Fix CLI migrator pending detection, allow default migration path registration, add regression tests and changelog entry

Author: KolesnikovKirill

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 All significant changes to this project will be documented in this file.
 
+## [1.4.1] - 2025-12-10
+
+### Added
+
+-   **CLI tests:** Added coverage for skipping already-ran migrations and for migration path resolver uniqueness/default path handling.
+
+### Fixed
+
+-   **Migrator:** Pending detection now compares against ran migration names, preventing repeat execution of logged migrations.
+-   **CLI path resolver:** Allows registering default migration path even if the directory does not exist yet and deduplicates entries.
+
 ## [1.4.0] - 2025-12-10
 
 ### Added

src/Migrations/MigrationPathResolver.php

@@ -14,9 +14,11 @@ class MigrationPathResolver
      */
     public function addPath(string $path): void
     {
-        if (is_dir($path)) {
-            $this->paths[] = rtrim($path, DIRECTORY_SEPARATOR);
-        }
+        // Allow registering paths even before the directory exists; it can be created later by CLI
+        $this->paths[] = rtrim($path, DIRECTORY_SEPARATOR);
+
+        // Keep list unique to avoid duplicate lookups
+        $this->paths = array_values(array_unique($this->paths));
     }
 
     /**

src/Migrations/Migrator.php

@@ -32,7 +32,8 @@ public function migrate(): array
         $this->repository->ensureTableExists();
 
         $files = $this->getMigrationFiles();
-        $ran = $this->repository->getRan();
+        // Compare by migration names only to avoid treating already-ran migrations as pending
+        $ran = array_column($this->repository->getRan(), 'migration');
 
         $pending = array_diff(array_keys($files), $ran);
 

tests/Migrations/MigrationPathResolverTest.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Codemonster\Database\Tests\Migrations;
+
+use Codemonster\Database\Migrations\MigrationPathResolver;
+use Codemonster\Database\Tests\TestCase;
+
+class MigrationPathResolverTest extends TestCase
+{
+    public function test_adds_nonexistent_path_and_keeps_unique()
+    {
+        $resolver = new MigrationPathResolver();
+
+        $path = sys_get_temp_dir() . '/cm_db_missing_' . uniqid('', true);
+
+        $resolver->addPath($path);
+        // Duplicate with trailing slash to ensure it stays unique
+        $resolver->addPath($path . DIRECTORY_SEPARATOR);
+
+        $paths = $resolver->getPaths();
+
+        $this->assertSame([$path], $paths);
+        $this->assertFalse(is_dir($path));
+    }
+}
+

tests/Migrations/MigratorTest.php

@@ -55,4 +55,49 @@ public function down(): void {}
         unlink($file);
         rmdir($dir);
     }
+
+    public function test_migrator_skips_already_ran_migrations()
+    {
+        $dir = sys_get_temp_dir() . '/cm_db_migrations_' . uniqid('', true);
+
+        mkdir($dir);
+
+        $first = '2025_01_01_000000_first_migration';
+        $second = '2025_01_02_000000_second_migration';
+
+        foreach ([$first, $second] as $name) {
+            file_put_contents($dir . DIRECTORY_SEPARATOR . $name . '.php', <<<PHP
+            <?php
+
+            use Codemonster\\Database\\Migrations\\Migration;
+
+            return new class extends Migration {
+                public function up(): void {}
+                public function down(): void {}
+            };
+            PHP);
+        }
+
+        $conn = new FakeConnection();
+        $conn->migrations = [$first];
+
+        $repo = new MigrationRepository($conn);
+
+        /** @var MigrationPathResolver $paths */
+        $paths = $this->createStub(MigrationPathResolver::class);
+        $paths->method('getPaths')->willReturn([$dir]);
+
+        $migrator = new Migrator($repo, $conn, $paths);
+
+        $ran = $migrator->migrate();
+
+        $this->assertSame([$second], $ran);
+        $this->assertSame([$first, $second], $conn->migrations);
+
+        foreach ([$first, $second] as $name) {
+            unlink($dir . DIRECTORY_SEPARATOR . $name . '.php');
+        }
+
+        rmdir($dir);
+    }
 }