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

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?php

namespace Rector\PHPUnit\Tests\PHPUnit100\Rector\Class_\RemoveNamedArgsInDataProviderRector\Fixture;

use PHPUnit\Framework\TestCase;

final class SkipProvideDataWithNoNamedArgs extends TestCase
{
/**
* @dataProvider provideData()
*/
public function test()
{
}

public static function provideData()
{
yield [100];
}
}

?>
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
namespace Rector\PHPUnit\PHPUnit100\Rector\Class_;

use PhpParser\Node;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\Array_;
use PhpParser\Node\Expr\ArrayItem;
use PhpParser\Node\Expr\Yield_;
Expand Down Expand Up @@ -99,11 +100,14 @@ public function refactor(Node $node): ?Node
/** @var Expression $stmt */
foreach ($dataProvider->getStmts() ?? [] as $stmt) {
$expr = $stmt->expr;
$arrayChanged = false;
if ($expr instanceof Yield_) {
$this->handleStmt($expr->value);
$hasChanged = true;
$arrayChanged = $this->handleArray($expr->value);
} elseif ($expr instanceof Array_) {
$this->handleStmt($expr);
$arrayChanged = $this->handleArray($expr);
}

if ($arrayChanged) {
$hasChanged = true;
}
}
Expand All @@ -116,16 +120,20 @@ public function refactor(Node $node): ?Node
return null;
}

private function handleStmt(Array_ $array): void
private function handleArray(Array_ $array): bool
{
$hasChanged = false;
foreach ($array->items as $item) {
if (! $item instanceof ArrayItem) {
continue;
}

if (! $item->key instanceof Int_) {
if (! $item->key instanceof Int_ && $item->key instanceof Expr) {
$item->key = null;
$hasChanged = true;
}
}

return $hasChanged;
}
}
Loading