Merge branch '5.x' into 5.x-routebuilder-named-args

dereuromark · web-flow · commit 8d60f3c2132c · 2025-11-26T21:11:33.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,7 +24,7 @@ jobs:
             prefer-lowest: 'prefer-lowest'
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -78,7 +78,7 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
diff --git a/README.md b/README.md
@@ -103,6 +103,7 @@ The upgrade tool also includes rulesets for related tools and libraries:
 
 - **chronos3** - Upgrade to Chronos 3.x
 - **migrations45** - Upgrade to Migrations 4.5
+- **migrations50** - Upgrade to Migrations 5.0
 - **phpunit80** - Upgrade to PHPUnit 8.0
 
 ```bash
@@ -114,6 +115,9 @@ bin/cake upgrade rector --rules chronos3 /path/to/your/app/src
 # Apply Migrations 4.5 upgrade rules
 bin/cake upgrade rector --rules migrations45 /path/to/your/app/config
 
+# Apply Migrations 5.0 upgrade rules
+bin/cake upgrade rector --rules migrations50 /path/to/your/app/config
+
 # Apply PHPUnit 8.0 upgrade rules
 bin/cake upgrade rector --rules phpunit80 /path/to/your/app/tests
 ```
diff --git a/config/rector/migrations50.php b/config/rector/migrations50.php
@@ -0,0 +1,9 @@
+<?php
+declare(strict_types=1);
+
+use Cake\Upgrade\Rector\Set\CakePHPSetList;
+use Rector\Config\RectorConfig;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->sets([CakePHPSetList::MIGRATIONS_50]);
+};
diff --git a/config/rector/sets/migrations50.php b/config/rector/sets/migrations50.php
@@ -0,0 +1,50 @@
+<?php
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Rector\Renaming\Rector\ClassConstFetch\RenameClassConstFetchRector;
+use Rector\Renaming\ValueObject\RenameClassConstFetch;
+
+/**
+ * @see https://github.com/cakephp/migrations/releases/5.0.0/
+ */
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->ruleWithConfiguration(RenameClassConstFetchRector::class, [
+        // Standard types
+        new RenameClassConstFetch('Migrations\Db\Adapter\AdapterInterface', 'PHINX_TYPE_STRING', 'TYPE_STRING'),
+        new RenameClassConstFetch('Migrations\Db\Adapter\AdapterInterface', 'PHINX_TYPE_CHAR', 'TYPE_CHAR'),
+        new RenameClassConstFetch('Migrations\Db\Adapter\AdapterInterface', 'PHINX_TYPE_TEXT', 'TYPE_TEXT'),
+        new RenameClassConstFetch('Migrations\Db\Adapter\AdapterInterface', 'PHINX_TYPE_INTEGER', 'TYPE_INTEGER'),
+        new RenameClassConstFetch('Migrations\Db\Adapter\AdapterInterface', 'PHINX_TYPE_TINY_INTEGER', 'TYPE_TINYINTEGER'),
+        new RenameClassConstFetch('Migrations\Db\Adapter\AdapterInterface', 'PHINX_TYPE_SMALL_INTEGER', 'TYPE_SMALLINTEGER'),
+        new RenameClassConstFetch('Migrations\Db\Adapter\AdapterInterface', 'PHINX_TYPE_BIG_INTEGER', 'TYPE_BIGINTEGER'),
+        new RenameClassConstFetch('Migrations\Db\Adapter\AdapterInterface', 'PHINX_TYPE_FLOAT', 'TYPE_FLOAT'),
+        new RenameClassConstFetch('Migrations\Db\Adapter\AdapterInterface', 'PHINX_TYPE_DECIMAL', 'TYPE_DECIMAL'),
+        new RenameClassConstFetch('Migrations\Db\Adapter\AdapterInterface', 'PHINX_TYPE_DATETIME', 'TYPE_DATETIME'),
+        new RenameClassConstFetch('Migrations\Db\Adapter\AdapterInterface', 'PHINX_TYPE_TIMESTAMP', 'TYPE_TIMESTAMP'),
+        new RenameClassConstFetch('Migrations\Db\Adapter\AdapterInterface', 'PHINX_TYPE_TIME', 'TYPE_TIME'),
+        new RenameClassConstFetch('Migrations\Db\Adapter\AdapterInterface', 'PHINX_TYPE_DATE', 'TYPE_DATE'),
+        new RenameClassConstFetch('Migrations\Db\Adapter\AdapterInterface', 'PHINX_TYPE_BINARY', 'TYPE_BINARY'),
+        new RenameClassConstFetch('Migrations\Db\Adapter\AdapterInterface', 'PHINX_TYPE_BINARYUUID', 'TYPE_BINARY_UUID'),
+        new RenameClassConstFetch('Migrations\Db\Adapter\AdapterInterface', 'PHINX_TYPE_BOOLEAN', 'TYPE_BOOLEAN'),
+        new RenameClassConstFetch('Migrations\Db\Adapter\AdapterInterface', 'PHINX_TYPE_JSON', 'TYPE_JSON'),
+        new RenameClassConstFetch('Migrations\Db\Adapter\AdapterInterface', 'PHINX_TYPE_UUID', 'TYPE_UUID'),
+        new RenameClassConstFetch('Migrations\Db\Adapter\AdapterInterface', 'PHINX_TYPE_NATIVEUUID', 'TYPE_NATIVE_UUID'),
+
+        // Geospatial types
+        new RenameClassConstFetch('Migrations\Db\Adapter\AdapterInterface', 'PHINX_TYPE_GEOMETRY', 'TYPE_GEOMETRY'),
+        new RenameClassConstFetch('Migrations\Db\Adapter\AdapterInterface', 'PHINX_TYPE_POINT', 'TYPE_POINT'),
+        new RenameClassConstFetch('Migrations\Db\Adapter\AdapterInterface', 'PHINX_TYPE_LINESTRING', 'TYPE_LINESTRING'),
+        new RenameClassConstFetch('Migrations\Db\Adapter\AdapterInterface', 'PHINX_TYPE_POLYGON', 'TYPE_POLYGON'),
+
+        // Geospatial array constant
+        new RenameClassConstFetch('Migrations\Db\Adapter\AdapterInterface', 'PHINX_TYPES_GEOSPATIAL', 'TYPES_GEOSPATIAL'),
+
+        // Database-specific types
+        new RenameClassConstFetch('Migrations\Db\Adapter\AdapterInterface', 'PHINX_TYPE_YEAR', 'TYPE_YEAR'),
+        new RenameClassConstFetch('Migrations\Db\Adapter\AdapterInterface', 'PHINX_TYPE_CIDR', 'TYPE_CIDR'),
+        new RenameClassConstFetch('Migrations\Db\Adapter\AdapterInterface', 'PHINX_TYPE_INET', 'TYPE_INET'),
+        new RenameClassConstFetch('Migrations\Db\Adapter\AdapterInterface', 'PHINX_TYPE_MACADDR', 'TYPE_MACADDR'),
+        new RenameClassConstFetch('Migrations\Db\Adapter\AdapterInterface', 'PHINX_TYPE_INTERVAL', 'TYPE_INTERVAL'),
+    ]);
+};
diff --git a/src/Command/RectorCommand.php b/src/Command/RectorCommand.php
@@ -83,10 +83,11 @@ protected function runRector(ConsoleIo $io, Arguments $args, string $autoload):
 
         $cmdPath = ROOT . '/vendor/bin/rector process';
         $command = sprintf(
-            '%s %s %s --autoload-file=%s --config=%s %s --clear-cache',
+            '%s %s %s %s --autoload-file=%s --config=%s %s --clear-cache',
             $cmdPath,
             $args->getOption('dry-run') ? '--dry-run' : '',
-            $args->getOption('verbose') ? '-vvvv' : '',
+            $args->getOption('verbose') ? '--debug' : '',
+            $args->getOption('no-diff') ? '--no-diff' : '',
             escapeshellarg($autoload),
             escapeshellarg($config),
             escapeshellarg($path),
@@ -199,6 +200,10 @@ protected function buildOptionParser(ConsoleOptionParser $parser): ConsoleOption
             ->addOption('dry-run', [
                 'help' => 'Enable to get a preview of what modifications will be applied.',
                 'boolean' => true,
+            ])
+            ->addOption('no-diff', [
+                'help' => 'Disable rector diff output which can cause issues with large files.',
+                'boolean' => true,
             ]);
 
         return $parser;
diff --git a/src/Rector/Rector/MethodCall/StaticConnectionHelperRector.php b/src/Rector/Rector/MethodCall/StaticConnectionHelperRector.php
@@ -51,10 +51,10 @@ public function refactor(Node $node): ?Node
                 $parent = $node->getAttribute(AttributeKey::PARENT_NODE);
                 if ($parent instanceof Expression) {
                     $this->removeNode($parent);
-
-                    return null;
                 }
             }
