Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit 5e0a3c5471ea · 2023-07-25T11:50:29.000+02:00
* 6.4:
  Use typed properties in tests as much as possible
diff --git a/Tests/ExpressionLanguageTest.php b/Tests/ExpressionLanguageTest.php
@@ -170,10 +170,10 @@ public function testParseThrowsInsteadOfNotice()
 
     public static function shortCircuitProviderEvaluate()
     {
-        $object = new class(\Closure::fromCallable([static::class, 'fail'])) {
-            private $fail;
+        $object = new class(static::fail(...)) {
+            private \Closure $fail;
 
-            public function __construct(callable $fail)
+            public function __construct(\Closure $fail)
             {
                 $this->fail = $fail;
             }
diff --git a/Tests/LexerTest.php b/Tests/LexerTest.php
@@ -19,10 +19,7 @@
 
 class LexerTest extends TestCase
 {
-    /**
-     * @var Lexer
-     */
-    private $lexer;
+    private Lexer $lexer;
 
     protected function setUp(): void
     {

Original file line number	Diff line number	Diff line change
`@@ -170,10 +170,10 @@ public function testParseThrowsInsteadOfNotice()`
`170`	`170`
`171`	`171`	`public static function shortCircuitProviderEvaluate()`
`172`	`172`	`{`
`173`		`- $object = new class(\Closure::fromCallable([static::class, 'fail'])) {`
`174`		`- private $fail;`
	`173`	`+ $object = new class(static::fail(...)) {`
	`174`	`+ private \Closure $fail;`
`175`	`175`
`176`		`- public function __construct(callable $fail)`
	`176`	`+ public function __construct(\Closure $fail)`
`177`	`177`	`{`
`178`	`178`	`$this->fail = $fail;`
`179`	`179`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,7 @@`
`19`	`19`
`20`	`20`	`class LexerTest extends TestCase`
`21`	`21`	`{`
`22`		`- /**`
`23`		`- * @var Lexer`
`24`		`- */`
`25`		`- private $lexer;`
	`22`	`+ private Lexer $lexer;`
`26`	`23`
`27`	`24`	`protected function setUp(): void`
`28`	`25`	`{`