From 35549a775093fefde948146bfb667e3339e5bb39 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@qossmic.com>
Date: Fri, 17 May 2024 16:43:13 +0200
Subject: [PATCH] fix merge

---
 Tests/Session/Storage/PhpBridgeSessionStorageTest.php | 1 -
 Tests/Session/Storage/Proxy/AbstractProxyTest.php     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Tests/Session/Storage/PhpBridgeSessionStorageTest.php b/Tests/Session/Storage/PhpBridgeSessionStorageTest.php
index 9520bbf39..5fbc38335 100644
--- a/Tests/Session/Storage/PhpBridgeSessionStorageTest.php
+++ b/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);
     }
diff --git a/Tests/Session/Storage/Proxy/AbstractProxyTest.php b/Tests/Session/Storage/Proxy/AbstractProxyTest.php
index 1dc97049c..bb459bb9f 100644
--- a/Tests/Session/Storage/Proxy/AbstractProxyTest.php
+++ b/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
     {