| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2006, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2007, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
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;
#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 *qarray, *qstring, **_SERVER = NULL, **_GET = NULL, **QUERY_STRING = NULL;;
+ zval *qarray = NULL, *qstring = NULL, **_SERVER = NULL, **_GET = NULL, **QUERY_STRING = NULL;;
if (!this_ptr) {
MAKE_STD_ZVAL(this_ptr);
/* }}} */
/* {{{ 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;
}
/* }}} */
+/* {{{ 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 *zobj, *qarr, *qstr, *params;
#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(NULL, global, NULL, !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(NULL, global, NULL, !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;
/* }}} */
/* {{{ 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;