cakephp
diff --git a/‎.github/workflows/ci.yml‎
Lines changed: 8 additions & 0 deletions b/‎.github/workflows/ci.yml‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎docs/en/upgrading-to-builtin-backend.rst‎
Lines changed: 89 additions & 0 deletions b/‎docs/en/upgrading-to-builtin-backend.rst‎
Lines changed: 89 additions & 0 deletions
diff --git a/‎src/Command/BakeMigrationDiffCommand.php‎
Lines changed: 3 additions & 0 deletions b/‎src/Command/BakeMigrationDiffCommand.php‎
Lines changed: 3 additions & 0 deletions
@@ -24,6 +24,7 @@ jobs:
         php-version: ['8.2', '8.5']
         db-type: [mariadb, mysql, pgsql, sqlite]
         prefer-lowest: ['']
+        legacy-tables: ['']
         include:
           - php-version: '8.2'
             db-type: 'sqlite'
@@ -32,6 +33,10 @@ jobs:
             db-type: 'mysql'
           - php-version: '8.3'
             db-type: 'pgsql'
+          # Test unified cake_migrations table (non-legacy mode)
+          - php-version: '8.3'
+            db-type: 'mysql'
+            legacy-tables: 'false'
     services:
       postgres:
         image: postgres
@@ -135,6 +140,9 @@ jobs:
             export DB_URL='postgres://postgres:pg-password@127.0.0.1/cakephp_test'
             export DB_URL_SNAPSHOT='postgres://postgres:pg-password@127.0.0.1/cakephp_snapshot'
           fi
+          if [[ -n '${{ matrix.legacy-tables }}' ]]; then
+            export LEGACY_TABLES='${{ matrix.legacy-tables }}'
+          fi
           if [[ ${{ matrix.php-version }} == '8.1' && ${{ matrix.db-type }} == 'mysql' ]]; then
             vendor/bin/phpunit --coverage-clover=coverage.xml
           else
 
@@ -102,6 +102,95 @@ Similar changes are for fetching a single row::
     $stmt = $this->getAdapter()->query('SELECT * FROM articles');
     $rows = $stmt->fetch('assoc');
 
+Unified Migrations Table
+========================
+
+As of migrations 5.x, there is a new unified ``cake_migrations`` table that
+replaces the legacy ``phinxlog`` tables. This provides several benefits:
+
+- **Single table for all migrations**: Instead of separate ``phinxlog`` (app)
+  and ``{plugin}_phinxlog`` (plugins) tables, all migrations are tracked in
+  one ``cake_migrations`` table with a ``plugin`` column.
+- **Simpler database schema**: Fewer migration tracking tables to manage.
+- **Better plugin support**: Plugin migrations are properly namespaced.
+
+Backward Compatibility
+----------------------
+
+For existing applications with ``phinxlog`` tables:
+
+- **Automatic detection**: If any ``phinxlog`` table exists, migrations will
+  continue using the legacy tables automatically.
+- **No forced migration**: Existing applications don't need to change anything.
+- **Opt-in upgrade**: You can migrate to the new table when you're ready.
+
+Configuration
+-------------
+
+The ``Migrations.legacyTables`` configuration option controls the behavior:
+
+.. code-block:: php
+
+    // config/app.php or config/app_local.php
+    'Migrations' => [
+        // null (default): Autodetect - use legacy if phinxlog tables exist
+        // false: Force use of new cake_migrations table
+        // true: Force use of legacy phinxlog tables
+        'legacyTables' => null,
+    ],
+
+Upgrading to the Unified Table
+------------------------------
+
+To migrate from ``phinxlog`` tables to the new ``cake_migrations`` table:
+
+1. **Preview the upgrade** (dry run):
+
+   .. code-block:: bash
+
+       bin/cake migrations upgrade --dry-run
+
+2. **Run the upgrade**:
+
+   .. code-block:: bash
+
+       bin/cake migrations upgrade
+
+3. **Update your configuration**:
+
+   .. code-block:: php
+
+       // config/app.php
+       'Migrations' => [
+           'legacyTables' => false,
+       ],
+
+4. **Optionally drop phinx tables**: Your migration history is preserved
+   by default. Use ``--drop-tables`` to drop the ``phinxlog``tables after
+   verifying your migrations run correctly.
+
+   .. code-block:: bash
+
+       bin/cake migrations upgrade --drop-tables
+
+Rolling Back
+------------
+
+If you need to revert to phinx tables after upgrading:
+
+1. Set ``'legacyTables' => true`` in your configuration.
+
+.. warning::
+
+    You cannot rollback after running ``upgrade --drop-tables``.
+
+
+New Installations
+-----------------
+
+For new applications without any existing ``phinxlog`` tables, the unified
+``cake_migrations`` table is used automatically. No configuration is needed.
+
 Problems with the builtin backend?
 ==================================
 
 
@@ -584,6 +584,9 @@ protected function getCurrentSchema(): array
             if (preg_match('/^.*phinxlog$/', $table) === 1) {
                 continue;
             }
+            if ($table === 'cake_migrations' || $table === 'cake_seeds') {
+                continue;
+            }
 
             $schema[$table] = $collection->describe($table);
         }
Original file line number	Diff line number	Diff line change
`@@ -584,6 +584,9 @@ protected function getCurrentSchema(): array`
`584`	`584`	`if (preg_match('/^.*phinxlog$/', $table) === 1) {`
`585`	`585`	`continue;`
`586`	`586`	`}`
	`587`	`+ if ($table === 'cake_migrations' \|\| $table === 'cake_seeds') {`
	`588`	`+ continue;`
	`589`	`+ }`
`587`	`590`
`588`	`591`	`$schema[$table] = $collection->describe($table);`
`589`	`592`	`}`