Deprecate partially supported callables

nikic · nikic · commit ee510eed685c · 2021-10-22T10:15:24.000+02:00
This deprecates all callables that are accepted by call_user_func($callable) but not by $callable(). In particular: "self::method" "parent::method" "static::method" ["self", "method"] ["parent", "method"] ["static", "method"] ["Foo", "Bar::method"] [new Foo, "Bar::method"] RFC: https://wiki.php.net/rfc/deprecate_partially_supported_callables Closes GH-7446.
diff --git a/UPGRADING b/UPGRADING
@@ -35,6 +35,26 @@ PHP 8.2 UPGRADE NOTES
 4. Deprecated Functionality
 ========================================
 
+- Core:
+  . Callables that are not accepted by the $callable() syntax (but are accepted
+    by call_user_func) are deprecated. In particular:
+
+        "self::method"
+        "parent::method"
+        "static::method"
+        ["self", "method"]
+        ["parent", "method"]
+        ["static", "method"]
+        ["Foo", "Bar::method"]
+        [new Foo, "Bar::method"]
+
+    This does not affect normal method callables like "A::method" or
+    ["A", "method"]. A deprecation notice is only emitted on call. Both
+    is_callable() and the callable type will silently accept these callables
+    until support for them is removed entirely.
+
+    RFC: https://wiki.php.net/rfc/deprecate_partially_supported_callables
+
 ========================================
 5. Changed Functions
 ========================================
diff --git a/Zend/tests/bug37138.phpt b/Zend/tests/bug37138.phpt
@@ -14,7 +14,11 @@ st::e ();
 st::e2 ();
 stch::g ();
 ?>
---EXPECT--
+--EXPECTF--
 EHLO
+
+Deprecated: Use of "self" in callables is deprecated in %s on line %d
 EHLO
+
+Deprecated: Use of "parent" in callables is deprecated in %s on line %d
 EHLO
diff --git a/Zend/tests/bug41026.phpt b/Zend/tests/bug41026.phpt
@@ -20,6 +20,7 @@ try_class::main ();
 
 echo "Done\n";
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Use of "self" in callables is deprecated in %s on line %d
 Done
 CHECKPOINT
diff --git a/Zend/tests/bug45186.phpt b/Zend/tests/bug45186.phpt
@@ -38,7 +38,7 @@ try {
 }
 
 ?>
---EXPECT--
+--EXPECTF--
 __call:
 string(3) "ABC"
 __call:
@@ -47,8 +47,12 @@ __call:
 string(3) "xyz"
 __call:
 string(3) "www"
+
+Deprecated: Use of "self" in callables is deprecated in %s on line %d
 __call:
 string(1) "y"
+
+Deprecated: Use of "self" in callables is deprecated in %s on line %d
 __call:
 string(1) "y"
 ok
diff --git a/Zend/tests/bug45186_2.phpt b/Zend/tests/bug45186_2.phpt
@@ -38,7 +38,7 @@ try {
 }
 
 ?>
---EXPECT--
+--EXPECTF--
 __call:
 string(3) "ABC"
 __call:
@@ -47,8 +47,12 @@ __call:
 string(3) "xyz"
 __call:
 string(3) "www"
+
+Deprecated: Use of "self" in callables is deprecated in %s on line %d
 __call:
 string(1) "y"
+
+Deprecated: Use of "self" in callables is deprecated in %s on line %d
 __call:
 string(1) "y"
 ok
diff --git a/Zend/tests/bug48770.phpt b/Zend/tests/bug48770.phpt
@@ -30,5 +30,6 @@ $c = new C;
 $c->callFuncInParent('Which function will be called??');
 
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Callables of the form ["C", "parent::func"] are deprecated in %s on line %d
 B::func called
diff --git a/Zend/tests/bug48770_2.phpt b/Zend/tests/bug48770_2.phpt
@@ -53,8 +53,15 @@ $c = new C;
 $c->func('This should work!');
 
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Callables of the form ["C", "parent::func2"] are deprecated in %s on line %d
 string(27) "B::func2: This should work!"
+
+Deprecated: Callables of the form ["C", "parent::func3"] are deprecated in %s on line %d
 string(27) "B::func3: This should work!"
