prepare 5.x major release

.github/workflows/ci.yml

@@ -6,6 +6,7 @@ on:
       - 3.x
       - 4.x
       - 4.next
+      - 5.x
   pull_request:
     branches:
       - '*'
@@ -20,18 +21,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.1', '8.4']
+        php-version: ['8.2', '8.5']
         db-type: [mariadb, mysql, pgsql, sqlite]
         prefer-lowest: ['']
-        cake_version: ['']
+        legacy-tables: ['']
         include:
-          - php-version: '8.1'
+          - php-version: '8.2'
             db-type: 'sqlite'
             prefer-lowest: 'prefer-lowest'
           - php-version: '8.3'
             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
@@ -106,13 +111,9 @@ jobs:
       - name: Composer install
         run: |
           if [[ ${{ matrix.php-version }} == '8.2' || ${{ matrix.php-version }} == '8.3' || ${{ matrix.php-version }} == '8.4' ]]; then
-            composer install --ignore-platform-req=php
+            composer install
           elif ${{ matrix.prefer-lowest == 'prefer-lowest' }}; then
             composer update --prefer-lowest --prefer-stable
-          elif ${{ matrix.cake_version != '' }}; then
-            composer require --dev "cakephp/cakephp:${{ matrix.cake_version }}"
-            composer require --dev --with-all-dependencies "cakephp/bake:dev-3.next as 3.1.0"
-            composer update
           else
             composer update
           fi
@@ -139,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
@@ -151,11 +155,11 @@ jobs:
 
   testsuite-windows:
     runs-on: windows-2022
-    name: Windows - PHP 8.1 & SQL Server
+    name: Windows - PHP 8.2 & SQL Server
 
     env:
       EXTENSIONS: mbstring, intl, pdo_sqlsrv
-      PHP_VERSION: '8.1'
+      PHP_VERSION: '8.2'
 
     steps:
     - uses: actions/checkout@v6

.phive/phars.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpstan" version="2.1.17" installed="2.1.17" location="./tools/phpstan" copy="false"/>
+  <phar name="phpstan" version="2.1.33" installed="2.1.33" location="./tools/phpstan" copy="false"/>
 </phive>

README.md

