Change the new macro to Z_PARAM_CLASS_NAME_OR_OBJ

Author: kocsismate

Zend/tests/010.phpt

@@ -32,16 +32,37 @@ var_dump(get_parent_class("bar"));
 var_dump(get_parent_class("foo"));
 var_dump(get_parent_class("i"));
 
-var_dump(get_parent_class(""));
-var_dump(get_parent_class("[[[["));
-var_dump(get_parent_class(" "));
+try {
+    get_parent_class("");
+} catch (TypeError $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
+try {
+    get_parent_class("[[[[");
+} catch (TypeError $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
+try {
+    get_parent_class(" ");
+} catch (TypeError $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
 var_dump(get_parent_class(new stdclass));
+
 try {
     get_parent_class(array());
 } catch (TypeError $exception) {
     echo $exception->getMessage() . "\n";
 }
-var_dump(get_parent_class(1));
+
+try {
+    get_parent_class(1);
+} catch (TypeError $exception) {
+    echo $exception->getMessage() . "\n";
+}
 
 echo "Done\n";
 ?>
@@ -54,10 +75,10 @@ bool(false)
 string(3) "foo"
 bool(false)
 bool(false)
+get_parent_class(): Argument #1 ($object) must be a valid class name or object, string given
+get_parent_class(): Argument #1 ($object) must be a valid class name or object, string given
+get_parent_class(): Argument #1 ($object) must be a valid class name or object, string given
 bool(false)
-bool(false)
-bool(false)
-bool(false)
-get_parent_class(): Argument #1 ($object) must be of type string|object, array given
-bool(false)
+get_parent_class(): Argument #1 ($object) must be a valid class name or object, array given
+get_parent_class(): Argument #1 ($object) must be a valid class name or object, int given
 Done

Zend/zend_API.h

@@ -1217,8 +1217,8 @@ static zend_always_inline zval *zend_try_array_init(zval *zv)
 	_(Z_EXPECTED_STRING_OR_ARRAY_OR_NULL, "of type string|array|null") \
 	_(Z_EXPECTED_STRING_OR_LONG,	"of type string|int") \
 	_(Z_EXPECTED_STRING_OR_LONG_OR_NULL, "of type string|int|null") \
-	_(Z_EXPECTED_STRING_OR_OBJECT,	"of type string|object") \
-	_(Z_EXPECTED_STRING_OR_OBJECT_OR_NULL, "of type string|object|null") \
+	_(Z_EXPECTED_CLASS_NAME_OR_OBJECT,	"a valid class name or object") \
+	_(Z_EXPECTED_CLASS_NAME_OR_OBJECT_OR_NULL, "a valid class name, object, or null") \
 
 #define Z_EXPECTED_TYPE
 
@@ -1397,6 +1397,20 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_value_error(uint32_t arg_num
 #define Z_PARAM_CLASS(dest) \
 	Z_PARAM_CLASS_EX(dest, 0, 0)
 
+#define Z_PARAM_CLASS_NAME_OR_OBJ_EX(dest_str, dest_object, allow_null) \
+	Z_PARAM_PROLOGUE(0, 0); \
+	if (UNEXPECTED(!zend_parse_arg_class_name_or_obj(_arg, &dest_str, &dest_object, _i, allow_null))) { \
+		_expected_type = allow_null ? Z_EXPECTED_CLASS_NAME_OR_OBJECT_OR_NULL : Z_EXPECTED_CLASS_NAME_OR_OBJECT; \
+		_error_code = ZPP_ERROR_WRONG_ARG; \
+		break; \
+	}
+
+#define Z_PARAM_CLASS_NAME_OR_OBJ(dest_str, dest_object) \
+	Z_PARAM_CLASS_NAME_OR_OBJ_EX(dest_str, dest_object, 0);
+
+#define Z_PARAM_CLASS_NAME_OR_OBJ_OR_NULL(dest_str, dest_object) \
+	Z_PARAM_CLASS_NAME_OR_OBJ_EX(dest_str, dest_object, 1);
+
 /* old "d" */
 #define Z_PARAM_DOUBLE_EX2(dest, is_null, check_null, deref, separate) \
 		Z_PARAM_PROLOGUE(deref, separate); \
@@ -1682,20 +1696,6 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_value_error(uint32_t arg_num
 #define Z_PARAM_STR_OR_LONG_OR_NULL(dest_str, dest_long, is_null) \
 	Z_PARAM_STR_OR_LONG_EX(dest_str, dest_long, is_null, 1);
 
-#define Z_PARAM_STR_OR_OBJ_EX(dest_str, dest_object, allow_null) \
-	Z_PARAM_PROLOGUE(0, 0); \
-	if (UNEXPECTED(!zend_parse_arg_str_or_obj(_arg, &dest_str, &dest_object, allow_null))) { \
-		_expected_type = allow_null ? Z_EXPECTED_STRING_OR_OBJECT_OR_NULL : Z_EXPECTED_STRING_OR_OBJECT; \
-		_error_code = ZPP_ERROR_WRONG_ARG; \
-		break; \
-	}
-
-#define Z_PARAM_STR_OR_OBJ(dest_str, dest_object) \
-	Z_PARAM_STR_OR_OBJ_EX(dest_str, dest_object, 0);
-
-#define Z_PARAM_STR_OR_OBJ_OR_NULL(dest_str, dest_object) \
-	Z_PARAM_STR_OR_OBJ_EX(dest_str, dest_object, 1);
-
 /* End of new parameter parsing API */
 
 /* Inlined implementations shared by new and old parameter parsing APIs */
@@ -1954,21 +1954,24 @@ static zend_always_inline int zend_parse_arg_str_or_long(zval *arg, zend_string
 	return 1;
 }
 
-static zend_always_inline int zend_parse_arg_str_or_obj(
-	zval *arg, zend_string **dest_str, zend_object **dest_object, int allow_null
+static zend_always_inline int zend_parse_arg_class_name_or_obj(
+	zval *arg, zend_string **dest_str, zend_object **dest_object, int num, int allow_null
 ) {
-	if (EXPECTED(Z_TYPE_P(arg) == IS_STRING)) {
-		*dest_str = Z_STR_P(arg);
+	zend_class_entry *class_entry;
+
+	if (EXPECTED(Z_TYPE_P(arg) == IS_STRING) && (class_entry = zend_lookup_class(Z_STR_P(arg)))) {
+		*dest_str = class_entry->name;
 		*dest_object = NULL;
 	} else if (EXPECTED(Z_TYPE_P(arg) == IS_OBJECT)) {
-		*dest_object = Z_OBJ_P(arg);
 		*dest_str = NULL;
+		*dest_object = Z_OBJ_P(arg);
 	} else if (allow_null && EXPECTED(Z_TYPE_P(arg) == IS_NULL)) {
-		*dest_object = NULL;
 		*dest_str = NULL;
+		*dest_object = NULL;
 	} else {
+		*dest_str = NULL;
 		*dest_object = NULL;
-		return zend_parse_arg_str_slow(arg, dest_str);
+		return 0;
 	}
 
 	return 1;

Zend/zend_builtin_functions.c

@@ -643,7 +643,7 @@ ZEND_FUNCTION(get_parent_class)
 
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
-		Z_PARAM_STR_OR_OBJ(str, object)
+		Z_PARAM_CLASS_NAME_OR_OBJ(str, object)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (object) {