Skip to content

Commit

Permalink
DX: make data providers return type "iterable" (#7072)
Browse files Browse the repository at this point in the history
  • Loading branch information
kubawerlos committed Jun 22, 2023
1 parent 31b1a2a commit b5d8d91
Show file tree
Hide file tree
Showing 243 changed files with 601 additions and 601 deletions.
2 changes: 1 addition & 1 deletion tests/AbstractDoctrineAnnotationFixerTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public function testConfigureWithInvalidConfiguration(array $configuration): voi
$this->fixer->configure($configuration);
}

public static function provideConfigureWithInvalidConfigurationCases(): array
public static function provideConfigureWithInvalidConfigurationCases(): iterable
{
return [
[['foo' => 'bar']],
Expand Down
2 changes: 1 addition & 1 deletion tests/AbstractFunctionReferenceFixerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public function testAbstractFunctionReferenceFixer(
self::assertFalse($tokens->isChanged());
}

public static function provideAbstractFunctionReferenceFixerCases(): array
public static function provideAbstractFunctionReferenceFixerCases(): iterable
{
return [
'simple case I' => [
Expand Down
2 changes: 1 addition & 1 deletion tests/AutoReview/CommandTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function testCommandHasNameConst(Command $command): void
self::assertNotNull($command::getDefaultName());
}

public static function provideCommandHasNameConstCases(): array
public static function provideCommandHasNameConstCases(): iterable
{
$application = new Application();
$commands = $application->all();
Expand Down
8 changes: 4 additions & 4 deletions tests/AutoReview/ProjectCodeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ static function (\ReflectionMethod $rm): string {
);
}

public static function provideSrcClassCases(): array
public static function provideSrcClassCases(): iterable
{
return array_map(
static function (string $item): array {
Expand All @@ -591,7 +591,7 @@ static function (string $item): array {
);
}

public static function provideThatSrcClassesNotAbuseInterfacesCases(): array
public static function provideThatSrcClassesNotAbuseInterfacesCases(): iterable
{
return array_map(
static function (string $item): array {
Expand Down Expand Up @@ -637,7 +637,7 @@ static function (string $item): array {
);
}

public static function provideThatSrcClassHaveTestClassCases(): array
public static function provideThatSrcClassHaveTestClassCases(): iterable
{
return array_map(
static fn (string $item): array => [$item],
Expand Down Expand Up @@ -667,7 +667,7 @@ public static function provideTestClassCases(): iterable
yield from self::$testClassCases;
}

public static function provideThereIsNoPregFunctionUsedDirectlyCases(): array
public static function provideThereIsNoPregFunctionUsedDirectlyCases(): iterable
{
return array_map(
static fn (string $item): array => [$item],
Expand Down
4 changes: 2 additions & 2 deletions tests/AutoReview/TransformerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public function testTransformerPriorityIsListed(TransformerInterface $transforme
self::fail(sprintf('Transformer "%s" has priority %d but is not in priority test list.', $name, $priority));
}

public static function provideTransformerPriorityCases(): array
public static function provideTransformerPriorityCases(): iterable
{
$transformers = [];

Expand Down Expand Up @@ -102,7 +102,7 @@ public static function provideTransformerPriorityCases(): array
/**
* @return TransformerInterface[]
*/
public static function provideTransformerPriorityIsListedCases(): array
public static function provideTransformerPriorityIsListedCases(): iterable
{
static $transformersArray = null;

Expand Down
4 changes: 2 additions & 2 deletions tests/Cache/CacheTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public function testFromJsonThrowsInvalidArgumentExceptionIfJsonIsMissingKey(arr
Cache::fromJson($json);
}

public static function provideFromJsonThrowsInvalidArgumentExceptionIfJsonIsMissingKeyCases(): array
public static function provideFromJsonThrowsInvalidArgumentExceptionIfJsonIsMissingKeyCases(): iterable
{
$data = [
'php' => '7.1.2',
Expand Down Expand Up @@ -158,7 +158,7 @@ public function testCanConvertToAndFromJson(SignatureInterface $signature): void
self::assertSame($hash, $cached->get($file));
}

public static function provideCanConvertToAndFromJsonCases(): array
public static function provideCanConvertToAndFromJsonCases(): iterable
{
$toolInfo = new ToolInfo();
$config = new Config();
Expand Down
2 changes: 1 addition & 1 deletion tests/ConfigTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ public function testConfigDefault(): void
self::assertFalse($config->getUsingCache());
}

public static function provideRegisterCustomFixersCases(): array
public static function provideRegisterCustomFixersCases(): iterable
{
$fixers = [
new NoWhitespaceBeforeCommaInArrayFixer(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public function testCalculate(int $expected, bool $isDryRun, bool $hasChangedFil
);
}

public static function provideCalculateCases(): array
public static function provideCalculateCases(): iterable
{
return [
[0, true, false, false, false, false],
Expand Down
8 changes: 4 additions & 4 deletions tests/Console/Command/SelfUpdateCommandTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public function testCommandName(string $name): void
self::assertSame($command, $application->find($name));
}

public static function provideCommandNameCases(): array
public static function provideCommandNameCases(): iterable
{
return [
['self-update'],
Expand Down Expand Up @@ -135,7 +135,7 @@ public function testExecute(
self::assertSame(0, $commandTester->getStatusCode());
}

public static function provideExecuteCases(): array
public static function provideExecuteCases(): iterable
{
$currentVersion = Application::VERSION;
$minorRelease = self::getNewMinorReleaseVersion();
Expand Down Expand Up @@ -276,7 +276,7 @@ public function testExecuteWhenNotAbleToGetLatestVersions(
self::assertSame(1, $commandTester->getStatusCode());
}

public static function provideExecuteWhenNotAbleToGetLatestVersionsCases(): array
public static function provideExecuteWhenNotAbleToGetLatestVersionsCases(): iterable
{
return [
[false, false, [], true],
Expand Down Expand Up @@ -322,7 +322,7 @@ public function testExecuteWhenNotInstalledAsPhar(array $input, bool $decorated)
self::assertSame(1, $commandTester->getStatusCode());
}

public static function provideExecuteWhenNotInstalledAsPharCases(): array
public static function provideExecuteWhenNotInstalledAsPharCases(): iterable
{
return [
[[], true],
Expand Down
16 changes: 8 additions & 8 deletions tests/Console/ConfigurationResolverTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public function testResolveProgressWithNegativeConfigAndExplicitProgress(string
self::assertSame($progressType, $resolver->getProgress());
}

public static function provideProgressTypeCases(): array
public static function provideProgressTypeCases(): iterable
{
return [
['none'],
Expand Down Expand Up @@ -195,7 +195,7 @@ public function testResolveConfigFileChooseFile(string $expectedFile, string $ex
self::assertInstanceOf($expectedClass, $resolver->getConfig());
}

public static function provideResolveConfigFileChooseFileCases(): array
public static function provideResolveConfigFileChooseFileCases(): iterable
{
$dirBase = self::getFixtureDir();

Expand Down Expand Up @@ -498,7 +498,7 @@ static function (\SplFileInfo $file): string {
self::assertSame($expected, $intersectionItems);
}

public static function provideResolveIntersectionOfPathsCases(): array
public static function provideResolveIntersectionOfPathsCases(): iterable
{
$dir = __DIR__.'/../Fixtures/ConfigurationResolverPathsIntersection';
$cb = static function (array $items) use ($dir): array {
Expand Down Expand Up @@ -666,7 +666,7 @@ public function testConfigFinderIsOverridden(array $options, bool $expectedResul
self::assertSame($expectedResult, $resolver->configFinderIsOverridden());
}

public static function provideConfigFinderIsOverriddenCases(): array
public static function provideConfigFinderIsOverriddenCases(): iterable
{
$root = __DIR__.'/../..';

Expand Down Expand Up @@ -1080,7 +1080,7 @@ public function testResolveDiffer(string $expected, $diffConfig): void
self::assertInstanceOf($expected, $resolver->getDiffer());
}

public static function provideResolveDifferCases(): array
public static function provideResolveDifferCases(): iterable
{
return [
[
Expand Down Expand Up @@ -1121,7 +1121,7 @@ public function testDeprecationOfPassingOtherThanNoOrYes(): void
$resolver->getRiskyAllowed();
}

public static function provideResolveBooleanOptionCases(): array
public static function provideResolveBooleanOptionCases(): iterable
{
return [
[true, true, 'yes'],
Expand Down Expand Up @@ -1162,7 +1162,7 @@ public function testDeprecatedFixerConfigured($ruleConfig): void
$resolver->getFixers();
}

public static function provideDeprecatedFixerConfiguredCases(): array
public static function provideDeprecatedFixerConfiguredCases(): iterable
{
return [
[true],
Expand All @@ -1171,7 +1171,7 @@ public static function provideDeprecatedFixerConfiguredCases(): array
];
}

public static function provideGetDirectoryCases(): array
public static function provideGetDirectoryCases(): iterable
{
return [
[null, '/my/path/my/file', 'my/file'],
Expand Down
2 changes: 1 addition & 1 deletion tests/Console/Output/ErrorOutputTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public function testErrorOutput(Error $error, int $verbosityLevel, int $lineNumb
self::assertStringStartsWith($startWith, $displayed);
}

public static function provideErrorOutputCases(): array
public static function provideErrorOutputCases(): iterable
{
$lineNumber = __LINE__;
[$exceptionLineNumber, $error] = self::getErrorAndLineNumber(); // note: keep call and __LINE__ separated with one line break
Expand Down
2 changes: 1 addition & 1 deletion tests/Console/Output/ProcessOutputTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public function testProcessProgressOutput(array $statuses, string $expectedOutpu
self::assertSame($expectedOutput, $output->fetch());
}

public static function provideProcessProgressOutputCases(): array
public static function provideProcessProgressOutputCases(): iterable
{
return [
[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ final public function testGenerate(string $expectedReport, ReportSummary $report
$this->assertFormat($expectedReport, $actualReport);
}

final public static function provideGenerateCases(): array
final public static function provideGenerateCases(): iterable
{
return [
'no errors' => [
Expand Down
4 changes: 2 additions & 2 deletions tests/Console/SelfUpdate/NewVersionCheckerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public function testGetLatestVersionOfMajor(int $majorVersion, ?string $expected
self::assertSame($expectedVersion, $checker->getLatestVersionOfMajor($majorVersion));
}

public static function provideGetLatestVersionOfMajorCases(): array
public static function provideGetLatestVersionOfMajorCases(): iterable
{
return [
[1, 'v1.13.2'],
Expand All @@ -68,7 +68,7 @@ public function testCompareVersions(string $versionA, string $versionB, int $exp
);
}

public static function provideCompareVersionsCases(): array
public static function provideCompareVersionsCases(): iterable
{
$cases = [];

Expand Down
2 changes: 1 addition & 1 deletion tests/Differ/DiffConsoleFormatterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function testDiffConsoleFormatter(string $expected, bool $isDecoratedOutp
);
}

public static function provideDiffConsoleFormatterCases(): array
public static function provideDiffConsoleFormatterCases(): iterable
{
return [
[
Expand Down
8 changes: 4 additions & 4 deletions tests/DocBlock/AnnotationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ public function testRemoveEdgeCases(string $expected, string $input): void
self::assertSame($expected, $doc->getContent());
}

public static function provideRemoveEdgeCasesCases(): array
public static function provideRemoveEdgeCasesCases(): iterable
{
return [
// Single line
Expand Down Expand Up @@ -242,7 +242,7 @@ public function testTypeParsing(array $expected, string $input): void
self::assertSame($expected, $tag->getTypes());
}

public static function provideTypeParsingCases(): array
public static function provideTypeParsingCases(): iterable
{
return [
[
Expand Down Expand Up @@ -468,7 +468,7 @@ public function testTypes(array $expected, array $new, string $input, string $ou
self::assertSame($output, $line->getContent());
}

public static function provideTypesCases(): array
public static function provideTypesCases(): iterable
{
return [
[['Foo', 'null'], ['Bar[]'], ' * @param Foo|null $foo', ' * @param Bar[] $foo'],
Expand All @@ -494,7 +494,7 @@ public function testNormalizedTypes(array $expected, string $input): void
self::assertSame($expected, $tag->getNormalizedTypes());
}

public static function provideNormalizedTypesCases(): array
public static function provideNormalizedTypesCases(): iterable
{
return [
[['null', 'string'], '* @param StRiNg|NuLl $foo'],
Expand Down
4 changes: 2 additions & 2 deletions tests/DocBlock/DocBlockTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ public function testMakeMultiLIne(string $inputDocBlock, string $outputDocBlock
self::assertSame($outputDocBlock, $doc->getContent());
}

public static function provideMakeMultiLIneCases(): array
public static function provideMakeMultiLIneCases(): iterable
{
return [
'It keeps a multi line doc block as is' => [
Expand Down Expand Up @@ -215,7 +215,7 @@ public function testMakeSingleLine(string $inputDocBlock, string $outputDocBlock
self::assertSame($outputDocBlock, $doc->getContent());
}

public static function provideMakeSingleLineCases(): array
public static function provideMakeSingleLineCases(): iterable
{
return [
'It keeps a single line doc block as is' => [
Expand Down
2 changes: 1 addition & 1 deletion tests/DocBlock/ShortDescriptionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function testGetEnd(?int $expected, string $input): void
self::assertSame($expected, $shortDescription->getEnd());
}

public static function provideGetEndCases(): array
public static function provideGetEndCases(): iterable
{
return [
[1, '/**
Expand Down
4 changes: 2 additions & 2 deletions tests/DocBlock/TagComparatorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public function testComparatorTogether(string $first, string $second, bool $expe
self::assertSame($expected, TagComparator::shouldBeTogether($tag1, $tag2));
}

public static function provideComparatorTogetherCases(): array
public static function provideComparatorTogetherCases(): iterable
{
return [
['return', 'return', true],
Expand Down Expand Up @@ -79,7 +79,7 @@ public function testComparatorTogetherWithDefinedGroups(array $groups, string $f
);
}

public static function provideComparatorTogetherWithDefinedGroupsCases(): array
public static function provideComparatorTogetherWithDefinedGroupsCases(): iterable
{
return [
[[['param', 'return']], 'return', 'return', true],
Expand Down
4 changes: 2 additions & 2 deletions tests/DocBlock/TagTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public function testName(string $expected, string $new, string $input): void
self::assertSame($new, $tag->getName());
}

public static function provideNameCases(): array
public static function provideNameCases(): iterable
{
return [
['param', 'var', ' * @param Foo $foo'],
Expand All @@ -72,7 +72,7 @@ public function testValid(bool $expected, string $input): void
self::assertSame($expected, $tag->valid());
}

public static function provideValidCases(): array
public static function provideValidCases(): iterable
{
return [
[true, ' * @param Foo $foo'],
Expand Down
4 changes: 2 additions & 2 deletions tests/Doctrine/Annotation/TokenTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public function testIsTypeReturnsTrue(int $type, $types): void
self::assertTrue($token->isType($types));
}

public static function provideIsTypeReturnsTrueCases(): array
public static function provideIsTypeReturnsTrueCases(): iterable
{
return [
'same-value' => [
Expand Down Expand Up @@ -105,7 +105,7 @@ public function testIsTypeReturnsFalse(int $type, $types): void
self::assertFalse($token->isType($types));
}

public static function provideIsTypeReturnsFalseCases(): array
public static function provideIsTypeReturnsFalseCases(): iterable
{
return [
'different-value' => [
Expand Down

0 comments on commit b5d8d91

Please sign in to comment.