Make get_defined_vars() always return an array

kocsismate · kocsismate · commit 0e8070778ef1 · 2019-12-20T14:31:57.000+01:00
GH-5025
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
@@ -1630,7 +1630,7 @@ ZEND_FUNCTION(get_defined_vars)
 
 	symbol_table = zend_rebuild_symbol_table();
 	if (UNEXPECTED(symbol_table == NULL)) {
-		return;
+		RETURN_EMPTY_ARRAY();
 	}
 
 	RETURN_ARR(zend_array_dup(symbol_table));
diff --git a/Zend/zend_builtin_functions.stub.php b/Zend/zend_builtin_functions.stub.php
@@ -81,7 +81,7 @@ function get_declared_interfaces(): array {}
 
 function get_defined_functions(bool $exclude_disabled = false): array {}
 
-function get_defined_vars(): ?array {}
+function get_defined_vars(): array {}
 
 function get_resource_type($res): string {}
 
diff --git a/Zend/zend_builtin_functions_arginfo.h b/Zend/zend_builtin_functions_arginfo.h
@@ -143,8 +143,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_get_defined_functions, 0, 0, IS_
 	ZEND_ARG_TYPE_INFO(0, exclude_disabled, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_get_defined_vars, 0, 0, IS_ARRAY, 1)
-ZEND_END_ARG_INFO()
+#define arginfo_get_defined_vars arginfo_get_included_files
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_get_resource_type, 0, 1, IS_STRING, 0)
 	ZEND_ARG_INFO(0, res)
diff --git a/ext/opcache/Optimizer/zend_func_info.c b/ext/opcache/Optimizer/zend_func_info.c
@@ -106,7 +106,7 @@ static const func_info_t func_infos[] = {
 	F1("get_declared_classes",    MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING),
 	F1("get_declared_interfaces", MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING),
 	F1("get_defined_functions",   MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ARRAY),
-	F1("get_defined_vars",        MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF),
+	F1("get_defined_vars",        MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF),
 	F1("get_resource_type",       MAY_BE_STRING),
 	F1("get_defined_constants",   MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_NULL | MAY_BE_ARRAY_OF_FALSE | MAY_BE_ARRAY_OF_TRUE | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_DOUBLE | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_RESOURCE | MAY_BE_ARRAY_OF_ARRAY),
 	F1("debug_backtrace",         MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_ARRAY),

Original file line number	Diff line number	Diff line change
`@@ -1630,7 +1630,7 @@ ZEND_FUNCTION(get_defined_vars)`
`1630`	`1630`
`1631`	`1631`	`symbol_table = zend_rebuild_symbol_table();`
`1632`	`1632`	`if (UNEXPECTED(symbol_table == NULL)) {`
`1633`		`- return;`
	`1633`	`+ RETURN_EMPTY_ARRAY();`
`1634`	`1634`	`}`
`1635`	`1635`
`1636`	`1636`	`RETURN_ARR(zend_array_dup(symbol_table));`