ext/ldap: Throw a ValueError when passing an unknown option

Author: Girgias

UPGRADING

@@ -19,6 +19,10 @@ PHP 8.5 UPGRADE NOTES
 1. Backward Incompatible Changes
 ========================================
 
+- LDAP:
+  . ldap_get_option() and ldap_set_option() now throw a ValueError when
+    passing an invalid option.
+
 - SPL:
   . ArrayObject no longer accepts enums, as modifying the $name or $value
     properties can break engine assumptions.

ext/ldap/ldap.c

@@ -3009,7 +3009,8 @@ PHP_FUNCTION(ldap_get_option)
 	case LDAP_OPT_API_FEATURE_INFO:
 */
 	default:
-		RETURN_FALSE;
+		zend_argument_value_error(2, "must be a valid LDAP option");
+		RETURN_THROWS();
 	}
 	RETURN_TRUE;
 }
@@ -3207,7 +3208,8 @@ PHP_FUNCTION(ldap_set_option)
 			}
 		} break;
 	default:
-		RETURN_FALSE;
+		zend_argument_value_error(2, "must be a valid LDAP option");
+		RETURN_THROWS();
 	}
 	RETURN_TRUE;
 }

ext/ldap/tests/ldap_get_option_package_basic.phpt

@@ -11,9 +11,7 @@ $link = ldap_connect($uri);
 
 $result = ldap_get_option($link, LDAP_OPT_X_TLS_PACKAGE, $optionval);
 var_dump(in_array($optionval, ['GnuTLS', 'OpenSSL', 'MozNSS']));
-// This is a read-only option.
-var_dump(ldap_set_option($link, LDAP_OPT_X_TLS_PACKAGE, 'foo'));
+
 ?>
 --EXPECT--
 bool(true)
-bool(false)

ext/ldap/tests/ldap_get_set_invalid_option_error.phpt

@@ -0,0 +1,22 @@
+--TEST--
+ldap_(g|s)et_option() with non existing option
+--EXTENSIONS--
+ldap
+--FILE--
+<?php
+
+$ldap = ldap_connect('ldap://127.0.0.1:3333');
+try {
+    var_dump(ldap_set_option($ldap, 999999, "bogus"));
+} catch (Throwable $e) {
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump(ldap_get_option($ldap, 999999, $value));
+} catch (Throwable $e) {
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+}
+?>
+--EXPECT--
+ValueError: ldap_set_option(): Argument #2 ($option) must be a valid LDAP option
+ValueError: ldap_get_option(): Argument #2 ($option) must be a valid LDAP option

ext/ldap/tests/ldap_set_option_error.phpt

@@ -33,11 +33,9 @@ foreach ($controls as $control) {
     }
 }
 
-var_dump(ldap_set_option($link, 999999, 999999));
 ?>
 --EXPECT--
 bool(false)
 ValueError: ldap_set_option(): Control must have an "oid" key
 TypeError: ldap_set_option(): Argument #3 ($value) must contain only arrays, where each array is a control
 TypeError: ldap_set_option(): Argument #3 ($value) must be of type array for the LDAP_OPT_CLIENT_CONTROLS option, string given
-bool(false)