Merge branch '6.2' into 6.3

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

Author: nicolas-grekas

Tests/ExpressionLanguageTest.php

@@ -168,7 +168,7 @@ public function testParseThrowsInsteadOfNotice()
         $expressionLanguage->parse('node.', ['node']);
     }
 
-    public function shortCircuitProviderEvaluate()
+    public static function shortCircuitProviderEvaluate()
     {
         $object = new class(\Closure::fromCallable([static::class, 'fail'])) {
             private $fail;
@@ -192,7 +192,7 @@ public function foo()
         ];
     }
 
-    public function shortCircuitProviderCompile()
+    public static function shortCircuitProviderCompile()
     {
         return [
             ['false and foo', ['foo' => 'foo'], false],
@@ -315,7 +315,7 @@ public function testNullSafeCompile($expression, $foo)
         $this->assertNull(eval(sprintf('return %s;', $expressionLanguage->compile($expression, ['foo' => 'foo']))));
     }
 
-    public function provideNullSafe()
+    public static function provideNullSafe()
     {
         $foo = new class() extends \stdClass {
             public function bar()
@@ -368,7 +368,7 @@ public function testNullSafeCompileFails($expression, $foo)
         eval(sprintf('return %s;', $expressionLanguage->compile($expression, ['foo' => 'foo'])));
     }
 
-    public function provideInvalidNullSafe()
+    public static function provideInvalidNullSafe()
     {
         yield ['foo?.bar.baz', (object) ['bar' => null], 'Unable to get property "baz" of non-object "foo.bar".'];
         yield ['foo?.bar["baz"]', (object) ['bar' => null], 'Unable to get an item of non-array "foo.bar".'];
@@ -393,7 +393,7 @@ public function testNullCoalescingCompile($expression, $foo)
         $this->assertSame(eval(sprintf('return %s;', $expressionLanguage->compile($expression, ['foo' => 'foo']))), 'default');
     }
 
-    public function provideNullCoalescing()
+    public static function provideNullCoalescing()
     {
         $foo = new class() extends \stdClass {
             public function bar()
@@ -424,7 +424,7 @@ public function testRegisterAfterCompile($registerCallback)
         $registerCallback($el);
     }
 
-    public function getRegisterCallbacks()
+    public static function getRegisterCallbacks()
     {
         return [
             [

Tests/LexerTest.php

@@ -54,7 +54,7 @@ public function testTokenizeThrowsErrorOnUnclosedBrace()
         $this->lexer->tokenize($expression);
     }
 
-    public function getTokenizeData()
+    public static function getTokenizeData()
     {
         return [
             [