Skip to content

Commit 272b887

Browse files
pmmagapmmaga
committed
Ignore inheritance rules on private methods
Closes GH-5401
1 parent 371e29e commit 272b887

File tree

9 files changed

+123
-6
lines changed

9 files changed

+123
-6
lines changed

‎UPGRADING‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,9 @@ PHP 8.0 UPGRADE NOTES
194194
RFC: https://wiki.php.net/rfc/locale_independent_float_to_string
195195
. Removed support for deprecated curly braces for offset access
196196
RFC: https://wiki.php.net/rfc/deprecate_curly_braces_array_access
197+
. Applying the final modifier on a private method will now produce a warning
198+
unless that method is the constructor.
199+
RFC: https://wiki.php.net/rfc/inheritance_private_methods
197200

198201
- COM:
199202
. Removed the ability to import case-insensitive constants from type
@@ -584,6 +587,10 @@ PHP 8.0 UPGRADE NOTES
584587
RFC: https://wiki.php.net/rfc/constructor_promotion
585588
. Added support for `match` expression.
586589
RFC: https://wiki.php.net/rfc/match_expression_v2
590+
. Private methods declared on a parent class no longer enforce any
591+
inheritance rules on the methods of a child class. (with the exception of
592+
final private constructors)
593+
RFC: https://wiki.php.net/rfc/inheritance_private_methods
587594

588595
- Date:
589596
. Added DateTime::createFromInterface() and

‎Zend/tests/method_argument_binding.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class C extends B {
2424
(new C)->test();
2525

2626
class D {
27-
private final function method(&$x) {
27+
private function method(&$x) {
2828
++$x;
2929
}
3030
}

‎Zend/zend_compile.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6486,6 +6486,10 @@ zend_string *zend_begin_method_decl(zend_op_array *op_array, zend_string *name,
64866486

64876487
zend_string *lcname;
64886488

6489+
if ((fn_flags & ZEND_ACC_PRIVATE) && (fn_flags & ZEND_ACC_FINAL) && !zend_is_constructor(name)) {
6490+
zend_error(E_COMPILE_WARNING, "Private methods cannot be final as they are never overridden by other classes");
6491+
}
6492+
64896493
if (in_interface) {
64906494
if (!(fn_flags & ZEND_ACC_PUBLIC) || (fn_flags & (ZEND_ACC_FINAL|ZEND_ACC_ABSTRACT))) {
64916495
zend_error_noreturn(E_COMPILE_ERROR, "Access type for interface method "

‎Zend/zend_inheritance.c‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -828,6 +828,14 @@ static zend_always_inline inheritance_status do_inheritance_check_on_method_ex(
828828
uint32_t parent_flags = parent->common.fn_flags;
829829
zend_function *proto;
830830

831+
if (UNEXPECTED((parent_flags & ZEND_ACC_PRIVATE) && !(parent_flags & ZEND_ACC_ABSTRACT) && !(parent_flags & ZEND_ACC_CTOR))) {
832+
if (!check_only) {
833+
child->common.fn_flags |= ZEND_ACC_CHANGED;
834+
}
835+
/* The parent method is private and not an abstract so we don't need to check any inheritance rules */
836+
return INHERITANCE_SUCCESS;
837+
}
838+
831839
if (!checked && UNEXPECTED(parent_flags & ZEND_ACC_FINAL)) {
832840
if (check_only) {
833841
return INHERITANCE_ERROR;
@@ -869,10 +877,6 @@ static zend_always_inline inheritance_status do_inheritance_check_on_method_ex(
869877
child->common.fn_flags |= ZEND_ACC_CHANGED;
870878
}
871879

872-
if ((parent_flags & ZEND_ACC_PRIVATE) && !(parent_flags & ZEND_ACC_ABSTRACT)) {
873-
return INHERITANCE_SUCCESS;
874-
}
875-
876880
proto = parent->common.prototype ?
877881
parent->common.prototype : parent;
878882

‎tests/classes/clone_005.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ abstract class base {
66
public $a = 'base';
77

88
// disallow cloning once forever
9-
final private function __clone() {}
9+
final protected function __clone() {}
1010
}
1111

1212
class test extends base {

‎tests/classes/final_private_ctor.phpt‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
--TEST--
2+
Final private constructors cannot be overridden
3+
--FILE--
4+
<?php
5+
6+
class Base
7+
{
8+
private final function __construct()
9+
{
10+
}
11+
}
12+
class Extended extends Base
13+
{
14+
public function __construct()
15+
{
16+
}
17+
}
18+
19+
?>
20+
--EXPECTF--
21+
Fatal error: Cannot override final method Base::__construct() in %s on line %d

‎tests/classes/inheritance_007.phpt‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
--TEST--
2+
Ensure private methods with the same name are not checked for inheritance rules - final
3+
--FILE--
4+
<?php
5+
class A {
6+
function callYourPrivates() {
7+
$this->normalPrivate();
8+
$this->finalPrivate();
9+
}
10+
function notOverridden_callYourPrivates() {
11+
$this->normalPrivate();
12+
$this->finalPrivate();
13+
}
14+
private function normalPrivate() {
15+
echo __METHOD__ . PHP_EOL;
16+
}
17+
final private function finalPrivate() {
18+
echo __METHOD__ . PHP_EOL;
19+
}
20+
}
21+
class B extends A {
22+
function callYourPrivates() {
23+
$this->normalPrivate();
24+
$this->finalPrivate();
25+
}
26+
private function normalPrivate() {
27+
echo __METHOD__ . PHP_EOL;
28+
}
29+
final private function finalPrivate() {
30+
echo __METHOD__ . PHP_EOL;
31+
}
32+
}
33+
$a = new A();
34+
$a->callYourPrivates();
35+
$a->notOverridden_callYourPrivates();
36+
$b = new B();
37+
$b->callYourPrivates();
38+
$b->notOverridden_callYourPrivates();
39+
?>
40+
--EXPECTF--
41+
Warning: Private methods cannot be final as they are never overridden by other classes %s
42+
43+
Warning: Private methods cannot be final as they are never overridden by other classes %s
44+
A::normalPrivate
45+
A::finalPrivate
46+
A::normalPrivate
47+
A::finalPrivate
48+
B::normalPrivate
49+
B::finalPrivate
50+
A::normalPrivate
51+
A::finalPrivate

‎tests/classes/inheritance_008.phpt‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
--TEST--
2+
Ensure private methods with the same name are not checked for inheritance rules - static
3+
--FILE--
4+
<?php
5+
class A {
6+
static private function foo() { }
7+
private function bar() {}
8+
}
9+
class B extends A {
10+
private function foo() {}
11+
static private function bar() {}
12+
}
13+
echo 'OK';
14+
?>
15+
--EXPECT--
16+
OK

‎tests/classes/inheritance_009.phpt‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
--TEST--
2+
Ensure private methods with the same name are not checked for inheritance rules - abstract
3+
--FILE--
4+
<?php
5+
class A {
6+
private function test() {}
7+
}
8+
abstract class B extends A {
9+
abstract function test();
10+
}
11+
echo 'OK';
12+
?>
13+
--EXPECT--
14+
OK

0 commit comments

Comments
 (0)