fix test

Author: muhajirinlpu

composer.json

@@ -36,7 +36,10 @@
         }
     },
     "scripts": {
-        "test": "vendor/bin/phpunit"
+        "test": "vendor/bin/phpunit",
+        "post-autoload-dump": [
+            "@php ./vendor/bin/testbench package:discover --ansi"
+        ]
     },
     "minimum-stability": "stable",
     "extra": {

src/Console/MakeCommand.php

@@ -28,10 +28,10 @@ public function handle(): void
      * @param $name
      * @param $table
      * @param $create
-     * @return string
+     * @return string|null
      * @throws \Exception
      */
-    protected function writeMigration($name, $table, $create): string
+    protected function writeMigration($name, $table, $create): ?string
     {
         $file = $this->creator->create(
             $name, $this->getMigrationPath(), $table, $create

src/Console/PatchCommand.php

@@ -39,9 +39,7 @@ public function handle(): int
     protected function prepareDatabase(): void
     {
         if (! $this->migrator->repositoryExists()) {
-            $this->call('patcher:install', array_filter([
-                '--database' => $this->option('database'),
-            ]));
+            $this->call('patcher:install');
         }
     }
 

src/Patcher.php

@@ -84,7 +84,7 @@ protected function patch(string $file, int $batch, bool $pretend): void
      * @return void
      * @throws \Throwable
      */
-    protected function runPatch($migration, string $method): void
+    protected function runPatch(object $migration, string $method): void
     {
         $connection = $this->resolveConnection(
             $migration->getConnection()

tests/Command/PatcherInstallCommandTest.php

@@ -18,7 +18,7 @@ protected function tearDown(): void
         m::close();
     }
 
-    public function testFireCallsRepositoryToInstall()
+    public function testFireCallsRepositoryToInstall(): void
     {
         $command = new InstallCommand($repo = m::mock(MigrationRepositoryInterface::class));
 
@@ -29,7 +29,7 @@ public function testFireCallsRepositoryToInstall()
         $this->runCommand($command, ['--database' => 'foo']);
     }
 
-    protected function runCommand(Command $command, $options = [])
+    protected function runCommand(Command $command, $options = []): int
     {
         return $command->run(new ArrayInput($options), new NullOutput());
     }

tests/Command/PatcherMakeCommandTest.php

@@ -32,7 +32,7 @@ public function testBasicCreateDumpsAutoload(): void
         $this->runCommand($command, ['name' => 'fix_foo']);
     }
 
-    public function testBasicCreateGivesCreatorProperArguments()
+    public function testBasicCreateGivesCreatorProperArguments(): void
     {
         $command = new MakeCommand(
             $creator = m::mock(PatcherCreator::class),
@@ -45,7 +45,7 @@ public function testBasicCreateGivesCreatorProperArguments()
         $this->runCommand($command, ['name' => 'fix_foo']);
     }
 
-    public function testBasicCreateGivesCreatorProperArgumentsWhenNameIsStudlyCase()
+    public function testBasicCreateGivesCreatorProperArgumentsWhenNameIsStudlyCase(): void
     {
         $command = new MakeCommand(
             $creator = m::mock(PatcherCreator::class),

tests/Command/PatcherRunCommandTest.php

@@ -3,12 +3,10 @@
 namespace Dentro\Patcher\Tests\Command;
 
 use Illuminate\Contracts\Events\Dispatcher;
-use Illuminate\Database\Events\SchemaLoaded;
 use Illuminate\Foundation\Application;
 use Dentro\Patcher\Console\PatchCommand;
 use Dentro\Patcher\Patcher;
 use PHPUnit\Framework\TestCase;
-use stdClass;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\NullOutput;
 use Mockery as m;
@@ -20,12 +18,11 @@ protected function tearDown(): void
         m::close();
     }
 
-    public function testBasicPatchesCallMigratorWithProperArguments()
+    public function testBasicPatchesCallMigratorWithProperArguments(): void
     {
         $command = new PatchCommand($migrator = m::mock(Patcher::class), $dispatcher = m::mock(Dispatcher::class));
         $app = new ApplicationDatabaseMigrationStub();
         $command->setLaravel($app);
-        $migrator->shouldReceive('paths')->once()->andReturn([]);
         $migrator->shouldReceive('hasRunAnyMigrations')->andReturn(true);
         $migrator->shouldReceive('usingConnection')->once()->andReturnUsing(function ($name, $callback) {
             return $callback();
@@ -38,39 +35,12 @@ public function testBasicPatchesCallMigratorWithProperArguments()
         $this->runCommand($command);
     }
 
-    public function testMigrationsCanBeRunWithStoredSchema()
-    {
-        $command = new PatchCommand($migrator = m::mock(Patcher::class), $dispatcher = m::mock(Dispatcher::class));
-        $app = new ApplicationDatabaseMigrationStub();
-        $app->setBasePath(__DIR__);
-        $command->setLaravel($app);
-        $migrator->shouldReceive('paths')->once()->andReturn([]);
-        $migrator->shouldReceive('hasRunAnyMigrations')->andReturn(false);
-        $migrator->shouldReceive('resolveConnection')->andReturn($connection = m::mock(stdClass::class));
-        $connection->shouldReceive('getName')->andReturn('mysql');
-        $migrator->shouldReceive('usingConnection')->once()->andReturnUsing(function ($name, $callback) {
-            return $callback();
-        });
-        $migrator->shouldReceive('deleteRepository')->once();
-        $connection->shouldReceive('getSchemaState')->andReturn($schemaState = m::mock(stdClass::class));
-        $schemaState->shouldReceive('handleOutputUsing')->andReturnSelf();
-        $schemaState->shouldReceive('load')->once()->with(__DIR__.'/stubs/schema.sql');
-        $dispatcher->shouldReceive('dispatch')->once()->with(m::type(SchemaLoaded::class));
-        $migrator->shouldReceive('setOutput')->once()->andReturn($migrator);
-        $migrator->shouldReceive('run')->once()->with([__DIR__.DIRECTORY_SEPARATOR.'patches'], ['pretend' => false, 'step' => false]);
-        $migrator->shouldReceive('getNotes')->andReturn([]);
-        $migrator->shouldReceive('repositoryExists')->once()->andReturn(true);
-
-        $this->runCommand($command, ['--schema-path' => __DIR__.'/stubs/schema.sql']);
-    }
-
-    public function testPatchesRepositoryCreatedWhenNecessary()
+    public function testPatchesRepositoryCreatedWhenNecessary(): void
     {
         $params = [$migrator = m::mock(Patcher::class), $dispatcher = m::mock(Dispatcher::class)];
         $command = $this->getMockBuilder(PatchCommand::class)->onlyMethods(['call'])->setConstructorArgs($params)->getMock();
         $app = new ApplicationDatabaseMigrationStub();
         $command->setLaravel($app);
-        $migrator->shouldReceive('paths')->once()->andReturn([]);
         $migrator->shouldReceive('hasRunAnyMigrations')->andReturn(true);
         $migrator->shouldReceive('usingConnection')->once()->andReturnUsing(function ($name, $callback) {
             return $callback();
@@ -83,58 +53,6 @@ public function testPatchesRepositoryCreatedWhenNecessary()
         $this->runCommand($command);
     }
 
-    public function testTheCommandMayBePretended()
-    {
-        $command = new PatchCommand($migrator = m::mock(Patcher::class), $dispatcher = m::mock(Dispatcher::class));
-        $app = new ApplicationDatabaseMigrationStub(['path.database' => __DIR__]);
-        $app->useDatabasePath(__DIR__);
-        $command->setLaravel($app);
-        $migrator->shouldReceive('paths')->once()->andReturn([]);
-        $migrator->shouldReceive('hasRunAnyMigrations')->andReturn(true);
-        $migrator->shouldReceive('usingConnection')->once()->andReturnUsing(function ($name, $callback) {
-            return $callback();
-        });
-        $migrator->shouldReceive('setOutput')->once()->andReturn($migrator);
-        $migrator->shouldReceive('run')->once()->with([$app->basePath().DIRECTORY_SEPARATOR.'patches'], ['pretend' => true, 'step' => false]);
-        $migrator->shouldReceive('repositoryExists')->once()->andReturn(true);
-
-        $this->runCommand($command, ['--pretend' => true]);
-    }
-
-    public function testTheDatabaseMayBeSet()
-    {
-        $command = new PatchCommand($migrator = m::mock(Patcher::class), $dispatcher = m::mock(Dispatcher::class));
-        $app = new ApplicationDatabaseMigrationStub();
-        $command->setLaravel($app);
-        $migrator->shouldReceive('paths')->once()->andReturn([]);
-        $migrator->shouldReceive('hasRunAnyMigrations')->andReturn(true);
-        $migrator->shouldReceive('usingConnection')->once()->andReturnUsing(function ($name, $callback) {
-            return $callback();
-        });
-        $migrator->shouldReceive('setOutput')->once()->andReturn($migrator);
-        $migrator->shouldReceive('run')->once()->with([$app->basePath().DIRECTORY_SEPARATOR.'patches'], ['pretend' => false, 'step' => false]);
-        $migrator->shouldReceive('repositoryExists')->once()->andReturn(true);
-
-        $this->runCommand($command, ['--database' => 'foo']);
-    }
-
-    public function testStepMayBeSet()
-    {
-        $command = new PatchCommand($migrator = m::mock(Patcher::class), $dispatcher = m::mock(Dispatcher::class));
-        $app = new ApplicationDatabaseMigrationStub();
-        $command->setLaravel($app);
-        $migrator->shouldReceive('paths')->once()->andReturn([]);
-        $migrator->shouldReceive('hasRunAnyMigrations')->andReturn(true);
-        $migrator->shouldReceive('usingConnection')->once()->andReturnUsing(function ($name, $callback) {
-            return $callback();
-        });
-        $migrator->shouldReceive('setOutput')->once()->andReturn($migrator);
-        $migrator->shouldReceive('run')->once()->with([$app->basePath().DIRECTORY_SEPARATOR.'patches'], ['pretend' => false, 'step' => true]);
-        $migrator->shouldReceive('repositoryExists')->once()->andReturn(true);
-
-        $this->runCommand($command, ['--step' => true]);
-    }
-
     protected function runCommand($command, $input = [])
     {
         return $command->run(new ArrayInput($input), new NullOutput);
@@ -150,7 +68,7 @@ public function __construct(array $data = [])
         }
     }
 
-    public function environment(...$environments)
+    public function environment(...$environments): string
     {
         return 'development';
     }