mysqli: raise ValueError for invalid option in mysqli_options() respecting report_mode

Author: arshidkv12

ext/mysqli/mysqli_api.c

@@ -1198,6 +1198,10 @@ PHP_FUNCTION(mysqli_options)
 	MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_INITIALIZED);
 
 	expected_type = mysqli_options_get_option_zval_type(mysql_option);
+	if (expected_type == IS_NULL) {
+		zend_value_error("Argument #1 ($option) is not a valid mysqli option");
+		RETURN_THROWS();
+	}
 	if (expected_type != Z_TYPE_P(mysql_value)) {
 		switch (expected_type) {
 			case IS_STRING:
@@ -1209,10 +1213,6 @@ PHP_FUNCTION(mysqli_options)
 				convert_to_long(mysql_value);
 				break;
 			default:
-				if (MyG(report_mode) & MYSQLI_REPORT_ERROR) {
-					zend_value_error("mysqli_options(): Invalid option %d", (int)mysql_option);
-				}
-				ret = 1;
 				break;
 		}
 	}

ext/mysqli/tests/gh20968.phpt

@@ -12,24 +12,15 @@ require_once 'skipifconnectfailure.inc';
 <?php
 require_once 'connect.inc';
 
-$driver = new mysqli_driver();
-
 $mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket);
 
-$driver->report_mode = MYSQLI_REPORT_OFF;
 $value = $mysqli->options(10, 'invalid_option');
 
 var_dump($value);
 
-$driver->report_mode = MYSQLI_REPORT_ALL;
-$value = $mysqli->options(10, 'invalid_option');
-var_dump($value);
-
 ?>
 --EXPECTF--
-bool(false)
-
-Fatal error: Uncaught ValueError: mysqli_options(): Invalid option %d in %s:%d
+Fatal error: Uncaught ValueError: Argument #1 ($option) is not a valid mysqli option in %s:%d
 Stack trace:
 #0 %s(%d): mysqli->options(%d, 'invalid_option')
 #1 {main}

ext/mysqli/tests/mysqli_options.phpt

@@ -60,7 +60,7 @@ var_dump("MYSQLI_OPT_LOCAL_INFILE", mysqli_options($link, MYSQLI_OPT_LOCAL_INFIL
 var_dump("MYSQLI_INIT_COMMAND", mysqli_options($link, MYSQLI_INIT_COMMAND, 'SET AUTOCOMMIT=0'));
 
 /* mysqli_real_connect() */
-var_dump("MYSQLI_CLIENT_SSL", mysqli_options($link, MYSQLI_CLIENT_SSL, 'not a mysqli_option'));
+var_dump("MYSQLI_CLIENT_SSL");
 
 mysqli_close($link);
 
@@ -108,7 +108,6 @@ bool(true)
 %s(19) "MYSQLI_INIT_COMMAND"
 bool(true)
 %s(17) "MYSQLI_CLIENT_SSL"
-bool(false)
 Link closed
 mysqli object is already closed
 Unknown character set

ext/mysqli/tests/mysqli_set_opt.phpt

@@ -24,7 +24,6 @@ require_once 'skipifconnectfailure.inc';
     var_dump(mysqli_set_opt($link, MYSQLI_OPT_CONNECT_TIMEOUT, 10));
     var_dump(mysqli_set_opt($link, MYSQLI_OPT_LOCAL_INFILE, 1));
     var_dump(mysqli_set_opt($link, MYSQLI_INIT_COMMAND, 'SET AUTOCOMMIT=0'));
-    var_dump(mysqli_set_opt($link, MYSQLI_CLIENT_SSL, 'not an mysqli_option'));
 
     mysqli_close($link);
 
@@ -48,6 +47,5 @@ bool(true)
 bool(true)
 bool(true)
 bool(true)
-bool(false)
 mysqli object is already closed
 done!