Merge branch '5.4' into 6.2

* 5.4: Migrate to `static` data providers using `rector/rector`
symfony · Feb 14, 2023 · 8ec38e4 · 8ec38e4
2 parents 97235cb + c8336db
commit 8ec38e4
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/Tests/Command/LintCommandTest.php b/Tests/Command/LintCommandTest.php
@@ -171,7 +171,7 @@ public function testComplete(array $input, array $expectedSuggestions)
         $this->assertSame($expectedSuggestions, $tester->complete($input));
     }
 
-    public function provideCompletionSuggestions()
+    public static function provideCompletionSuggestions()
     {
         yield 'option' => [['--format', ''], ['txt', 'json', 'github']];
     }

diff --git a/Tests/DumperTest.php b/Tests/DumperTest.php
@@ -225,7 +225,7 @@ public function testEscapedEscapeSequencesInQuotedScalar($input, $expected)
         $this->assertSameData($input, $this->parser->parse($expected));
     }
 
-    public function getEscapeSequences()
+    public static function getEscapeSequences()
     {
         return [
             'empty string' => ['', "''"],
@@ -275,7 +275,7 @@ public function testDumpObjectAsMap($object, $expected)
         $this->assertSameData($expected, $this->parser->parse($yaml, Yaml::PARSE_OBJECT_FOR_MAP));
     }
 
-    public function objectAsMapProvider()
+    public static function objectAsMapProvider()
     {
         $tests = [];
 

diff --git a/Tests/ParserTest.php b/Tests/ParserTest.php
@@ -146,7 +146,7 @@ public function testTabsAsIndentationInYaml(string $given, string $expectedMessa
         $this->parser->parse($given);
     }
 
-    public function invalidIndentation(): array
+    public static function invalidIndentation(): array
     {
         return [
             [
@@ -191,7 +191,7 @@ public function testValidTokenSeparation(string $given, array $expected)
         $this->assertSameData($expected, $actual);
     }
 
-    public function validTokenSeparators(): array
+    public static function validTokenSeparators(): array
     {
         return [
             [
@@ -224,7 +224,7 @@ public function testEndOfTheDocumentMarker()
         $this->assertEquals('foo', $this->parser->parse($yaml));
     }
 
-    public function getBlockChompingTests()
+    public static function getBlockChompingTests()
     {
         $tests = [];
 
@@ -588,7 +588,7 @@ public function testObjectForMap($yaml, $expected)
         $this->assertSameData($expected, $this->parser->parse($yaml, $flags));
     }
 
-    public function getObjectForMapTests()
+    public static function getObjectForMapTests()
     {
         $tests = [];
 
@@ -835,7 +835,7 @@ public function testNonStringFollowedByCommentEmbeddedInMapping()
         $this->assertSame($expected, $this->parser->parse($yaml));
     }
 
-    public function getParseExceptionNotAffectedMultiLineStringLastResortParsing()
+    public static function getParseExceptionNotAffectedMultiLineStringLastResortParsing()
     {
         $tests = [];
 
@@ -977,7 +977,7 @@ public function testParseExceptionOnDuplicate($input, $duplicateKey, $lineNumber
         Yaml::parse($input);
     }
 
-    public function getParseExceptionOnDuplicateData()
+    public static function getParseExceptionOnDuplicateData()
     {
         $tests = [];
 
@@ -1282,7 +1282,7 @@ public function testCommentLikeStringsAreNotStrippedInBlockScalars($yaml, $expec
         $this->assertSame($expectedParserResult, $this->parser->parse($yaml));
     }
 
-    public function getCommentLikeStringInScalarBlockData()
+    public static function getCommentLikeStringInScalarBlockData()
     {
         $tests = [];
 
@@ -1467,7 +1467,7 @@ public function testParseBinaryData($data)
         $this->assertSame(['data' => 'Hello world'], $this->parser->parse($data));
     }
 
-    public function getBinaryData()
+    public static function getBinaryData()
     {
         return [
             'enclosed with double quotes' => ['data: !!binary "SGVsbG8gd29ybGQ="'],
@@ -1499,7 +1499,7 @@ public function testParseInvalidBinaryData($data, $expectedMessage)
         $this->parser->parse($data);
     }
 
-    public function getInvalidBinaryData()
+    public static function getInvalidBinaryData()
     {
         return [
             'length not a multiple of four' => ['data: !!binary "SGVsbG8d29ybGQ="', '/The normalized base64 encoded data \(data without whitespace characters\) length must be a multiple of four \(\d+ bytes given\)/'],
@@ -1565,7 +1565,7 @@ public function testParserThrowsExceptionWithCorrectLineNumber($lineNumber, $yam
         $this->parser->parse($yaml);
     }
 
-    public function parserThrowsExceptionWithCorrectLineNumberProvider()
+    public static function parserThrowsExceptionWithCorrectLineNumberProvider()
     {
         return [
             [
@@ -1722,7 +1722,7 @@ public function testParseQuotedStringContainingEscapedQuotationCharacters(string
         $this->assertSame($expected, $this->parser->parse($yaml));
     }
 
-    public function escapedQuotationCharactersInQuotedStrings()
+    public static function escapedQuotationCharactersInQuotedStrings()
     {
         return [
             'single quoted string' => [
@@ -1780,7 +1780,7 @@ public function testParseMultiLineMappingValue($yaml, $expected, $parseError)
         $this->assertSame($expected, $this->parser->parse($yaml));
     }
 
-    public function multiLineDataProvider()
+    public static function multiLineDataProvider()
     {
         $tests = [];
 
@@ -1847,7 +1847,7 @@ public function testInlineNotationSpanningMultipleLines($expected, string $yaml)
         $this->assertSame($expected, $this->parser->parse($yaml));
     }
 
-    public function inlineNotationSpanningMultipleLinesProvider(): array
+    public static function inlineNotationSpanningMultipleLinesProvider(): array
     {
         return [
             'mapping' => [
@@ -2236,7 +2236,7 @@ public function testCustomTagSupport($expected, $yaml)
         $this->assertSameData($expected, $this->parser->parse($yaml, Yaml::PARSE_CUSTOM_TAGS));
     }
 
-    public function taggedValuesProvider()
+    public static function taggedValuesProvider()
     {
         return [
             'scalars' => [
@@ -2671,7 +2671,7 @@ public function testDetectCircularReferences($yaml)
         $this->parser->parse($yaml, Yaml::PARSE_CUSTOM_TAGS);
     }
 
-    public function circularReferenceProvider()
+    public static function circularReferenceProvider()
     {
         $tests = [];
 
@@ -2711,7 +2711,7 @@ public function testParseIndentedMappings($yaml, $expected)
         $this->assertSame($expected, $this->parser->parse($yaml));
     }
 
-    public function indentedMappingData()
+    public static function indentedMappingData()
     {
         $tests = [];