Make ChangeGlobalVariablesToPropertiesRector add properties directly,…

… remove Nette inject methods (#3957) * Make ChangeGlobalVariablesToPropertiesRector add properties directly * remove inject property * note * remove parent property empty, as inject not used anymore
rectorphp · May 24, 2023 · 179b5cb · 179b5cb
1 parent 69220a7
commit 179b5cb
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 320 deletions.
diff --git a/.github/workflows/e2e_autoload.yaml b/.github/workflows/e2e_autoload.yaml
diff --git a/e2e/parent-property-empty/.gitignore b/e2e/parent-property-empty/.gitignore
diff --git a/e2e/parent-property-empty/composer.json b/e2e/parent-property-empty/composer.json
diff --git a/e2e/parent-property-empty/expected-output.diff b/e2e/parent-property-empty/expected-output.diff
diff --git a/e2e/parent-property-empty/rector.php b/e2e/parent-property-empty/rector.php
diff --git a/e2e/parent-property-empty/src/ProfilePresenter.php b/e2e/parent-property-empty/src/ProfilePresenter.php
diff --git a/packages/PostRector/Collector/PropertyToAddCollector.php b/packages/PostRector/Collector/PropertyToAddCollector.php
@@ -5,7 +5,6 @@
 namespace Rector\PostRector\Collector;
 
 use PhpParser\Node\Stmt\Class_;
-use PHPStan\Type\Type;
 use Rector\ChangesReporting\Collector\RectorChangeCollector;
 use Rector\PostRector\Contract\Collector\NodeCollectorInterface;
 use Rector\PostRector\ValueObject\PropertyMetadata;
@@ -17,23 +16,14 @@ final class PropertyToAddCollector implements NodeCollectorInterface
      */
     private array $propertiesByClass = [];
 
-    /**
-     * @var array<string, array<string, Type|null>>
-     */
-    private array $propertiesWithoutConstructorByClass = [];
-
     public function __construct(
         private readonly RectorChangeCollector $rectorChangeCollector
     ) {
     }
 
     public function isActive(): bool
     {
-        if ($this->propertiesByClass !== []) {
-            return true;
-        }
-
-        return $this->propertiesWithoutConstructorByClass !== [];
+        return $this->propertiesByClass !== [];
     }
 
     public function addPropertyToClass(Class_ $class, PropertyMetadata $propertyMetadata): void
@@ -44,19 +34,6 @@ public function addPropertyToClass(Class_ $class, PropertyMetadata $propertyMeta
         $this->rectorChangeCollector->notifyNodeFileInfo($class);
     }
 
-    /**
-     * @api
-     */
-    public function addPropertyWithoutConstructorToClass(
-        string $propertyName,
-        ?Type $propertyType,
-        Class_ $class
-    ): void {
-        $this->propertiesWithoutConstructorByClass[spl_object_hash($class)][$propertyName] = $propertyType;
-
-        $this->rectorChangeCollector->notifyNodeFileInfo($class);
-    }
-
     /**
      * @return PropertyMetadata[]
      */
@@ -65,13 +42,4 @@ public function getPropertiesByClass(Class_ $class): array
         $classHash = spl_object_hash($class);
         return $this->propertiesByClass[$classHash] ?? [];
     }
-
-    /**
-     * @return array<string, Type|null>
-     */
-    public function getPropertiesWithoutConstructorByClass(Class_ $class): array
-    {
-        $classHash = spl_object_hash($class);
-        return $this->propertiesWithoutConstructorByClass[$classHash] ?? [];
-    }
 }
diff --git a/packages/PostRector/NodeAnalyzer/NetteInjectDetector.php b/packages/PostRector/NodeAnalyzer/NetteInjectDetector.php
diff --git a/packages/PostRector/Rector/PropertyAddingPostRector.php b/packages/PostRector/Rector/PropertyAddingPostRector.php
@@ -8,9 +8,7 @@
 use PhpParser\Node\Stmt\Class_;
 use Rector\Core\NodeAnalyzer\ClassAnalyzer;
 use Rector\Core\NodeManipulator\ClassDependencyManipulator;
