Updated Rector to commit 6a5f6c53f3637b23b4488cab81ec90a0d1bef053

rectorphp/rector-src@6a5f6c5 [TypeDeclaration] Handle crash on interface Mixin on ReturnTypeFromStrictConstantReturnRector (#5884)
rectorphp · May 16, 2024 · 6cf7059 · 6cf7059
1 parent 3c1e41f
commit 6cf7059
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
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 = '6bd2b871c4e9741928fb48df3ca8e899be42be81';
+    public const PACKAGE_VERSION = '6a5f6c53f3637b23b4488cab81ec90a0d1bef053';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2024-05-15 09:15:53';
+    public const RELEASE_DATE = '2024-05-16 18:42:05';
     /**
      * @var int
      */

diff --git a/src/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php b/src/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php
@@ -111,6 +111,10 @@ final class PHPStanNodeScopeResolver
      * @var bool
      */
     private $hasUnreachableStatementNode = \false;
+    /**
+     * @var string
+     */
+    private const PHPSTAN_INTERNAL_ERROR_MESSAGE = 'Internal error.';
     /**
      * @param ScopeResolverNodeVisitorInterface[] $nodeVisitors
      */
@@ -233,7 +237,7 @@ private function nodeScopeResolverProcessNodes(array $stmts, MutatingScope $muta
         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;
             }
         }
@@ -362,7 +366,14 @@ private function resolveClassOrInterfaceScope($classLike, MutatingScope $mutatin
         }
         $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;
+        }
     }
     /**
      * @param \PhpParser\Node\Stmt\Class_|\PhpParser\Node\Stmt\Interface_|\PhpParser\Node\Stmt\Trait_|\PhpParser\Node\Stmt\Enum_ $classLike

diff --git a/vendor/scoper-autoload.php b/vendor/scoper-autoload.php
@@ -14,7 +14,7 @@
     // Restore the backup and ensure the excluded files are properly marked as loaded
     $GLOBALS['__composer_autoload_files'] = \array_merge(
         $existingComposerAutoloadFiles,
-        \array_fill_keys(['0e6d7bf4a5811bfa5cf40c5ccd6fae6a', '5928a00fa978807cf85d90ec3f4b0147'], true)
+        \array_fill_keys(['5928a00fa978807cf85d90ec3f4b0147', '0e6d7bf4a5811bfa5cf40c5ccd6fae6a'], true)
     );
 
     return $loader;