Merge branch 'cakephp:0.x' into issue-2386

Author: lutdev

.github/workflows/ci.yml

@@ -64,7 +64,7 @@ jobs:
       run: echo "date=$(date +'%Y-%m')" >> $GITHUB_OUTPUT
 
     - name: Cache composer dependencies
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
         key: ${{ runner.os }}-composer-${{ steps.key-date.outputs.date }}-${{ hashFiles('composer.json') }}-${{ matrix.prefer-lowest }}
@@ -141,7 +141,7 @@ jobs:
         key: ${{ steps.key-date.outputs.date }}
 
     - name: Cache PHP extensions
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: ${{ steps.php-ext-cache.outputs.dir }}
         key: ${{ runner.os }}-php-ext-${{ steps.php-ext-cache.outputs.key }}
@@ -167,7 +167,7 @@ jobs:
       run: echo "dir=$(composer config cache-files-dir)" >> $env:GITHUB_OUTPUT
 
     - name: Cache composer dependencies
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
         key: ${{ runner.os }}-composer-${{ steps.key-date.outputs.date }}-${{ hashFiles('composer.json') }}-${{ matrix.prefer-lowest }}
@@ -209,7 +209,7 @@ jobs:
       run: echo "date=$(date +'%Y-%m')" >> $GITHUB_OUTPUT
 
     - name: Cache composer dependencies
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
         key: ${{ runner.os }}-composer-${{ steps.key-date.outputs.date }}-${{ hashFiles('composer.json') }}

.github/workflows/phar.yml

@@ -22,7 +22,7 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}

composer.json

@@ -40,16 +40,16 @@
         "composer-runtime-api": "^2.0",
         "cakephp/database": "^5.0.2",
         "psr/container": "^1.1|^2.0",
