[TypeDeclaration] Handle crash on interface Mixin on ReturnTypeFromSt…

…rictConstantReturnRector (#5884) * [TypeDeclaration] Handle crash on interface Mixin on ReturnTypeFromStrictConstantReturnRector * run rector * move repetivive string message to constant
rectorphp · May 16, 2024 · 6a5f6c5 · 6a5f6c5
1 parent 6bd2b87
commit 6a5f6c5
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/...ClassMethod/ReturnTypeFromStrictConstantReturnRector/Fixture/skip_interface_mixin.php.inc b/...ClassMethod/ReturnTypeFromStrictConstantReturnRector/Fixture/skip_interface_mixin.php.inc
@@ -0,0 +1,11 @@
+<?php
+
+// the namespace Webmozart\Assert on purpose to reproduce crash
+// @see https://github.com/rectorphp/rector/issues/8624
+// @see https://getrector.com/demo/e6b2e871-1b41-4897-8864-2f9aaad48de1
+namespace Webmozart\Assert;
+
+interface Mixin
+{
+    public static function nullOrString($value, $message = '');
+}
diff --git a/src/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php b/src/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php
@@ -79,6 +79,11 @@ final class PHPStanNodeScopeResolver
 
     private bool $hasUnreachableStatementNode = false;
 
+    /**
+     * @var string
+     */
+    private const PHPSTAN_INTERNAL_ERROR_MESSAGE = 'Internal error.';
+
     /**
      * @param ScopeResolverNodeVisitorInterface[] $nodeVisitors
      */
@@ -230,7 +235,7 @@ private function nodeScopeResolverProcessNodes(
         try {
             $this->nodeScopeResolver->processNodes($stmts, $mutatingScope, $nodeCallback);
         } catch (Throwable $throwable) {
-            if ($throwable->getMessage() !== 'Internal error.') {
+            if ($throwable->getMessage() !== self::PHPSTAN_INTERNAL_ERROR_MESSAGE) {
                 throw $throwable;
             }
         }
@@ -385,7 +390,15 @@ private function resolveClassOrInterfaceScope(
         $context = $this->privatesAccessor->getPrivateProperty($mutatingScope, 'context');
         $this->privatesAccessor->setPrivateProperty($context, 'classReflection', null);
 
-        return $mutatingScope->enterClass($classReflection);
+        try {
+            return $mutatingScope->enterClass($classReflection);
+        } catch (Throwable $throwable) {
+            if ($throwable->getMessage() !== self::PHPSTAN_INTERNAL_ERROR_MESSAGE) {
+                throw $throwable;
+            }
+
+            return $mutatingScope;
+        }
     }
 
     private function resolveClassName(Class_ | Interface_ | Trait_| Enum_ $classLike): string