Merge branch '7.0' into 7.1

* 7.0:
  fix merge
  fix merge
  fix merge

Author: xabbuh

src/Symfony/Component/Config/Tests/Definition/BaseNodeTest.php

@@ -41,17 +41,17 @@ protected function validateType($value): void
             {
             }
 
-            protected function normalizeValue($value)
+            protected function normalizeValue($value): mixed
             {
                 return null;
             }
 
-            protected function mergeValues($leftSide, $rightSide)
+            protected function mergeValues($leftSide, $rightSide): mixed
             {
                 return null;
             }
 
-            protected function finalizeValue($value)
+            protected function finalizeValue($value): mixed
             {
                 return null;
             }
@@ -61,7 +61,7 @@ public function hasDefaultValue(): bool
                 return true;
             }
 
-            public function getDefaultValue()
+            public function getDefaultValue(): mixed
             {
                 return null;
             }

src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php

@@ -55,7 +55,6 @@ protected function tearDown(): void
             @rmdir($this->savePath);
         }
 
-        $this->savePath = null;
         ini_set('session.save_handler', $this->initialSessionSaveHandler);
         ini_set('session.save_path', $this->initialSessionSavePath);
     }

src/Symfony/Component/HttpFoundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php

@@ -51,7 +51,6 @@ protected function tearDown(): void
             @rmdir($this->savePath);
         }
 
-        $this->savePath = null;
         ini_set('session.save_handler', $this->initialSessionSaveHandler);
         ini_set('session.save_path', $this->initialSessionSavePath);
     }

src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php

@@ -23,7 +23,7 @@
  */
 class AbstractProxyTest extends TestCase
 {
-    protected MockObject&AbstractProxy $proxy;
+    protected AbstractProxy $proxy;
 
     protected function setUp(): void
     {

src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php

@@ -102,7 +102,7 @@ public function testRenderExceptionIgnoreErrors()
 
     public function testRenderExceptionIgnoreErrorsWithAlt()
     {
-        $strategy = new InlineFragmentRenderer($this->getKernel($this->returnCallback(function () {
+        $strategy = new InlineFragmentRenderer($this->getKernel(function () {
             static $firstCall = true;
 
             if ($firstCall) {
@@ -112,7 +112,7 @@ public function testRenderExceptionIgnoreErrorsWithAlt()
             }
 
             return new Response('bar');
-        })));
+        }));
 
         $this->assertEquals('bar', $strategy->render('/', Request::create('/'), ['ignore_errors' => true, 'alt' => '/foo'])->getContent());
     }
@@ -127,6 +127,8 @@ private function getKernel($returnValue)
 
         if ($returnValue instanceof \Exception) {
             $mocker->willThrowException($returnValue);
+        } elseif ($returnValue instanceof \Closure) {
+            $mocker->willReturnCallback($returnValue);
         } else {
             $mocker->willReturn(...(\is_array($returnValue) ? $returnValue : [$returnValue]));
         }