-        "symfony/config": "^4.0|^5.0|^6.0|^7.0",
-        "symfony/console": "^6.0|^7.0"
+        "symfony/config": "^4.0|^5.0|^6.0|^7.0|^8.0",
+        "symfony/console": "^6.0|^7.0|^8.0"
     },
     "require-dev": {
         "ext-json": "*",
         "ext-pdo": "*",
         "cakephp/cakephp-codesniffer": "^5.0",
         "cakephp/i18n": "^5.0",
         "phpunit/phpunit": "^10.5",
-        "symfony/yaml": "^4.0|^5.0|^6.0|^7.0"
+        "symfony/yaml": "^4.0|^5.0|^6.0|^7.0|^8.0"
     },
     "autoload": {
         "psr-4": {

docs/en/configuration.rst

@@ -562,7 +562,8 @@ For some breaking changes, Phinx offers a way to opt-out of new behavior. The fo
 * ``column_null_default``: Should Phinx create columns as null by default? (default: ``true``)
 
 Since MySQL ``TIMESTAMP`` fields do not support dates past 2038-01-19, you have the option to use ``DATETIME`` field
-types for fields created by the ``addTimestamps()`` function:
+types for fields created by the ``addTimestamps()`` function. This setting also affects the start_time and end_time 
+columns in the schema table:
 
 * ``add_timestamps_use_datetime``: Should Phinx create created_at and updated_at fields as datetime? (default: ``false``)
 

phpstan-baseline.neon

@@ -4,3 +4,9 @@ parameters:
 			message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
 			count: 1
 			path: src/Phinx/Db/Adapter/MysqlAdapter.php
+
+		-
+			message: "#^Call to an undefined static method Symfony\\\\Component\\\\Console\\\\Application\\:\\:addCommand\\(\\)\\.$#"
+			count: 1
+			path: src/Phinx/Console/PhinxApplication.php
+			reportUnmatched: false

src/Phinx/Config/FeatureFlags.php

@@ -24,6 +24,7 @@ class FeatureFlags
     public static bool $columnNullDefault = true;
     /**
      * @var bool Should Phinx create datetime columns for addTimestamps instead of timestamp?
+     * Also affects start_time and end_time column types in schema table.
      */
     public static bool $addTimestampsUseDateTime = false;
 

src/Phinx/Console/PhinxApplication.php

@@ -20,6 +20,7 @@
 use Phinx\Console\Command\Status;
 use Phinx\Console\Command\Test;
 use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -90,6 +91,25 @@ public function doRun(InputInterface $input, OutputInterface $output): int
         return parent::doRun($input, $output);
     }
 
+    /**
+     * Adds a command object.
+     *
+     * Provides backwards compatibility for Symfony Console 6.x/7.x where
+     * the add() method exists, and Symfony 8.x where it was removed in
+     * favor of addCommand().
+     *
+     * @param \Symfony\Component\Console\Command\Command $command A Command object
+     * @return \Symfony\Component\Console\Command\Command|null
+     */
+    public function add(Command $command): ?Command
+    {
+        if (method_exists(Application::class, 'addCommand')) {
+            return parent::addCommand($command);
+        }
+
+        return parent::add($command);
+    }
+
     /**
      * Get the current application version.
      *

src/Phinx/Db/Adapter/AbstractAdapter.php

@@ -10,6 +10,7 @@
 
 use Exception;
 use InvalidArgumentException;
+use Phinx\Config\FeatureFlags;
 use Phinx\Db\Table;
 use Phinx\Db\Table\Column;
 use Phinx\Util\Literal;
@@ -307,11 +308,15 @@ public function createSchemaTable(): void
                 'primary_key' => 'version',
             ];
 
+            $columnType = FeatureFlags::$addTimestampsUseDateTime
+                ? AdapterInterface::PHINX_TYPE_DATETIME
+                : AdapterInterface::PHINX_TYPE_TIMESTAMP;
+
             $table = new Table($this->getSchemaTableName(), $options, $this);
             $table->addColumn('version', 'biginteger', ['null' => false])
                 ->addColumn('migration_name', 'string', ['limit' => 100, 'default' => null, 'null' => true])
-                ->addColumn('start_time', 'timestamp', ['default' => null, 'null' => true])
-                ->addColumn('end_time', 'timestamp', ['default' => null, 'null' => true])
+                ->addColumn('start_time', $columnType, ['default' => null, 'null' => true])
+                ->addColumn('end_time', $columnType, ['default' => null, 'null' => true])
                 ->addColumn('breakpoint', 'boolean', ['default' => false, 'null' => false])
                 ->save();
         } catch (Exception $exception) {

src/Phinx/Db/Table.php

@@ -295,7 +295,21 @@ public function reset(): void
      *
      * @param string|\Phinx\Db\Table\Column $columnName Column Name
      * @param string|\Phinx\Util\Literal|null $type Column Type
-     * @param array<string, mixed> $options Column Options
+     * @param array{
+     *  limit?: int,
+     *  length?: int,
+     *  default?: mixed,
+     *  null?: bool,
+     *  after?: string,
+     *  comment?: string,
+     *  precision?: int,
+     *  scale?: int,
+     *  signed?: bool,
+     *  values?: mixed,
+     *  identity?: bool,
+     *  update?: string,
+     *  timezone?: bool,
+     * } $options Column Options
      * @throws \InvalidArgumentException
      * @return $this
      */
@@ -358,7 +372,21 @@ public function renameColumn(string $oldName, string $newName)
      *
      * @param string $columnName Column Name
      * @param string|\Phinx\Db\Table\Column|\Phinx\Util\Literal $newColumnType New Column Type
-     * @param array<string, mixed> $options Options
+     * @param array{
+     *  limit?: int,
+     *  length?: int,
+     *  default?: mixed,
+     *  null?: bool,
+     *  after?: string,
+     *  comment?: string,
+     *  precision?: int,
+     *  scale?: int,
+     *  signed?: bool,
+     *  values?: mixed,
+     *  identity?: bool,
+     *  update?: string,
+     *  timezone?: bool,
+     * } $options Options
      * @return $this
      */
     public function changeColumn(string $columnName, string|Column|Literal $newColumnType, array $options = [])