-use Rector\Core\NodeManipulator\ClassInsertManipulator;
 use Rector\PostRector\Collector\PropertyToAddCollector;
-use Rector\PostRector\NodeAnalyzer\NetteInjectDetector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
@@ -21,8 +19,6 @@ final class PropertyAddingPostRector extends AbstractPostRector
 {
     public function __construct(
         private readonly ClassDependencyManipulator $classDependencyManipulator,
-        private readonly ClassInsertManipulator $classInsertManipulator,
-        private readonly NetteInjectDetector $netteInjectDetector,
         private readonly PropertyToAddCollector $propertyToAddCollector,
         private readonly ClassAnalyzer $classAnalyzer
     ) {
@@ -44,7 +40,6 @@ public function enterNode(Node $node): ?Node
         }
 
         $this->addProperties($node);
-        $this->addPropertiesWithoutConstructor($node);
 
         return $node;
     }
@@ -83,25 +78,8 @@ private function addProperties(Class_ $class): void
     {
         $propertiesMetadatas = $this->propertyToAddCollector->getPropertiesByClass($class);
 
-        $isNetteInjectPreferred = $this->netteInjectDetector->isNetteInjectPreferred($class);
-
         foreach ($propertiesMetadatas as $propertyMetadata) {
-            if (! $isNetteInjectPreferred) {
-                $this->classDependencyManipulator->addConstructorDependency($class, $propertyMetadata);
-            } else {
-                $this->classDependencyManipulator->addInjectProperty($class, $propertyMetadata);
-            }
-        }
-    }
-
-    private function addPropertiesWithoutConstructor(Class_ $class): void
-    {
-        $propertiesWithoutConstructor = $this->propertyToAddCollector->getPropertiesWithoutConstructorByClass(
-            $class
-        );
-
-        foreach ($propertiesWithoutConstructor as $propertyName => $propertyType) {
-            $this->classInsertManipulator->addPropertyToClass($class, $propertyName, $propertyType);
+            $this->classDependencyManipulator->addConstructorDependency($class, $propertyMetadata);
         }
     }
 }
diff --git a/rules/Privatization/Rector/Class_/ChangeGlobalVariablesToPropertiesRector.php b/rules/Privatization/Rector/Class_/ChangeGlobalVariablesToPropertiesRector.php
@@ -11,9 +11,10 @@
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Global_;
+use PhpParser\Node\Stmt\Property;
+use PhpParser\Node\Stmt\PropertyProperty;
 use PhpParser\NodeTraverser;
 use Rector\Core\Rector\AbstractRector;
-use Rector\PostRector\Collector\PropertyToAddCollector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
@@ -30,11 +31,6 @@ final class ChangeGlobalVariablesToPropertiesRector extends AbstractRector
      */
     private array $globalVariableNames = [];
 
-    public function __construct(
-        private readonly PropertyToAddCollector $propertyToAddCollector
-    ) {
-    }
-
     public function getRuleDefinition(): RuleDefinition
     {
         return new RuleDefinition(
@@ -99,10 +95,16 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        // @todo find ideal property position
+        $globalProperties = [];
         foreach ($this->globalVariableNames as $globalVariableName) {
-            $this->propertyToAddCollector->addPropertyWithoutConstructorToClass($globalVariableName, null, $node);
+            $globalProperties[] = new Property(Class_::MODIFIER_PRIVATE, [
+                new PropertyProperty($globalVariableName),
+            ]);
         }
 
+        array_splice($node->stmts, 0, 0, $globalProperties);
+
         return $node;
     }
 

diff --git a/src/Kernel/RectorKernel.php b/src/Kernel/RectorKernel.php
@@ -17,7 +17,7 @@ final class RectorKernel
     /**
      * @var string
      */
-    private const CACHE_KEY = 'v28';
+    private const CACHE_KEY = 'v30';
 
     private ContainerInterface|null $container = null;