cakephp · LordSimal · Dec 3, 2023 · Dec 2, 2023 · Dec 2, 2023
diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
         "php": "^8.1",
         "cakephp/console": "5.x-dev",
         "nette/utils": "^3.2",
-        "rector/rector": "0.17.13",
+        "rector/rector": "0.18.11",
         "symfony/string": "^6.0"
     },
     "autoload": {
@@ -35,13 +35,6 @@
             "rector/extension-installer": true
         }
     },
-    "extra": {
-        "rector": {
-            "includes": [
-                "config/rector/config.php"
-            ]
-        }
-    },
     "support": {
         "source": "https://github.com/cakephp/upgrade"
     }

diff --git a/config/rector/config.php b/config/rector/config.php
diff --git a/config/rector/sets/cakephp-fluent-options.php b/config/rector/sets/cakephp-fluent-options.php
@@ -7,7 +7,6 @@
 use Rector\Config\RectorConfig;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->import(__DIR__ . '/../config.php');
     $rectorConfig->ruleWithConfiguration(ArrayToFluentCallRector::class, [
         ArrayToFluentCallRector::ARRAYS_TO_FLUENT_CALLS => [
             new ArrayToFluentCall('Cake\ORM\Association', [

diff --git a/config/rector/sets/cakephp30.php b/config/rector/sets/cakephp30.php
@@ -6,7 +6,6 @@
 use Rector\Renaming\Rector\Name\RenameClassRector;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->import(__DIR__ . '/../config.php');
     # @see https://github.com/cakephp/upgrade/tree/master/src/Shell/Task
     $rectorConfig->rule(AppUsesStaticCallToUseStatementRector::class);
 

diff --git a/config/rector/sets/cakephp34.php b/config/rector/sets/cakephp34.php
@@ -16,7 +16,6 @@
 use Rector\Visibility\ValueObject\ChangeMethodVisibility;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->import(__DIR__ . '/../config.php');
     $rectorConfig->ruleWithConfiguration(PropertyFetchToMethodCallRector::class, [
         // source: https://book.cakephp.org/3.0/en/appendices/3-4-migration-guide.html
         new PropertyFetchToMethodCall('Cake\Network\Request', 'params', 'getAttribute', null, ['params']),

diff --git a/config/rector/sets/cakephp35.php b/config/rector/sets/cakephp35.php
@@ -10,7 +10,6 @@
 
 # source: https://book.cakephp.org/3.0/en/appendices/3-5-migration-guide.html
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->import(__DIR__ . '/../config.php');
     $rectorConfig->ruleWithConfiguration(RenameClassRector::class, [
         'Cake\Http\Client\CookieCollection' => 'Cake\Http\Cookie\CookieCollection',
         'Cake\Console\ShellDispatcher' => 'Cake\Console\CommandRunner',

diff --git a/config/rector/sets/cakephp36.php b/config/rector/sets/cakephp36.php
@@ -9,7 +9,6 @@
 use Rector\Transform\ValueObject\PropertyFetchToMethodCall;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->import(__DIR__ . '/../config.php');
     # source: https://book.cakephp.org/3.0/en/appendices/3-6-migration-guide.html
     $rectorConfig->ruleWithConfiguration(RenameMethodRector::class, [
         new MethodCallRename('Cake\ORM\Table', 'association', 'getAssociation'),

diff --git a/config/rector/sets/cakephp37.php b/config/rector/sets/cakephp37.php
@@ -14,7 +14,6 @@
 
 # source: https://book.cakephp.org/3.0/en/appendices/3-7-migration-guide.html
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->import(__DIR__ . '/../config.php');
     $rectorConfig->ruleWithConfiguration(RenameMethodRector::class, [
         new MethodCallRename('Cake\Form\Form', 'errors', 'getErrors'),
         new MethodCallRename('Cake\Validation\Validation', 'cc', 'creditCard'),

diff --git a/config/rector/sets/cakephp38.php b/config/rector/sets/cakephp38.php
@@ -8,7 +8,6 @@
 # source: https://book.cakephp.org/3.0/en/appendices/3-8-migration-guide.html
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->import(__DIR__ . '/../config.php');
     $rectorConfig->ruleWithConfiguration(
         RenameMethodRector::class,
         [new MethodCallRename('Cake\ORM\Entity', 'visibleProperties', 'getVisible')]

diff --git a/config/rector/sets/cakephp40.php b/config/rector/sets/cakephp40.php
@@ -31,7 +31,6 @@
 # source: https://book.cakephp.org/4/en/appendices/4-0-migration-guide.html
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->import(__DIR__ . '/../config.php');
     $rectorConfig->ruleWithConfiguration(RenameClassRector::class, [
         'Cake\Database\Type' => 'Cake\Database\TypeFactory',
         'Cake\Console\ConsoleErrorHandler' => 'Cake\Error\ConsoleErrorHandler',

diff --git a/config/rector/sets/cakephp41.php b/config/rector/sets/cakephp41.php
@@ -9,7 +9,6 @@
 use Rector\Renaming\ValueObject\MethodCallRename;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->import(__DIR__ . '/../config.php');
     $rectorConfig->ruleWithConfiguration(RenameClassRector::class, [
         'Cake\Routing\Exception\RedirectException' => 'Cake\Http\Exception\RedirectException',
         'Cake\Database\Expression\Comparison' => 'Cake\Database\Expression\ComparisonExpression',

diff --git a/config/rector/sets/cakephp42.php b/config/rector/sets/cakephp42.php
@@ -8,7 +8,6 @@
 
 # source: https://book.cakephp.org/4/en/appendices/4-2-migration-guide.html
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->import(__DIR__ . '/../config.php');
     $rectorConfig->ruleWithConfiguration(RenameClassRector::class, [
         'Cake\Core\Exception\Exception' => 'Cake\Core\Exception\CakeException',
         'Cake\Database\Exception' => 'Cake\Database\Exception\DatabaseException',

diff --git a/config/rector/sets/cakephp43.php b/config/rector/sets/cakephp43.php
@@ -13,7 +13,6 @@
 
 # source: https://book.cakephp.org/4.next/en/appendices/4-3-migration-guide.html
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->import(__DIR__ . '/../config.php');
     $rectorConfig->ruleWithConfiguration(
         RenameMethodRector::class,
         [new MethodCallRename('Cake\Controller\Component', 'shutdown', 'afterFilter')]

diff --git a/config/rector/sets/cakephp44.php b/config/rector/sets/cakephp44.php
@@ -8,7 +8,6 @@
 
 # @see https://book.cakephp.org/4/en/appendices/4-4-migration-guide.html
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->import(__DIR__ . '/../config.php');
     $rectorConfig->ruleWithConfiguration(RenameClassRector::class, [
         'Cake\TestSuite\ConsoleIntegrationTestTrait' => 'Cake\Console\TestSuite\ConsoleIntegrationTestTrait',
         'Cake\TestSuite\Stub\ConsoleInput' => 'Cake\Console\TestSuite\StubConsoleInput',

diff --git a/config/rector/sets/cakephp45.php b/config/rector/sets/cakephp45.php
@@ -8,7 +8,6 @@
 
 # @see https://book.cakephp.org/4/en/appendices/4-5-migration-guide.html
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->import(__DIR__ . '/../config.php');
     $rectorConfig->ruleWithConfiguration(RenameClassRector::class, [
         'Cake\Datasource\Paging\Paginator' => 'Cake\Datasource\Paging\NumericPaginator',
         'Cake\TestSuite\ContainerStubTrait' => 'Cake\Core\TestSuite\ContainerStubTrait',

diff --git a/config/rector/sets/cakephp50.php b/config/rector/sets/cakephp50.php
@@ -23,8 +23,6 @@
 
 # @see https://book.cakephp.org/5/en/appendices/5-0-migration-guide.html
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->import(__DIR__ . '/../config.php');
-
     $rectorConfig->ruleWithConfiguration(
         OptionsArrayToNamedParametersRector::class,
         [

diff --git a/config/rector/sets/chronos3.php b/config/rector/sets/chronos3.php
@@ -13,8 +13,6 @@
  * @see https://github.com/cakephp/chronos/blob/3.x/docs/en/3-x-migration-guide.rst
  */
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->import(__DIR__ . '/../config.php');
-
     $rectorConfig->ruleWithConfiguration(RenameClassRector::class, [
         // Date
         'Cake\Chronos\Date' => 'Cake\Chronos\ChronosDate',

diff --git a/src/Rector/Rector/MethodCall/AddMethodCallArgsRector.php b/src/Rector/Rector/MethodCall/AddMethodCallArgsRector.php
@@ -79,7 +79,7 @@ public function refactor(Node $node): ?Node
                 continue;
             }
 
-            $values = $methodCallRenameWithAddedArgument->getValues()[0];
+            $values = $methodCallRenameWithAddedArgument->getValues();
             if ($node->args) {
                 $newArgs = [];
                 foreach ($node->args as $arg) {

diff --git a/src/Rector/Rector/MethodCall/RenameMethodCallBasedOnParameterRector.php b/src/Rector/Rector/MethodCall/RenameMethodCallBasedOnParameterRector.php
@@ -8,6 +8,7 @@
 use PhpParser\Node\Identifier;
 use Cake\Upgrade\Rector\ValueObject\RenameMethodCallBasedOnParameter;
 use Rector\Core\Contract\Rector\ConfigurableRectorInterface;
+use Rector\Core\PhpParser\Node\Value\ValueResolver;
 use Rector\Core\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -30,6 +31,10 @@ final class RenameMethodCallBasedOnParameterRector extends AbstractRector implem
      */
     private array $callsWithParamRenames = [];
 
+    public function __construct(private ValueResolver $valueResolver)
+    {
+    }
+
     public function getRuleDefinition(): RuleDefinition
     {
         $configuration = [

diff --git a/src/Rector/Rector/Namespace_/AppUsesStaticCallToUseStatementRector.php b/src/Rector/Rector/Namespace_/AppUsesStaticCallToUseStatementRector.php
@@ -15,7 +15,9 @@
 use PhpParser\Node\Stmt;
 use PhpParser\NodeTraverser;
 use Rector\Core\Contract\PhpParser\Node\StmtsAwareInterface;
+use Rector\Core\PhpParser\Node\BetterNodeFinder;
 use Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace;
+use Rector\Core\PhpParser\Node\Value\ValueResolver;
 use Rector\Core\Rector\AbstractRector;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -30,7 +32,9 @@
 final class AppUsesStaticCallToUseStatementRector extends AbstractRector
 {
     public function __construct(
-        private ShortClassNameResolver $shortClassNameResolver
+        private ShortClassNameResolver $shortClassNameResolver,
+        private BetterNodeFinder $betterNodeFinder,
+        private ValueResolver $valueResolver
     ) {
     }
 

diff --git a/tests/TestCase/Rector/MethodCall/AddMethodCallArgsRector/config/configured_rule.php b/tests/TestCase/Rector/MethodCall/AddMethodCallArgsRector/config/configured_rule.php
@@ -7,8 +7,6 @@
 use Rector\Config\RectorConfig;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->import(__DIR__ . '/../../../../../../config/rector/config.php');
-
     $rectorConfig->ruleWithConfiguration(AddMethodCallArgsRector::class, [
         new AddMethodCallArgs(SomeModelType::class, 'getAttribute', '2ndArg', 1, true),
     ]);

diff --git a/tests/TestCase/Rector/MethodCall/ArrayToFluentCallRector/config/configured_rule.php b/tests/TestCase/Rector/MethodCall/ArrayToFluentCallRector/config/configured_rule.php
@@ -10,8 +10,6 @@
 use Rector\Config\RectorConfig;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->import(__DIR__ . '/../../../../../../config/rector/config.php');
-
     $rectorConfig->ruleWithConfiguration(ArrayToFluentCallRector::class, [
         ArrayToFluentCallRector::ARRAYS_TO_FLUENT_CALLS => [
             new ArrayToFluentCall(ConfigurableClass::class, [

diff --git a/tests/TestCase/Rector/MethodCall/ModalToGetSetRector/config/configured_rule.php b/tests/TestCase/Rector/MethodCall/ModalToGetSetRector/config/configured_rule.php
@@ -7,8 +7,6 @@
 use Rector\Config\RectorConfig;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->import(__DIR__ . '/../../../../../../config/rector/config.php');
-
     $rectorConfig->ruleWithConfiguration(ModalToGetSetRector::class, [
 
         new ModalToGetSet(SomeModelType::class, 'config', null, null, 2, 'array'),

diff --git a/...TestCase/Rector/MethodCall/OptionsArrayToNamedParametersRector/config/configured_rule.php b/...TestCase/Rector/MethodCall/OptionsArrayToNamedParametersRector/config/configured_rule.php
@@ -8,8 +8,6 @@
 use Rector\Config\RectorConfig;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->import(__DIR__ . '/../../../../../../config/rector/config.php');
-
     $rectorConfig->ruleWithConfiguration(OptionsArrayToNamedParametersRector::class, [
         new OptionsArrayToNamedParameters(ConfigurableClass::class, ['find']),
         new OptionsArrayToNamedParameters(ConfigurableClass::class, [

diff --git a/tests/TestCase/Rector/MethodCall/RemoveIntermediaryMethodRector/config/configured_rule.php b/tests/TestCase/Rector/MethodCall/RemoveIntermediaryMethodRector/config/configured_rule.php
@@ -6,8 +6,6 @@
 use Rector\Config\RectorConfig;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->import(__DIR__ . '/../../../../../../config/rector/config.php');
-
     $rectorConfig->ruleWithConfiguration(
         RemoveIntermediaryMethodRector::class,
         [new RemoveIntermediaryMethod('getTableLocator', 'get', 'fetchTable')]

diff --git a/tests/TestCase/Rector/MethodCall/RemoveMethodCallArgsRector/config/configured_rule.php b/tests/TestCase/Rector/MethodCall/RemoveMethodCallArgsRector/config/configured_rule.php
@@ -7,8 +7,6 @@
 use Rector\Config\RectorConfig;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->import(__DIR__ . '/../../../../../../config/rector/config.php');
-
     $rectorConfig->ruleWithConfiguration(RemoveMethodCallRector::class, [
         new RemoveMethodCall(SomeModelType::class, 'getAttribute'),
     ]);

diff --git a/...tCase/Rector/MethodCall/RenameMethodCallBasedOnParameterRector/config/configured_rule.php b/...tCase/Rector/MethodCall/RenameMethodCallBasedOnParameterRector/config/configured_rule.php
@@ -7,8 +7,6 @@
 use Rector\Config\RectorConfig;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->import(__DIR__ . '/../../../../../../config/rector/config.php');
-
     $rectorConfig->ruleWithConfiguration(RenameMethodCallBasedOnParameterRector::class, [
         new RenameMethodCallBasedOnParameter(SomeModelType::class, 'getParam', 'paging', 'getAttribute'),
         new RenameMethodCallBasedOnParameter(SomeModelType::class, 'withParam', 'paging', 'withAttribute'),

diff --git a/...stCase/Rector/Namespace_/AppUsesStaticCallToUseStatementRector/config/configured_rule.php b/...stCase/Rector/Namespace_/AppUsesStaticCallToUseStatementRector/config/configured_rule.php
@@ -5,7 +5,5 @@
 use Rector\Config\RectorConfig;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->import(__DIR__ . '/../../../../../../config/rector/config.php');
-
     $rectorConfig->rule(AppUsesStaticCallToUseStatementRector::class);
 };
diff --git a/tests/TestCase/Rector/Property/ChangeSnakedFixtureNameToPascal/config/configured_rule.php b/tests/TestCase/Rector/Property/ChangeSnakedFixtureNameToPascal/config/configured_rule.php
@@ -5,7 +5,5 @@
 use Rector\Config\RectorConfig;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->import(__DIR__ . '/../../../../../../config/rector/config.php');
-
     $rectorConfig->rule(ChangeSnakedFixtureNameToPascalRector::class);
 };