Merge branch 'PHP-8.0' into PHP-8.1

cmb69 · cmb69 · commit dd89acaf4985 · 2022-05-19T11:07:29.000+02:00
* PHP-8.0: Fix GH-8578: Error on wrong parameter on SoapHeader constructor
diff --git a/NEWS b/NEWS
@@ -15,6 +15,10 @@ PHP                                                                        NEWS
   . Fixed bug #79589 (error:14095126:SSL routines:ssl3_read_n:unexpected eof
     while reading). (Jakub Zelenka)
 
+- Soap:
+  . Fixed bug GH-8578 (Error on wrong parameter on SoapHeader constructor).
+    (robertnisipeanu)
+
 - SPL:
   . Fixed bug GH-8235 (iterator_count() may run indefinitely). (cmb)
 
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
@@ -577,7 +577,7 @@ PHP_METHOD(SoapHeader, __construct)
 		if (ZSTR_LEN(actor_str) > 2) {
 			ZVAL_STR_COPY(Z_HEADER_ACTOR_P(this_ptr), actor_str);
 		} else {
-			zend_argument_value_error(2, "must be longer than 2 characters");
+			zend_argument_value_error(5, "must be longer than 2 characters");
 			RETURN_THROWS();
 		}
 	} else if (!actor_is_null) {

Original file line number	Diff line number	Diff line change
`@@ -577,7 +577,7 @@ PHP_METHOD(SoapHeader, __construct)`
`577`	`577`	`if (ZSTR_LEN(actor_str) > 2) {`
`578`	`578`	`ZVAL_STR_COPY(Z_HEADER_ACTOR_P(this_ptr), actor_str);`
`579`	`579`	`} else {`
`580`		`- zend_argument_value_error(2, "must be longer than 2 characters");`
	`580`	`+ zend_argument_value_error(5, "must be longer than 2 characters");`
`581`	`581`	`RETURN_THROWS();`
`582`	`582`	`}`
`583`	`583`	`} else if (!actor_is_null) {`