handle constructor visibility

Author: withinboredom

Zend/zend_object_handlers.c

@@ -2080,9 +2080,15 @@ ZEND_API zend_function *zend_std_get_constructor(zend_object *zobj) /* {{{ */
 	if (constructor) {
 		if (UNEXPECTED(!(constructor->op_array.fn_flags & ZEND_ACC_PUBLIC))) {
 			zend_class_entry *scope = get_fake_or_executed_scope();
+check_lexical_scope:
 			if (UNEXPECTED(constructor->common.scope != scope)) {
 				if (UNEXPECTED(constructor->op_array.fn_flags & ZEND_ACC_PRIVATE)
 				 || UNEXPECTED(!zend_check_protected(zend_get_function_root_class(constructor), scope))) {
+					if (scope && scope->lexical_scope) {
+						scope = scope->lexical_scope;
+						goto check_lexical_scope;
+					}
+
 					zend_bad_constructor_call(constructor, scope);
 					zend_object_store_ctor_failed(zobj);
 					constructor = NULL;

tests/classes/inner_classes/enum_usage.phpt

@@ -0,0 +1,16 @@
+--TEST--
+usage in an enum
+--FILE--
+<?php
+
+enum Outer {
+    class Inner {}
+}
+
+var_dump(new Outer:>Inner());
+var_dump(class_exists(Outer:>Inner::class));
+?>
+--EXPECT--
+object(Outer:>Inner)#1 (0) {
+}
+bool(true)

tests/classes/inner_classes/interface_usage.phpt

@@ -0,0 +1,21 @@
+--TEST--
+usage in an interface
+--FILE--
+<?php
+
+interface Outer {
+    class Inner {}
+}
+
+var_dump(new Outer:>Inner());
+
+class Foo implements Outer {}
+
+var_dump(class_exists(Outer:>Inner::class));
+var_dump(class_exists(Foo:>Inner::class));
+?>
+--EXPECT--
+object(Outer:>Inner)#1 (0) {
+}
+bool(true)
+bool(false)

tests/classes/inner_classes/trait_usage.phpt

@@ -0,0 +1,24 @@
+--TEST--
+usage inside a trait
+--FILE--
+<?php
+
+trait Outer {
+    class Inner {}
+}
+
+var_dump(new Outer:>Inner());
+
+class Foo {
+    use Outer;
+}
+
+var_dump(class_exists(Outer:>Inner::class));
+var_dump(class_exists(Foo:>Inner::class));
+
+?>
+--EXPECT--
+object(Outer:>Inner)#1 (0) {
+}
+bool(true)
+bool(false)

tests/classes/inner_classes/visibility_010.phpt

@@ -0,0 +1,41 @@
+--TEST--
+constructors
+--FILE--
+<?php
+
+class User {
+    public private(set) string $name;
+    public private(set) string $email;
+
+    private function __construct(self:>Builder $builder) {
+        $this->name = $builder->name;
+        $this->email = $builder->email;
+    }
+
+    public readonly final class Builder {
+        public function __construct(public private(set) string|null $name = null, public private(set) string|null $email = null) {}
+
+        public function withEmail(string $email): self {
+            return new self($this->name, $email);
+        }
+
+        public function withName(string $name): self {
+            return new self($name, $this->email);
+        }
+
+        public function build(): User {
+            return new User($this);
+        }
+    }
+}
+
+$user = new User:>Builder()->withName('Rob')->withEmail('[email protected]')->build();
+var_dump($user);
+?>
+--EXPECT--
+object(User)#2 (2) {
+  ["name"]=>
+  string(3) "Rob"
+  ["email"]=>
+  string(15) "[email protected]"
+}