Drop usage of E_RECOVERABLE_ERROR in Session extension

4 files changed, 21 insertions, 5 deletions

diff --git a/ext/session/tests/bug60860.phpt b/ext/session/tests/bug60860.phpt
index 487fba5307..fbd8a6eeab 100644
--- a/ext/session/tests/bug60860.phpt
+++ b/ext/session/tests/bug60860.phpt
@@ -15,5 +15,5 @@ echo "ok\n";
 
 ?>
 --EXPECT--
-Recoverable fatal error: PHP Startup: Session save handler "user" cannot be set by ini_set() or session_module_name() in Unknown on line 0
+Fatal error: PHP Startup: Session save handler "user" cannot be set by ini_set() in Unknown on line 0
 ok
diff --git a/ext/session/tests/bug73100.phpt b/ext/session/tests/bug73100.phpt
index a59e9f41cc..a9c140aa88 100644
--- a/ext/session/tests/bug73100.phpt
+++ b/ext/session/tests/bug73100.phpt
@@ -14,7 +14,11 @@ var_dump(session_start());
 session_module_name("user");
 var_dump(session_destroy());
 
-session_module_name("user");
+try {
+    session_module_name("user");
+} catch (\ValueError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
 ?>
 ===DONE===
 --EXPECTF--
@@ -22,5 +26,5 @@ bool(true)
 
 Warning: session_module_name(): Session save handler module cannot be changed when a session is active in %s on line %d
 bool(true)
-
-Recoverable fatal error: session_module_name(): Session save handler "user" cannot be set by ini_set() or session_module_name() in %s on line %d
+session_module_name(): Argument #1 ($module) cannot be "user"
+===DONE===
diff --git a/ext/session/tests/error_when_setting_save_handler_ini_setting_in_runtime.phpt b/ext/session/tests/error_when_setting_save_handler_ini_setting_in_runtime.phpt
new file mode 100644
index 0000000000..f176a7ae79
--- /dev/null
+++ b/ext/session/tests/error_when_setting_save_handler_ini_setting_in_runtime.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Error when setting session.save_handler to user via ini_set
+--SKIPIF--
+<?php
+include('skipif.inc');
+?>
+--FILE--
+<?php
+ini_set('session.save_handler', 'user');
+?>
+--EXPECTF--
+Warning: ini_set(): Session save handler "user" cannot be set by ini_set() in %s on line %d
diff --git a/ext/session/tests/session_set_save_handler_class_014.phpt b/ext/session/tests/session_set_save_handler_class_014.phpt
index 6eee4f8b6a..ff1b84a87e 100644
--- a/ext/session/tests/session_set_save_handler_class_014.phpt
+++ b/ext/session/tests/session_set_save_handler_class_014.phpt
@@ -21,5 +21,5 @@ session_set_save_handler($handler);
 session_start();
 ?>
 --EXPECT--
-Recoverable fatal error: PHP Startup: Session save handler "user" cannot be set by ini_set() or session_module_name() in Unknown on line 0
+Fatal error: PHP Startup: Session save handler "user" cannot be set by ini_set() in Unknown on line 0
 *** Testing session_set_save_handler() : calling default handler when save_handler=user ***