Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?php

namespace Rector\PHPUnit\Tests\CodeQuality\Rector\Class_\YieldDataProviderRector\Fixture;

use PHPUnit\Framework\TestCase;

final class SkipWithIf extends TestCase
{
#[\PHPUnit\Framework\Attributes\DataProvider('dataProvider')]
public function test(string $val1, string $val2): void
{
}

public static function dataProvider(): iterable
{
yield from [
['value3', 'value4'],
['value5', 'value6'],
['value7', 'value8'],
];

if (PHP_VERSION_ID < 80100) {
return 1;
}

yield ['value1', 'value2'];
}

}
3 changes: 2 additions & 1 deletion rules/CodeQuality/Rector/Class_/YieldDataProviderRector.php
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,13 @@ private function collectReturnArrayNodesFromClassMethod(ClassMethod $classMethod
return null;
}

$totalStmts = count($classMethod->stmts);
foreach ($classMethod->stmts as $statement) {
if ($statement instanceof Expression) {
$statement = $statement->expr;
}

if ($statement instanceof Return_ || $statement instanceof YieldFrom) {
if ($statement instanceof Return_ || ($statement instanceof YieldFrom && $totalStmts === 1)) {
$returnedExpr = $statement->expr;
if (! $returnedExpr instanceof Array_) {
return null;
Expand Down