keep cased namespace names

Author: withinboredom

Zend/zend.h

@@ -210,7 +210,6 @@ struct _zend_class_entry {
 	uint32_t num_traits;
 	uint32_t num_hooked_props;
 	uint32_t num_hooked_prop_variance_checks;
-	uint32_t num_nested_classes;
 
 	/* class_entry or string(s) depending on ZEND_ACC_LINKED */
 	union {
@@ -219,7 +218,6 @@ struct _zend_class_entry {
 	};
 
 	zend_class_name *trait_names;
-	zend_class_entry **nested_classes;
 	zend_trait_alias **trait_aliases;
 	zend_trait_precedence **trait_precedences;
 	HashTable *attributes;

Zend/zend_compile.c

@@ -2173,8 +2173,6 @@ ZEND_API void zend_initialize_class_data(zend_class_entry *ce, bool nullify_hand
 		ce->trait_names = NULL;
 		ce->trait_aliases = NULL;
 		ce->trait_precedences = NULL;
-		ce->num_nested_classes = 0;
-		ce->nested_classes = NULL;
 		ce->serialize = NULL;
 		ce->unserialize = NULL;
 		if (ce->type == ZEND_INTERNAL_CLASS) {
@@ -9194,9 +9192,6 @@ static void zend_compile_class_decl(znode *result, zend_ast *ast, bool toplevel)
 			ce->required_scope = propFlags & (ZEND_ACC_PRIVATE | ZEND_ACC_PROTECTED) ? CG(active_class_entry) : NULL;
 			ce->required_scope_absolute = propFlags & ZEND_ACC_PRIVATE ? true : false;
 			ce->lexical_scope = CG(active_class_entry);
-			ce->lexical_scope->nested_classes =
-				erealloc(ce->lexical_scope->nested_classes, sizeof(zend_class_entry *) * (ce->lexical_scope->num_nested_classes + 1));
-			ce->lexical_scope->nested_classes[ce->lexical_scope->num_nested_classes++] = ce;
 		} else {
 			name = zend_prefix_with_ns(unqualified_name);
 			ce->required_scope = NULL;

Zend/zend_namespaces.c

@@ -26,12 +26,12 @@ zend_class_entry *create_namespace(zend_string *name) {
    zend_initialize_class_data(ns, 1);
    ns->type = ZEND_NAMESPACE_CLASS;
    ns->ce_flags |= ZEND_ACC_UNINSTANTIABLE;
-   ns->name = zend_string_copy(name);
+   ns->name = name;
 
    return ns;
 }
 
-static zend_class_entry *insert_namespace(const zend_string *name) {
+static zend_class_entry *insert_namespace(const zend_string *name, zend_string *lc_name) {
    zend_class_entry *parent_ns = EG(global_namespace);
    zend_class_entry *ns = parent_ns;
    const char *start = ZSTR_VAL(name);
@@ -42,23 +42,17 @@ static zend_class_entry *insert_namespace(const zend_string *name) {
    while (pos <= end) {
       if (pos == end || *pos == '\\') {
          len = pos - start;
-         zend_string *needle = zend_string_init(ZSTR_VAL(name), len, 0);
+         zend_string *needle = zend_string_init(ZSTR_VAL(lc_name), len, 0);
 
          ns = zend_hash_find_ptr(EG(namespaces), needle);
 
          if (!ns) {
-            zend_string *interned_name = zend_new_interned_string(needle);
-            ns = create_namespace(interned_name);
+            zend_string *full_name = zend_string_init_interned(ZSTR_VAL(name), len, 1);
+            ns = create_namespace(full_name);
             ns->lexical_scope = parent_ns;
-            zend_hash_add_ptr(EG(namespaces), interned_name, ns);
-
-            /* sometimes, opcache refuses to intern the string */
-            if (interned_name == needle) {
-               zend_string_release(interned_name);
-            }
-         } else {
-            zend_string_release(needle);
+            zend_hash_add_ptr(EG(namespaces), needle, ns);
          }
+         zend_string_release(needle);
 
          parent_ns = ns;
       }
@@ -85,7 +79,7 @@ zend_class_entry *zend_resolve_namespace(zend_string *name) {
    zend_class_entry *ns = zend_hash_find_ptr(EG(namespaces), lc_name);
 
    if (!ns) {
-      ns = insert_namespace(lc_name);
+      ns = insert_namespace(name, lc_name);
    }
 
    zend_string_release(lc_name);

Zend/zend_opcode.c

@@ -366,8 +366,6 @@ ZEND_API void destroy_zend_class(zval *zv)
 				}
 			}
 
-			efree(ce->nested_classes);
-
 			if (ce->default_properties_table) {
 				zval *p = ce->default_properties_table;
 				zval *end = p + ce->default_properties_count;