Merge pull request #327 from cakephp/5.x-orm-query

add rector to transform ORM\Query to ORM\Query\SelectQuery

Author: ADmad

config/rector/sets/cakephp53.php

@@ -4,12 +4,16 @@
 use Cake\Upgrade\Rector\Rector\MethodCall\EntityIsEmptyRector;
 use Rector\Config\RectorConfig;
 use Rector\Renaming\Rector\MethodCall\RenameMethodRector;
+use Rector\Renaming\Rector\Name\RenameClassRector;
 use Rector\Renaming\ValueObject\MethodCallRename;
 
 # @see https://book.cakephp.org/5/en/appendices/5-3-migration-guide.html
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->ruleWithConfiguration(RenameMethodRector::class, [
         new MethodCallRename('Cake\Database\Query', 'newExpr', 'expr'),
     ]);
+    $rectorConfig->ruleWithConfiguration(RenameClassRector::class, [
+        'Cake\ORM\Query' => 'Cake\ORM\Query\SelectQuery',
+    ]);
     $rectorConfig->rule(EntityIsEmptyRector::class);
 };

phpcs.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0"?>
 <ruleset name="CakePHP Upgrade">
-    <config name="installed_paths" value="../../cakephp/cakephp-codesniffer"/>
-
     <rule ref="CakePHP"/>
 
     <exclude-pattern>tests/test_apps</exclude-pattern>

tests/test_apps/original/RectorCommand-testApply53/src/SomeTest.php

@@ -5,6 +5,7 @@
 
 use Cake\ORM\Entity;
 use Cake\ORM\Locator\LocatorAwareTrait;
+use Cake\ORM\Query;
 
 class SomeTest
 {
@@ -18,4 +19,8 @@ public function testRenames(): void
         $table = $this->fetchTable('Articles');
         $expr = $table->find()->newExpr();
     }
+
+    public function findSomething(Query $query, array $options): Query {
+        return $query;
+    }
 }

tests/test_apps/upgraded/RectorCommand-testApply53/src/SomeTest.php

@@ -5,6 +5,7 @@
 
 use Cake\ORM\Entity;
 use Cake\ORM\Locator\LocatorAwareTrait;
+use Cake\ORM\Query;
 
 class SomeTest
 {
@@ -18,4 +19,8 @@ public function testRenames(): void
         $table = $this->fetchTable('Articles');
         $expr = $table->find()->expr();
     }
+
+    public function findSomething(\Cake\ORM\Query\SelectQuery $query, array $options): \Cake\ORM\Query\SelectQuery {
+        return $query;
+    }
 }