add more tests to validate scope resolution keywords

Author: withinboredom

Zend/zend_compile.c

@@ -1793,33 +1793,6 @@ static uint32_t zend_get_class_fetch_type_ast(zend_ast *name_ast) /* {{{ */
 }
 /* }}} */
 
-static zend_string *zend_resolve_const_class_name_reference(zend_ast *ast, const char *type)
-{
-	zend_string *class_name = zend_ast_get_str(ast);
-	if (ZEND_FETCH_CLASS_DEFAULT != zend_get_class_fetch_type_ast(ast)) {
-		zend_error_noreturn(E_COMPILE_ERROR,
-			"Cannot use \"%s\" as %s, as it is reserved",
-			ZSTR_VAL(class_name), type);
-	}
-	return zend_resolve_class_name(class_name, ast->attr);
-}
-
-static void zend_ensure_valid_class_fetch_type(uint32_t fetch_type) /* {{{ */
-{
-	if (fetch_type != ZEND_FETCH_CLASS_DEFAULT && zend_is_scope_known()) {
-		zend_class_entry *ce = CG(active_class_entry);
-		if (!ce) {
-			zend_error_noreturn(E_COMPILE_ERROR, "Cannot use \"%s\" when no class scope is active",
-				fetch_type == ZEND_FETCH_CLASS_SELF ? "self" :
-				fetch_type == ZEND_FETCH_CLASS_PARENT ? "parent" : "static");
-		} else if (fetch_type == ZEND_FETCH_CLASS_PARENT && !ce->parent_name) {
-			zend_error_noreturn(E_COMPILE_ERROR,
-				"Cannot use \"parent\" when current class scope has no parent");
-		}
-	}
-}
-/* }}} */
-
 static bool zend_try_compile_const_expr_resolve_class_name(zval *zv, zend_ast *class_ast);
 
 static zend_string *zend_resolve_nested_class_name(zend_ast *ast) /* {{{ */
@@ -1853,6 +1826,37 @@ static zend_string *zend_resolve_nested_class_name(zend_ast *ast) /* {{{ */
 }
 /* }}} */
 
