HTTP_END_ARGS;
#endif
+HTTP_BEGIN_ARGS(factory, 0)
+ HTTP_ARG_VAL(global, 0)
+ HTTP_ARG_VAL(params, 0)
+ HTTP_ARG_VAL(class_name, 0)
+HTTP_END_ARGS;
+
HTTP_EMPTY_ARGS(toArray);
HTTP_EMPTY_ARGS(toString);
HTTP_QUERYSTRING_GME(getArray, ZEND_ACC_PUBLIC)
HTTP_QUERYSTRING_GME(getObject, ZEND_ACC_PUBLIC)
+ HTTP_QUERYSTRING_ME(factory, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
#ifndef WONKY
HTTP_QUERYSTRING_ME(singleton, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
#endif
zend_object_value _http_querystring_object_new(zend_class_entry *ce TSRMLS_DC)
{
- return http_querystring_object_new_ex(ce, NULL);
+ return http_querystring_object_new_ex(ce, NULL, NULL);
}
-zend_object_value _http_querystring_object_new_ex(zend_class_entry *ce, http_querystring_object **ptr TSRMLS_DC)
+zend_object_value _http_querystring_object_new_ex(zend_class_entry *ce, void *nothing, http_querystring_object **ptr TSRMLS_DC)
{
zend_object_value ov;
http_querystring_object *o;
{
http_querystring_object *o = (http_querystring_object *) object;
- if (OBJ_PROP(o)) {
- zend_hash_destroy(OBJ_PROP(o));
- FREE_HASHTABLE(OBJ_PROP(o));
- }
- efree(o);
+ freeObject(o);
}
/* {{{ querystring helpers */
-#define http_querystring_instantiate(g) _http_querystring_instantiate((g) TSRMLS_CC)
-static inline zval *_http_querystring_instantiate(zend_bool global TSRMLS_DC)
+#define http_querystring_instantiate(t, g, p, u) _http_querystring_instantiate((t), (g), (p), (u) TSRMLS_CC)
+static inline zval *_http_querystring_instantiate(zval *this_ptr, zend_bool global, zval *params, zend_bool defer_update TSRMLS_DC)
{
- zval *zobj, *zglobal;
+ zval *qarray = NULL, *qstring = NULL, **_SERVER = NULL, **_GET = NULL, **QUERY_STRING = NULL;;
- MAKE_STD_ZVAL(zglobal);
- ZVAL_BOOL(zglobal, global);
-
- MAKE_STD_ZVAL(zobj);
- Z_TYPE_P(zobj) = IS_OBJECT;
- Z_OBJVAL_P(zobj) = http_querystring_object_new(http_querystring_object_ce);
- zend_call_method_with_1_params(&zobj, Z_OBJCE_P(zobj), NULL, "__construct", NULL, zglobal);
+ if (!this_ptr) {
+ MAKE_STD_ZVAL(this_ptr);
+ Z_TYPE_P(this_ptr) = IS_OBJECT;
+ this_ptr->value.obj = http_querystring_object_new(http_querystring_object_ce);
+ }
+ if (global) {
+#ifdef ZEND_ENGINE_2
+ zend_is_auto_global("_SERVER", lenof("_SERVER") TSRMLS_CC);
+#endif
+ if ( (SUCCESS == zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void *) &_SERVER)) &&
+ (Z_TYPE_PP(_SERVER) == IS_ARRAY) &&
+ (SUCCESS == zend_hash_find(Z_ARRVAL_PP(_SERVER), "QUERY_STRING", sizeof("QUERY_STRING"), (void *) &QUERY_STRING))) {
+
+ qstring = *QUERY_STRING;
+#ifdef ZEND_ENGINE_2
+ zend_is_auto_global("_GET", lenof("_GET") TSRMLS_CC);
+#endif
+ if ((SUCCESS == zend_hash_find(&EG(symbol_table), "_GET", sizeof("_GET"), (void *) &_GET)) && (Z_TYPE_PP(_GET) == IS_ARRAY)) {
+ qarray = *_GET;
+ } else {
+ http_error(HE_WARNING, HTTP_E_QUERYSTRING, "Could not acquire reference to superglobal GET array");
+ }
+ } else {
+ http_error(HE_WARNING, HTTP_E_QUERYSTRING, "Could not acquire reference to QUERY_STRING");
+ }
+
+ if (qarray && qstring) {
+ if (Z_TYPE_P(qstring) != IS_STRING) {
+ convert_to_string(qstring);
+ }
+
+ SET_PROP(queryArray, qarray);
+ SET_PROP(queryString, qstring);
+ GET_PROP(queryArray)->is_ref = 1;
+ GET_PROP(queryString)->is_ref = 1;
- zval_ptr_dtor(&zglobal);
+ if (params) {
+ http_querystring_modify(GET_PROP(queryArray), params);
+ }
+ if (!defer_update) {
+ http_querystring_update(GET_PROP(queryArray), GET_PROP(queryString));
+ }
+ }
+ } else {
+ qarray = ecalloc(1, sizeof(zval));
+ array_init(qarray);
+
+ SET_PROP(queryArray, qarray);
+ UPD_STRL(queryString, "", 0);
+
+ if (params && http_querystring_modify(qarray, params) && !defer_update) {
+ http_querystring_update(qarray, GET_PROP(queryString));
+ }
+ }
- return zobj;
+ return this_ptr;
}
#define http_querystring_get(o, t, n, l, def, del, r) _http_querystring_get((o), (t), (n), (l), (def), (del), (r) TSRMLS_CC)
/* }}} */
/* {{{ proto final void HttpQueryString::__construct([bool global = true[, mixed add])
- *
- * Creates a new HttpQueryString object instance.
- * Operates on and modifies $_GET and $_SERVER['QUERY_STRING'] if global is TRUE.
- */
+ Creates a new HttpQueryString object instance. Operates on and modifies $_GET and $_SERVER['QUERY_STRING'] if global is TRUE. */
PHP_METHOD(HttpQueryString, __construct)
{
zend_bool global = 1;
- zval *params = NULL, *qarray = NULL, *qstring = NULL, **_GET, **_SERVER, **QUERY_STRING;
+ zval *params = NULL;
SET_EH_THROW_HTTP();
if (!sapi_module.treat_data) {
http_error(HE_ERROR, HTTP_E_QUERYSTRING, "The SAPI does not have a treat_data function registered");
} else if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|bz", &global, ¶ms)) {
- if (global) {
-#ifdef ZEND_ENGINE_2
- zend_is_auto_global("_SERVER", lenof("_SERVER") TSRMLS_CC);
-#endif
- if ( (SUCCESS == zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void *) &_SERVER)) &&
- (Z_TYPE_PP(_SERVER) == IS_ARRAY) &&
- (SUCCESS == zend_hash_find(Z_ARRVAL_PP(_SERVER), "QUERY_STRING", sizeof("QUERY_STRING"), (void *) &QUERY_STRING))) {
-
- qstring = *QUERY_STRING;
-#ifdef ZEND_ENGINE_2
- zend_is_auto_global("_GET", lenof("_GET") TSRMLS_CC);
-#endif
- if ((SUCCESS == zend_hash_find(&EG(symbol_table), "_GET", sizeof("_GET"), (void *) &_GET)) && (Z_TYPE_PP(_GET) == IS_ARRAY)) {
- qarray = *_GET;
- } else {
- http_error(HE_WARNING, HTTP_E_QUERYSTRING, "Could not acquire reference to superglobal GET array");
- }
- } else {
- http_error(HE_WARNING, HTTP_E_QUERYSTRING, "Could not acquire reference to QUERY_STRING");
- }
-
- if (qarray && qstring) {
- if (Z_TYPE_P(qstring) != IS_STRING) {
- convert_to_string(qstring);
- }
-
- SET_PROP(queryArray, qarray);
- SET_PROP(queryString, qstring);
- GET_PROP(queryArray)->is_ref = 1;
- GET_PROP(queryString)->is_ref = 1;
-
- if (params) {
- http_querystring_modify(GET_PROP(queryArray), params);
- }
- http_querystring_update(GET_PROP(queryArray), GET_PROP(queryString));
- }
- } else {
- qarray = ecalloc(1, sizeof(zval));
- array_init(qarray);
-
- SET_PROP(queryArray, qarray);
- UPD_STRL(queryString, "", 0);
-
- if (params && http_querystring_modify(qarray, params)) {
- http_querystring_update(qarray, GET_PROP(queryString));
- }
- }
+ http_querystring_instantiate(getThis(), global, params, 0);
+ }
+ SET_EH_NORMAL();
+}
+/* }}} */
+
+/* {{{ proto HttpQueryString HttpQueryString::factory([bool global = TRUE[, mixed params[, string class_name = "HttpQueryString"])
+ Creates a new HttpQueryString object instance. */
+PHP_METHOD(HttpQueryString, factory)
+{
+ zend_bool global = 1;
+ zval *params = NULL;
+ char *cn = NULL;
+ int cl = 0;
+ zend_object_value ov;
+
+ SET_EH_THROW_HTTP();
+ if (!sapi_module.treat_data) {
+ http_error(HE_ERROR, HTTP_E_QUERYSTRING, "The SAPI does not have a treat_data function registered");
+ } else if ( SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|bzs", &global, ¶ms, &cn, &cl) &&
+ SUCCESS == http_object_new(&ov, cn, cl, _http_querystring_object_new_ex, http_querystring_object_ce, NULL, NULL)) {
+ RETVAL_OBJVAL(ov, 0);
+ http_querystring_instantiate(return_value, global, params, 0);
}
SET_EH_NORMAL();
}
/* }}} */
/* {{{ proto string HttpQueryString::toString()
- *
- * Returns the string representation.
- */
+ Returns the string representation. */
PHP_METHOD(HttpQueryString, toString)
{
NO_ARGS;
/* }}} */
/* {{{ proto array HttpQueryString::toArray()
- *
- * Returns the array representation.
- */
+ Returns the array representation. */
PHP_METHOD(HttpQueryString, toArray)
{
NO_ARGS;
/* }}} */
/* {{{ proto mixed HttpQueryString::get([string key[, mixed type = 0[, mixed defval = NULL[, bool delete = false]]]])
- *
- * Get (part of) the query string.
- *
- * The type parameter is either one of the HttpQueryString::TYPE_* constants or a type abbreviation like
- * "b" for bool, "i" for int, "f" for float, "s" for string, "a" for array and "o" for a stdClass object.
- */
+ Get (part of) the query string. The type parameter is either one of the HttpQueryString::TYPE_* constants or a type abbreviation like "b" for bool, "i" for int, "f" for float, "s" for string, "a" for array and "o" for a stdClass object. */
PHP_METHOD(HttpQueryString, get)
{
char *name = NULL;
/* }}} */
/* {{{ proto string HttpQueryString::set(mixed params)
- *
- * Set query string entry/entries. NULL values will unset the variable.
- */
+ Set query string entry/entries. NULL values will unset the variable. */
PHP_METHOD(HttpQueryString, set)
{
zval *params;
/* }}} */
/* {{{ proto HttpQueryString HttpQueryString::mod(mixed params)
- *
- * Copies the query string object and sets provided params at the clone.
- * This is basically shorthand for:
- * <pre>
- * <?php
- * $newQS = new HttpQueryString(false, $oldQS);
- * $newQS->set($other_params);
- * ?>
- * </pre>
- */
+ Copies the query string object and sets provided params at the clone. */
PHP_METHOD(HttpQueryString, mod)
{
- zval *orig, *zobj, *qarr, *qstr, *params;
+ zval *zobj, *qarr, *qstr, *params;
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", ¶ms)) {
- zobj = http_querystring_instantiate(0);
- orig = GET_PROP(queryArray);
+ zobj = http_querystring_instantiate(NULL, 0, GET_PROP(queryArray), 1);
qarr = GET_PROP_EX(zobj, queryArray);
qstr = GET_PROP_EX(zobj, queryString);
- array_copy(orig, qarr);
http_querystring_modify(qarr, params);
http_querystring_update(qarr, qstr);
-
+
RETURN_ZVAL(zobj, 1, 1);
}
}
#ifndef WONKY
/* {{{ proto static HttpQueryString HttpQueryString::singleton([bool global = true])
- *
- * Get a single instance (differentiates between the global setting).
- */
+ Get a single instance (differentiates between the global setting). */
PHP_METHOD(HttpQueryString, singleton)
{
zend_bool global = 1;
if (SUCCESS == zend_hash_index_find(Z_ARRVAL_P(instance), global, (void *) &zobj_ptr)) {
RETVAL_ZVAL(*zobj_ptr, 1, 0);
} else {
- zobj = http_querystring_instantiate(global);
+ zobj = http_querystring_instantiate(NULL, global, NULL, (zend_bool) !global);
add_index_zval(instance, global, zobj);
RETVAL_OBJECT(zobj, 1);
}
MAKE_STD_ZVAL(instance);
array_init(instance);
- zobj = http_querystring_instantiate(global);
+ zobj = http_querystring_instantiate(NULL, global, NULL, (zend_bool) !global);
add_index_zval(instance, global, zobj);
RETVAL_OBJECT(zobj, 1);
#ifdef HTTP_HAVE_ICONV
/* {{{ proto bool HttpQueryString::xlate(string ie, string oe)
- *
- * Converts the query string from the source encoding ie to the target encoding oe.
- * WARNING: Don't use any character set that can contain NUL bytes like UTF-16.
- *
- * Returns TRUE on success or FALSE on failure.
- */
+ Converts the query string from the source encoding ie to the target encoding oe. WARNING: Don't use any character set that can contain NUL bytes like UTF-16. */
PHP_METHOD(HttpQueryString, xlate)
{
char *ie, *oe;
#endif /* HAVE_ICONV */
/* {{{ proto string HttpQueryString::serialize()
- *
- * Implements Serializable.
- */
+ Implements Serializable::serialize(). */
PHP_METHOD(HttpQueryString, serialize)
{
NO_ARGS;
/* }}} */
/* {{{ proto void HttpQueryString::unserialize(string serialized)
- *
- * Implements Serializable.
- */
+ Implements Serializable::unserialize(). */
PHP_METHOD(HttpQueryString, unserialize)
{
zval *serialized;
SET_EH_THROW_HTTP();
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &serialized)) {
if (Z_TYPE_P(serialized) == IS_STRING) {
- zval *qa = GET_PROP(queryArray);
-
- zend_hash_clean(Z_ARRVAL_P(qa));
- http_querystring_modify(qa, serialized);
- http_querystring_update(qa, GET_PROP(queryString));
+ http_querystring_instantiate(getThis(), 0, serialized, 0);
} else {
http_error(HE_WARNING, HTTP_E_QUERYSTRING, "Expected a string as parameter");
}
/* }}} */
/* {{{ proto mixed HttpQueryString::offsetGet(string offset)
- *
- * Implements ArrayAccess.
- */
+ Implements ArrayAccess::offsetGet(). */
PHP_METHOD(HttpQueryString, offsetGet)
{
char *offset_str;
/* }}} */
/* {{{ proto void HttpQueryString::offsetSet(string offset, mixed value)
- *
- * Implements ArrayAccess.
- */
+ Implements ArrayAccess::offsetGet(). */
PHP_METHOD(HttpQueryString, offsetSet)
{
char *offset_str;
/* }}} */
/* {{{ proto bool HttpQueryString::offsetExists(string offset)
- *
- * Implements ArrayAccess.
- */
+ Implements ArrayAccess::offsetExists(). */
PHP_METHOD(HttpQueryString, offsetExists)
{
char *offset_str;
/* }}} */
/* {{{ proto void HttpQueryString::offsetUnset(string offset)
- *
- * Implements ArrayAccess.
- */
+ Implements ArrayAccess::offsetUnset(). */
PHP_METHOD(HttpQueryString, offsetUnset)
{
char *offset_str;