Updated Rector to commit de0dda8f29453b36bcfa3728cf26662fb634fcd1

rectorphp/rector-src@de0dda8 Compare type directly in CleanupUnneededNullsafeOperatorRector (#6086)
rectorphp · Jun 30, 2024 · 33f4d6d · 33f4d6d
1 parent 91f015b
commit 33f4d6d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/rules/CodeQuality/Rector/NullsafeMethodCall/CleanupUnneededNullsafeOperatorRector.php b/rules/CodeQuality/Rector/NullsafeMethodCall/CleanupUnneededNullsafeOperatorRector.php
@@ -9,8 +9,8 @@
 use PhpParser\Node\Expr\NullsafeMethodCall;
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Identifier;
+use PHPStan\Type\ObjectType;
 use Rector\Rector\AbstractRector;
-use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
 use Rector\TypeDeclaration\TypeAnalyzer\ReturnStrictTypeAnalyzer;
 use Rector\ValueObject\PhpVersionFeature;
 use Rector\VersionBonding\Contract\MinPhpVersionInterface;
@@ -84,12 +84,8 @@ public function refactor(Node $node) : ?Node
         if (!$node->var instanceof FuncCall && !$node->var instanceof MethodCall && !$node->var instanceof StaticCall) {
             return null;
         }
-        $returnNode = $this->returnStrictTypeAnalyzer->resolveMethodCallReturnNode($node->var);
-        if (!$returnNode instanceof Node) {
-            return null;
-        }
-        $type = $this->getType($returnNode);
-        if (!$type instanceof FullyQualifiedObjectType) {
+        $returnType = $this->returnStrictTypeAnalyzer->resolveMethodCallReturnType($node->var);
+        if (!$returnType instanceof ObjectType) {
             return null;
         }
         return new MethodCall($node->var, $node->name, $node->args);

diff --git a/rules/TypeDeclaration/TypeAnalyzer/ReturnStrictTypeAnalyzer.php b/rules/TypeDeclaration/TypeAnalyzer/ReturnStrictTypeAnalyzer.php
@@ -95,6 +95,17 @@ public function collectStrictReturnTypes(array $returns, Scope $scope) : array
      * @param \PhpParser\Node\Expr\MethodCall|\PhpParser\Node\Expr\StaticCall|\PhpParser\Node\Expr\FuncCall $call
      */
     public function resolveMethodCallReturnNode($call) : ?Node
+    {
+        $returnType = $this->resolveMethodCallReturnType($call);
+        if (!$returnType instanceof Type) {
+            return null;
+        }
+        return $this->staticTypeMapper->mapPHPStanTypeToPhpParserNode($returnType, TypeKind::RETURN);
+    }
+    /**
+     * @param \PhpParser\Node\Expr\MethodCall|\PhpParser\Node\Expr\StaticCall|\PhpParser\Node\Expr\FuncCall $call
+     */
+    public function resolveMethodCallReturnType($call) : ?Type
     {
         $methodReflection = $this->reflectionResolver->resolveFunctionLikeReflectionFromCall($call);
         if ($methodReflection === null) {
@@ -114,8 +125,7 @@ public function resolveMethodCallReturnNode($call) : ?Node
         if ($returnType instanceof MixedType) {
             return null;
         }
-        $returnType = $this->normalizeStaticType($call, $returnType);
-        return $this->staticTypeMapper->mapPHPStanTypeToPhpParserNode($returnType, TypeKind::RETURN);
+        return $this->normalizeStaticType($call, $returnType);
     }
     /**
      * @param \PhpParser\Node\Expr\MethodCall|\PhpParser\Node\Expr\StaticCall|\PhpParser\Node\Expr\FuncCall $call

diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php
@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '296a2b2fbbe8d41393cc470eb97ec1c3ac5423cd';
+    public const PACKAGE_VERSION = 'de0dda8f29453b36bcfa3728cf26662fb634fcd1';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2024-06-30 12:55:24';
+    public const RELEASE_DATE = '2024-06-30 19:47:13';
     /**
      * @var int
      */