From 9bed5a8801e704a0375cdc4c413c0d167bd9a83e Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 5 Jul 2024 11:29:39 +0200
Subject: [PATCH] fix tests for 8.4

---
 tests/__serialize_020.phpt | 8 ++++----
 tests/igbinary_015.phpt    | 2 +-
 tests/igbinary_015b.phpt   | 2 +-
 tests/igbinary_015c.phpt   | 2 +-
 tests/igbinary_027.phpt    | 2 +-
 tests/igbinary_028.phpt    | 2 +-
 tests/igbinary_047.phpt    | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/__serialize_020.phpt b/tests/__serialize_020.phpt
index 1f3f439f..cf5bf150 100644
--- a/tests/__serialize_020.phpt
+++ b/tests/__serialize_020.phpt
@@ -23,7 +23,7 @@ class MessageEvents
         $this->transports[$event->getTransport()] = true;
     }
 
-    public function getEvents(string $name = null): array
+    public function getEvents(?string $name = null): array
     {
         return $this->events;
     }
@@ -229,7 +229,7 @@ final class Headers
         return array_shift($values);
     }
 
-    public function all(string $name = null): iterable
+    public function all(?string $name = null): iterable
     {
         if (null === $name) {
             foreach ($this->headers as $name => $collection) {
@@ -305,7 +305,7 @@ class RawMessage
 class Message extends RawMessage
 {
 
-    public function __construct(Headers $headers = null, AbstractPart $body = null)
+    public function __construct(?Headers $headers = null, ?AbstractPart $body = null)
     {
         $this->headers = $headers ? clone $headers : new Headers();
         $this->body = $body;
@@ -640,4 +640,4 @@ object(MessageEvents)#1 (2) {
 string(14) "headers_before"
 bool(false)
 string(13) "headers_after"
-bool(false)
\ No newline at end of file
+bool(false)
diff --git a/tests/igbinary_015.phpt b/tests/igbinary_015.phpt
index 0c4244bc..727c4604 100644
--- a/tests/igbinary_015.phpt
+++ b/tests/igbinary_015.phpt
@@ -50,7 +50,7 @@ function gc($time) {
 
 ini_set('session.serialize_handler', 'igbinary');
 
-session_set_save_handler('open', 'close', 'read', 'write', 'destroy', 'gc');
+@session_set_save_handler('open', 'close', 'read', 'write', 'destroy', 'gc');
 
 session_start();
 
diff --git a/tests/igbinary_015b.phpt b/tests/igbinary_015b.phpt
index c8f2c3c0..d41140d4 100644
--- a/tests/igbinary_015b.phpt
+++ b/tests/igbinary_015b.phpt
@@ -50,7 +50,7 @@ function gc($time) {
 	return true;
 }
 
-session_set_save_handler('open', 'close', 'read', 'write', 'destroy', 'gc');
+@session_set_save_handler('open', 'close', 'read', 'write', 'destroy', 'gc');
 
 session_start();
 
diff --git a/tests/igbinary_015c.phpt b/tests/igbinary_015c.phpt
index 10a793c5..b5d9cc7f 100644
--- a/tests/igbinary_015c.phpt
+++ b/tests/igbinary_015c.phpt
@@ -51,7 +51,7 @@ function gc($time) {
 
 ini_set('session.serialize_handler', 'igbinary');
 
-session_set_save_handler('open', 'close', 'read', 'write', 'destroy', 'gc');
+@session_set_save_handler('open', 'close', 'read', 'write', 'destroy', 'gc');
 session_id('abcdef10231512dfaz_12311');
 
 session_start();
diff --git a/tests/igbinary_027.phpt b/tests/igbinary_027.phpt
index b0aedc4a..77b4a7cf 100644
--- a/tests/igbinary_027.phpt
+++ b/tests/igbinary_027.phpt
@@ -59,7 +59,7 @@ class Bar {
 
 ini_set('session.serialize_handler', 'igbinary');
 
-session_set_save_handler('open', 'close', 'read', 'write', 'destroy', 'gc');
+@session_set_save_handler('open', 'close', 'read', 'write', 'destroy', 'gc');
 
 
 $db_object = new Foo();
diff --git a/tests/igbinary_028.phpt b/tests/igbinary_028.phpt
index dbc0c795..d07860bf 100644
--- a/tests/igbinary_028.phpt
+++ b/tests/igbinary_028.phpt
@@ -96,7 +96,7 @@ function gc($time) {
 
 ini_set('session.serialize_handler', 'igbinary');
 
-session_set_save_handler('open', 'close', 'read', 'write', 'destroy', 'gc');
+@session_set_save_handler('open', 'close', 'read', 'write', 'destroy', 'gc');
 
 session_start();
 
diff --git a/tests/igbinary_047.phpt b/tests/igbinary_047.phpt
index d7653d6f..317da80f 100644
--- a/tests/igbinary_047.phpt
+++ b/tests/igbinary_047.phpt
@@ -64,7 +64,7 @@ class Bar {
 ini_set('session.serialize_handler', 'igbinary');
 
 $handler = new S();
-session_set_save_handler($handler, true);
+@session_set_save_handler($handler, true);
 
 $db_object = new Foo();
 $session_object = new Bar();