only allow enums and fix test

Author: withinboredom

Zend/zend_API.c

@@ -1840,7 +1840,7 @@ static zend_always_inline zend_result _object_and_properties_init(zval *arg, zen
 	}
 
 	// preloading may have changed the class type from ZEND_NAMESPACE_CLASS, so we need to check for user/internal class
-	if (check_class != scope && check_class->lexical_scope && (check_class->lexical_scope->type != ZEND_USER_CLASS && check_class->lexical_scope->type != ZEND_INTERNAL_CLASS)) {
+	if (check_class != scope && check_class->lexical_scope && (check_class->lexical_scope->type == ZEND_USER_CLASS || check_class->lexical_scope->type == ZEND_INTERNAL_CLASS)) {
 		check_class = check_class->lexical_scope;
 		goto check_lexical_scope;
 	}

Zend/zend_compile.c

@@ -9179,6 +9179,11 @@ static void zend_compile_class_decl(znode *result, zend_ast *ast, bool toplevel)
 				"\\", 1,
 				ZSTR_VAL(unqualified_name), ZSTR_LEN(unqualified_name));
 
+			if (CG(active_class_entry)->ce_flags & ZEND_ACC_TRAIT) {
+				zend_error_noreturn(E_COMPILE_ERROR, "Cannot declare class %s inside a trait",
+					ZSTR_VAL(name));
+			}
+
 			/* configure the class from the modifiers */
 			decl->flags |= decl->attr & ZEND_ACC_FINAL;
 			if (decl->attr & ZEND_ACC_ABSTRACT) {

Zend/zend_execute.c

@@ -1047,6 +1047,7 @@ static zend_always_inline bool i_zend_check_property_type(const zend_property_in
 
 static zend_result zend_check_type_visibility(const zend_class_entry *ce, const zend_property_info *info, uint32_t current_visibility)
 {
+check_lexical_scope:
 	/* public classes are always visible */
 	if (!ce->required_scope) {
 		return SUCCESS;
@@ -1065,14 +1066,19 @@ static zend_result zend_check_type_visibility(const zend_class_entry *ce, const
 
 	/* a private class is visible if it is the same class as the lexical scope and the current visibility is private */
 	if (ce->required_scope_absolute && ce->required_scope == info->ce) {
-		if (current_visibility < ZEND_ACC_PRIVATE) {
+		if ((current_visibility & ZEND_ACC_PPP_MASK) < ZEND_ACC_PRIVATE) {
 			zend_type_error("Cannot declare private class %s to a %s property in %s::%s", ZSTR_VAL(ce->name), zend_visibility_string(current_visibility), ZSTR_VAL(info->ce->name), zend_get_unmangled_property_name(info->name));
 			return FAILURE;
 		}
 
 		return SUCCESS;
 	}
 
+	if (ce->lexical_scope != info->ce && ce->lexical_scope && (ce->lexical_scope->type == ZEND_USER_CLASS || ce->lexical_scope->type == ZEND_INTERNAL_CLASS)) {
+		ce = ce->lexical_scope;
+		goto check_lexical_scope;
+	}
+
 	zend_type_error("Cannot declare %s to weaker visible property %s::%s", ZSTR_VAL(ce->name), ZSTR_VAL(info->ce->name), zend_get_unmangled_property_name(info->name));
 	return FAILURE;
 }

Zend/zend_language_parser.y

@@ -954,7 +954,6 @@ class_statement_list:
 nested_class_statement:
 		T_CLASS T_STRING { $<num>$ = CG(zend_lineno); } extends_from implements_list backup_doc_comment '{' class_statement_list '}'
 			{ $$ = zend_ast_create_decl(ZEND_AST_CLASS, 0, $<num>3, $6, zend_ast_get_str($2), $4, $5, $8, NULL, NULL); }
-	|	trait_declaration_statement { $$ = $1; }
 	|	enum_declaration_statement { $$ = $1; }
 ;
 

tests/classes/inner_classes/access_modifiers_002.phpt

@@ -10,4 +10,4 @@ class Outer {
 
 ?>
 --EXPECTF--
-Parse error: syntax error, unexpected identifier "int", expecting "class" in %s on line %d
+Parse error: syntax error, unexpected identifier "int", expecting "class" or "enum" in %s on line %d

tests/classes/inner_classes/enum_002.phpt

@@ -0,0 +1,45 @@
+--TEST--
+nested enums
+--FILE--
+<?php
+enum Status {
+    case Active;
+    case Inactive;
+
+    private enum Processing {
+        case Pending;
+        case Completed;
+    }
+
+    public class Message {
+
+        private Processing $processing = Processing::Pending;
+
+        public function __construct(private Status $status) {}
+
+        public function getMessage(): string {
+            return match ([$this->status, $this->processing]) {
+                [Status::Active, Processing::Pending] => "Active and Pending",
+                [Status::Active, Processing::Completed] => "Active and Completed",
+                [Status::Inactive, Processing::Pending] => "Inactive and Pending",
+                [Status::Inactive, Processing::Completed] => throw new LogicException('should not happen'),
+            };
+        }
+    }
+
+    public function createMessage(): Message {
+        return new Message($this);
+    }
+}
+
+var_dump(Status::Active->createMessage());
+echo Status::Inactive->createMessage()->getMessage() . "\n";
+?>
+--EXPECT--
+object(Status\Message)#3 (2) {
+  ["processing":"Status\Message":private]=>
+  enum(Status\Processing::Pending)
+  ["status":"Status\Message":private]=>
+  enum(Status::Active)
+}
+Inactive and Pending

tests/classes/inner_classes/trait_001.phpt

@@ -17,8 +17,5 @@ var_dump(class_exists(Outer\Inner::class));
 var_dump(class_exists(Foo\Inner::class));
 
 ?>
---EXPECT--
-object(Outer\Inner)#1 (0) {
-}
-bool(true)
-bool(false)
+--EXPECTF--
+Fatal error: Cannot declare class Outer\Inner inside a trait in %s on line %d