+
+            return null;
         }
 
         // Ensure the node is a method call on the ConnectionHelper instance
diff --git a/src/Rector/Rector/Namespace_/AppUsesStaticCallToUseStatementRector.php b/src/Rector/Rector/Namespace_/AppUsesStaticCallToUseStatementRector.php
@@ -15,7 +15,6 @@
 use PhpParser\NodeVisitor;
 use PHPStan\Type\ObjectType;
 use Rector\Contract\PhpParser\Node\StmtsAwareInterface;
-use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\PhpParser\Node\BetterNodeFinder;
 use Rector\PhpParser\Node\CustomNode\FileWithoutNamespace;
 use Rector\PhpParser\Node\Value\ValueResolver;
@@ -128,8 +127,13 @@ function (Node $subNode) use ($node, $appUsesStaticCalls, &$currentStmt) {
                     return null;
                 }
 
-                /** @var \PhpParser\Node\Stmt $currentStmt */
-                unset($node->stmts[$currentStmt->getAttribute(AttributeKey::STMT_KEY)]);
+                foreach ($node->stmts as $key => $stmt) {
+                    if ($stmt === $currentStmt) {
+                        unset($node->stmts[$key]);
+
+                        return null;
+                    }
+                }
 
                 return null;
             },
diff --git a/src/Rector/Set/CakePHPSetList.php b/src/Rector/Set/CakePHPSetList.php
@@ -95,6 +95,11 @@ final class CakePHPSetList
      */
     public const MIGRATIONS_45 = __DIR__ . '/../../../config/rector/sets/migrations45.php';
 
