Reduce scope of changes.

CI is too red right now.
cakephp · Nov 1, 2024 · 1739d4c · 1739d4c
1 parent 0fb6aba
commit 1739d4c
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 42 deletions.
diff --git a/src/Command/BakeMigrationDiffCommand.php b/src/Command/BakeMigrationDiffCommand.php
@@ -18,7 +18,6 @@
 use Cake\Console\Arguments;
 use Cake\Console\ConsoleIo;
 use Cake\Console\ConsoleOptionParser;
-use Cake\Core\Configure;
 use Cake\Database\Connection;
 use Cake\Database\Schema\CollectionInterface;
 use Cake\Database\Schema\TableSchema;
@@ -200,7 +199,6 @@ public function templateData(Arguments $arguments): array
             'data' => $this->templateData,
             'dumpSchema' => $this->dumpSchema,
             'currentSchema' => $this->currentSchema,
-            'backend' => Configure::read('Migrations.backend', 'builtin'),
         ];
     }
 

diff --git a/src/Command/BakeMigrationSnapshotCommand.php b/src/Command/BakeMigrationSnapshotCommand.php
@@ -115,7 +115,6 @@ public function templateData(Arguments $arguments): array
             'action' => 'create_table',
             'name' => $this->_name,
             'autoId' => $autoId,
-            'backend' => Configure::read('Migrations.backend', 'builtin'),
         ];
     }
 

diff --git a/src/Command/SnapshotTrait.php b/src/Command/SnapshotTrait.php
@@ -15,7 +15,6 @@
 
 use Cake\Console\Arguments;
 use Cake\Console\ConsoleIo;
