minor #58326 Mutate remaining data providers to static ones (alexandre-daubois)

derrabus · derrabus · commit 6687e4ea35f4 · 2024-09-20T10:10:31.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- Mutate remaining data providers to static ones | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | - | License | MIT Non-static data providers are deprecated. Commits ------- 3035e99 Mutate remaining data providers to static ones
diff --git a/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php b/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php
@@ -200,7 +200,7 @@ public static function provideInlineStyleOptionsCases()
         ];
     }
 
-    public function provideInlineStyleTagsWithUnknownOptions()
+    public static function provideInlineStyleTagsWithUnknownOptions()
     {
         return [
             ['<options=abc;>', 'abc'],
diff --git a/src/Symfony/Component/Form/Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php b/src/Symfony/Component/Form/Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php
@@ -586,7 +586,7 @@ public static function provideDistinguishedChoices()
         ];
     }
 
-    public function provideSameKeyChoices()
+    public static function provideSameKeyChoices()
     {
         // Only test types here that can be used as array keys
         return [
@@ -597,7 +597,7 @@ public function provideSameKeyChoices()
         ];
     }
 
-    public function provideDistinguishedKeyChoices()
+    public static function provideDistinguishedKeyChoices()
     {
         // Only test types here that can be used as array keys
         return [
diff --git a/src/Symfony/Component/Intl/Tests/LocalesTest.php b/src/Symfony/Component/Intl/Tests/LocalesTest.php
@@ -21,12 +21,12 @@ class LocalesTest extends ResourceBundleTestCase
 {
     public function testGetLocales()
     {
-        $this->assertSame($this->getLocales(), Locales::getLocales());
+        $this->assertSame(static::getLocales(), Locales::getLocales());
     }
 
     public function testGetAliases()
     {
-        $this->assertSame($this->getLocaleAliases(), Locales::getAliases());
+        $this->assertSame(static::getLocaleAliases(), Locales::getAliases());
     }
 
     /**
@@ -41,7 +41,7 @@ public function testGetNames($displayLocale)
         // We can't assert on exact list of locale, as there's too many variations.
         // The best we can do is to make sure getNames() returns a subset of what getLocales() returns.
         $this->assertNotEmpty($locales);
-        $this->assertEmpty(array_diff($locales, $this->getLocales()));
+        $this->assertEmpty(array_diff($locales, static::getLocales()));
     }
 
     public function testGetNamesDefaultLocale()
diff --git a/src/Symfony/Component/Intl/Tests/ResourceBundleTestCase.php b/src/Symfony/Component/Intl/Tests/ResourceBundleTestCase.php
@@ -758,45 +758,37 @@ protected function tearDown(): void
         \Locale::setDefault($this->defaultLocale);
     }
 
-    public function provideLocales()
+    public static function provideLocales()
     {
         return array_map(
             function ($locale) { return [$locale]; },
-            $this->getLocales()
+            static::getLocales()
         );
     }
 
-    public function provideLocaleAliases()
+    public static function provideLocaleAliases()
     {
         return array_map(
             function ($alias, $ofLocale) { return [$alias, $ofLocale]; },
-            array_keys($this->getLocaleAliases()),
-            $this->getLocaleAliases()
+            array_keys(static::getLocaleAliases()),
+            static::getLocaleAliases()
         );
     }
 
-    public function provideRootLocales()
-    {
-        return array_map(
-            function ($locale) { return [$locale]; },
-            $this->getRootLocales()
-        );
-    }
-
-    protected function getLocales()
+    protected static function getLocales()
     {
         return self::LOCALES;
     }
 
-    protected function getLocaleAliases()
+    protected static function getLocaleAliases()
     {
         return self::LOCALE_ALIASES;
     }
 
-    protected function getRootLocales()
+    protected static function getRootLocales()
     {
         if (null === self::$rootLocales) {
-            self::$rootLocales = array_filter($this->getLocales(), function ($locale) {
+            self::$rootLocales = array_filter(static::getLocales(), function ($locale) {
                 // no locales for which fallback is possible (e.g "en_GB")
                 return !str_contains($locale, '_');
             });
diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php
@@ -500,7 +500,7 @@ public function testFindAllSqlGenerated(AbstractPlatform $platform, string $expe
         $connection->findAll(50);
     }
 
-    public function provideFindAllSqlGeneratedByPlatform(): iterable
+    public static function provideFindAllSqlGeneratedByPlatform(): iterable
     {
         yield 'MySQL' => [
             class_exists(MySQLPlatform::class) ? new MySQLPlatform() : new MySQL57Platform(),
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
@@ -701,7 +701,7 @@ public function testDenormalizeBooleanTypesWithNotMatchingData(array $data, stri
         $normalizer->denormalize($data, $type);
     }
 
-    public function provideBooleanTypesData()
+    public static function provideBooleanTypesData()
     {
         return [
             [['foo' => true], FalsePropertyDummy::class],
diff --git a/src/Symfony/Component/String/Tests/AbstractUnicodeTestCase.php b/src/Symfony/Component/String/Tests/AbstractUnicodeTestCase.php
@@ -52,7 +52,7 @@ public function testAsciiClosureRule()
         $this->assertSame('Dieser Wert sollte grOEsser oder gleich', (string) $s->ascii([$rule]));
     }
 
-    public function provideCreateFromCodePoint(): array
+    public static function provideCreateFromCodePoint(): array
     {
         return [
             ['', []],

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ public static function provideInlineStyleOptionsCases()`
`200`	`200`	`];`
`201`	`201`	`}`
`202`	`202`
`203`		`- public function provideInlineStyleTagsWithUnknownOptions()`
	`203`	`+ public static function provideInlineStyleTagsWithUnknownOptions()`
`204`	`204`	`{`
`205`	`205`	`return [`
`206`	`206`	`['<options=abc;>', 'abc'],`
Original file line number	Diff line number	Diff line change
`@@ -586,7 +586,7 @@ public static function provideDistinguishedChoices()`
`586`	`586`	`];`
`587`	`587`	`}`
`588`	`588`
`589`		`- public function provideSameKeyChoices()`
	`589`	`+ public static function provideSameKeyChoices()`
`590`	`590`	`{`
`591`	`591`	`// Only test types here that can be used as array keys`
`592`	`592`	`return [`
`@@ -597,7 +597,7 @@ public function provideSameKeyChoices()`
`597`	`597`	`];`
`598`	`598`	`}`
`599`	`599`
`600`		`- public function provideDistinguishedKeyChoices()`
	`600`	`+ public static function provideDistinguishedKeyChoices()`
`601`	`601`	`{`
`602`	`602`	`// Only test types here that can be used as array keys`
`603`	`603`	`return [`
Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,12 @@ class LocalesTest extends ResourceBundleTestCase`
`21`	`21`	`{`
`22`	`22`	`public function testGetLocales()`
`23`	`23`	`{`
`24`		`- $this->assertSame($this->getLocales(), Locales::getLocales());`
	`24`	`+ $this->assertSame(static::getLocales(), Locales::getLocales());`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public function testGetAliases()`
`28`	`28`	`{`
`29`		`- $this->assertSame($this->getLocaleAliases(), Locales::getAliases());`
	`29`	`+ $this->assertSame(static::getLocaleAliases(), Locales::getAliases());`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`/**`
`@@ -41,7 +41,7 @@ public function testGetNames($displayLocale)`
`41`	`41`	`// We can't assert on exact list of locale, as there's too many variations.`
`42`	`42`	`// The best we can do is to make sure getNames() returns a subset of what getLocales() returns.`
`43`	`43`	`$this->assertNotEmpty($locales);`
`44`		`- $this->assertEmpty(array_diff($locales, $this->getLocales()));`
	`44`	`+ $this->assertEmpty(array_diff($locales, static::getLocales()));`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`public function testGetNamesDefaultLocale()`
Original file line number	Diff line number	Diff line change
`@@ -758,45 +758,37 @@ protected function tearDown(): void`
`758`	`758`	`\Locale::setDefault($this->defaultLocale);`
`759`	`759`	`}`
`760`	`760`
`761`		`- public function provideLocales()`
	`761`	`+ public static function provideLocales()`
`762`	`762`	`{`
`763`	`763`	`return array_map(`
`764`	`764`	`function ($locale) { return [$locale]; },`
`765`		`- $this->getLocales()`
	`765`	`+ static::getLocales()`
`766`	`766`	`);`
`767`	`767`	`}`
`768`	`768`
`769`		`- public function provideLocaleAliases()`
	`769`	`+ public static function provideLocaleAliases()`
`770`	`770`	`{`
`771`	`771`	`return array_map(`
`772`	`772`	`function ($alias, $ofLocale) { return [$alias, $ofLocale]; },`
`773`		`- array_keys($this->getLocaleAliases()),`
`774`		`- $this->getLocaleAliases()`
	`773`	`+ array_keys(static::getLocaleAliases()),`
	`774`	`+ static::getLocaleAliases()`
`775`	`775`	`);`
`776`	`776`	`}`
`777`	`777`
`778`		`- public function provideRootLocales()`
`779`		`- {`
`780`		`- return array_map(`
`781`		`- function ($locale) { return [$locale]; },`
`782`		`- $this->getRootLocales()`
`783`		`- );`
`784`		`- }`
`785`		`-`
`786`		`- protected function getLocales()`
	`778`	`+ protected static function getLocales()`
`787`	`779`	`{`
`788`	`780`	`return self::LOCALES;`
`789`	`781`	`}`
`790`	`782`
`791`		`- protected function getLocaleAliases()`
	`783`	`+ protected static function getLocaleAliases()`
`792`	`784`	`{`
`793`	`785`	`return self::LOCALE_ALIASES;`
`794`	`786`	`}`
`795`	`787`
`796`		`- protected function getRootLocales()`
	`788`	`+ protected static function getRootLocales()`
`797`	`789`	`{`
`798`	`790`	`if (null === self::$rootLocales) {`
`799`		`- self::$rootLocales = array_filter($this->getLocales(), function ($locale) {`
	`791`	`+ self::$rootLocales = array_filter(static::getLocales(), function ($locale) {`
`800`	`792`	`// no locales for which fallback is possible (e.g "en_GB")`
`801`	`793`	`return !str_contains($locale, '_');`
`802`	`794`	`});`
Original file line number	Diff line number	Diff line change
`@@ -500,7 +500,7 @@ public function testFindAllSqlGenerated(AbstractPlatform $platform, string $expe`
`500`	`500`	`$connection->findAll(50);`
`501`	`501`	`}`
`502`	`502`
`503`		`- public function provideFindAllSqlGeneratedByPlatform(): iterable`
	`503`	`+ public static function provideFindAllSqlGeneratedByPlatform(): iterable`
`504`	`504`	`{`
`505`	`505`	`yield 'MySQL' => [`
`506`	`506`	`class_exists(MySQLPlatform::class) ? new MySQLPlatform() : new MySQL57Platform(),`
Original file line number	Diff line number	Diff line change
`@@ -701,7 +701,7 @@ public function testDenormalizeBooleanTypesWithNotMatchingData(array $data, stri`
`701`	`701`	`$normalizer->denormalize($data, $type);`
`702`	`702`	`}`
`703`	`703`
`704`		`- public function provideBooleanTypesData()`
	`704`	`+ public static function provideBooleanTypesData()`
`705`	`705`	`{`
`706`	`706`	`return [`
`707`	`707`	`[['foo' => true], FalsePropertyDummy::class],`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function testAsciiClosureRule()`
`52`	`52`	`$this->assertSame('Dieser Wert sollte grOEsser oder gleich', (string) $s->ascii([$rule]));`
`53`	`53`	`}`
`54`	`54`
`55`		`- public function provideCreateFromCodePoint(): array`
	`55`	`+ public static function provideCreateFromCodePoint(): array`
`56`	`56`	`{`
`57`	`57`	`return [`
`58`	`58`	`['', []],`