add more tests and fix access modifiers

Author: withinboredom

Zend/zend_compile.c

@@ -893,19 +893,20 @@ uint32_t zend_modifier_token_to_flag(zend_modifier_target target, uint32_t token
 			}
 			break;
 		case T_READONLY:
-			if (target == ZEND_MODIFIER_TARGET_PROPERTY || target == ZEND_MODIFIER_TARGET_CPP) {
+			if (target == ZEND_MODIFIER_TARGET_PROPERTY || target == ZEND_MODIFIER_TARGET_CPP || target == ZEND_MODIFIER_TARGET_INNER_CLASS) {
 				return ZEND_ACC_READONLY;
 			}
 			break;
 		case T_ABSTRACT:
-			if (target == ZEND_MODIFIER_TARGET_METHOD || target == ZEND_MODIFIER_TARGET_PROPERTY) {
+			if (target == ZEND_MODIFIER_TARGET_METHOD || target == ZEND_MODIFIER_TARGET_PROPERTY || target == ZEND_MODIFIER_TARGET_INNER_CLASS) {
 				return ZEND_ACC_ABSTRACT;
 			}
 			break;
 		case T_FINAL:
 			if (target == ZEND_MODIFIER_TARGET_METHOD
 				|| target == ZEND_MODIFIER_TARGET_CONSTANT
 				|| target == ZEND_MODIFIER_TARGET_PROPERTY
+				|| target == ZEND_MODIFIER_TARGET_INNER_CLASS
 				|| target == ZEND_MODIFIER_TARGET_PROPERTY_HOOK) {
 				return ZEND_ACC_FINAL;
 			}
@@ -9195,13 +9196,21 @@ static void zend_compile_class_decl(znode *result, zend_ast *ast, bool toplevel)
 			// - final
 			// - readonly
 			// - abstract
-			ce->ce_flags |= decl->attr & (ZEND_ACC_FINAL|ZEND_ACC_READONLY|ZEND_ACC_ABSTRACT);
+			decl->flags |= decl->attr & ZEND_ACC_FINAL;
+			if (decl->attr & ZEND_ACC_ABSTRACT) {
+				decl->flags |= ZEND_ACC_EXPLICIT_ABSTRACT_CLASS;
+			}
+			if (decl->attr & ZEND_ACC_READONLY) {
+				decl->flags |= ZEND_ACC_READONLY_CLASS & ZEND_ACC_NO_DYNAMIC_PROPERTIES;
+			}
 
-			// configure the const stand-ins for a nested class. This should only include:
+			// configure for a nested class. This should only include:
 			// - public
 			// - private
 			// - protected
 			int propFlags = decl->attr & (ZEND_ACC_PUBLIC|ZEND_ACC_PROTECTED|ZEND_ACC_PRIVATE);
+			// remove the flags from attrs
+			decl->attr &= ~(ZEND_ACC_PUBLIC|ZEND_ACC_PROTECTED|ZEND_ACC_PRIVATE|ZEND_ACC_FINAL|ZEND_ACC_ABSTRACT|ZEND_ACC_READONLY);
 
 			// if a class is private or protected, we need to require the correct scope
 			ce->required_scope = propFlags & (ZEND_ACC_PRIVATE|ZEND_ACC_PROTECTED) ? CG(active_class_entry) : NULL;

Zend/zend_language_parser.y

@@ -627,6 +627,14 @@ class_modifier:
 	|	T_READONLY 		{ $$ = ZEND_ACC_READONLY_CLASS|ZEND_ACC_NO_DYNAMIC_PROPERTIES; }
 ;
 
+inner_class_modifiers:
+		non_empty_member_modifiers
+			{ $$ = zend_modifier_list_to_flags(ZEND_MODIFIER_TARGET_INNER_CLASS, $1);
+			  if (!$$) { YYERROR; } }
+	|	%empty
+			{ $$ = ZEND_ACC_PUBLIC; }
+;
+
 trait_declaration_statement:
 		T_TRAIT { $<num>$ = CG(zend_lineno); }
 		T_STRING backup_doc_comment '{' class_statement_list '}'
@@ -954,14 +962,6 @@ inner_class_statement:
 			{ $$ = zend_ast_create_decl(ZEND_AST_CLASS, 0, $<num>3, $6, zend_ast_get_str($2), $4, $5, $8, NULL, NULL); }
 ;
 
-inner_class_modifiers:
-		non_empty_member_modifiers
-			{ $$ = zend_modifier_list_to_flags(ZEND_MODIFIER_TARGET_INNER_CLASS, $1);
-			  if (!$$) { YYERROR; } }
-	|	%empty
-			{ $$ = ZEND_ACC_PUBLIC; }
-;
-
 attributed_class_statement:
 		property_modifiers optional_type_without_static property_list ';'
 			{ $$ = zend_ast_create(ZEND_AST_PROP_GROUP, $2, $3, NULL);

tests/classes/inner_classes/access_modifiers_007.phpt

@@ -4,15 +4,24 @@ abstract inner classes
 <?php
 
 class Outer {
-    abstract class Inner {}
+    public abstract class Inner {}
 }
 
-$extended = new class extends Outer:>Inner{};
+class Extended extends Outer:>Inner {}
+
+$extended = new Extended();
 
 var_dump($extended);
 $reflection = new ReflectionClass('Outer:>Inner');
 var_dump($reflection->isAbstract());
 new Outer:>Inner();
 ?>
 --EXPECTF--
-last one fails
+object(Extended)#1 (0) {
+}
+bool(true)
+
+Fatal error: Uncaught Error: Cannot instantiate abstract class Outer:>Inner in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d

tests/classes/inner_classes/inheritance.phpt

@@ -5,9 +5,9 @@ inheritance
 
 class Outer {
     abstract class Other {}
-    class Middle extends Other {
-        class Inner1 {} // extends Outer:>Middle
-        class Inner2 extends Outer:>Middle {} // extends Outer
+    class Middle extends Outer:>Other {
+        class Inner1 extends Outer:>Other {}
+        class Inner2 extends Outer:>Middle {}
     }
 }
 ?>

tests/classes/inner_classes/return_types_006.phpt

@@ -10,7 +10,7 @@ class Outer {
         }
     }
 
-    public function test() { return new self:>PrivateInner()->test(); }
+    public function test(): mixed { return new self:>PrivateInner()->test(); }
 }
 
 $foo = new Outer()->test();

tests/classes/inner_classes/visibility_001.phpt

@@ -0,0 +1,23 @@
+--TEST--
+outer class visibility
+--FILE--
+<?php
+
+class Outer {
+    private class Inner {}
+    private class Other {
+        public function __construct(private Outer:>Inner $inner) {}
+
+        public function reset(): void {
+            $prev = $this->inner;
+            $this->inner = new Outer:>Inner();
+            var_dump($prev === $this->inner);
+        }
+    }
+    public static function test(): void {
+        new self:>Other(new Outer:>Inner());
+    }
+}
+Outer::test();
+?>
+--EXPECT--