[Php81] Handle crash insensitive function name on NullToStrictStringF…

…uncCallArgRector (#2953) * [Php81] Handle crash insensitive function name on NullToStrictStringFuncCallArgRector * Fixed 🎉 * [ci-review] Rector Rectify * [ci-review] Rector Rectify * [ci-review] Rector Rectify Co-authored-by: GitHub Action <action@github.com>
rectorphp · Sep 24, 2022 · 429c9c0 · 429c9c0
1 parent 54cc8e7
commit 429c9c0
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 8 deletions.
diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/UnionTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/UnionTypeMapper.php
@@ -126,7 +126,7 @@ public function mapToPhpParserNode(Type $type, string $typeKind): ?Node
         return $this->mapNullabledType($nullabledType, $typeKind);
     }
 
-    /** 
+    /**
      * @param TypeKind::* $typeKind
      */
     private function mapNullabledType(Type $nullabledType, string $typeKind): ?Node

diff --git a/...ncCall/NullToStrictStringFuncCallArgRector/Fixture/case_insensitive_function_name.php.inc b/...ncCall/NullToStrictStringFuncCallArgRector/Fixture/case_insensitive_function_name.php.inc
@@ -0,0 +1,27 @@
+<?php
+
+namespace Rector\Tests\Php80\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
+
+final class CaseInsensitiveFunctionName
+{
+    public function run($var)
+    {
+        return strToLower($var);
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Php80\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
+
+final class CaseInsensitiveFunctionName
+{
+    public function run($var)
+    {
+        return strToLower((string) $var);
+    }
+}
+
+?>
diff --git a/rules/Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector.php b/rules/Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector.php
@@ -484,7 +484,7 @@ private function resolveOriginalPositions(FuncCall $funcCall): array
             $funcCall,
             $scope
         );
-        $functionName = $this->nodeNameResolver->getName($funcCall);
+        $functionName = $functionReflection->getName();
         $argNames = self::ARG_POSITION_NAME_NULL_TO_STRICT_STRING[$functionName];
         $positions = [];
 

diff --git a/rules/TypeDeclaration/TypeAnalyzer/AlwaysStrictScalarExprAnalyzer.php b/rules/TypeDeclaration/TypeAnalyzer/AlwaysStrictScalarExprAnalyzer.php
@@ -56,7 +56,7 @@ public function matchStrictScalarExpr(Expr $expr): ?Type
         if ($expr instanceof FuncCall) {
             $returnType = $this->resolveFuncCallType($expr);
 
-            if ($returnType === null) {
+            if (! $returnType instanceof Type) {
                 return null;
             }
 
@@ -84,11 +84,7 @@ private function isScalarType(Type $type): bool
             return true;
         }
 
-        if ($type instanceof BooleanType) {
-            return true;
-        }
-
-        return false;
+        return $type instanceof BooleanType;
     }
 
     private function resolveTypeFromScalar(Scalar $scalar): Type|null