+ * //Returns value from $params["id"] without sanitizing
+ * $id = $this->router->getParam("id");
+ *
+ * //Returns value from $params["title"] with sanitizing
+ * $title = $this->router->getParam("title", "escape|repeats");
+ *
+ * //Returns value from $params["id"] with a default value
+ * $id = $this->router->getParam("id", null, 150);
+ *
+ * $foo = 123;
+ * echo (new \Ice\Dump())->variable($foo, "foo");
+ *
+ * $foo = "string";
+ * $bar = ["key" => "value"];
+ * $baz = new stdClass();
+ * echo (new \Ice\Dump())->vars($foo, $bar, $baz);
+ *
+ * {{ dump('str', 1, 2.5, true, null, ['key': 'value']) }}
+ * :output", 0); - ZEPHIR_RETURN_CALL_FUNCTION("strtr", &_4, &_3, _0); + ZEPHIR_RETURN_CALL_FUNCTION("strtr", NULL, 85, &_3, _0); zephir_check_call_status(); RETURN_MM(); @@ -818,33 +844,59 @@ PHP_METHOD(Ice_Dump, variable) { */ PHP_METHOD(Ice_Dump, vars) { - zephir_fcall_cache_entry *_7 = NULL; - HashTable *_3; - HashPosition _2; + zephir_fcall_cache_entry *_6 = NULL; + HashTable *_2; + HashPosition _1; int ZEPHIR_LAST_CALL_STATUS; - zephir_nts_static zephir_fcall_cache_entry *_1 = NULL; - zval *key = NULL, *value = NULL, *output, *_0 = NULL, **_4, *_5 = NULL, *_6 = NULL; + zval *key = NULL, *value = NULL, *output = NULL, *_0 = NULL, **_3, *_4 = NULL, *_5 = NULL; ZEPHIR_MM_GROW(); ZEPHIR_INIT_VAR(output); ZVAL_STRING(output, "", 1); - ZEPHIR_CALL_FUNCTION(&_0, "func_get_args", &_1); + ZEPHIR_CALL_FUNCTION(&_0, "func_get_args", NULL, 84); zephir_check_call_status(); - zephir_is_iterable(_0, &_3, &_2, 0, 0, "ice/dump.zep", 300); + zephir_is_iterable(_0, &_2, &_1, 0, 0, "ice/dump.zep", 309); for ( - ; zephir_hash_get_current_data_ex(_3, (void**) &_4, &_2) == SUCCESS - ; zephir_hash_move_forward_ex(_3, &_2) + ; zephir_hash_get_current_data_ex(_2, (void**) &_3, &_1) == SUCCESS + ; zephir_hash_move_forward_ex(_2, &_1) ) { - ZEPHIR_GET_HMKEY(key, _3, _2); - ZEPHIR_GET_HVALUE(value, _4); - ZEPHIR_INIT_LNVAR(_6); - ZEPHIR_CONCAT_SV(_6, "var ", key); - ZEPHIR_CALL_METHOD(&_5, this_ptr, "one", &_7, value, _6); + ZEPHIR_GET_HMKEY(key, _2, _1); + ZEPHIR_GET_HVALUE(value, _3); + ZEPHIR_INIT_LNVAR(_5); + ZEPHIR_CONCAT_SV(_5, "var ", key); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "one", &_6, 0, value, _5); zephir_check_call_status(); - zephir_concat_self(&output, _5 TSRMLS_CC); + zephir_concat_self(&output, _4 TSRMLS_CC); } RETURN_CCTOR(output); } +static zend_object_value zephir_init_properties_Ice_Dump(zend_class_entry *class_type TSRMLS_DC) { + + zval *_0, *_1 = NULL, *_2; + + ZEPHIR_MM_GROW(); + + { + zval *this_ptr = NULL; + ZEPHIR_CREATE_OBJECT(this_ptr, class_type); + _0 = zephir_fetch_nproperty_this(this_ptr, SL("styles"), PH_NOISY_CC); + if (Z_TYPE_P(_0) == IS_NULL) { + ZEPHIR_INIT_VAR(_1); + array_init(_1); + zephir_update_property_this(this_ptr, SL("styles"), _1 TSRMLS_CC); + } + _2 = zephir_fetch_nproperty_this(this_ptr, SL("methods"), PH_NOISY_CC); + if (Z_TYPE_P(_2) == IS_NULL) { + ZEPHIR_INIT_NVAR(_1); + array_init(_1); + zephir_update_property_this(this_ptr, SL("methods"), _1 TSRMLS_CC); + } + ZEPHIR_MM_RESTORE(); + return Z_OBJVAL_P(this_ptr); + } + +} + diff --git a/ext/ice/dump.zep.h b/ext/ice/dump.zep.h index c7c5a938..bec7c803 100644 --- a/ext/ice/dump.zep.h +++ b/ext/ice/dump.zep.h @@ -13,6 +13,7 @@ PHP_METHOD(Ice_Dump, one); PHP_METHOD(Ice_Dump, output); PHP_METHOD(Ice_Dump, variable); PHP_METHOD(Ice_Dump, vars); +static zend_object_value zephir_init_properties_Ice_Dump(zend_class_entry *class_type TSRMLS_DC); ZEND_BEGIN_ARG_INFO_EX(arginfo_ice_dump_setdetailed, 0, 0, 1) ZEND_ARG_INFO(0, detailed) @@ -58,5 +59,5 @@ ZEPHIR_INIT_FUNCS(ice_dump_method_entry) { PHP_ME(Ice_Dump, output, arginfo_ice_dump_output, ZEND_ACC_PROTECTED) PHP_ME(Ice_Dump, variable, arginfo_ice_dump_variable, ZEND_ACC_PUBLIC) PHP_ME(Ice_Dump, vars, NULL, ZEND_ACC_PUBLIC) - PHP_FE_END + PHP_FE_END }; diff --git a/ext/ice/exception.zep.c b/ext/ice/exception.zep.c index 4891d0a0..9be09956 100644 --- a/ext/ice/exception.zep.c +++ b/ext/ice/exception.zep.c @@ -51,10 +51,10 @@ ZEPHIR_INIT_CLASS(Ice_Exception) { */ PHP_METHOD(Ice_Exception, __construct) { - zval *_9 = NULL; + zval *_7 = NULL; int ZEPHIR_LAST_CALL_STATUS; - zephir_nts_static zephir_fcall_cache_entry *_0 = NULL, *_2 = NULL, *_6 = NULL, *_7 = NULL; - zval *message = NULL, *code = NULL, *previous = NULL, *di = NULL, *values = NULL, *str = NULL, _1 = zval_used_for_init, *_3 = NULL, *_4 = NULL, *_5 = NULL, *_8 = NULL; + zephir_fcall_cache_entry *_0 = NULL; + zval *message = NULL, *code = NULL, *previous = NULL, *di = NULL, *values = NULL, *str = NULL, _1 = zval_used_for_init, *_2 = NULL, *_3 = NULL, *_4 = NULL, *_5 = NULL, *_6; ZEPHIR_MM_GROW(); zephir_fetch_params(1, 0, 3, &message, &code, &previous); @@ -74,12 +74,12 @@ PHP_METHOD(Ice_Exception, __construct) { } - ZEPHIR_CALL_CE_STATIC(&di, ice_di_ce, "fetch", &_0); + ZEPHIR_CALL_CE_STATIC(&di, ice_di_ce, "fetch", &_0, 8); zephir_check_call_status(); if (Z_TYPE_P(message) == IS_ARRAY) { ZEPHIR_SINIT_VAR(_1); ZVAL_LONG(&_1, 1); - ZEPHIR_CALL_FUNCTION(&values, "array_slice", &_2, message, &_1); + ZEPHIR_CALL_FUNCTION(&values, "array_slice", NULL, 95, message, &_1); zephir_check_call_status(); ZEPHIR_OBS_VAR(str); zephir_array_fetch_long(&str, message, 0, PH_NOISY, "ice/exception.zep", 32 TSRMLS_CC); @@ -88,42 +88,46 @@ PHP_METHOD(Ice_Exception, __construct) { ZVAL_NULL(values); ZEPHIR_CPY_WRT(str, message); } - ZEPHIR_INIT_VAR(_4); - ZVAL_STRING(_4, "i18n", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(&_3, di, "has", NULL, _4); - zephir_check_temp_parameter(_4); + ZEPHIR_INIT_VAR(_3); + ZVAL_STRING(_3, "i18n", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(&_2, di, "has", NULL, 0, _3); + zephir_check_temp_parameter(_3); zephir_check_call_status(); - if (zephir_is_true(_3)) { - ZEPHIR_INIT_NVAR(_4); - ZVAL_STRING(_4, "i18n", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(&_5, di, "get", NULL, _4); - zephir_check_temp_parameter(_4); + if (zephir_is_true(_2)) { + ZEPHIR_INIT_NVAR(_3); + ZVAL_STRING(_3, "i18n", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_INIT_VAR(_5); + ZVAL_NULL(_5); + ZEPHIR_INIT_VAR(_6); + ZVAL_BOOL(_6, 1); + ZEPHIR_CALL_METHOD(&_4, di, "get", NULL, 0, _3, _5, _6); + zephir_check_temp_parameter(_3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&message, _5, "translate", NULL, str, values); + ZEPHIR_CALL_METHOD(&message, _4, "translate", NULL, 0, str, values); zephir_check_call_status(); } else if (Z_TYPE_P(values) == IS_ARRAY) { - ZEPHIR_INIT_NVAR(_4); - zephir_array_keys(_4, values TSRMLS_CC); + ZEPHIR_INIT_NVAR(_3); + zephir_array_keys(_3, values TSRMLS_CC); ZEPHIR_SINIT_NVAR(_1); ZVAL_STRING(&_1, "is_string", 0); - ZEPHIR_CALL_FUNCTION(&_5, "array_filter", &_6, _4, &_1); + ZEPHIR_CALL_FUNCTION(&_4, "array_filter", NULL, 10, _3, &_1); zephir_check_call_status(); - if (zephir_fast_count_int(_5 TSRMLS_CC)) { - ZEPHIR_CALL_FUNCTION(&message, "strtr", &_7, str, values); + if (zephir_fast_count_int(_4 TSRMLS_CC)) { + ZEPHIR_CALL_FUNCTION(&message, "strtr", NULL, 85, str, values); zephir_check_call_status(); } else { - ZEPHIR_INIT_VAR(_8); + ZEPHIR_INIT_NVAR(_5); ZEPHIR_SINIT_NVAR(_1); ZVAL_STRING(&_1, "sprintf", 0); - ZEPHIR_CALL_USER_FUNC_ARRAY(_8, &_1, message); + ZEPHIR_CALL_USER_FUNC_ARRAY(_5, &_1, message); zephir_check_call_status(); - ZEPHIR_CPY_WRT(message, _8); + ZEPHIR_CPY_WRT(message, _5); } } - zephir_get_strval(_9, message); - ZEPHIR_INIT_NVAR(_8); - ZVAL_LONG(_8, zephir_get_intval(code)); - ZEPHIR_CALL_PARENT(NULL, ice_exception_ce, this_ptr, "__construct", NULL, _9, _8, previous); + zephir_get_strval(_7, message); + ZEPHIR_INIT_NVAR(_5); + ZVAL_LONG(_5, zephir_get_intval(code)); + ZEPHIR_CALL_PARENT(NULL, ice_exception_ce, this_ptr, "__construct", NULL, 0, _7, _5, previous); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -137,20 +141,21 @@ PHP_METHOD(Ice_Exception, __construct) { */ PHP_METHOD(Ice_Exception, getFullTraceAsString) { - zephir_nts_static zephir_fcall_cache_entry *_19 = NULL; + zephir_fcall_cache_entry *_19 = NULL; HashTable *_2, *_6; HashPosition _1, _5; - int count = 0, ZEPHIR_LAST_CALL_STATUS; - zval *e, *output, *frame = NULL, *args = NULL, *arg = NULL, *node = NULL, *_0 = NULL, **_3, *_4, **_7, *_8 = NULL, *_9 = NULL, *_10 = NULL, *_11, *_12 = NULL, *_13, *_14, *_15, _16 = zval_used_for_init, _17 = zval_used_for_init, *_18 = NULL; + int count, ZEPHIR_LAST_CALL_STATUS; + zval *e, *output = NULL, *frame = NULL, *args = NULL, *arg = NULL, *node = NULL, *_0 = NULL, **_3, *_4, **_7, *_8 = NULL, *_9 = NULL, *_10 = NULL, *_11, *_12 = NULL, *_13, *_14, *_15, _16 = zval_used_for_init, _17 = zval_used_for_init, *_18 = NULL; ZEPHIR_MM_GROW(); zephir_fetch_params(1, 1, 0, &e); + count = 0; ZEPHIR_INIT_VAR(output); ZVAL_STRING(output, "", 1); - ZEPHIR_CALL_METHOD(&_0, e, "gettrace", NULL); + ZEPHIR_CALL_METHOD(&_0, e, "gettrace", NULL, 0); zephir_check_call_status(); zephir_is_iterable(_0, &_2, &_1, 0, 0, "ice/exception.zep", 109); for ( @@ -248,7 +253,7 @@ PHP_METHOD(Ice_Exception, getFullTraceAsString) { ZVAL_STRING(&_16, "#%s %s: %s(%s)\n", 0); ZEPHIR_SINIT_NVAR(_17); ZVAL_LONG(&_17, count); - ZEPHIR_CALL_FUNCTION(&_18, "sprintf", &_19, &_16, &_17, _9, _12, args); + ZEPHIR_CALL_FUNCTION(&_18, "sprintf", &_19, 1, &_16, &_17, _9, _12, args); zephir_check_call_status(); zephir_concat_self(&output, _18 TSRMLS_CC); count++; @@ -265,10 +270,9 @@ PHP_METHOD(Ice_Exception, getFullTraceAsString) { */ PHP_METHOD(Ice_Exception, errorHandler) { - zephir_nts_static zephir_fcall_cache_entry *_1 = NULL; zval *context = NULL; zval *message = NULL, *file = NULL; - zval *code_param = NULL, *message_param = NULL, *file_param = NULL, *line_param = NULL, *context_param = NULL, *_0 = NULL, *_2, *_3, *_4, *_5; + zval *code_param = NULL, *message_param = NULL, *file_param = NULL, *line_param = NULL, *context_param = NULL, *_0 = NULL, *_1, *_2, *_3, *_4; int code, line, ZEPHIR_LAST_CALL_STATUS; ZEPHIR_MM_GROW(); @@ -295,20 +299,20 @@ PHP_METHOD(Ice_Exception, errorHandler) { } - ZEPHIR_CALL_FUNCTION(&_0, "error_reporting", &_1); + ZEPHIR_CALL_FUNCTION(&_0, "error_reporting", NULL, 96); zephir_check_call_status(); if (((int) (zephir_get_numberval(_0)) & code)) { + ZEPHIR_INIT_VAR(_1); + object_init_ex(_1, zephir_get_internal_ce(SS("errorexception") TSRMLS_CC)); ZEPHIR_INIT_VAR(_2); - object_init_ex(_2, zephir_get_internal_ce(SS("errorexception") TSRMLS_CC)); + ZVAL_LONG(_2, code); ZEPHIR_INIT_VAR(_3); - ZVAL_LONG(_3, code); + ZVAL_LONG(_3, 0); ZEPHIR_INIT_VAR(_4); - ZVAL_LONG(_4, 0); - ZEPHIR_INIT_VAR(_5); - ZVAL_LONG(_5, line); - ZEPHIR_CALL_METHOD(NULL, _2, "__construct", NULL, message, _3, _4, file, _5); + ZVAL_LONG(_4, line); + ZEPHIR_CALL_METHOD(NULL, _1, "__construct", NULL, 97, message, _2, _3, file, _4); zephir_check_call_status(); - zephir_throw_exception_debug(_2, "ice/exception.zep", 123 TSRMLS_CC); + zephir_throw_exception_debug(_1, "ice/exception.zep", 123 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -337,21 +341,21 @@ PHP_METHOD(Ice_Exception, handler) { ZEPHIR_INIT_VAR(_1); zephir_get_called_class(_1 TSRMLS_CC); ZEPHIR_INIT_VAR(_2); - array_init_size(_2, 4); - ZEPHIR_CALL_METHOD(&_3, e, "getmessage", NULL); + zephir_create_array(_2, 3, 0 TSRMLS_CC); + ZEPHIR_CALL_METHOD(&_3, e, "getmessage", NULL, 0); zephir_check_call_status(); zephir_array_fast_append(_2, _3); - ZEPHIR_CALL_METHOD(&_3, e, "getcode", NULL); + ZEPHIR_CALL_METHOD(&_3, e, "getcode", NULL, 0); zephir_check_call_status(); zephir_array_fast_append(_2, _3); zephir_array_fast_append(_2, e); ZEPHIR_LAST_CALL_STATUS = zephir_create_instance_params(_0, _1, _2 TSRMLS_CC); zephir_check_call_status(); + ZEPHIR_MM_RESTORE(); ZEPHIR_SINIT_VAR(_4); ZVAL_LONG(&_4, 1); zephir_exit(&_4); ZEPHIR_MM_RESTORE(); - ZEPHIR_MM_RESTORE(); } @@ -362,53 +366,52 @@ PHP_METHOD(Ice_Exception, handler) { */ PHP_METHOD(Ice_Exception, shutdownHandler) { - zval *_3; - zend_bool _1; + zval *_2; + zend_bool _0; int ZEPHIR_LAST_CALL_STATUS; - zephir_nts_static zephir_fcall_cache_entry *_0 = NULL, *_5 = NULL, *_6 = NULL; - zval *e = NULL, *_2, *_4 = NULL, *_7, *_8, *_9, *_10, *_11, _12; + zval *e = NULL, *_1, *_3 = NULL, *_4, *_5, *_6, *_7, *_8, _9; ZEPHIR_MM_GROW(); - ZEPHIR_CALL_FUNCTION(&e, "error_get_last", &_0); + ZEPHIR_CALL_FUNCTION(&e, "error_get_last", NULL, 98); zephir_check_call_status(); - _1 = Z_TYPE_P(e) == IS_ARRAY; - if (_1) { - zephir_array_fetch_string(&_2, e, SL("type"), PH_NOISY | PH_READONLY, "ice/exception.zep", 152 TSRMLS_CC); + _0 = Z_TYPE_P(e) == IS_ARRAY; + if (_0) { + zephir_array_fetch_string(&_1, e, SL("type"), PH_NOISY | PH_READONLY, "ice/exception.zep", 152 TSRMLS_CC); + ZEPHIR_INIT_VAR(_2); + zephir_create_array(_2, 3, 0 TSRMLS_CC); ZEPHIR_INIT_VAR(_3); - array_init_size(_3, 4); - ZEPHIR_INIT_VAR(_4); - ZVAL_LONG(_4, 4); - zephir_array_fast_append(_3, _4); - ZEPHIR_INIT_NVAR(_4); - ZVAL_LONG(_4, 1); - zephir_array_fast_append(_3, _4); - ZEPHIR_INIT_NVAR(_4); - ZVAL_LONG(_4, 256); - zephir_array_fast_append(_3, _4); - _1 = zephir_fast_in_array(_2, _3 TSRMLS_CC); + ZVAL_LONG(_3, 4); + zephir_array_fast_append(_2, _3); + ZEPHIR_INIT_NVAR(_3); + ZVAL_LONG(_3, 1); + zephir_array_fast_append(_2, _3); + ZEPHIR_INIT_NVAR(_3); + ZVAL_LONG(_3, 256); + zephir_array_fast_append(_2, _3); + _0 = zephir_fast_in_array(_1, _2 TSRMLS_CC); } - if (_1) { - ZEPHIR_CALL_FUNCTION(NULL, "ob_get_level", &_5); + if (_0) { + ZEPHIR_CALL_FUNCTION(NULL, "ob_get_level", NULL, 99); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", &_6); + ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 100); zephir_check_call_status(); - ZEPHIR_INIT_NVAR(_4); - object_init_ex(_4, zephir_get_internal_ce(SS("errorexception") TSRMLS_CC)); - zephir_array_fetch_string(&_7, e, SL("message"), PH_NOISY | PH_READONLY, "ice/exception.zep", 157 TSRMLS_CC); - zephir_array_fetch_string(&_8, e, SL("type"), PH_NOISY | PH_READONLY, "ice/exception.zep", 157 TSRMLS_CC); - zephir_array_fetch_string(&_9, e, SL("file"), PH_NOISY | PH_READONLY, "ice/exception.zep", 157 TSRMLS_CC); - zephir_array_fetch_string(&_10, e, SL("line"), PH_NOISY | PH_READONLY, "ice/exception.zep", 157 TSRMLS_CC); - ZEPHIR_INIT_VAR(_11); - ZVAL_LONG(_11, 0); - ZEPHIR_CALL_METHOD(NULL, _4, "__construct", NULL, _7, _8, _11, _9, _10); + ZEPHIR_INIT_NVAR(_3); + object_init_ex(_3, zephir_get_internal_ce(SS("errorexception") TSRMLS_CC)); + zephir_array_fetch_string(&_4, e, SL("message"), PH_NOISY | PH_READONLY, "ice/exception.zep", 157 TSRMLS_CC); + zephir_array_fetch_string(&_5, e, SL("type"), PH_NOISY | PH_READONLY, "ice/exception.zep", 157 TSRMLS_CC); + zephir_array_fetch_string(&_6, e, SL("file"), PH_NOISY | PH_READONLY, "ice/exception.zep", 157 TSRMLS_CC); + zephir_array_fetch_string(&_7, e, SL("line"), PH_NOISY | PH_READONLY, "ice/exception.zep", 157 TSRMLS_CC); + ZEPHIR_INIT_VAR(_8); + ZVAL_LONG(_8, 0); + ZEPHIR_CALL_METHOD(NULL, _3, "__construct", NULL, 97, _4, _5, _8, _6, _7); zephir_check_call_status(); - ZEPHIR_CALL_SELF(NULL, "handler", NULL, _4); + ZEPHIR_CALL_SELF(NULL, "handler", NULL, 0, _3); zephir_check_call_status(); - ZEPHIR_SINIT_VAR(_12); - ZVAL_LONG(&_12, 1); - zephir_exit(&_12); ZEPHIR_MM_RESTORE(); + ZEPHIR_SINIT_VAR(_9); + ZVAL_LONG(&_9, 1); + zephir_exit(&_9); } ZEPHIR_MM_RESTORE(); diff --git a/ext/ice/exception.zep.h b/ext/ice/exception.zep.h index 6053ef65..d33ce7f9 100644 --- a/ext/ice/exception.zep.h +++ b/ext/ice/exception.zep.h @@ -37,5 +37,5 @@ ZEPHIR_INIT_FUNCS(ice_exception_method_entry) { PHP_ME(Ice_Exception, errorHandler, arginfo_ice_exception_errorhandler, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) PHP_ME(Ice_Exception, handler, arginfo_ice_exception_handler, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) PHP_ME(Ice_Exception, shutdownHandler, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) - PHP_FE_END + PHP_FE_END }; diff --git a/ext/ice/filter.zep.c b/ext/ice/filter.zep.c index db246740..695ab263 100644 --- a/ext/ice/filter.zep.c +++ b/ext/ice/filter.zep.c @@ -38,7 +38,7 @@ ZEPHIR_INIT_CLASS(Ice_Filter) { ZEPHIR_REGISTER_CLASS(Ice, Filter, ice, filter, ice_filter_method_entry, 0); - zend_declare_property_null(ice_filter_ce, SL("_filters"), ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_null(ice_filter_ce, SL("filters"), ZEND_ACC_PROTECTED TSRMLS_CC); return SUCCESS; @@ -62,7 +62,6 @@ PHP_METHOD(Ice_Filter, add) { zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'name' must be a string") TSRMLS_CC); RETURN_MM_NULL(); } - if (likely(Z_TYPE_P(name_param) == IS_STRING)) { zephir_get_strval(name, name_param); } else { @@ -75,7 +74,7 @@ PHP_METHOD(Ice_Filter, add) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(ice_exception_ce, "Filter must be an object", "ice/filter.zep", 27); return; } - zephir_update_property_array(this_ptr, SL("_filters"), name, body TSRMLS_CC); + zephir_update_property_array(this_ptr, SL("filters"), name, body TSRMLS_CC); ZEPHIR_MM_RESTORE(); } @@ -114,7 +113,7 @@ PHP_METHOD(Ice_Filter, sanitize) { ; zephir_hash_move_forward_ex(_2, &_1) ) { ZEPHIR_GET_HVALUE(filter, _3); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "_sanitize", &_5, value, filter); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "dosanitize", &_5, 0, value, filter); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, _4); } @@ -131,10 +130,9 @@ PHP_METHOD(Ice_Filter, sanitize) { * @param string filter * @return mixed */ -PHP_METHOD(Ice_Filter, _sanitize) { +PHP_METHOD(Ice_Filter, doSanitize) { - zephir_fcall_cache_entry *_11 = NULL; - zephir_nts_static zephir_fcall_cache_entry *_9 = NULL, *_15 = NULL, *_16 = NULL, *_17 = NULL; + zephir_fcall_cache_entry *_9 = NULL, *_11 = NULL; zval *_1 = NULL, *_12; int ZEPHIR_LAST_CALL_STATUS; zval *value_param = NULL, *filter_param = NULL, *custom = NULL, *_0, _2 = zval_used_for_init, *_3 = NULL, *_4 = NULL, *_5 = NULL, *_6, *_7, *_8 = NULL, _10 = zval_used_for_init, *_13; @@ -148,7 +146,6 @@ PHP_METHOD(Ice_Filter, _sanitize) { zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'filter' must be a string") TSRMLS_CC); RETURN_MM_NULL(); } - if (likely(Z_TYPE_P(filter_param) == IS_STRING)) { zephir_get_strval(filter, filter_param); } else { @@ -158,44 +155,44 @@ PHP_METHOD(Ice_Filter, _sanitize) { ZEPHIR_OBS_VAR(custom); - _0 = zephir_fetch_nproperty_this(this_ptr, SL("_filters"), PH_NOISY_CC); + _0 = zephir_fetch_nproperty_this(this_ptr, SL("filters"), PH_NOISY_CC); if (zephir_array_isset_fetch(&custom, _0, filter, 0 TSRMLS_CC)) { if (zephir_instance_of_ev(custom, zend_ce_closure TSRMLS_CC)) { ZEPHIR_INIT_VAR(_1); - array_init_size(_1, 2); + zephir_create_array(_1, 1, 0 TSRMLS_CC); zephir_array_fast_append(_1, value); ZEPHIR_CALL_USER_FUNC_ARRAY(return_value, custom, _1); zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_RETURN_CALL_METHOD(custom, "sanitize", NULL, value); + ZEPHIR_RETURN_CALL_METHOD(custom, "sanitize", NULL, 0, value); zephir_check_call_status(); RETURN_MM(); } do { if (ZEPHIR_IS_STRING(filter, "cssmin")) { - ZEPHIR_INIT_NVAR(custom); ZEPHIR_SINIT_VAR(_2); ZVAL_STRING(&_2, "Ice\\Filter\\Css", 0); + ZEPHIR_INIT_NVAR(custom); ZEPHIR_LAST_CALL_STATUS = zephir_create_instance(custom, &_2 TSRMLS_CC); zephir_check_call_status(); ZEPHIR_INIT_VAR(_3); ZVAL_STRING(_3, "cssmin", 1); - zephir_update_property_array(this_ptr, SL("_filters"), _3, custom TSRMLS_CC); - ZEPHIR_RETURN_CALL_METHOD(custom, "sanitize", NULL, value); + zephir_update_property_array(this_ptr, SL("filters"), _3, custom TSRMLS_CC); + ZEPHIR_RETURN_CALL_METHOD(custom, "sanitize", NULL, 0, value); zephir_check_call_status(); RETURN_MM(); } if (ZEPHIR_IS_STRING(filter, "jsmin")) { - ZEPHIR_INIT_NVAR(custom); ZEPHIR_SINIT_NVAR(_2); ZVAL_STRING(&_2, "Ice\\Filter\\Js", 0); + ZEPHIR_INIT_NVAR(custom); ZEPHIR_LAST_CALL_STATUS = zephir_create_instance(custom, &_2 TSRMLS_CC); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_3); ZVAL_STRING(_3, "jsmin", 1); - zephir_update_property_array(this_ptr, SL("_filters"), _3, custom TSRMLS_CC); - ZEPHIR_RETURN_CALL_METHOD(custom, "sanitize", NULL, value); + zephir_update_property_array(this_ptr, SL("filters"), _3, custom TSRMLS_CC); + ZEPHIR_RETURN_CALL_METHOD(custom, "sanitize", NULL, 0, value); zephir_check_call_status(); RETURN_MM(); } @@ -217,7 +214,7 @@ PHP_METHOD(Ice_Filter, _sanitize) { ZVAL_STRING(_6, "/(?<=\\w)(?=[A-Z])/", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_INIT_VAR(_7); ZVAL_STRING(_7, " $1", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_FUNCTION(&_8, "preg_replace", &_9, _6, _7, value); + ZEPHIR_CALL_FUNCTION(&_8, "preg_replace", &_9, 101, _6, _7, value); zephir_check_temp_parameter(_6); zephir_check_temp_parameter(_7); zephir_check_call_status(); @@ -226,7 +223,7 @@ PHP_METHOD(Ice_Filter, _sanitize) { ZVAL_STRING(&_2, "_", 0); ZEPHIR_SINIT_VAR(_10); ZVAL_STRING(&_10, " ", 0); - zephir_fast_str_replace(_4, &_2, &_10, _5 TSRMLS_CC); + zephir_fast_str_replace(&_4, &_2, &_10, _5 TSRMLS_CC); zephir_fast_trim(_3, _4, NULL , ZEPHIR_TRIM_BOTH TSRMLS_CC); zephir_ucfirst(return_value, _3); RETURN_MM(); @@ -234,7 +231,7 @@ PHP_METHOD(Ice_Filter, _sanitize) { if (ZEPHIR_IS_STRING(filter, "lower")) { ZEPHIR_INIT_NVAR(_3); if ((zephir_function_exists_ex(SS("mb_strtolower") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&_3, "mb_strtolower", NULL, value); + ZEPHIR_CALL_FUNCTION(&_3, "mb_strtolower", NULL, 102, value); zephir_check_call_status(); } else { zephir_fast_strtolower(_3, value); @@ -244,7 +241,7 @@ PHP_METHOD(Ice_Filter, _sanitize) { if (ZEPHIR_IS_STRING(filter, "upper")) { ZEPHIR_INIT_NVAR(_3); if ((zephir_function_exists_ex(SS("mb_strtoupper") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&_3, "mb_strtoupper", NULL, value); + ZEPHIR_CALL_FUNCTION(&_3, "mb_strtoupper", NULL, 103, value); zephir_check_call_status(); } else { zephir_fast_strtoupper(_3, value); @@ -256,7 +253,7 @@ PHP_METHOD(Ice_Filter, _sanitize) { ZVAL_STRING(_3, "/[^a-z0-9]/i", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_INIT_NVAR(_4); ZVAL_STRING(_4, "", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_FUNCTION("preg_replace", &_9, _3, _4, value); + ZEPHIR_RETURN_CALL_FUNCTION("preg_replace", &_9, 101, _3, _4, value); zephir_check_temp_parameter(_3); zephir_check_temp_parameter(_4); zephir_check_call_status(); @@ -267,7 +264,7 @@ PHP_METHOD(Ice_Filter, _sanitize) { ZVAL_STRING(_3, "/[^a-z]/i", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_INIT_NVAR(_4); ZVAL_STRING(_4, "", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_FUNCTION("preg_replace", &_9, _3, _4, value); + ZEPHIR_RETURN_CALL_FUNCTION("preg_replace", &_9, 101, _3, _4, value); zephir_check_temp_parameter(_3); zephir_check_temp_parameter(_4); zephir_check_call_status(); @@ -276,7 +273,7 @@ PHP_METHOD(Ice_Filter, _sanitize) { if (ZEPHIR_IS_STRING(filter, "email")) { ZEPHIR_SINIT_NVAR(_2); ZVAL_LONG(&_2, 517); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", &_11, value, &_2); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", &_11, 104, value, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -285,27 +282,27 @@ PHP_METHOD(Ice_Filter, _sanitize) { ZVAL_LONG(&_2, 520); ZEPHIR_SINIT_NVAR(_10); ZVAL_LONG(&_10, 4096); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", &_11, value, &_2, &_10); + ZEPHIR_CALL_FUNCTION(&_8, "filter_var", &_11, 104, value, &_2, &_10); zephir_check_call_status(); - RETURN_MM(); + RETURN_MM_DOUBLE(zephir_get_doubleval(_8)); } if (ZEPHIR_IS_STRING(filter, "int")) { ZEPHIR_SINIT_NVAR(_2); ZVAL_LONG(&_2, 519); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", &_11, value, &_2); + ZEPHIR_CALL_FUNCTION(&_8, "filter_var", &_11, 104, value, &_2); zephir_check_call_status(); - RETURN_MM(); + RETURN_MM_LONG(zephir_get_intval(_8)); } if (ZEPHIR_IS_STRING(filter, "string")) { ZEPHIR_SINIT_NVAR(_2); ZVAL_LONG(&_2, 513); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", &_11, value, &_2); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", &_11, 104, value, &_2); zephir_check_call_status(); RETURN_MM(); } if (ZEPHIR_IS_STRING(filter, "repeats") || ZEPHIR_IS_STRING(filter, "strip_repeats")) { ZEPHIR_INIT_NVAR(_1); - array_init_size(_1, 4); + zephir_create_array(_1, 3, 0 TSRMLS_CC); ZEPHIR_INIT_NVAR(_3); ZVAL_STRING(_3, "/[ ]{2,}/", 1); zephir_array_fast_append(_1, _3); @@ -316,7 +313,7 @@ PHP_METHOD(Ice_Filter, _sanitize) { ZVAL_STRING(_3, "~(.?)\\1{3,}~", 1); zephir_array_fast_append(_1, _3); ZEPHIR_INIT_VAR(_12); - array_init_size(_12, 4); + zephir_create_array(_12, 3, 0 TSRMLS_CC); ZEPHIR_INIT_NVAR(_3); ZVAL_STRING(_3, " ", 1); zephir_array_fast_append(_12, _3); @@ -330,7 +327,7 @@ PHP_METHOD(Ice_Filter, _sanitize) { ZEPHIR_INIT_NVAR(_5); ZVAL_STRING(_5, "$1$1$1", 1); zephir_array_fast_append(_12, _5); - ZEPHIR_RETURN_CALL_FUNCTION("preg_replace", &_9, _1, _12, value); + ZEPHIR_RETURN_CALL_FUNCTION("preg_replace", &_9, 101, _1, _12, value); zephir_check_call_status(); RETURN_MM(); } @@ -338,14 +335,14 @@ PHP_METHOD(Ice_Filter, _sanitize) { zephir_get_strval(_14, value); ZEPHIR_SINIT_NVAR(_2); ZVAL_LONG(&_2, (3 | 48)); - ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", &_15, _14, &_2); + ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 105, _14, &_2); zephir_check_call_status(); RETURN_MM(); } if (ZEPHIR_IS_STRING(filter, "unescape") || ZEPHIR_IS_STRING(filter, "unstrip_special")) { ZEPHIR_SINIT_NVAR(_2); ZVAL_LONG(&_2, (3 | 48)); - ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars_decode", &_16, value, &_2); + ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars_decode", NULL, 106, value, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -353,9 +350,9 @@ PHP_METHOD(Ice_Filter, _sanitize) { object_init_ex(_3, ice_exception_ce); ZEPHIR_SINIT_NVAR(_2); ZVAL_STRING(&_2, "Filter '%s' is not supported", 0); - ZEPHIR_CALL_FUNCTION(&_8, "sprintf", &_17, &_2, filter); + ZEPHIR_CALL_FUNCTION(&_8, "sprintf", NULL, 1, &_2, filter); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, _3, "__construct", NULL, _8); + ZEPHIR_CALL_METHOD(NULL, _3, "__construct", NULL, 2, _8); zephir_check_call_status(); zephir_throw_exception_debug(_3, "ice/filter.zep", 127 TSRMLS_CC); ZEPHIR_MM_RESTORE(); diff --git a/ext/ice/filter.zep.h b/ext/ice/filter.zep.h index fda0d861..7fa256e6 100644 --- a/ext/ice/filter.zep.h +++ b/ext/ice/filter.zep.h @@ -5,7 +5,7 @@ ZEPHIR_INIT_CLASS(Ice_Filter); PHP_METHOD(Ice_Filter, add); PHP_METHOD(Ice_Filter, sanitize); -PHP_METHOD(Ice_Filter, _sanitize); +PHP_METHOD(Ice_Filter, doSanitize); ZEND_BEGIN_ARG_INFO_EX(arginfo_ice_filter_add, 0, 0, 2) ZEND_ARG_INFO(0, name) @@ -17,7 +17,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ice_filter_sanitize, 0, 0, 2) ZEND_ARG_INFO(0, filters) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_ice_filter__sanitize, 0, 0, 2) +ZEND_BEGIN_ARG_INFO_EX(arginfo_ice_filter_dosanitize, 0, 0, 2) ZEND_ARG_INFO(0, value) ZEND_ARG_INFO(0, filter) ZEND_END_ARG_INFO() @@ -25,6 +25,6 @@ ZEND_END_ARG_INFO() ZEPHIR_INIT_FUNCS(ice_filter_method_entry) { PHP_ME(Ice_Filter, add, arginfo_ice_filter_add, ZEND_ACC_PUBLIC) PHP_ME(Ice_Filter, sanitize, arginfo_ice_filter_sanitize, ZEND_ACC_PUBLIC) - PHP_ME(Ice_Filter, _sanitize, arginfo_ice_filter__sanitize, ZEND_ACC_PROTECTED) - PHP_FE_END + PHP_ME(Ice_Filter, doSanitize, arginfo_ice_filter_dosanitize, ZEND_ACC_PROTECTED) + PHP_FE_END }; diff --git a/ext/ice/filter/css.zep.c b/ext/ice/filter/css.zep.c index e9b1a0d0..d880fc0a 100644 --- a/ext/ice/filter/css.zep.c +++ b/ext/ice/filter/css.zep.c @@ -12,8 +12,8 @@ #include
+ * // Get rules for one field
+ * $this->getRules('password');
+ *
+ * // Get rules for multiple fields
+ * $this->getRules(['fullName', 'about']);
+ *
+ * // Get all rules
+ * $this->getRules();
+ *
+ * // Phtml
+ * $this->tag->textField(['some', 'some_value']);
+ *
+ * // Sleet
+ * {{ text_field(['some', 'some_value', 'id' => 'some1', 'class' => 'field', 'style' => 'width: 100%']) }}
+ *
+ * // Phtml
+ * $this->tag->passwordField(['pass', 'class': 'form-control']);
+ *
+ * // Sleet
+ * {{ password_field(['pass', 'placeholder': 'My secret password']) }}
+ *
+ * // Phtml
+ * $this->tag->hiddenField(['secret', 'some value']);
+ *
+ * // Sleet
+ * {{ hidden_field(['secret', 'hidden value', 'id': 'my_id']) }}
+ *
+ * // Sleet
+ * {{ file_field(['some']) }}
+ *
+ * // Phtml
+ * $this->tag->submitButton(['some', 'Submit']);
+ *
+ * // Sleet
+ * {{ submit_button(['some', 'value' => 'Submit', 'id' => 'some1', 'class' => 'btn']) }}
+ *
+ * // Phtml
+ * $this->tag->button(['some', 'content']);
+ *
+ * // Sleet
+ * {{ button(['some', '+ ' . 'Submit', 'type' => 'button', 'id' => 'some1']) }}
+ *
+ * // Phtml
+ * $this->tag->checkField(['agree', 'yes']);
+ *
+ * // Sleet
+ * {{ check_field(['remember', 'on', 'checked': 'checked']) }}
+ *
+ * // Phtml
+ * $this->tag->radioField(['sex', 'male']);
+ *
+ * // Sleet
+ * {{ radio_field(['sex', 'female', 'checked': 'checked']) }}
+ *
+ * // Phtml
+ * // Phtml
+ * $this->tag->textArea(['description', 'content']);
+ *
+ * // Sleet
+ * {{ text_area(['some', 'placeholder' => 'Say something']) }}
+ *
+ * // Phtml 
+ * $this->tag->img(['img/logo.png', 'Logo']);
+ *
+ * // Sleet 
+ * {{ image(['http://example.com/img/logo.png', 'Logo', 'local' => false]) }}
+ *
+ * // Phtml Add
+ * $this->tag->a(['post/add', 'Add', 'Add a post']);
+ *
+ * // Sleet Google
+ * {{ link_to(['http://google.com', 'Google', 'local' => false]) }}
+ *
+ * // Phtml
+ * $this->tag->link(['css/app.css']);
+ *
+ * // Sleet
+ * {{ link(['http://example.com/favicon.ico', 'type' => 'image/x-icon', 'rel' => 'icon', 'local' => false]) }}
+ *
+ * // Phtml
+ * $this->tag->script(['js/plugins.js']);
+ *
+ * // Sleet
+ * {{ script(['content' => 'alert("OK");']) }}
+ *
+ * // Sleet
+ * {{ style(['body { color: #444 }']) }}
+ *
+ * // Phtml
+ * $this->tag->meta(['ice, framework', 'keywords']);
+ *
+ * // Sleet
+ * {{ meta(['Your description', 'property': 'og:description']) }}
+ *
+ * $countries = [1 => 'England', 2 => 'Poland'];
+ * $this->tag->select('country', $countries);
+ *
+ * // Sleet
+ * {{ end_tag('form') }}
+ *
+ * $title = "Mess'd up --text-- just (to) stress /test/ ?our! `little` \\clean\\ url fun.ction!?-->";
+ * // 'messd-up-text-just-to-stress-test-our-little-clean-url-function'
+ * $friendly = $this->tag->friendlyTitle($title);
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'fullName' => 'required',
+ * 'email' => 'required|email',
+ * 'repeatEmail' => 'same:email',
+ * 'about' => 'required|length:10,5000',
+ * ]);
+ *
+ * $valid = $validation->validate($_POST);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rule('email', 'required|email');
+ * $validation->rule('content', [
+ * 'length' => [
+ * 'max' => 1000,
+ * 'messageMin' => 'Too long!',
+ * 'label' => 'Desctiption'
+ * ]
+ * ]);
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'username' => 'required|length:4,24|notIn:admin,user,root|unique:users',
+ * 'password' => 'required|length:5,32',
+ * 'repeatPassword' => 'same:password',
+ * 'email' => 'email',
+ * 'status' => 'required|digit|in:0,1,2',
+ * 'website' => 'url',
+ * 'title' => 'length:,100',
+ * 'age' => 'required|between:18,21',
+ * ]);
+ *
+ * // Get value for one field
+ * $validation->getValues('password');
+ *
+ * // Get values for multiple fields
+ * $validation->getValues(['fullName', 'about']);
+ *
+ * // Get all values
+ * $validation->getValues();
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'username' => 'alnum',
+ * 'prefix' => [
+ * 'alnum' => [
+ * 'message' => 'Field :field must be alphanumeric'
+ * ]
+ * ]
+ * ]);
+ *
+ * $valid = $validation->validate($_POST);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'username' => 'alpha',
+ * 'prefix' => [
+ * 'alpha' => [
+ * 'message' => 'Field :field must be alpha'
+ * ]
+ * ]
+ * ]);
+ *
+ * $valid = $validation->validate($_POST);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'age' => 'between:18,21',
+ * 'height' => [
+ * 'between' => [
+ * 'min' => 180,
+ * 'max' => 190,
+ * ]
+ * ]
+ * ]);
+ *
+ * $valid = $validation->validate($_POST);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'sort' => 'digit'
+ * ]);
+ *
+ * $valid = $validation->validate($_POST);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'e_mail' => 'email'
+ * ]);
+ *
+ * $valid = $validation->validate($_POST);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'picture' => [
+ * 'file' => [
+ * 'maxSize' => '6M',
+ * 'allowedTypes' => ['image/jpeg', 'image/png'],
+ * 'minResolution' => '400x300,
+ * 'maxResolution' => '1600x1200',
+ * ]
+ * ]
+ * ]);
+ *
+ * $valid = $validation->validate($_FILES);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'status' => 'in:1,2,3,4'
+ * ]);
+ *
+ * $valid = $validation->validate($_POST);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'title' => 'length:10,100',
+ * 'content' => [
+ * 'length' => [
+ * 'max' => 1000,
+ * 'messageMin' => 'Too long!',
+ * 'label' => 'Desctiption'
+ * ]
+ * ]
+ * ]);
+ *
+ * $valid = $validation->validate($_POST);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'status' => 'notIn:unactive,removed',
+ * 'username' => [
+ * 'notIn' => [
+ * 'values' => ['about', 'admin', 'user', 'root'],
+ * 'message' => 'Field :field is reserved',
+ * 'label' => 'Nick'
+ * ],
+ * ]
+ * ]);
+ *
+ * $valid = $validation->validate($_POST);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'username' => [
+ * 'regex' => [
+ * 'pattern' => '/[a-zA-Z][a-zA-Z0-9_-]{3,}/'
+ * ],
+ * ]
+ * ]);
+ *
+ * $valid = $validation->validate($_POST);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'username' => 'required'
+ * ]);
+ *
+ * $valid = $validation->validate($_POST);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'email' => 'required|email',
+ * 'repeatEmail' => 'same:email'
+ * ]);
+ *
+ * $valid = $validation->validate($_POST);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'userName' => [
+ * 'unique' => [
+ * 'from' => 'users',
+ * 'custom' => 'username'
+ * ],
+ * ]
+ * ]);
+ *
+ * $valid = $validation->validate($_POST);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'website' => 'url'
+ * ]);
+ *
+ * $valid = $validation->validate($_POST);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'repeatPassword' => [
+ * 'with' => [
+ * 'fields' => ['password'],
+ * ],
+ * ]
+ * ]);
+ *
+ * $valid = $validation->validate($_POST);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'password' => [
+ * 'without' => [
+ * 'fields' => ['newPassword'],
+ * ],
+ * ]
+ * ]);
+ *
+ * $valid = $validation->validate($_POST);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ * Copyright (c) 2014-2015 Ice Team." @@ -34,6 +34,8 @@ ZEND_BEGIN_MODULE_GLOBALS(ice) /** Function cache */ HashTable *fcache; + zephir_fcall_cache_entry *scache[ZEPHIR_MAX_CACHE_SLOTS]; + /* Cache enabled */ unsigned int cache_enabled; diff --git a/ice/arr.zep b/ice/arr.zep index 66c6d0bb..7d88e085 100644 --- a/ice/arr.zep +++ b/ice/arr.zep @@ -15,7 +15,7 @@ use ArrayIterator; class Arr implements \ArrayAccess, \Countable, \IteratorAggregate { - protected _data = [] { get }; + protected data = [] { get }; /** * Arr constructor. @@ -24,7 +24,7 @@ class Arr implements \ArrayAccess, \Countable, \IteratorAggregate */ public function __construct(array data = []) { - let this->_data = data; + let this->data = data; } /** @@ -35,7 +35,7 @@ class Arr implements \ArrayAccess, \Countable, \IteratorAggregate */ public function has(string key) -> boolean { - return isset this->_data[key]; + return isset this->data[key]; } /** @@ -44,13 +44,18 @@ class Arr implements \ArrayAccess, \Countable, \IteratorAggregate * * @param string key The data key * @param mixed defaultValue The value to return if data key does not exist + * @param boolean required Throw exception if key is required but doesn't exist * @return mixed */ - public function get(string key, var defaultValue = null) + public function get(string key, var defaultValue = null, boolean required = false) { var value; - if fetch value, this->_data[key] { + if required && !this->has(key) { + throw new Exception(sprintf("The '%s' key is required", key)); + } + + if fetch value, this->data[key] { return value; } @@ -66,7 +71,7 @@ class Arr implements \ArrayAccess, \Countable, \IteratorAggregate */ public function set(string key, var value) -> void { - let this->_data[key] = value; + let this->data[key] = value; } /** @@ -102,7 +107,7 @@ class Arr implements \ArrayAccess, \Countable, \IteratorAggregate */ public function setData(array! data = []) -> void { - let this->_data = data; + let this->data = data; } /** @@ -112,7 +117,7 @@ class Arr implements \ArrayAccess, \Countable, \IteratorAggregate */ public function keys() -> array { - return array_keys(this->_data); + return array_keys(this->data); } /** @@ -123,7 +128,7 @@ class Arr implements \ArrayAccess, \Countable, \IteratorAggregate */ public function remove(string key) -> void { - unset this->_data[key]; + unset this->data[key]; } /** @@ -133,7 +138,7 @@ class Arr implements \ArrayAccess, \Countable, \IteratorAggregate */ public function clear() -> void { - let this->_data = []; + let this->data = []; } /** @@ -143,7 +148,7 @@ class Arr implements \ArrayAccess, \Countable, \IteratorAggregate */ public function count() -> int { - return count(this->_data); + return count(this->data); } /** @@ -153,7 +158,7 @@ class Arr implements \ArrayAccess, \Countable, \IteratorAggregate */ public function getIterator() ->
+ * //Returns value from $params["id"] without sanitizing
+ * $id = $this->router->getParam("id");
+ *
+ * //Returns value from $params["title"] with sanitizing
+ * $title = $this->router->getParam("title", "escape|repeats");
+ *
+ * //Returns value from $params["id"] with a default value
+ * $id = $this->router->getParam("id", null, 150);
+ *
+ * // Get rules for one field
+ * $this->getRules('password');
+ *
+ * // Get rules for multiple fields
+ * $this->getRules(['fullName', 'about']);
+ *
+ * // Get all rules
+ * $this->getRules();
+ *
+ * // Phtml
+ * $this->tag->textField(['some', 'some_value']);
+ *
+ * // Sleet
+ * {{ text_field(['some', 'some_value', 'id' => 'some1', 'class' => 'field', 'style' => 'width: 100%']) }}
+ *
+ * // Phtml
+ * $this->tag->passwordField(['pass', 'class': 'form-control']);
+ *
+ * // Sleet
+ * {{ password_field(['pass', 'placeholder': 'My secret password']) }}
+ *
+ * // Phtml
+ * $this->tag->hiddenField(['secret', 'some value']);
+ *
+ * // Sleet
+ * {{ hidden_field(['secret', 'hidden value', 'id': 'my_id']) }}
+ *
+ * // Sleet
+ * {{ file_field(['some']) }}
+ *
+ * // Phtml
+ * $this->tag->submitButton(['some', 'Submit']);
+ *
+ * // Sleet
+ * {{ submit_button(['some', 'value' => 'Submit', 'id' => 'some1', 'class' => 'btn']) }}
+ *
+ * // Phtml
+ * $this->tag->button(['some', 'content']);
+ *
+ * // Sleet
+ * {{ button(['some', '+ ' . 'Submit', 'type' => 'button', 'id' => 'some1']) }}
+ *
+ * // Phtml
+ * $this->tag->checkField(['agree', 'yes']);
+ *
+ * // Sleet
+ * {{ check_field(['remember', 'on', 'checked': 'checked']) }}
+ *
+ * // Phtml
+ * $this->tag->radioField(['sex', 'male']);
+ *
+ * // Sleet
+ * {{ radio_field(['sex', 'female', 'checked': 'checked']) }}
+ *
+ * // Phtml
+ * // Phtml
+ * $this->tag->textArea(['description', 'content']);
+ *
+ * // Sleet
+ * {{ text_area(['some', 'placeholder' => 'Say something']) }}
+ *
+ * // Phtml
+ * $this->tag->img(['img/logo.png', 'Logo']);
+ *
+ * // Sleet
+ * {{ image(['http://example.com/img/logo.png', 'Logo', 'local' => false]) }}
+ *
+ * // Phtml Add
+ * $this->tag->a(['post/add', 'Add', 'Add a post']);
+ *
+ * // Sleet Google
+ * {{ link_to(['http://google.com', 'Google', 'local' => false]) }}
+ *
+ * // Phtml
+ * $this->tag->link(['css/app.css']);
+ *
+ * // Sleet
+ * {{ link(['http://example.com/favicon.ico', 'type' => 'image/x-icon', 'rel' => 'icon', 'local' => false]) }}
+ *
+ * // Phtml
+ * $this->tag->script(['js/plugins.js']);
+ *
+ * // Sleet
+ * {{ script(['content' => 'alert("OK");']) }}
+ *
+ * // Sleet
+ * {{ style(['body { color: #444 }']) }}
+ *
+ * // Phtml
+ * $this->tag->meta(['ice, framework', 'keywords']);
+ *
+ * // Sleet
+ * {{ meta(['Your description', 'property': 'og:description']) }}
+ *
+ * $countries = [1 => 'England', 2 => 'Poland'];
+ * $this->tag->select('country', $countries);
+ *
+ * // Sleet
+ * {{ end_tag('form') }}
+ *
+ * $title = "Mess'd up --text-- just (to) stress /test/ ?our! `little` \\clean\\ url fun.ction!?-->";
+ * // 'messd-up-text-just-to-stress-test-our-little-clean-url-function'
+ * $friendly = $this->tag->friendlyTitle($title);
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'fullName' => 'required',
+ * 'email' => 'required|email',
+ * 'repeatEmail' => 'same:email',
+ * 'about' => 'required|length:10,5000',
+ * ]);
+ *
+ * $valid = $validation->validate($_POST);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rule('email', 'required|email');
+ * $validation->rule('content', [
+ * 'length' => [
+ * 'max' => 1000,
+ * 'messageMin' => 'Too long!',
+ * 'label' => 'Desctiption'
+ * ]
+ * ]);
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'username' => 'required|length:4,24|notIn:admin,user,root|unique:users',
+ * 'password' => 'required|length:5,32',
+ * 'repeatPassword' => 'same:password',
+ * 'email' => 'email',
+ * 'status' => 'required|digit|in:0,1,2',
+ * 'website' => 'url',
+ * 'title' => 'length:,100',
+ * 'age' => 'required|between:18,21',
+ * ]);
+ *
+ * // Get value for one field
+ * $validation->getValues('password');
+ *
+ * // Get values for multiple fields
+ * $validation->getValues(['fullName', 'about']);
+ *
+ * // Get all values
+ * $validation->getValues();
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'username' => 'alnum',
+ * 'prefix' => [
+ * 'alnum' => [
+ * 'message' => 'Field :field must be alphanumeric'
+ * ]
+ * ]
+ * ]);
+ *
+ * $valid = $validation->validate($_POST);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'username' => 'alpha',
+ * 'prefix' => [
+ * 'alpha' => [
+ * 'message' => 'Field :field must be alpha'
+ * ]
+ * ]
+ * ]);
+ *
+ * $valid = $validation->validate($_POST);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'age' => 'between:18,21',
+ * 'height' => [
+ * 'between' => [
+ * 'min' => 180,
+ * 'max' => 190,
+ * ]
+ * ]
+ * ]);
+ *
+ * $valid = $validation->validate($_POST);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'sort' => 'digit'
+ * ]);
+ *
+ * $valid = $validation->validate($_POST);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'e_mail' => 'email'
+ * ]);
+ *
+ * $valid = $validation->validate($_POST);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'picture' => [
+ * 'file' => [
+ * 'maxSize' => '6M',
+ * 'allowedTypes' => ['image/jpeg', 'image/png'],
+ * 'minResolution' => '400x300,
+ * 'maxResolution' => '1600x1200',
+ * ]
+ * ]
+ * ]);
+ *
+ * $valid = $validation->validate($_FILES);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'status' => 'in:1,2,3,4'
+ * ]);
+ *
+ * $valid = $validation->validate($_POST);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'title' => 'length:10,100',
+ * 'content' => [
+ * 'length' => [
+ * 'max' => 1000,
+ * 'messageMin' => 'Too long!',
+ * 'label' => 'Desctiption'
+ * ]
+ * ]
+ * ]);
+ *
+ * $valid = $validation->validate($_POST);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'status' => 'notIn:unactive,removed',
+ * 'username' => [
+ * 'notIn' => [
+ * 'values' => ['about', 'admin', 'user', 'root'],
+ * 'message' => 'Field :field is reserved',
+ * 'label' => 'Nick'
+ * ],
+ * ]
+ * ]);
+ *
+ * $valid = $validation->validate($_POST);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'username' => [
+ * 'regex' => [
+ * 'pattern' => '/[a-zA-Z][a-zA-Z0-9_-]{3,}/'
+ * ],
+ * ]
+ * ]);
+ *
+ * $valid = $validation->validate($_POST);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'username' => 'required'
+ * ]);
+ *
+ * $valid = $validation->validate($_POST);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'email' => 'required|email',
+ * 'repeatEmail' => 'same:email'
+ * ]);
+ *
+ * $valid = $validation->validate($_POST);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'userName' => [
+ * 'unique' => [
+ * 'from' => 'users',
+ * 'custom' => 'username'
+ * ],
+ * ]
+ * ]);
+ *
+ * $valid = $validation->validate($_POST);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'website' => 'url'
+ * ]);
+ *
+ * $valid = $validation->validate($_POST);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'repeatPassword' => [
+ * 'with' => [
+ * 'fields' => ['password'],
+ * ],
+ * ]
+ * ]);
+ *
+ * $valid = $validation->validate($_POST);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *
+ * $validation = new Ice\Validation();
+ *
+ * $validation->rules([
+ * 'password' => [
+ * 'without' => [
+ * 'fields' => ['newPassword'],
+ * ],
+ * ]
+ * ]);
+ *
+ * $valid = $validation->validate($_POST);
+ *
+ * if (!$valid) {
+ * $messages = $validation->getMessages();
+ * }
+ *