Updated Rector to commit 96c457badfd0c198a57a758c552ec82aee0049de

96c457badf Fix RenamePropertyToMatchTypeRector for non-docblocks properties (#3189)

packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfoFactory.php

@@ -98,7 +98,7 @@ final class PhpDocInfoFactory
         $this->currentNodeProvider->setNode($node);
         $docComment = $node->getDocComment();
         if (!$docComment instanceof Doc) {
-            if ($node->getComments() !== []) {
+            if ($node->getComments() === []) {
                 return null;
             }
             // create empty node

rules/Naming/ExpectedNameResolver/MatchPropertyTypeExpectedNameResolver.php

@@ -4,15 +4,17 @@ declare (strict_types=1);
 namespace Rector\Naming\ExpectedNameResolver;
 
 use PhpParser\Node\Stmt\Class_;
+use PhpParser\Node\Stmt\ClassLike;
 use PhpParser\Node\Stmt\Property;
 use PHPStan\Reflection\ClassReflection;
+use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\Core\NodeManipulator\PropertyManipulator;
-use Rector\Core\PhpParser\Node\BetterNodeFinder;
 use Rector\Core\Reflection\ReflectionResolver;
 use Rector\Naming\Naming\PropertyNaming;
 use Rector\Naming\ValueObject\ExpectedName;
 use Rector\NodeNameResolver\NodeNameResolver;
+use Rector\StaticTypeMapper\StaticTypeMapper;
 final class MatchPropertyTypeExpectedNameResolver
 {
     /**
@@ -30,11 +32,6 @@ final class MatchPropertyTypeExpectedNameResolver
      * @var \Rector\NodeNameResolver\NodeNameResolver
      */
     private $nodeNameResolver;
-    /**
-     * @readonly
-     * @var \Rector\Core\PhpParser\Node\BetterNodeFinder
-     */
-    private $betterNodeFinder;
     /**
      * @readonly
      * @var \Rector\Core\NodeManipulator\PropertyManipulator
@@ -45,19 +42,23 @@ final class MatchPropertyTypeExpectedNameResolver
      * @var \Rector\Core\Reflection\ReflectionResolver
      */
     private $reflectionResolver;
-    public function __construct(PropertyNaming $propertyNaming, PhpDocInfoFactory $phpDocInfoFactory, NodeNameResolver $nodeNameResolver, BetterNodeFinder $betterNodeFinder, PropertyManipulator $propertyManipulator, ReflectionResolver $reflectionResolver)
+    /**
+     * @readonly
+     * @var \Rector\StaticTypeMapper\StaticTypeMapper
+     */
+    private $staticTypeMapper;
+    public function __construct(PropertyNaming $propertyNaming, PhpDocInfoFactory $phpDocInfoFactory, NodeNameResolver $nodeNameResolver, PropertyManipulator $propertyManipulator, ReflectionResolver $reflectionResolver, StaticTypeMapper $staticTypeMapper)
     {
         $this->propertyNaming = $propertyNaming;
         $this->phpDocInfoFactory = $phpDocInfoFactory;
         $this->nodeNameResolver = $nodeNameResolver;
-        $this->betterNodeFinder = $betterNodeFinder;
         $this->propertyManipulator = $propertyManipulator;
         $this->reflectionResolver = $reflectionResolver;
+        $this->staticTypeMapper = $staticTypeMapper;
     }
-    public function resolve(Property $property) : ?string
+    public function resolve(Property $property, ClassLike $classLike) : ?string
     {
-        $class = $this->betterNodeFinder->findParentType($property, Class_::class);
-        if (!$class instanceof Class_) {
+        if (!$classLike instanceof Class_) {
             return null;
         }
         $classReflection = $this->reflectionResolver->resolveClassReflection($property);
@@ -68,8 +69,7 @@ final class MatchPropertyTypeExpectedNameResolver
         if ($this->propertyManipulator->isUsedByTrait($classReflection, $propertyName)) {
             return null;
         }
-        $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($property);
-        $expectedName = $this->propertyNaming->getExpectedNameFromType($phpDocInfo->getVarType());
+        $expectedName = $this->resolveExpectedName($property);
         if (!$expectedName instanceof ExpectedName) {
             return null;
         }
@@ -80,4 +80,18 @@ final class MatchPropertyTypeExpectedNameResolver
         }
         return $expectedName->getName();
     }
+    private function resolveExpectedName(Property $property) : ?ExpectedName
+    {
+        // property type first
+        if ($property->type instanceof \PhpParser\Node) {
+            $propertyType = $this->staticTypeMapper->mapPhpParserNodePHPStanType($property->type);
+            return $this->propertyNaming->getExpectedNameFromType($propertyType);
+        }
+        // fallback to docblock
+        $phpDocInfo = $this->phpDocInfoFactory->createFromNode($property);
+        if ($phpDocInfo instanceof PhpDocInfo) {
+            return $this->propertyNaming->getExpectedNameFromType($phpDocInfo->getVarType());
+        }
+        return null;
+    }
 }

rules/Naming/Guard/PropertyConflictingNameGuard/MatchPropertyTypeConflictingNameGuard.php

@@ -43,7 +43,7 @@ final class MatchPropertyTypeConflictingNameGuard
     {
         $expectedNames = [];
         foreach ($classLike->getProperties() as $property) {
-            $expectedName = $this->matchPropertyTypeExpectedNameResolver->resolve($property);
+            $expectedName = $this->matchPropertyTypeExpectedNameResolver->resolve($property, $classLike);
             if ($expectedName === null) {
                 // fallback to existing name
                 $expectedName = $this->nodeNameResolver->getName($property);

rules/Naming/Rector/Class_/RenamePropertyToMatchTypeRector.php

@@ -109,7 +109,7 @@ CODE_SAMPLE
     private function refactorClassProperties(ClassLike $classLike) : void
     {
         foreach ($classLike->getProperties() as $property) {
-            $expectedPropertyName = $this->matchPropertyTypeExpectedNameResolver->resolve($property);
+            $expectedPropertyName = $this->matchPropertyTypeExpectedNameResolver->resolve($property, $classLike);
             if ($expectedPropertyName === null) {
                 continue;
             }

src/Application/VersionResolver.php

@@ -17,12 +17,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '809467ed2ddb362ad833142177d3148cfaf368bc';
+    public const PACKAGE_VERSION = '96c457badfd0c198a57a758c552ec82aee0049de';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2022-12-11 16:26:26';
+    public const RELEASE_DATE = '2022-12-11 18:45:24';
     /**
      * @var int
      */

vendor/autoload.php

@@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitf58675208f67b502abc85fcd8b1f7c30::getLoader();
+return ComposerAutoloaderInitfa35554e8ecb680533c5fb8896873474::getLoader();

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitf58675208f67b502abc85fcd8b1f7c30
+class ComposerAutoloaderInitfa35554e8ecb680533c5fb8896873474
 {
     private static $loader;
 
@@ -22,19 +22,19 @@ class ComposerAutoloaderInitf58675208f67b502abc85fcd8b1f7c30
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitf58675208f67b502abc85fcd8b1f7c30', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitfa35554e8ecb680533c5fb8896873474', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInitf58675208f67b502abc85fcd8b1f7c30', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitfa35554e8ecb680533c5fb8896873474', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInitf58675208f67b502abc85fcd8b1f7c30::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInitfa35554e8ecb680533c5fb8896873474::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
-        $includeFiles = \Composer\Autoload\ComposerStaticInitf58675208f67b502abc85fcd8b1f7c30::$files;
+        $includeFiles = \Composer\Autoload\ComposerStaticInitfa35554e8ecb680533c5fb8896873474::$files;
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequiref58675208f67b502abc85fcd8b1f7c30($fileIdentifier, $file);
+            composerRequirefa35554e8ecb680533c5fb8896873474($fileIdentifier, $file);
         }
 
         return $loader;
@@ -46,7 +46,7 @@ class ComposerAutoloaderInitf58675208f67b502abc85fcd8b1f7c30
  * @param string $file
  * @return void
  */
-function composerRequiref58675208f67b502abc85fcd8b1f7c30($fileIdentifier, $file)
+function composerRequirefa35554e8ecb680533c5fb8896873474($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInitf58675208f67b502abc85fcd8b1f7c30
+class ComposerStaticInitfa35554e8ecb680533c5fb8896873474
 {
     public static $files = array (
         'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@@ -3026,9 +3026,9 @@ class ComposerStaticInitf58675208f67b502abc85fcd8b1f7c30
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitf58675208f67b502abc85fcd8b1f7c30::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitf58675208f67b502abc85fcd8b1f7c30::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInitf58675208f67b502abc85fcd8b1f7c30::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitfa35554e8ecb680533c5fb8896873474::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitfa35554e8ecb680533c5fb8896873474::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInitfa35554e8ecb680533c5fb8896873474::$classMap;
 
         }, null, ClassLoader::class);
     }