start keeping track of own nested classes

Author: withinboredom

Zend/zend.h

@@ -210,6 +210,7 @@ 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 {
@@ -218,6 +219,7 @@ 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

@@ -2201,6 +2201,8 @@ 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) {
@@ -9220,6 +9222,9 @@ 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_opcode.c

@@ -366,6 +366,8 @@ 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;

tests/classes/inner_classes/inheritance.phpt

@@ -1,5 +1,11 @@
 --TEST--
 circular inheritance
+--SKIPIF--
+<?php
+if (!extension_loaded('opcache')) {
+    die('skip opcache required');
+}
+?>
 --FILE--
 <?php
 

tests/classes/inner_classes/resolution_001.phpt

@@ -0,0 +1,15 @@
+--TEST--
+resolution of outer scopes
+--FILE--
+<?php
+
+class Outside {}
+
+class Outer {
+    class Inner extends Outside {}
+}
+
+echo (new Outer\Inner) instanceof Outside;
+?>
+--EXPECT--
+1

tests/classes/inner_classes/resolution_002.phpt

@@ -0,0 +1,21 @@
+--TEST--
+shadowing
+--FILE--
+<?php
+
+namespace Foo\Bar;
+
+class Outside {}
+
+class Outer {
+    class Outside {}
+    class Inner extends Outside {}
+    class Middle extends \Foo\Bar\Outside {}
+}
+
+echo Outer\Inner::class . ': ' . (new Outer\Inner()) instanceof Outer\Outside . "\n";
+echo Outer\Middle::class . ': ' . (new Outer\Middle()) instanceof Outside . "\n";
+?>
+--EXPECT--
+Foo\Bar\Outer\Inner: 1
+Foo\Bar\Outer\Middle: 1

tests/classes/inner_classes/simple_declaration_005.phpt

@@ -31,4 +31,4 @@ 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
+Fatal error: Declaration of Outer2::testSelf(): Outer2\Middle must be compatible with Outer::testSelf(): Outer\Middle in %s on line %d