diff --git a/src/Rector/Architecture/PHPUnit/ArrayToYieldDataProviderRector.php b/src/Rector/Architecture/PHPUnit/ArrayToYieldDataProviderRector.php index 85359f676b4..ad814785fc4 100644 --- a/src/Rector/Architecture/PHPUnit/ArrayToYieldDataProviderRector.php +++ b/src/Rector/Architecture/PHPUnit/ArrayToYieldDataProviderRector.php @@ -119,7 +119,11 @@ CODE_SAMPLE private function isInProvideMethod(ClassMethod $classMethodNode): bool { - return (bool) Strings::match($classMethodNode->name, '#^provide*#'); + if (! $classMethodNode->isPublic()) { + return false; + } + + return (bool) Strings::match($classMethodNode->name, '#^(provide|dataProvider)*#'); } private function hasClassMethodReturnArrayOfArrays(ClassMethod $classMethodNode): bool diff --git a/tests/Rector/Architecture/PHPUnit/Correct/correct3.php.inc b/tests/Rector/Architecture/PHPUnit/Correct/correct3.php.inc index 9878b1e5561..e4f5d6b45e8 100644 --- a/tests/Rector/Architecture/PHPUnit/Correct/correct3.php.inc +++ b/tests/Rector/Architecture/PHPUnit/Correct/correct3.php.inc @@ -6,7 +6,7 @@ use PHPUnit\Framework\TestCase; final class MyTestCase extends TestCase { - public function provideWrongToFixedFiles(): \Iterator + public function dataProvider(): \Iterator { yield [__DIR__ . '/Wrong/wrong.php.inc', __DIR__ . '/Correct/correct.php.inc']; } diff --git a/tests/Rector/Architecture/PHPUnit/Wrong/wrong3.php.inc b/tests/Rector/Architecture/PHPUnit/Wrong/wrong3.php.inc index cd829d2d2bd..5513b256366 100644 --- a/tests/Rector/Architecture/PHPUnit/Wrong/wrong3.php.inc +++ b/tests/Rector/Architecture/PHPUnit/Wrong/wrong3.php.inc @@ -6,7 +6,7 @@ use PHPUnit\Framework\TestCase; final class MyTestCase extends TestCase { - public function provideWrongToFixedFiles(): array + public function dataProvider(): array { return [[__DIR__ . '/Wrong/wrong.php.inc', __DIR__ . '/Correct/correct.php.inc']]; }