cleanup NodeRepository (#323)

rectorphp · Jun 28, 2021 · 5e4b159 · 5e4b159
1 parent 0979d51
commit 5e4b159
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/build/config/config-downgrade.php b/build/config/config-downgrade.php
@@ -25,14 +25,6 @@
     $containerConfigurator->import(DowngradeSetList::PHP_74);
     $containerConfigurator->import(DowngradeSetList::PHP_73);
     $containerConfigurator->import(DowngradeSetList::PHP_72);
-
-    $services = $containerConfigurator->services();
-    $services->set(DowngradeAttributeToAnnotationRector::class)
-        ->call('configure', [[
-            DowngradeAttributeToAnnotationRector::ATTRIBUTE_TO_ANNOTATION => ValueObjectInliner::inline([
-                new DowngradeAttributeToAnnotation('Symfony\Contracts\Service\Attribute\Required', 'required'),
-            ]),
-        ]]);
 };
 
 /**

diff --git a/config/set/downgrade-php80.php b/config/set/downgrade-php80.php
@@ -41,7 +41,11 @@
     $services->set(DowngradeAttributeToAnnotationRector::class)
         ->call('configure', [[
             DowngradeAttributeToAnnotationRector::ATTRIBUTE_TO_ANNOTATION => ValueObjectInliner::inline([
-                new DowngradeAttributeToAnnotation('Attribute'),
+                new DowngradeAttributeToAnnotation('Attribute', 'annotation'),
+                // Symfony
+                new DowngradeAttributeToAnnotation('Symfony\Contracts\Service\Attribute\Required', 'required'),
+                // Nette
+                new DowngradeAttributeToAnnotation('Nette\DI\Attributes\Inject', 'inject'),
             ]),
         ]]);
 

diff --git a/packages/NodeCollector/NodeCollector/NodeRepository.php b/packages/NodeCollector/NodeCollector/NodeRepository.php
@@ -100,6 +100,9 @@ public function findClass(string $name): ?Class_
         return $this->parsedNodeCollector->findClass($name);
     }
 
+    /**
+     * @param class-string $name
+     */
     public function findTrait(string $name): ?Trait_
     {
         return $this->parsedNodeCollector->findTrait($name);

diff --git a/rules/CodeQuality/Rector/Isset_/IssetOnPropertyObjectToPropertyExistsRector.php b/rules/CodeQuality/Rector/Isset_/IssetOnPropertyObjectToPropertyExistsRector.php
@@ -12,7 +12,6 @@
 use PhpParser\Node\Expr\Isset_;
 use PhpParser\Node\Expr\PropertyFetch;
 use PhpParser\Node\Scalar\String_;
-use PhpParser\Node\Stmt\Property;
 use PHPStan\Reflection\Php\PhpPropertyReflection;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\MixedType;

diff --git a/src/Reflection/ReflectionResolver.php b/src/Reflection/ReflectionResolver.php
@@ -152,8 +152,9 @@ public function resolveMethodReflectionFromNew(New_ $new): ?MethodReflection
         return $this->resolveMethodReflection($newClassType->getClassName(), MethodName::CONSTRUCT, $scope);
     }
 
-    public function resolvePropertyReflectionFromPropertyFetch(PropertyFetch | StaticPropertyFetch $propertyFetch): ?PhpPropertyReflection
-    {
+    public function resolvePropertyReflectionFromPropertyFetch(
+        PropertyFetch | StaticPropertyFetch $propertyFetch
+    ): ?PhpPropertyReflection {
         $fetcheeType = $propertyFetch instanceof PropertyFetch
             ? $this->nodeTypeResolver->resolve($propertyFetch->var)
             : $this->nodeTypeResolver->resolve($propertyFetch->class);