Rfc: inner class2

Zend/Optimizer/ssa_integrity.c

@@ -97,7 +97,7 @@ static inline bool is_defined(const zend_ssa *ssa, const zend_op_array *op_array
 #define FAIL(...) do { \
 	if (status == SUCCESS) { \
 		fprintf(stderr, "\nIn function %s::%s (%s):\n", \
-			op_array->scope ? ZSTR_VAL(op_array->scope->name) : "", \
+			op_array->scope ? ZSTR_VAL(op_array->scope->namespaced_name.name) : "", \
 			op_array->function_name ? ZSTR_VAL(op_array->function_name) : "{main}", extra); \
 	} \
 	fprintf(stderr, __VA_ARGS__); \

Zend/Optimizer/zend_dump.c

@@ -221,9 +221,9 @@ static void zend_dump_type_info(uint32_t info, zend_class_entry *ce, int is_inst
 		fprintf(stderr, "class");
 		if (ce) {
 			if (is_instanceof) {
-				fprintf(stderr, " (instanceof %s)", ce->name->val);
+				fprintf(stderr, " (instanceof %s)", (ce->namespaced_name.name)->val);
 			} else {
-				fprintf(stderr, " (%s)", ce->name->val);
+				fprintf(stderr, " (%s)", (ce->namespaced_name.name)->val);
 			}
 		}
 	} else if ((info & MAY_BE_ANY) == MAY_BE_ANY) {
@@ -356,9 +356,9 @@ static void zend_dump_type_info(uint32_t info, zend_class_entry *ce, int is_inst
 			fprintf(stderr, "object");
 			if (ce) {
 				if (is_instanceof) {
-					fprintf(stderr, " (instanceof %s)", ce->name->val);
+					fprintf(stderr, " (instanceof %s)", (ce->namespaced_name.name)->val);
 				} else {
-					fprintf(stderr, " (%s)", ce->name->val);
+					fprintf(stderr, " (%s)", (ce->namespaced_name.name)->val);
 				}
 			}
 		}
@@ -931,8 +931,8 @@ static void zend_dump_block_header(const zend_cfg *cfg, const zend_op_array *op_
 void zend_dump_op_array_name(const zend_op_array *op_array)
 {
 	if (op_array->function_name) {
-		if (op_array->scope && op_array->scope->name) {
-			fprintf(stderr, "%s::%s", op_array->scope->name->val, op_array->function_name->val);
+		if (op_array->scope && op_array->scope->namespaced_name.name) {
+			fprintf(stderr, "%s::%s", (op_array->scope->namespaced_name.name)->val, op_array->function_name->val);
 		} else {
 			fprintf(stderr, "%s", op_array->function_name->val);
 		}

Zend/Optimizer/zend_optimizer.c

@@ -842,7 +842,7 @@ zend_class_entry *zend_optimizer_get_class_entry(
 		return Z_PTR_P(ce_zv);
 	}
 
-	if (op_array && op_array->scope && zend_string_equals_ci(op_array->scope->name, lcname)) {
+	if (op_array && op_array->scope && zend_string_equals_ci(op_array->scope->namespaced_name.name, lcname)) {
 		return op_array->scope;
 	}
 

Zend/tests/errmsg/errmsg_027.phpt

@@ -13,4 +13,4 @@ class test {
 echo "Done\n";
 ?>
 --EXPECTF--
-Fatal error: Class declarations may not be nested in %s on line %d
+Fatal error: Class declarations may not be declared inside functions in %s on line %d

Zend/zend.h

@@ -82,6 +82,21 @@ struct _zend_unserialize_data;
 typedef struct _zend_serialize_data zend_serialize_data;
 typedef struct _zend_unserialize_data zend_unserialize_data;
 
+typedef enum _zend_name_resolution_kind {
+	ZEND_NAME_LEXICAL_SCOPE,
+	ZEND_NAME_NAMESPACE,
+} zend_name_resolution_kind;
+
+typedef struct _zend_namespaced_name {
+	zend_string *name;
+	zend_string *resolved_name;
+	zend_name_resolution_kind kind;
+	union {
+		zend_class_entry *lexical_scope;
+		zend_string *namespace_name;
+	};
+} zend_namespaced_name;
+
 typedef struct _zend_class_name {
 	zend_string *name;
 	zend_string *lc_name;
@@ -146,11 +161,11 @@ struct _zend_inheritance_cache_entry {
 
 struct _zend_class_entry {
 	char type;
-	zend_string *name;
+	zend_namespaced_name namespaced_name;
 	/* class_entry or string depending on ZEND_ACC_LINKED */
 	union {
 		zend_class_entry *parent;
-		zend_string *parent_name;
+		zend_namespaced_name *parent_name;
 	};
 	int refcount;
 	uint32_t ce_flags;
@@ -164,6 +179,10 @@ struct _zend_class_entry {
 	HashTable properties_info;
 	HashTable constants_table;
 
+	zend_class_entry *required_scope;
+	zend_class_entry *lexical_scope;
+	char required_scope_absolute;
+
 	ZEND_MAP_PTR_DEF(zend_class_mutable_data*, mutable_data);
 	zend_inheritance_cache_entry *inheritance_cache;
 
@@ -210,10 +229,10 @@ struct _zend_class_entry {
 	/* class_entry or string(s) depending on ZEND_ACC_LINKED */
 	union {
 		zend_class_entry **interfaces;
-		zend_class_name *interface_names;
+		zend_namespaced_name *interface_names;
 	};
 
-	zend_class_name *trait_names;
+	zend_namespaced_name *trait_names;
 	zend_trait_alias **trait_aliases;
 	zend_trait_precedence **trait_precedences;
 	HashTable *attributes;