Merge branch '5.4' into 6.2

nicolas-grekas · nicolas-grekas · commit 249271da6f54 · 2023-02-14T09:44:56.000+01:00
* 5.4:
  Migrate to `static` data providers using `rector/rector`
diff --git a/Tests/Builder/GeneratedConfigTest.php b/Tests/Builder/GeneratedConfigTest.php
@@ -53,7 +53,7 @@ protected function tearDown(): void
         parent::tearDown();
     }
 
-    public function fixtureNames()
+    public static function fixtureNames()
     {
         $array = [
             'ScalarNormalizedTypes' => 'scalar_normalized_types',
diff --git a/Tests/ConfigCacheTest.php b/Tests/ConfigCacheTest.php
@@ -96,7 +96,7 @@ public function testStaleResourceInDebug()
         $this->assertFalse($cache->isFresh());
     }
 
-    public function debugModes(): array
+    public static function debugModes(): array
     {
         return [
             [true],
diff --git a/Tests/Definition/ArrayNodeTest.php b/Tests/Definition/ArrayNodeTest.php
@@ -55,7 +55,7 @@ public function testNormalizeWithoutProposals()
         $node->normalize(['beta' => 'foo']);
     }
 
-    public function ignoreAndRemoveMatrixProvider(): array
+    public static function ignoreAndRemoveMatrixProvider(): array
     {
         $unrecognizedOptionException = new InvalidConfigurationException('Unrecognized option "foo" under "root"');
 
@@ -94,7 +94,7 @@ public function testPreNormalize(array $denormalized, array $normalized)
         $this->assertSame($normalized, $r->invoke($node, $denormalized));
     }
 
-    public function getPreNormalizationTests(): array
+    public static function getPreNormalizationTests(): array
     {
         return [
             [
@@ -135,7 +135,7 @@ public function testNodeNameCanBeZero(array $denormalized, array $normalized)
         $this->assertSame($normalized, $r->invoke($rootNode, $denormalized));
     }
 
-    public function getZeroNamedNodeExamplesData(): array
+    public static function getZeroNamedNodeExamplesData(): array
     {
         return [
             [
@@ -181,7 +181,7 @@ public function testChildrenOrderIsMaintainedOnNormalizeValue(array $prenormaliz
         $this->assertSame($normalized, $r->invoke($node, $prenormalized));
     }
 
-    public function getPreNormalizedNormalizedOrderedData(): array
+    public static function getPreNormalizedNormalizedOrderedData(): array
     {
         return [
             [
@@ -311,7 +311,7 @@ public function testMergeWithIgnoringExtraKeys(array $prenormalizeds, array $mer
         $this->assertEquals($merged, $r->invoke($node, ...$prenormalizeds));
     }
 
-    public function getDataWithIncludedExtraKeys(): array
+    public static function getDataWithIncludedExtraKeys(): array
     {
         return [
             [
diff --git a/Tests/Definition/BaseNodeTest.php b/Tests/Definition/BaseNodeTest.php
@@ -41,7 +41,7 @@ public function testGetPathForChildNode(string $expected, array $params)
         $this->assertSame($expected, $node->getPath());
     }
 
-    public function providePath(): array
+    public static function providePath(): array
     {
         return [
             'name only' => ['root', ['root']],
diff --git a/Tests/Definition/BooleanNodeTest.php b/Tests/Definition/BooleanNodeTest.php
@@ -37,7 +37,7 @@ public function testValidNonEmptyValues(bool $value)
         $this->assertSame($value, $node->finalize($value));
     }
 
-    public function getValidValues(): array
+    public static function getValidValues(): array
     {
         return [
             [false],
@@ -55,7 +55,7 @@ public function testNormalizeThrowsExceptionOnInvalidValues($value)
         $node->normalize($value);
     }
 
-    public function getInvalidValues(): array
+    public static function getInvalidValues(): array
     {
         return [
             [null],
diff --git a/Tests/Definition/Builder/ArrayNodeDefinitionTest.php b/Tests/Definition/Builder/ArrayNodeDefinitionTest.php
@@ -52,7 +52,7 @@ public function testPrototypeNodeSpecificOption(string $method, array $args)
         $node->getNode();
     }
 
-    public function providePrototypeNodeSpecificCalls(): array
+    public static function providePrototypeNodeSpecificCalls(): array
     {
         return [
             ['defaultValue', [[]]],
@@ -132,7 +132,7 @@ public function testPrototypedArrayNodeDefault(int|array|string|null $args, bool
         }
     }
 
-    public function providePrototypedArrayNodeDefaults(): array
+    public static function providePrototypedArrayNodeDefaults(): array
     {
         return [
             [null, true, false, [[]]],
@@ -293,7 +293,7 @@ public function testPrototypeEnum()
         $this->assertEquals($node->prototype('enum'), $node->enumPrototype());
     }
 
-    public function getEnableableNodeFixtures(): array
+    public static function getEnableableNodeFixtures(): array
     {
         return [
             [['enabled' => true, 'foo' => 'bar'], [true], 'true enables an enableable node'],
diff --git a/Tests/Definition/Builder/ExprBuilderTest.php b/Tests/Definition/Builder/ExprBuilderTest.php
@@ -159,7 +159,7 @@ public function testCastToArrayExpression($configValue, array $expectedValue)
         $this->assertFinalizedValueIs($expectedValue, $test, ['key' => $configValue]);
     }
 
-    public function castToArrayValues(): iterable
+    public static function castToArrayValues(): iterable
     {
         yield ['value', ['value']];
         yield [-3.14, [-3.14]];
diff --git a/Tests/Definition/Dumper/YamlReferenceDumperTest.php b/Tests/Definition/Dumper/YamlReferenceDumperTest.php
@@ -26,7 +26,7 @@ public function testDumper()
         $this->assertEquals($this->getConfigurationAsString(), $dumper->dump($configuration));
     }
 
-    public function provideDumpAtPath(): array
+    public static function provideDumpAtPath(): array
     {
         return [
             'Regular node' => ['scalar_true', <<<EOL
diff --git a/Tests/Definition/FloatNodeTest.php b/Tests/Definition/FloatNodeTest.php
@@ -37,7 +37,7 @@ public function testValidNonEmptyValues(int|float $value)
         $this->assertSame($value, $node->finalize($value));
     }
 
-    public function getValidValues(): array
+    public static function getValidValues(): array
     {
         return [
             [1798.0],
@@ -61,7 +61,7 @@ public function testNormalizeThrowsExceptionOnInvalidValues($value)
         $node->normalize($value);
     }
 
-    public function getInvalidValues(): array
+    public static function getInvalidValues(): array
     {
         return [
             [null],
diff --git a/Tests/Definition/IntegerNodeTest.php b/Tests/Definition/IntegerNodeTest.php
@@ -37,7 +37,7 @@ public function testValidNonEmptyValues(int $value)
         $this->assertSame($value, $node->finalize($value));
     }
 
-    public function getValidValues(): array
+    public static function getValidValues(): array
     {
         return [
             [1798],
@@ -56,7 +56,7 @@ public function testNormalizeThrowsExceptionOnInvalidValues($value)
         $node->normalize($value);
     }
 
-    public function getInvalidValues(): array
+    public static function getInvalidValues(): array
     {
         return [
             [null],
diff --git a/Tests/Definition/NormalizationTest.php b/Tests/Definition/NormalizationTest.php
@@ -51,7 +51,7 @@ public function testNormalizeEncoders($denormalized)
         $this->assertNormalized($tree, $denormalized, $normalized);
     }
 
-    public function getEncoderTests(): array
+    public static function getEncoderTests(): array
     {
         $configs = [];
 
@@ -120,7 +120,7 @@ public function testAnonymousKeysArray($denormalized)
         $this->assertNormalized($tree, $denormalized, $normalized);
     }
 
-    public function getAnonymousKeysTests(): array
+    public static function getAnonymousKeysTests(): array
     {
         $configs = [];
 
@@ -151,7 +151,7 @@ public function testNumericKeysAsAttributes($denormalized)
         $this->assertNormalized($this->getNumericKeysTestTree(), $denormalized, $normalized);
     }
 
-    public function getNumericKeysTests(): array
+    public static function getNumericKeysTests(): array
     {
         $configs = [];
 
diff --git a/Tests/Definition/PrototypedArrayNodeTest.php b/Tests/Definition/PrototypedArrayNodeTest.php
@@ -280,7 +280,7 @@ public function testMappedAttributeKeyIsRemovedLeftValueOnly($value, array $chil
         $this->assertEquals($expected, $normalized);
     }
 
-    public function getDataForKeyRemovedLeftValueOnly(): array
+    public static function getDataForKeyRemovedLeftValueOnly(): array
     {
         $scalarValue = new ScalarNode('value');
 
@@ -354,7 +354,7 @@ public function testPrototypedArrayNodeMerge(array $left, array $right, array $e
         self::assertSame($result, $expected);
     }
 
-    public function getPrototypedArrayNodeDataToMerge(): array
+    public static function getPrototypedArrayNodeDataToMerge(): array
     {
         return [
             // data to merged is a plain array
diff --git a/Tests/Definition/ScalarNodeTest.php b/Tests/Definition/ScalarNodeTest.php
@@ -28,7 +28,7 @@ public function testNormalize($value)
         $this->assertSame($value, $node->normalize($value));
     }
 
-    public function getValidValues(): array
+    public static function getValidValues(): array
     {
         return [
             [false],
@@ -93,7 +93,7 @@ public function testNormalizeThrowsExceptionOnInvalidValues($value)
         $node->normalize($value);
     }
 
-    public function getInvalidValues(): array
+    public static function getInvalidValues(): array
     {
         return [
             [[]],
@@ -136,7 +136,7 @@ public function testValidNonEmptyValues($value)
         $this->assertSame($value, $node->finalize($value));
     }
 
-    public function getValidNonEmptyValues(): array
+    public static function getValidNonEmptyValues(): array
     {
         return [
             [false],
@@ -162,7 +162,7 @@ public function testNotAllowedEmptyValuesThrowException($value)
         $node->finalize($value);
     }
 
-    public function getEmptyValues(): array
+    public static function getEmptyValues(): array
     {
         return [
             [null],
diff --git a/Tests/FileLocatorTest.php b/Tests/FileLocatorTest.php
@@ -29,7 +29,7 @@ public function testIsAbsolutePath(string $path)
         $this->assertTrue($m->invoke($loader, $path), '->isAbsolutePath() returns true for an absolute path');
     }
 
-    public function getIsAbsolutePathTests(): array
+    public static function getIsAbsolutePathTests(): array
     {
         return [
             ['/foo.xml'],
diff --git a/Tests/Loader/FileLoaderTest.php b/Tests/Loader/FileLoaderTest.php
@@ -139,7 +139,7 @@ public function testExcludeTrailingSlashConsistency(string $exclude)
         $this->assertNotContains('baz.txt', $loadedFiles);
     }
 
-    public function excludeTrailingSlashConsistencyProvider(): iterable
+    public static function excludeTrailingSlashConsistencyProvider(): iterable
     {
         yield [__DIR__.'/../Fixtures/Exclude/ExcludeToo/'];
         yield [__DIR__.'/../Fixtures/Exclude/ExcludeToo'];
diff --git a/Tests/Resource/ReflectionClassResourceTest.php b/Tests/Resource/ReflectionClassResourceTest.php
@@ -116,7 +116,7 @@ public function testHashedSignature(bool $changeExpected, int $changedLine, ?str
         }
     }
 
-    public function provideHashedSignature(): iterable
+    public static function provideHashedSignature(): iterable
     {
         yield [false, 0, "// line change\n\n"];
         yield [true, 0, '/** class docblock */'];
diff --git a/Tests/Util/XmlUtilsTest.php b/Tests/Util/XmlUtilsTest.php
@@ -124,7 +124,7 @@ public function testConvertDomToArray($expected, string $xml, bool $root = false
         $this->assertSame($expected, XmlUtils::convertDomElementToArray($dom->documentElement, $checkPrefix));
     }
 
-    public function getDataForConvertDomToArray(): array
+    public static function getDataForConvertDomToArray(): array
     {
         return [
             [null, ''],
@@ -155,7 +155,7 @@ public function testPhpize($expected, string $value)
         $this->assertSame($expected, XmlUtils::phpize($value));
     }
 
-    public function getDataForPhpize(): array
+    public static function getDataForPhpize(): array
     {
         return [
             ['', ''],

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ protected function tearDown(): void`
`53`	`53`	`parent::tearDown();`
`54`	`54`	`}`
`55`	`55`
`56`		`- public function fixtureNames()`
	`56`	`+ public static function fixtureNames()`
`57`	`57`	`{`
`58`	`58`	`$array = [`
`59`	`59`	`'ScalarNormalizedTypes' => 'scalar_normalized_types',`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public function testStaleResourceInDebug()`
`96`	`96`	`$this->assertFalse($cache->isFresh());`
`97`	`97`	`}`
`98`	`98`
`99`		`- public function debugModes(): array`
	`99`	`+ public static function debugModes(): array`
`100`	`100`	`{`
`101`	`101`	`return [`
`102`	`102`	`[true],`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function testNormalizeWithoutProposals()`
`55`	`55`	`$node->normalize(['beta' => 'foo']);`
`56`	`56`	`}`
`57`	`57`
`58`		`- public function ignoreAndRemoveMatrixProvider(): array`
	`58`	`+ public static function ignoreAndRemoveMatrixProvider(): array`
`59`	`59`	`{`
`60`	`60`	`$unrecognizedOptionException = new InvalidConfigurationException('Unrecognized option "foo" under "root"');`
`61`	`61`
`@@ -94,7 +94,7 @@ public function testPreNormalize(array $denormalized, array $normalized)`
`94`	`94`	`$this->assertSame($normalized, $r->invoke($node, $denormalized));`
`95`	`95`	`}`
`96`	`96`
`97`		`- public function getPreNormalizationTests(): array`
	`97`	`+ public static function getPreNormalizationTests(): array`
`98`	`98`	`{`
`99`	`99`	`return [`
`100`	`100`	`[`
`@@ -135,7 +135,7 @@ public function testNodeNameCanBeZero(array $denormalized, array $normalized)`
`135`	`135`	`$this->assertSame($normalized, $r->invoke($rootNode, $denormalized));`
`136`	`136`	`}`
`137`	`137`
`138`		`- public function getZeroNamedNodeExamplesData(): array`
	`138`	`+ public static function getZeroNamedNodeExamplesData(): array`
`139`	`139`	`{`
`140`	`140`	`return [`
`141`	`141`	`[`
`@@ -181,7 +181,7 @@ public function testChildrenOrderIsMaintainedOnNormalizeValue(array $prenormaliz`
`181`	`181`	`$this->assertSame($normalized, $r->invoke($node, $prenormalized));`
`182`	`182`	`}`
`183`	`183`
`184`		`- public function getPreNormalizedNormalizedOrderedData(): array`
	`184`	`+ public static function getPreNormalizedNormalizedOrderedData(): array`
`185`	`185`	`{`
`186`	`186`	`return [`
`187`	`187`	`[`
`@@ -311,7 +311,7 @@ public function testMergeWithIgnoringExtraKeys(array $prenormalizeds, array $mer`
`311`	`311`	`$this->assertEquals($merged, $r->invoke($node, ...$prenormalizeds));`
`312`	`312`	`}`
`313`	`313`
`314`		`- public function getDataWithIncludedExtraKeys(): array`
	`314`	`+ public static function getDataWithIncludedExtraKeys(): array`
`315`	`315`	`{`
`316`	`316`	`return [`
`317`	`317`	`[`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function testGetPathForChildNode(string $expected, array $params)`
`41`	`41`	`$this->assertSame($expected, $node->getPath());`
`42`	`42`	`}`
`43`	`43`
`44`		`- public function providePath(): array`
	`44`	`+ public static function providePath(): array`
`45`	`45`	`{`
`46`	`46`	`return [`
`47`	`47`	`'name only' => ['root', ['root']],`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function testValidNonEmptyValues(bool $value)`
`37`	`37`	`$this->assertSame($value, $node->finalize($value));`
`38`	`38`	`}`
`39`	`39`
`40`		`- public function getValidValues(): array`
	`40`	`+ public static function getValidValues(): array`
`41`	`41`	`{`
`42`	`42`	`return [`
`43`	`43`	`[false],`
`@@ -55,7 +55,7 @@ public function testNormalizeThrowsExceptionOnInvalidValues($value)`
`55`	`55`	`$node->normalize($value);`
`56`	`56`	`}`
`57`	`57`
`58`		`- public function getInvalidValues(): array`
	`58`	`+ public static function getInvalidValues(): array`
`59`	`59`	`{`
`60`	`60`	`return [`
`61`	`61`	`[null],`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function testPrototypeNodeSpecificOption(string $method, array $args)`
`52`	`52`	`$node->getNode();`
`53`	`53`	`}`
`54`	`54`
`55`		`- public function providePrototypeNodeSpecificCalls(): array`
	`55`	`+ public static function providePrototypeNodeSpecificCalls(): array`
`56`	`56`	`{`
`57`	`57`	`return [`
`58`	`58`	`['defaultValue', [[]]],`
`@@ -132,7 +132,7 @@ public function testPrototypedArrayNodeDefault(int\|array\|string\|null $args, bool`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`
`135`		`- public function providePrototypedArrayNodeDefaults(): array`
	`135`	`+ public static function providePrototypedArrayNodeDefaults(): array`
`136`	`136`	`{`
`137`	`137`	`return [`
`138`	`138`	`[null, true, false, [[]]],`
`@@ -293,7 +293,7 @@ public function testPrototypeEnum()`
`293`	`293`	`$this->assertEquals($node->prototype('enum'), $node->enumPrototype());`
`294`	`294`	`}`
`295`	`295`
`296`		`- public function getEnableableNodeFixtures(): array`
	`296`	`+ public static function getEnableableNodeFixtures(): array`
`297`	`297`	`{`
`298`	`298`	`return [`
`299`	`299`	`[['enabled' => true, 'foo' => 'bar'], [true], 'true enables an enableable node'],`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ public function testCastToArrayExpression($configValue, array $expectedValue)`
`159`	`159`	`$this->assertFinalizedValueIs($expectedValue, $test, ['key' => $configValue]);`
`160`	`160`	`}`
`161`	`161`
`162`		`- public function castToArrayValues(): iterable`
	`162`	`+ public static function castToArrayValues(): iterable`
`163`	`163`	`{`
`164`	`164`	`yield ['value', ['value']];`
`165`	`165`	`yield [-3.14, [-3.14]];`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public function testDumper()`
`26`	`26`	`$this->assertEquals($this->getConfigurationAsString(), $dumper->dump($configuration));`
`27`	`27`	`}`
`28`	`28`
`29`		`- public function provideDumpAtPath(): array`
	`29`	`+ public static function provideDumpAtPath(): array`
`30`	`30`	`{`
`31`	`31`	`return [`
`32`	`32`	`'Regular node' => ['scalar_true', <<<EOL`