Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CodeQuality] Use existing PhpAttributeAnalyzer service instead of AttributeFinder from Doctrine package on DynamicDocBlockPropertyToNativePropertyRector #6382

Merged
merged 4 commits into from
Oct 12, 2024
Merged

[CodeQuality] Use existing PhpAttributeAnalyzer service instead of AttributeFinder from Doctrine package on DynamicDocBlockPropertyToNativePropertyRector #6382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
33b120b
[CodeQuality] Use existing PhpAttributeAnalyzer service instead of At…
samsonasik Oct 12, 2024
3ea77ad
add fixture
samsonasik Oct 12, 2024
2cd6efb
add fixture
samsonasik Oct 12, 2024
23331c3
add fixture
samsonasik Oct 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions ...PropertyToNativePropertyRector/Fixture/skip_no_allow_dynamic_properties_attribute.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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();
}
}
11 changes: 3 additions & 8 deletions rules/CodeQuality/Rector/Class_/DynamicDocBlockPropertyToNativePropertyRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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,
Expand Down Expand Up @@ -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;
}

Expand Down