+
+Deprecated: Callables of the form ["C", "parent::func22"] 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: Callables of the form ["C", "parent::inexistent"] 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
@@ -44,7 +44,12 @@ $c = new C;
 $c->func('This should work!');
 
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Callables of the form ["C", "self::func2"] are deprecated in %s on line %d
 string(27) "B::func2: This should work!"
+
+Deprecated: Callables of the form ["C", "self::func3"] are deprecated in %s on line %d
 string(27) "B::func3: This should work!"
+
+Deprecated: Callables of the form ["C", "self::inexistent"] 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
@@ -34,10 +34,14 @@ call_user_func(array(B::class, 'parent::who'));
 C::test();
 
 ?>
---EXPECT--
+--EXPECTF--
 string(1) "B"
 string(1) "A"
+
+Deprecated: Callables of the form ["B", "parent::who"] are deprecated in %s on line %d
 string(1) "A"
 string(1) "B"
 string(1) "A"
+
+Deprecated: Callables of the form ["B", "parent::who"] are deprecated in %s on line %d
 string(1) "A"
diff --git a/Zend/tests/bug78770.phpt b/Zend/tests/bug78770.phpt
@@ -19,5 +19,6 @@ class Test {
 
 ?>
 ===DONE===
---EXPECT--
+--EXPECTF--
+Deprecated: Use of "self" in callables is deprecated in %s on line %d
 ===DONE===
diff --git a/Zend/tests/bug78898.phpt b/Zend/tests/bug78898.phpt
@@ -30,5 +30,9 @@ $b = new B;
 $b->x();
 
 ?>
---EXPECT--
-aaa
+--EXPECTF--
+a
+Deprecated: Use of "parent" in callables is deprecated in %s on line %d
+a
+Deprecated: Use of "parent" in callables is deprecated in %s on line %d
+a
diff --git a/Zend/tests/callable_self_parent_static_deprecation.phpt b/Zend/tests/callable_self_parent_static_deprecation.phpt
@@ -0,0 +1,69 @@
+--TEST--
+Deprecation of self/parent/static in callables
+--FILE--
+<?php
+
+class A {
+    public function foo() {}
+}
+class B extends A {
+    public function test() {
+        // Different callables using self/parent/static
+        echo "Test different callables\n";
+        call_user_func("self::foo");
+        call_user_func("parent::foo");
+        call_user_func("static::foo");
+        call_user_func(["self", "foo"]);
+        call_user_func(["parent", "foo"]);
+        call_user_func(["static", "foo"]);
+        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";
+        array_map("self::foo", [1]);
+
+        echo "Test is_callable() -- should be silent\n";
+        var_dump(is_callable("self::foo"));
+
+        echo "Test callable type hint -- should be silent\n";
+        $this->callableTypeHint("self::foo");
+    }
+
+    public function callableTypeHint(callable $c) {}
+}
+
+$b = new B;
+$b->test();
+
+?>
+--EXPECTF--
+Test different callables
+
+Deprecated: Use of "self" in callables is deprecated in %s on line %d
+
+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: 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: Callables of the form ["B", "self::foo"] are deprecated in %s on line %d
+
+Deprecated: Callables of the form ["B", "parent::foo"] are deprecated in %s on line %d
+
+Deprecated: Callables of the form ["B", "static::foo"] are deprecated in %s on line %d
+
+Deprecated: Callables of the form ["B", "A::foo"] are deprecated in %s on line %d
+Test array_map()
+
+Deprecated: Use of "self" in callables is deprecated in %s on line %d
+Test is_callable() -- should be silent
+bool(true)
+Test callable type hint -- should be silent
diff --git a/Zend/tests/closures/closure_from_callable_basic.phpt b/Zend/tests/closures/closure_from_callable_basic.phpt
@@ -96,7 +96,7 @@ echo $fn(" OK".PHP_EOL);
 
 
 ?>
---EXPECT--
+--EXPECTF--
 Access public static function OK
 Access public static function with different case OK
 Access public static function with colon scheme OK
@@ -111,9 +111,17 @@ Instance return private static method as callable OK
 Instance return protected static method as callable OK
 Subclass closure over parent class protected method OK
 Subclass closure over parent class static protected method OK
-Access public instance method of parent object through "parent::"  OK
-Access public instance method of self object through "self::"  OK
-Access public instance method of parent object through "self::" to parent method OK
-Access protected instance method of parent object through "self::" to parent method OK
+Access public instance method of parent object through "parent::" 
+Deprecated: Use of "parent" in callables is deprecated in %s on line %d
+ OK
+Access public instance method of self object through "self::" 
+Deprecated: Use of "self" in callables is deprecated in %s on line %d
+ OK
+Access public instance method of parent object through "self::" to parent method
+Deprecated: Use of "self" in callables is deprecated in %s on line %d
+ OK
+Access protected instance method of parent object through "self::" to parent method
+Deprecated: Use of "self" in callables is deprecated in %s on line %d
+ OK
 MagicCall __call instance method __call,nonExistentMethod, OK
 MagicCall __callStatic static method __callStatic,nonExistentMethod, OK
diff --git a/Zend/tests/closures/closure_from_callable_error.phpt b/Zend/tests/closures/closure_from_callable_error.phpt
@@ -193,7 +193,7 @@ catch (\Throwable $t) {
 echo "OK\n";
 
 ?>
---EXPECT--
+--EXPECTF--
 Cannot access privateInstance method statically
 Cannot access privateInstance method statically with colon scheme
 Cannot access privateInstance method
@@ -209,4 +209,6 @@ Subclass cannot closure over parant private static method
 Function scope cannot closure over protected instance method
 Function scope cannot closure over private instance method
 Access private instance method of parent object through "self::" to parent method
+
+Deprecated: Use of "self" in callables is deprecated in %s on line %d
 OK
diff --git a/Zend/tests/lsb_011.phpt b/Zend/tests/lsb_011.phpt
@@ -19,5 +19,6 @@ class Test2 extends Test1 {
 }
 Test2::test();
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Use of "static" in callables is deprecated in %s on line %d
 ok
diff --git a/Zend/tests/lsb_012.phpt b/Zend/tests/lsb_012.phpt
@@ -19,5 +19,6 @@ class Test2 extends Test1 {
 }
 Test2::test();
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Use of "static" in callables is deprecated in %s on line %d
 ok
diff --git a/Zend/tests/lsb_021.phpt b/Zend/tests/lsb_021.phpt
@@ -39,12 +39,20 @@ C::testForward();
 C::testNoForward();
 
 ?>
---EXPECT--
+--EXPECTF--
 C
+
+Deprecated: Use of "parent" in callables is deprecated in %s on line %d
 C
+
+Deprecated: Use of "parent" in callables is deprecated in %s on line %d
 C
 C
+
+Deprecated: Use of "self" in callables is deprecated in %s on line %d
 C
+
+Deprecated: Use of "self" in callables is deprecated in %s on line %d
 C
 A
 A
diff --git a/Zend/tests/lsb_022.phpt b/Zend/tests/lsb_022.phpt
@@ -24,9 +24,24 @@ class B extends A {
 }
 B::foo();
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Use of "static" in callables is deprecated in %s on line %d
 B
+
+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
 B
+
+Deprecated: Use of "static" in callables is deprecated in %s on line %d
 B
+
+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
 B
+
+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
 B
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
diff --git a/ext/pdo_mysql/tests/pdo_mysql_subclass.phpt b/ext/pdo_mysql/tests/pdo_mysql_subclass.phpt
diff --git a/ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt b/ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt
diff --git a/ext/spl/tests/bug65006.phpt b/ext/spl/tests/bug65006.phpt
diff --git a/ext/standard/tests/class_object/forward_static_call_001.phpt b/ext/standard/tests/class_object/forward_static_call_001.phpt
diff --git a/ext/standard/tests/class_object/forward_static_call_003.phpt b/ext/standard/tests/class_object/forward_static_call_003.phpt
diff --git a/ext/standard/tests/general_functions/bug40398.phpt b/ext/standard/tests/general_functions/bug40398.phpt
diff --git a/ext/standard/tests/general_functions/callbacks_001.phpt b/ext/standard/tests/general_functions/callbacks_001.phpt
diff --git a/tests/classes/abstract_user_call.phpt b/tests/classes/abstract_user_call.phpt
