From: Michael Wallner <mike@php.net>
Date: Fri, 1 Mar 2019 14:38:06 +0000 (+0100)
Subject: PHP-7.x compatibility
X-Git-Tag: RELEASE_3_2_1~15
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=26aa34a67125bb1428de46e006906bf4ccd85bb7;p=m6w6%2Fext-http

PHP-7.x compatibility
---

diff --git a/src/php_http_querystring.c b/src/php_http_querystring.c
index 63125da..bd3afe5 100644
--- a/src/php_http_querystring.c
+++ b/src/php_http_querystring.c
@@ -378,21 +378,16 @@ PHP_METHOD(HttpQueryString, getGlobalInstance)
 	if (Z_TYPE_P(instance) == IS_OBJECT) {
 		RETVAL_ZVAL(instance, 1, 0);
 	} else if ((_GET = php_http_env_get_superglobal(ZEND_STRL("_GET")))) {
-#if PHP_VERSION_ID >= 70200
 		zval tmp, *qa;
 
 		ZVAL_OBJ(return_value, php_http_querystring_object_new(php_http_querystring_class_entry));
 
 		ZVAL_STRING(&tmp, "queryArray");
 		qa = Z_OBJ_HT_P(return_value)->get_property_ptr_ptr(return_value, &tmp, BP_VAR_RW, NULL);
-		ZVAL_NEW_REF(qa, _GET);
 		zval_ptr_dtor(&tmp);
-#else
-		ZVAL_OBJ(return_value, php_http_querystring_object_new(php_http_querystring_class_entry));
 
-		ZVAL_MAKE_REF(_GET);
-		zend_update_property(php_http_querystring_class_entry, return_value, ZEND_STRL("queryArray"), _GET);
-#endif
+		ZVAL_NEW_REF(_GET, _GET);
+		ZVAL_COPY(qa, _GET);
 
 		zend_update_static_property(php_http_querystring_class_entry, ZEND_STRL("instance"), return_value);
 	} else {
diff --git a/tests/querystring001_a.phpt b/tests/querystring001_a.phpt
index 24994f2..38cd0b6 100644
--- a/tests/querystring001_a.phpt
+++ b/tests/querystring001_a.phpt
@@ -14,6 +14,7 @@ echo "Test\n";
 printf("\nGlobal instance:\n");
 $q = http\QueryString::getGlobalInstance();
 printf("%s\n", $q);
+$q = http\QueryString::getGlobalInstance();
 
 printf("\nStandard getters:\n");
 var_dump($q->getString("str"));