From ceff1cad27dcb44086ecd2794f1f9463e6fd6ded Mon Sep 17 00:00:00 2001
From: Tomas Votruba <tomas.vot@gmail.com>
Date: Tue, 19 Mar 2024 10:36:18 +0000
Subject: [PATCH] Updated Rector to commit
 1bf3947959e10f213a04e4eb626fc2ce428add60

https://github.com/rectorphp/rector-src/commit/1bf3947959e10f213a04e4eb626fc2ce428add60 [CodingStyle] Remove usage of Reflection::expandClassName() from nette/utils 4.0 as cause bug on downgrade (#5740)
---
 .../ClassNameImport/ShortNameResolver.php     | 41 ++-----------------
 src/Application/VersionResolver.php           |  4 +-
 2 files changed, 6 insertions(+), 39 deletions(-)

diff --git a/rules/CodingStyle/ClassNameImport/ShortNameResolver.php b/rules/CodingStyle/ClassNameImport/ShortNameResolver.php
index 9fc16023c36..1bb71899915 100644
--- a/rules/CodingStyle/ClassNameImport/ShortNameResolver.php
+++ b/rules/CodingStyle/ClassNameImport/ShortNameResolver.php
@@ -3,7 +3,6 @@
 declare (strict_types=1);
 namespace Rector\CodingStyle\ClassNameImport;
 
-use RectorPrefix202403\Nette\Utils\Reflection;
 use PhpParser\Node;
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Name;
@@ -12,8 +11,6 @@ use PhpParser\Node\Stmt\ClassLike;
 use PhpParser\Node\Stmt\Namespace_;
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
 use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
-use PHPStan\Reflection\ClassReflection;
-use PHPStan\Reflection\ReflectionProvider;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\CodingStyle\NodeAnalyzer\UseImportNameMatcher;
@@ -24,7 +21,6 @@ use Rector\PhpDocParser\PhpDocParser\PhpDocNodeTraverser;
 use Rector\PhpParser\Node\BetterNodeFinder;
 use Rector\PhpParser\Node\CustomNode\FileWithoutNamespace;
 use Rector\ValueObject\Application\File;
-use ReflectionClass;
 /**
  * @see \Rector\Tests\CodingStyle\ClassNameImport\ShortNameResolver\ShortNameResolverTest
  */
@@ -40,11 +36,6 @@ final class ShortNameResolver
      * @var \Rector\NodeNameResolver\NodeNameResolver
      */
     private $nodeNameResolver;
-    /**
-     * @readonly
-     * @var \PHPStan\Reflection\ReflectionProvider
-     */
-    private $reflectionProvider;
     /**
      * @readonly
      * @var \Rector\PhpParser\Node\BetterNodeFinder
@@ -64,11 +55,10 @@ final class ShortNameResolver
      * @var array<string, string[]>
      */
     private $shortNamesByFilePath = [];
-    public function __construct(SimpleCallableNodeTraverser $simpleCallableNodeTraverser, NodeNameResolver $nodeNameResolver, ReflectionProvider $reflectionProvider, BetterNodeFinder $betterNodeFinder, UseImportNameMatcher $useImportNameMatcher, PhpDocInfoFactory $phpDocInfoFactory)
+    public function __construct(SimpleCallableNodeTraverser $simpleCallableNodeTraverser, NodeNameResolver $nodeNameResolver, BetterNodeFinder $betterNodeFinder, UseImportNameMatcher $useImportNameMatcher, PhpDocInfoFactory $phpDocInfoFactory)
     {
         $this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser;
         $this->nodeNameResolver = $nodeNameResolver;
-        $this->reflectionProvider = $reflectionProvider;
         $this->betterNodeFinder = $betterNodeFinder;
         $this->useImportNameMatcher = $useImportNameMatcher;
         $this->phpDocInfoFactory = $phpDocInfoFactory;
@@ -152,7 +142,6 @@ final class ShortNameResolver
      */
     private function resolveFromStmtsDocBlocks(array $stmts) : array
     {
-        $classReflection = $this->resolveClassReflection($stmts);
         $shortNames = [];
         $this->simpleCallableNodeTraverser->traverseNodesWithCallable($stmts, function (Node $node) use(&$shortNames) {
             // speed up for nodes that are
@@ -176,41 +165,19 @@ final class ShortNameResolver
             });
             return null;
         });
-        return $this->fqnizeShortNames($shortNames, $classReflection, $stmts);
-    }
-    /**
-     * @param Node[] $stmts
-     */
-    private function resolveClassReflection(array $stmts) : ?ClassReflection
-    {
-        $firstClassLike = $this->betterNodeFinder->findFirstInstanceOf($stmts, ClassLike::class);
-        if (!$firstClassLike instanceof ClassLike) {
-            return null;
-        }
-        $className = (string) $this->nodeNameResolver->getName($firstClassLike);
-        if (!$this->reflectionProvider->hasClass($className)) {
-            return null;
-        }
-        return $this->reflectionProvider->getClass($className);
+        return $this->fqnizeShortNames($shortNames, $stmts);
     }
     /**
      * @param string[] $shortNames
      * @param Stmt[] $stmts
      * @return array<string, string>
      */
-    private function fqnizeShortNames(array $shortNames, ?ClassReflection $classReflection, array $stmts) : array
+    private function fqnizeShortNames(array $shortNames, array $stmts) : array
     {
         $shortNamesToFullyQualifiedNames = [];
-        $nativeReflectionClass = $classReflection instanceof ClassReflection && !$classReflection->isAnonymous() ? $classReflection->getNativeReflection() : null;
         foreach ($shortNames as $shortName) {
             $stmtsMatchedName = $this->useImportNameMatcher->matchNameWithStmts($shortName, $stmts);
-            if ($nativeReflectionClass instanceof ReflectionClass) {
-                $fullyQualifiedName = Reflection::expandClassName($shortName, $nativeReflectionClass);
-            } elseif (\is_string($stmtsMatchedName)) {
-                $fullyQualifiedName = $stmtsMatchedName;
-            } else {
-                $fullyQualifiedName = $shortName;
-            }
+            $fullyQualifiedName = \is_string($stmtsMatchedName) ? $stmtsMatchedName : $shortName;
             $shortNamesToFullyQualifiedNames[$shortName] = $fullyQualifiedName;
         }
         return $shortNamesToFullyQualifiedNames;
diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php
index d38a101352a..42a50fec832 100644
--- a/src/Application/VersionResolver.php
+++ b/src/Application/VersionResolver.php
@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = 'a78fb1b970be42619495215a2612d032a6ecdbee';
+    public const PACKAGE_VERSION = '1bf3947959e10f213a04e4eb626fc2ce428add60';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2024-03-19 02:25:58';
+    public const RELEASE_DATE = '2024-03-19 17:33:59';
     /**
      * @var int
      */