clean up a bit and check readonly

Author: withinboredom

Zend/zend_compile.c

@@ -9199,7 +9199,7 @@ static void zend_compile_class_decl(znode *result, zend_ast *ast, bool toplevel)
 				decl->flags |= ZEND_ACC_EXPLICIT_ABSTRACT_CLASS;
 			}
 			if (decl->attr & ZEND_ACC_READONLY) {
-				decl->flags |= ZEND_ACC_READONLY_CLASS & ZEND_ACC_NO_DYNAMIC_PROPERTIES;
+				decl->flags |= ZEND_ACC_READONLY_CLASS | ZEND_ACC_NO_DYNAMIC_PROPERTIES;
 			}
 
 			// configure for a nested class. This should only include:

Zend/zend_execute.c

@@ -1239,14 +1239,14 @@ static zend_always_inline bool zend_check_type_slow(
 				zend_class_entry *scope = zend_get_executed_scope();
 				if (ce->required_scope_absolute && scope != ce->required_scope) {
 					if (scope == NULL) {
-						zend_error(E_ERROR, "Private inner class %s cannot be used as a type declaration in the global scope", ce->name->val);
+						zend_error(E_ERROR, "Private inner class %s cannot be used as a type declaration in the global scope", ZSTR_VAL(ce->name));
 					}
 
-					zend_error(E_ERROR, "Private inner class %s cannot be used as a type declaration in the scope of %s", ce->name->val, scope->name->val);
+					zend_error(E_ERROR, "Private inner class %s cannot be used as a type declaration in the scope of %s", ZSTR_VAL(ce->name), ZSTR_VAL(scope->name));
 				} else if (scope == NULL) {
-					zend_error(E_ERROR, "Protected inner class %s cannot be used as a type declaration in the global scope", ce->name->val);
+					zend_error(E_ERROR, "Protected inner class %s cannot be used as a type declaration in the global scope", ZSTR_VAL(ce->name));
 				} else if (!instanceof_function(scope, ce->required_scope)) {
-					zend_error(E_ERROR, "Protected inner class %s cannot be used as a type declaration in the scope of %s", ce->name->val, scope->name->val);
+					zend_error(E_ERROR, "Protected inner class %s cannot be used as a type declaration in the scope of %s", ZSTR_VAL(ce->name), ZSTR_VAL(scope->name));
 				}
 			}
 

tests/classes/inner_classes/readonly_001.phpt

@@ -0,0 +1,23 @@
+--TEST--
+readonly should work
+--FILE--
+<?php
+
+class Outer {
+    public readonly class Inner { public function __construct(public int $t) {} }
+}
+
+var_dump($foo = new Outer:>Inner(1));
+$foo->t = 42;
+var_dump($foo);
+?>
+--EXPECTF--
+object(Outer:>Inner)#1 (1) {
+  ["t"]=>
+  int(1)
+}
+
+Fatal error: Uncaught Error: Cannot modify readonly property Outer:>Inner::$t in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d