finish up edge cases and tests

Author: withinboredom

Zend/zend_API.c

@@ -1816,6 +1816,21 @@ static zend_always_inline zend_result _object_and_properties_init(zval *arg, zen
 		return FAILURE;
 	}
 
+	if (class_type->required_scope) {
+		const zend_class_entry *scope = zend_get_executed_scope();
+		if (scope == NULL) {
+			zend_error(E_ERROR, "Cannot instantiate \"%s\" from the global scope", ZSTR_VAL(class_type->name));
+		}
+
+		if (class_type->required_scope_absolute) {
+			if (scope != class_type->required_scope && scope->lexical_scope != class_type->required_scope) {
+				zend_error(E_ERROR, "Cannot instantiate private \"%s\" from \"%s\"", ZSTR_VAL(class_type->name), ZSTR_VAL(scope->name));
+			}
+		} else if (!instanceof_function(scope, class_type->required_scope) && !instanceof_function(scope->lexical_scope, class_type->required_scope)) {
+			zend_error(E_ERROR, "Cannot instantiate protected \"%s\" from \"%s\"", ZSTR_VAL(class_type->name), ZSTR_VAL(scope->name));
+		}
+	}
+
 	if (UNEXPECTED(!(class_type->ce_flags & ZEND_ACC_CONSTANTS_UPDATED))) {
 		if (UNEXPECTED(zend_update_class_constants(class_type) != SUCCESS)) {
 			ZVAL_NULL(arg);

Zend/zend_compile.c

@@ -9170,6 +9170,12 @@ HashTable *inner_class_queue = NULL;
 
 static void zend_defer_class_decl(zend_ast *ast)
 {
+	ZEND_ASSERT(CG(active_class_entry));
+
+	if (CG(active_op_array)->function_name) {
+		zend_error_noreturn(E_COMPILE_ERROR, "Class declarations may not be declared inside functions");
+	}
+
 	if (inner_class_queue == NULL) {
 		ALLOC_HASHTABLE(inner_class_queue);
 		zend_hash_init(inner_class_queue, 0, NULL, ZVAL_PTR_DTOR, 0);

Zend/zend_execute_API.c

@@ -1217,21 +1217,16 @@ static zend_class_entry *zend_resolve_nested_class(zend_string *requested_name,
 		zend_string *shorter_scope = zend_string_init(ZSTR_VAL(scope_name), outer_len, 0);
 		zend_string_release(scope_name);
 		scope_name = shorter_scope;
-
-		if (!outer_ce) {
-			// we have reached the namespace/global scope so nothing to do here
-			break;
-		}
 	}
 
 	// handle the edge case where the class is in the global scope
-	if (separator == NULL) {
+	//if (separator == NULL) {
 		ce = zend_lookup_class_ex(inner_name, NULL, flags | ZEND_FETCH_CLASS_NO_INNER);
 		zend_string_release(scope_name);
 		zend_string_release(inner_name);
 		zend_string_release(requested_name);
 		return ce;
-	}
+	//}
 
 	zend_string_release(scope_name);
 

tests/classes/inner_classes/autoload_002.phpt

@@ -13,4 +13,4 @@ var_dump($line);
 --EXPECTF--
 autoload(inner_classes)
 
-Fatal error: Cannot access private inner class 'inner_classes\Line' in %s
+Fatal error: Cannot instantiate "inner_classes\Line" from the global scope in %s on line %d

tests/classes/inner_classes/return_types_002.phpt

@@ -29,4 +29,4 @@ var_dump($outer->getInner());
 object(Outer\Inner)#2 (0) {
 }
 
-Fatal error: Cannot access private inner class 'Outer\Inner' in %s on line %d
+Fatal error: Cannot instantiate private "Outer\Inner" from "Foo" in %s on line %d

tests/classes/inner_classes/return_types_004.phpt

@@ -19,7 +19,7 @@ var_dump($r);
 test($r);
 ?>
 --EXPECTF--
-Fatal error: Uncaught TypeError: Public method getInner cannot return private class Outer:>Inner in %s:%d
+Fatal error: Uncaught TypeError: Public method getInner cannot return private class Outer\Inner in %s:%d
 Stack trace:
 #0 %s(%d): Outer::getInner()
 #1 {main}