Stop special casing false value type

Author: Girgias

ext/xml/tests/set_handler_errors.phpt

@@ -52,9 +52,9 @@ try {
 Invalid $parser:
 TypeError: xml_set_processing_instruction_handler(): Argument #1 ($parser) must be of type XMLParser, stdClass given
 Invalid callable type true:
-TypeError: xml_set_processing_instruction_handler(): Argument #2 ($handler) must be of type callable|string|null|false
+TypeError: xml_set_processing_instruction_handler(): Argument #2 ($handler) must be of type callable|string|null
 Invalid callable type int:
-TypeError: xml_set_processing_instruction_handler(): Argument #2 ($handler) must be of type callable|string|null|false
+TypeError: xml_set_processing_instruction_handler(): Argument #2 ($handler) must be of type callable|string|null
 String not callable and no object set:
 ValueError: xml_set_processing_instruction_handler(): Argument #2 ($handler) an object must be set via xml_set_object() to be able to lookup method
 String non existent method on set object:

ext/xml/tests/xml_set_element_handler_errors.phpt

@@ -78,13 +78,13 @@ try {
 Invalid $parser:
 TypeError: xml_set_element_handler(): Argument #1 ($parser) must be of type XMLParser, stdClass given
 Invalid start callable type true:
-TypeError: xml_set_element_handler(): Argument #2 ($start_handler) must be of type callable|string|null|false
+TypeError: xml_set_element_handler(): Argument #2 ($start_handler) must be of type callable|string|null
 Invalid end callable type true:
-TypeError: xml_set_element_handler(): Argument #3 ($end_handler) must be of type callable|string|null|false
+TypeError: xml_set_element_handler(): Argument #3 ($end_handler) must be of type callable|string|null
 Invalid start callable type int:
-TypeError: xml_set_element_handler(): Argument #2 ($start_handler) must be of type callable|string|null|false
+TypeError: xml_set_element_handler(): Argument #2 ($start_handler) must be of type callable|string|null
 Invalid end callable type int:
-TypeError: xml_set_element_handler(): Argument #3 ($end_handler) must be of type callable|string|null|false
+TypeError: xml_set_element_handler(): Argument #3 ($end_handler) must be of type callable|string|null
 Invalid start callable, no object set and string not callable:
 ValueError: xml_set_element_handler(): Argument #2 ($start_handler) an object must be set via xml_set_object() to be able to lookup method
 Invalid end callable, no object set and string not callable:

ext/xml/xml.c

@@ -1175,27 +1175,15 @@ PHP_FUNCTION(xml_set_element_handler)
 			RETURN_THROWS();
 		} else {
 			switch (Z_TYPE_P(dummy_start)) {
-				case IS_FALSE:
 				case IS_NULL:
-					break;
 				case IS_STRING:
-					// TODO ... how to deal with callable on one arg and false on another?
-				default:
-					zend_argument_type_error(2, "must be of type callable|string|null|false");
-					RETURN_THROWS();
-			}
-			switch (Z_TYPE_P(dummy_end)) {
-				case IS_FALSE:
-				case IS_NULL:
 					break;
-				case IS_STRING:
-					// TODO ... how to deal with callable on one arg and false on another?
 				default:
-					zend_argument_type_error(3, "must be of type callable|string|null|false");
+					zend_argument_type_error(2, "must be of type callable|string|null");
 					RETURN_THROWS();
 			}
-
-			parser = Z_XMLPARSER_P(pind);
+			zend_argument_type_error(3, "must be of type callable|string|null");
+			RETURN_THROWS();
 		}
 	}
 
@@ -1234,11 +1222,6 @@ static void php_xml_set_handler_parse_callable(
 		xml_parser *local_parser;
 		*parser = local_parser = Z_XMLPARSER_P(pind);
 
-		if (ZSTR_LEN(method_name) == 0) {
-			/* Free handler, so just return and a uninitialized FCC communicates this */
-			return;
-		}
-
 		bool status = php_xml_check_string_method_arg(2, local_parser, method_name, parser_handler_fcc);
 		if (status == false) {
 			RETURN_FALSE;
@@ -1248,15 +1231,8 @@ static void php_xml_set_handler_parse_callable(
 		if (zend_parse_parameters(ZEND_NUM_ARGS(), "Oz", &pind, xml_parser_ce, &dummy) == FAILURE) {
 			RETURN_THROWS();
 		}
-		switch (Z_TYPE_P(dummy)) {
-			case IS_FALSE:
-				break;
-			default:
-				zend_argument_type_error(2, "must be of type callable|string|null|false");
-				RETURN_THROWS();
-		}
-
-		*parser = Z_XMLPARSER_P(pind);
+		zend_argument_type_error(2, "must be of type callable|string|null");
+		RETURN_THROWS();
 	}
 }