Skip to content

Commit 064821d

Browse files
authored
[PHPUnit] Add missing DocblockUpdater usage on YieldDataProviderRector when removing @return doc (#416)
1 parent b650d6e commit 064821d

2 files changed

Lines changed: 51 additions & 0 deletions

File tree

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<?php
2+
3+
namespace Rector\PHPUnit\Tests\CodeQuality\Rector\Class_\YieldDataProviderRector\Fixture;
4+
5+
use PHPUnit\Framework\TestCase;
6+
7+
final class RemoveReturnNonArrayDoc extends TestCase
8+
{
9+
#[\PHPUnit\Framework\Attributes\DataProvider('dataProvider')]
10+
public function test(string $filePath): void
11+
{
12+
}
13+
14+
/**
15+
* @return mixed
16+
*/
17+
public static function dataProvider()
18+
{
19+
return [
20+
['<?php implode(\'\', $foo, );', '<?php implode($foo, );'],
21+
['<?php implode(\'\', $foo, );', '<?php implode($foo, );']
22+
];
23+
}
24+
}
25+
26+
?>
27+
-----
28+
<?php
29+
30+
namespace Rector\PHPUnit\Tests\CodeQuality\Rector\Class_\YieldDataProviderRector\Fixture;
31+
32+
use PHPUnit\Framework\TestCase;
33+
34+
final class RemoveReturnNonArrayDoc extends TestCase
35+
{
36+
#[\PHPUnit\Framework\Attributes\DataProvider('dataProvider')]
37+
public function test(string $filePath): void
38+
{
39+
}
40+
41+
public static function dataProvider(): \Iterator
42+
{
43+
yield ['<?php implode(\'\', $foo, );', '<?php implode($foo, );'];
44+
yield ['<?php implode(\'\', $foo, );', '<?php implode($foo, );'];
45+
}
46+
}
47+
48+
?>

rules/CodeQuality/Rector/Class_/YieldDataProviderRector.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use PHPStan\Type\Generic\GenericObjectType;
1616
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
1717
use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger;
18+
use Rector\Comments\NodeDocBlock\DocBlockUpdater;
1819
use Rector\DeadCode\NodeAnalyzer\IsClassMethodUsedAnalyzer;
1920
use Rector\NodeTypeResolver\Node\AttributeKey;
2021
use Rector\PhpParser\NodeTransformer;
@@ -40,6 +41,7 @@ public function __construct(
4041
private readonly PhpDocInfoFactory $phpDocInfoFactory,
4142
private readonly IsClassMethodUsedAnalyzer $isClassMethodUsedAnalyzer,
4243
private readonly PhpDocTypeChanger $phpDocTypeChanger,
44+
private readonly DocBlockUpdater $docBlockUpdater
4345
) {
4446
}
4547

@@ -184,6 +186,7 @@ private function removeReturnTag(ClassMethod $classMethod): void
184186
);
185187
} else {
186188
$phpDocInfo->removeByType(ReturnTagValueNode::class);
189+
$this->docBlockUpdater->updateRefactoredNodeWithPhpDocInfo($classMethod);
187190
}
188191
}
189192
}

0 commit comments

Comments
 (0)