Deprecate ["C1", "C2::method"] style callables

nikic · nikic · commit 3af29f1c34f6 · 2021-09-02T10:49:38.000+02:00
diff --git a/Zend/tests/bug48770.phpt b/Zend/tests/bug48770.phpt
@@ -31,5 +31,5 @@ $c->callFuncInParent('Which function will be called??');
 
 ?>
 --EXPECTF--
-Deprecated: Use of "parent" in callables is deprecated in %s on line %d
+Deprecated: Callables of the form ["C1", "C2::method"] are deprecated in %s on line %d
 B::func called
diff --git a/Zend/tests/bug48770_2.phpt b/Zend/tests/bug48770_2.phpt
@@ -54,14 +54,14 @@ $c->func('This should work!');
 
 ?>
 --EXPECTF--
-Deprecated: Use of "parent" in callables is deprecated in %s on line %d
+Deprecated: Callables of the form ["C1", "C2::method"] are deprecated in %s on line %d
 string(27) "B::func2: This should work!"
 
-Deprecated: Use of "parent" in callables is deprecated in %s on line %d
+Deprecated: Callables of the form ["C1", "C2::method"] are deprecated in %s on line %d
 string(27) "B::func3: This should work!"
 
-Deprecated: Use of "parent" in callables is deprecated in %s on line %d
+Deprecated: Callables of the form ["C1", "C2::method"] are deprecated in %s on line %d
 call_user_func_array(): Argument #1 ($callback) must be a valid callback, cannot access private method B::func22()
 
-Deprecated: Use of "parent" in callables is deprecated in %s on line %d
+Deprecated: Callables of the form ["C1", "C2::method"] are deprecated in %s on line %d
 call_user_func_array(): Argument #1 ($callback) must be a valid callback, class B does not have a method "inexistent"
diff --git a/Zend/tests/bug48770_3.phpt b/Zend/tests/bug48770_3.phpt
@@ -45,11 +45,11 @@ $c->func('This should work!');
 
 ?>
 --EXPECTF--
-Deprecated: Use of "self" in callables is deprecated in %s on line %d
+Deprecated: Callables of the form ["C1", "C2::method"] are deprecated in %s on line %d
 string(27) "B::func2: This should work!"
 
-Deprecated: Use of "self" in callables is deprecated in %s on line %d
+Deprecated: Callables of the form ["C1", "C2::method"] are deprecated in %s on line %d
 string(27) "B::func3: This should work!"
 
-Deprecated: Use of "self" in callables is deprecated in %s on line %d
+Deprecated: Callables of the form ["C1", "C2::method"] are deprecated in %s on line %d
 call_user_func_array(): Argument #1 ($callback) must be a valid callback, class C does not have a method "inexistent"
diff --git a/Zend/tests/bug66719.phpt b/Zend/tests/bug66719.phpt
@@ -38,10 +38,10 @@ C::test();
 string(1) "B"
 string(1) "A"
 
-Deprecated: Use of "parent" in callables is deprecated in %s on line %d
+Deprecated: Callables of the form ["C1", "C2::method"] are deprecated in %s on line %d
 string(1) "A"
 string(1) "B"
 string(1) "A"
 
-Deprecated: Use of "parent" in callables is deprecated in %s on line %d
+Deprecated: Callables of the form ["C1", "C2::method"] are deprecated in %s on line %d
 string(1) "A"
diff --git a/Zend/tests/callable_self_parent_static_deprecation.phpt b/Zend/tests/callable_self_parent_static_deprecation.phpt
@@ -19,6 +19,7 @@ class B extends A {
         call_user_func(["B", "self::foo"]);
         call_user_func(["B", "parent::foo"]);
         call_user_func(["B", "static::foo"]);
+        call_user_func(["B", "A::foo"]);
 
         // Also applies to other things performing calls
         echo "Test array_map()\n";
@@ -53,11 +54,13 @@ Deprecated: Use of "parent" in callables is deprecated in %s on line %d
 
 Deprecated: Use of "static" in callables is deprecated in %s on line %d
 
-Deprecated: Use of "self" in callables is deprecated in %s on line %d
+Deprecated: Callables of the form ["C1", "C2::method"] are deprecated in %s on line %d
 
-Deprecated: Use of "parent" in callables is deprecated in %s on line %d
+Deprecated: Callables of the form ["C1", "C2::method"] are deprecated in %s on line %d
 
-Deprecated: Use of "static" in callables is deprecated in %s on line %d
+Deprecated: Callables of the form ["C1", "C2::method"] are deprecated in %s on line %d
+
+Deprecated: Callables of the form ["C1", "C2::method"] are deprecated in %s on line %d
 Test array_map()
 
 Deprecated: Use of "self" in callables is deprecated in %s on line %d
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
@@ -3291,7 +3291,7 @@ static zend_always_inline zend_class_entry *get_scope(zend_execute_data *frame)
 	return frame && frame->func ? frame->func->common.scope : NULL;
 }
 
