Skip to content

Commit 023e103

Browse files
Merge branch '5.4' into 6.2
* 5.4: Migrate to `static` data providers using `rector/rector`
2 parents bfd3357 + 5015895 commit 023e103

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

Tests/ExpressionLanguageTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public function testParseThrowsInsteadOfNotice()
119119
$expressionLanguage->parse('node.', ['node']);
120120
}
121121

122-
public function shortCircuitProviderEvaluate()
122+
public static function shortCircuitProviderEvaluate()
123123
{
124124
$object = new class(\Closure::fromCallable([static::class, 'fail'])) {
125125
private $fail;
@@ -143,7 +143,7 @@ public function foo()
143143
];
144144
}
145145

146-
public function shortCircuitProviderCompile()
146+
public static function shortCircuitProviderCompile()
147147
{
148148
return [
149149
['false and foo', ['foo' => 'foo'], false],
@@ -266,7 +266,7 @@ public function testNullSafeCompile($expression, $foo)
266266
$this->assertNull(eval(sprintf('return %s;', $expressionLanguage->compile($expression, ['foo' => 'foo']))));
267267
}
268268

269-
public function provideNullSafe()
269+
public static function provideNullSafe()
270270
{
271271
$foo = new class() extends \stdClass {
272272
public function bar()
@@ -319,7 +319,7 @@ public function testNullSafeCompileFails($expression, $foo)
319319
eval(sprintf('return %s;', $expressionLanguage->compile($expression, ['foo' => 'foo'])));
320320
}
321321

322-
public function provideInvalidNullSafe()
322+
public static function provideInvalidNullSafe()
323323
{
324324
yield ['foo?.bar.baz', (object) ['bar' => null], 'Unable to get property "baz" of non-object "foo.bar".'];
325325
yield ['foo?.bar["baz"]', (object) ['bar' => null], 'Unable to get an item of non-array "foo.bar".'];
@@ -344,7 +344,7 @@ public function testNullCoalescingCompile($expression, $foo)
344344
$this->assertSame(eval(sprintf('return %s;', $expressionLanguage->compile($expression, ['foo' => 'foo']))), 'default');
345345
}
346346

347-
public function provideNullCoalescing()
347+
public static function provideNullCoalescing()
348348
{
349349
$foo = new class() extends \stdClass {
350350
public function bar()
@@ -375,7 +375,7 @@ public function testRegisterAfterCompile($registerCallback)
375375
$registerCallback($el);
376376
}
377377

378-
public function getRegisterCallbacks()
378+
public static function getRegisterCallbacks()
379379
{
380380
return [
381381
[

Tests/LexerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function testTokenizeThrowsErrorOnUnclosedBrace()
5454
$this->lexer->tokenize($expression);
5555
}
5656

57-
public function getTokenizeData()
57+
public static function getTokenizeData()
5858
{
5959
return [
6060
[

0 commit comments

Comments
 (0)