@@ -1,13 +1,13 @@
 # Migrations plugin for CakePHP
 
 [![CI](https://github.com/cakephp/migrations/actions/workflows/ci.yml/badge.svg)](https://github.com/cakephp/migrations/actions/workflows/ci.yml)
-[![Coverage Status](https://img.shields.io/codecov/c/github/cakephp/migrations/3.x.svg?style=flat-square)](https://app.codecov.io/github/cakephp/migrations/tree/3.x)
+[![Coverage Status](https://img.shields.io/codecov/c/github/cakephp/migrations/5.x.svg?style=flat-square)](https://app.codecov.io/github/cakephp/migrations/tree/5.x)
 [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE.txt)
 [![Total Downloads](https://img.shields.io/packagist/dt/cakephp/migrations.svg?style=flat-square)](https://packagist.org/packages/cakephp/migrations)
 
 This is a Database Migrations system for CakePHP.
 
-The plugin consists of a CakePHP CLI wrapper for the [Phinx](https://book.cakephp.org/phinx/0/en/index.html) migrations library.
+The plugin provides a complete database migration solution with support for creating, running, and managing migrations.
 
 This branch is for use with CakePHP **5.x**. See [version map](https://github.com/cakephp/migrations/wiki#version-map) for details.
 
@@ -33,21 +33,6 @@ If you are using the PendingMigrations middleware, use:
 bin/cake plugin load Migrations
 ```
 
-### Enabling the builtin backend
-
-In a future release, migrations will be switching to a new backend based on the CakePHP ORM. We're aiming
-to be compatible with as many existing migrations as possible, and could use your feedback. Enable the
-new backend with:
-
-```php
-// in app/config/app_local.php
-$config = [
-    // Other configuration
-    'Migrations' => ['backend' => 'builtin'],
-];
-
-```
-
 ## Documentation
 
-Full documentation of the plugin can be found on the [CakePHP Cookbook](https://book.cakephp.org/migrations/4/).
+Full documentation of the plugin can be found on the [CakePHP Cookbook](https://book.cakephp.org/migrations/5/).

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "cakephp/migrations",
-    "description": "Database Migration plugin for CakePHP based on Phinx",
+    "description": "Database Migration plugin for CakePHP",
     "license": "MIT",
     "type": "cakephp-plugin",
     "keywords": [
@@ -22,17 +22,16 @@
         "source": "https://github.com/cakephp/migrations"
     },
     "require": {
-        "php": ">=8.1",
-        "cakephp/cache": "^5.2.9",
-        "cakephp/database": "^5.2.9",
-        "cakephp/orm": "^5.2.9",
-        "robmorgan/phinx": "^0.16.10"
+        "php": ">=8.2",
+        "cakephp/cache": "^5.3.0",
+        "cakephp/database": "^5.3.0",
+        "cakephp/orm": "^5.3.0"
     },
     "require-dev": {
         "cakephp/bake": "^3.3",
-        "cakephp/cakephp": "^5.2.9",
+        "cakephp/cakephp": "^5.3.0",
         "cakephp/cakephp-codesniffer": "^5.0",
-        "phpunit/phpunit": "^10.5.5 || ^11.1.3 || ^12.2.4"
+        "phpunit/phpunit": "^11.5.3 || ^12.1.3"
     },
     "suggest": {
         "cakephp/bake": "If you want to generate migrations.",
@@ -53,7 +52,9 @@
             "Migrator\\": "tests/test_app/Plugin/Migrator/src/",
             "SimpleSnapshot\\": "tests/test_app/Plugin/SimpleSnapshot/src/",
             "TestApp\\": "tests/test_app/App/",
-            "TestBlog\\": "tests/test_app/Plugin/TestBlog/src/"
+            "TestBlog\\": "tests/test_app/Plugin/TestBlog/src/",
+            "Blog\\": "tests/test_app/Plugin/Blog/src/",
+            "Migrator\\": "tests/test_app/Plugin/Migrator/src/"
         }
     },
     "config": {
@@ -67,8 +68,8 @@
             "@stan",
             "@test"
         ],
-        "cs-check": "phpcs -p",
-        "cs-fix": "phpcbf -p",
+        "cs-check": "phpcs --parallel=16 -p",
+        "cs-fix": "phpcbf --parallel=16 -p",
         "phpstan": "tools/phpstan analyse",
         "stan": "@phpstan",
         "stan-baseline": "tools/phpstan --generate-baseline",

config/app.example.php

@@ -6,8 +6,8 @@
 
 return [
     'Migrations' => [
-        'backend' => 'builtin',
-        'unsigned_primary_keys' => null,
-        'column_null_default' => null,
+        'unsigned_primary_keys' => null, // Default false
+        'unsigned_ints' => null, // Default false, make sure this is aligned with the above config
+        'column_null_default' => null, // Default false
     ],
 ];

docs/en/index.rst

@@ -3,7 +3,7 @@ Migrations
 
 Migrations is a plugin that lets you track changes to your database schema over
 time as PHP code that accompanies your application. This lets you ensure each
-environment your application runs in can has the appropriate schema by applying
+environment your application runs in has the appropriate schema by applying
 migrations.
 
 Instead of writing schema modifications in SQL, this plugin allows you to
@@ -43,6 +43,12 @@ your application in your **config/app.php** file as explained in the `Database
 Configuration section
 <https://book.cakephp.org/5/en/orm/database-basics.html#database-configuration>`__.
 
+Upgrading from 4.x
+==================
+
+If you are upgrading from Migrations 4.x, please see the :doc:`upgrading` guide
+for breaking changes and migration steps.
+
 Overview
 ========
 
@@ -218,7 +224,7 @@ also edit the migration after generation to add or customize the columns
 
 Columns on the command line follow the following pattern::
 
-    fieldName:fieldType?[length]:indexType:indexName
+    fieldName:fieldType?[length]:default[value]:indexType:indexName
 
 For instance, the following are all valid ways of specifying an email field:
 
@@ -238,6 +244,16 @@ Columns with a question mark after the fieldType will make the column nullable.
 
 The ``length`` part is optional and should always be written between bracket.
 
+The ``default[value]`` part is optional and sets the default value for the column.
+Supported value types include:
+
+* Booleans: ``true`` or ``false`` - e.g., ``active:boolean:default[true]``
+* Integers: ``0``, ``123``, ``-456`` - e.g., ``count:integer:default[0]``
+* Floats: ``1.5``, ``-2.75`` - e.g., ``rate:decimal:default[1.5]``
+* Strings: ``'hello'`` or ``"world"`` (quoted) - e.g., ``status:string:default['pending']``
+* Null: ``null`` or ``NULL`` - e.g., ``description:text?:default[null]``
+* SQL expressions: ``CURRENT_TIMESTAMP`` - e.g., ``created_at:datetime:default[CURRENT_TIMESTAMP]``
+
 Fields named ``created`` and ``modified``, as well as any field with a ``_at``
 suffix, will automatically be set to the type ``datetime``.
 
@@ -318,6 +334,39 @@ will generate::
         }
     }
 
+Adding a column with a default value
+-------------------------------------
+
+You can specify default values for columns using the ``default[value]`` syntax:
+
+.. code-block:: bash
+
+    bin/cake bake migration AddActiveToUsers active:boolean:default[true]
+
+will generate::
+
+    <?php
+    use Migrations\BaseMigration;
+
+    class AddActiveToUsers extends BaseMigration
+    {
+        public function change(): void
+        {
+            $table = $this->table('users');
+            $table->addColumn('active', 'boolean', [
+                'default' => true,
+                'null' => false,
+            ]);
+            $table->update();
+        }
+    }
+
+You can combine default values with other options like nullable and indexes:
+
+.. code-block:: bash
+
+    bin/cake bake migration AddStatusToOrders status:string:default['pending']:unique
+
 Altering a column
 -----------------
 
@@ -419,8 +468,8 @@ for use in unit tests), you can use the ``--generate-only`` flag:
 
     bin/cake bake migration_snapshot Initial --generate-only
 
-This will create the migration file but will not add an entry to the phinxlog
-table, allowing you to move the file to a different location without causing
+This will create the migration file but will not add an entry to the migrations
+tracking table, allowing you to move the file to a different location without causing
 "MISSING" status issues.
 
 The same logic will be applied implicitly if you wish to bake a snapshot for a
@@ -554,15 +603,15 @@ Cleaning up missing migrations
 -------------------------------
 
 Sometimes migration files may be deleted from the filesystem but still exist
-in the phinxlog table. These migrations will be marked as **MISSING** in the
-status output. You can remove these entries from the phinxlog table using the
+in the migrations tracking table. These migrations will be marked as **MISSING** in the
+status output. You can remove these entries from the tracking table using the
 ``--cleanup`` option:
 
 .. code-block:: bash
 
     bin/cake migrations status --cleanup
 
-This will remove all migration entries from the phinxlog table that no longer
+This will remove all migration entries from the tracking table that no longer
 have corresponding migration files in the filesystem.
 
 Marking a migration as migrated
@@ -795,9 +844,10 @@ pass them to the method::
 Feature Flags
 =============
 
-Migrations offers a few feature flags to compatibility with phinx. These features are disabled by default but can be enabled if required:
+Migrations offers a few feature flags for compatibility. These features are disabled by default but can be enabled if required:
 
 * ``unsigned_primary_keys``: Should Migrations create primary keys as unsigned integers? (default: ``false``)
+* ``unsigned_ints``: Should Migrations create all integer columns as unsigned? (default: ``false``)
 * ``column_null_default``: Should Migrations create columns as null by default? (default: ``false``)
 * ``add_timestamps_use_datetime``: Should Migrations use ``DATETIME`` type
   columns for the columns added by ``addTimestamps()``.
@@ -806,9 +856,18 @@ Set them via Configure to enable (e.g. in ``config/app.php``)::
 
     'Migrations' => [
         'unsigned_primary_keys' => true,
+        'unsigned_ints' => true,
         'column_null_default' => true,
     ],
 
+.. note::
+
+    The ``unsigned_primary_keys`` and ``unsigned_ints`` options only affect MySQL databases.
+    When generating migrations with ``bake migration_snapshot`` or ``bake migration_diff``,
+    the ``signed`` attribute will only be included in the output for unsigned columns
+    (as ``'signed' => false``). Signed is the default for integer columns in MySQL, so
+    ``'signed' => true`` is never output.
+
 Skipping the ``schema.lock`` file generation
 ============================================