Updated Rector to commit a6732a5b0e80868a6542c9bd5443f27750577e64

rectorphp/rector-src@a6732a5 [FamilyTree] Remove AstResolver on FamilyRelationsAnalyzer (#5117)
rectorphp · Oct 5, 2023 · 9696ef6 · 9696ef6
1 parent a40e240
commit 9696ef6
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 32 deletions.
diff --git a/packages/FamilyTree/Reflection/FamilyRelationsAnalyzer.php b/packages/FamilyTree/Reflection/FamilyRelationsAnalyzer.php
@@ -8,7 +8,6 @@
 use PhpParser\Node\Stmt\Interface_;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\ReflectionProvider;
-use Rector\Core\PhpParser\AstResolver;
 use Rector\Core\Util\Reflection\PrivatesAccessor;
 use Rector\NodeNameResolver\NodeNameResolver;
 final class FamilyRelationsAnalyzer
@@ -28,17 +27,11 @@ final class FamilyRelationsAnalyzer
      * @var \Rector\NodeNameResolver\NodeNameResolver
      */
     private $nodeNameResolver;
-    /**
-     * @readonly
-     * @var \Rector\Core\PhpParser\AstResolver
-     */
-    private $astResolver;
-    public function __construct(ReflectionProvider $reflectionProvider, PrivatesAccessor $privatesAccessor, NodeNameResolver $nodeNameResolver, AstResolver $astResolver)
+    public function __construct(ReflectionProvider $reflectionProvider, PrivatesAccessor $privatesAccessor, NodeNameResolver $nodeNameResolver)
     {
         $this->reflectionProvider = $reflectionProvider;
         $this->privatesAccessor = $privatesAccessor;
         $this->nodeNameResolver = $nodeNameResolver;
-        $this->astResolver = $astResolver;
     }
     /**
      * @return ClassReflection[]
@@ -69,22 +62,24 @@ public function getClassLikeAncestorNames($classOrName) : array
         $ancestorNames = [];
         if ($classOrName instanceof Name) {
             $fullName = $this->nodeNameResolver->getName($classOrName);
-            $classLike = $this->astResolver->resolveClassFromName($fullName);
-        } else {
-            $classLike = $classOrName;
+            $classReflection = $this->reflectionProvider->getClass($fullName);
+            $ancestors = \array_merge($classReflection->getParents(), $classReflection->getInterfaces());
+            return \array_map(static function (ClassReflection $classReflection) : string {
+                return $classReflection->getName();
+            }, $ancestors);
         }
-        if ($classLike instanceof Interface_) {
-            foreach ($classLike->extends as $extendInterfaceName) {
+        if ($classOrName instanceof Interface_) {
+            foreach ($classOrName->extends as $extendInterfaceName) {
                 $ancestorNames[] = $this->nodeNameResolver->getName($extendInterfaceName);
                 $ancestorNames = \array_merge($ancestorNames, $this->getClassLikeAncestorNames($extendInterfaceName));
             }
         }
-        if ($classLike instanceof Class_) {
-            if ($classLike->extends instanceof Name) {
-                $ancestorNames[] = $this->nodeNameResolver->getName($classLike->extends);
-                $ancestorNames = \array_merge($ancestorNames, $this->getClassLikeAncestorNames($classLike->extends));
+        if ($classOrName instanceof Class_) {
+            if ($classOrName->extends instanceof Name) {
+                $ancestorNames[] = $this->nodeNameResolver->getName($classOrName->extends);
+                $ancestorNames = \array_merge($ancestorNames, $this->getClassLikeAncestorNames($classOrName->extends));
             }
-            foreach ($classLike->implements as $implement) {
+            foreach ($classOrName->implements as $implement) {
                 $ancestorNames[] = $this->nodeNameResolver->getName($implement);
                 $ancestorNames = \array_merge($ancestorNames, $this->getClassLikeAncestorNames($implement));
             }

diff --git a/rules/Php80/Rector/Class_/StringableForToStringRector.php b/rules/Php80/Rector/Class_/StringableForToStringRector.php
@@ -108,15 +108,15 @@ public function refactor(Node $node) : ?Node
         // warning, classes that implements __toString() will return Stringable interface even if they don't implemen it
         // reflection cannot be used for real detection
         $classLikeAncestorNames = $this->familyRelationsAnalyzer->getClassLikeAncestorNames($node);
-        if (\in_array(self::STRINGABLE, $classLikeAncestorNames, \true)) {
-            return null;
-        }
+        $isAncestorHasStringable = \in_array(self::STRINGABLE, $classLikeAncestorNames, \true);
         $returnType = $this->returnTypeInferer->inferFunctionLike($toStringClassMethod);
         if (!$returnType->isString()->yes()) {
             $this->processNotStringType($toStringClassMethod);
         }
-        // add interface
-        $node->implements[] = new FullyQualified(self::STRINGABLE);
+        if (!$isAncestorHasStringable) {
+            // add interface
+            $node->implements[] = new FullyQualified(self::STRINGABLE);
+        }
         // add return type
         if ($toStringClassMethod->returnType === null) {
             $toStringClassMethod->returnType = new Identifier('string');

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 = 'a0f2f32c7970d925681fc4cec64efa1ee90b6ea8';
+    public const PACKAGE_VERSION = 'a6732a5b0e80868a6542c9bd5443f27750577e64';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2023-10-05 12:35:58';
+    public const RELEASE_DATE = '2023-10-05 14:30:52';
     /**
      * @var int
      */

diff --git a/src/PhpParser/AstResolver.php b/src/PhpParser/AstResolver.php
@@ -99,6 +99,7 @@ public function __construct(SmartPhpParser $smartPhpParser, NodeScopeAndMetadata
         $this->methodReflectionResolver = $methodReflectionResolver;
     }
     /**
+     * @api downgrade
      * @return \PhpParser\Node\Stmt\Class_|\PhpParser\Node\Stmt\Trait_|\PhpParser\Node\Stmt\Interface_|\PhpParser\Node\Stmt\Enum_|null
      */
     public function resolveClassFromName(string $className)

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -1879,12 +1879,12 @@
             "source": {
                 "type": "git",
                 "url": "https:\/\/github.com\/rectorphp\/rector-symfony.git",
-                "reference": "24ea3ecd82cfab1d040bed6c0cd7a0cf69a11a85"
+                "reference": "873458ca73a73f9becd1680963a347bbcb8e5f43"
             },
             "dist": {
                 "type": "zip",
-                "url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-symfony\/zipball\/24ea3ecd82cfab1d040bed6c0cd7a0cf69a11a85",
-                "reference": "24ea3ecd82cfab1d040bed6c0cd7a0cf69a11a85",
+                "url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-symfony\/zipball\/873458ca73a73f9becd1680963a347bbcb8e5f43",
+                "reference": "873458ca73a73f9becd1680963a347bbcb8e5f43",
                 "shasum": ""
             },
             "require": {
@@ -1917,7 +1917,7 @@
                 "tomasvotruba\/unused-public": "^0.2",
                 "tracy\/tracy": "^2.10"
             },
-            "time": "2023-10-01T11:40:39+00:00",
+            "time": "2023-10-05T05:47:32+00:00",
             "default-branch": true,
             "type": "rector-extension",
             "extra": {

diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
diff --git a/vendor/rector/extension-installer/src/GeneratedConfig.php b/vendor/rector/extension-installer/src/GeneratedConfig.php
@@ -9,7 +9,7 @@
  */
 final class GeneratedConfig
 {
-    public const EXTENSIONS = array('rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => NULL, 'version' => 'dev-main a846e7f'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => NULL, 'version' => 'dev-main 850b492'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => NULL, 'version' => 'dev-main 383d079'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => NULL, 'version' => 'dev-main 24ea3ec'));
+    public const EXTENSIONS = array('rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => NULL, 'version' => 'dev-main a846e7f'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => NULL, 'version' => 'dev-main 850b492'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => NULL, 'version' => 'dev-main 383d079'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => NULL, 'version' => 'dev-main 873458c'));
     private function __construct()
     {
     }

diff --git a/...or-symfony/rules/Symfony42/Rector/MethodCall/ContainerGetToConstructorInjectionRector.php b/...or-symfony/rules/Symfony42/Rector/MethodCall/ContainerGetToConstructorInjectionRector.php
@@ -132,7 +132,7 @@ private function decorateCommandConstructor(Class_ $class) : void
             return;
         }
         // empty stmts? add parent::__construct() to setup command
-        if (\count((array) $constuctClassMethod->stmts) === 0) {
+        if ((array) $constuctClassMethod->stmts === []) {
             $parentConstructStaticCall = new StaticCall(new Name('parent'), '__construct');
             $constuctClassMethod->stmts[] = new Expression($parentConstructStaticCall);
         }