-static bool zend_is_callable_check_class(zend_string *name, zend_class_entry *scope, zend_execute_data *frame, zend_fcall_info_cache *fcc, bool *strict_class, char **error) /* {{{ */
+static bool zend_is_callable_check_class(zend_string *name, zend_class_entry *scope, zend_execute_data *frame, zend_fcall_info_cache *fcc, bool *strict_class, char **error, bool suppress_deprecation) /* {{{ */
 {
 	bool ret = 0;
 	zend_class_entry *ce;
@@ -3307,7 +3307,7 @@ static bool zend_is_callable_check_class(zend_string *name, zend_class_entry *sc
 		if (!scope) {
 			if (error) *error = estrdup("cannot access \"self\" when no class scope is active");
 		} else {
-			if (error) {
+			if (error && !suppress_deprecation) {
 				zend_error(E_DEPRECATED, "Use of \"self\" in callables is deprecated");
 			}
 			fcc->called_scope = zend_get_called_scope(frame);
@@ -3326,7 +3326,7 @@ static bool zend_is_callable_check_class(zend_string *name, zend_class_entry *sc
 		} else if (!scope->parent) {
 			if (error) *error = estrdup("cannot access \"parent\" when current class scope has no parent");
 		} else {
-			if (error) {
+			if (error && !suppress_deprecation) {
 				zend_error(E_DEPRECATED, "Use of \"parent\" in callables is deprecated");
 			}
 			fcc->called_scope = zend_get_called_scope(frame);
@@ -3346,7 +3346,7 @@ static bool zend_is_callable_check_class(zend_string *name, zend_class_entry *sc
 		if (!called_scope) {
 			if (error) *error = estrdup("cannot access \"static\" when no class scope is active");
 		} else {
-			if (error) {
+			if (error && !suppress_deprecation) {
 				zend_error(E_DEPRECATED, "Use of \"static\" in callables is deprecated");
 			}
 			fcc->called_scope = called_scope;
@@ -3481,7 +3481,7 @@ static zend_always_inline bool zend_is_callable_check_func(int check_flags, zval
 				fcc->called_scope = fcc->object ? fcc->object->ce : fcc->calling_scope;
 			}
 			strict_class = 1;
-		} else if (!zend_is_callable_check_class(cname, scope, frame, fcc, &strict_class, error)) {
+		} else if (!zend_is_callable_check_class(cname, scope, frame, fcc, &strict_class, error, ce_org != NULL)) {
 			zend_string_release_ex(cname, 0);
 			return 0;
 		}
@@ -3492,6 +3492,10 @@ static zend_always_inline bool zend_is_callable_check_func(int check_flags, zval
 			if (error) zend_spprintf(error, 0, "class %s is not a subclass of %s", ZSTR_VAL(ce_org->name), ZSTR_VAL(fcc->calling_scope->name));
 			return 0;
 		}
+		if (ce_org && error) {
+			zend_error(E_DEPRECATED,
+				"Callables of the form [\"C1\", \"C2::method\"] are deprecated");
+		}
 		mname = zend_string_init(Z_STRVAL_P(callable) + clen + 2, mlen, 0);
 	} else if (ce_org) {
 		/* Try to fetch find static method of given class. */
@@ -3765,7 +3769,7 @@ ZEND_API bool zend_is_callable_at_frame(
 						return 1;
 					}
 
-					if (!zend_is_callable_check_class(Z_STR_P(obj), get_scope(frame), frame, fcc, &strict_class, error)) {
+					if (!zend_is_callable_check_class(Z_STR_P(obj), get_scope(frame), frame, fcc, &strict_class, error, false)) {
 						return 0;
 					}
 				} else {
diff --git a/ext/standard/tests/general_functions/bug40398.phpt b/ext/standard/tests/general_functions/bug40398.phpt
@@ -74,9 +74,10 @@ new Derived_6('6');
 
 ?>
 --EXPECTF--
+Deprecated: Callables of the form ["C1", "C2::method"] are deprecated in %s on line %d
 Base::__construct(1)
 
-Deprecated: Use of "parent" in callables is deprecated in %s on line %d
+Deprecated: Callables of the form ["C1", "C2::method"] are deprecated in %s on line %d
 Base::__construct(2)
 Base::__construct(3)
 
diff --git a/ext/standard/tests/general_functions/callbacks_001.phpt b/ext/standard/tests/general_functions/callbacks_001.phpt
@@ -90,15 +90,15 @@ Deprecated: Use of "parent" in callables is deprecated in %s on line %d
 B
 C|parent::who
 
-Deprecated: Use of "parent" in callables is deprecated in %s on line %d
+Deprecated: Callables of the form ["C1", "C2::method"] are deprecated in %s on line %d
 B
 B|parent::who
 
-Deprecated: Use of "parent" in callables is deprecated in %s on line %d
+Deprecated: Callables of the form ["C1", "C2::method"] are deprecated in %s on line %d
 A
 E|parent::who
 
-Deprecated: Use of "parent" in callables is deprecated in %s on line %d
+Deprecated: Callables of the form ["C1", "C2::method"] are deprecated in %s on line %d
 D
 A|who
 A
@@ -113,9 +113,11 @@ Deprecated: Use of "parent" in callables is deprecated in %s on line %d
 O
 P|parent::who
 
-Deprecated: Use of "parent" in callables is deprecated in %s on line %d
+Deprecated: Callables of the form ["C1", "C2::method"] are deprecated in %s on line %d
 O
 $this|O::who
+
+Deprecated: Callables of the form ["C1", "C2::method"] are deprecated in %s on line %d
 O
 $this|B::who
 call_user_func(): Argument #1 ($callback) must be a valid callback, class P is not a subclass of B
diff --git a/tests/classes/abstract_user_call.phpt b/tests/classes/abstract_user_call.phpt
@@ -27,6 +27,8 @@ try {
 }
 
 ?>
---EXPECT--
+--EXPECTF--
 test::func()
+
+Deprecated: Callables of the form ["C1", "C2::method"] are deprecated in %s on line %d
 call_user_func(): Argument #1 ($callback) must be a valid callback, cannot call abstract method test_base::func()

Original file line number	Diff line number	Diff line change
`@@ -90,15 +90,15 @@ Deprecated: Use of "parent" in callables is deprecated in %s on line %d`
`90`	`90`	`B`
`91`	`91`	`C\|parent::who`
`92`	`92`
`93`		`-Deprecated: Use of "parent" in callables is deprecated in %s on line %d`
	`93`	`+Deprecated: Callables of the form ["C1", "C2::method"] are deprecated in %s on line %d`
`94`	`94`	`B`
`95`	`95`	`B\|parent::who`
`96`	`96`
`97`		`-Deprecated: Use of "parent" in callables is deprecated in %s on line %d`
	`97`	`+Deprecated: Callables of the form ["C1", "C2::method"] are deprecated in %s on line %d`
`98`	`98`	`A`
`99`	`99`	`E\|parent::who`
`100`	`100`
`101`		`-Deprecated: Use of "parent" in callables is deprecated in %s on line %d`
	`101`	`+Deprecated: Callables of the form ["C1", "C2::method"] are deprecated in %s on line %d`
`102`	`102`	`D`
`103`	`103`	`A\|who`
`104`	`104`	`A`
`@@ -113,9 +113,11 @@ Deprecated: Use of "parent" in callables is deprecated in %s on line %d`
`113`	`113`	`O`
`114`	`114`	`P\|parent::who`
`115`	`115`
`116`		`-Deprecated: Use of "parent" in callables is deprecated in %s on line %d`
	`116`	`+Deprecated: Callables of the form ["C1", "C2::method"] are deprecated in %s on line %d`
`117`	`117`	`O`
`118`	`118`	`$this\|O::who`
	`119`	`+`
	`120`	`+Deprecated: Callables of the form ["C1", "C2::method"] are deprecated in %s on line %d`
`119`	`121`	`O`
`120`	`122`	`$this\|B::who`
`121`	`123`	`call_user_func(): Argument #1 ($callback) must be a valid callback, class P is not a subclass of B`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@ try {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`?>`
`30`		`---EXPECT--`
	`30`	`+--EXPECTF--`
`31`	`31`	`test::func()`
	`32`	`+`
	`33`	`+Deprecated: Callables of the form ["C1", "C2::method"] are deprecated in %s on line %d`
`32`	`34`	`call_user_func(): Argument #1 ($callback) must be a valid callback, cannot call abstract method test_base::func()`