-use Cake\Core\Configure;
 
 /**
  * Trait needed for all "snapshot" type of bake operations.
@@ -63,11 +62,7 @@ protected function markSnapshotApplied(string $path, Arguments $args, ConsoleIo
         $newArgs = array_merge($newArgs, $this->parseOptions($args));
 
         $io->out('Marking the migration ' . $fileName . ' as migrated...');
-        if (Configure::read('Migrations.backend') == 'builtin') {
-            $this->executeCommand(MarkMigratedCommand::class, $newArgs, $io);
-        } else {
-            $this->executeCommand(MigrationsMarkMigratedCommand::class, $newArgs, $io);
-        }
+        $this->executeCommand(MigrationsMarkMigratedCommand::class, $newArgs, $io);
     }
 
     /**
@@ -83,11 +78,7 @@ protected function refreshDump(Arguments $args, ConsoleIo $io): void
         $newArgs = $this->parseOptions($args);
 
         $io->out('Creating a dump of the new database state...');
-        if (Configure::read('Migrations.backend') == 'builtin') {
-            $this->executeCommand(DumpCommand::class, $newArgs, $io);
-        } else {
-            $this->executeCommand(MigrationsDumpCommand::class, $newArgs, $io);
-        }
+        $this->executeCommand(MigrationsDumpCommand::class, $newArgs, $io);
     }
 
     /**

diff --git a/templates/bake/config/diff.twig b/templates/bake/config/diff.twig
@@ -20,15 +20,9 @@
 <?php
 declare(strict_types=1);
 
-{% if backend == "builtin" %}
-use Migrations\BaseMigration;
-
-class {{ name }} extends BaseMigration
-{% else %}
 use Migrations\AbstractMigration;
 
 class {{ name }} extends AbstractMigration
-{% endif %}
 {
 {% if not autoId %}
     public bool $autoId = false;

diff --git a/templates/bake/config/snapshot.twig b/templates/bake/config/snapshot.twig
@@ -22,15 +22,9 @@
 <?php
 declare(strict_types=1);
 
-{% if backend == "builtin" %}
-use Migrations\BaseMigration;
-
-class {{ name }} extends BaseMigration
-{% else %}
 use Migrations\AbstractMigration;
 
 class {{ name }} extends AbstractMigration
-{% endif %}
 {
 {% if not autoId  %}
     public bool $autoId = false;

diff --git a/tests/comparisons/Migration/pgsql/test_snapshot_auto_id_disabled_pgsql.php b/tests/comparisons/Migration/pgsql/test_snapshot_auto_id_disabled_pgsql.php
@@ -1,9 +1,9 @@
 <?php
 declare(strict_types=1);
 
-use Migrations\BaseMigration;
+use Migrations\AbstractMigration;
 
-class TestSnapshotAutoIdDisabledPgsql extends BaseMigration
+class TestSnapshotAutoIdDisabledPgsql extends AbstractMigration
 {
     public bool $autoId = false;
 

diff --git a/tests/comparisons/Migration/pgsql/test_snapshot_not_empty_pgsql.php b/tests/comparisons/Migration/pgsql/test_snapshot_not_empty_pgsql.php
@@ -1,9 +1,9 @@
 <?php
 declare(strict_types=1);
 
-use Migrations\BaseMigration;
+use Migrations\AbstractMigration;
 
-class TestSnapshotNotEmptyPgsql extends BaseMigration
+class TestSnapshotNotEmptyPgsql extends AbstractMigration
 {
     /**
      * Up Method.

diff --git a/tests/comparisons/Migration/pgsql/test_snapshot_plugin_blog_pgsql.php b/tests/comparisons/Migration/pgsql/test_snapshot_plugin_blog_pgsql.php
@@ -1,9 +1,9 @@
 <?php
 declare(strict_types=1);
 
-use Migrations\BaseMigration;
+use Migrations\AbstractMigration;
 
-class TestSnapshotPluginBlogPgsql extends BaseMigration
+class TestSnapshotPluginBlogPgsql extends AbstractMigration
 {
     /**
      * Up Method.

diff --git a/tests/comparisons/Migration/sqlite/test_snapshot_auto_id_disabled_sqlite.php b/tests/comparisons/Migration/sqlite/test_snapshot_auto_id_disabled_sqlite.php
@@ -1,9 +1,9 @@
 <?php
 declare(strict_types=1);
 
-use Migrations\BaseMigration;
+use Migrations\AbstractMigration;
 
-class TestSnapshotAutoIdDisabledSqlite extends BaseMigration
+class TestSnapshotAutoIdDisabledSqlite extends AbstractMigration
 {
     public bool $autoId = false;
 

diff --git a/tests/comparisons/Migration/sqlite/test_snapshot_not_empty_sqlite.php b/tests/comparisons/Migration/sqlite/test_snapshot_not_empty_sqlite.php
@@ -1,9 +1,9 @@
 <?php
 declare(strict_types=1);
 
-use Migrations\BaseMigration;
+use Migrations\AbstractMigration;
 
-class TestSnapshotNotEmptySqlite extends BaseMigration
+class TestSnapshotNotEmptySqlite extends AbstractMigration
 {
     /**
      * Up Method.

diff --git a/tests/comparisons/Migration/sqlite/test_snapshot_plugin_blog_sqlite.php b/tests/comparisons/Migration/sqlite/test_snapshot_plugin_blog_sqlite.php
@@ -1,9 +1,9 @@
 <?php
 declare(strict_types=1);
 
-use Migrations\BaseMigration;
+use Migrations\AbstractMigration;
 
-class TestSnapshotPluginBlogSqlite extends BaseMigration
+class TestSnapshotPluginBlogSqlite extends AbstractMigration
 {
     /**
      * Up Method.

diff --git a/tests/comparisons/Seeds/pgsql/testWithData.php b/tests/comparisons/Seeds/pgsql/testWithData.php
@@ -1,12 +1,12 @@
 <?php
 declare(strict_types=1);
 
-use Migrations\AbstractSeed;
+use Migrations\BaseSeed;
 
 /**
  * Events seed.
  */
-class EventsSeed extends AbstractSeed
+class EventsSeed extends BaseSeed
 {
     /**
      * Run Method.

diff --git a/tests/comparisons/Seeds/pgsql/testWithDataAndLimit.php b/tests/comparisons/Seeds/pgsql/testWithDataAndLimit.php
@@ -1,12 +1,12 @@
 <?php
 declare(strict_types=1);
 
-use Migrations\AbstractSeed;
+use Migrations\BaseSeed;
 
 /**
  * Events seed.
  */
-class EventsSeed extends AbstractSeed
+class EventsSeed extends BaseSeed
 {
     /**
      * Run Method.