[CodeQuality] Use existing PhpAttributeAnalyzer service instead of At…

…tributeFinder from Doctrine package on DynamicDocBlockPropertyToNativePropertyRector (#6382) * [CodeQuality] Use existing PhpAttributeAnalyzer service instead of AttributeFinder from Doctrine package on DynamicDocBlockPropertyToNativePropertyRector * add fixture * add fixture * add fixture
rectorphp · Oct 12, 2024 · 61016bf · 61016bf
1 parent 385d423
commit 61016bf
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/...PropertyToNativePropertyRector/Fixture/skip_no_allow_dynamic_properties_attribute.php.inc b/...PropertyToNativePropertyRector/Fixture/skip_no_allow_dynamic_properties_attribute.php.inc
@@ -0,0 +1,16 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\Class_\DynamicDocBlockPropertyToNativePropertyRector\Fixture;
+
+use Rector\Tests\CodeQuality\Rector\Class_\DynamicDocBlockPropertyToNativePropertyRector\Source\SomeDependency;
+
+/**
+ * @property SomeDependency $someDependency
+ */
+final class SkipNoAllowDynamicPropertiesAttribute
+{
+ public function run(): void
+ {
+ $this->someDependency = new SomeDependency();
+ }
+}
diff --git a/rules/CodeQuality/Rector/Class_/DynamicDocBlockPropertyToNativePropertyRector.php b/rules/CodeQuality/Rector/Class_/DynamicDocBlockPropertyToNativePropertyRector.php
@@ -5,7 +5,6 @@
 namespace Rector\CodeQuality\Rector\Class_;
 
 use PhpParser\Node;
-use PhpParser\Node\Attribute;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
@@ -17,7 +16,7 @@
 use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTagRemover;
 use Rector\CodeQuality\NodeFactory\TypedPropertyFactory;
 use Rector\Comments\NodeDocBlock\DocBlockUpdater;
-use Rector\Doctrine\NodeAnalyzer\AttributeFinder;
+use Rector\Php80\NodeAnalyzer\PhpAttributeAnalyzer;
 use Rector\PhpParser\Node\Value\ValueResolver;
 use Rector\PHPUnit\NodeAnalyzer\TestsNodeAnalyzer;
 use Rector\Rector\AbstractRector;
@@ -33,7 +32,7 @@
 final class DynamicDocBlockPropertyToNativePropertyRector extends AbstractRector implements MinPhpVersionInterface
 {
  public function __construct(
- private readonly AttributeFinder $attributeFinder,
+ private readonly PhpAttributeAnalyzer $phpAttributeAnalyzer,
  private readonly PhpDocInfoFactory $phpDocInfoFactory,
  private readonly PhpDocTagRemover $phpDocTagRemover,
  private readonly DocBlockUpdater $docBlockUpdater,
@@ -89,11 +88,7 @@ public function getNodeTypes(): array
  */
  public function refactor(Node $node): ?Node
  {
- $allowDynamicPropertiesAttribute = $this->attributeFinder->findAttributeByClass(
- $node,
- 'AllowDynamicProperties'
- );
- if (! $allowDynamicPropertiesAttribute instanceof Attribute) {
+ if (! $this->phpAttributeAnalyzer->hasPhpAttribute($node, 'AllowDynamicProperties')) {
  return null;
  }