enable visibility

Author: withinboredom

Zend/zend_execute.c

@@ -1196,6 +1196,23 @@ static zend_always_inline bool zend_check_type_slow(
 			}
 		} else {
 			ce = zend_fetch_ce_from_cache_slot(cache_slot, type);
+
+			// verify that the class is being used in the correct scope
+			if (ce && ce->required_scope) {
+				zend_class_entry *scope = zend_get_executed_scope();
+				if (ce->required_scope_absolute && scope != ce->required_scope) {
+					if (scope == NULL) {
+						zend_error(E_ERROR, "Private inner class %s cannot be used as a type declaration in the global scope", ce->name->val);
+					}
+
+					zend_error(E_ERROR, "Private inner class %s cannot be used as a type declaration in the scope of %s", ce->name->val, scope->name->val);
+				} else if (scope == NULL) {
+					zend_error(E_ERROR, "Protected inner class %s cannot be used as a type declaration in the global scope", ce->name->val);
+				} else if (!instanceof_function(scope, ce->required_scope)) {
+					zend_error(E_ERROR, "Protected inner class %s cannot be used as a type declaration in the scope of %s", ce->name->val, scope->name->val);
+				}
+			}
+
 			/* If we have a CE we check if it satisfies the type constraint,
 			 * otherwise it will check if a standard type satisfies it. */
 			if (ce && instanceof_function(Z_OBJCE_P(arg), ce)) {

Zend/zend_vm_def.h

@@ -1804,7 +1804,9 @@ ZEND_VM_HANDLER(210, ZEND_FETCH_INNER_CLASS, CONST|TMPVAR|UNUSED, CONST, CACHE_S
 	SAVE_OPLINE();
 
 	zend_string *inner_class_name, *full_class_name;
-	zend_class_entry *outer_ce = NULL, *inner_ce = NULL;
+	zend_class_entry *outer_ce = NULL, *inner_ce = NULL, *scope = NULL;
+
+	scope = EX(func)->op_array.scope;
 
 	if (OP1_TYPE == IS_CONST) {
 		zval *outer_class_zv = RT_CONSTANT(opline, opline->op1);
@@ -1815,10 +1817,9 @@ ZEND_VM_HANDLER(210, ZEND_FETCH_INNER_CLASS, CONST|TMPVAR|UNUSED, CONST, CACHE_S
 		}
 	} else if (OP1_TYPE == IS_UNUSED) {
 		uint32_t fetch_type;
-		zend_class_entry *called_scope, *scope;
+		zend_class_entry *called_scope;
 
-		fetch_type = opline->op1.num;
-		scope = EX(func)->op_array.scope;
+		fetch_type = opline->op1.num & ZEND_FETCH_CLASS_MASK;
 		if (UNEXPECTED(scope == NULL)) {
 			SAVE_OPLINE();
 			zend_throw_error(NULL, "Cannot use \"%s\" in the global scope",
@@ -1827,9 +1828,9 @@ ZEND_VM_HANDLER(210, ZEND_FETCH_INNER_CLASS, CONST|TMPVAR|UNUSED, CONST, CACHE_S
 			ZVAL_UNDEF(EX_VAR(opline->result.var));
 			HANDLE_EXCEPTION();
 		}
-		if (fetch_type & ZEND_FETCH_CLASS_SELF) {
+		if (fetch_type == ZEND_FETCH_CLASS_SELF) {
 			outer_ce = scope;
-		} else if (fetch_type & ZEND_FETCH_CLASS_PARENT) {
+		} else if (fetch_type == ZEND_FETCH_CLASS_PARENT) {
 			if (UNEXPECTED(scope->parent == NULL)) {
 				SAVE_OPLINE();
 				zend_throw_error(NULL,
@@ -1838,7 +1839,7 @@ ZEND_VM_HANDLER(210, ZEND_FETCH_INNER_CLASS, CONST|TMPVAR|UNUSED, CONST, CACHE_S
 				HANDLE_EXCEPTION();
 			}
 			outer_ce = scope->parent;
-		} else if (fetch_type & ZEND_FETCH_CLASS_STATIC) {
+		} else if (fetch_type == ZEND_FETCH_CLASS_STATIC) {
 			if (Z_TYPE(EX(This)) == IS_OBJECT) {
 				called_scope = Z_OBJCE(EX(This));
 			} else {
@@ -1867,6 +1868,17 @@ ZEND_VM_HANDLER(210, ZEND_FETCH_INNER_CLASS, CONST|TMPVAR|UNUSED, CONST, CACHE_S
 	inner_ce = zend_lookup_class(full_class_name);
 	if (!inner_ce) {
 		zend_error(E_ERROR, "Class '%s' not found", ZSTR_VAL(full_class_name));
+		HANDLE_EXCEPTION();
+	}
+
+	if (inner_ce->required_scope) {
+		if (inner_ce->required_scope_absolute && inner_ce->required_scope != scope) {
+			zend_error(E_ERROR, "Class '%s' is private", ZSTR_VAL(full_class_name));
+			HANDLE_EXCEPTION();
+		} else if (scope == NULL || !instanceof_function(scope, inner_ce->required_scope)) {
+			zend_error(E_ERROR, "Class '%s' is protected", ZSTR_VAL(full_class_name));
+			HANDLE_EXCEPTION();
+		}
 	}
 
 	CACHE_PTR(opline->extended_value, inner_ce);

Zend/zend_vm_execute.h

@@ -0,0 +1,28 @@
+--TEST--
+private inner class
+--FILE--
+<?php
+
+class Outer {
+    private class Inner {}
+
+    public function getInner(): self:>Inner {
+        return new self:>Inner();
+    }
+}
+
+class Foo extends Outer {
+    public function getInner(): parent:>Inner {
+        var_dump(parent::getInner());
+        return new parent:>Inner();
+    }
+}
+
+$outer = new Foo();
+var_dump($outer->getInner());
+?>
+--EXPECTF--
+object(Outer:>Inner)#2 (0) {
+}
+
+Fatal error: Class 'Outer:>Inner' is private in %s on line %d

tests/classes/inner_classes_014.phpt

@@ -0,0 +1,31 @@
+--TEST--
+protected inner class
+--FILE--
+<?php
+
+class Outer {
+    protected class Inner {}
+
+    public function getInner(): self:>Inner {
+        return new self:>Inner();
+    }
+}
+
+class Foo extends Outer {
+    public function getInner(): parent:>Inner {
+        var_dump(parent::getInner());
+        return new parent:>Inner();
+    }
+}
+
+$outer = new Foo();
+var_dump($outer->getInner());
+var_dump(new Outer:>Inner());
+?>
+--EXPECTF--
+object(Outer:>Inner)#2 (0) {
+}
+object(Outer:>Inner)#2 (0) {
+}
+
+Fatal error: Class 'Outer:>Inner' is protected in %s on line %d

tests/classes/inner_classes_015.phpt

@@ -0,0 +1,25 @@
+--TEST--
+private return types
+--FILE--
+<?php
+
+class Outer {
+    private class Inner {}
+
+    public static function getInner(): self:>Inner {
+        return new self:>Inner();
+    }
+}
+
+$r = Outer::getInner();
+function test($r): Outer:>Inner {
+    return $r;
+}
+var_dump($r);
+test($r);
+?>
+--EXPECTF--
+object(Outer:>Inner)#1 (0) {
+}
+
+Fatal error: Private inner class Outer:>Inner cannot be used as a type declaration in the global scope in %s on line %d

tests/classes/inner_classes_016.phpt

@@ -0,0 +1,25 @@
+--TEST--
+protected return types
+--FILE--
+<?php
+
+class Outer {
+    protected class Inner {}
+
+    public static function getInner(): self:>Inner {
+        return new self:>Inner();
+    }
+}
+
+$r = Outer::getInner();
+function test($r): Outer:>Inner {
+    return $r;
+}
+var_dump($r);
+test($r);
+?>
+--EXPECTF--
+object(Outer:>Inner)#1 (0) {
+}
+
+Fatal error: Protected inner class Outer:>Inner cannot be used as a type declaration in the global scope in %s on line %d