Another round

Author: kocsismate

ext/soap/soap.c

@@ -575,10 +575,14 @@ PHP_METHOD(SoapHeader, __construct)
 	}
 	add_property_bool(this_ptr, "mustUnderstand", must_understand);
 
-	if (!actor_is_null) {
-		if (actor_str && ZSTR_LEN(actor_str) > 2) {
+	if (actor_str) {
+		if (ZSTR_LEN(actor_str) > 2) {
 			add_property_stringl(this_ptr, "actor", ZSTR_VAL(actor_str), ZSTR_LEN(actor_str));
-		} else if ((actor_long == SOAP_ACTOR_NEXT || actor_long == SOAP_ACTOR_NONE || actor_long == SOAP_ACTOR_UNLIMATERECEIVER)) {
+		} else {
+			php_error_docref(NULL, E_WARNING, "Invalid actor");
+		}
+	} else if (actor_is_null) {
+		if ((actor_long == SOAP_ACTOR_NEXT || actor_long == SOAP_ACTOR_NONE || actor_long == SOAP_ACTOR_UNLIMATERECEIVER)) {
 			add_property_long(this_ptr, "actor", actor_long);
 		} else {
 			php_error_docref(NULL, E_WARNING, "Invalid actor");
@@ -609,15 +613,13 @@ PHP_METHOD(SoapFault, __construct)
 	if (code_str) {
 		fault_code = ZSTR_VAL(code_str);
 		fault_code_len = ZSTR_LEN(code_str);
-	} else if (code_ht) {
-		if (zend_hash_num_elements(code_ht) == 2) {
-			zval *t_ns = zend_hash_index_find(code_ht, 0);
-			zval *t_code = zend_hash_index_find(code_ht, 1);
-			if (t_ns && t_code && Z_TYPE_P(t_ns) == IS_STRING && Z_TYPE_P(t_code) == IS_STRING) {
-				fault_code_ns = Z_STRVAL_P(t_ns);
-				fault_code = Z_STRVAL_P(t_code);
-				fault_code_len = Z_STRLEN_P(t_code);
-			}
+	} else if (code_ht && zend_hash_num_elements(code_ht) == 2) {
+		zval *t_ns = zend_hash_index_find(code_ht, 0);
+		zval *t_code = zend_hash_index_find(code_ht, 1);
+		if (t_ns && t_code && Z_TYPE_P(t_ns) == IS_STRING && Z_TYPE_P(t_code) == IS_STRING) {
+			fault_code_ns = Z_STRVAL_P(t_ns);
+			fault_code = Z_STRVAL_P(t_code);
+			fault_code_len = Z_STRLEN_P(t_code);
 		}
 	}
 

ext/standard/tests/filters/php_user_filter_01.phpt

@@ -14,4 +14,4 @@ class bar extends php_user_filter {
 }
 ?>
 --EXPECTF--
-Fatal error: Declaration of bar::filter($in, $out, &$consumed) must be compatible with php_user_filter::filter(mixed $in, mixed $out, mixed &$consumed, mixed $closing) in %s on line %d
+Fatal error: Declaration of bar::filter($in, $out, &$consumed) must be compatible with php_user_filter::filter($in, $out, &$consumed, bool $closing) in %s on line %d

ext/standard/tests/filters/php_user_filter_02.phpt

@@ -9,4 +9,4 @@ class foo extends php_user_filter {
 }
 ?>
 --EXPECTF--
-Fatal error: Declaration of foo::filter($in, $out, $consumed, $closing) must be compatible with php_user_filter::filter(mixed $in, mixed $out, mixed &$consumed, mixed $closing) in %s on line %d
+Fatal error: Declaration of foo::filter($in, $out, $consumed, $closing) must be compatible with php_user_filter::filter($in, $out, &$consumed, bool $closing) in %s on line %d

ext/standard/user_filters.c

@@ -41,8 +41,9 @@ static int le_bucket;
 
 PHP_METHOD(php_user_filter, filter)
 {
-	zval *in, *out, *consumed, *closing;
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "zzzz", &in, &out, &consumed, &closing) == FAILURE) {
+	zval *in, *out, *consumed;
+	zend_bool closing;
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rrzb", &in, &out, &consumed, &closing) == FAILURE) {
 		RETURN_THROWS();
 	}
 }

ext/standard/user_filters.stub.php

@@ -4,8 +4,13 @@
 
 class php_user_filter
 {
-    /** @return int */
-    public function filter(mixed $in, mixed $out, mixed &$consumed, mixed $closing) {}
+    /**
+     * @param resource $in
+     * @param resource $out
+     * @param int $consumed
+     * @return int
+     */
+    public function filter($in, $out, &$consumed, bool $closing) {}
 
     /** @return void */
     public function onCreate() {}

ext/standard/user_filters_arginfo.h

@@ -1,11 +1,11 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 1917249014ff29c226c94ac0e46e7a9f00261d0d */
+ * Stub hash: b3876ce9055a9417d0d1db9f97235513740de956 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_php_user_filter_filter, 0, 0, 4)
-	ZEND_ARG_TYPE_INFO(0, in, IS_MIXED, 0)
-	ZEND_ARG_TYPE_INFO(0, out, IS_MIXED, 0)
-	ZEND_ARG_TYPE_INFO(1, consumed, IS_MIXED, 0)
-	ZEND_ARG_TYPE_INFO(0, closing, IS_MIXED, 0)
+	ZEND_ARG_INFO(0, in)
+	ZEND_ARG_INFO(0, out)
+	ZEND_ARG_INFO(1, consumed)
+	ZEND_ARG_TYPE_INFO(0, closing, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_php_user_filter_onCreate, 0, 0, 0)