Get more tests passing

src/Migration/Environment.php

@@ -15,6 +15,7 @@
 use Migrations\Db\Adapter\PhinxAdapter;
 use Migrations\SeedInterface;
 use Migrations\MigrationInterface;
+use Migrations\Shim\MigrationAdapter;
 use RuntimeException;
 
 class Environment
@@ -91,32 +92,32 @@ public function executeMigration(MigrationInterface $migration, string $directio
         }
 
         if (!$fake) {
-            // TODO this is tricky as the adapter would need to implement
-            // this method, but then it always exists. One option is to copy this
-            // is to special case the adapter and move this logic there?
-
-            // Run the migration
-            if (method_exists($migration, MigrationInterface::CHANGE)) {
-                if ($direction === MigrationInterface::DOWN) {
-                    // Create an instance of the RecordingAdapter so we can record all
-                    // of the migration commands for reverse playback
-
-                    /** @var \Migrations\Db\Adapter\RecordingAdapter $recordAdapter */
-                    $recordAdapter = AdapterFactory::instance()
-                        ->getWrapper('record', $adapter);
-
-                    // Wrap the adapter with a phinx shim to maintain contain
-                    $migration->setAdapter($adapter);
-
-                    $migration->{MigrationInterface::CHANGE}();
-                    $recordAdapter->executeInvertedCommands();
-
-                    $migration->setAdapter($this->getAdapter());
+            if ($migration instanceof MigrationAdapter) {
+                $migration->applyDirection($direction);
+            } else {
+                // Run the migration
+                if (method_exists($migration, MigrationInterface::CHANGE)) {
+                    if ($direction === MigrationInterface::DOWN) {
+                        // Create an instance of the RecordingAdapter so we can record all
+                        // of the migration commands for reverse playback
+
+                        /** @var \Migrations\Db\Adapter\RecordingAdapter $recordAdapter */
+                        $recordAdapter = AdapterFactory::instance()
+                            ->getWrapper('record', $adapter);
+
+                        // Wrap the adapter with a phinx shim to maintain contain
+                        $migration->setAdapter($adapter);
+
+                        $migration->{MigrationInterface::CHANGE}();
+                        $recordAdapter->executeInvertedCommands();
+
+                        $migration->setAdapter($this->getAdapter());
+                    } else {
+                        $migration->{MigrationInterface::CHANGE}();
+                    }
                 } else {
-                    $migration->{MigrationInterface::CHANGE}();
+                    $migration->{$direction}();
                 }
-            } else {
-                $migration->{$direction}();
             }
         }
 

src/Migration/Manager.php

@@ -257,11 +257,19 @@ public function markMigrated(int $version, string $path): bool
         /** @var class-string<\Phinx\Migration\MigrationInterface> $className */
         $className = $this->getMigrationClassName($migrationFile);
         require_once $migrationFile;
-        $Migration = new $className('default', $version);
+
+        /** @var \Migrations\MigrationInterface $migration */
+        if (is_subclass_of($className, PhinxMigrationInterface::class)) {
+            $migration = new MigrationAdapter($className, $version);
+        } else {
+            $migration = new $className($version);
+        }
+        $config = $this->getConfig();
+        $migration->setConfig($config);
 
         $time = date('Y-m-d H:i:s', time());
 
-        $adapter->migrated($Migration, 'up', $time, $time);
+        $adapter->migrated($migration, 'up', $time, $time);
 
         return true;
     }

src/Shim/MigrationAdapter.php

@@ -19,6 +19,7 @@
 use Migrations\Db\Adapter\PhinxAdapter;
 use Migrations\Db\Table;
 use Migrations\MigrationInterface;
+use Phinx\Db\Adapter\AdapterFactory as PhinxAdapterFactory;
 use Phinx\Migration\MigrationInterface as PhinxMigrationInterface;
 use RuntimeException;
 use Symfony\Component\Console\Input\ArrayInput;
@@ -101,6 +102,40 @@ public function init(): void
         }
     }
 
+    /**
+     * Compatibility shim for executing change/up/down
+     */
+    public function applyDirection(string $direction): void
+    {
+        $adapter = $this->getAdapter();
+
+        // Run the migration
+        if (method_exists($this->migration, MigrationInterface::CHANGE)) {
+            if ($direction === MigrationInterface::DOWN) {
+                // Create an instance of the RecordingAdapter so we can record all
+                // of the migration commands for reverse playback
+                $adapter = $this->migration->getAdapter();
+                assert($adapter !== null, 'Adapter must be set in migration');
+
+                /** @var \Phinx\Db\Adapter\ProxyAdapter $proxyAdapter */
+                $proxyAdapter = PhinxAdapterFactory::instance()
+                    ->getWrapper('proxy', $adapter);
+
+                // Wrap the adapter with a phinx shim to maintain contain
+                $this->migration->setAdapter($proxyAdapter);
+
+                $this->migration->{MigrationInterface::CHANGE}();
+                $proxyAdapter->executeInvertedCommands();
+
+                $this->migration->setAdapter($adapter);
+            } else {
+                $this->migration->{MigrationInterface::CHANGE}();
+            }
+        } else {
+            $this->migration->{$direction}();
+        }
+    }
+
     /**
      * {@inheritDoc}
      */

tests/TestCase/Migration/EnvironmentTest.php

@@ -131,7 +131,8 @@ public function up(): void
             }
         };
 
-        $this->environment->executeMigration($upMigration, MigrationInterface::UP);
+        $migrationWrapper = new MigrationAdapter($upMigration, $upMigration->getVersion());
+        $this->environment->executeMigration($migrationWrapper, MigrationInterface::UP);
         $this->assertTrue($upMigration->executed);
     }
 
@@ -156,7 +157,8 @@ public function down(): void
             }
         };
 
-        $this->environment->executeMigration($downMigration, MigrationInterface::DOWN);
+        $migrationWrapper = new MigrationAdapter($downMigration, $downMigration->getVersion());
+        $this->environment->executeMigration($migrationWrapper, MigrationInterface::DOWN);
         $this->assertTrue($downMigration->executed);
     }
 
@@ -187,7 +189,8 @@ public function up(): void
             }
         };
 
-        $this->environment->executeMigration($migration, MigrationInterface::UP);
+        $migrationWrapper = new MigrationAdapter($migration, $migration->getVersion());
+        $this->environment->executeMigration($migrationWrapper, MigrationInterface::UP);
         $this->assertTrue($migration->executed);
     }
 
@@ -212,7 +215,8 @@ public function change(): void
             }
         };
 
-        $this->environment->executeMigration($migration, MigrationInterface::UP);
+        $migrationWrapper = new MigrationAdapter($migration, $migration->getVersion());
+        $this->environment->executeMigration($migrationWrapper, MigrationInterface::UP);
         $this->assertTrue($migration->executed);
     }
 
@@ -237,7 +241,8 @@ public function change(): void
             }
         };
 
-        $this->environment->executeMigration($migration, MigrationInterface::DOWN);
+        $migrationWrapper = new MigrationAdapter($migration, $migration->getVersion());
+        $this->environment->executeMigration($migrationWrapper, MigrationInterface::DOWN);
         $this->assertTrue($migration->executed);
     }
 
@@ -262,7 +267,8 @@ public function change(): void
             }
         };
 
-        $this->environment->executeMigration($migration, MigrationInterface::UP, true);
+        $migrationWrapper = new MigrationAdapter($migration, $migration->getVersion());
+        $this->environment->executeMigration($migrationWrapper, MigrationInterface::UP, true);
         $this->assertFalse($migration->executed);
     }