HTTP_ARG_VAL(params, 0)
HTTP_END_ARGS;
+HTTP_BEGIN_ARGS(mod, 0)
+ HTTP_ARG_VAL(params, 0)
+HTTP_END_ARGS;
+
HTTP_BEGIN_ARGS(__getter, 1)
HTTP_ARG_VAL(name, 0)
HTTP_ARG_VAL(defval, 0)
HTTP_ARG_VAL(delete, 0)
HTTP_END_ARGS;
-#ifdef HAVE_ICONV
+#ifdef HTTP_HAVE_ICONV
HTTP_BEGIN_ARGS(xlate, 2)
HTTP_ARG_VAL(from_encoding, 0)
HTTP_ARG_VAL(to_encoding, 0)
HTTP_ARG_VAL(serialized, 0)
HTTP_END_ARGS;
+HTTP_BEGIN_ARGS(offsetGet, 1)
+ HTTP_ARG_VAL(offset, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(offsetSet, 2)
+ HTTP_ARG_VAL(offset, 0)
+ HTTP_ARG_VAL(value, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(offsetExists, 1)
+ HTTP_ARG_VAL(offset, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(offsetUnset, 1)
+ HTTP_ARG_VAL(offset, 0)
+HTTP_END_ARGS;
+
+
#define OBJ_PROP_CE http_querystring_object_ce
zend_class_entry *http_querystring_object_ce;
zend_function_entry http_querystring_object_fe[] = {
HTTP_QUERYSTRING_ME(get, ZEND_ACC_PUBLIC)
HTTP_QUERYSTRING_ME(set, ZEND_ACC_PUBLIC)
+ HTTP_QUERYSTRING_ME(mod, ZEND_ACC_PUBLIC)
HTTP_QUERYSTRING_GME(getBool, ZEND_ACC_PUBLIC)
HTTP_QUERYSTRING_GME(getInt, ZEND_ACC_PUBLIC)
#ifndef WONKY
HTTP_QUERYSTRING_ME(singleton, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
#endif
-#ifdef HAVE_ICONV
+#ifdef HTTP_HAVE_ICONV
HTTP_QUERYSTRING_ME(xlate, ZEND_ACC_PUBLIC)
#endif
HTTP_QUERYSTRING_ME(serialize, ZEND_ACC_PUBLIC)
HTTP_QUERYSTRING_ME(unserialize, ZEND_ACC_PUBLIC)
+ /* Implements ArrayAccess */
+ HTTP_QUERYSTRING_ME(offsetGet, ZEND_ACC_PUBLIC)
+ HTTP_QUERYSTRING_ME(offsetSet, ZEND_ACC_PUBLIC)
+ HTTP_QUERYSTRING_ME(offsetExists, ZEND_ACC_PUBLIC)
+ HTTP_QUERYSTRING_ME(offsetUnset, ZEND_ACC_PUBLIC)
+
EMPTY_FUNCTION_ENTRY
};
static zend_object_handlers http_querystring_object_handlers;
HTTP_REGISTER_CLASS_EX(HttpQueryString, http_querystring_object, NULL, 0);
#ifndef WONKY
- zend_class_implements(http_querystring_object_ce TSRMLS_CC, 1, zend_ce_serializable);
+ zend_class_implements(http_querystring_object_ce TSRMLS_CC, 2, zend_ce_serializable, zend_ce_arrayaccess);
#endif
DCL_STATIC_PROP_N(PRIVATE, instance);
{
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 */
-#ifndef WONKY
#define http_querystring_instantiate(g) _http_querystring_instantiate((g) TSRMLS_CC)
static inline zval *_http_querystring_instantiate(zend_bool global TSRMLS_DC)
{
MAKE_STD_ZVAL(zobj);
Z_TYPE_P(zobj) = IS_OBJECT;
- Z_OBJVAL_P(zobj) = http_querystring_object_new(http_querystring_object_ce);
+ zobj->value.obj = http_querystring_object_new(http_querystring_object_ce);
zend_call_method_with_1_params(&zobj, Z_OBJCE_P(zobj), NULL, "__construct", NULL, zglobal);
zval_ptr_dtor(&zglobal);
return zobj;
}
-#endif /* WONKY */
#define http_querystring_get(o, t, n, l, def, del, r) _http_querystring_get((o), (t), (n), (l), (def), (del), (r) TSRMLS_CC)
static inline void _http_querystring_get(zval *this_ptr, int type, char *name, uint name_len, zval *defval, zend_bool del, zval *return_value TSRMLS_DC)
}
/* }}} */
+/* {{{ 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>
+ */
+PHP_METHOD(HttpQueryString, mod)
+{
+ zval *orig, *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);
+ qarr = GET_PROP_EX(zobj, queryArray);
+ qstr = GET_PROP_EX(zobj, queryString);
+
+ http_querystring_modify(qarr, orig);
+ 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])
*
HTTP_QUERYSTRING_GETTER(getObject, IS_OBJECT);
/* }}} */
-#ifdef HAVE_ICONV
+#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.
}
/* }}} */
+/* {{{ proto mixed HttpQueryString::offsetGet(string offset)
+ *
+ * Implements ArrayAccess.
+ */
+PHP_METHOD(HttpQueryString, offsetGet)
+{
+ char *offset_str;
+ int offset_len;
+ zval **value;
+
+ if ( (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &offset_str, &offset_len)) &&
+ (SUCCESS == zend_hash_find(Z_ARRVAL_P(GET_PROP(queryArray)), offset_str, offset_len + 1, (void *) &value))) {
+ RETVAL_ZVAL(*value, 1, 0);
+ }
+}
+/* }}} */
+
+/* {{{ proto void HttpQueryString::offsetSet(string offset, mixed value)
+ *
+ * Implements ArrayAccess.
+ */
+PHP_METHOD(HttpQueryString, offsetSet)
+{
+ char *offset_str;
+ int offset_len;
+ zval *value;
+
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz", &offset_str, &offset_len, &value)) {
+ zval *qarr = GET_PROP(queryArray), *qstr = GET_PROP(queryString);
+
+ ZVAL_ADDREF(value);
+ add_assoc_zval_ex(qarr, offset_str, offset_len + 1, value);
+ http_querystring_update(qarr, qstr);
+ }
+}
+/* }}} */
+
+/* {{{ proto bool HttpQueryString::offsetExists(string offset)
+ *
+ * Implements ArrayAccess.
+ */
+PHP_METHOD(HttpQueryString, offsetExists)
+{
+ char *offset_str;
+ int offset_len;
+ zval **value;
+
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &offset_str, &offset_len)) {
+ RETURN_BOOL((SUCCESS == zend_hash_find(Z_ARRVAL_P(GET_PROP(queryArray)), offset_str, offset_len + 1, (void *) &value)) && (Z_TYPE_PP(value) != IS_NULL));
+ }
+}
+/* }}} */
+
+/* {{{ proto void HttpQueryString::offsetUnset(string offset)
+ *
+ * Implements ArrayAccess.
+ */
+PHP_METHOD(HttpQueryString, offsetUnset)
+{
+ char *offset_str;
+ int offset_len;
+
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &offset_str, &offset_len)) {
+ zval *qarr = GET_PROP(queryArray);
+
+ if (SUCCESS == zend_hash_del(Z_ARRVAL_P(qarr), offset_str, offset_len + 1)) {
+ http_querystring_update(qarr, GET_PROP(queryString));
+ }
+ }
+}
+/* }}} */
+
#endif /* ZEND_ENGINE_2 */
/*
projects / m6w6 / ext-http / blobdiff