PHP-7.x compatibility

diff --git a/src/php_http_querystring.c b/src/php_http_querystring.c
index 63125da627fcbc5fe0cc7a114eb3127fccab1f0b..bd3afe5a054b9e9b085ebfa0cdfc9d91822d63e3 100644 (file)
--- 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 24994f2778ebde297e4b4fa6499d76023c59df0c..38cd0b611c8143a6e8d00ec46eb1de6ff8c28e46 100644 (file)
--- 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"));