[PHPStan] Handle PHPStan internal ShouldNotHappenException on FamilyR…

…elationsAnalyzer and PHPStanNodeScopeResolver (#5885) * [PHPStan] Handle PHPStan internal ShouldNotHappenException on FamilyRelationsAnalyzer * fix
rectorphp · May 16, 2024 · db213ee · db213ee
1 parent 6a5f6c5
commit db213ee
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 17 deletions.
diff --git a/src/FamilyTree/Reflection/FamilyRelationsAnalyzer.php b/src/FamilyTree/Reflection/FamilyRelationsAnalyzer.php
@@ -10,6 +10,7 @@
 use PHPStan\Broker\ClassNotFoundException;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\ReflectionProvider;
+use PHPStan\ShouldNotHappenException;
 use Rector\Caching\Cache;
 use Rector\Caching\Enum\CacheKey;
 use Rector\NodeNameResolver\NodeNameResolver;
@@ -113,7 +114,7 @@ private function loadClasses(): void
             foreach ($classNamesCache as $classNameCache) {
                 try {
                     $this->reflectionProvider->getClass($classNameCache);
-                } catch (ClassNotFoundException) {
+                } catch (ClassNotFoundException|ShouldNotHappenException) {
                 }
             }
         }

diff --git a/src/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php b/src/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php
@@ -61,7 +61,6 @@
 use Rector\PHPStan\NodeVisitor\ExprScopeFromStmtNodeVisitor;
 use Rector\PHPStan\NodeVisitor\WrappedNodeRestoringNodeVisitor;
 use Rector\Util\Reflection\PrivatesAccessor;
-use Throwable;
 use Webmozart\Assert\Assert;
 
 /**
@@ -79,11 +78,6 @@ final class PHPStanNodeScopeResolver
 
     private bool $hasUnreachableStatementNode = false;
 
-    /**
-     * @var string
-     */
-    private const PHPSTAN_INTERNAL_ERROR_MESSAGE = 'Internal error.';
-
     /**
      * @param ScopeResolverNodeVisitorInterface[] $nodeVisitors
      */
@@ -234,10 +228,7 @@ private function nodeScopeResolverProcessNodes(
     ): void {
         try {
             $this->nodeScopeResolver->processNodes($stmts, $mutatingScope, $nodeCallback);
-        } catch (Throwable $throwable) {
-            if ($throwable->getMessage() !== self::PHPSTAN_INTERNAL_ERROR_MESSAGE) {
-                throw $throwable;
-            }
+        } catch (\PHPStan\ShouldNotHappenException) {
         }
     }
 
@@ -392,13 +383,10 @@ private function resolveClassOrInterfaceScope(
 
         try {
             return $mutatingScope->enterClass($classReflection);
-        } catch (Throwable $throwable) {
-            if ($throwable->getMessage() !== self::PHPSTAN_INTERNAL_ERROR_MESSAGE) {
-                throw $throwable;
-            }
-
-            return $mutatingScope;
+        } catch (\PHPStan\ShouldNotHappenException) {
         }
+
+        return $mutatingScope;
     }
 
     private function resolveClassName(Class_ | Interface_ | Trait_| Enum_ $classLike): string