mirror of
https://github.com/rectorphp/rector.git
synced 2025-02-24 03:35:01 +01:00
Resolve conflict
This commit is contained in:
parent
4974c1d139
commit
9f7ba49b99
@ -5,24 +5,22 @@ declare(strict_types=1);
|
|||||||
namespace Rector\Symfony\Tests\Rector\ClassMethod\MergeMethodAnnotationToRouteAnnotationRector;
|
namespace Rector\Symfony\Tests\Rector\ClassMethod\MergeMethodAnnotationToRouteAnnotationRector;
|
||||||
|
|
||||||
use Iterator;
|
use Iterator;
|
||||||
|
use Rector\Core\Testing\PHPUnit\AbstractRectorTestCase;
|
||||||
use Rector\Symfony\Rector\ClassMethod\MergeMethodAnnotationToRouteAnnotationRector;
|
use Rector\Symfony\Rector\ClassMethod\MergeMethodAnnotationToRouteAnnotationRector;
|
||||||
use Rector\Testing\PHPUnit\AbstractRectorTestCase;
|
|
||||||
|
|
||||||
final class MergeMethodAnnotationToRouteAnnotationRectorTest extends AbstractRectorTestCase
|
final class MergeMethodAnnotationToRouteAnnotationRectorTest extends AbstractRectorTestCase
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* @dataProvider provideDataForTest()
|
* @dataProvider provideData()
|
||||||
*/
|
*/
|
||||||
public function test(string $file): void
|
public function test(string $file): void
|
||||||
{
|
{
|
||||||
$this->doTestFile($file);
|
$this->doTestFile($file);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function provideDataForTest(): Iterator
|
public function provideData(): Iterator
|
||||||
{
|
{
|
||||||
yield [__DIR__ . '/Fixture/fixture.php.inc'];
|
return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
|
||||||
yield [__DIR__ . '/Fixture/fixture_with_template_annotation.php.inc'];
|
|
||||||
yield [__DIR__ . '/Fixture/fixture_with_template_annotation2.php.inc'];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function getRectorClass(): string
|
protected function getRectorClass(): string
|
||||||
|
Loading…
x
Reference in New Issue
Block a user