add more tests and fix a memory leak

Author: withinboredom

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_namespaces.c

@@ -39,8 +39,8 @@ static zend_class_entry *insert_namespace(const zend_string *name) {
    const char *pos = start;
    size_t len = 0;
 
-   while (pos < end) {
-      if (*pos == '\\') {
+   while (pos <= end) {
+      if (pos == end || *pos == '\\') {
          len = pos - start;
          zend_string *needle = zend_string_init(ZSTR_VAL(name), len, 0);
 
@@ -51,8 +51,14 @@ static zend_class_entry *insert_namespace(const zend_string *name) {
             ns = create_namespace(interned_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_string_release(needle);
 
          parent_ns = ns;
       }
@@ -96,9 +102,10 @@ zend_class_entry *zend_lookup_namespace(zend_string *name) {
 }
 
 void zend_destroy_namespaces(void) {
-   zend_hash_destroy(EG(namespaces));
-   FREE_HASHTABLE(EG(namespaces));
-   EG(namespaces) = NULL;
-   pefree(EG(global_namespace), 0);
-   EG(global_namespace) = NULL;
+   if (EG(namespaces) != NULL) {
+      zend_hash_destroy(EG(namespaces));
+      FREE_HASHTABLE(EG(namespaces));
+      EG(namespaces) = NULL;
+      EG(global_namespace) = NULL;
+   }
 }

Zend/zend_opcode.c

@@ -432,6 +432,7 @@ ZEND_API void destroy_zend_class(zval *zv)
 			}
 			break;
 		case ZEND_INTERNAL_CLASS:
+		case ZEND_NAMESPACE_CLASS:
 			if (ce->doc_comment) {
 				zend_string_release_ex(ce->doc_comment, 1);
 			}
@@ -527,7 +528,11 @@ ZEND_API void destroy_zend_class(zval *zv)
 			if (ce->attributes) {
 				zend_hash_release(ce->attributes);
 			}
-			free(ce);
+			if (ce->type == ZEND_NAMESPACE_CLASS) {
+				pefree(ce, 0);
+			} else {
+				free(ce);
+			}
 			break;
 	}
 }

ext/reflection/tests/bug74454.phpt

@@ -14,4 +14,4 @@ function load_file() {
 }
 ?>
 --EXPECT--
-ParseError: syntax error, unexpected token "if", expecting "function"
+ParseError: syntax error, unexpected token "if", expecting "class"

tests/classes/inner_classes/simple_declaration.phpt renamed to tests/classes/inner_classes/simple_declaration_001.phpt

@@ -0,0 +1,13 @@
+--TEST--
+nested inside function
+--FILE--
+<?php
+
+class Outer {
+    public function test() {
+        class Inner {}
+    }
+}
+?>
+--EXPECTF--
+Fatal error: Class declarations may not be declared inside functions in %s on line %d

tests/classes/inner_classes/simple_declaration_002.phpt

@@ -0,0 +1,20 @@
+--TEST--
+basic nested classes
+--FILE--
+<?php
+
+namespace Foo;
+
+class Outer {
+    class Middle {
+        class Inner {
+            public function test() {
+                echo __CLASS__;
+            }
+        }
+    }
+}
+new Outer\Middle\Inner()->test();
+?>
+--EXPECT--
+Foo\Outer\Middle\Inner

tests/classes/inner_classes/simple_declaration_003.phpt

@@ -0,0 +1,38 @@
+--TEST--
+scope resolution access
+--FILE--
+<?php
+
+class Outer {
+    public class Middle {
+    }
+    public static function testSelf(): Middle {
+        return new Middle();
+    }
+}
+
+class Outer2 extends Outer {
+    public class Middle extends Outer\Middle {
+    }
+
+    public static function testParent(): Outer\Middle {
+        return new Outer\Middle();
+    }
+
+    public static function testSelf(): Middle {
+        return new Middle();
+    }
+}
+
+var_dump(Outer::testSelf());
+var_dump(Outer2::testParent());
+var_dump(Outer2::testSelf());
+
+?>
+--EXPECT--
+object(Outer\Middle)#1 (0) {
+}
+object(Outer\Middle)#1 (0) {
+}
+object(Outer2\Middle)#1 (0) {
+}

tests/classes/inner_classes/simple_declaration_004.phpt

@@ -0,0 +1,34 @@
+--TEST--
+failed inheritance
+--FILE--
+<?php
+
+class Outer {
+    public class Middle {
+    }
+    public static function testSelf(): Middle {
+        return new Middle();
+    }
+}
+
+class Outer2 extends Outer {
+    public class Middle {
+    }
+
+    public static function testParent(): Outer\Middle {
+        return new Outer\Middle();
+    }
+
+    public static function testSelf(): Middle {
+        return new Middle();
+    }
+}
+
+var_dump(Outer::testSelf());
+var_dump(Outer2::testParent());
+var_dump(Outer2::testSelf());
+var_dump(Outer2::testSelf());
+
+?>
+--EXPECTF--
+Fatal error: Declaration of Outer2::testSelf(): Outer2\middle must be compatible with Outer::testSelf(): Outer\middle in %s on line %d