Merge branch '6.4' into 7.0

xabbuh · xabbuh · commit 89a6bf348895 · 2024-05-17T16:44:04.000+02:00
* 6.4:
  fix merge
  fix merge
  fix merge
diff --git a/Tests/Session/Storage/NativeSessionStorageTest.php b/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);
     }
diff --git 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
@@ -23,7 +23,7 @@
  */
 class AbstractProxyTest extends TestCase
 {
-    protected MockObject&AbstractProxy $proxy;
+    protected AbstractProxy $proxy;
 
     protected function setUp(): void
     {

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,6 @@ protected function tearDown(): void`
`55`	`55`	`@rmdir($this->savePath);`
`56`	`56`	`}`
`57`	`57`
`58`		`- $this->savePath = null;`
`59`	`58`	`ini_set('session.save_handler', $this->initialSessionSaveHandler);`
`60`	`59`	`ini_set('session.save_path', $this->initialSessionSavePath);`
`61`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,6 @@ protected function tearDown(): void`
`51`	`51`	`@rmdir($this->savePath);`
`52`	`52`	`}`
`53`	`53`
`54`		`- $this->savePath = null;`
`55`	`54`	`ini_set('session.save_handler', $this->initialSessionSaveHandler);`
`56`	`55`	`ini_set('session.save_path', $this->initialSessionSavePath);`
`57`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`*/`
`24`	`24`	`class AbstractProxyTest extends TestCase`
`25`	`25`	`{`
`26`		`- protected MockObject&AbstractProxy $proxy;`
	`26`	`+ protected AbstractProxy $proxy;`
`27`	`27`
`28`	`28`	`protected function setUp(): void`
`29`	`29`	`{`