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_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