fix getArgs() missing in phpstan scoped version in rector-src packages (

#936)
rectorphp · Sep 30, 2021 · ffa3915 · ffa3915
1 parent e5859d6
commit ffa3915
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 19 deletions.
diff --git a/phpstan.neon b/phpstan.neon
@@ -498,3 +498,8 @@ parameters:
 
         # false positive - class_exists check is right above it
         - '#Parameter \#1 \$objectOrClass of class ReflectionClass constructor expects class\-string<Rector\\RectorInstaller\\GeneratedConfig\>\|Rector\\RectorInstaller\\GeneratedConfig, string given#'
+
+        # waits for phpstan upgrade to php-parser 4.13
+        - '#Access to an undefined property PhpParser\\Node\\Arg\|PhpParser\\Node\\VariadicPlaceholder\:\:\$value#'
+        - '#(.*?), array<PhpParser\\Node\\Arg\|PhpParser\\Node\\VariadicPlaceholder\> given#'
+        - '#(.*?) but returns array<int, PhpParser\\Node\\Arg\|PhpParser\\Node\\VariadicPlaceholder\>#'
diff --git a/rules/Arguments/ArgumentDefaultValueReplacer.php b/rules/Arguments/ArgumentDefaultValueReplacer.php
@@ -100,7 +100,7 @@ private function processArgs(
         ) && $argValue === $replaceArgumentDefaultValue->getValueBefore()) {
             $expr->args[$position] = $this->normalizeValueToArgument($replaceArgumentDefaultValue->getValueAfter());
         } elseif (is_array($replaceArgumentDefaultValue->getValueBefore())) {
-            $newArgs = $this->processArrayReplacement($expr->getArgs(), $replaceArgumentDefaultValue);
+            $newArgs = $this->processArrayReplacement($expr->args, $replaceArgumentDefaultValue);
 
             if ($newArgs) {
                 $expr->args = $newArgs;

diff --git a/rules/DowngradePhp72/Rector/FuncCall/DowngradePregUnmatchedAsNullConstantRector.php b/rules/DowngradePhp72/Rector/FuncCall/DowngradePregUnmatchedAsNullConstantRector.php
@@ -71,7 +71,7 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        $args = $node->getArgs();
+        $args = $node->args;
         if (! isset($args[3])) {
             return null;
         }

diff --git a/rules/DowngradePhp80/Rector/ClassMethod/DowngradeTrailingCommasInParamUseRector.php b/rules/DowngradePhp80/Rector/ClassMethod/DowngradeTrailingCommasInParamUseRector.php
@@ -117,7 +117,7 @@ public function refactor(Node $node): ?Node
 
     private function processArgs(FuncCall | MethodCall | StaticCall | New_ $node): ?Node
     {
-        $args = $node->getArgs();
+        $args = $node->args;
         if ($args === []) {
             return null;
         }

diff --git a/rules/DowngradePhp80/Rector/FuncCall/DowngradeStrEndsWithRector.php b/rules/DowngradePhp80/Rector/FuncCall/DowngradeStrEndsWithRector.php
@@ -64,7 +64,7 @@ public function refactor(Node $node): ?Node
 
     private function createSubstrCompareFuncCall(FuncCall $funcCall): FuncCall
     {
-        $args = $funcCall->getArgs();
+        $args = $funcCall->args;
 
         $strlenFuncCall = $this->createStrlenFuncCall($args[1]->value);
         $args[] = new Arg(new UnaryMinus($strlenFuncCall));

diff --git a/rules/DowngradePhp80/Rector/MethodCall/DowngradeNamedArgumentRector.php b/rules/DowngradePhp80/Rector/MethodCall/DowngradeNamedArgumentRector.php
@@ -81,7 +81,7 @@ private function execute($a = null, $b = null)
      */
     public function refactor(Node $node): ?Node
     {
-        $args = $node->getArgs();
+        $args = $node->args;
         if ($this->shouldSkip($args)) {
             return null;
         }

diff --git a/rules/MysqlToMysqli/Rector/FuncCall/MysqlQueryMysqlErrorWithLinkRector.php b/rules/MysqlToMysqli/Rector/FuncCall/MysqlQueryMysqlErrorWithLinkRector.php
@@ -131,10 +131,9 @@ public function refactor(Node $node): ?Node
                 continue;
             }
 
-            $args = $node->getArgs();
+            $args = $node->args;
             if (
-                $args === []
-                || ! $this->isProbablyMysql($args[0]->value)
+                $args === [] || ! $this->isProbablyMysql($args[0]->value)
             ) {
                 $connectionVariable = $this->findConnectionVariable($node);
 
@@ -144,7 +143,7 @@ public function refactor(Node $node): ?Node
                     return null;
                 }
 
-                $node->args = array_merge([new Arg($connectionVariable)], $node->getArgs());
+                $node->args = array_merge([new Arg($connectionVariable)], $node->args);
             }
 
             $node->name = new Name($newFunction);

diff --git a/rules/Php70/Rector/FuncCall/CallUserMethodRector.php b/rules/Php70/Rector/FuncCall/CallUserMethodRector.php
@@ -65,7 +65,7 @@ public function refactor(Node $node): ?Node
         $newName = self::OLD_TO_NEW_FUNCTIONS[$this->getName($node)];
         $node->name = new Name($newName);
 
-        $oldArgs = $node->getArgs();
+        $oldArgs = $node->args;
 
         unset($node->args[1]);
 

diff --git a/rules/Php70/Rector/FuncCall/MultiDirnameRector.php b/rules/Php70/Rector/FuncCall/MultiDirnameRector.php
@@ -82,7 +82,7 @@ private function matchNestedDirnameFuncCall(FuncCall $funcCall): ?FuncCall
             return null;
         }
 
-        $args = $funcCall->getArgs();
+        $args = $funcCall->args;
         if (count($args) >= 3) {
             return null;
         }

diff --git a/rules/Php73/Rector/FuncCall/SetCookieRector.php b/rules/Php73/Rector/FuncCall/SetCookieRector.php
@@ -11,6 +11,7 @@
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Scalar\String_;
+use PhpParser\Node\VariadicPlaceholder;
 use Rector\Core\Rector\AbstractRector;
 use Rector\Core\ValueObject\PhpVersionFeature;
 use Rector\VersionBonding\Contract\MinPhpVersionInterface;
@@ -116,13 +117,13 @@ private function shouldSkip(FuncCall $funcCall): bool
     }
 
     /**
-     * @return Arg[]
+     * @return Arg[]|VariadicPlaceholder[]
      */
     private function composeNewArgs(FuncCall $funcCall): array
     {
         $items = [];
 
-        $args = $funcCall->getArgs();
+        $args = $funcCall->args;
 
         $newArgs = [];
         $newArgs[] = $args[0];

diff --git a/rules/Php80/Rector/ClassMethod/OptionalParametersAfterRequiredRector.php b/rules/Php80/Rector/ClassMethod/OptionalParametersAfterRequiredRector.php
@@ -144,12 +144,12 @@ private function refactorNew(New_ $new): ?New_
             return null;
         }
 
-        $expectedArgOrParamOrder = $this->resolveExpectedArgParamOrderIfDifferent($methodReflection, $new->getArgs());
+        $expectedArgOrParamOrder = $this->resolveExpectedArgParamOrderIfDifferent($methodReflection, $new->args);
         if ($expectedArgOrParamOrder === null) {
             return null;
         }
 
-        $new->args = $this->argumentSorter->sortArgsByExpectedParamOrder($new->getArgs(), $expectedArgOrParamOrder);
+        $new->args = $this->argumentSorter->sortArgsByExpectedParamOrder($new->args, $expectedArgOrParamOrder);
         $new->setAttribute(self::ALREADY_SORTED, true);
 
         return $new;
@@ -164,14 +164,14 @@ private function refactorMethodCall(MethodCall $methodCall): ?MethodCall
 
         $expectedArgOrParamOrder = $this->resolveExpectedArgParamOrderIfDifferent(
             $methodReflection,
-            $methodCall->getArgs()
+            $methodCall->args
         );
         if ($expectedArgOrParamOrder === null) {
             return null;
         }
 
         $newArgs = $this->argumentSorter->sortArgsByExpectedParamOrder(
-            $methodCall->getArgs(),
+            $methodCall->args,
             $expectedArgOrParamOrder
         );
 

diff --git a/rules/PhpSpecToPHPUnit/Rector/MethodCall/PhpSpecMocksToPHPUnitMocksRector.php b/rules/PhpSpecToPHPUnit/Rector/MethodCall/PhpSpecMocksToPHPUnitMocksRector.php
@@ -223,7 +223,7 @@ private function createPropertyFetchMockVariableAssign(Param $param, Name $name)
 
     private function createIsTypeOrIsInstanceOf(StaticCall $staticCall): MethodCall
     {
-        $args = $staticCall->getArgs();
+        $args = $staticCall->args;
         $type = $this->valueResolver->getValue($args[0]->value);
 
         $name = $this->typeAnalyzer->isPhpReservedType($type) ? 'isType' : 'isInstanceOf';

diff --git a/rules/PhpSpecToPHPUnit/Rector/MethodCall/PhpSpecPromisesToPHPUnitAssertRector.php b/rules/PhpSpecToPHPUnit/Rector/MethodCall/PhpSpecPromisesToPHPUnitAssertRector.php
@@ -147,7 +147,7 @@ public function refactor(Node $node): ?Node
 
         $this->processMatchersKeys($node);
 
-        $args = $node->getArgs();
+        $args = $node->args;
         foreach (self::NEW_METHOD_TO_OLD_METHODS as $newMethod => $oldMethods) {
             if (! $this->isNames($node->name, $oldMethods)) {
                 continue;