+static zend_string *zend_resolve_const_class_name_reference(zend_ast *ast, const char *type)
+{
+	if (ast->kind == ZEND_AST_INNER_CLASS) {
+		return zend_resolve_nested_class_name(ast);
+	}
+
+	zend_string *class_name = zend_ast_get_str(ast);
+	if (ZEND_FETCH_CLASS_DEFAULT != zend_get_class_fetch_type_ast(ast)) {
+		zend_error_noreturn(E_COMPILE_ERROR,
+			"Cannot use \"%s\" as %s, as it is reserved",
+			ZSTR_VAL(class_name), type);
+	}
+	return zend_resolve_class_name(class_name, ast->attr);
+}
+
+static void zend_ensure_valid_class_fetch_type(uint32_t fetch_type) /* {{{ */
+{
+	if (fetch_type != ZEND_FETCH_CLASS_DEFAULT && zend_is_scope_known()) {
+		zend_class_entry *ce = CG(active_class_entry);
+		if (!ce) {
+			zend_error_noreturn(E_COMPILE_ERROR, "Cannot use \"%s\" when no class scope is active",
+				fetch_type == ZEND_FETCH_CLASS_SELF ? "self" :
+				fetch_type == ZEND_FETCH_CLASS_PARENT ? "parent" : "static");
+		} else if (fetch_type == ZEND_FETCH_CLASS_PARENT && !ce->parent_name) {
+			zend_error_noreturn(E_COMPILE_ERROR,
+				"Cannot use \"parent\" when current class scope has no parent");
+		}
+	}
+}
+/* }}} */
+
 static bool zend_try_compile_const_expr_resolve_class_name(zval *zv, zend_ast *class_ast) /* {{{ */
 {
 	uint32_t fetch_type;
@@ -2917,7 +2921,7 @@ static inline void zend_set_class_name_op1(zend_op *opline, znode *class_node) /
 
 static void zend_compile_class_ref(znode *result, zend_ast *name_ast, uint32_t fetch_flags);
 
-static void zend_compile_inner_class_ref(znode *result, zend_ast *ast) /* {{{ */
+static void zend_compile_inner_class_ref(znode *result, zend_ast *ast, uint32_t fetch_flags) /* {{{ */
 {
 	zend_ast *outer_class = ast->child[0];
 	zend_ast *inner_class = ast->child[1];
@@ -2926,9 +2930,9 @@ static void zend_compile_inner_class_ref(znode *result, zend_ast *ast) /* {{{ */
 
 	// handle nesting
 	if (outer_class->kind == ZEND_AST_INNER_CLASS) {
-		zend_compile_inner_class_ref(&outer_node, outer_class);
+		zend_compile_inner_class_ref(&outer_node, outer_class, fetch_flags);
 	} else {
-		zend_compile_class_ref(&outer_node, outer_class, ZEND_FETCH_CLASS_EXCEPTION);
+		zend_compile_class_ref(&outer_node, outer_class, fetch_flags);
 	}
 
 	if (inner_class->kind == ZEND_AST_ZVAL && Z_TYPE_P(zend_ast_get_zval(inner_class)) == IS_STRING) {
@@ -2948,7 +2952,7 @@ static void zend_compile_class_ref(znode *result, zend_ast *name_ast, uint32_t f
 	uint32_t fetch_type;
 
 	if (name_ast->kind == ZEND_AST_INNER_CLASS) {
-		zend_compile_inner_class_ref(result, name_ast);
+		zend_compile_inner_class_ref(result, name_ast, fetch_flags);
 		return;
 	}
 
@@ -11838,7 +11842,7 @@ static void zend_compile_expr_inner(znode *result, zend_ast *ast) /* {{{ */
 			zend_compile_match(result, ast);
 			return;
 		case ZEND_AST_INNER_CLASS:
-			zend_compile_inner_class_ref(result, ast);
+			zend_compile_inner_class_ref(result, ast, ZEND_FETCH_CLASS_EXCEPTION);
 			return;
 		default:
 			ZEND_ASSERT(0 /* not supported */);

Zend/zend_vm_def.h

@@ -1798,7 +1798,7 @@ ZEND_VM_C_LABEL(fetch_this):
 	ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 }
 
-ZEND_VM_HANDLER(210, ZEND_FETCH_INNER_CLASS, CONST|TMPVAR, CONST, CACHE_SLOT)
+ZEND_VM_HANDLER(210, ZEND_FETCH_INNER_CLASS, CONST|TMPVAR|UNUSED, CONST, CACHE_SLOT)
 {
 	USE_OPLINE
 	SAVE_OPLINE();
@@ -1813,6 +1813,42 @@ ZEND_VM_HANDLER(210, ZEND_FETCH_INNER_CLASS, CONST|TMPVAR, CONST, CACHE_SLOT)
 			zend_error(E_ERROR, "Class '%s' not found", Z_STRVAL_P(outer_class_zv));
 			HANDLE_EXCEPTION();
 		}
+	} else if (OP1_TYPE == IS_UNUSED) {
+		uint32_t fetch_type;
+		zend_class_entry *called_scope, *scope;
+
+		fetch_type = opline->op1.num;
+		scope = EX(func)->op_array.scope;
+		if (UNEXPECTED(scope == NULL)) {
+			SAVE_OPLINE();
+			zend_throw_error(NULL, "Cannot use \"%s\" in the global scope",
+				fetch_type == ZEND_FETCH_CLASS_SELF ? "self" :
+				fetch_type == ZEND_FETCH_CLASS_PARENT ? "parent" : "static");
+			ZVAL_UNDEF(EX_VAR(opline->result.var));
+			HANDLE_EXCEPTION();
+		}
+		if (fetch_type & ZEND_FETCH_CLASS_SELF) {
+			outer_ce = scope;
+		} else if (fetch_type & ZEND_FETCH_CLASS_PARENT) {
+			if (UNEXPECTED(scope->parent == NULL)) {
+				SAVE_OPLINE();
+				zend_throw_error(NULL,
+					"Cannot use \"parent\" when current class scope has no parent");
+				ZVAL_UNDEF(EX_VAR(opline->result.var));
+				HANDLE_EXCEPTION();
+			}
+			outer_ce = scope->parent;
+		} else if (fetch_type & ZEND_FETCH_CLASS_STATIC) {
+			if (Z_TYPE(EX(This)) == IS_OBJECT) {
+				called_scope = Z_OBJCE(EX(This));
+			} else {
+				called_scope = Z_CE(EX(This));
+			}
+			outer_ce = called_scope;
+		} else {
+			zend_throw_error(NULL, "Unknown scope resolution");
+			HANDLE_EXCEPTION();
+		}
 	} else {
 		outer_ce = CACHED_PTR(opline->extended_value);
 		if (UNEXPECTED(outer_ce == NULL)) {