Fix reflection of static vars

Author: iluuu1994

ext/reflection/php_reflection.c

@@ -1939,7 +1939,6 @@ ZEND_METHOD(ReflectionFunctionAbstract, getStaticVariables)
 {
 	reflection_object *intern;
 	zend_function *fptr;
-	zval *val;
 
 	if (zend_parse_parameters_none() == FAILURE) {
 		RETURN_THROWS();
@@ -1956,12 +1955,7 @@ ZEND_METHOD(ReflectionFunctionAbstract, getStaticVariables)
 			ht = zend_array_dup(fptr->op_array.static_variables);
 			ZEND_MAP_PTR_SET(fptr->op_array.static_variables_ptr, ht);
 		}
-		zend_string *static_var_name;
-		ZEND_HASH_MAP_FOREACH_STR_KEY_VAL(ht, static_var_name, val) {
-			if (Z_TYPE_EXTRA_P(val) != IS_TYPE_UNINITIALIZED) {
-				zend_hash_add(Z_ARR_P(return_value), static_var_name, val);
-			}
-		} ZEND_HASH_FOREACH_END();
+		zend_hash_copy(Z_ARRVAL_P(return_value), ht, zval_add_ref);
 	} else {
 		RETURN_EMPTY_ARRAY();
 	}

ext/reflection/tests/009.phpt

@@ -79,7 +79,9 @@ string(%d) "/**
 hoho
 */"
 --getStaticVariables--
-array(0) {
+array(1) {
+  ["var"]=>
+  NULL
 }
 array(1) {
   ["var"]=>

ext/reflection/tests/025.phpt

@@ -79,7 +79,9 @@ string(%d) "/**
 hoho
 */"
 --getStaticVariables--
-array(0) {
+array(1) {
+  ["var"]=>
+  NULL
 }
 array(1) {
   ["var"]=>

ext/reflection/tests/ReflectionFunction_001.phpt

@@ -45,9 +45,13 @@ bool(false)
 bool(true)
 int(6)
 int(11)
-array(1) {
+array(3) {
   ["c"]=>
   NULL
+  ["a"]=>
+  NULL
+  ["b"]=>
+  NULL
 }
 string(3) "foo"
 bool(false)

ext/reflection/tests/ReflectionMethod_getStaticVariables_basic.phpt

@@ -45,9 +45,13 @@ var_dump($methodInfo->getStaticVariables());
 ?>
 --EXPECT--
 Public method:
-array(1) {
+array(3) {
   ["c"]=>
   NULL
+  ["a"]=>
+  NULL
+  ["b"]=>
+  NULL
 }
 array(3) {
   ["c"]=>
@@ -59,7 +63,9 @@ array(3) {
 }
 
 Private method:
-array(0) {
+array(1) {
+  ["a"]=>
+  NULL
 }
 array(1) {
   ["a"]=>

ext/reflection/tests/bug32981.phpt

@@ -28,7 +28,9 @@ foreach ($class->getMethods() as $method) {
 ?>
 --EXPECT--
 string(4) "test"
-array(0) {
+array(1) {
+  ["enabled"]=>
+  NULL
 }
 string(4) "test"
 array(1) {

ext/reflection/tests/bug63614.phpt

@@ -30,6 +30,7 @@ print_r($reflect->getStaticVariables());
 --EXPECT--
 Array
 (
+    [a] => 
 )
 Array
 (
@@ -40,6 +41,7 @@ Array
 )
 Array
 (
+    [a] => 
 )
 Array
 (

ext/reflection/tests/new_in_constexpr.phpt

@@ -26,7 +26,9 @@ var_dump($rp->getDefaultValue() !== test2());
 
 ?>
 --EXPECT--
-array(0) {
+array(1) {
+  ["x"]=>
+  NULL
 }
 bool(true)
 bool(true)