tests correction and infection fix

.github/workflows/analysis.yml

@@ -21,9 +21,6 @@ jobs:
         with:
           php-version: ${{ matrix.php-version }}
           coverage: none
-        env:
-          fail-fast: true
-          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install composer dependencies
         uses: ramsey/composer-install@v3
@@ -35,7 +32,7 @@ jobs:
         run: vendor/bin/phpcs
 
       - name: Psalm
-        run: vendor/bin/psalm --stats --output-format=github
+        run: vendor/bin/psalm --stats
 
       - name: PHPStan
         run: vendor/bin/phpstan analyse

.github/workflows/release.yml

@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "8.3"
+          - "8.4"
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/tests.yml

@@ -13,6 +13,7 @@ jobs:
         php-version:
           - "8.3"
           - "8.4"
+          - "8.5"
 
     steps:
       - name: Checkout

tests/workflow/ArgumentsTest.php

@@ -49,6 +49,7 @@ public function testUpWithLimit(): void
         $data = $this->command->fetchApplied();
         self::assertCount(3, $data);
 
+        // check order
         $names = array_keys($data);
         self::assertEquals('202501021025_account_email.sql', $names[0]);
         self::assertEquals('202501021024_account_create.sql', $names[1]);
@@ -105,8 +106,6 @@ public function testWithDb(): void
     public function testWithUnknownDb(): void
     {
         $this->migrator->init();
-        $data = $this->command->fetchApplied();
-        self::assertEmpty($data);
 
         $this->expectException(ConfigurationException::class);
         $this->migrator->up(new InputArgs(dbName: 'sqlite/unknown'));
@@ -151,11 +150,11 @@ public function testDownWithLatestVersion(): void
 
         usleep(10_000);
 
-        $this->migrator->up($args);
+        $this->migrator->up($args); // +1
         $data = $this->command->fetchApplied();
         self::assertCount(2, $data);
 
-        $this->migrator->up($args);
+        $this->migrator->up($args); // +1
         $data = $this->command->fetchApplied();
         self::assertCount(3, $data);
 

tests/workflow/CommandTest.php

@@ -8,6 +8,7 @@
 use Throwable;
 use PDO;
 use PDOException;
+use PHPUnit\Framework\Attributes\Depends;
 use PHPUnit\Framework\TestCase;
 use kuaukutsu\poc\migration\driver\DriverType;
 use kuaukutsu\poc\migration\internal\command\Args;
@@ -44,19 +45,22 @@ public function testInit(): void
     /**
      * @throws Throwable
      */
+    #[Depends('testInit')]
     public function testUp(): void
     {
         $this->execInitialization();
 
         $this->execUp('table1');
 
         $data = $this->command->fetchApplied();
+        self::assertCount(1, $data);
         self::assertNotEmpty($data['test-table1']);
     }
 
     /**
      * @throws Throwable
      */
+    #[Depends('testInit')]
     public function testDown(): void
     {
         $this->execInitialization();
@@ -82,6 +86,7 @@ public function testDown(): void
     /**
      * @throws Throwable
      */
+    #[Depends('testInit')]
     public function testFetchLimit(): void
     {
         $this->execInitialization();
@@ -100,6 +105,8 @@ public function testFetchLimit(): void
             new Args(limit: 2)
         );
         self::assertCount(2, $data);
+
+        // sort order
         $names = array_keys($data);
         self::assertEquals('test-table3', $names[0]);
         self::assertEquals('test-table2', $names[1]);
@@ -108,6 +115,7 @@ public function testFetchLimit(): void
     /**
      * @throws Throwable
      */
+    #[Depends('testInit')]
     public function testFetchVersion(): void
     {
         $this->execInitialization();
@@ -140,6 +148,7 @@ public function testFetchVersion(): void
     /**
      * @throws Throwable
      */
+    #[Depends('testInit')]
     public function testUpDryRun(): void
     {
         $this->execInitialization();
@@ -170,6 +179,7 @@ public function testUpDryRun(): void
     /**
      * @throws Throwable
      */
+    #[Depends('testInit')]
     public function testDownDryRun(): void
     {
         $this->execInitialization();
@@ -200,6 +210,7 @@ public function testDownDryRun(): void
     /**
      * @throws Throwable
      */
+    #[Depends('testInit')]
     public function testUpRollbackTransaction(): void
     {
         $this->execInitialization();
@@ -222,6 +233,7 @@ public function testUpRollbackTransaction(): void
     /**
      * @throws Throwable
      */
+    #[Depends('testInit')]
     public function testDownRollbackTransaction(): void
     {
         $this->execInitialization();

tests/workflow/EventTest.php

@@ -169,7 +169,7 @@ public function testMigrationFilesystemNotice(): void
         );
     }
 
-    public function testMigrationDoesNotContainFiles(): void
+    public function testMigrationUpDoesNotContainFiles(): void
     {
         $eventSubscriber = new TestSubscriber();
         $migrator = MigratorFactory::makeFromEvent(
@@ -183,18 +183,32 @@ public function testMigrationDoesNotContainFiles(): void
         );
 
         $migrator->init();
-
         $migrator->up();
+
         // migration completed in the previous step
         $migrator->up();
         self::assertStringContainsString(
             'does not contain migration files',
             $eventSubscriber->get(Event::FilesystemNotice)
         );
+    }
 
-        $eventSubscriber->clear();
+    public function testMigrationDownDoesNotContainFiles(): void
+    {
+        $eventSubscriber = new TestSubscriber();
+        $migrator = MigratorFactory::makeFromEvent(
+            new PdoDriver(
+                dsn: 'sqlite::memory:',
+            ),
+            [
+                $eventSubscriber,
+            ],
+            dirname(__DIR__) . '/migration/sqlite/memory'
+        );
 
+        $migrator->init();
         $migrator->down();
+
         // migration completed in the previous step
         $migrator->down();
         self::assertStringContainsString(

tests/workflow/MigrationFailTest.php

@@ -8,6 +8,7 @@
 use PHPUnit\Framework\TestCase;
 use kuaukutsu\poc\migration\driver\PdoDriver;
 use kuaukutsu\poc\migration\exception\ActionException;
+use kuaukutsu\poc\migration\exception\ConfigurationException;
 use kuaukutsu\poc\migration\internal\command\CommandInterface;
 use kuaukutsu\poc\migration\internal\command\Params;
 use kuaukutsu\poc\migration\tests\MigratorFactory;
@@ -79,4 +80,16 @@ public function testUpExactlyAllException(): void
 
         $this->migrator->up(new InputArgs(exactlyAll: true));
     }
+
+    public function testMigrationFixtureException(): void
+    {
+        $this->migrator->init();
+
+        $this->expectException(ConfigurationException::class);
+        $this->expectExceptionMessageMatches(
+            '/^the directory .+ does not exist.$/i'
+        );
+
+        $this->migrator->fixture();
+    }
 }

tests/workflow/MigrationTest.php

@@ -48,33 +48,31 @@ public function testInit(): void
     public function testUp(): void
     {
         $this->migrator->init();
-        $data = $this->command->fetchApplied();
-        self::assertEmpty($data);
 
         $this->migrator->up();
         $data = $this->command->fetchApplied();
-        self::assertCount(3, $data);
+        $countMigration = count($data);
+        self::assertGreaterThanOrEqual(3, $countMigration);
 
+        // sort order
         $names = array_keys($data);
         self::assertEquals('202501021025_account_email.sql', $names[0]);
         self::assertEquals('202501021024_account_create.sql', $names[1]);
         self::assertEquals('202501011024_entity_create.sql', $names[2]);
 
         $this->migrator->up();
         $data = $this->command->fetchApplied();
-        self::assertCount(3, $data);
+        self::assertCount($countMigration, $data);
     }
 
     #[Depends('testInit')]
     public function testDown(): void
     {
         $this->migrator->init();
-        $data = $this->command->fetchApplied();
-        self::assertEmpty($data);
 
         $this->migrator->up();
         $data = $this->command->fetchApplied();
-        self::assertCount(3, $data);
+        self::assertGreaterThanOrEqual(3, $data);
 
         $this->migrator->down();
         $data = $this->command->fetchApplied();
@@ -85,12 +83,10 @@ public function testDown(): void
     public function testRedo(): void
     {
         $this->migrator->init();
-        $data = $this->command->fetchApplied();
-        self::assertEmpty($data);
 
         $this->migrator->up();
         $data = $this->command->fetchApplied();
-        self::assertCount(3, $data);
+        self::assertGreaterThanOrEqual(3, $data);
 
         $version = (int)current($data);
         self::assertGreaterThan(0, $version);
@@ -99,7 +95,7 @@ public function testRedo(): void
 
         $this->migrator->redo();
         $data = $this->command->fetchApplied();
-        self::assertCount(3, $data);
+        self::assertGreaterThanOrEqual(3, $data);
 
         $versionNew = (int)current($data);
         self::assertGreaterThan(0, $versionNew);
@@ -118,24 +114,19 @@ public function testInitializationException(): void
 
     public function testConnectionException(): void
     {
-        $driver = new PdoDriver(
-            dsn: 'mysql:host=mysql;dbname=main',
-        );
+        $driver = new PdoDriver(dsn: 'mysql:host=mysql;dbname=main');
+        $migrator = MigratorFactory::makeFromEvent($driver);
 
         $this->expectException(ConnectionException::class);
         $this->expectExceptionMessageMatches('~PDO_MYSQL:\w+~');
 
-        $migrator = MigratorFactory::makeFromDriver($driver);
         $migrator->init();
     }
 
     public function testActionException(): void
     {
-        $migrator = MigratorFactory::makeFromEvent(
-            new PdoDriver(
-                dsn: 'sqlite::memory:',
-            )
-        );
+        $driver = new PdoDriver(dsn: 'sqlite::memory:');
+        $migrator = MigratorFactory::makeFromEvent($driver);
 
         $this->expectException(ActionException::class);
         $this->expectExceptionMessage(
@@ -146,15 +137,13 @@ public function testActionException(): void
         $migrator->up();
     }
 
-    public function testActionExceptionDryRun(): void
+    public function testActionNotExceptionDryRun(): void
     {
         $driver = new PdoDriver(dsn: 'sqlite::memory:');
         $migrator = MigratorFactory::makeFromEvent($driver);
         $command = $driver->makeCommand(new Params(table: 'migration'));
 
         $migrator->init();
-        $data = $command->fetchApplied();
-        self::assertEmpty($data);
 
         $migrator->up(new InputArgs(dryRun: true));
         $data = $command->fetchApplied();