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/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
     {