Skip to content

Allow extending readonly classes by non-readonly ones #9827

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kocsismate wants to merge 1 commit into from
Closed

Allow extending readonly classes by non-readonly ones #9827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Zend/tests/readonly_classes/readonly_class_inheritance_error1.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
--TEST--
Non-readonly class cannot extend a readonly class
Readonly class cannot extend a non-readonly class
--FILE--
<?php

readonly class Foo
class Foo
{
}

class Bar extends Foo
readonly class Bar extends Foo
{
}

?>
--EXPECTF--
Fatal error: Non-readonly class Bar cannot extend readonly class Foo in %s on line %d
Fatal error: Readonly class Bar cannot extend non-readonly class Foo in %s on line %d
16 changes: 0 additions & 16 deletions Zend/tests/readonly_classes/readonly_class_inheritance_error2.phpt
View file
Open in desktop

This file was deleted.

0 ...s/readonly_class_inheritance_success.phpt → .../readonly_class_inheritance_success1.phpt
View file
Open in desktop
File renamed without changes.
15 changes: 15 additions & 0 deletions Zend/tests/readonly_classes/readonly_class_inheritance_success2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
--TEST--
Non-readonly class can extend a readonly class
--FILE--
<?php

readonly class Foo
{
}

class Bar extends Foo
{
}

?>
--EXPECT--
19 changes: 19 additions & 0 deletions Zend/tests/readonly_classes/readonly_class_inheritance_success3.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
--TEST--
Non-readonly child of a readonly class can create dynamic properties
--FILE--
<?php

readonly class Foo
{
}

class Bar extends Foo
{
}

$bar = new Bar();
$bar->baz = 1;

?>
--EXPECTF--
Deprecated: Creation of dynamic property Bar::$baz is deprecated in %s on line %d
20 changes: 20 additions & 0 deletions Zend/tests/readonly_classes/readonly_class_inheritance_success4.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
--TEST--
Non-readonly child of a readonly class can accept the AllowDynamicProperties attribute
--FILE--
<?php

readonly class Foo
{
}


#[AllowDynamicProperties]
class Bar extends Foo
{
}

$bar = new Bar();
$bar->baz = 1;

?>
--EXPECTF--
37 changes: 37 additions & 0 deletions Zend/tests/readonly_classes/readonly_class_inheritance_success5.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
--TEST--
Non-readonly child of a readonly class can declare non-readonly properties
--FILE--
<?php

readonly class Foo
{
}

class Bar extends Foo
{
public static $property1 = 1;
public static int $property2 = 2;
public $property3 = 3;
public int $property4 = 4;
}

$bar = new Bar();
Bar::$property1 = 2;
Bar::$property2 = 3;
$bar->property3 = 4;
$bar->property4 = 5;

var_dump(Bar::$property1);
var_dump(Bar::$property2);
var_dump($bar);

?>
--EXPECT--
int(2)
int(3)
object(Bar)#1 (2) {
["property3"]=>
int(4)
["property4"]=>
int(5)
}
42 changes: 42 additions & 0 deletions Zend/tests/readonly_classes/readonly_class_inheritance_success6.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
--TEST--
Non-readonly child of a readonly class can declare non-readonly properties indirectly via a trait
--FILE--
<?php

trait BarTrait
{
public static $property1 = 1;
public static int $property2 = 2;
public $property3 = 3;
public int $property4 = 4;
}

readonly class Foo
{
}

class Bar extends Foo
{
use BarTrait;
}

$bar = new Bar();
Bar::$property1 = 2;
Bar::$property2 = 3;
$bar->property3 = 4;
$bar->property4 = 5;

var_dump(Bar::$property1);
var_dump(Bar::$property2);
var_dump($bar);

?>
--EXPECT--
int(2)
int(3)
object(Bar)#1 (2) {
["property3"]=>
int(4)
["property4"]=>
int(5)
}
2 changes: 1 addition & 1 deletion Zend/zend_inheritance.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1461,7 +1461,7 @@ ZEND_API void zend_do_inheritance_ex(zend_class_entry *ce, zend_class_entry *par
}
}

if (UNEXPECTED((ce->ce_flags & ZEND_ACC_READONLY_CLASS) != (parent_ce->ce_flags & ZEND_ACC_READONLY_CLASS))) {
if (UNEXPECTED((ce->ce_flags & ZEND_ACC_READONLY_CLASS) && !(parent_ce->ce_flags & ZEND_ACC_READONLY_CLASS))) {
zend_error_noreturn(E_COMPILE_ERROR, "%s class %s cannot extend %s class %s",
ce->ce_flags & ZEND_ACC_READONLY_CLASS ? "Readonly" : "Non-readonly", ZSTR_VAL(ce->name),
parent_ce->ce_flags & ZEND_ACC_READONLY_CLASS ? "readonly" : "non-readonly", ZSTR_VAL(parent_ce->name)
Expand Down