Merge branch '6.2' into 6.3

* 6.2:
  Fix merge
  Migrate to `static` data providers using `rector/rector`

Author: nicolas-grekas

Test/TranslatorTest.php

@@ -114,15 +114,15 @@ public function testGetLocaleReturnsDefaultLocaleIfNotSet()
         $this->assertEquals('en', $translator->getLocale());
     }
 
-    public function getTransTests()
+    public static function getTransTests()
     {
         return [
             ['Symfony is great!', 'Symfony is great!', []],
             ['Symfony is awesome!', 'Symfony is %what%!', ['%what%' => 'awesome']],
         ];
     }
 
-    public function getTransChoiceTests()
+    public static function getTransChoiceTests()
     {
         return [
             ['There are no apples', '{0} There are no apples|{1} There is one apple|]1,Inf] There are %count% apples', 0],
@@ -146,7 +146,7 @@ public function testInterval($expected, $number, $interval)
         $this->assertEquals($expected, $translator->trans($interval.' foo|[1,Inf[ bar', ['%count%' => $number]));
     }
 
-    public function getInterval()
+    public static function getInterval()
     {
         return [
             ['foo', 3, '{1,2, 3 ,4}'],
@@ -189,7 +189,7 @@ public function testThrowExceptionIfMatchingMessageCannotBeFound($id, $number)
         $translator->trans($id, ['%count%' => $number]);
     }
 
-    public function getNonMatchingMessages()
+    public static function getNonMatchingMessages()
     {
         return [
             ['{0} There are no apples|{1} There is one apple', 2],
@@ -199,7 +199,7 @@ public function getNonMatchingMessages()
         ];
     }
 
-    public function getChooseTests()
+    public static function getChooseTests()
     {
         return [
             ['There are no apples', '{0} There are no apples|{1} There is one apple|]1,Inf] There are %count% apples', 0],
@@ -315,7 +315,7 @@ public function testLangcodes($nplural, $langCodes)
      *
      * As it is impossible to have this ever complete we should try as hard as possible to have it almost complete.
      */
-    public function successLangcodes(): array
+    public static function successLangcodes(): array
     {
         return [
             ['1', ['ay', 'bo', 'cgg', 'dz', 'id', 'ja', 'jbo', 'ka', 'kk', 'km', 'ko', 'ky']],
@@ -334,7 +334,7 @@ public function successLangcodes(): array
      *
      * @return array with nplural together with langcodes
      */
-    public function failingLangcodes(): array
+    public static function failingLangcodes(): array
     {
         return [
             ['1', ['fa']],