refactor: improved misleading error handling

php · NickSdot · Jun 4, 2025 · Jun 8, 2025 · Jun 14, 2025 · Jun 14, 2025
commit 92d70bcd6af0908d24a92e0947c50d4df0b6c4f2
diff --git a/Zend/tests/property_hooks/readonly_class_property_virtual_promoted.phpt b/Zend/tests/property_hooks/readonly_class_property_virtual_promoted.phpt
@@ -13,4 +13,4 @@ readonly class Test {
 
 ?>
 --EXPECTF--
-Fatal error: Hooked virtual properties cannot be readonly in %s on line %d
+Fatal error: Hooked virtual properties may not be declared readonly in %s on line %d
diff --git a/Zend/tests/property_hooks/readonly_property_virtual_in_abstract.phpt b/Zend/tests/property_hooks/readonly_property_virtual_in_abstract.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Virtual readonly property in interface throws
+Hooked properties in abstract classes cannot be readonly
 --FILE--
 <?php
 
@@ -8,4 +8,4 @@ abstract class Test {
 }
 ?>
 --EXPECTF--
-Fatal error: Hooked virtual properties cannot be readonly in %s on line %d
+Fatal error: Hooked properties in abstract classes may not be declared readonly in %s on line %d
diff --git a/Zend/tests/property_hooks/readonly_property_virtual_in_class.phpt b/Zend/tests/property_hooks/readonly_property_virtual_in_class.phpt
@@ -10,4 +10,4 @@ class Test {
 }
 ?>
 --EXPECTF--
-Fatal error: Hooked virtual properties cannot be readonly in %s on line %d
+Fatal error: Hooked virtual properties may not be declared readonly in %s on line %d
diff --git a/Zend/tests/property_hooks/readonly_property_virtual_in_interface.phpt b/Zend/tests/property_hooks/readonly_property_virtual_in_interface.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Virtual readonly property in interface throws
+Interface properties cannot be readonly
 --FILE--
 <?php
 
@@ -8,4 +8,4 @@ interface Test {
 }
 ?>
 --EXPECTF--
-Fatal error: Hooked virtual properties cannot be readonly in %s on line %d
+Fatal error: Interface properties may not be declared readonly in %s on line %d
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -8499,7 +8499,16 @@ static void zend_compile_property_hooks(
 
 	/* Allow hooks on backed readonly properties only. */
 	if ((prop_info->flags & (ZEND_ACC_READONLY|ZEND_ACC_VIRTUAL)) == (ZEND_ACC_READONLY|ZEND_ACC_VIRTUAL)) {
-		zend_error_noreturn(E_COMPILE_ERROR, "Hooked virtual properties cannot be readonly");
+
+		if (ce->ce_flags & ZEND_ACC_INTERFACE) {
+			zend_error_noreturn(E_COMPILE_ERROR, "Interface properties may not be declared readonly");
+		}
+
+		if (ce->ce_flags & (ZEND_ACC_IMPLICIT_ABSTRACT_CLASS|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)) {
+			zend_error_noreturn(E_COMPILE_ERROR, "Hooked properties in abstract classes may not be declared readonly");
+		}
+
+		zend_error_noreturn(E_COMPILE_ERROR, "Hooked virtual properties may not be declared readonly");
 	}
 
 	if (hooks->children == 0) {