Change to ValueError

Author: LamentXU123

NEWS

@@ -52,7 +52,8 @@ PHP                                                                        NEWS
   . Fixed header injection through the Content-Type context option, the
     soapaction and the cookie names and values. (David Carlier)
   . Fixed the SoapClient and SoapServer "classmap" option to reject arrays
-    containing integer keys. (Weilin Du, David Carlier)
+    containing integer keys, and made SoapClient throw ValueError for invalid
+    "classmap" options. (Weilin Du, David Carlier)
 
 - MBString:
   . Fixed bug GH-22779 (mb_strrpos() returns the wrong position for a negative

UPGRADING

@@ -157,7 +157,8 @@ PHP 8.6 UPGRADE NOTES
 - SOAP:
   . The "classmap" option of SoapClient and SoapServer now rejects arrays
     containing integer keys. Previously, sparse integer-keyed and mixed-keyed
-    arrays could be accepted.
+    arrays could be accepted. SoapClient now throws a ValueError for invalid
+    "classmap" options, also when the "exceptions" option is disabled.
   . WSDL/XML Schema parsing now rejects out-of-range integer values for
     occurrence constraints and integer restriction facets. Negative minOccurs
     and maxOccurs values are rejected as well.

ext/soap/soap.c

@@ -2245,7 +2245,11 @@ PHP_METHOD(SoapClient, __construct)
 		if ((tmp = zend_hash_str_find(ht, "classmap", sizeof("classmap")-1)) != NULL &&
 			Z_TYPE_P(tmp) == IS_ARRAY) {
 			if (UNEXPECTED(!soap_class_map_has_only_string_keys(Z_ARRVAL_P(tmp)))) {
-				php_error_docref(NULL, E_ERROR, "'classmap' option must be an associative array");
+				zend_argument_value_error(2, "\"classmap\" option must be an associative array");
+				if (context) {
+					zend_list_delete(context->res);
+				}
+				goto finish;
 			}
 			ZVAL_COPY(Z_CLIENT_CLASSMAP_P(this_ptr), tmp);
 		}
@@ -2324,6 +2328,8 @@ PHP_METHOD(SoapClient, __construct)
 	if (typemap_ht) {
 		soap_client_object_fetch(Z_OBJ_P(this_ptr))->typemap = soap_create_typemap(sdl, typemap_ht);
 	}
+
+finish:
 	SOAP_CLIENT_END_CODE();
 }
 /* }}} */

ext/soap/tests/bugs/gh16256.phpt

@@ -20,5 +20,5 @@ try {
 }
 ?>
 --EXPECT--
-SoapClient::__construct(): 'classmap' option must be an associative array
+SoapClient::__construct(): Argument #2 ($options) "classmap" option must be an associative array
 SoapServer::__construct(): Argument #2 ($options) "classmap" option must be an associative array

ext/soap/tests/classmap_invalid_keys.phpt

@@ -52,16 +52,16 @@ SoapServer: OK
 SoapClient: OK
 SoapServer: OK
 -- packed --
-SoapClient::__construct(): 'classmap' option must be an associative array
+SoapClient::__construct(): Argument #2 ($options) "classmap" option must be an associative array
 SoapServer::__construct(): Argument #2 ($options) "classmap" option must be an associative array
 -- sparse numeric --
-SoapClient::__construct(): 'classmap' option must be an associative array
+SoapClient::__construct(): Argument #2 ($options) "classmap" option must be an associative array
 SoapServer::__construct(): Argument #2 ($options) "classmap" option must be an associative array
 -- numeric string --
-SoapClient::__construct(): 'classmap' option must be an associative array
+SoapClient::__construct(): Argument #2 ($options) "classmap" option must be an associative array
 SoapServer::__construct(): Argument #2 ($options) "classmap" option must be an associative array
 -- mixed --
-SoapClient::__construct(): 'classmap' option must be an associative array
+SoapClient::__construct(): Argument #2 ($options) "classmap" option must be an associative array
 SoapServer::__construct(): Argument #2 ($options) "classmap" option must be an associative array
 -- associative --
 SoapClient: OK

ext/soap/tests/classmap_invalid_keys_error_types.phpt

@@ -1,5 +1,5 @@
 --TEST--
-SoapClient and SoapServer report an invalid classmap option differently
+SoapClient and SoapServer report an invalid classmap option as ValueError
 --EXTENSIONS--
 soap
 --FILE--
@@ -28,5 +28,5 @@ try {
 
 ?>
 --EXPECT--
-SoapClient: SoapFault: SoapClient::__construct(): 'classmap' option must be an associative array
+SoapClient: ValueError: SoapClient::__construct(): Argument #2 ($options) "classmap" option must be an associative array
 SoapServer: ValueError: SoapServer::__construct(): Argument #2 ($options) "classmap" option must be an associative array

ext/soap/tests/classmap_invalid_keys_exceptions_disabled.phpt

@@ -1,18 +1,21 @@
 --TEST--
-SoapClient reports an invalid classmap option as a fatal error when exceptions are disabled
+SoapClient reports an invalid classmap option as ValueError when exceptions are disabled
 --EXTENSIONS--
 soap
 --FILE--
 <?php
 
-new SoapClient(null, [
-    'location' => 'http://example.com/',
-    'uri' => 'urn:test',
-    'exceptions' => false,
-    'classmap' => ['type' => 'stdClass', 1 => 'stdClass'],
-]);
-echo 'not reached', PHP_EOL;
+try {
+    new SoapClient(null, [
+        'location' => 'http://example.com/',
+        'uri' => 'urn:test',
+        'exceptions' => false,
+        'classmap' => ['type' => 'stdClass', 1 => 'stdClass'],
+    ]);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
 
 ?>
---EXPECTF--
-Fatal error: SoapClient::__construct(): 'classmap' option must be an associative array in %s on line %d
+--EXPECT--
+ValueError: SoapClient::__construct(): Argument #2 ($options) "classmap" option must be an associative array