projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
PHP 8 compatibility
[m6w6/ext-http]
/
src
/
php_http_querystring.c
diff --git
a/src/php_http_querystring.c
b/src/php_http_querystring.c
index dfda3d5e935c0ac74f6b392effb4c45b4379b0a0..f2d73a4bf2fdb0b12e2bcb232d4d32cc579490af 100644
(file)
--- a/
src/php_http_querystring.c
+++ b/
src/php_http_querystring.c
@@
-15,7
+15,7
@@
#include "php_variables.h"
#include "ext/spl/spl_array.h"
#include "php_variables.h"
#include "ext/spl/spl_array.h"
-#if
def
PHP_HTTP_HAVE_ICONV
+#if PHP_HTTP_HAVE_ICONV
# ifndef HAVE_ICONV
# define HAVE_ICONV 1
# endif
# ifndef HAVE_ICONV
# define HAVE_ICONV 1
# endif
@@
-38,7
+38,7
@@
static inline void php_http_querystring_set(zval *instance, zval *params, int fl
array_init(&qa);
if (flags & QS_MERGE) {
array_init(&qa);
if (flags & QS_MERGE) {
- zval old_tmp, *old = zend_read_property(php_http_querystring_class_entry,
instance
, ZEND_STRL("queryArray"), 0, &old_tmp);
+ zval old_tmp, *old = zend_read_property(php_http_querystring_class_entry,
Z_OBJ_P(instance)
, ZEND_STRL("queryArray"), 0, &old_tmp);
ZVAL_DEREF(old);
if (Z_TYPE_P(old) == IS_ARRAY) {
ZVAL_DEREF(old);
if (Z_TYPE_P(old) == IS_ARRAY) {
@@
-47,13
+47,13
@@
static inline void php_http_querystring_set(zval *instance, zval *params, int fl
}
php_http_querystring_update(&qa, params, NULL);
}
php_http_querystring_update(&qa, params, NULL);
- zend_update_property(php_http_querystring_class_entry,
instance
, ZEND_STRL("queryArray"), &qa);
+ zend_update_property(php_http_querystring_class_entry,
Z_OBJ_P(instance)
, ZEND_STRL("queryArray"), &qa);
zval_ptr_dtor(&qa);
}
static inline void php_http_querystring_str(zval *instance, zval *return_value)
{
zval_ptr_dtor(&qa);
}
static inline void php_http_querystring_str(zval *instance, zval *return_value)
{
- zval qa_tmp, *qa = zend_read_property(php_http_querystring_class_entry,
instance
, ZEND_STRL("queryArray"), 0, &qa_tmp);
+ zval qa_tmp, *qa = zend_read_property(php_http_querystring_class_entry,
Z_OBJ_P(instance)
, ZEND_STRL("queryArray"), 0, &qa_tmp);
ZVAL_DEREF(qa);
if (Z_TYPE_P(qa) == IS_ARRAY) {
ZVAL_DEREF(qa);
if (Z_TYPE_P(qa) == IS_ARRAY) {
@@
-63,9
+63,9
@@
static inline void php_http_querystring_str(zval *instance, zval *return_value)
}
}
}
}
-static inline void php_http_querystring_get(zval *instance, int type, char *name, uint name_len, zval *defval, zend_bool del, zval *return_value)
+static inline void php_http_querystring_get(zval *instance, int type, char *name, uint
32_t
name_len, zval *defval, zend_bool del, zval *return_value)
{
{
- zval *arrval, qarray_tmp, *qarray = zend_read_property(php_http_querystring_class_entry,
instance
, ZEND_STRL("queryArray"), 0, &qarray_tmp);
+ zval *arrval, qarray_tmp, *qarray = zend_read_property(php_http_querystring_class_entry,
Z_OBJ_P(instance)
, ZEND_STRL("queryArray"), 0, &qarray_tmp);
ZVAL_DEREF(qarray);
if ((Z_TYPE_P(qarray) == IS_ARRAY) && (arrval = zend_symtable_str_find(Z_ARRVAL_P(qarray), name, name_len))) {
ZVAL_DEREF(qarray);
if ((Z_TYPE_P(qarray) == IS_ARRAY) && (arrval = zend_symtable_str_find(Z_ARRVAL_P(qarray), name, name_len))) {
@@
-92,7
+92,7
@@
static inline void php_http_querystring_get(zval *instance, int type, char *name
}
}
}
}
-#if
def
PHP_HTTP_HAVE_ICONV
+#if PHP_HTTP_HAVE_ICONV
ZEND_RESULT_CODE php_http_querystring_xlate(zval *dst, zval *src, const char *ie, const char *oe)
{
zval *entry;
ZEND_RESULT_CODE php_http_querystring_xlate(zval *dst, zval *src, const char *ie, const char *oe)
{
zval *entry;
@@
-103,7
+103,7
@@
ZEND_RESULT_CODE php_http_querystring_xlate(zval *dst, zval *src, const char *ie
{
if (key.key) {
if (PHP_ICONV_ERR_SUCCESS != php_iconv_string(key.key->val, key.key->len, &xkey, oe, ie)) {
{
if (key.key) {
if (PHP_ICONV_ERR_SUCCESS != php_iconv_string(key.key->val, key.key->len, &xkey, oe, ie)) {
- php_error_docref(NULL, E_WARNING, "Failed to convert '%.*s' from '%s' to '%s'", key.key->len, key.key->val, ie, oe);
+ php_error_docref(NULL, E_WARNING, "Failed to convert '%.*s' from '%s' to '%s'",
(int)
key.key->len, key.key->val, ie, oe);
return FAILURE;
}
}
return FAILURE;
}
}
@@
-113,7
+113,7
@@
ZEND_RESULT_CODE php_http_querystring_xlate(zval *dst, zval *src, const char *ie
if (key.key) {
zend_string_release(xkey);
}
if (key.key) {
zend_string_release(xkey);
}
- php_error_docref(NULL, E_WARNING, "Failed to convert '%.*s' from '%s' to '%s'", Z_STRLEN_P(entry), Z_STRVAL_P(entry), ie, oe);
+ php_error_docref(NULL, E_WARNING, "Failed to convert '%.*s' from '%s' to '%s'",
(int)
Z_STRLEN_P(entry), Z_STRVAL_P(entry), ie, oe);
return FAILURE;
}
if (key.key) {
return FAILURE;
}
if (key.key) {
@@
-160,7
+160,7
@@
static int apply_querystring(zval *val)
zval *zvalue;
if ((zvalue = zend_hash_str_find(Z_ARRVAL_P(val), ZEND_STRL("value")))) {
zval *zvalue;
if ((zvalue = zend_hash_str_find(Z_ARRVAL_P(val), ZEND_STRL("value")))) {
- zval tmp;
+ zval tmp
= {0}
;
ZVAL_COPY(&tmp, zvalue);
zval_dtor(val);
ZVAL_COPY(&tmp, zvalue);
zval_dtor(val);
@@
-254,7
+254,7
@@
ZEND_RESULT_CODE php_http_querystring_update(zval *qarray, zval *params, zval *o
/* squeeze the hash out of the zval */
if (Z_TYPE_P(params) == IS_OBJECT && instanceof_function(Z_OBJCE_P(params), php_http_querystring_class_entry)) {
/* squeeze the hash out of the zval */
if (Z_TYPE_P(params) == IS_OBJECT && instanceof_function(Z_OBJCE_P(params), php_http_querystring_class_entry)) {
- zval qa_tmp, *qa = zend_read_property(php_http_querystring_class_entry,
params
, ZEND_STRL("queryArray"), 0, &qa_tmp);
+ zval qa_tmp, *qa = zend_read_property(php_http_querystring_class_entry,
Z_OBJ_P(params)
, ZEND_STRL("queryArray"), 0, &qa_tmp);
ZVAL_DEREF(qa);
convert_to_array(qa);
ZVAL_DEREF(qa);
convert_to_array(qa);
@@
-289,25
+289,24
@@
ZEND_RESULT_CODE php_http_querystring_update(zval *qarray, zval *params, zval *o
/*
* update
*/
/*
* update
*/
- zval equal, tmp, *entry =
&tmp
;
+ zval equal, tmp, *entry =
NULL
;
ZVAL_UNDEF(&tmp);
/* recursive */
if (Z_TYPE_P(params_entry) == IS_ARRAY || Z_TYPE_P(params_entry) == IS_OBJECT) {
ZVAL_UNDEF(&tmp);
/* recursive */
if (Z_TYPE_P(params_entry) == IS_ARRAY || Z_TYPE_P(params_entry) == IS_OBJECT) {
- ZVAL_DUP(entry, qarray_entry);
- convert_to_array(entry);
- php_http_querystring_update(entry, params_entry, NULL);
+ ZVAL_DUP(&tmp, qarray_entry);
+ convert_to_array(&tmp);
+ php_http_querystring_update(&tmp, params_entry, NULL);
+ entry = &tmp;
} else if ((FAILURE == is_identical_function(&equal, qarray_entry, params_entry)) || Z_TYPE(equal) != IS_TRUE) {
Z_TRY_ADDREF_P(params_entry);
entry = params_entry;
}
} else if ((FAILURE == is_identical_function(&equal, qarray_entry, params_entry)) || Z_TYPE(equal) != IS_TRUE) {
Z_TRY_ADDREF_P(params_entry);
entry = params_entry;
}
- if (entry) {
- if (key.key) {
- zend_hash_update(Z_ARRVAL_P(qarray), key.key, entry);
- } else {
- zend_hash_index_update(Z_ARRVAL_P(qarray), key.h, entry);
- }
+ if (key.key) {
+ zend_hash_update(Z_ARRVAL_P(qarray), key.key, entry ? entry : &tmp);
+ } else {
+ zend_hash_index_update(Z_ARRVAL_P(qarray), key.h, entry ? entry : &tmp);
}
} else {
zval entry, *entry_ptr = &entry;
}
} else {
zval entry, *entry_ptr = &entry;
@@
-371,25
+370,27
@@
ZEND_END_ARG_INFO();
PHP_METHOD(HttpQueryString, getGlobalInstance)
{
zval *instance, *_GET;
PHP_METHOD(HttpQueryString, getGlobalInstance)
{
zval *instance, *_GET;
- zend_string *zs;
php_http_expect(SUCCESS == zend_parse_parameters_none(), invalid_arg, return);
php_http_expect(SUCCESS == zend_parse_parameters_none(), invalid_arg, return);
- zs = zend_string_init(ZEND_STRL("instance"), 0);
- instance = zend_std_get_static_property(php_http_querystring_class_entry, zs, 0);
- zend_string_release(zs);
+ instance = zend_read_static_property(php_http_querystring_class_entry, ZEND_STRL("instance"), 0);
if (Z_TYPE_P(instance) == IS_OBJECT) {
RETVAL_ZVAL(instance, 1, 0);
} else if ((_GET = php_http_env_get_superglobal(ZEND_STRL("_GET")))) {
if (Z_TYPE_P(instance) == IS_OBJECT) {
RETVAL_ZVAL(instance, 1, 0);
} else if ((_GET = php_http_env_get_superglobal(ZEND_STRL("_GET")))) {
+ zval *qa;
+ zend_string *qa_str = zend_string_init(ZEND_STRL("queryArray"), 0);
+
ZVAL_OBJ(return_value, php_http_querystring_object_new(php_http_querystring_class_entry));
ZVAL_OBJ(return_value, php_http_querystring_object_new(php_http_querystring_class_entry));
+ qa = Z_OBJ_HT_P(return_value)->get_property_ptr_ptr(Z_OBJ_P(return_value), qa_str, BP_VAR_RW, NULL);
+ zend_string_release(qa_str);
- ZVAL_
MAKE_REF(
_GET);
-
zend_update_property(php_http_querystring_class_entry, return_value, ZEND_STRL("queryArray")
, _GET);
+ ZVAL_
NEW_REF(_GET,
_GET);
+
ZVAL_COPY(qa
, _GET);
zend_update_static_property(php_http_querystring_class_entry, ZEND_STRL("instance"), return_value);
} else {
zend_update_static_property(php_http_querystring_class_entry, ZEND_STRL("instance"), return_value);
} else {
- php_http_throw(unexpected_val, "Could not acquire reference to superglobal GET array"
, NULL
);
+ php_http_throw(unexpected_val, "Could not acquire reference to superglobal GET array");
}
}
}
}
@@
-402,10
+403,10
@@
PHP_METHOD(HttpQueryString, getIterator)
php_http_expect(SUCCESS == zend_parse_parameters_none(), invalid_arg, return);
php_http_expect(SUCCESS == zend_parse_parameters_none(), invalid_arg, return);
- qa = zend_read_property(php_http_querystring_class_entry,
getThis(
), ZEND_STRL("queryArray"), 0, &qa_tmp);
+ qa = zend_read_property(php_http_querystring_class_entry,
Z_OBJ_P(ZEND_THIS
), ZEND_STRL("queryArray"), 0, &qa_tmp);
object_init_ex(return_value, spl_ce_RecursiveArrayIterator);
object_init_ex(return_value, spl_ce_RecursiveArrayIterator);
- zend_call_method_with_1_params(
return_value
, spl_ce_RecursiveArrayIterator, NULL, "__construct", NULL, qa);
+ zend_call_method_with_1_params(
Z_OBJ_P(return_value)
, spl_ce_RecursiveArrayIterator, NULL, "__construct", NULL, qa);
}
ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString_toString, 0, 0, 0)
}
ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString_toString, 0, 0, 0)
@@
-428,7
+429,7
@@
PHP_METHOD(HttpQueryString, toArray)
return;
}
return;
}
- zqa = zend_read_property(php_http_querystring_class_entry,
getThis(
), ZEND_STRL("queryArray"), 0, &zqa_tmp);
+ zqa = zend_read_property(php_http_querystring_class_entry,
Z_OBJ_P(ZEND_THIS
), ZEND_STRL("queryArray"), 0, &zqa_tmp);
RETURN_ZVAL(zqa, 1, 0);
}
RETURN_ZVAL(zqa, 1, 0);
}
@@
-505,9
+506,9
@@
PHP_METHOD(HttpQueryString, mod)
php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "z", ¶ms), invalid_arg, return);
zend_replace_error_handling(EH_THROW, php_http_get_exception_bad_querystring_class_entry(), &zeh);
php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "z", ¶ms), invalid_arg, return);
zend_replace_error_handling(EH_THROW, php_http_get_exception_bad_querystring_class_entry(), &zeh);
- ZVAL_OBJ(return_value, Z_OBJ_HT_P(instance)->clone_obj(
instance
));
+ ZVAL_OBJ(return_value, Z_OBJ_HT_P(instance)->clone_obj(
Z_OBJ_P(instance)
));
/* make sure we do not inherit the reference to _GET */
/* make sure we do not inherit the reference to _GET */
- SEPARATE_ZVAL(zend_read_property(Z_OBJCE_P(return_value),
return_value
, ZEND_STRL("queryArray"), 0, &qa_tmp));
+ SEPARATE_ZVAL(zend_read_property(Z_OBJCE_P(return_value),
Z_OBJ_P(return_value)
, ZEND_STRL("queryArray"), 0, &qa_tmp));
php_http_querystring_set(return_value, params, QS_MERGE);
zend_restore_error_handling(&zeh);
}
php_http_querystring_set(return_value, params, QS_MERGE);
zend_restore_error_handling(&zeh);
}
@@
-535,7
+536,7
@@
PHP_HTTP_QUERYSTRING_GETTER(getString, IS_STRING);
PHP_HTTP_QUERYSTRING_GETTER(getArray, IS_ARRAY);
PHP_HTTP_QUERYSTRING_GETTER(getObject, IS_OBJECT);
PHP_HTTP_QUERYSTRING_GETTER(getArray, IS_ARRAY);
PHP_HTTP_QUERYSTRING_GETTER(getObject, IS_OBJECT);
-#if
def
PHP_HTTP_HAVE_ICONV
+#if PHP_HTTP_HAVE_ICONV
ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString_xlate, 0, 0, 2)
ZEND_ARG_INFO(0, from_encoding)
ZEND_ARG_INFO(0, to_encoding)
ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString_xlate, 0, 0, 2)
ZEND_ARG_INFO(0, from_encoding)
ZEND_ARG_INFO(0, to_encoding)
@@
-549,7
+550,7
@@
PHP_METHOD(HttpQueryString, xlate)
php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "ss", &ie, &ie_len, &oe, &oe_len), invalid_arg, return);
array_init(&na);
php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "ss", &ie, &ie_len, &oe, &oe_len), invalid_arg, return);
array_init(&na);
- qa = zend_read_property(php_http_querystring_class_entry,
getThis(
), ZEND_STRL("queryArray"), 0, &qa_tmp);
+ qa = zend_read_property(php_http_querystring_class_entry,
Z_OBJ_P(ZEND_THIS
), ZEND_STRL("queryArray"), 0, &qa_tmp);
ZVAL_DEREF(qa);
convert_to_array(qa);
ZVAL_DEREF(qa);
convert_to_array(qa);
@@
-605,7
+606,7
@@
PHP_METHOD(HttpQueryString, offsetGet)
return;
}
return;
}
- qa = zend_read_property(php_http_querystring_class_entry,
getThis(
), ZEND_STRL("queryArray"), 0, &qa_tmp);
+ qa = zend_read_property(php_http_querystring_class_entry,
Z_OBJ_P(ZEND_THIS
), ZEND_STRL("queryArray"), 0, &qa_tmp);
ZVAL_DEREF(qa);
if (Z_TYPE_P(qa) == IS_ARRAY) {
ZVAL_DEREF(qa);
if (Z_TYPE_P(qa) == IS_ARRAY) {
@@
-652,7
+653,7
@@
PHP_METHOD(HttpQueryString, offsetExists)
return;
}
return;
}
- qa = zend_read_property(php_http_querystring_class_entry,
getThis(
), ZEND_STRL("queryArray"), 0, &qa_tmp);
+ qa = zend_read_property(php_http_querystring_class_entry,
Z_OBJ_P(ZEND_THIS
), ZEND_STRL("queryArray"), 0, &qa_tmp);
ZVAL_DEREF(qa);
if (Z_TYPE_P(qa) == IS_ARRAY) {
ZVAL_DEREF(qa);
if (Z_TYPE_P(qa) == IS_ARRAY) {
@@
-683,7
+684,7
@@
PHP_METHOD(HttpQueryString, offsetUnset)
}
static zend_function_entry php_http_querystring_methods[] = {
}
static zend_function_entry php_http_querystring_methods[] = {
- PHP_ME(HttpQueryString, __construct, ai_HttpQueryString___construct, ZEND_ACC_PUBLIC|ZEND_ACC_
CTOR|ZEND_ACC_
FINAL)
+ PHP_ME(HttpQueryString, __construct, ai_HttpQueryString___construct, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(HttpQueryString, toArray, ai_HttpQueryString_toArray, ZEND_ACC_PUBLIC)
PHP_ME(HttpQueryString, toString, ai_HttpQueryString_toString, ZEND_ACC_PUBLIC)
PHP_ME(HttpQueryString, toArray, ai_HttpQueryString_toArray, ZEND_ACC_PUBLIC)
PHP_ME(HttpQueryString, toString, ai_HttpQueryString_toString, ZEND_ACC_PUBLIC)
@@
-703,7
+704,7
@@
static zend_function_entry php_http_querystring_methods[] = {
PHP_ME(HttpQueryString, getIterator, ai_HttpQueryString_getIterator, ZEND_ACC_PUBLIC)
PHP_ME(HttpQueryString, getGlobalInstance, ai_HttpQueryString_getGlobalInstance, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
PHP_ME(HttpQueryString, getIterator, ai_HttpQueryString_getIterator, ZEND_ACC_PUBLIC)
PHP_ME(HttpQueryString, getGlobalInstance, ai_HttpQueryString_getGlobalInstance, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#if
def
PHP_HTTP_HAVE_ICONV
+#if PHP_HTTP_HAVE_ICONV
PHP_ME(HttpQueryString, xlate, ai_HttpQueryString_xlate, ZEND_ACC_PUBLIC)
#endif
PHP_ME(HttpQueryString, xlate, ai_HttpQueryString_xlate, ZEND_ACC_PUBLIC)
#endif