Drop usages of E_RECOVERABLE_ERROR

There were only 2 remaining usages.

Author: Girgias

Zend/tests/temporary_cleaning_014.phpt

@@ -4,10 +4,10 @@ Leak in JMP_SET
 <?php if (!extension_loaded("gmp")) print "skip"; ?>
 --FILE--
 <?php
-set_error_handler(function() { throw new Exception; });
+set_exception_handler(function() { throw new Exception; });
 try {
     new GMP ?: null;
-} catch (Exception $e) {
+} catch (\TypeError $e) {
 }
 ?>
 DONE

Zend/zend_operators.c

@@ -2541,7 +2541,7 @@ ZEND_API bool ZEND_FASTCALL zend_object_is_true(zval *op) /* {{{ */
 	if (zobj->handlers->cast_object(zobj, &tmp, _IS_BOOL) == SUCCESS) {
 		return Z_TYPE(tmp) == IS_TRUE;
 	}
-	zend_error(E_RECOVERABLE_ERROR, "Object of class %s could not be converted to bool", ZSTR_VAL(zobj->ce->name));
+	zend_type_error("Object of class %s could not be converted to bool", ZSTR_VAL(zobj->ce->name));
 	return false;
 }
 /* }}} */

ext/gmp/tests/cast.phpt

@@ -10,13 +10,15 @@ echo $n, "\n";
 var_dump((string) $n);
 var_dump((int) $n);
 var_dump((float) $n);
-var_dump((bool) $n);
-
+try {
+    var_dump((bool) $n);
+} catch (\TypeError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
 ?>
---EXPECTF--
+--EXPECT--
 42
 string(2) "42"
 int(42)
 float(42)
-
-Recoverable fatal error: Object of class GMP could not be converted to bool in %s on line %d
+Object of class GMP could not be converted to bool

ext/session/session.c

@@ -536,21 +536,18 @@ static void php_session_normalize_vars() /* {{{ */
 static PHP_INI_MH(OnUpdateSaveHandler) /* {{{ */
 {
 	const ps_module *tmp;
+	int err_type = E_ERROR;
 
 	SESSION_CHECK_ACTIVE_STATE;
 	SESSION_CHECK_OUTPUT_STATE;
 
 	tmp = _php_find_ps_module(ZSTR_VAL(new_value));
 
-	if (PG(modules_activated) && !tmp) {
-		int err_type;
-
-		if (stage == ZEND_INI_STAGE_RUNTIME) {
-			err_type = E_WARNING;
-		} else {
-			err_type = E_ERROR;
-		}
+	if (stage == ZEND_INI_STAGE_RUNTIME) {
+		err_type = E_WARNING;
+	}
 
+	if (PG(modules_activated) && !tmp) {
 		/* Do not output error when restoring ini options. */
 		if (stage != ZEND_INI_STAGE_DEACTIVATE) {
 			php_error_docref(NULL, err_type, "Session save handler \"%s\" cannot be found", ZSTR_VAL(new_value));
@@ -561,7 +558,7 @@ static PHP_INI_MH(OnUpdateSaveHandler) /* {{{ */
 
 	/* "user" save handler should not be set by user */
 	if (!PS(set_handler) &&  tmp == ps_user_ptr) {
-		php_error_docref(NULL, E_RECOVERABLE_ERROR, "Session save handler \"user\" cannot be set by ini_set() or session_module_name()");
+		php_error_docref(NULL, err_type, "Session save handler \"user\" cannot be set by ini_set()");
 		return FAILURE;
 	}
 
@@ -1917,6 +1914,10 @@ PHP_FUNCTION(session_module_name)
 	}
 
 	if (name) {
+		if (zend_string_equals_literal_ci(name, "user")) {
+			zend_argument_value_error(1, "cannot be \"user\"");
+			RETURN_THROWS();
+		}
 		if (!_php_find_ps_module(ZSTR_VAL(name))) {
 			php_error_docref(NULL, E_WARNING, "Session handler module \"%s\" cannot be found", ZSTR_VAL(name));
 

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

ext/session/tests/bug73100.phpt

@@ -14,13 +14,17 @@ 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--
 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===

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

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 ***