Merge branch '5.4' into 6.2

* 5.4: Migrate to `static` data providers using `rector/rector`
symfony · Feb 14, 2023 · e27ea15 · e27ea15
2 parents d1347f0 + 3c2942a
commit e27ea15
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/Tests/Caster/CasterTest.php b/Tests/Caster/CasterTest.php
@@ -46,7 +46,7 @@ public function testFilter($filter, $expectedDiff, $listedProperties = null)
         $this->assertSame($expectedDiff, array_diff_assoc(self::$referenceArray, $filteredArray));
     }
 
-    public function provideFilter()
+    public static function provideFilter()
     {
         return [
             [

diff --git a/Tests/Caster/DateCasterTest.php b/Tests/Caster/DateCasterTest.php
@@ -90,7 +90,7 @@ public function testCastDateTime($time, $timezone, $xDate, $xTimestamp, $xInfos)
         $this->assertDumpMatchesFormat($xDump, $cast["\0~\0date"]);
     }
 
-    public function provideDateTimes()
+    public static function provideDateTimes()
     {
         return [
             ['2017-04-30 00:00:00.000000', 'Europe/Zurich', '2017-04-30 00:00:00.0 Europe/Zurich (+02:00)', 1493503200, 'Sunday, April 30, 2017%Afrom now%ADST On'],
@@ -210,7 +210,7 @@ public function testCastInterval($intervalSpec, $ms, $invert, $xInterval, $xSeco
         $this->assertDumpMatchesFormat($xDump, $cast["\0~\0interval"]);
     }
 
-    public function provideIntervals()
+    public static function provideIntervals()
     {
         return [
             ['PT0S', 0, 0, '0s', '0s'],
@@ -309,7 +309,7 @@ public function testCastTimeZone($timezone, $xTimezone, $xRegion)
         $this->assertDumpMatchesFormat($xDump, $cast["\0~\0timezone"]);
     }
 
-    public function provideTimeZones()
+    public static function provideTimeZones()
     {
         $xRegion = \extension_loaded('intl') ? '%s' : '';
 
@@ -386,7 +386,7 @@ public function testCastPeriod($start, $interval, $end, $options, $xPeriod, $xDa
         $this->assertDumpMatchesFormat($xDump, $cast["\0~\0period"]);
     }
 
-    public function providePeriods()
+    public static function providePeriods()
     {
         $periods = [
             ['2017-01-01', 'P1D', '2017-01-03', 0, 'every + 1d, from [2017-01-01 00:00:00.0 to 2017-01-03 00:00:00.0[', '1) 2017-01-01%a2) 2017-01-02'],

diff --git a/Tests/Caster/SplCasterTest.php b/Tests/Caster/SplCasterTest.php
@@ -21,7 +21,7 @@ class SplCasterTest extends TestCase
 {
     use VarDumperTestTrait;
 
-    public function getCastFileInfoTests()
+    public static function getCastFileInfoTests()
     {
         return [
             [__FILE__, <<<'EOTXT'
@@ -135,7 +135,7 @@ public function testCastSplDoublyLinkedList($modeValue, $modeDump)
         $this->assertDumpMatchesFormat($dump, $var);
     }
 
-    public function provideCastSplDoublyLinkedList()
+    public static function provideCastSplDoublyLinkedList()
     {
         return [
             [\SplDoublyLinkedList::IT_MODE_FIFO, 'IT_MODE_FIFO | IT_MODE_KEEP'],

diff --git a/Tests/Caster/XmlReaderCasterTest.php b/Tests/Caster/XmlReaderCasterTest.php
@@ -64,7 +64,7 @@ public function testNodes($seek, $expectedDump)
         $this->assertDumpMatchesFormat($expectedDump, $this->reader);
     }
 
-    public function provideNodes()
+    public static function provideNodes()
     {
         return [
             [0, <<<'EODUMP'

diff --git a/Tests/Command/Descriptor/CliDescriptorTest.php b/Tests/Command/Descriptor/CliDescriptorTest.php
@@ -54,7 +54,7 @@ public function testDescribe(array $context, string $expectedOutput, bool $decor
         $this->assertStringMatchesFormat(trim($expectedOutput), str_replace(\PHP_EOL, "\n", trim($output->fetch())));
     }
 
-    public function provideContext()
+    public static function provideContext()
     {
         yield 'source' => [
             [

diff --git a/Tests/Command/Descriptor/HtmlDescriptorTest.php b/Tests/Command/Descriptor/HtmlDescriptorTest.php
@@ -63,7 +63,7 @@ public function testDescribe(array $context, string $expectedOutput)
         $this->assertStringMatchesFormat(trim($expectedOutput), trim(preg_replace('@<style>.*</style><script>.*</script>@s', '', $output->fetch())));
     }
 
-    public function provideContext()
+    public static function provideContext()
     {
         yield 'source' => [
             [

diff --git a/Tests/Command/ServerDumpCommandTest.php b/Tests/Command/ServerDumpCommandTest.php
@@ -28,7 +28,7 @@ public function testComplete(array $input, array $expectedSuggestions)
         $this->assertSame($expectedSuggestions, $tester->complete($input));
     }
 
-    public function provideCompletionSuggestions()
+    public static function provideCompletionSuggestions()
     {
         yield 'option --format' => [
             ['--format', ''],

diff --git a/Tests/Dumper/CliDumperTest.php b/Tests/Dumper/CliDumperTest.php
@@ -157,7 +157,7 @@ public function testDumpWithCommaFlagsAndExceptionCodeExcerpt()
             , $dump);
     }
 
-    public function provideDumpWithCommaFlagTests()
+    public static function provideDumpWithCommaFlagTests()
     {
         $expected = <<<'EOTXT'
 array:3 [
@@ -398,7 +398,7 @@ public function testIncompleteClass()
         );
     }
 
-    public function provideDumpArrayWithColor()
+    public static function provideDumpArrayWithColor()
     {
         yield [
             ['foo' => 'bar'],

diff --git a/Tests/Dumper/HtmlDumperTest.php b/Tests/Dumper/HtmlDumperTest.php
@@ -180,7 +180,7 @@ public function testDumpString($var, $needle)
         $this->assertStringContainsString($needle, $out);
     }
 
-    public function varToDumpProvider()
+    public static function varToDumpProvider()
     {
         return [
             [['dummy' => new ImgStub('dummy', 'img/png', '100em')], '<img src="data:img/png;base64,ZHVtbXk=" />'],