From b416a0eeb5f460cbbe94dcf7aa3e07000ed9249e Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sun, 10 Nov 2024 11:34:28 +0700 Subject: [PATCH 1/2] [CodeQuality] Skip possible data provider method called and used as array on YieldDataProviderRector --- .../Fixture/skip_used_as_array.php.inc | 25 +++++++++++++++++++ .../Rector/Class_/YieldDataProviderRector.php | 12 +++++++-- 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 rules-tests/CodeQuality/Rector/Class_/YieldDataProviderRector/Fixture/skip_used_as_array.php.inc diff --git a/rules-tests/CodeQuality/Rector/Class_/YieldDataProviderRector/Fixture/skip_used_as_array.php.inc b/rules-tests/CodeQuality/Rector/Class_/YieldDataProviderRector/Fixture/skip_used_as_array.php.inc new file mode 100644 index 00000000..210c3306 --- /dev/null +++ b/rules-tests/CodeQuality/Rector/Class_/YieldDataProviderRector/Fixture/skip_used_as_array.php.inc @@ -0,0 +1,25 @@ +testsNodeAnalyzer->isInTestClass($node)) { return null; @@ -95,6 +99,10 @@ public function refactor(Node $node): ?Node continue; } + if ($this->isClassMethodUsedAnalyzer->isClassMethodUsed($node, $dataProviderClassMethod, $scope)) { + continue; + } + $this->transformArrayToYieldsOnMethodNode($dataProviderClassMethod, $array); $hasChanged = true; } From eb962a34ec1e5a68673e6d5c99236258b162edeb Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 10 Nov 2024 04:35:21 +0000 Subject: [PATCH 2/2] [ci-review] Rector Rectify --- rules/CodeQuality/Rector/Class_/YieldDataProviderRector.php | 1 - 1 file changed, 1 deletion(-) diff --git a/rules/CodeQuality/Rector/Class_/YieldDataProviderRector.php b/rules/CodeQuality/Rector/Class_/YieldDataProviderRector.php index 9d9938b8..97f2704c 100644 --- a/rules/CodeQuality/Rector/Class_/YieldDataProviderRector.php +++ b/rules/CodeQuality/Rector/Class_/YieldDataProviderRector.php @@ -18,7 +18,6 @@ use Rector\PhpParser\NodeTransformer; use Rector\PHPUnit\NodeAnalyzer\TestsNodeAnalyzer; use Rector\PHPUnit\NodeFinder\DataProviderClassMethodFinder; -use Rector\Rector\AbstractRector; use Rector\Rector\AbstractScopeAwareRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;