Merge branch '6.4' into 7.1

* 6.4:
  Make more data providers static
  fix merge
  Mutate remaining data providers to static ones

Author: derrabus

src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php

@@ -199,7 +199,7 @@ public static function provideInlineStyleOptionsCases()
         ];
     }
 
-    public function provideInlineStyleTagsWithUnknownOptions()
+    public static function provideInlineStyleTagsWithUnknownOptions()
     {
         return [
             ['<options=abc;>', 'abc'],

src/Symfony/Component/DependencyInjection/Tests/Attribute/AutowireTest.php

@@ -74,7 +74,7 @@ public function testCanUseParam()
     /**
      * @see testCanOnlySetOneParameter
      */
-    private static function provideMultipleParameters(): iterable
+    public static function provideMultipleParameters(): iterable
     {
         yield [['service' => 'id', 'expression' => 'expr']];
 

src/Symfony/Component/Form/Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php

@@ -577,7 +577,7 @@ public static function provideDistinguishedChoices()
         ];
     }
 
-    public function provideSameKeyChoices()
+    public static function provideSameKeyChoices()
     {
         // Only test types here that can be used as array keys
         return [
@@ -588,7 +588,7 @@ public function provideSameKeyChoices()
         ];
     }
 
-    public function provideDistinguishedKeyChoices()
+    public static function provideDistinguishedKeyChoices()
     {
         // Only test types here that can be used as array keys
         return [

src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php

@@ -98,7 +98,7 @@ public function testConstructorShouldThrowExceptionForMissingOptions(array $opti
         new MongoDbSessionHandler($this->manager, $options);
     }
 
-    public function provideInvalidOptions()
+    public static function provideInvalidOptions(): iterable
     {
         yield 'empty' => [[]];
         yield 'collection missing' => [['database' => 'foo']];

src/Symfony/Component/HttpFoundation/Tests/Test/Constraint/ResponseHeaderLocationSameTest.php

@@ -36,7 +36,7 @@ public function testConstraintSuccess(string $requestUrl, ?string $location, str
         self::assertTrue($constraint->evaluate($response, '', true));
     }
 
-    public function provideSuccessCases(): iterable
+    public static function provideSuccessCases(): iterable
     {
         yield ['http://example.com', 'http://example.com', 'http://example.com'];
         yield ['http://example.com', 'http://example.com', '//example.com'];
@@ -112,7 +112,7 @@ public function testConstraintFailure(string $requestUrl, ?string $location, str
         $constraint->evaluate($response);
     }
 
-    public function provideFailureCases(): iterable
+    public static function provideFailureCases(): iterable
     {
         yield ['http://example.com', null, 'http://example.com'];
         yield ['http://example.com', null, '//example.com'];

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()

src/Symfony/Component/Intl/Tests/ResourceBundleTestCase.php

@@ -762,24 +762,24 @@ public static function provideLocales()
     {
         return array_map(
             fn ($locale) => [$locale],
-            self::getLocales()
+            static::getLocales()
         );
     }
 
     public static function provideLocaleAliases()
     {
         return array_map(
             fn ($alias, $ofLocale) => [$alias, $ofLocale],
-            array_keys(self::getLocaleAliases()),
-            self::getLocaleAliases()
+            array_keys(static::getLocaleAliases()),
+            static::getLocaleAliases()
         );
     }
 
     public static function provideRootLocales()
     {
         return array_map(
             fn ($locale) => [$locale],
-            self::getRootLocales()
+            static::getRootLocales()
         );
     }
 
@@ -796,8 +796,8 @@ protected static function getLocaleAliases()
     protected static function getRootLocales()
     {
         if (null === self::$rootLocales) {
-            // ignore locales for which fallback is possible (e.g "en_GB")
-            self::$rootLocales = array_filter(self::getLocales(), fn ($locale) => !str_contains($locale, '_'));
+            // no locales for which fallback is possible (e.g "en_GB")
+            self::$rootLocales = array_filter(static::getLocales(), fn ($locale) => !str_contains($locale, '_'));
         }
 
         return self::$rootLocales;

src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php

@@ -720,7 +720,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(),

src/Symfony/Component/Mime/Tests/MessageTest.php

@@ -306,7 +306,7 @@ public function testEnsureValidity(array $headers, ?string $exceptionClass, ?str
         $m->ensureValidity();
     }
 
-    public function ensureValidityProvider()
+    public static function ensureValidityProvider(): array
     {
         return [
             'Valid address fields' => [

src/Symfony/Component/Security/Http/Tests/Authenticator/AccessTokenAuthenticatorTest.php

@@ -177,7 +177,7 @@ public function testAccessTokenHeaderRegex(string $input, ?string $expectedToken
         $this->assertEquals($expectedToken, $token);
     }
 
-    public function provideAccessTokenHeaderRegex(): array
+    public static function provideAccessTokenHeaderRegex(): array
     {
         return [
             ['Bearer token', 'token'],