Make NullToStrictStringFuncCallArgRector run without scope (#4792)

rectorphp · Aug 14, 2023 · 514df0a · 514df0a
1 parent 685fe90
commit 514df0a
Show file tree

Hide file tree

Showing 18 changed files with 74 additions and 82 deletions.
diff --git a/...Rector/FuncCall/NullToStrictStringFuncCallArgRector/Fixture/after_exit_namespaced.php.inc b/...Rector/FuncCall/NullToStrictStringFuncCallArgRector/Fixture/after_exit_namespaced.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php80\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
+namespace Rector\Tests\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
 
 exit();
 
@@ -15,7 +15,7 @@ function run2()
 -----
 <?php
 
-namespace Rector\Tests\Php80\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
+namespace Rector\Tests\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
 
 exit();
 

diff --git a/...ncCall/NullToStrictStringFuncCallArgRector/Fixture/case_insensitive_function_name.php.inc b/...ncCall/NullToStrictStringFuncCallArgRector/Fixture/case_insensitive_function_name.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php80\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
+namespace Rector\Tests\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
 
 final class CaseInsensitiveFunctionName
 {
@@ -14,7 +14,7 @@ final class CaseInsensitiveFunctionName
 -----
 <?php
 
-namespace Rector\Tests\Php80\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
+namespace Rector\Tests\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
 
 final class CaseInsensitiveFunctionName
 {

diff --git a/...s/Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector/Fixture/crypt_one_arg.php.inc b/...s/Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector/Fixture/crypt_one_arg.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php80\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
+namespace Rector\Tests\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
 
 /**
  * Crypt requires 2 args since php 5.6, when it only fill 1st arg, it will only change 1st arg
@@ -19,7 +19,7 @@ final class CryptOneArg
 -----
 <?php
 
-namespace Rector\Tests\Php80\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
+namespace Rector\Tests\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
 
 /**
  * Crypt requires 2 args since php 5.6, when it only fill 1st arg, it will only change 1st arg

diff --git a/.../Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector/Fixture/named_argument.php.inc b/.../Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector/Fixture/named_argument.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php80\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
+namespace Rector\Tests\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
 
 final class NamedArgument
 {
@@ -14,7 +14,7 @@ final class NamedArgument
 -----
 <?php
 
-namespace Rector\Tests\Php80\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
+namespace Rector\Tests\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
 
 final class NamedArgument
 {

diff --git a/...Rector/FuncCall/NullToStrictStringFuncCallArgRector/Fixture/non_string_param_type.php.inc b/...Rector/FuncCall/NullToStrictStringFuncCallArgRector/Fixture/non_string_param_type.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php80\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
+namespace Rector\Tests\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
 
 final class NonStringParamType
 {
@@ -14,7 +14,7 @@ final class NonStringParamType
 -----
 <?php
 
-namespace Rector\Tests\Php80\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
+namespace Rector\Tests\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
 
 final class NonStringParamType
 {

diff --git a/.../NullToStrictStringFuncCallArgRector/Fixture/non_string_param_type_in_use_closure.php.inc b/.../NullToStrictStringFuncCallArgRector/Fixture/non_string_param_type_in_use_closure.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php80\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
+namespace Rector\Tests\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
 
 final class NonStringParamTypeInUseClosure
 {
@@ -16,7 +16,7 @@ final class NonStringParamTypeInUseClosure
 -----
 <?php
 
-namespace Rector\Tests\Php80\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
+namespace Rector\Tests\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
 
 final class NonStringParamTypeInUseClosure
 {

diff --git a/...tests/Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector/Fixture/pass_null.php.inc b/...tests/Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector/Fixture/pass_null.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php80\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
+namespace Rector\Tests\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
 
 final class PassNull
 {
@@ -14,7 +14,7 @@ final class PassNull
 -----
 <?php
 
-namespace Rector\Tests\Php80\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
+namespace Rector\Tests\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
 
 final class PassNull
 {

diff --git a/...Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector/Fixture/pass_null_multi.php.inc b/...Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector/Fixture/pass_null_multi.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php80\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
+namespace Rector\Tests\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
 
 final class PassNullMulti
 {
@@ -14,7 +14,7 @@ final class PassNullMulti
 -----
 <?php
 
-namespace Rector\Tests\Php80\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
+namespace Rector\Tests\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
 
 final class PassNullMulti
 {

diff --git a/...1/Rector/FuncCall/NullToStrictStringFuncCallArgRector/Fixture/preg_match_callable.php.inc b/...1/Rector/FuncCall/NullToStrictStringFuncCallArgRector/Fixture/preg_match_callable.php.inc
@@ -0,0 +1,37 @@
+<?php
+
+namespace Rector\Tests\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
+
+final class PregMatchCallable
+{
+    public function run($regex)
+    {
+        preg_replace_callback($regex, 'value', function (array $match) use (
+            &$string
+        ): string {
+            $innerPattern = $match['content'];
+            $positionDelimiter = strpos($innerPattern, '');
+        });
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
+
+final class PregMatchCallable
+{
+    public function run($regex)
+    {
+        preg_replace_callback($regex, 'value', function (array $match) use (
+            &$string
+        ): string {
+            $innerPattern = $match['content'];
+            $positionDelimiter = strpos((string) $innerPattern, '');
+        });
+    }
+}
+
+?>
diff --git a/...cCall/NullToStrictStringFuncCallArgRector/Fixture/skip_constant_string_param_type.php.inc b/...cCall/NullToStrictStringFuncCallArgRector/Fixture/skip_constant_string_param_type.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php80\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
+namespace Rector\Tests\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
 
 final class SkipConstantStringParamType
 {

diff --git a/...Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector/Fixture/skip_error_type.php.inc b/...Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector/Fixture/skip_error_type.php.inc
diff --git a/...Call/NullToStrictStringFuncCallArgRector/Fixture/skip_intersection_string_numeric.php.inc b/...Call/NullToStrictStringFuncCallArgRector/Fixture/skip_intersection_string_numeric.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php80\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
+namespace Rector\Tests\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
 
 use PhpParser\Node;
 use PhpParser\Node\Scalar\DNumber;

diff --git a/...or/FuncCall/NullToStrictStringFuncCallArgRector/Fixture/skip_method_call_on_trait.php.inc b/...or/FuncCall/NullToStrictStringFuncCallArgRector/Fixture/skip_method_call_on_trait.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php80\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
+namespace Rector\Tests\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
 
 trait SkipMethodCallOnTrait
 {

diff --git a/...StringFuncCallArgRector/Fixture/skip_not_registered_func_call_with_named_argument.php.inc b/...StringFuncCallArgRector/Fixture/skip_not_registered_func_call_with_named_argument.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php80\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
+namespace Rector\Tests\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
 
 final class SkipNotRegisteredFuncCallWithNamedArgument
 {

diff --git a/...81/Rector/FuncCall/NullToStrictStringFuncCallArgRector/Fixture/skip_reassign_cast.php.inc b/...81/Rector/FuncCall/NullToStrictStringFuncCallArgRector/Fixture/skip_reassign_cast.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php80\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
+namespace Rector\Tests\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
 
 use PhpParser\Node;
 use PhpParser\Node\Scalar\DNumber;

diff --git a/...l/NullToStrictStringFuncCallArgRector/Fixture/skip_str_replace_pass_array_subject.php.inc b/...l/NullToStrictStringFuncCallArgRector/Fixture/skip_str_replace_pass_array_subject.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php80\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
+namespace Rector\Tests\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
 
 final class SkipStrReplacePassArraySubject
 {

diff --git a/...ector/FuncCall/NullToStrictStringFuncCallArgRector/Fixture/skip_string_param_type.php.inc b/...ector/FuncCall/NullToStrictStringFuncCallArgRector/Fixture/skip_string_param_type.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\Php80\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
+namespace Rector\Tests\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
 
 final class SkipStringParamType
 {

diff --git a/rules/Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector.php b/rules/Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector.php
@@ -14,27 +14,25 @@
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Scalar\Encapsed;
 use PhpParser\Node\Scalar\String_;
-use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\Native\NativeFunctionReflection;
-use PHPStan\Type\ErrorType;
+use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\NullType;
 use PHPStan\Type\Type;
 use Rector\Core\NodeAnalyzer\ArgsAnalyzer;
 use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
-use Rector\Core\Rector\AbstractScopeAwareRector;
+use Rector\Core\Rector\AbstractRector;
 use Rector\Core\Reflection\ReflectionResolver;
 use Rector\Core\ValueObject\PhpVersionFeature;
-use Rector\NodeTypeResolver\PHPStan\ParametersAcceptorSelectorVariantsWrapper;
 use Rector\VersionBonding\Contract\MinPhpVersionInterface;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 /**
  * @see \Rector\Tests\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector\NullToStrictStringFuncCallArgRectorTest
  */
-final class NullToStrictStringFuncCallArgRector extends AbstractScopeAwareRector implements MinPhpVersionInterface
+final class NullToStrictStringFuncCallArgRector extends AbstractRector implements MinPhpVersionInterface
 {
     /**
      * @var array<string, string[]>
@@ -377,7 +375,7 @@ public function getNodeTypes(): array
     /**
      * @param FuncCall $node
      */
-    public function refactorWithScope(Node $node, Scope $scope): ?Node
+    public function refactor(Node $node): ?Node
     {
         if ($this->shouldSkip($node)) {
             return null;
@@ -386,18 +384,18 @@ public function refactorWithScope(Node $node, Scope $scope): ?Node
         $args = $node->getArgs();
         $positions = $this->argsAnalyzer->hasNamedArg($args)
             ? $this->resolveNamedPositions($node, $args)
-            : $this->resolveOriginalPositions($node, $scope);
+            : $this->resolveOriginalPositions($node);
 
         if ($positions === []) {
             return null;
         }
 
-        $classReflection = $scope->getClassReflection();
+        $classReflection = $this->reflectionResolver->resolveClassReflection($node);
         $isTrait = $classReflection instanceof ClassReflection && $classReflection->isTrait();
 
         $isChanged = false;
         foreach ($positions as $position) {
-            $result = $this->processNullToStrictStringOnNodePosition($node, $args, $position, $isTrait, $scope);
+            $result = $this->processNullToStrictStringOnNodePosition($node, $args, $position, $isTrait);
             if ($result instanceof Node) {
                 $node = $result;
                 $isChanged = true;
@@ -448,8 +446,7 @@ private function processNullToStrictStringOnNodePosition(
         FuncCall $funcCall,
         array $args,
         int|string $position,
-        bool $isTrait,
-        Scope $scope
+        bool $isTrait
     ): ?FuncCall {
         if (! isset($args[$position])) {
             return null;
@@ -477,10 +474,6 @@ private function processNullToStrictStringOnNodePosition(
             return null;
         }
 
-        if ($this->isAnErrorTypeFromParentScope($argValue, $scope)) {
-            return null;
-        }
-
         if ($this->shouldSkipTrait($argValue, $type, $isTrait)) {
             return null;
         }
@@ -512,37 +505,26 @@ private function shouldSkipTrait(Expr $expr, Type $type, bool $isTrait): bool
         return true;
     }
 
-    private function isAnErrorTypeFromParentScope(Expr $expr, Scope $scope): bool
-    {
-        $parentScope = $scope->getParentScope();
-        if ($parentScope instanceof Scope) {
-            return $parentScope->getType($expr) instanceof ErrorType;
-        }
-
-        return false;
-    }
-
     /**
      * @return int[]|string[]
      */
-    private function resolveOriginalPositions(FuncCall $funcCall, Scope $scope): array
+    private function resolveOriginalPositions(FuncCall $funcCall): array
     {
         $functionReflection = $this->reflectionResolver->resolveFunctionLikeReflectionFromCall($funcCall);
         if (! $functionReflection instanceof NativeFunctionReflection) {
             return [];
         }
 
-        $parametersAcceptor = ParametersAcceptorSelectorVariantsWrapper::select(
-            $functionReflection,
-            $funcCall,
-            $scope
+        $parametersAcceptorWithPhpDocs = ParametersAcceptorSelector::combineAcceptors(
+            $functionReflection->getVariants()
         );
+
         $functionName = $functionReflection->getName();
         $argNames = self::ARG_POSITION_NAME_NULL_TO_STRICT_STRING[$functionName];
         $positions = [];
 
-        foreach ($parametersAcceptor->getParameters() as $position => $parameterReflection) {
-            if (in_array($parameterReflection->getName(), $argNames, true)) {
+        foreach ($parametersAcceptorWithPhpDocs->getParameters() as $position => $parameterReflectionWithPhpDoc) {
+            if (in_array($parameterReflectionWithPhpDoc->getName(), $argNames, true)) {
                 $positions[] = $position;
             }
         }