Fix phpunit tests errors

Author: stephane-monnot

composer.json

@@ -25,6 +25,7 @@
         "symfony/process": "2.8.*|3.0.*"
     },
     "require-dev": {
+        "laravel/framework": ">=5.1.0",
         "mockery/mockery": "~0.9.2",
         "phpunit/phpunit": "~4.1"
     },

src/Commands/ImportCommand.php

@@ -250,7 +250,7 @@ protected function seedCommand($class, $extra = '')
 	 */
 	protected function makeProcess($command)
 	{
-		return new Process($command, $this->laravel['path.base'], null, null, 0);
+		return new Process($command, $this->laravel->basePath(), null, null, 0);
 	}
 
 	/**

src/Commands/InstallCommand.php

@@ -30,7 +30,7 @@ public function fire()
 	{
 		$force = $this->input->getOption('force');
 
-		$path = $this->laravel['path.base'].'/app/config/packages/ipalaus/geonames/config.php';
+		$path = $this->laravel->basePath().'/app/config/packages/ipalaus/geonames/config.php';
 
 		// prevents config overwrites
 		if ($this->configExists($path) and ! $force)

tests/ImportCommandTest.php

@@ -1,6 +1,7 @@
 <?php
 
 use Mockery as m;
+use Illuminate\Foundation\Application;
 use Ipalaus\Geonames\Importer;
 use Ipalaus\Geonames\Commands\ImportCommand;
 
@@ -12,6 +13,10 @@ class ImportCommandTest extends PHPUnit_Framework_TestCase {
 	public function testDevelopmentAndCountryCantBeBothOptions()
 	{
 		$command = new ImportCommandTestStub(new Importer($this->getRepo()), $this->getFiles(), array());
+
+		$app = new Application();
+		$command->setLaravel($app);
+
 		$this->runCommand($command, array('--development' => true, '--country' => 'IP'));
 	}
 
@@ -21,6 +26,10 @@ public function testDevelopmentAndCountryCantBeBothOptions()
 	public function testMustProvideAValidIsoAlpha2Country()
 	{
 		$command = new ImportCommandTestStub(new Importer($this->getRepo()), $this->getFiles(), array());
+
+		$app = new Application();
+		$command->setLaravel($app);
+
 		$this->runCommand($command, array('--country' => 'Isern'));
 	}
 
@@ -78,6 +87,9 @@ public function testCommandCall()
 
 		$command = $this->getMock('ImportCommandTestStub', $mockedMethods, array($importer, $filesystem, $config));
 
+		$app = new Application();
+		$command->setLaravel($app);
+
 		$filesystem->shouldReceive('isDirectory')->once()->andReturn(false);
 		$filesystem->shouldReceive('makeDirectory')->once()->andReturn(true);
 		$filesystem->shouldReceive('runProcess')->andReturn(null);
@@ -114,6 +126,9 @@ public function testCommandAllFilesExistsCall()
 
 		$command = $this->getMock('ImportCommandTestStub', $mockedMethods, array($importer, $filesystem, $config));
 
+		$app = new Application();
+		$command->setLaravel($app);
+
 		$filesystem->shouldReceive('isDirectory')->once()->andReturn(false);
 		$filesystem->shouldReceive('makeDirectory')->once()->andReturn(true);
 		$filesystem->shouldReceive('runProcess')->andReturn(null);
@@ -147,6 +162,9 @@ public function testFetchOnlyOptionCall()
 
 		$command = $this->getMock('ImportCommandTestStub', $mockedMethods, array($importer, $filesystem, $config));
 
+		$app = new Application();
+		$command->setLaravel($app);
+
 		$filesystem->shouldReceive('isDirectory')->once()->andReturn(false);
 		$filesystem->shouldReceive('makeDirectory')->once()->andReturn(true);
 
@@ -183,6 +201,9 @@ public function testDevelopmentOptionCall()
 
 		$command = $this->getMock('ImportCommandTestStub', $mockedMethods, array($importer, $filesystem, $config));
 
+		$app = new Application();
+		$command->setLaravel($app);
+
 		$filesystem->shouldReceive('isDirectory')->once()->andReturn(false);
 		$filesystem->shouldReceive('makeDirectory')->once()->andReturn(true);
 		$filesystem->shouldReceive('runProcess')->andReturn(null);
@@ -220,6 +241,9 @@ public function testCountryOptionCall()
 
 		$command = $this->getMock('ImportCommandTestStub', $mockedMethods, array($importer, $filesystem, $config));
 
+		$app = new Application();
+		$command->setLaravel($app);
+
 		$filesystem->shouldReceive('isDirectory')->once()->andReturn(false);
 		$filesystem->shouldReceive('makeDirectory')->once()->andReturn(true);
 		$filesystem->shouldReceive('runProcess')->andReturn(null);

tests/InstallCommandTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use Illuminate\Foundation\Application;
 use Ipalaus\Geonames\Commands\InstallCommand;
 
 class InstallCommandTest extends PHPUnit_Framework_TestCase {
@@ -8,6 +9,9 @@ public function testCommandCall()
 	{
 		$command = new InstallCommandTestStub;
 
+		$app = new Application();
+		$command->setLaravel($app);
+
 		$this->runCommand($command);
 	}
 
@@ -17,6 +21,10 @@ public function testCommandCall()
 	public function testExistingConfigThrowsException()
 	{
 		$command = $this->getMock('InstallCommandTestStub', array('configExists'));
+
+		$app = new Application();
+		$command->setLaravel($app);
+
 		$command->expects($this->once())
 				->method('configExists')
 				->will($this->returnValue(true));
@@ -27,6 +35,10 @@ public function testExistingConfigThrowsException()
 	public function testForceEvenConfigExists()
 	{
 		$command = $this->getMock('InstallCommandTestStub', array('configExists'));
+
+		$app = new Application();
+		$command->setLaravel($app);
+
 		$command->expects($this->once())
 				->method('configExists')
 				->will($this->returnValue(true));

tests/TruncateCommandTest.php

@@ -1,6 +1,7 @@
 <?php
 
 use Mockery as m;
+use Illuminate\Foundation\Application;
 use Ipalaus\Geonames\Commands\TruncateCommand;
 
 class TruncateCommandTest extends PHPUnit_Framework_TestCase {
@@ -12,6 +13,10 @@ public function testCommandCall()
 			->method('truncate');
 
 		$command = $this->getMock('TruncateCommandTestStub', array('confirmTruncate'), array($repo));
+
+		$app = new Application();
+		$command->setLaravel($app);
+
 		$command->expects($this->once())
 			->method('confirmTruncate')
 			->will($this->returnValue(true));
@@ -35,6 +40,10 @@ public function testExistingConfigThrowsException()
 		$repo = $this->getMock('Ipalaus\Geonames\RepositoryInterface');
 
 		$command = $this->getMock('TruncateCommandTestStub', array('confirmTruncate'), array($repo));
+
+		$app = new Application();
+		$command->setLaravel($app);
+
 		$command->expects($this->once())
 				->method('confirmTruncate')
 				->will($this->returnValue(false));