+    /**
+     * @var string
+     */
+    public const MIGRATIONS_50 = __DIR__ . '/../../../config/rector/sets/migrations50.php';
+
     /**
      * @var string
      */
diff --git a/tests/TestCase/Command/RectorCommandTest.php b/tests/TestCase/Command/RectorCommandTest.php
@@ -68,6 +68,16 @@ public function testApplyAppDir()
         $this->assertOutputContains('Rector applied successfully');
     }
 
+    public function testApplyNoDiff()
+    {
+        $this->setupTestApp(__FUNCTION__);
+        $this->exec('upgrade rector --rules cakephp40 --dry-run --no-diff ' . TEST_APP);
+
+        $this->assertExitSuccess();
+        $this->assertOutputNotContains('begin diff');
+        $this->assertOutputContains('Rector applied successfully');
+    }
+
     /**
      * @return void
      */

Original file line number	Diff line number	Diff line change
`@@ -51,10 +51,10 @@ public function refactor(Node $node): ?Node`
`51`	`51`	`$parent = $node->getAttribute(AttributeKey::PARENT_NODE);`
`52`	`52`	`if ($parent instanceof Expression) {`
`53`	`53`	`$this->removeNode($parent);`
`54`		`-`
`55`		`- return null;`
`56`	`54`	`}`
`57`	`55`	`}`
	`56`	`+`
	`57`	`+ return null;`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`// Ensure the node is a method call on the ConnectionHelper instance`