Updated Rector to commit 5ccf468c144112121d0ab7933430a796d82ef8a2

5ccf468c14 [Privatization] Use PropertyManipulator::isUsedByTrait() on ParentPropertyLookupGuard for PrivatizeFinalClassPropertyRector (#3185)

rules/Privatization/Guard/ParentPropertyLookupGuard.php

@@ -13,6 +13,7 @@ use PhpParser\Node\Stmt\Property;
 use PHPStan\Reflection\ClassReflection;
 use Rector\Core\Enum\ObjectReference;
 use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
+use Rector\Core\NodeManipulator\PropertyManipulator;
 use Rector\Core\PhpParser\AstResolver;
 use Rector\Core\PhpParser\Node\BetterNodeFinder;
 use Rector\Core\Reflection\ReflectionResolver;
@@ -44,13 +45,19 @@ final class ParentPropertyLookupGuard
      * @var \Rector\Core\PhpParser\AstResolver
      */
     private $astResolver;
-    public function __construct(BetterNodeFinder $betterNodeFinder, ReflectionResolver $reflectionResolver, NodeNameResolver $nodeNameResolver, PropertyFetchAnalyzer $propertyFetchAnalyzer, AstResolver $astResolver)
+    /**
+     * @readonly
+     * @var \Rector\Core\NodeManipulator\PropertyManipulator
+     */
+    private $propertyManipulator;
+    public function __construct(BetterNodeFinder $betterNodeFinder, ReflectionResolver $reflectionResolver, NodeNameResolver $nodeNameResolver, PropertyFetchAnalyzer $propertyFetchAnalyzer, AstResolver $astResolver, PropertyManipulator $propertyManipulator)
     {
         $this->betterNodeFinder = $betterNodeFinder;
         $this->reflectionResolver = $reflectionResolver;
         $this->nodeNameResolver = $nodeNameResolver;
         $this->propertyFetchAnalyzer = $propertyFetchAnalyzer;
         $this->astResolver = $astResolver;
+        $this->propertyManipulator = $propertyManipulator;
     }
     public function isLegal(Property $property) : bool
     {
@@ -58,14 +65,17 @@ final class ParentPropertyLookupGuard
         if (!$class instanceof Class_) {
             return \false;
         }
-        if ($class->extends === null) {
-            return \true;
-        }
         $classReflection = $this->reflectionResolver->resolveClassReflection($property);
         if (!$classReflection instanceof ClassReflection) {
             return \false;
         }
         $propertyName = $this->nodeNameResolver->getName($property);
+        if ($this->propertyManipulator->isUsedByTrait($classReflection, $propertyName)) {
+            return \false;
+        }
+        if ($class->extends === null) {
+            return \true;
+        }
         $className = $classReflection->getName();
         $parents = $classReflection->getParents();
         // parent class not autoloaded

rules/Privatization/Rector/Property/PrivatizeFinalClassPropertyRector.php

@@ -6,8 +6,6 @@ namespace Rector\Privatization\Rector\Property;
 use PhpParser\Node;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\Property;
-use PhpParser\Node\Stmt\TraitUse;
-use PHPStan\Reflection\ReflectionProvider;
 use Rector\Core\Rector\AbstractRector;
 use Rector\Privatization\Guard\ParentPropertyLookupGuard;
 use Rector\Privatization\NodeManipulator\VisibilityManipulator;
@@ -28,16 +26,10 @@ final class PrivatizeFinalClassPropertyRector extends AbstractRector
      * @var \Rector\Privatization\Guard\ParentPropertyLookupGuard
      */
     private $parentPropertyLookupGuard;
-    /**
-     * @readonly
-     * @var \PHPStan\Reflection\ReflectionProvider
-     */
-    private $reflectionProvider;
-    public function __construct(VisibilityManipulator $visibilityManipulator, ParentPropertyLookupGuard $parentPropertyLookupGuard, ReflectionProvider $reflectionProvider)
+    public function __construct(VisibilityManipulator $visibilityManipulator, ParentPropertyLookupGuard $parentPropertyLookupGuard)
     {
         $this->visibilityManipulator = $visibilityManipulator;
         $this->parentPropertyLookupGuard = $parentPropertyLookupGuard;
-        $this->reflectionProvider = $reflectionProvider;
     }
     public function getRuleDefinition() : RuleDefinition
     {
@@ -70,10 +62,9 @@ CODE_SAMPLE
         if (!$node->isFinal()) {
             return null;
         }
-        $traitPropertyNames = $this->resolveTraitPropertyNames($node);
         $hasChanged = \false;
         foreach ($node->getProperties() as $property) {
-            if ($this->shouldSkipProperty($property, $traitPropertyNames)) {
+            if ($this->shouldSkipProperty($property)) {
                 continue;
             }
             if (!$this->parentPropertyLookupGuard->isLegal($property)) {
@@ -87,41 +78,11 @@ CODE_SAMPLE
         }
         return null;
     }
-    /**
-     * @return string[]
-     */
-    private function resolveTraitPropertyNames(Class_ $class) : array
-    {
-        $traitPropertyNames = [];
-        foreach ($class->stmts as $classStmt) {
-            if (!$classStmt instanceof TraitUse) {
-                continue;
-            }
-            foreach ($classStmt->traits as $trait) {
-                $traitName = $this->getName($trait);
-                if (!$this->reflectionProvider->hasClass($traitName)) {
-                    continue;
-                }
-                $traitReflection = $this->reflectionProvider->getClass($traitName);
-                $nativeTraitReflection = $traitReflection->getNativeReflection();
-                foreach ($nativeTraitReflection->getProperties() as $propertyReflection) {
-                    $traitPropertyNames[] = $propertyReflection->getName();
-                }
-            }
-        }
-        return $traitPropertyNames;
-    }
-    /**
-     * @param string[] $traitPropertyNames
-     */
-    private function shouldSkipProperty(Property $property, array $traitPropertyNames) : bool
+    private function shouldSkipProperty(Property $property) : bool
     {
         if (\count($property->props) !== 1) {
             return \true;
         }
-        if (!$property->isProtected()) {
-            return \true;
-        }
-        return $this->isNames($property, $traitPropertyNames);
+        return !$property->isProtected();
     }
 }

src/Application/VersionResolver.php

@@ -17,12 +17,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '802d98e8c6cb0b29c731e2238160b860b33be13c';
+    public const PACKAGE_VERSION = '5ccf468c144112121d0ab7933430a796d82ef8a2';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2022-12-11 11:28:09';
+    public const RELEASE_DATE = '2022-12-11 11:32:33';
     /**
      * @var int
      */

vendor/autoload.php

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

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit83955387acde7726e09b101b1acb7c69
+class ComposerAutoloaderInit17a7ca0b70c3dc973329e03c35fb331b
 {
     private static $loader;
 
@@ -22,19 +22,19 @@ class ComposerAutoloaderInit83955387acde7726e09b101b1acb7c69
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit83955387acde7726e09b101b1acb7c69', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit17a7ca0b70c3dc973329e03c35fb331b', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit83955387acde7726e09b101b1acb7c69', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit17a7ca0b70c3dc973329e03c35fb331b', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit83955387acde7726e09b101b1acb7c69::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit17a7ca0b70c3dc973329e03c35fb331b::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
-        $includeFiles = \Composer\Autoload\ComposerStaticInit83955387acde7726e09b101b1acb7c69::$files;
+        $includeFiles = \Composer\Autoload\ComposerStaticInit17a7ca0b70c3dc973329e03c35fb331b::$files;
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire83955387acde7726e09b101b1acb7c69($fileIdentifier, $file);
+            composerRequire17a7ca0b70c3dc973329e03c35fb331b($fileIdentifier, $file);
         }
 
         return $loader;
@@ -46,7 +46,7 @@ class ComposerAutoloaderInit83955387acde7726e09b101b1acb7c69
  * @param string $file
  * @return void
  */
-function composerRequire83955387acde7726e09b101b1acb7c69($fileIdentifier, $file)
+function composerRequire17a7ca0b70c3dc973329e03c35fb331b($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 ComposerStaticInit83955387acde7726e09b101b1acb7c69
+class ComposerStaticInit17a7ca0b70c3dc973329e03c35fb331b
 {
     public static $files = array (
         'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@@ -3026,9 +3026,9 @@ class ComposerStaticInit83955387acde7726e09b101b1acb7c69
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit83955387acde7726e09b101b1acb7c69::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit83955387acde7726e09b101b1acb7c69::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit83955387acde7726e09b101b1acb7c69::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit17a7ca0b70c3dc973329e03c35fb331b::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit17a7ca0b70c3dc973329e03c35fb331b::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit17a7ca0b70c3dc973329e03c35fb331b::$classMap;
 
         }, null, ClassLoader::class);
     }