From 6e107d1e2836d7129761fb13385ed704187c5978 Mon Sep 17 00:00:00 2001 From: Andres Gutierrez Date: Wed, 4 May 2016 11:27:48 -0500 Subject: [PATCH] Regenerating builds [ci skip] --- build/32bits/phalcon.zep.c | 3823 ++++++++++++++++++++---------------- build/32bits/phalcon.zep.h | 101 +- build/32bits/php_phalcon.h | 4 +- build/64bits/phalcon.zep.c | 3823 ++++++++++++++++++++---------------- build/64bits/phalcon.zep.h | 101 +- build/64bits/php_phalcon.h | 4 +- build/safe/phalcon.zep.c | 3823 ++++++++++++++++++++---------------- build/safe/phalcon.zep.h | 101 +- build/safe/php_phalcon.h | 4 +- 9 files changed, 6645 insertions(+), 5139 deletions(-) diff --git a/build/32bits/phalcon.zep.c b/build/32bits/phalcon.zep.c index f26ad3f593b..20fc73e6041 100644 --- a/build/32bits/phalcon.zep.c +++ b/build/32bits/phalcon.zep.c @@ -2219,8 +2219,8 @@ static void zephir_fast_strip_tags(zval *return_value, zval *str); static void zephir_fast_strtoupper(zval *return_value, zval *str); /** Camelize/Uncamelize */ -static void zephir_camelize(zval *return_value, const zval *str); -static void zephir_uncamelize(zval *return_value, const zval *str); +static void zephir_camelize(zval *return_value, const zval *str, const zval *delimiter); +static void zephir_uncamelize(zval *return_value, const zval *str, const zval *delimiter); /** Starts/Ends with */ static int zephir_start_with(const zval *str, const zval *compared, zval *case_sensitive); @@ -9671,17 +9671,26 @@ static void zephir_fast_join_str(zval *return_value, char *glue, unsigned int gl } } -static void zephir_camelize(zval *return_value, const zval *str) { +static void zephir_camelize(zval *return_value, const zval *str, const zval *delimiter) { int i, len, first = 0; smart_str camelize_str = {0}; - char *marker, ch; + char *marker, ch, delim; if (unlikely(Z_TYPE_P(str) != IS_STRING)) { zend_error(E_WARNING, "Invalid arguments supplied for camelize()"); RETURN_EMPTY_STRING(); } + if (delimiter == NULL || Z_TYPE_P(delimiter) == IS_NULL) { + delim = '_'; + } else if (Z_TYPE_P(delimiter) == IS_STRING && Z_STRLEN_P(delimiter) == 1) { + delim = *(Z_STRVAL_P(delimiter)); + } else { + zend_error(E_WARNING, "Second argument passed to the camelize() must be a string of one character"); + RETURN_EMPTY_STRING(); + } + marker = Z_STRVAL_P(str); len = Z_STRLEN_P(str); @@ -9691,7 +9700,7 @@ static void zephir_camelize(zval *return_value, const zval *str) { if (first == 0) { - if (ch == '-' || ch == '_') { + if (ch == delim) { continue; } @@ -9700,7 +9709,7 @@ static void zephir_camelize(zval *return_value, const zval *str) { continue; } - if (ch == '-' || ch == '_') { + if (ch == delim) { if (i != (len - 1)) { i++; ch = marker[i]; @@ -9721,15 +9730,24 @@ static void zephir_camelize(zval *return_value, const zval *str) { RETURN_EMPTY_STRING(); } -static void zephir_uncamelize(zval *return_value, const zval *str) { +static void zephir_uncamelize(zval *return_value, const zval *str, const zval *delimiter) { unsigned int i; smart_str uncamelize_str = {0}; - char *marker, ch; + char *marker, ch, delim; if (Z_TYPE_P(str) != IS_STRING) { zend_error(E_WARNING, "Invalid arguments supplied for uncamelize()"); - return; + RETURN_EMPTY_STRING(); + } + + if (delimiter == NULL || Z_TYPE_P(delimiter) == IS_NULL) { + delim = '_'; + } else if (Z_TYPE_P(delimiter) == IS_STRING && Z_STRLEN_P(delimiter) == 1) { + delim = *(Z_STRVAL_P(delimiter)); + } else { + zend_error(E_WARNING, "Second argument passed to the uncamelize() must be a string of one character"); + RETURN_EMPTY_STRING(); } marker = Z_STRVAL_P(str); @@ -9743,7 +9761,7 @@ static void zephir_uncamelize(zval *return_value, const zval *str) { if (ch >= 'A' && ch <= 'Z') { if (i > 0) { - smart_str_appendc(&uncamelize_str, '_'); + smart_str_appendc(&uncamelize_str, delim); } smart_str_appendc(&uncamelize_str, (*marker) + 32); } else { @@ -16996,7 +17014,7 @@ static PHP_METHOD(phalcon_0__closure, __invoke) { zephir_array_fetch_long(&_0, matches, 1, PH_NOISY | PH_READONLY, "phalcon/text.zep", 272 TSRMLS_CC); ZEPHIR_INIT_VAR(words); zephir_fast_explode_str(words, SL("|"), _0, LONG_MAX TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_2, "array_rand", NULL, 447, words); + ZEPHIR_CALL_FUNCTION(&_2, "array_rand", NULL, 444, words); zephir_check_call_status(); zephir_array_fetch(&_1, words, _2, PH_NOISY | PH_READONLY, "phalcon/text.zep", 273 TSRMLS_CC); RETURN_CTOR(_1); @@ -17902,7 +17920,7 @@ static PHP_METHOD(Phalcon_Crypt, encrypt) { zend_bool _3, _4; int ZEPHIR_LAST_CALL_STATUS, _2$$9; - zval *text_param = NULL, *key_param = NULL, *encryptKey = NULL, *ivSize = NULL, *iv = NULL, *cipher = NULL, *mode = NULL, *blockSize = NULL, *paddingType = NULL, *padded = NULL, _0, *_5 = NULL, *_1$$8 = NULL; + zval *text_param = NULL, *key_param = NULL, *encryptKey = NULL, *ivSize = NULL, *iv = NULL, *cipher = NULL, *mode = NULL, *blockSize = NULL, *paddingType = NULL, *padded = NULL, *_0, *_5 = NULL, *_1$$8 = NULL; zval *text = NULL, *key = NULL; ZEPHIR_MM_GROW(); @@ -17953,22 +17971,22 @@ static PHP_METHOD(Phalcon_Crypt, encrypt) { zephir_read_property_this(&cipher, this_ptr, SL("_cipher"), PH_NOISY_CC); ZEPHIR_OBS_VAR(mode); zephir_read_property_this(&mode, this_ptr, SL("_mode"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&ivSize, "mcrypt_get_iv_size", NULL, 135, cipher, mode); + ZEPHIR_CALL_FUNCTION(&ivSize, "mcrypt_get_iv_size", NULL, 0, cipher, mode); zephir_check_call_status(); if (ZEPHIR_LT_LONG(ivSize, zephir_fast_strlen_ev(encryptKey))) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_crypt_exception_ce, "Size of key is too large for this algorithm", "phalcon/crypt.zep", 319); return; } - ZEPHIR_SINIT_VAR(_0); - ZVAL_LONG(&_0, 2); - ZEPHIR_CALL_FUNCTION(&iv, "mcrypt_create_iv", NULL, 136, ivSize, &_0); + ZEPHIR_INIT_VAR(_0); + ZEPHIR_GET_CONSTANT(_0, "MCRYPT_RAND"); + ZEPHIR_CALL_FUNCTION(&iv, "mcrypt_create_iv", NULL, 0, ivSize, _0); zephir_check_call_status(); if (Z_TYPE_P(iv) != IS_STRING) { ZEPHIR_CALL_FUNCTION(&_1$$8, "strval", NULL, 21, iv); zephir_check_call_status(); ZEPHIR_CPY_WRT(iv, _1$$8); } - ZEPHIR_CALL_FUNCTION(&blockSize, "mcrypt_get_block_size", NULL, 137, cipher, mode); + ZEPHIR_CALL_FUNCTION(&blockSize, "mcrypt_get_block_size", NULL, 0, cipher, mode); zephir_check_call_status(); if (Z_TYPE_P(blockSize) != IS_LONG) { _2$$9 = zephir_get_intval(blockSize); @@ -17991,7 +18009,7 @@ static PHP_METHOD(Phalcon_Crypt, encrypt) { } else { ZEPHIR_CPY_WRT(padded, text); } - ZEPHIR_CALL_FUNCTION(&_5, "mcrypt_encrypt", NULL, 138, cipher, encryptKey, padded, mode, iv); + ZEPHIR_CALL_FUNCTION(&_5, "mcrypt_encrypt", NULL, 0, cipher, encryptKey, padded, mode, iv); zephir_check_call_status(); ZEPHIR_CONCAT_VV(return_value, iv, _5); RETURN_MM(); @@ -18041,7 +18059,7 @@ static PHP_METHOD(Phalcon_Crypt, decrypt) { zephir_read_property_this(&cipher, this_ptr, SL("_cipher"), PH_NOISY_CC); ZEPHIR_OBS_VAR(mode); zephir_read_property_this(&mode, this_ptr, SL("_mode"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&ivSize, "mcrypt_get_iv_size", NULL, 135, cipher, mode); + ZEPHIR_CALL_FUNCTION(&ivSize, "mcrypt_get_iv_size", NULL, 0, cipher, mode); zephir_check_call_status(); ZEPHIR_INIT_VAR(keySize); ZVAL_LONG(keySize, zephir_fast_strlen_ev(decryptKey)); @@ -18061,9 +18079,9 @@ static PHP_METHOD(Phalcon_Crypt, decrypt) { ZVAL_LONG(&_1, 0); ZEPHIR_INIT_VAR(_2); zephir_substr(_2, text, 0 , zephir_get_intval(ivSize), 0); - ZEPHIR_CALL_FUNCTION(&decrypted, "mcrypt_decrypt", NULL, 139, cipher, decryptKey, _0, mode, _2); + ZEPHIR_CALL_FUNCTION(&decrypted, "mcrypt_decrypt", NULL, 0, cipher, decryptKey, _0, mode, _2); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&blockSize, "mcrypt_get_block_size", NULL, 137, cipher, mode); + ZEPHIR_CALL_FUNCTION(&blockSize, "mcrypt_get_block_size", NULL, 0, cipher, mode); zephir_check_call_status(); ZEPHIR_OBS_VAR(paddingType); zephir_read_property_this(&paddingType, this_ptr, SL("_padding"), PH_NOISY_CC); @@ -18198,7 +18216,7 @@ static PHP_METHOD(Phalcon_Crypt, getAvailableCiphers) { ZEPHIR_MM_GROW(); - ZEPHIR_RETURN_CALL_FUNCTION("mcrypt_list_algorithms", NULL, 140); + ZEPHIR_RETURN_CALL_FUNCTION("mcrypt_list_algorithms", NULL, 135); zephir_check_call_status(); RETURN_MM(); @@ -18210,7 +18228,7 @@ static PHP_METHOD(Phalcon_Crypt, getAvailableModes) { ZEPHIR_MM_GROW(); - ZEPHIR_RETURN_CALL_FUNCTION("mcrypt_list_modes", NULL, 141); + ZEPHIR_RETURN_CALL_FUNCTION("mcrypt_list_modes", NULL, 136); zephir_check_call_status(); RETURN_MM(); @@ -18506,7 +18524,7 @@ static PHP_METHOD(Phalcon_Debug, listenExceptions) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "onUncaughtException", 1); zephir_array_fast_append(_0, _1); - ZEPHIR_CALL_FUNCTION(NULL, "set_exception_handler", NULL, 151, _0); + ZEPHIR_CALL_FUNCTION(NULL, "set_exception_handler", NULL, 146, _0); zephir_check_call_status(); RETURN_THIS(); @@ -18526,7 +18544,7 @@ static PHP_METHOD(Phalcon_Debug, listenLowSeverity) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "onUncaughtLowSeverity", 1); zephir_array_fast_append(_0, _1); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 152, _0); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 147, _0); zephir_check_call_status(); ZEPHIR_INIT_VAR(_2); zephir_create_array(_2, 2, 0 TSRMLS_CC); @@ -18534,7 +18552,7 @@ static PHP_METHOD(Phalcon_Debug, listenLowSeverity) { ZEPHIR_INIT_NVAR(_1); ZVAL_STRING(_1, "onUncaughtException", 1); zephir_array_fast_append(_2, _1); - ZEPHIR_CALL_FUNCTION(NULL, "set_exception_handler", NULL, 151, _2); + ZEPHIR_CALL_FUNCTION(NULL, "set_exception_handler", NULL, 146, _2); zephir_check_call_status(); RETURN_THIS(); @@ -18570,7 +18588,7 @@ static PHP_METHOD(Phalcon_Debug, debugVar) { ZEPHIR_INIT_VAR(_0); zephir_create_array(_0, 3, 0 TSRMLS_CC); zephir_array_fast_append(_0, varz); - ZEPHIR_CALL_FUNCTION(&_1, "debug_backtrace", NULL, 153); + ZEPHIR_CALL_FUNCTION(&_1, "debug_backtrace", NULL, 148); zephir_check_call_status(); zephir_array_fast_append(_0, _1); ZEPHIR_INIT_VAR(_2); @@ -18611,7 +18629,7 @@ static PHP_METHOD(Phalcon_Debug, _escapeString) { ZVAL_LONG(&_3$$3, 2); ZEPHIR_SINIT_VAR(_4$$3); ZVAL_STRING(&_4$$3, "utf-8", 0); - ZEPHIR_RETURN_CALL_FUNCTION("htmlentities", NULL, 154, _0$$3, &_3$$3, &_4$$3); + ZEPHIR_RETURN_CALL_FUNCTION("htmlentities", NULL, 149, _0$$3, &_3$$3, &_4$$3); zephir_check_call_status(); RETURN_MM(); } @@ -18676,7 +18694,7 @@ static PHP_METHOD(Phalcon_Debug, _getArrayDump) { if (Z_TYPE_P(v) == IS_ARRAY) { ZEPHIR_INIT_NVAR(_7$$9); ZVAL_LONG(_7$$9, (zephir_get_numberval(n) + 1)); - ZEPHIR_CALL_METHOD(&_6$$9, this_ptr, "_getarraydump", &_8, 155, v, _7$$9); + ZEPHIR_CALL_METHOD(&_6$$9, this_ptr, "_getarraydump", &_8, 150, v, _7$$9); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_9$$9); ZEPHIR_CONCAT_SVSVS(_9$$9, "[", k, "] => Array(", _6$$9, ")"); @@ -18749,7 +18767,7 @@ static PHP_METHOD(Phalcon_Debug, _getVarDump) { } } if (Z_TYPE_P(variable) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&_2$$11, this_ptr, "_getarraydump", &_1, 155, variable); + ZEPHIR_CALL_METHOD(&_2$$11, this_ptr, "_getarraydump", &_1, 150, variable); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, "Array(", _2$$11, ")"); RETURN_MM(); @@ -18770,7 +18788,7 @@ static PHP_METHOD(Phalcon_Debug, getMajorVersion) { ZEPHIR_MM_GROW(); - ZEPHIR_CALL_CE_STATIC(&_0, phalcon_version_ce, "get", &_1, 156); + ZEPHIR_CALL_CE_STATIC(&_0, phalcon_version_ce, "get", &_1, 151); zephir_check_call_status(); ZEPHIR_INIT_VAR(parts); zephir_fast_explode_str(parts, SL(" "), _0, LONG_MAX TSRMLS_CC); @@ -18789,7 +18807,7 @@ static PHP_METHOD(Phalcon_Debug, getVersion) { ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmajorversion", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_CE_STATIC(&_1, phalcon_version_ce, "get", &_2, 156); + ZEPHIR_CALL_CE_STATIC(&_1, phalcon_version_ce, "get", &_2, 151); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "
Phalcon Framework ", _1, "
"); RETURN_MM(); @@ -18882,7 +18900,7 @@ static PHP_METHOD(Phalcon_Debug, showTraceItem) { object_init_ex(classReflection, zephir_get_internal_ce(SS("reflectionclass") TSRMLS_CC)); ZEPHIR_CALL_METHOD(NULL, classReflection, "__construct", NULL, 66, className); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_8$$5, classReflection, "isinternal", NULL, 157); + ZEPHIR_CALL_METHOD(&_8$$5, classReflection, "isinternal", NULL, 152); zephir_check_call_status(); if (zephir_is_true(_8$$5)) { ZEPHIR_INIT_VAR(_9$$6); @@ -18915,9 +18933,9 @@ static PHP_METHOD(Phalcon_Debug, showTraceItem) { if ((zephir_function_exists(functionName TSRMLS_CC) == SUCCESS)) { ZEPHIR_INIT_VAR(functionReflection); object_init_ex(functionReflection, zephir_get_internal_ce(SS("reflectionfunction") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, functionReflection, "__construct", NULL, 158, functionName); + ZEPHIR_CALL_METHOD(NULL, functionReflection, "__construct", NULL, 153, functionName); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_16$$10, functionReflection, "isinternal", NULL, 159); + ZEPHIR_CALL_METHOD(&_16$$10, functionReflection, "isinternal", NULL, 154); zephir_check_call_status(); if (zephir_is_true(_16$$10)) { ZEPHIR_SINIT_VAR(_17$$11); @@ -18978,7 +18996,7 @@ static PHP_METHOD(Phalcon_Debug, showTraceItem) { ZEPHIR_OBS_VAR(showFiles); zephir_read_property_this(&showFiles, this_ptr, SL("_showFiles"), PH_NOISY_CC); if (zephir_is_true(showFiles)) { - ZEPHIR_CALL_FUNCTION(&lines, "file", NULL, 160, filez); + ZEPHIR_CALL_FUNCTION(&lines, "file", NULL, 155, filez); zephir_check_call_status(); ZEPHIR_INIT_VAR(numberLines); ZVAL_LONG(numberLines, zephir_fast_count_int(lines TSRMLS_CC)); @@ -19061,7 +19079,7 @@ static PHP_METHOD(Phalcon_Debug, showTraceItem) { ZVAL_LONG(&_49$$31, 2); ZEPHIR_SINIT_NVAR(_50$$31); ZVAL_STRING(&_50$$31, "UTF-8", 0); - ZEPHIR_CALL_FUNCTION(&_51$$31, "htmlentities", &_52, 154, _46$$31, &_49$$31, &_50$$31); + ZEPHIR_CALL_FUNCTION(&_51$$31, "htmlentities", &_52, 149, _46$$31, &_49$$31, &_50$$31); zephir_check_call_status(); zephir_concat_self(&html, _51$$31 TSRMLS_CC); } @@ -19085,7 +19103,7 @@ static PHP_METHOD(Phalcon_Debug, onUncaughtLowSeverity) { - ZEPHIR_CALL_FUNCTION(&_0, "error_reporting", NULL, 161); + ZEPHIR_CALL_FUNCTION(&_0, "error_reporting", NULL, 156); zephir_check_call_status(); ZEPHIR_SINIT_VAR(_1); zephir_bitwise_and_function(&_1, _0, severity TSRMLS_CC); @@ -19094,7 +19112,7 @@ static PHP_METHOD(Phalcon_Debug, onUncaughtLowSeverity) { object_init_ex(_2$$3, zephir_get_internal_ce(SS("errorexception") TSRMLS_CC)); ZEPHIR_INIT_VAR(_3$$3); ZVAL_LONG(_3$$3, 0); - ZEPHIR_CALL_METHOD(NULL, _2$$3, "__construct", NULL, 162, message, _3$$3, severity, file, line); + ZEPHIR_CALL_METHOD(NULL, _2$$3, "__construct", NULL, 157, message, _3$$3, severity, file, line); zephir_check_call_status(); zephir_throw_exception_debug(_2$$3, "phalcon/debug.zep", 566 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -19119,7 +19137,7 @@ static PHP_METHOD(Phalcon_Debug, onUncaughtException) { - ZEPHIR_CALL_FUNCTION(&obLevel, "ob_get_level", NULL, 163); + ZEPHIR_CALL_FUNCTION(&obLevel, "ob_get_level", NULL, 158); zephir_check_call_status(); if (ZEPHIR_GT_LONG(obLevel, 0)) { ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 122); @@ -19186,7 +19204,7 @@ static PHP_METHOD(Phalcon_Debug, onUncaughtException) { ) { ZEPHIR_GET_HMKEY(n, _12$$5, _11$$5); ZEPHIR_GET_HVALUE(traceItem, _13$$5); - ZEPHIR_CALL_METHOD(&_14$$7, this_ptr, "showtraceitem", &_15, 164, n, traceItem); + ZEPHIR_CALL_METHOD(&_14$$7, this_ptr, "showtraceitem", &_15, 159, n, traceItem); zephir_check_call_status(); zephir_concat_self(&html, _14$$7 TSRMLS_CC); } @@ -19205,7 +19223,7 @@ static PHP_METHOD(Phalcon_Debug, onUncaughtException) { ZEPHIR_CONCAT_SVSVS(_19$$9, "", keyRequest, "", value, ""); zephir_concat_self(&html, _19$$9 TSRMLS_CC); } else { - ZEPHIR_CALL_FUNCTION(&_20$$10, "print_r", &_21, 165, value, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(&_20$$10, "print_r", &_21, 160, value, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_22$$10); ZEPHIR_CONCAT_SVSVS(_22$$10, "", keyRequest, "", _20$$10, ""); @@ -19231,7 +19249,7 @@ static PHP_METHOD(Phalcon_Debug, onUncaughtException) { zephir_concat_self_str(&html, SL("") TSRMLS_CC); zephir_concat_self_str(&html, SL("
") TSRMLS_CC); zephir_concat_self_str(&html, SL("") TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_29$$5, "get_included_files", NULL, 166); + ZEPHIR_CALL_FUNCTION(&_29$$5, "get_included_files", NULL, 161); zephir_check_call_status(); zephir_is_iterable(_29$$5, &_31$$5, &_30$$5, 0, 0, "phalcon/debug.zep", 694); for ( @@ -19246,7 +19264,7 @@ static PHP_METHOD(Phalcon_Debug, onUncaughtException) { } zephir_concat_self_str(&html, SL("
#Path
") TSRMLS_CC); zephir_concat_self_str(&html, SL("
") TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_34$$5, "memory_get_usage", NULL, 167, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(&_34$$5, "memory_get_usage", NULL, 162, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); ZEPHIR_INIT_VAR(_35$$5); ZEPHIR_CONCAT_SVS(_35$$5, ""); @@ -20458,10 +20476,10 @@ static PHP_METHOD(Phalcon_Dispatcher, getReturnedValue) { static PHP_METHOD(Phalcon_Dispatcher, dispatch) { - zval *_49$$39 = NULL; - zval *value = NULL, *handler = NULL, *dependencyInjector = NULL, *namespaceName = NULL, *handlerName = NULL, *actionName = NULL, *params = NULL, *eventsManager = NULL, *actionSuffix = NULL, *handlerClass = NULL, *status = NULL, *actionMethod = NULL, *e = NULL, *_0, *_1$$3, *_2$$3, *_3$$4 = NULL, *_4$$4, *_5$$7 = NULL, *_6$$7 = NULL, *_10$$8 = NULL, *_11$$8 = NULL, *_13$$8, *_14$$6 = NULL, *_16$$12 = NULL, *_17$$12 = NULL, *_19$$13, *_22$$16 = NULL, *_23$$16 = NULL, *_25$$17, *_26$$19 = NULL, *_27$$19 = NULL, *_29$$20, *_30$$23 = NULL, *_31$$23 = NULL, *_33$$23, *_34$$22 = NULL, *_35$$22 = NULL, *_37$$26, *_38$$28 = NULL, *_39$$28 = NULL, *_41$$28, *_42$$31 = NULL, *_43$$31, *_44$$36 = NULL, *_45$$36 = NULL, *_47$$36, *_48$$39 = NULL, *_50$$40 = NULL, *_52$$41, *_53$$44 = NULL, *_54$$44 = NULL, *_56$$44, *_58$$47 = NULL, *_59$$47, *_60$$50; + zval *_30$$6 = NULL, *_50$$39 = NULL; + zval *value = NULL, *handler = NULL, *dependencyInjector = NULL, *namespaceName = NULL, *handlerName = NULL, *actionName = NULL, *params = NULL, *eventsManager = NULL, *actionSuffix = NULL, *handlerClass = NULL, *status = NULL, *actionMethod = NULL, *e = NULL, *_0, *_1$$3, *_2$$3, *_3$$4 = NULL, *_4$$4, *_5$$7 = NULL, *_6$$7 = NULL, *_10$$8 = NULL, *_11$$8 = NULL, *_13$$8, *_14$$6 = NULL, *_16$$12 = NULL, *_17$$12 = NULL, *_19$$13, *_22$$16 = NULL, *_23$$16 = NULL, *_25$$17, *_26$$19 = NULL, *_27$$19 = NULL, *_29$$20, *_31$$23 = NULL, *_32$$23 = NULL, *_34$$23, *_35$$22 = NULL, *_36$$22 = NULL, *_38$$26, *_39$$28 = NULL, *_40$$28 = NULL, *_42$$28, *_43$$31 = NULL, *_44$$31, *_45$$36 = NULL, *_46$$36 = NULL, *_48$$36, *_49$$39 = NULL, *_51$$40 = NULL, *_53$$41, *_54$$44 = NULL, *_55$$44 = NULL, *_57$$44, *_59$$47 = NULL, *_60$$47, *_61$$50; zend_bool hasService = 0, wasFresh; - zephir_fcall_cache_entry *_7 = NULL, *_8 = NULL, *_9 = NULL, *_12 = NULL, *_15 = NULL, *_18 = NULL, *_20 = NULL, *_21 = NULL, *_24 = NULL, *_28 = NULL, *_32 = NULL, *_36 = NULL, *_40 = NULL, *_46 = NULL, *_51 = NULL, *_55 = NULL, *_57 = NULL; + zephir_fcall_cache_entry *_7 = NULL, *_8 = NULL, *_9 = NULL, *_12 = NULL, *_15 = NULL, *_18 = NULL, *_20 = NULL, *_21 = NULL, *_24 = NULL, *_28 = NULL, *_33 = NULL, *_37 = NULL, *_41 = NULL, *_47 = NULL, *_52 = NULL, *_56 = NULL, *_58 = NULL; int ZEPHIR_LAST_CALL_STATUS, numberDispatches = 0; ZEPHIR_MM_GROW(); @@ -20613,57 +20631,61 @@ static PHP_METHOD(Phalcon_Dispatcher, dispatch) { } ZEPHIR_INIT_NVAR(actionMethod); ZEPHIR_CONCAT_VV(actionMethod, actionName, actionSuffix); - if (!((zephir_method_exists(handler, actionMethod TSRMLS_CC) == SUCCESS))) { + ZEPHIR_INIT_NVAR(_30$$6); + zephir_create_array(_30$$6, 2, 0 TSRMLS_CC); + zephir_array_fast_append(_30$$6, handler); + zephir_array_fast_append(_30$$6, actionMethod); + if (!(zephir_is_callable(_30$$6 TSRMLS_CC))) { if (Z_TYPE_P(eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_NVAR(_31$$23); - ZVAL_STRING(_31$$23, "dispatch:beforeNotFoundAction", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(&_30$$23, eventsManager, "fire", &_32, 0, _31$$23, this_ptr); - zephir_check_temp_parameter(_31$$23); + ZEPHIR_INIT_NVAR(_32$$23); + ZVAL_STRING(_32$$23, "dispatch:beforeNotFoundAction", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(&_31$$23, eventsManager, "fire", &_33, 0, _32$$23, this_ptr); + zephir_check_temp_parameter(_32$$23); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(_30$$23)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(_31$$23)) { continue; } - _33$$23 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); - if (ZEPHIR_IS_FALSE_IDENTICAL(_33$$23)) { + _34$$23 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); + if (ZEPHIR_IS_FALSE_IDENTICAL(_34$$23)) { continue; } } - ZEPHIR_INIT_LNVAR(_34$$22); - ZEPHIR_CONCAT_SVSVS(_34$$22, "Action '", actionName, "' was not found on handler '", handlerName, "'"); - ZEPHIR_INIT_NVAR(_35$$22); - ZVAL_LONG(_35$$22, 5); - ZEPHIR_CALL_METHOD(&status, this_ptr, "_throwdispatchexception", &_36, 0, _34$$22, _35$$22); + ZEPHIR_INIT_LNVAR(_35$$22); + ZEPHIR_CONCAT_SVSVS(_35$$22, "Action '", actionName, "' was not found on handler '", handlerName, "'"); + ZEPHIR_INIT_NVAR(_36$$22); + ZVAL_LONG(_36$$22, 5); + ZEPHIR_CALL_METHOD(&status, this_ptr, "_throwdispatchexception", &_37, 0, _35$$22, _36$$22); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(status)) { - _37$$26 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); - if (ZEPHIR_IS_FALSE_IDENTICAL(_37$$26)) { + _38$$26 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); + if (ZEPHIR_IS_FALSE_IDENTICAL(_38$$26)) { continue; } } break; } if (Z_TYPE_P(eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_NVAR(_39$$28); - ZVAL_STRING(_39$$28, "dispatch:beforeExecuteRoute", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(&_38$$28, eventsManager, "fire", &_40, 0, _39$$28, this_ptr); - zephir_check_temp_parameter(_39$$28); + ZEPHIR_INIT_NVAR(_40$$28); + ZVAL_STRING(_40$$28, "dispatch:beforeExecuteRoute", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(&_39$$28, eventsManager, "fire", &_41, 0, _40$$28, this_ptr); + zephir_check_temp_parameter(_40$$28); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(_38$$28)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(_39$$28)) { continue; } - _41$$28 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); - if (ZEPHIR_IS_FALSE_IDENTICAL(_41$$28)) { + _42$$28 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); + if (ZEPHIR_IS_FALSE_IDENTICAL(_42$$28)) { continue; } } if ((zephir_method_exists_ex(handler, SS("beforeexecuteroute") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_CALL_METHOD(&_42$$31, handler, "beforeexecuteroute", NULL, 0, this_ptr); + ZEPHIR_CALL_METHOD(&_43$$31, handler, "beforeexecuteroute", NULL, 0, this_ptr); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(_42$$31)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(_43$$31)) { continue; } - _43$$31 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); - if (ZEPHIR_IS_FALSE_IDENTICAL(_43$$31)) { + _44$$31 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); + if (ZEPHIR_IS_FALSE_IDENTICAL(_44$$31)) { continue; } } @@ -20673,32 +20695,32 @@ static PHP_METHOD(Phalcon_Dispatcher, dispatch) { zephir_check_call_status(); } if (zephir_is_true(eventsManager)) { - ZEPHIR_INIT_NVAR(_45$$36); - ZVAL_STRING(_45$$36, "dispatch:afterInitialize", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(&_44$$36, eventsManager, "fire", &_46, 0, _45$$36, this_ptr); - zephir_check_temp_parameter(_45$$36); + ZEPHIR_INIT_NVAR(_46$$36); + ZVAL_STRING(_46$$36, "dispatch:afterInitialize", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(&_45$$36, eventsManager, "fire", &_47, 0, _46$$36, this_ptr); + zephir_check_temp_parameter(_46$$36); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(_44$$36)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(_45$$36)) { continue; } - _47$$36 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); - if (ZEPHIR_IS_FALSE_IDENTICAL(_47$$36)) { + _48$$36 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); + if (ZEPHIR_IS_FALSE_IDENTICAL(_48$$36)) { continue; } } } + zephir_update_property_this(this_ptr, SL("_lastHandler"), handler TSRMLS_CC); /* try_start_1: */ - ZEPHIR_INIT_NVAR(_48$$39); ZEPHIR_INIT_NVAR(_49$$39); - zephir_create_array(_49$$39, 2, 0 TSRMLS_CC); - zephir_array_fast_append(_49$$39, handler); - zephir_array_fast_append(_49$$39, actionMethod); - ZEPHIR_CALL_USER_FUNC_ARRAY(_48$$39, _49$$39, params); + ZEPHIR_INIT_NVAR(_50$$39); + zephir_create_array(_50$$39, 2, 0 TSRMLS_CC); + zephir_array_fast_append(_50$$39, handler); + zephir_array_fast_append(_50$$39, actionMethod); + ZEPHIR_CALL_USER_FUNC_ARRAY(_49$$39, _50$$39, params); zephir_check_call_status_or_jump(try_end_1); - zephir_update_property_this(this_ptr, SL("_returnedValue"), _48$$39 TSRMLS_CC); - zephir_update_property_this(this_ptr, SL("_lastHandler"), handler TSRMLS_CC); + zephir_update_property_this(this_ptr, SL("_returnedValue"), _49$$39 TSRMLS_CC); try_end_1: @@ -20706,56 +20728,57 @@ static PHP_METHOD(Phalcon_Dispatcher, dispatch) { ZEPHIR_CPY_WRT(e, EG(exception)); if (zephir_instance_of_ev(e, zend_exception_get_default(TSRMLS_C) TSRMLS_CC)) { zend_clear_exception(TSRMLS_C); - ZEPHIR_CALL_METHOD(&_50$$40, this_ptr, "_handleexception", &_51, 0, e); + zephir_update_property_this(this_ptr, SL("_lastHandler"), handler TSRMLS_CC); + ZEPHIR_CALL_METHOD(&_51$$40, this_ptr, "_handleexception", &_52, 0, e); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(_50$$40)) { - _52$$41 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); - if (ZEPHIR_IS_FALSE_IDENTICAL(_52$$41)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(_51$$40)) { + _53$$41 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); + if (ZEPHIR_IS_FALSE_IDENTICAL(_53$$41)) { continue; } } else { - zephir_throw_exception_debug(e, "phalcon/dispatcher.zep", 518 TSRMLS_CC); + zephir_throw_exception_debug(e, "phalcon/dispatcher.zep", 522 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } } } if (Z_TYPE_P(eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_NVAR(_54$$44); - ZVAL_STRING(_54$$44, "dispatch:afterExecuteRoute", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(&_53$$44, eventsManager, "fire", &_55, 0, _54$$44, this_ptr, value); - zephir_check_temp_parameter(_54$$44); + ZEPHIR_INIT_NVAR(_55$$44); + ZVAL_STRING(_55$$44, "dispatch:afterExecuteRoute", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(&_54$$44, eventsManager, "fire", &_56, 0, _55$$44, this_ptr, value); + zephir_check_temp_parameter(_55$$44); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(_53$$44)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(_54$$44)) { continue; } - _56$$44 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); - if (ZEPHIR_IS_FALSE_IDENTICAL(_56$$44)) { + _57$$44 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); + if (ZEPHIR_IS_FALSE_IDENTICAL(_57$$44)) { continue; } - ZEPHIR_INIT_NVAR(_54$$44); - ZVAL_STRING(_54$$44, "dispatch:afterDispatch", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, eventsManager, "fire", &_57, 0, _54$$44, this_ptr); - zephir_check_temp_parameter(_54$$44); + ZEPHIR_INIT_NVAR(_55$$44); + ZVAL_STRING(_55$$44, "dispatch:afterDispatch", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(NULL, eventsManager, "fire", &_58, 0, _55$$44, this_ptr); + zephir_check_temp_parameter(_55$$44); zephir_check_call_status(); } if ((zephir_method_exists_ex(handler, SS("afterexecuteroute") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_CALL_METHOD(&_58$$47, handler, "afterexecuteroute", NULL, 0, this_ptr, value); + ZEPHIR_CALL_METHOD(&_59$$47, handler, "afterexecuteroute", NULL, 0, this_ptr, value); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(_58$$47)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(_59$$47)) { continue; } - _59$$47 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); - if (ZEPHIR_IS_FALSE_IDENTICAL(_59$$47)) { + _60$$47 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); + if (ZEPHIR_IS_FALSE_IDENTICAL(_60$$47)) { continue; } } } if (Z_TYPE_P(eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_VAR(_60$$50); - ZVAL_STRING(_60$$50, "dispatch:afterDispatchLoop", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, eventsManager, "fire", NULL, 0, _60$$50, this_ptr); - zephir_check_temp_parameter(_60$$50); + ZEPHIR_INIT_VAR(_61$$50); + ZVAL_STRING(_61$$50, "dispatch:afterDispatchLoop", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(NULL, eventsManager, "fire", NULL, 0, _61$$50, this_ptr); + zephir_check_temp_parameter(_61$$50); zephir_check_call_status(); } RETURN_CCTOR(handler); @@ -20839,9 +20862,9 @@ static PHP_METHOD(Phalcon_Dispatcher, getHandlerClass) { zephir_read_property_this(&handlerName, this_ptr, SL("_handlerName"), PH_NOISY_CC); ZEPHIR_OBS_VAR(namespaceName); zephir_read_property_this(&namespaceName, this_ptr, SL("_namespaceName"), PH_NOISY_CC); - if (!(zephir_memnstr_str(handlerName, SL("\\"), "phalcon/dispatcher.zep", 631))) { + if (!(zephir_memnstr_str(handlerName, SL("\\"), "phalcon/dispatcher.zep", 635))) { ZEPHIR_INIT_VAR(camelizedClass); - zephir_camelize(camelizedClass, handlerName); + zephir_camelize(camelizedClass, handlerName, NULL ); } else { ZEPHIR_CPY_WRT(camelizedClass, handlerName); } @@ -21046,13 +21069,13 @@ static PHP_METHOD(Phalcon_Escaper, detectEncoding) { ; zephir_hash_move_forward_ex(_3, &_2) ) { ZEPHIR_GET_HVALUE(charset, _4); - ZEPHIR_CALL_FUNCTION(&_5$$5, "mb_detect_encoding", &_6, 180, str, charset, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(&_5$$5, "mb_detect_encoding", &_6, 175, str, charset, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); if (zephir_is_true(_5$$5)) { RETURN_CCTOR(charset); } } - ZEPHIR_RETURN_CALL_FUNCTION("mb_detect_encoding", &_6, 180, str); + ZEPHIR_RETURN_CALL_FUNCTION("mb_detect_encoding", &_6, 175, str); zephir_check_call_status(); RETURN_MM(); @@ -21074,11 +21097,11 @@ static PHP_METHOD(Phalcon_Escaper, normalizeEncoding) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_escaper_exception_ce, "Extension 'mbstring' is required", "phalcon/escaper.zep", 128); return; } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "detectencoding", NULL, 181, str); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "detectencoding", NULL, 176, str); zephir_check_call_status(); ZEPHIR_SINIT_VAR(_1); ZVAL_STRING(&_1, "UTF-32", 0); - ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 182, str, &_1, _0); + ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 177, str, &_1, _0); zephir_check_call_status(); RETURN_MM(); @@ -21098,7 +21121,7 @@ static PHP_METHOD(Phalcon_Escaper, escapeHtml) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_htmlQuoteType"), PH_NOISY_CC); _1 = zephir_fetch_nproperty_this(this_ptr, SL("_encoding"), PH_NOISY_CC); - ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 183, text, _0, _1); + ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 178, text, _0, _1); zephir_check_call_status(); RETURN_MM(); @@ -21119,7 +21142,7 @@ static PHP_METHOD(Phalcon_Escaper, escapeHtmlAttr) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_encoding"), PH_NOISY_CC); ZEPHIR_SINIT_VAR(_1); ZVAL_LONG(&_1, 3); - ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 183, attribute, &_1, _0); + ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 178, attribute, &_1, _0); zephir_check_call_status(); RETURN_MM(); @@ -21137,7 +21160,7 @@ static PHP_METHOD(Phalcon_Escaper, escapeCss) { zephir_get_strval(css, css_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 184, css); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 179, css); zephir_check_call_status(); zephir_escape_css(return_value, _0); RETURN_MM(); @@ -21156,7 +21179,7 @@ static PHP_METHOD(Phalcon_Escaper, escapeJs) { zephir_get_strval(js, js_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 184, js); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 179, js); zephir_check_call_status(); zephir_escape_js(return_value, _0); RETURN_MM(); @@ -21175,7 +21198,7 @@ static PHP_METHOD(Phalcon_Escaper, escapeUrl) { zephir_get_strval(url, url_param); - ZEPHIR_RETURN_CALL_FUNCTION("rawurlencode", NULL, 185, url); + ZEPHIR_RETURN_CALL_FUNCTION("rawurlencode", NULL, 180, url); zephir_check_call_status(); RETURN_MM(); @@ -21452,16 +21475,16 @@ static PHP_METHOD(Phalcon_Filter, _sanitize) { if (ZEPHIR_IS_STRING(filter, "email")) { ZEPHIR_SINIT_VAR(_3$$5); ZVAL_STRING(&_3$$5, "FILTER_SANITIZE_EMAIL", 0); - ZEPHIR_CALL_FUNCTION(&_4$$5, "constant", NULL, 192, &_3$$5); + ZEPHIR_CALL_FUNCTION(&_4$$5, "constant", NULL, 187, &_3$$5); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", &_5, 193, value, _4$$5); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", &_5, 188, value, _4$$5); zephir_check_call_status(); RETURN_MM(); } if (ZEPHIR_IS_STRING(filter, "int")) { ZEPHIR_SINIT_VAR(_6$$6); ZVAL_LONG(&_6$$6, 519); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", &_5, 193, value, &_6$$6); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", &_5, 188, value, &_6$$6); zephir_check_call_status(); RETURN_MM(); } @@ -21471,14 +21494,14 @@ static PHP_METHOD(Phalcon_Filter, _sanitize) { if (ZEPHIR_IS_STRING(filter, "absint")) { ZEPHIR_SINIT_VAR(_7$$8); ZVAL_LONG(&_7$$8, zephir_get_intval(value)); - ZEPHIR_RETURN_CALL_FUNCTION("abs", NULL, 194, &_7$$8); + ZEPHIR_RETURN_CALL_FUNCTION("abs", NULL, 189, &_7$$8); zephir_check_call_status(); RETURN_MM(); } if (ZEPHIR_IS_STRING(filter, "string")) { ZEPHIR_SINIT_VAR(_8$$9); ZVAL_LONG(&_8$$9, 513); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", &_5, 193, value, &_8$$9); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", &_5, 188, value, &_8$$9); zephir_check_call_status(); RETURN_MM(); } @@ -21488,7 +21511,7 @@ static PHP_METHOD(Phalcon_Filter, _sanitize) { add_assoc_long_ex(_9$$10, SS("flags"), 4096); ZEPHIR_SINIT_VAR(_10$$10); ZVAL_LONG(&_10$$10, 520); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", &_5, 193, value, &_10$$10, _9$$10); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", &_5, 188, value, &_10$$10, _9$$10); zephir_check_call_status(); RETURN_MM(); } @@ -21511,13 +21534,13 @@ static PHP_METHOD(Phalcon_Filter, _sanitize) { RETURN_MM(); } if (ZEPHIR_IS_STRING(filter, "striptags")) { - ZEPHIR_RETURN_CALL_FUNCTION("strip_tags", NULL, 195, value); + ZEPHIR_RETURN_CALL_FUNCTION("strip_tags", NULL, 190, value); zephir_check_call_status(); RETURN_MM(); } if (ZEPHIR_IS_STRING(filter, "lower")) { if ((zephir_function_exists_ex(SS("mb_strtolower") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("mb_strtolower", NULL, 196, value); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strtolower", NULL, 191, value); zephir_check_call_status(); RETURN_MM(); } @@ -21526,7 +21549,7 @@ static PHP_METHOD(Phalcon_Filter, _sanitize) { } if (ZEPHIR_IS_STRING(filter, "upper")) { if ((zephir_function_exists_ex(SS("mb_strtoupper") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("mb_strtoupper", NULL, 197, value); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strtoupper", NULL, 192, value); zephir_check_call_status(); RETURN_MM(); } @@ -22315,7 +22338,7 @@ static PHP_METHOD(Phalcon_Loader, register) { ZEPHIR_INIT_VAR(_2$$3); ZVAL_STRING(_2$$3, "autoLoad", 1); zephir_array_fast_append(_1$$3, _2$$3); - ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_register", NULL, 287, _1$$3); + ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_register", NULL, 282, _1$$3); zephir_check_call_status(); if (1) { zephir_update_property_this(this_ptr, SL("_registered"), ZEPHIR_GLOBAL(global_true) TSRMLS_CC); @@ -22343,7 +22366,7 @@ static PHP_METHOD(Phalcon_Loader, unregister) { ZEPHIR_INIT_VAR(_2$$3); ZVAL_STRING(_2$$3, "autoLoad", 1); zephir_array_fast_append(_1$$3, _2$$3); - ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_unregister", NULL, 288, _1$$3); + ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_unregister", NULL, 283, _1$$3); zephir_check_call_status(); if (0) { zephir_update_property_this(this_ptr, SL("_registered"), ZEPHIR_GLOBAL(global_true) TSRMLS_CC); @@ -22454,7 +22477,7 @@ static PHP_METHOD(Phalcon_Loader, autoLoad) { zephir_check_temp_parameter(_12$$12); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_14$$11, "is_file", &_15, 289, filePath); + ZEPHIR_CALL_FUNCTION(&_14$$11, "is_file", &_15, 284, filePath); zephir_check_call_status(); if (zephir_is_true(_14$$11)) { if (Z_TYPE_P(eventsManager) == IS_OBJECT) { @@ -22525,7 +22548,7 @@ static PHP_METHOD(Phalcon_Loader, autoLoad) { zephir_check_temp_parameter(_31$$20); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_33$$19, "is_file", &_15, 289, filePath); + ZEPHIR_CALL_FUNCTION(&_33$$19, "is_file", &_15, 284, filePath); zephir_check_call_status(); if (zephir_is_true(_33$$19)) { if (Z_TYPE_P(eventsManager) == IS_OBJECT) { @@ -22583,7 +22606,7 @@ static PHP_METHOD(Phalcon_Loader, autoLoad) { zephir_check_temp_parameter(_45$$26); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_47$$25, "is_file", &_15, 289, filePath); + ZEPHIR_CALL_FUNCTION(&_47$$25, "is_file", &_15, 284, filePath); zephir_check_call_status(); if (zephir_is_true(_47$$25)) { if (Z_TYPE_P(eventsManager) == IS_OBJECT) { @@ -22834,7 +22857,7 @@ static PHP_METHOD(Phalcon_Registry, next) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_data"), PH_NOISY_CC); ZEPHIR_MAKE_REF(_0); - ZEPHIR_CALL_FUNCTION(NULL, "next", NULL, 391, _0); + ZEPHIR_CALL_FUNCTION(NULL, "next", NULL, 388, _0); ZEPHIR_UNREF(_0); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -22850,7 +22873,7 @@ static PHP_METHOD(Phalcon_Registry, key) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_data"), PH_NOISY_CC); ZEPHIR_MAKE_REF(_0); - ZEPHIR_RETURN_CALL_FUNCTION("key", NULL, 392, _0); + ZEPHIR_RETURN_CALL_FUNCTION("key", NULL, 389, _0); ZEPHIR_UNREF(_0); zephir_check_call_status(); RETURN_MM(); @@ -22866,7 +22889,7 @@ static PHP_METHOD(Phalcon_Registry, rewind) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_data"), PH_NOISY_CC); ZEPHIR_MAKE_REF(_0); - ZEPHIR_CALL_FUNCTION(NULL, "reset", NULL, 393, _0); + ZEPHIR_CALL_FUNCTION(NULL, "reset", NULL, 390, _0); ZEPHIR_UNREF(_0); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -22882,7 +22905,7 @@ static PHP_METHOD(Phalcon_Registry, valid) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_data"), PH_NOISY_CC); ZEPHIR_MAKE_REF(_0); - ZEPHIR_CALL_FUNCTION(&_1, "key", NULL, 392, _0); + ZEPHIR_CALL_FUNCTION(&_1, "key", NULL, 389, _0); ZEPHIR_UNREF(_0); zephir_check_call_status(); RETURN_MM_BOOL(Z_TYPE_P(_1) != IS_NULL); @@ -22898,7 +22921,7 @@ static PHP_METHOD(Phalcon_Registry, current) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_data"), PH_NOISY_CC); ZEPHIR_MAKE_REF(_0); - ZEPHIR_RETURN_CALL_FUNCTION("current", NULL, 394, _0); + ZEPHIR_RETURN_CALL_FUNCTION("current", NULL, 391, _0); ZEPHIR_UNREF(_0); zephir_check_call_status(); RETURN_MM(); @@ -22926,7 +22949,7 @@ static PHP_METHOD(Phalcon_Registry, __set) { } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "offsetset", NULL, 395, key, value); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "offsetset", NULL, 392, key, value); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -22953,7 +22976,7 @@ static PHP_METHOD(Phalcon_Registry, __get) { } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "offsetget", NULL, 396, key); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "offsetget", NULL, 393, key); zephir_check_call_status(); RETURN_MM(); @@ -22980,7 +23003,7 @@ static PHP_METHOD(Phalcon_Registry, __isset) { } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "offsetexists", NULL, 397, key); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "offsetexists", NULL, 394, key); zephir_check_call_status(); RETURN_MM(); @@ -23007,7 +23030,7 @@ static PHP_METHOD(Phalcon_Registry, __unset) { } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "offsetunset", NULL, 398, key); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "offsetunset", NULL, 395, key); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -23165,7 +23188,7 @@ static PHP_METHOD(Phalcon_Security, getSaltBytes) { ZEPHIR_INIT_NVAR(safeBytes); ZEPHIR_INIT_NVAR(_1$$5); ZVAL_LONG(_1$$5, numberBytes); - ZEPHIR_CALL_FUNCTION(&_2$$5, "openssl_random_pseudo_bytes", &_3, 399, _1$$5); + ZEPHIR_CALL_FUNCTION(&_2$$5, "openssl_random_pseudo_bytes", &_3, 396, _1$$5); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&_4$$5, "base64_encode", &_5, 116, _2$$5); zephir_check_call_status(); @@ -23257,7 +23280,7 @@ static PHP_METHOD(Phalcon_Security, hash) { } ZEPHIR_INIT_VAR(_5$$11); ZEPHIR_CONCAT_SVSV(_5$$11, "$", variant, "$", saltBytes); - ZEPHIR_RETURN_CALL_FUNCTION("crypt", &_6, 400, password, _5$$11); + ZEPHIR_RETURN_CALL_FUNCTION("crypt", &_6, 397, password, _5$$11); zephir_check_call_status(); RETURN_MM(); } @@ -23280,11 +23303,11 @@ static PHP_METHOD(Phalcon_Security, hash) { ZVAL_STRING(&_8$$13, "%02s", 0); ZEPHIR_SINIT_VAR(_9$$13); ZVAL_LONG(&_9$$13, workFactor); - ZEPHIR_CALL_FUNCTION(&_10$$13, "sprintf", NULL, 189, &_8$$13, &_9$$13); + ZEPHIR_CALL_FUNCTION(&_10$$13, "sprintf", NULL, 184, &_8$$13, &_9$$13); zephir_check_call_status(); ZEPHIR_INIT_VAR(_11$$13); ZEPHIR_CONCAT_SVSVSV(_11$$13, "$2", variant, "$", _10$$13, "$", saltBytes); - ZEPHIR_RETURN_CALL_FUNCTION("crypt", &_6, 400, password, _11$$13); + ZEPHIR_RETURN_CALL_FUNCTION("crypt", &_6, 397, password, _11$$13); zephir_check_call_status(); RETURN_MM(); } while(0); @@ -23324,7 +23347,7 @@ static PHP_METHOD(Phalcon_Security, checkHash) { RETURN_MM_BOOL(0); } } - ZEPHIR_CALL_FUNCTION(&_1, "crypt", NULL, 400, password, passwordHash); + ZEPHIR_CALL_FUNCTION(&_1, "crypt", NULL, 397, password, passwordHash); zephir_check_call_status(); zephir_get_strval(_2, _1); ZEPHIR_CPY_WRT(cryptedHash, _2); @@ -23388,7 +23411,7 @@ static PHP_METHOD(Phalcon_Security, getTokenKey) { ZEPHIR_INIT_VAR(safeBytes); ZEPHIR_INIT_VAR(_1); ZVAL_LONG(_1, numberBytes); - ZEPHIR_CALL_FUNCTION(&_2, "openssl_random_pseudo_bytes", NULL, 399, _1); + ZEPHIR_CALL_FUNCTION(&_2, "openssl_random_pseudo_bytes", NULL, 396, _1); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&_3, "base64_encode", NULL, 116, _2); zephir_check_call_status(); @@ -23430,7 +23453,7 @@ static PHP_METHOD(Phalcon_Security, getToken) { } ZEPHIR_INIT_VAR(_0); ZVAL_LONG(_0, numberBytes); - ZEPHIR_CALL_FUNCTION(&token, "openssl_random_pseudo_bytes", NULL, 399, _0); + ZEPHIR_CALL_FUNCTION(&token, "openssl_random_pseudo_bytes", NULL, 396, _0); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&_1, "base64_encode", NULL, 116, token); zephir_check_call_status(); @@ -23605,7 +23628,7 @@ static PHP_METHOD(Phalcon_Security, computeHmac) { ZEPHIR_SINIT_VAR(_0); ZVAL_BOOL(&_0, (raw ? 1 : 0)); - ZEPHIR_CALL_FUNCTION(&hmac, "hash_hmac", NULL, 401, algo, data, key, &_0); + ZEPHIR_CALL_FUNCTION(&hmac, "hash_hmac", NULL, 398, algo, data, key, &_0); zephir_check_call_status(); if (!(zephir_is_true(hmac))) { ZEPHIR_INIT_VAR(_1$$3); @@ -24393,7 +24416,7 @@ static PHP_METHOD(Phalcon_Tag, colorField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "color", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24413,7 +24436,7 @@ static PHP_METHOD(Phalcon_Tag, textField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "text", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24433,7 +24456,7 @@ static PHP_METHOD(Phalcon_Tag, numericField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "number", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24453,7 +24476,7 @@ static PHP_METHOD(Phalcon_Tag, rangeField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "range", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24473,7 +24496,7 @@ static PHP_METHOD(Phalcon_Tag, emailField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "email", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24493,7 +24516,7 @@ static PHP_METHOD(Phalcon_Tag, dateField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "date", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24513,7 +24536,7 @@ static PHP_METHOD(Phalcon_Tag, dateTimeField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "datetime", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24533,7 +24556,7 @@ static PHP_METHOD(Phalcon_Tag, dateTimeLocalField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "datetime-local", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24553,7 +24576,7 @@ static PHP_METHOD(Phalcon_Tag, monthField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "month", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24573,7 +24596,7 @@ static PHP_METHOD(Phalcon_Tag, timeField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "time", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24593,7 +24616,7 @@ static PHP_METHOD(Phalcon_Tag, weekField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "week", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24613,7 +24636,7 @@ static PHP_METHOD(Phalcon_Tag, passwordField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "password", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24633,7 +24656,7 @@ static PHP_METHOD(Phalcon_Tag, hiddenField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "hidden", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24653,7 +24676,7 @@ static PHP_METHOD(Phalcon_Tag, fileField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "file", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24673,7 +24696,7 @@ static PHP_METHOD(Phalcon_Tag, searchField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "search", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24693,7 +24716,7 @@ static PHP_METHOD(Phalcon_Tag, telField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "tel", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24713,7 +24736,7 @@ static PHP_METHOD(Phalcon_Tag, urlField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "url", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24733,7 +24756,7 @@ static PHP_METHOD(Phalcon_Tag, checkField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "checkbox", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfieldchecked", &_0, 414, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfieldchecked", &_0, 411, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24753,7 +24776,7 @@ static PHP_METHOD(Phalcon_Tag, radioField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "radio", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfieldchecked", &_0, 414, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfieldchecked", &_0, 411, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24775,7 +24798,7 @@ static PHP_METHOD(Phalcon_Tag, imageInput) { ZVAL_STRING(_1, "image", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_INIT_VAR(_2); ZVAL_BOOL(_2, 1); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters, _2); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters, _2); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24797,7 +24820,7 @@ static PHP_METHOD(Phalcon_Tag, submitButton) { ZVAL_STRING(_1, "submit", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_INIT_VAR(_2); ZVAL_BOOL(_2, 1); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters, _2); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters, _2); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24818,7 +24841,7 @@ static PHP_METHOD(Phalcon_Tag, selectStatic) { } - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_select_ce, "selectfield", &_0, 208, parameters, data); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_select_ce, "selectfield", &_0, 203, parameters, data); zephir_check_call_status(); RETURN_MM(); @@ -24838,7 +24861,7 @@ static PHP_METHOD(Phalcon_Tag, select) { } - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_select_ce, "selectfield", &_0, 208, parameters, data); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_select_ce, "selectfield", &_0, 203, parameters, data); zephir_check_call_status(); RETURN_MM(); @@ -25359,13 +25382,13 @@ static PHP_METHOD(Phalcon_Tag, friendlyTitle) { ZVAL_LONG(&_3$$3, 0); ZEPHIR_SINIT_VAR(_4$$3); ZVAL_STRING(&_4$$3, "en_US.UTF-8", 0); - ZEPHIR_CALL_FUNCTION(&locale, "setlocale", &_5, 415, &_3$$3, &_4$$3); + ZEPHIR_CALL_FUNCTION(&locale, "setlocale", &_5, 412, &_3$$3, &_4$$3); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_3$$3); ZVAL_STRING(&_3$$3, "UTF-8", 0); ZEPHIR_SINIT_NVAR(_4$$3); ZVAL_STRING(&_4$$3, "ASCII//TRANSLIT", 0); - ZEPHIR_CALL_FUNCTION(&_6$$3, "iconv", NULL, 371, &_3$$3, &_4$$3, text); + ZEPHIR_CALL_FUNCTION(&_6$$3, "iconv", NULL, 369, &_3$$3, &_4$$3, text); zephir_check_call_status(); zephir_get_strval(text, _6$$3); } @@ -25428,7 +25451,7 @@ static PHP_METHOD(Phalcon_Tag, friendlyTitle) { if (zephir_is_true(_19)) { ZEPHIR_SINIT_VAR(_20$$10); ZVAL_LONG(&_20$$10, 0); - ZEPHIR_CALL_FUNCTION(NULL, "setlocale", &_5, 415, &_20$$10, locale); + ZEPHIR_CALL_FUNCTION(NULL, "setlocale", &_5, 412, &_20$$10, locale); zephir_check_call_status(); } RETURN_CCTOR(friendly); @@ -25700,7 +25723,7 @@ static PHP_METHOD(Phalcon_Text, camelize) { ZEPHIR_INIT_VAR(_0); - zephir_camelize(_0, str); + zephir_camelize(_0, str, NULL ); RETURN_CCTOR(_0); } @@ -25726,7 +25749,7 @@ static PHP_METHOD(Phalcon_Text, uncamelize) { ZEPHIR_INIT_VAR(_0); - zephir_uncamelize(_0, str); + zephir_uncamelize(_0, str, NULL ); RETURN_CCTOR(_0); } @@ -25794,13 +25817,13 @@ static PHP_METHOD(Phalcon_Text, random) { ZVAL_STRING(&_0$$3, "a", 0); ZEPHIR_SINIT_VAR(_1$$3); ZVAL_STRING(&_1$$3, "z", 0); - ZEPHIR_CALL_FUNCTION(&_2$$3, "range", &_3, 418, &_0$$3, &_1$$3); + ZEPHIR_CALL_FUNCTION(&_2$$3, "range", &_3, 415, &_0$$3, &_1$$3); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_0$$3); ZVAL_STRING(&_0$$3, "A", 0); ZEPHIR_SINIT_NVAR(_1$$3); ZVAL_STRING(&_1$$3, "Z", 0); - ZEPHIR_CALL_FUNCTION(&_4$$3, "range", &_3, 418, &_0$$3, &_1$$3); + ZEPHIR_CALL_FUNCTION(&_4$$3, "range", &_3, 415, &_0$$3, &_1$$3); zephir_check_call_status(); ZEPHIR_INIT_VAR(pool); zephir_fast_array_merge(pool, &(_2$$3), &(_4$$3) TSRMLS_CC); @@ -25811,13 +25834,13 @@ static PHP_METHOD(Phalcon_Text, random) { ZVAL_LONG(&_5$$4, 0); ZEPHIR_SINIT_VAR(_6$$4); ZVAL_LONG(&_6$$4, 9); - ZEPHIR_CALL_FUNCTION(&_7$$4, "range", &_3, 418, &_5$$4, &_6$$4); + ZEPHIR_CALL_FUNCTION(&_7$$4, "range", &_3, 415, &_5$$4, &_6$$4); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_5$$4); ZVAL_STRING(&_5$$4, "a", 0); ZEPHIR_SINIT_NVAR(_6$$4); ZVAL_STRING(&_6$$4, "f", 0); - ZEPHIR_CALL_FUNCTION(&_8$$4, "range", &_3, 418, &_5$$4, &_6$$4); + ZEPHIR_CALL_FUNCTION(&_8$$4, "range", &_3, 415, &_5$$4, &_6$$4); zephir_check_call_status(); ZEPHIR_INIT_NVAR(pool); zephir_fast_array_merge(pool, &(_7$$4), &(_8$$4) TSRMLS_CC); @@ -25828,7 +25851,7 @@ static PHP_METHOD(Phalcon_Text, random) { ZVAL_LONG(&_9$$5, 0); ZEPHIR_SINIT_VAR(_10$$5); ZVAL_LONG(&_10$$5, 9); - ZEPHIR_CALL_FUNCTION(&pool, "range", &_3, 418, &_9$$5, &_10$$5); + ZEPHIR_CALL_FUNCTION(&pool, "range", &_3, 415, &_9$$5, &_10$$5); zephir_check_call_status(); break; } @@ -25837,7 +25860,7 @@ static PHP_METHOD(Phalcon_Text, random) { ZVAL_LONG(&_11$$6, 1); ZEPHIR_SINIT_VAR(_12$$6); ZVAL_LONG(&_12$$6, 9); - ZEPHIR_CALL_FUNCTION(&pool, "range", &_3, 418, &_11$$6, &_12$$6); + ZEPHIR_CALL_FUNCTION(&pool, "range", &_3, 415, &_11$$6, &_12$$6); zephir_check_call_status(); break; } @@ -25845,21 +25868,21 @@ static PHP_METHOD(Phalcon_Text, random) { ZVAL_LONG(&_13$$7, 0); ZEPHIR_SINIT_VAR(_14$$7); ZVAL_LONG(&_14$$7, 9); - ZEPHIR_CALL_FUNCTION(&_15$$7, "range", &_3, 418, &_13$$7, &_14$$7); + ZEPHIR_CALL_FUNCTION(&_15$$7, "range", &_3, 415, &_13$$7, &_14$$7); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_13$$7); ZVAL_STRING(&_13$$7, "a", 0); ZEPHIR_SINIT_NVAR(_14$$7); ZVAL_STRING(&_14$$7, "z", 0); - ZEPHIR_CALL_FUNCTION(&_16$$7, "range", &_3, 418, &_13$$7, &_14$$7); + ZEPHIR_CALL_FUNCTION(&_16$$7, "range", &_3, 415, &_13$$7, &_14$$7); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_13$$7); ZVAL_STRING(&_13$$7, "A", 0); ZEPHIR_SINIT_NVAR(_14$$7); ZVAL_STRING(&_14$$7, "Z", 0); - ZEPHIR_CALL_FUNCTION(&_17$$7, "range", &_3, 418, &_13$$7, &_14$$7); + ZEPHIR_CALL_FUNCTION(&_17$$7, "range", &_3, 415, &_13$$7, &_14$$7); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&pool, "array_merge", &_18, 419, _15$$7, _16$$7, _17$$7); + ZEPHIR_CALL_FUNCTION(&pool, "array_merge", &_18, 416, _15$$7, _16$$7, _17$$7); zephir_check_call_status(); break; } while(0); @@ -25965,7 +25988,7 @@ static PHP_METHOD(Phalcon_Text, lower) { if ((zephir_function_exists_ex(SS("mb_strtolower") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("mb_strtolower", NULL, 196, str, encoding); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strtolower", NULL, 191, str, encoding); zephir_check_call_status(); RETURN_MM(); } @@ -26011,7 +26034,7 @@ static PHP_METHOD(Phalcon_Text, upper) { if ((zephir_function_exists_ex(SS("mb_strtoupper") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("mb_strtoupper", NULL, 197, str, encoding); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strtoupper", NULL, 192, str, encoding); zephir_check_call_status(); RETURN_MM(); } @@ -26056,24 +26079,24 @@ static PHP_METHOD(Phalcon_Text, concat) { ZEPHIR_SINIT_VAR(_0); ZVAL_LONG(&_0, 0); - ZEPHIR_CALL_FUNCTION(&separator, "func_get_arg", &_1, 420, &_0); + ZEPHIR_CALL_FUNCTION(&separator, "func_get_arg", &_1, 417, &_0); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_0); ZVAL_LONG(&_0, 1); - ZEPHIR_CALL_FUNCTION(&a, "func_get_arg", &_1, 420, &_0); + ZEPHIR_CALL_FUNCTION(&a, "func_get_arg", &_1, 417, &_0); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_0); ZVAL_LONG(&_0, 2); - ZEPHIR_CALL_FUNCTION(&b, "func_get_arg", &_1, 420, &_0); + ZEPHIR_CALL_FUNCTION(&b, "func_get_arg", &_1, 417, &_0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_2, "func_num_args", NULL, 421); + ZEPHIR_CALL_FUNCTION(&_2, "func_num_args", NULL, 418); zephir_check_call_status(); if (ZEPHIR_GT_LONG(_2, 3)) { - ZEPHIR_CALL_FUNCTION(&_3$$3, "func_get_args", NULL, 168); + ZEPHIR_CALL_FUNCTION(&_3$$3, "func_get_args", NULL, 163); zephir_check_call_status(); ZEPHIR_SINIT_VAR(_4$$3); ZVAL_LONG(&_4$$3, 3); - ZEPHIR_CALL_FUNCTION(&_5$$3, "array_slice", NULL, 372, _3$$3, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "array_slice", NULL, 370, _3$$3, &_4$$3); zephir_check_call_status(); zephir_is_iterable(_5$$3, &_7$$3, &_6$$3, 0, 0, "phalcon/text.zep", 242); for ( @@ -26166,24 +26189,24 @@ static PHP_METHOD(Phalcon_Text, dynamic) { } - ZEPHIR_CALL_FUNCTION(&_0, "substr_count", &_1, 422, text, leftDelimiter); + ZEPHIR_CALL_FUNCTION(&_0, "substr_count", &_1, 419, text, leftDelimiter); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_2, "substr_count", &_1, 422, text, rightDelimiter); + ZEPHIR_CALL_FUNCTION(&_2, "substr_count", &_1, 419, text, rightDelimiter); zephir_check_call_status(); if (!ZEPHIR_IS_IDENTICAL(_0, _2)) { ZEPHIR_INIT_VAR(_3$$3); object_init_ex(_3$$3, spl_ce_RuntimeException); ZEPHIR_INIT_VAR(_4$$3); ZEPHIR_CONCAT_SVS(_4$$3, "Syntax error in string \"", text, "\""); - ZEPHIR_CALL_METHOD(NULL, _3$$3, "__construct", NULL, 423, _4$$3); + ZEPHIR_CALL_METHOD(NULL, _3$$3, "__construct", NULL, 420, _4$$3); zephir_check_call_status(); zephir_throw_exception_debug(_3$$3, "phalcon/text.zep", 261 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_FUNCTION(&ldS, "preg_quote", &_5, 424, leftDelimiter); + ZEPHIR_CALL_FUNCTION(&ldS, "preg_quote", &_5, 421, leftDelimiter); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&rdS, "preg_quote", &_5, 424, rightDelimiter); + ZEPHIR_CALL_FUNCTION(&rdS, "preg_quote", &_5, 421, rightDelimiter); zephir_check_call_status(); ZEPHIR_INIT_VAR(pattern); ZEPHIR_CONCAT_SVSVVSVS(pattern, "/", ldS, "([^", ldS, rdS, "]+)", rdS, "/"); @@ -26195,7 +26218,7 @@ static PHP_METHOD(Phalcon_Text, dynamic) { ZEPHIR_INIT_NVAR(_6$$4); ZEPHIR_INIT_NVAR(_6$$4); zephir_create_closure_ex(_6$$4, NULL, phalcon_0__closure_ce, SS("__invoke") TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_7$$4, "preg_replace_callback", &_8, 425, pattern, _6$$4, result); + ZEPHIR_CALL_FUNCTION(&_7$$4, "preg_replace_callback", &_8, 422, pattern, _6$$4, result); zephir_check_call_status(); ZEPHIR_CPY_WRT(result, _7$$4); } @@ -26618,7 +26641,7 @@ static PHP_METHOD(Phalcon_Validation, setDefaultMessages) { ZEPHIR_INIT_VAR(defaultMessages); - zephir_create_array(defaultMessages, 24, 0 TSRMLS_CC); + zephir_create_array(defaultMessages, 25, 0 TSRMLS_CC); add_assoc_stringl_ex(defaultMessages, SS("Alnum"), SL("Field :field must contain only letters and numbers"), 1); add_assoc_stringl_ex(defaultMessages, SS("Alpha"), SL("Field :field must contain only letters"), 1); add_assoc_stringl_ex(defaultMessages, SS("Between"), SL("Field :field must be within the range of :min to :max"), 1); @@ -26643,6 +26666,7 @@ static PHP_METHOD(Phalcon_Validation, setDefaultMessages) { add_assoc_stringl_ex(defaultMessages, SS("Uniqueness"), SL("Field :field must be unique"), 1); add_assoc_stringl_ex(defaultMessages, SS("Url"), SL("Field :field must be a url"), 1); add_assoc_stringl_ex(defaultMessages, SS("CreditCard"), SL("Field :field is not valid for a credit card number"), 1); + add_assoc_stringl_ex(defaultMessages, SS("Date"), SL("Field :field is not a valid date"), 1); ZEPHIR_INIT_VAR(_0); zephir_fast_array_merge(_0, &(defaultMessages), &(messages) TSRMLS_CC); zephir_update_property_this(this_ptr, SL("_defaultMessages"), _0 TSRMLS_CC); @@ -26675,7 +26699,7 @@ static PHP_METHOD(Phalcon_Validation, getDefaultMessage) { RETURN_MM_STRING("", 1); } _1 = zephir_fetch_nproperty_this(this_ptr, SL("_defaultMessages"), PH_NOISY_CC); - zephir_array_fetch(&_2, _1, type, PH_NOISY | PH_READONLY, "phalcon/validation.zep", 279 TSRMLS_CC); + zephir_array_fetch(&_2, _1, type, PH_NOISY | PH_READONLY, "phalcon/validation.zep", 280 TSRMLS_CC); RETURN_CTOR(_2); } @@ -26759,7 +26783,7 @@ static PHP_METHOD(Phalcon_Validation, bind) { if (Z_TYPE_P(entity) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_validation_exception_ce, "Entity must be an object", "phalcon/validation.zep", 336); + ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_validation_exception_ce, "Entity must be an object", "phalcon/validation.zep", 337); return; } _0 = Z_TYPE_P(data) != IS_ARRAY; @@ -26767,7 +26791,7 @@ static PHP_METHOD(Phalcon_Validation, bind) { _0 = Z_TYPE_P(data) != IS_OBJECT; } if (_0) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_validation_exception_ce, "Data to validate must be an array or object", "phalcon/validation.zep", 340); + ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_validation_exception_ce, "Data to validate must be an array or object", "phalcon/validation.zep", 341); return; } zephir_update_property_this(this_ptr, SL("_entity"), entity TSRMLS_CC); @@ -26821,7 +26845,7 @@ static PHP_METHOD(Phalcon_Validation, getValue) { _1 = Z_TYPE_P(data) != IS_OBJECT; } if (_1) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_validation_exception_ce, "There is no data to validate", "phalcon/validation.zep", 387); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_validation_exception_ce, "There is no data to validate", "phalcon/validation.zep", 388); return; } ZEPHIR_OBS_VAR(values); @@ -26835,7 +26859,7 @@ static PHP_METHOD(Phalcon_Validation, getValue) { if (Z_TYPE_P(data) == IS_ARRAY) { if (zephir_array_isset(data, field)) { ZEPHIR_OBS_NVAR(value); - zephir_array_fetch(&value, data, field, PH_NOISY, "phalcon/validation.zep", 401 TSRMLS_CC); + zephir_array_fetch(&value, data, field, PH_NOISY, "phalcon/validation.zep", 402 TSRMLS_CC); } } else if (Z_TYPE_P(data) == IS_OBJECT) { if (zephir_isset_property_zval(data, field TSRMLS_CC)) { @@ -26858,7 +26882,7 @@ static PHP_METHOD(Phalcon_Validation, getValue) { ZEPHIR_CALL_CE_STATIC(&dependencyInjector, phalcon_di_ce, "getdefault", &_2, 1); zephir_check_call_status(); if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_validation_exception_ce, "A dependency injector is required to obtain the 'filter' service", "phalcon/validation.zep", 424); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_validation_exception_ce, "A dependency injector is required to obtain the 'filter' service", "phalcon/validation.zep", 425); return; } } @@ -26868,7 +26892,7 @@ static PHP_METHOD(Phalcon_Validation, getValue) { zephir_check_temp_parameter(_3$$19); zephir_check_call_status(); if (Z_TYPE_P(filterService) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_validation_exception_ce, "Returned 'filter' service is invalid", "phalcon/validation.zep", 430); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_validation_exception_ce, "Returned 'filter' service is invalid", "phalcon/validation.zep", 431); return; } ZEPHIR_RETURN_CALL_METHOD(filterService, "sanitize", NULL, 0, value, fieldFilters); @@ -26928,7 +26952,7 @@ static PHP_METHOD(Phalcon_Version, _getVersion) { ZVAL_LONG(_0, 0); zephir_array_fast_append(return_value, _0); ZEPHIR_INIT_NVAR(_0); - ZVAL_LONG(_0, 10); + ZVAL_LONG(_0, 11); zephir_array_fast_append(return_value, _0); ZEPHIR_INIT_NVAR(_0); ZVAL_LONG(_0, 4); @@ -26997,7 +27021,7 @@ static PHP_METHOD(Phalcon_Version, get) { zephir_array_fetch_long(&specialNumber, version, 4, PH_NOISY, "phalcon/version.zep", 128 TSRMLS_CC); ZEPHIR_INIT_VAR(result); ZEPHIR_CONCAT_VSVSVS(result, major, ".", medium, ".", minor, " "); - ZEPHIR_CALL_STATIC(&suffix, "_getspecial", &_0, 446, special); + ZEPHIR_CALL_STATIC(&suffix, "_getspecial", &_0, 443, special); zephir_check_call_status(); if (!ZEPHIR_IS_STRING(suffix, "")) { ZEPHIR_INIT_VAR(_1$$3); @@ -27031,11 +27055,11 @@ static PHP_METHOD(Phalcon_Version, getId) { zephir_array_fetch_long(&specialNumber, version, 4, PH_NOISY, "phalcon/version.zep", 158 TSRMLS_CC); ZEPHIR_SINIT_VAR(_0); ZVAL_STRING(&_0, "%02s", 0); - ZEPHIR_CALL_FUNCTION(&_1, "sprintf", &_2, 189, &_0, medium); + ZEPHIR_CALL_FUNCTION(&_1, "sprintf", &_2, 184, &_0, medium); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_0); ZVAL_STRING(&_0, "%02s", 0); - ZEPHIR_CALL_FUNCTION(&_3, "sprintf", &_2, 189, &_0, minor); + ZEPHIR_CALL_FUNCTION(&_3, "sprintf", &_2, 184, &_0, minor); zephir_check_call_status(); ZEPHIR_CONCAT_VVVVV(return_value, major, _1, _3, special, specialNumber); RETURN_MM(); @@ -27064,7 +27088,7 @@ static PHP_METHOD(Phalcon_Version, getPart) { } if (part == 3) { zephir_array_fetch_long(&_1$$4, version, 3, PH_NOISY | PH_READONLY, "phalcon/version.zep", 187 TSRMLS_CC); - ZEPHIR_CALL_STATIC(&result, "_getspecial", &_0, 446, _1$$4); + ZEPHIR_CALL_STATIC(&result, "_getspecial", &_0, 443, _1$$4); zephir_check_call_status(); break; } @@ -32929,7 +32953,7 @@ static PHP_METHOD(Phalcon_Assets_Collection, addFilter) { } -static zend_object_value zephir_init_properties_Phalcon_Assets_Collection(zend_class_entry *class_type TSRMLS_DC) { +zend_object_value zephir_init_properties_Phalcon_Assets_Collection(zend_class_entry *class_type TSRMLS_DC) { zval *_0, *_2, *_4, *_6, *_1$$3, *_3$$4, *_5$$5, *_7$$6; @@ -38626,7 +38650,7 @@ static PHP_METHOD(Phalcon_Cache_Backend_Mongo, decrement) { static PHP_METHOD(Phalcon_Cache_Backend_Mongo, flush) { - zval *_0 = NULL, *_1 = NULL; + zval *_0 = NULL; int ZEPHIR_LAST_CALL_STATUS; ZEPHIR_MM_GROW(); @@ -38635,12 +38659,6 @@ static PHP_METHOD(Phalcon_Cache_Backend_Mongo, flush) { zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, _0, "remove", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "rand", NULL, 111); - zephir_check_call_status(); - if (zephir_safe_mod_long_long(zephir_get_intval(_1), 100 TSRMLS_CC) == 0) { - ZEPHIR_CALL_METHOD(NULL, this_ptr, "gc", NULL, 0); - zephir_check_call_status(); - } RETURN_MM_BOOL(1); } @@ -38737,8 +38755,10 @@ static PHP_METHOD(Phalcon_Cache_Backend_Redis, _connect) { zephir_read_property_this(&options, this_ptr, SL("_options"), PH_NOISY_CC); ZEPHIR_INIT_VAR(redis); object_init_ex(redis, zephir_get_internal_ce(SS("redis") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, redis, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(redis TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, redis, "__construct", NULL, 0); + zephir_check_call_status(); + } ZEPHIR_OBS_VAR(host); _0 = !(zephir_array_isset_string_fetch(&host, options, SS("host"), 0 TSRMLS_CC)); if (!(_0)) { @@ -42220,7 +42240,7 @@ static PHP_METHOD(Phalcon_Cli_Router_Route, reConfigure) { ZEPHIR_CPY_WRT(realClassName, taskName); } ZEPHIR_INIT_VAR(_1$$9); - zephir_uncamelize(_1$$9, realClassName); + zephir_uncamelize(_1$$9, realClassName, NULL ); zephir_array_update_string(&routePaths, SL("task"), &_1$$9, PH_COPY | PH_SEPARATE); } if (Z_TYPE_P(actionName) != IS_NULL) { @@ -45456,7 +45476,7 @@ static PHP_METHOD(Phalcon_Db_Column, __set_state) { zephir_array_update_string(&definition, SL("bindType"), &bindType, PH_COPY | PH_SEPARATE); } object_init_ex(return_value, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 142, columnName, definition); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 137, columnName, definition); zephir_check_call_status(); RETURN_MM(); @@ -47668,19 +47688,19 @@ static PHP_METHOD(Phalcon_Db_Profiler, startProfile) { ZEPHIR_CALL_METHOD(NULL, activeProfile, "__construct", NULL, 0); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, activeProfile, "setsqlstatement", NULL, 147, sqlStatement); + ZEPHIR_CALL_METHOD(NULL, activeProfile, "setsqlstatement", NULL, 142, sqlStatement); zephir_check_call_status(); if (Z_TYPE_P(sqlVariables) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(NULL, activeProfile, "setsqlvariables", NULL, 148, sqlVariables); + ZEPHIR_CALL_METHOD(NULL, activeProfile, "setsqlvariables", NULL, 143, sqlVariables); zephir_check_call_status(); } if (Z_TYPE_P(sqlBindTypes) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(NULL, activeProfile, "setsqlbindtypes", NULL, 149, sqlBindTypes); + ZEPHIR_CALL_METHOD(NULL, activeProfile, "setsqlbindtypes", NULL, 144, sqlBindTypes); zephir_check_call_status(); } ZEPHIR_INIT_VAR(_0); zephir_microtime(_0, ZEPHIR_GLOBAL(global_true) TSRMLS_CC); - ZEPHIR_CALL_METHOD(NULL, activeProfile, "setinitialtime", NULL, 150, _0); + ZEPHIR_CALL_METHOD(NULL, activeProfile, "setinitialtime", NULL, 145, _0); zephir_check_call_status(); if ((zephir_method_exists_ex(this_ptr, SS("beforestartprofile") TSRMLS_CC) == SUCCESS)) { ZEPHIR_CALL_METHOD(NULL, this_ptr, "beforestartprofile", NULL, 0, activeProfile); @@ -49063,9 +49083,9 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, escapeIdentifier) { if (Z_TYPE_P(identifier) == IS_ARRAY) { ZEPHIR_OBS_VAR(domain); - zephir_array_fetch_long(&domain, identifier, 0, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 71 TSRMLS_CC); + zephir_array_fetch_long(&domain, identifier, 0, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 72 TSRMLS_CC); ZEPHIR_OBS_VAR(name); - zephir_array_fetch_long(&name, identifier, 1, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 72 TSRMLS_CC); + zephir_array_fetch_long(&name, identifier, 1, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 73 TSRMLS_CC); if (ZEPHIR_GLOBAL(db).escape_identifiers) { ZEPHIR_CONCAT_SVSVS(return_value, "`", domain, "`.`", name, "`"); RETURN_MM(); @@ -49088,7 +49108,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { HashPosition _4; zephir_fcall_cache_entry *_41 = NULL; int ZEPHIR_LAST_CALL_STATUS; - zval *table_param = NULL, *schema_param = NULL, *columns = NULL, *columnType = NULL, *field = NULL, *definition = NULL, *oldColumn = NULL, *sizePattern = NULL, *matches = NULL, *matchOne = NULL, *matchTwo = NULL, *columnName = NULL, *_0 = NULL, *_1, *_2 = NULL, *_3, **_6, *_7$$5 = NULL, *_8$$5 = NULL, *_9$$6 = NULL, *_10$$6 = NULL, *_11$$7 = NULL, *_12$$8 = NULL, *_13$$9 = NULL, *_14$$10 = NULL, *_15$$11 = NULL, *_16$$12 = NULL, *_17$$13 = NULL, *_18$$14 = NULL, *_19$$14 = NULL, *_20$$15 = NULL, *_21$$15 = NULL, *_22$$16 = NULL, *_23$$16 = NULL, *_24$$17 = NULL, *_25$$17 = NULL, *_26$$18 = NULL, *_27$$18 = NULL, *_28$$19 = NULL, *_29$$20 = NULL, *_30$$21 = NULL, *_31$$4 = NULL, *_32$$22 = NULL, *_33$$24 = NULL, *_34$$25 = NULL, *_35$$3, *_36$$3, *_37$$3, *_38$$3 = NULL, *_40$$3 = NULL, *_39$$32; + zval *table_param = NULL, *schema_param = NULL, *columns = NULL, *columnType = NULL, *field = NULL, *definition = NULL, *oldColumn = NULL, *sizePattern = NULL, *matches = NULL, *matchOne = NULL, *matchTwo = NULL, *columnName = NULL, *_0 = NULL, *_1, *_2 = NULL, *_3, **_6, *_7$$5 = NULL, *_8$$6 = NULL, *_9$$6 = NULL, *_10$$7 = NULL, *_11$$7 = NULL, *_12$$8 = NULL, *_13$$9 = NULL, *_14$$10 = NULL, *_15$$11 = NULL, *_16$$12 = NULL, *_17$$13 = NULL, *_18$$14 = NULL, *_19$$14 = NULL, *_20$$15 = NULL, *_21$$15 = NULL, *_22$$16 = NULL, *_23$$16 = NULL, *_24$$17 = NULL, *_25$$17 = NULL, *_26$$18 = NULL, *_27$$18 = NULL, *_28$$19 = NULL, *_29$$20 = NULL, *_30$$21 = NULL, *_31$$4 = NULL, *_32$$22 = NULL, *_33$$24 = NULL, *_34$$25 = NULL, *_35$$3, *_36$$3, *_37$$3, *_38$$3 = NULL, *_40$$3 = NULL, *_39$$32; zval *table = NULL, *schema = NULL; ZEPHIR_MM_GROW(); @@ -49116,7 +49136,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { ZVAL_LONG(_3, 3); ZEPHIR_CALL_METHOD(&_0, this_ptr, "fetchall", NULL, 0, _2, _3); zephir_check_call_status(); - zephir_is_iterable(_0, &_5, &_4, 0, 0, "phalcon/db/adapter/pdo/mysql.zep", 345); + zephir_is_iterable(_0, &_5, &_4, 0, 0, "phalcon/db/adapter/pdo/mysql.zep", 346); for ( ; zephir_hash_get_current_data_ex(_5, (void**) &_6, &_4) == SUCCESS ; zephir_hash_move_forward_ex(_5, &_4) @@ -49126,71 +49146,71 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { zephir_create_array(definition, 1, 0 TSRMLS_CC); add_assoc_long_ex(definition, SS("bindType"), 2); ZEPHIR_OBS_NVAR(columnType); - zephir_array_fetch_long(&columnType, field, 1, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 119 TSRMLS_CC); + zephir_array_fetch_long(&columnType, field, 1, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 120 TSRMLS_CC); while (1) { - if (zephir_memnstr_str(columnType, SL("bigint"), "phalcon/db/adapter/pdo/mysql.zep", 126)) { + if (zephir_memnstr_str(columnType, SL("enum"), "phalcon/db/adapter/pdo/mysql.zep", 127)) { ZEPHIR_INIT_NVAR(_7$$5); - ZVAL_LONG(_7$$5, 14); + ZVAL_LONG(_7$$5, 5); zephir_array_update_string(&definition, SL("type"), &_7$$5, PH_COPY | PH_SEPARATE); - zephir_array_update_string(&definition, SL("isNumeric"), &ZEPHIR_GLOBAL(global_true), PH_COPY | PH_SEPARATE); - ZEPHIR_INIT_NVAR(_8$$5); - ZVAL_LONG(_8$$5, 1); - zephir_array_update_string(&definition, SL("bindType"), &_8$$5, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("int"), "phalcon/db/adapter/pdo/mysql.zep", 136)) { - ZEPHIR_INIT_NVAR(_9$$6); - ZVAL_LONG(_9$$6, 0); - zephir_array_update_string(&definition, SL("type"), &_9$$6, PH_COPY | PH_SEPARATE); + if (zephir_memnstr_str(columnType, SL("bigint"), "phalcon/db/adapter/pdo/mysql.zep", 135)) { + ZEPHIR_INIT_NVAR(_8$$6); + ZVAL_LONG(_8$$6, 14); + zephir_array_update_string(&definition, SL("type"), &_8$$6, PH_COPY | PH_SEPARATE); zephir_array_update_string(&definition, SL("isNumeric"), &ZEPHIR_GLOBAL(global_true), PH_COPY | PH_SEPARATE); - ZEPHIR_INIT_NVAR(_10$$6); - ZVAL_LONG(_10$$6, 1); - zephir_array_update_string(&definition, SL("bindType"), &_10$$6, PH_COPY | PH_SEPARATE); + ZEPHIR_INIT_NVAR(_9$$6); + ZVAL_LONG(_9$$6, 1); + zephir_array_update_string(&definition, SL("bindType"), &_9$$6, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("varchar"), "phalcon/db/adapter/pdo/mysql.zep", 146)) { + if (zephir_memnstr_str(columnType, SL("int"), "phalcon/db/adapter/pdo/mysql.zep", 145)) { + ZEPHIR_INIT_NVAR(_10$$7); + ZVAL_LONG(_10$$7, 0); + zephir_array_update_string(&definition, SL("type"), &_10$$7, PH_COPY | PH_SEPARATE); + zephir_array_update_string(&definition, SL("isNumeric"), &ZEPHIR_GLOBAL(global_true), PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(_11$$7); - ZVAL_LONG(_11$$7, 2); - zephir_array_update_string(&definition, SL("type"), &_11$$7, PH_COPY | PH_SEPARATE); + ZVAL_LONG(_11$$7, 1); + zephir_array_update_string(&definition, SL("bindType"), &_11$$7, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("datetime"), "phalcon/db/adapter/pdo/mysql.zep", 154)) { + if (zephir_memnstr_str(columnType, SL("varchar"), "phalcon/db/adapter/pdo/mysql.zep", 155)) { ZEPHIR_INIT_NVAR(_12$$8); - ZVAL_LONG(_12$$8, 4); + ZVAL_LONG(_12$$8, 2); zephir_array_update_string(&definition, SL("type"), &_12$$8, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("enum"), "phalcon/db/adapter/pdo/mysql.zep", 162)) { + if (zephir_memnstr_str(columnType, SL("datetime"), "phalcon/db/adapter/pdo/mysql.zep", 163)) { ZEPHIR_INIT_NVAR(_13$$9); - ZVAL_LONG(_13$$9, 5); + ZVAL_LONG(_13$$9, 4); zephir_array_update_string(&definition, SL("type"), &_13$$9, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("char"), "phalcon/db/adapter/pdo/mysql.zep", 170)) { + if (zephir_memnstr_str(columnType, SL("char"), "phalcon/db/adapter/pdo/mysql.zep", 171)) { ZEPHIR_INIT_NVAR(_14$$10); ZVAL_LONG(_14$$10, 5); zephir_array_update_string(&definition, SL("type"), &_14$$10, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("date"), "phalcon/db/adapter/pdo/mysql.zep", 178)) { + if (zephir_memnstr_str(columnType, SL("date"), "phalcon/db/adapter/pdo/mysql.zep", 179)) { ZEPHIR_INIT_NVAR(_15$$11); ZVAL_LONG(_15$$11, 1); zephir_array_update_string(&definition, SL("type"), &_15$$11, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("timestamp"), "phalcon/db/adapter/pdo/mysql.zep", 186)) { + if (zephir_memnstr_str(columnType, SL("timestamp"), "phalcon/db/adapter/pdo/mysql.zep", 187)) { ZEPHIR_INIT_NVAR(_16$$12); ZVAL_LONG(_16$$12, 17); zephir_array_update_string(&definition, SL("type"), &_16$$12, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("text"), "phalcon/db/adapter/pdo/mysql.zep", 194)) { + if (zephir_memnstr_str(columnType, SL("text"), "phalcon/db/adapter/pdo/mysql.zep", 195)) { ZEPHIR_INIT_NVAR(_17$$13); ZVAL_LONG(_17$$13, 6); zephir_array_update_string(&definition, SL("type"), &_17$$13, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("decimal"), "phalcon/db/adapter/pdo/mysql.zep", 202)) { + if (zephir_memnstr_str(columnType, SL("decimal"), "phalcon/db/adapter/pdo/mysql.zep", 203)) { ZEPHIR_INIT_NVAR(_18$$14); ZVAL_LONG(_18$$14, 3); zephir_array_update_string(&definition, SL("type"), &_18$$14, PH_COPY | PH_SEPARATE); @@ -49200,7 +49220,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { zephir_array_update_string(&definition, SL("bindType"), &_19$$14, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("double"), "phalcon/db/adapter/pdo/mysql.zep", 212)) { + if (zephir_memnstr_str(columnType, SL("double"), "phalcon/db/adapter/pdo/mysql.zep", 213)) { ZEPHIR_INIT_NVAR(_20$$15); ZVAL_LONG(_20$$15, 9); zephir_array_update_string(&definition, SL("type"), &_20$$15, PH_COPY | PH_SEPARATE); @@ -49210,7 +49230,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { zephir_array_update_string(&definition, SL("bindType"), &_21$$15, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("float"), "phalcon/db/adapter/pdo/mysql.zep", 222)) { + if (zephir_memnstr_str(columnType, SL("float"), "phalcon/db/adapter/pdo/mysql.zep", 223)) { ZEPHIR_INIT_NVAR(_22$$16); ZVAL_LONG(_22$$16, 7); zephir_array_update_string(&definition, SL("type"), &_22$$16, PH_COPY | PH_SEPARATE); @@ -49220,7 +49240,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { zephir_array_update_string(&definition, SL("bindType"), &_23$$16, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("bit"), "phalcon/db/adapter/pdo/mysql.zep", 232)) { + if (zephir_memnstr_str(columnType, SL("bit"), "phalcon/db/adapter/pdo/mysql.zep", 233)) { ZEPHIR_INIT_NVAR(_24$$17); ZVAL_LONG(_24$$17, 8); zephir_array_update_string(&definition, SL("type"), &_24$$17, PH_COPY | PH_SEPARATE); @@ -49229,7 +49249,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { zephir_array_update_string(&definition, SL("bindType"), &_25$$17, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("tinyblob"), "phalcon/db/adapter/pdo/mysql.zep", 241)) { + if (zephir_memnstr_str(columnType, SL("tinyblob"), "phalcon/db/adapter/pdo/mysql.zep", 242)) { ZEPHIR_INIT_NVAR(_26$$18); ZVAL_LONG(_26$$18, 10); zephir_array_update_string(&definition, SL("type"), &_26$$18, PH_COPY | PH_SEPARATE); @@ -49238,19 +49258,19 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { zephir_array_update_string(&definition, SL("bindType"), &_27$$18, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("mediumblob"), "phalcon/db/adapter/pdo/mysql.zep", 250)) { + if (zephir_memnstr_str(columnType, SL("mediumblob"), "phalcon/db/adapter/pdo/mysql.zep", 251)) { ZEPHIR_INIT_NVAR(_28$$19); ZVAL_LONG(_28$$19, 12); zephir_array_update_string(&definition, SL("type"), &_28$$19, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("longblob"), "phalcon/db/adapter/pdo/mysql.zep", 258)) { + if (zephir_memnstr_str(columnType, SL("longblob"), "phalcon/db/adapter/pdo/mysql.zep", 259)) { ZEPHIR_INIT_NVAR(_29$$20); ZVAL_LONG(_29$$20, 13); zephir_array_update_string(&definition, SL("type"), &_29$$20, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("blob"), "phalcon/db/adapter/pdo/mysql.zep", 266)) { + if (zephir_memnstr_str(columnType, SL("blob"), "phalcon/db/adapter/pdo/mysql.zep", 267)) { ZEPHIR_INIT_NVAR(_30$$21); ZVAL_LONG(_30$$21, 11); zephir_array_update_string(&definition, SL("type"), &_30$$21, PH_COPY | PH_SEPARATE); @@ -49261,7 +49281,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { zephir_array_update_string(&definition, SL("type"), &_31$$4, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("("), "phalcon/db/adapter/pdo/mysql.zep", 281)) { + if (zephir_memnstr_str(columnType, SL("("), "phalcon/db/adapter/pdo/mysql.zep", 282)) { ZEPHIR_INIT_NVAR(matches); ZVAL_NULL(matches); ZEPHIR_INIT_NVAR(_32$$22); @@ -49281,7 +49301,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { } } } - if (zephir_memnstr_str(columnType, SL("unsigned"), "phalcon/db/adapter/pdo/mysql.zep", 296)) { + if (zephir_memnstr_str(columnType, SL("unsigned"), "phalcon/db/adapter/pdo/mysql.zep", 297)) { zephir_array_update_string(&definition, SL("unsigned"), &ZEPHIR_GLOBAL(global_true), PH_COPY | PH_SEPARATE); } if (Z_TYPE_P(oldColumn) == IS_NULL) { @@ -49289,30 +49309,30 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { } else { zephir_array_update_string(&definition, SL("after"), &oldColumn, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_35$$3, field, 3, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 312 TSRMLS_CC); + zephir_array_fetch_long(&_35$$3, field, 3, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 313 TSRMLS_CC); if (ZEPHIR_IS_STRING(_35$$3, "PRI")) { zephir_array_update_string(&definition, SL("primary"), &ZEPHIR_GLOBAL(global_true), PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_36$$3, field, 2, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 319 TSRMLS_CC); + zephir_array_fetch_long(&_36$$3, field, 2, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 320 TSRMLS_CC); if (ZEPHIR_IS_STRING(_36$$3, "NO")) { zephir_array_update_string(&definition, SL("notNull"), &ZEPHIR_GLOBAL(global_true), PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_37$$3, field, 5, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 326 TSRMLS_CC); + zephir_array_fetch_long(&_37$$3, field, 5, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 327 TSRMLS_CC); if (ZEPHIR_IS_STRING(_37$$3, "auto_increment")) { zephir_array_update_string(&definition, SL("autoIncrement"), &ZEPHIR_GLOBAL(global_true), PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_NVAR(_38$$3); - zephir_array_fetch_long(&_38$$3, field, 4, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 333 TSRMLS_CC); + zephir_array_fetch_long(&_38$$3, field, 4, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 334 TSRMLS_CC); if (Z_TYPE_P(_38$$3) != IS_NULL) { - zephir_array_fetch_long(&_39$$32, field, 4, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 334 TSRMLS_CC); + zephir_array_fetch_long(&_39$$32, field, 4, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 335 TSRMLS_CC); zephir_array_update_string(&definition, SL("default"), &_39$$32, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&columnName, field, 0, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 340 TSRMLS_CC); + zephir_array_fetch_long(&columnName, field, 0, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 341 TSRMLS_CC); ZEPHIR_INIT_NVAR(_40$$3); object_init_ex(_40$$3, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, _40$$3, "__construct", &_41, 142, columnName, definition); + ZEPHIR_CALL_METHOD(NULL, _40$$3, "__construct", &_41, 137, columnName, definition); zephir_check_call_status(); - zephir_array_append(&columns, _40$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/mysql.zep", 341); + zephir_array_append(&columns, _40$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/mysql.zep", 342); ZEPHIR_CPY_WRT(oldColumn, columnName); } RETURN_CCTOR(columns); @@ -49355,31 +49375,31 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeIndexes) { ZVAL_LONG(_3, 2); ZEPHIR_CALL_METHOD(&_0, this_ptr, "fetchall", NULL, 0, _2, _3); zephir_check_call_status(); - zephir_is_iterable(_0, &_5, &_4, 0, 0, "phalcon/db/adapter/pdo/mysql.zep", 389); + zephir_is_iterable(_0, &_5, &_4, 0, 0, "phalcon/db/adapter/pdo/mysql.zep", 390); for ( ; zephir_hash_get_current_data_ex(_5, (void**) &_6, &_4) == SUCCESS ; zephir_hash_move_forward_ex(_5, &_4) ) { ZEPHIR_GET_HVALUE(index, _6); - zephir_array_fetch_string(&keyName, index, SL("Key_name"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 365 TSRMLS_CC); + zephir_array_fetch_string(&keyName, index, SL("Key_name"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 366 TSRMLS_CC); if (!(zephir_array_isset(indexes, keyName))) { ZEPHIR_INIT_NVAR(_7$$4); array_init(_7$$4); zephir_array_update_zval(&indexes, keyName, &_7$$4, PH_COPY | PH_SEPARATE); } - zephir_array_fetch(&_8$$3, indexes, keyName, PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 371 TSRMLS_CC); + zephir_array_fetch(&_8$$3, indexes, keyName, PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 372 TSRMLS_CC); if (!(zephir_array_isset_string(_8$$3, SS("columns")))) { ZEPHIR_INIT_NVAR(columns); array_init(columns); } else { - zephir_array_fetch(&_9$$6, indexes, keyName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 374 TSRMLS_CC); + zephir_array_fetch(&_9$$6, indexes, keyName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 375 TSRMLS_CC); ZEPHIR_OBS_NVAR(columns); - zephir_array_fetch_string(&columns, _9$$6, SL("columns"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 374 TSRMLS_CC); + zephir_array_fetch_string(&columns, _9$$6, SL("columns"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 375 TSRMLS_CC); } - zephir_array_fetch_string(&_10$$3, index, SL("Column_name"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 377 TSRMLS_CC); - zephir_array_append(&columns, _10$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/mysql.zep", 377); + zephir_array_fetch_string(&_10$$3, index, SL("Column_name"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 378 TSRMLS_CC); + zephir_array_append(&columns, _10$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/mysql.zep", 378); zephir_array_update_multi(&indexes, &columns TSRMLS_CC, SL("zs"), 3, keyName, SL("columns")); - zephir_array_fetch_string(&_11$$3, index, SL("Non_unique"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 382 TSRMLS_CC); + zephir_array_fetch_string(&_11$$3, index, SL("Non_unique"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 383 TSRMLS_CC); if (ZEPHIR_IS_STRING(keyName, "PRIMARY")) { ZEPHIR_INIT_NVAR(_12$$7); ZVAL_STRING(_12$$7, "PRIMARY", 1); @@ -49394,7 +49414,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeIndexes) { } ZEPHIR_INIT_VAR(indexObjects); array_init(indexObjects); - zephir_is_iterable(indexes, &_15, &_14, 0, 0, "phalcon/db/adapter/pdo/mysql.zep", 394); + zephir_is_iterable(indexes, &_15, &_14, 0, 0, "phalcon/db/adapter/pdo/mysql.zep", 395); for ( ; zephir_hash_get_current_data_ex(_15, (void**) &_16, &_14) == SUCCESS ; zephir_hash_move_forward_ex(_15, &_14) @@ -49403,8 +49423,8 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeIndexes) { ZEPHIR_GET_HVALUE(index, _16); ZEPHIR_INIT_NVAR(_17$$10); object_init_ex(_17$$10, phalcon_db_index_ce); - zephir_array_fetch_string(&_18$$10, index, SL("columns"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 391 TSRMLS_CC); - zephir_array_fetch_string(&_19$$10, index, SL("type"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 391 TSRMLS_CC); + zephir_array_fetch_string(&_18$$10, index, SL("columns"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 392 TSRMLS_CC); + zephir_array_fetch_string(&_19$$10, index, SL("type"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 392 TSRMLS_CC); ZEPHIR_CALL_METHOD(NULL, _17$$10, "__construct", &_20, 15, name, _18$$10, _19$$10); zephir_check_call_status(); zephir_array_update_zval(&indexObjects, name, &_17$$10, PH_COPY | PH_SEPARATE); @@ -49413,6 +49433,148 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeIndexes) { } +static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeReferences) { + + zval *_15$$3 = NULL, *_20$$6 = NULL; + HashTable *_5, *_17; + HashPosition _4, _16; + zephir_fcall_cache_entry *_22 = NULL; + int ZEPHIR_LAST_CALL_STATUS; + zval *table_param = NULL, *schema_param = NULL, *references = NULL, *reference = NULL, *arrayReference = NULL, *constraintName = NULL, *referenceObjects = NULL, *name = NULL, *referencedSchema = NULL, *referencedTable = NULL, *columns = NULL, *referencedColumns = NULL, *referenceUpdate = NULL, *referenceDelete = NULL, *_0 = NULL, *_1, *_2 = NULL, *_3, **_6, **_18, *_7$$5, *_8$$5, *_9$$5, *_10$$5, *_11$$5, *_12$$5, *_13$$3, *_14$$3, *_19$$6 = NULL, *_21$$6 = NULL; + zval *table = NULL, *schema = NULL; + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 1, &table_param, &schema_param); + + if (unlikely(Z_TYPE_P(table_param) != IS_STRING && Z_TYPE_P(table_param) != IS_NULL)) { + zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'table' must be a string") TSRMLS_CC); + RETURN_MM_NULL(); + } + if (likely(Z_TYPE_P(table_param) == IS_STRING)) { + zephir_get_strval(table, table_param); + } else { + ZEPHIR_INIT_VAR(table); + ZVAL_EMPTY_STRING(table); + } + if (!schema_param) { + ZEPHIR_INIT_VAR(schema); + ZVAL_EMPTY_STRING(schema); + } else { + if (unlikely(Z_TYPE_P(schema_param) != IS_STRING && Z_TYPE_P(schema_param) != IS_NULL)) { + zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'schema' must be a string") TSRMLS_CC); + RETURN_MM_NULL(); + } + if (likely(Z_TYPE_P(schema_param) == IS_STRING)) { + zephir_get_strval(schema, schema_param); + } else { + ZEPHIR_INIT_VAR(schema); + ZVAL_EMPTY_STRING(schema); + } + } + + + ZEPHIR_INIT_VAR(references); + array_init(references); + _1 = zephir_fetch_nproperty_this(this_ptr, SL("_dialect"), PH_NOISY_CC); + ZEPHIR_CALL_METHOD(&_2, _1, "describereferences", NULL, 0, table, schema); + zephir_check_call_status(); + ZEPHIR_INIT_VAR(_3); + ZVAL_LONG(_3, 3); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "fetchall", NULL, 0, _2, _3); + zephir_check_call_status(); + zephir_is_iterable(_0, &_5, &_4, 0, 0, "phalcon/db/adapter/pdo/mysql.zep", 447); + for ( + ; zephir_hash_get_current_data_ex(_5, (void**) &_6, &_4) == SUCCESS + ; zephir_hash_move_forward_ex(_5, &_4) + ) { + ZEPHIR_GET_HVALUE(reference, _6); + zephir_array_fetch_long(&constraintName, reference, 2, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 416 TSRMLS_CC); + if (!(zephir_array_isset(references, constraintName))) { + ZEPHIR_OBS_NVAR(referencedSchema); + zephir_array_fetch_long(&referencedSchema, reference, 3, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 418 TSRMLS_CC); + ZEPHIR_OBS_NVAR(referencedTable); + zephir_array_fetch_long(&referencedTable, reference, 4, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 419 TSRMLS_CC); + ZEPHIR_OBS_NVAR(referenceUpdate); + zephir_array_fetch_long(&referenceUpdate, reference, 6, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 420 TSRMLS_CC); + ZEPHIR_OBS_NVAR(referenceDelete); + zephir_array_fetch_long(&referenceDelete, reference, 7, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 421 TSRMLS_CC); + ZEPHIR_INIT_NVAR(columns); + array_init(columns); + ZEPHIR_INIT_NVAR(referencedColumns); + array_init(referencedColumns); + } else { + zephir_array_fetch(&_7$$5, references, constraintName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 426 TSRMLS_CC); + ZEPHIR_OBS_NVAR(referencedSchema); + zephir_array_fetch_string(&referencedSchema, _7$$5, SL("referencedSchema"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 426 TSRMLS_CC); + zephir_array_fetch(&_8$$5, references, constraintName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 427 TSRMLS_CC); + ZEPHIR_OBS_NVAR(referencedTable); + zephir_array_fetch_string(&referencedTable, _8$$5, SL("referencedTable"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 427 TSRMLS_CC); + zephir_array_fetch(&_9$$5, references, constraintName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 428 TSRMLS_CC); + ZEPHIR_OBS_NVAR(columns); + zephir_array_fetch_string(&columns, _9$$5, SL("columns"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 428 TSRMLS_CC); + zephir_array_fetch(&_10$$5, references, constraintName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 429 TSRMLS_CC); + ZEPHIR_OBS_NVAR(referencedColumns); + zephir_array_fetch_string(&referencedColumns, _10$$5, SL("referencedColumns"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 429 TSRMLS_CC); + zephir_array_fetch(&_11$$5, references, constraintName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 430 TSRMLS_CC); + ZEPHIR_OBS_NVAR(referenceUpdate); + zephir_array_fetch_string(&referenceUpdate, _11$$5, SL("onUpdate"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 430 TSRMLS_CC); + zephir_array_fetch(&_12$$5, references, constraintName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 431 TSRMLS_CC); + ZEPHIR_OBS_NVAR(referenceDelete); + zephir_array_fetch_string(&referenceDelete, _12$$5, SL("onDelete"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 431 TSRMLS_CC); + } + zephir_array_fetch_long(&_13$$3, reference, 1, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 434 TSRMLS_CC); + zephir_array_append(&columns, _13$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/mysql.zep", 434); + zephir_array_fetch_long(&_14$$3, reference, 5, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 435 TSRMLS_CC); + zephir_array_append(&referencedColumns, _14$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/mysql.zep", 435); + ZEPHIR_INIT_NVAR(_15$$3); + zephir_create_array(_15$$3, 6, 0 TSRMLS_CC); + zephir_array_update_string(&_15$$3, SL("referencedSchema"), &referencedSchema, PH_COPY | PH_SEPARATE); + zephir_array_update_string(&_15$$3, SL("referencedTable"), &referencedTable, PH_COPY | PH_SEPARATE); + zephir_array_update_string(&_15$$3, SL("columns"), &columns, PH_COPY | PH_SEPARATE); + zephir_array_update_string(&_15$$3, SL("referencedColumns"), &referencedColumns, PH_COPY | PH_SEPARATE); + zephir_array_update_string(&_15$$3, SL("onUpdate"), &referenceUpdate, PH_COPY | PH_SEPARATE); + zephir_array_update_string(&_15$$3, SL("onDelete"), &referenceDelete, PH_COPY | PH_SEPARATE); + zephir_array_update_zval(&references, constraintName, &_15$$3, PH_COPY | PH_SEPARATE); + } + ZEPHIR_INIT_VAR(referenceObjects); + array_init(referenceObjects); + zephir_is_iterable(references, &_17, &_16, 0, 0, "phalcon/db/adapter/pdo/mysql.zep", 459); + for ( + ; zephir_hash_get_current_data_ex(_17, (void**) &_18, &_16) == SUCCESS + ; zephir_hash_move_forward_ex(_17, &_16) + ) { + ZEPHIR_GET_HMKEY(name, _17, _16); + ZEPHIR_GET_HVALUE(arrayReference, _18); + ZEPHIR_INIT_NVAR(_19$$6); + object_init_ex(_19$$6, phalcon_db_reference_ce); + ZEPHIR_INIT_NVAR(_20$$6); + zephir_create_array(_20$$6, 6, 0 TSRMLS_CC); + ZEPHIR_OBS_NVAR(_21$$6); + zephir_array_fetch_string(&_21$$6, arrayReference, SL("referencedSchema"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 450 TSRMLS_CC); + zephir_array_update_string(&_20$$6, SL("referencedSchema"), &_21$$6, PH_COPY | PH_SEPARATE); + ZEPHIR_OBS_NVAR(_21$$6); + zephir_array_fetch_string(&_21$$6, arrayReference, SL("referencedTable"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 451 TSRMLS_CC); + zephir_array_update_string(&_20$$6, SL("referencedTable"), &_21$$6, PH_COPY | PH_SEPARATE); + ZEPHIR_OBS_NVAR(_21$$6); + zephir_array_fetch_string(&_21$$6, arrayReference, SL("columns"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 452 TSRMLS_CC); + zephir_array_update_string(&_20$$6, SL("columns"), &_21$$6, PH_COPY | PH_SEPARATE); + ZEPHIR_OBS_NVAR(_21$$6); + zephir_array_fetch_string(&_21$$6, arrayReference, SL("referencedColumns"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 453 TSRMLS_CC); + zephir_array_update_string(&_20$$6, SL("referencedColumns"), &_21$$6, PH_COPY | PH_SEPARATE); + ZEPHIR_OBS_NVAR(_21$$6); + zephir_array_fetch_string(&_21$$6, arrayReference, SL("onUpdate"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 454 TSRMLS_CC); + zephir_array_update_string(&_20$$6, SL("onUpdate"), &_21$$6, PH_COPY | PH_SEPARATE); + ZEPHIR_OBS_NVAR(_21$$6); + zephir_array_fetch_string(&_21$$6, arrayReference, SL("onDelete"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 456 TSRMLS_CC); + zephir_array_update_string(&_20$$6, SL("onDelete"), &_21$$6, PH_COPY | PH_SEPARATE); + ZEPHIR_CALL_METHOD(NULL, _19$$6, "__construct", &_22, 16, name, _20$$6); + zephir_check_call_status(); + zephir_array_update_zval(&referenceObjects, name, &_19$$6, PH_COPY | PH_SEPARATE); + } + RETURN_CCTOR(referenceObjects); + +} + @@ -49462,7 +49624,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Oracle, connect) { ZEPHIR_OBS_NVAR(descriptor); zephir_read_property_this(&descriptor, this_ptr, SL("_descriptor"), PH_NOISY_CC); } - ZEPHIR_CALL_PARENT(&status, phalcon_db_adapter_pdo_oracle_ce, this_ptr, "connect", &_0, 143, descriptor); + ZEPHIR_CALL_PARENT(&status, phalcon_db_adapter_pdo_oracle_ce, this_ptr, "connect", &_0, 138, descriptor); zephir_check_call_status(); ZEPHIR_OBS_VAR(startup); if (zephir_array_isset_string_fetch(&startup, descriptor, SS("startup"), 0 TSRMLS_CC)) { @@ -49641,7 +49803,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Oracle, describeColumns) { zephir_array_fetch_long(&columnName, field, 0, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/oracle.zep", 199 TSRMLS_CC); ZEPHIR_INIT_NVAR(_23$$3); object_init_ex(_23$$3, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, _23$$3, "__construct", &_24, 142, columnName, definition); + ZEPHIR_CALL_METHOD(NULL, _23$$3, "__construct", &_24, 137, columnName, definition); zephir_check_call_status(); zephir_array_append(&columns, _23$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/oracle.zep", 204); ZEPHIR_CPY_WRT(oldColumn, columnName); @@ -49778,7 +49940,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Postgresql, connect) { zephir_array_update_string(&descriptor, SL("password"), &ZEPHIR_GLOBAL(global_null), PH_COPY | PH_SEPARATE); } } - ZEPHIR_CALL_PARENT(NULL, phalcon_db_adapter_pdo_postgresql_ce, this_ptr, "connect", &_3, 143, descriptor); + ZEPHIR_CALL_PARENT(NULL, phalcon_db_adapter_pdo_postgresql_ce, this_ptr, "connect", &_3, 138, descriptor); zephir_check_call_status(); if (!(ZEPHIR_IS_EMPTY(schema))) { ZEPHIR_INIT_VAR(sql); @@ -50021,7 +50183,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Postgresql, describeColumns) { zephir_array_fetch_long(&columnName, field, 0, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/postgresql.zep", 321 TSRMLS_CC); ZEPHIR_INIT_NVAR(_46$$3); object_init_ex(_46$$3, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, _46$$3, "__construct", &_47, 142, columnName, definition); + ZEPHIR_CALL_METHOD(NULL, _46$$3, "__construct", &_47, 137, columnName, definition); zephir_check_call_status(); zephir_array_append(&columns, _46$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/postgresql.zep", 322); ZEPHIR_CPY_WRT(oldColumn, columnName); @@ -50311,7 +50473,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, connect) { return; } zephir_array_update_string(&descriptor, SL("dsn"), &dbname, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_PARENT(NULL, phalcon_db_adapter_pdo_sqlite_ce, this_ptr, "connect", &_0, 143, descriptor); + ZEPHIR_CALL_PARENT(NULL, phalcon_db_adapter_pdo_sqlite_ce, this_ptr, "connect", &_0, 138, descriptor); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -50531,7 +50693,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) { zephir_array_fetch_long(&columnName, field, 1, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/sqlite.zep", 286 TSRMLS_CC); ZEPHIR_INIT_NVAR(_43$$3); object_init_ex(_43$$3, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, _43$$3, "__construct", &_44, 142, columnName, definition); + ZEPHIR_CALL_METHOD(NULL, _43$$3, "__construct", &_44, 137, columnName, definition); zephir_check_call_status(); zephir_array_append(&columns, _43$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/sqlite.zep", 287); ZEPHIR_CPY_WRT(oldColumn, columnName); @@ -51035,7 +51197,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_MySQL, getColumnDefinition) { ZEPHIR_GET_HVALUE(value$$51, _25$$51); ZEPHIR_SINIT_NVAR(_26$$52); ZVAL_STRING(&_26$$52, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_27$$52, "addcslashes", &_28, 144, value$$51, &_26$$52); + ZEPHIR_CALL_FUNCTION(&_27$$52, "addcslashes", &_28, 139, value$$51, &_26$$52); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_29$$52); ZEPHIR_CONCAT_SVS(_29$$52, "\"", _27$$52, "\", "); @@ -51053,7 +51215,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_MySQL, getColumnDefinition) { } else { ZEPHIR_SINIT_VAR(_34$$53); ZVAL_STRING(&_34$$53, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_35$$53, "addcslashes", &_28, 144, typeValues, &_34$$53); + ZEPHIR_CALL_FUNCTION(&_35$$53, "addcslashes", &_28, 139, typeValues, &_34$$53); zephir_check_call_status(); ZEPHIR_INIT_VAR(_36$$53); ZEPHIR_CONCAT_SVS(_36$$53, "(\"", _35$$53, "\")"); @@ -51117,7 +51279,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_MySQL, addColumn) { } else { ZEPHIR_SINIT_VAR(_5$$5); ZVAL_STRING(&_5$$5, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_6$$5, "addcslashes", NULL, 144, defaultValue, &_5$$5); + ZEPHIR_CALL_FUNCTION(&_6$$5, "addcslashes", NULL, 139, defaultValue, &_5$$5); zephir_check_call_status(); ZEPHIR_INIT_VAR(_7$$5); ZEPHIR_CONCAT_SVS(_7$$5, " DEFAULT \"", _6$$5, "\""); @@ -51205,7 +51367,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_MySQL, modifyColumn) { } else { ZEPHIR_SINIT_VAR(_5$$5); ZVAL_STRING(&_5$$5, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_6$$5, "addcslashes", NULL, 144, defaultValue, &_5$$5); + ZEPHIR_CALL_FUNCTION(&_6$$5, "addcslashes", NULL, 139, defaultValue, &_5$$5); zephir_check_call_status(); ZEPHIR_INIT_VAR(_7$$5); ZEPHIR_CONCAT_SVS(_7$$5, " DEFAULT \"", _6$$5, "\""); @@ -51671,7 +51833,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_MySQL, createTable) { } else { ZEPHIR_SINIT_NVAR(_8$$10); ZVAL_STRING(&_8$$10, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_9$$10, "addcslashes", &_10, 144, defaultValue, &_8$$10); + ZEPHIR_CALL_FUNCTION(&_9$$10, "addcslashes", &_10, 139, defaultValue, &_8$$10); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_11$$10); ZEPHIR_CONCAT_SVS(_11$$10, " DEFAULT \"", _9$$10, "\""); @@ -52149,14 +52311,14 @@ static PHP_METHOD(Phalcon_Db_Dialect_MySQL, describeReferences) { ZEPHIR_INIT_VAR(sql); - ZVAL_STRING(sql, "SELECT TABLE_NAME,COLUMN_NAME,CONSTRAINT_NAME,REFERENCED_TABLE_SCHEMA,REFERENCED_TABLE_NAME,REFERENCED_COLUMN_NAME FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE REFERENCED_TABLE_NAME IS NOT NULL AND ", 1); + ZVAL_STRING(sql, "SELECT KCU.TABLE_NAME, KCU.COLUMN_NAME, KCU.CONSTRAINT_NAME, KCU.REFERENCED_TABLE_SCHEMA, KCU.REFERENCED_TABLE_NAME, KCU.REFERENCED_COLUMN_NAME, RC.UPDATE_RULE, RC.DELETE_RULE FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE AS KCU LEFT JOIN INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS AS RC ON RC.CONSTRAINT_NAME = KCU.CONSTRAINT_NAME WHERE KCU.REFERENCED_TABLE_NAME IS NOT NULL AND ", 1); if (!(!schema) && Z_STRLEN_P(schema)) { ZEPHIR_INIT_VAR(_0$$3); - ZEPHIR_CONCAT_SVSVS(_0$$3, "CONSTRAINT_SCHEMA = '", schema, "' AND TABLE_NAME = '", table, "'"); + ZEPHIR_CONCAT_SVSVS(_0$$3, "KCU.CONSTRAINT_SCHEMA = '", schema, "' AND KCU.TABLE_NAME = '", table, "'"); zephir_concat_self(&sql, _0$$3 TSRMLS_CC); } else { ZEPHIR_INIT_VAR(_1$$4); - ZEPHIR_CONCAT_SVS(_1$$4, "TABLE_NAME = '", table, "'"); + ZEPHIR_CONCAT_SVS(_1$$4, "KCU.TABLE_NAME = '", table, "'"); zephir_concat_self(&sql, _1$$4 TSRMLS_CC); } RETURN_CCTOR(sql); @@ -52959,14 +53121,14 @@ static PHP_METHOD(Phalcon_Db_Dialect_Oracle, viewExists) { if (!ZEPHIR_IS_STRING(schemaName, "")) { - ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 145, viewName); + ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 140, viewName); zephir_check_call_status(); - ZEPHIR_CALL_CE_STATIC(&_2$$3, phalcon_text_ce, "upper", &_1, 145, schemaName); + ZEPHIR_CALL_CE_STATIC(&_2$$3, phalcon_text_ce, "upper", &_1, 140, schemaName); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "SELECT CASE WHEN COUNT(*) > 0 THEN 1 ELSE 0 END RET FROM ALL_VIEWS WHERE VIEW_NAME='", _0$$3, "' AND OWNER='", _2$$3, "'"); RETURN_MM(); } - ZEPHIR_CALL_CE_STATIC(&_3, phalcon_text_ce, "upper", &_1, 145, viewName); + ZEPHIR_CALL_CE_STATIC(&_3, phalcon_text_ce, "upper", &_1, 140, viewName); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, "SELECT CASE WHEN COUNT(*) > 0 THEN 1 ELSE 0 END RET FROM ALL_VIEWS WHERE VIEW_NAME='", _3, "'"); RETURN_MM(); @@ -52992,7 +53154,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Oracle, listViews) { if (!ZEPHIR_IS_STRING(schemaName, "")) { - ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 145, schemaName); + ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 140, schemaName); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, "SELECT VIEW_NAME FROM ALL_VIEWS WHERE OWNER='", _0$$3, "' ORDER BY VIEW_NAME"); RETURN_MM(); @@ -53030,14 +53192,14 @@ static PHP_METHOD(Phalcon_Db_Dialect_Oracle, tableExists) { if (!ZEPHIR_IS_STRING(schemaName, "")) { - ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 145, tableName); + ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 140, tableName); zephir_check_call_status(); - ZEPHIR_CALL_CE_STATIC(&_2$$3, phalcon_text_ce, "upper", &_1, 145, schemaName); + ZEPHIR_CALL_CE_STATIC(&_2$$3, phalcon_text_ce, "upper", &_1, 140, schemaName); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "SELECT CASE WHEN COUNT(*) > 0 THEN 1 ELSE 0 END RET FROM ALL_TABLES WHERE TABLE_NAME='", _0$$3, "' AND OWNER = '", _2$$3, "'"); RETURN_MM(); } - ZEPHIR_CALL_CE_STATIC(&_3, phalcon_text_ce, "upper", &_1, 145, tableName); + ZEPHIR_CALL_CE_STATIC(&_3, phalcon_text_ce, "upper", &_1, 140, tableName); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, "SELECT CASE WHEN COUNT(*) > 0 THEN 1 ELSE 0 END RET FROM ALL_TABLES WHERE TABLE_NAME='", _3, "'"); RETURN_MM(); @@ -53073,14 +53235,14 @@ static PHP_METHOD(Phalcon_Db_Dialect_Oracle, describeColumns) { if (!ZEPHIR_IS_STRING(schema, "")) { - ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 145, table); + ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 140, table); zephir_check_call_status(); - ZEPHIR_CALL_CE_STATIC(&_2$$3, phalcon_text_ce, "upper", &_1, 145, schema); + ZEPHIR_CALL_CE_STATIC(&_2$$3, phalcon_text_ce, "upper", &_1, 140, schema); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "SELECT TC.COLUMN_NAME, TC.DATA_TYPE, TC.DATA_LENGTH, TC.DATA_PRECISION, TC.DATA_SCALE, TC.NULLABLE, C.CONSTRAINT_TYPE, TC.DATA_DEFAULT, CC.POSITION FROM ALL_TAB_COLUMNS TC LEFT JOIN (ALL_CONS_COLUMNS CC JOIN ALL_CONSTRAINTS C ON (CC.CONSTRAINT_NAME = C.CONSTRAINT_NAME AND CC.TABLE_NAME = C.TABLE_NAME AND CC.OWNER = C.OWNER AND C.CONSTRAINT_TYPE = 'P')) ON TC.TABLE_NAME = CC.TABLE_NAME AND TC.COLUMN_NAME = CC.COLUMN_NAME WHERE TC.TABLE_NAME = '", _0$$3, "' AND TC.OWNER = '", _2$$3, "' ORDER BY TC.COLUMN_ID"); RETURN_MM(); } - ZEPHIR_CALL_CE_STATIC(&_3, phalcon_text_ce, "upper", &_1, 145, table); + ZEPHIR_CALL_CE_STATIC(&_3, phalcon_text_ce, "upper", &_1, 140, table); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, "SELECT TC.COLUMN_NAME, TC.DATA_TYPE, TC.DATA_LENGTH, TC.DATA_PRECISION, TC.DATA_SCALE, TC.NULLABLE, C.CONSTRAINT_TYPE, TC.DATA_DEFAULT, CC.POSITION FROM ALL_TAB_COLUMNS TC LEFT JOIN (ALL_CONS_COLUMNS CC JOIN ALL_CONSTRAINTS C ON (CC.CONSTRAINT_NAME = C.CONSTRAINT_NAME AND CC.TABLE_NAME = C.TABLE_NAME AND CC.OWNER = C.OWNER AND C.CONSTRAINT_TYPE = 'P')) ON TC.TABLE_NAME = CC.TABLE_NAME AND TC.COLUMN_NAME = CC.COLUMN_NAME WHERE TC.TABLE_NAME = '", _3, "' ORDER BY TC.COLUMN_ID"); RETURN_MM(); @@ -53106,7 +53268,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Oracle, listTables) { if (!ZEPHIR_IS_STRING(schemaName, "")) { - ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 145, schemaName); + ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 140, schemaName); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, "SELECT TABLE_NAME, OWNER FROM ALL_TABLES WHERE OWNER='", _0$$3, "' ORDER BY OWNER, TABLE_NAME"); RETURN_MM(); @@ -53144,14 +53306,14 @@ static PHP_METHOD(Phalcon_Db_Dialect_Oracle, describeIndexes) { if (!ZEPHIR_IS_STRING(schema, "")) { - ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 145, table); + ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 140, table); zephir_check_call_status(); - ZEPHIR_CALL_CE_STATIC(&_2$$3, phalcon_text_ce, "upper", &_1, 145, schema); + ZEPHIR_CALL_CE_STATIC(&_2$$3, phalcon_text_ce, "upper", &_1, 140, schema); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "SELECT I.TABLE_NAME, 0 AS C0, I.INDEX_NAME, IC.COLUMN_POSITION, IC.COLUMN_NAME FROM ALL_INDEXES I JOIN ALL_IND_COLUMNS IC ON I.INDEX_NAME = IC.INDEX_NAME WHERE I.TABLE_NAME = '", _0$$3, "' AND IC.INDEX_OWNER = '", _2$$3, "'"); RETURN_MM(); } - ZEPHIR_CALL_CE_STATIC(&_3, phalcon_text_ce, "upper", &_1, 145, table); + ZEPHIR_CALL_CE_STATIC(&_3, phalcon_text_ce, "upper", &_1, 140, table); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, "SELECT I.TABLE_NAME, 0 AS C0, I.INDEX_NAME, IC.COLUMN_POSITION, IC.COLUMN_NAME FROM ALL_INDEXES I JOIN ALL_IND_COLUMNS IC ON I.INDEX_NAME = IC.INDEX_NAME WHERE I.TABLE_NAME = '", _3, "'"); RETURN_MM(); @@ -53189,15 +53351,15 @@ static PHP_METHOD(Phalcon_Db_Dialect_Oracle, describeReferences) { ZEPHIR_INIT_VAR(sql); ZVAL_STRING(sql, "SELECT AC.TABLE_NAME, CC.COLUMN_NAME, AC.CONSTRAINT_NAME, AC.R_OWNER, RCC.TABLE_NAME R_TABLE_NAME, RCC.COLUMN_NAME R_COLUMN_NAME FROM ALL_CONSTRAINTS AC JOIN ALL_CONS_COLUMNS CC ON AC.CONSTRAINT_NAME = CC.CONSTRAINT_NAME JOIN ALL_CONS_COLUMNS RCC ON AC.R_OWNER = RCC.OWNER AND AC.R_CONSTRAINT_NAME = RCC.CONSTRAINT_NAME WHERE AC.CONSTRAINT_TYPE='R' ", 1); if (!ZEPHIR_IS_STRING(schema, "")) { - ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 145, schema); + ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 140, schema); zephir_check_call_status(); - ZEPHIR_CALL_CE_STATIC(&_2$$3, phalcon_text_ce, "upper", &_1, 145, table); + ZEPHIR_CALL_CE_STATIC(&_2$$3, phalcon_text_ce, "upper", &_1, 140, table); zephir_check_call_status(); ZEPHIR_INIT_VAR(_3$$3); ZEPHIR_CONCAT_SVSVS(_3$$3, "AND AC.OWNER='", _0$$3, "' AND AC.TABLE_NAME = '", _2$$3, "'"); zephir_concat_self(&sql, _3$$3 TSRMLS_CC); } else { - ZEPHIR_CALL_CE_STATIC(&_4$$4, phalcon_text_ce, "upper", &_1, 145, table); + ZEPHIR_CALL_CE_STATIC(&_4$$4, phalcon_text_ce, "upper", &_1, 140, table); zephir_check_call_status(); ZEPHIR_INIT_VAR(_5$$4); ZEPHIR_CONCAT_SVS(_5$$4, "AND AC.TABLE_NAME = '", _4$$4, "'"); @@ -53293,11 +53455,11 @@ static PHP_METHOD(Phalcon_Db_Dialect_Oracle, prepareTable) { } - ZEPHIR_CALL_CE_STATIC(&_1, phalcon_text_ce, "upper", &_2, 145, table); + ZEPHIR_CALL_CE_STATIC(&_1, phalcon_text_ce, "upper", &_2, 140, table); zephir_check_call_status(); - ZEPHIR_CALL_CE_STATIC(&_3, phalcon_text_ce, "upper", &_2, 145, schema); + ZEPHIR_CALL_CE_STATIC(&_3, phalcon_text_ce, "upper", &_2, 140, schema); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_PARENT(phalcon_db_dialect_oracle_ce, this_ptr, "preparetable", &_0, 146, _1, _3, alias, escapeChar); + ZEPHIR_RETURN_CALL_PARENT(phalcon_db_dialect_oracle_ce, this_ptr, "preparetable", &_0, 141, _1, _3, alias, escapeChar); zephir_check_call_status(); RETURN_MM(); @@ -53480,7 +53642,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, getColumnDefinition) { ZEPHIR_GET_HVALUE(value$$37, _11$$37); ZEPHIR_SINIT_NVAR(_12$$38); ZVAL_STRING(&_12$$38, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_13$$38, "addcslashes", &_14, 144, value$$37, &_12$$38); + ZEPHIR_CALL_FUNCTION(&_13$$38, "addcslashes", &_14, 139, value$$37, &_12$$38); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_15$$38); ZEPHIR_CONCAT_SVS(_15$$38, "\"", _13$$38, "\", "); @@ -53498,7 +53660,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, getColumnDefinition) { } else { ZEPHIR_SINIT_VAR(_20$$39); ZVAL_STRING(&_20$$39, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_21$$39, "addcslashes", &_14, 144, typeValues, &_20$$39); + ZEPHIR_CALL_FUNCTION(&_21$$39, "addcslashes", &_14, 139, typeValues, &_20$$39); zephir_check_call_status(); ZEPHIR_INIT_VAR(_22$$39); ZEPHIR_CONCAT_SVS(_22$$39, "(\"", _21$$39, "\")"); @@ -53579,7 +53741,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, addColumn) { } else { ZEPHIR_SINIT_VAR(_8$$6); ZVAL_STRING(&_8$$6, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_9$$6, "addcslashes", NULL, 144, defaultValue, &_8$$6); + ZEPHIR_CALL_FUNCTION(&_9$$6, "addcslashes", NULL, 139, defaultValue, &_8$$6); zephir_check_call_status(); ZEPHIR_INIT_VAR(_10$$6); ZEPHIR_CONCAT_SVS(_10$$6, " DEFAULT \"", _9$$6, "\""); @@ -53597,9 +53759,9 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, addColumn) { static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, modifyColumn) { - zend_bool _20$$8; + zend_bool _21$$8; int ZEPHIR_LAST_CALL_STATUS; - zval *tableName_param = NULL, *schemaName_param = NULL, *column, *currentColumn = NULL, *sql = NULL, *sqlAlterTable = NULL, *defaultValue = NULL, *columnDefinition = NULL, *_0 = NULL, *_1 = NULL, *_2 = NULL, *_6 = NULL, *_7 = NULL, *_10 = NULL, *_11 = NULL, *_17 = NULL, *_18 = NULL, *_3$$3 = NULL, *_4$$3 = NULL, *_5$$3, *_8$$4 = NULL, *_9$$4, *_12$$5 = NULL, *_13$$6 = NULL, *_14$$6, *_15$$7 = NULL, *_16$$7, *_19$$8 = NULL, *_21$$8 = NULL, *_24$$8 = NULL, *_22$$9 = NULL, *_23$$9, *_25$$10, *_26$$10, *_27$$11 = NULL, *_28$$11 = NULL, *_29$$11, *_30$$12 = NULL, *_31$$12, *_32$$13 = NULL, _33$$13, *_34$$13 = NULL, *_35$$13; + zval *tableName_param = NULL, *schemaName_param = NULL, *column, *currentColumn = NULL, *sql = NULL, *sqlAlterTable = NULL, *defaultValue = NULL, *columnDefinition = NULL, *_0 = NULL, *_1 = NULL, *_2 = NULL, *_3 = NULL, *_7 = NULL, *_8 = NULL, *_11 = NULL, *_12 = NULL, *_18 = NULL, *_19 = NULL, *_4$$3 = NULL, *_5$$3 = NULL, *_6$$3, *_9$$4 = NULL, *_10$$4, *_13$$5 = NULL, *_14$$6 = NULL, *_15$$6, *_16$$7 = NULL, *_17$$7, *_20$$8 = NULL, *_22$$8 = NULL, *_25$$8 = NULL, *_23$$9 = NULL, *_24$$9, *_26$$10, *_27$$10, *_28$$11 = NULL, *_29$$11 = NULL, *_30$$11, *_31$$12 = NULL, *_32$$12, *_33$$13 = NULL, _34$$13, *_35$$13 = NULL, *_36$$13; zval *tableName = NULL, *schemaName = NULL; ZEPHIR_MM_GROW(); @@ -53626,7 +53788,9 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, modifyColumn) { ZVAL_EMPTY_STRING(schemaName); } if (!currentColumn) { - currentColumn = ZEPHIR_GLOBAL(global_null); + ZEPHIR_CPY_WRT(currentColumn, ZEPHIR_GLOBAL(global_null)); + } else { + ZEPHIR_SEPARATE_PARAM(currentColumn); } @@ -53638,110 +53802,117 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, modifyColumn) { zephir_check_call_status(); ZEPHIR_INIT_VAR(sqlAlterTable); ZEPHIR_CONCAT_SV(sqlAlterTable, "ALTER TABLE ", _0); - ZEPHIR_CALL_METHOD(&_1, column, "getname", NULL, 0); + ZEPHIR_INIT_VAR(_1); + if (Z_TYPE_P(currentColumn) == IS_NULL) { + ZEPHIR_CPY_WRT(_1, column); + } else { + ZEPHIR_CPY_WRT(_1, currentColumn); + } + ZEPHIR_CPY_WRT(currentColumn, _1); + ZEPHIR_CALL_METHOD(&_2, column, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_2, currentColumn, "getname", NULL, 0); + ZEPHIR_CALL_METHOD(&_3, currentColumn, "getname", NULL, 0); zephir_check_call_status(); - if (!ZEPHIR_IS_EQUAL(_1, _2)) { - ZEPHIR_CALL_METHOD(&_3$$3, currentColumn, "getname", NULL, 0); + if (!ZEPHIR_IS_EQUAL(_2, _3)) { + ZEPHIR_CALL_METHOD(&_4$$3, currentColumn, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_4$$3, column, "getname", NULL, 0); + ZEPHIR_CALL_METHOD(&_5$$3, column, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_INIT_VAR(_5$$3); - ZEPHIR_CONCAT_VSVSVS(_5$$3, sqlAlterTable, " RENAME COLUMN \"", _3$$3, "\" TO \"", _4$$3, "\";"); - zephir_concat_self(&sql, _5$$3 TSRMLS_CC); + ZEPHIR_INIT_VAR(_6$$3); + ZEPHIR_CONCAT_VSVSVS(_6$$3, sqlAlterTable, " RENAME COLUMN \"", _4$$3, "\" TO \"", _5$$3, "\";"); + zephir_concat_self(&sql, _6$$3 TSRMLS_CC); } - ZEPHIR_CALL_METHOD(&_6, column, "gettype", NULL, 0); + ZEPHIR_CALL_METHOD(&_7, column, "gettype", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_7, currentColumn, "gettype", NULL, 0); + ZEPHIR_CALL_METHOD(&_8, currentColumn, "gettype", NULL, 0); zephir_check_call_status(); - if (!ZEPHIR_IS_EQUAL(_6, _7)) { - ZEPHIR_CALL_METHOD(&_8$$4, column, "getname", NULL, 0); + if (!ZEPHIR_IS_EQUAL(_7, _8)) { + ZEPHIR_CALL_METHOD(&_9$$4, column, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_INIT_VAR(_9$$4); - ZEPHIR_CONCAT_VSVSVS(_9$$4, sqlAlterTable, " ALTER COLUMN \"", _8$$4, "\" TYPE ", columnDefinition, ";"); - zephir_concat_self(&sql, _9$$4 TSRMLS_CC); + ZEPHIR_INIT_VAR(_10$$4); + ZEPHIR_CONCAT_VSVSVS(_10$$4, sqlAlterTable, " ALTER COLUMN \"", _9$$4, "\" TYPE ", columnDefinition, ";"); + zephir_concat_self(&sql, _10$$4 TSRMLS_CC); } - ZEPHIR_CALL_METHOD(&_10, column, "isnotnull", NULL, 0); + ZEPHIR_CALL_METHOD(&_11, column, "isnotnull", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_11, currentColumn, "isnotnull", NULL, 0); + ZEPHIR_CALL_METHOD(&_12, currentColumn, "isnotnull", NULL, 0); zephir_check_call_status(); - if (!ZEPHIR_IS_EQUAL(_10, _11)) { - ZEPHIR_CALL_METHOD(&_12$$5, column, "isnotnull", NULL, 0); + if (!ZEPHIR_IS_EQUAL(_11, _12)) { + ZEPHIR_CALL_METHOD(&_13$$5, column, "isnotnull", NULL, 0); zephir_check_call_status(); - if (zephir_is_true(_12$$5)) { - ZEPHIR_CALL_METHOD(&_13$$6, column, "getname", NULL, 0); + if (zephir_is_true(_13$$5)) { + ZEPHIR_CALL_METHOD(&_14$$6, column, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_INIT_VAR(_14$$6); - ZEPHIR_CONCAT_VSVS(_14$$6, sqlAlterTable, " ALTER COLUMN \"", _13$$6, "\" SET NOT NULL;"); - zephir_concat_self(&sql, _14$$6 TSRMLS_CC); + ZEPHIR_INIT_VAR(_15$$6); + ZEPHIR_CONCAT_VSVS(_15$$6, sqlAlterTable, " ALTER COLUMN \"", _14$$6, "\" SET NOT NULL;"); + zephir_concat_self(&sql, _15$$6 TSRMLS_CC); } else { - ZEPHIR_CALL_METHOD(&_15$$7, column, "getname", NULL, 0); + ZEPHIR_CALL_METHOD(&_16$$7, column, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_INIT_VAR(_16$$7); - ZEPHIR_CONCAT_VSVS(_16$$7, sqlAlterTable, " ALTER COLUMN \"", _15$$7, "\" DROP NOT NULL;"); - zephir_concat_self(&sql, _16$$7 TSRMLS_CC); + ZEPHIR_INIT_VAR(_17$$7); + ZEPHIR_CONCAT_VSVS(_17$$7, sqlAlterTable, " ALTER COLUMN \"", _16$$7, "\" DROP NOT NULL;"); + zephir_concat_self(&sql, _17$$7 TSRMLS_CC); } } - ZEPHIR_CALL_METHOD(&_17, column, "getdefault", NULL, 0); + ZEPHIR_CALL_METHOD(&_18, column, "getdefault", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_18, currentColumn, "getdefault", NULL, 0); + ZEPHIR_CALL_METHOD(&_19, currentColumn, "getdefault", NULL, 0); zephir_check_call_status(); - if (!ZEPHIR_IS_EQUAL(_17, _18)) { - ZEPHIR_CALL_METHOD(&_19$$8, column, "hasdefault", NULL, 0); + if (!ZEPHIR_IS_EQUAL(_18, _19)) { + ZEPHIR_CALL_METHOD(&_20$$8, column, "hasdefault", NULL, 0); zephir_check_call_status(); - _20$$8 = !zephir_is_true(_19$$8); - if (_20$$8) { - ZEPHIR_CALL_METHOD(&_21$$8, currentColumn, "getdefault", NULL, 0); + _21$$8 = !zephir_is_true(_20$$8); + if (_21$$8) { + ZEPHIR_CALL_METHOD(&_22$$8, currentColumn, "getdefault", NULL, 0); zephir_check_call_status(); - _20$$8 = !(ZEPHIR_IS_EMPTY(_21$$8)); + _21$$8 = !(ZEPHIR_IS_EMPTY(_22$$8)); } - if (_20$$8) { - ZEPHIR_CALL_METHOD(&_22$$9, column, "getname", NULL, 0); + if (_21$$8) { + ZEPHIR_CALL_METHOD(&_23$$9, column, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_INIT_VAR(_23$$9); - ZEPHIR_CONCAT_VSVS(_23$$9, sqlAlterTable, " ALTER COLUMN \"", _22$$9, "\" DROP DEFAULT;"); - zephir_concat_self(&sql, _23$$9 TSRMLS_CC); + ZEPHIR_INIT_VAR(_24$$9); + ZEPHIR_CONCAT_VSVS(_24$$9, sqlAlterTable, " ALTER COLUMN \"", _23$$9, "\" DROP DEFAULT;"); + zephir_concat_self(&sql, _24$$9 TSRMLS_CC); } - ZEPHIR_CALL_METHOD(&_24$$8, column, "hasdefault", NULL, 0); + ZEPHIR_CALL_METHOD(&_25$$8, column, "hasdefault", NULL, 0); zephir_check_call_status(); - if (zephir_is_true(_24$$8)) { + if (zephir_is_true(_25$$8)) { ZEPHIR_CALL_METHOD(&defaultValue, column, "getdefault", NULL, 0); zephir_check_call_status(); - ZEPHIR_INIT_VAR(_25$$10); - zephir_fast_strtoupper(_25$$10, columnDefinition); ZEPHIR_INIT_VAR(_26$$10); - zephir_fast_strtoupper(_26$$10, defaultValue); - if (zephir_memnstr_str(_25$$10, SL("BOOLEAN"), "phalcon/db/dialect/postgresql.zep", 238)) { - ZEPHIR_CALL_METHOD(&_27$$11, column, "getname", NULL, 0); + zephir_fast_strtoupper(_26$$10, columnDefinition); + ZEPHIR_INIT_VAR(_27$$10); + zephir_fast_strtoupper(_27$$10, defaultValue); + if (zephir_memnstr_str(_26$$10, SL("BOOLEAN"), "phalcon/db/dialect/postgresql.zep", 239)) { + ZEPHIR_CALL_METHOD(&_28$$11, column, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_INIT_VAR(_28$$11); + ZEPHIR_INIT_VAR(_29$$11); if (zephir_is_true(defaultValue)) { - ZEPHIR_INIT_NVAR(_28$$11); - ZVAL_STRING(_28$$11, "true", 1); + ZEPHIR_INIT_NVAR(_29$$11); + ZVAL_STRING(_29$$11, "true", 1); } else { - ZEPHIR_INIT_NVAR(_28$$11); - ZVAL_STRING(_28$$11, "false", 1); + ZEPHIR_INIT_NVAR(_29$$11); + ZVAL_STRING(_29$$11, "false", 1); } - ZEPHIR_INIT_VAR(_29$$11); - ZEPHIR_CONCAT_SVSV(_29$$11, " ALTER COLUMN \"", _27$$11, "\" SET DEFAULT ", _28$$11); - zephir_concat_self(&sql, _29$$11 TSRMLS_CC); - } else if (zephir_memnstr_str(_26$$10, SL("CURRENT_TIMESTAMP"), "phalcon/db/dialect/postgresql.zep", 240)) { - ZEPHIR_CALL_METHOD(&_30$$12, column, "getname", NULL, 0); + ZEPHIR_INIT_VAR(_30$$11); + ZEPHIR_CONCAT_SVSV(_30$$11, " ALTER COLUMN \"", _28$$11, "\" SET DEFAULT ", _29$$11); + zephir_concat_self(&sql, _30$$11 TSRMLS_CC); + } else if (zephir_memnstr_str(_27$$10, SL("CURRENT_TIMESTAMP"), "phalcon/db/dialect/postgresql.zep", 241)) { + ZEPHIR_CALL_METHOD(&_31$$12, column, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_INIT_VAR(_31$$12); - ZEPHIR_CONCAT_VSVS(_31$$12, sqlAlterTable, " ALTER COLUMN \"", _30$$12, "\" SET DEFAULT CURRENT_TIMESTAMP"); - zephir_concat_self(&sql, _31$$12 TSRMLS_CC); + ZEPHIR_INIT_VAR(_32$$12); + ZEPHIR_CONCAT_VSVS(_32$$12, sqlAlterTable, " ALTER COLUMN \"", _31$$12, "\" SET DEFAULT CURRENT_TIMESTAMP"); + zephir_concat_self(&sql, _32$$12 TSRMLS_CC); } else { - ZEPHIR_CALL_METHOD(&_32$$13, column, "getname", NULL, 0); + ZEPHIR_CALL_METHOD(&_33$$13, column, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_SINIT_VAR(_33$$13); - ZVAL_STRING(&_33$$13, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_34$$13, "addcslashes", NULL, 144, defaultValue, &_33$$13); + ZEPHIR_SINIT_VAR(_34$$13); + ZVAL_STRING(&_34$$13, "\"", 0); + ZEPHIR_CALL_FUNCTION(&_35$$13, "addcslashes", NULL, 139, defaultValue, &_34$$13); zephir_check_call_status(); - ZEPHIR_INIT_VAR(_35$$13); - ZEPHIR_CONCAT_VSVSVS(_35$$13, sqlAlterTable, " ALTER COLUMN \"", _32$$13, "\" SET DEFAULT \"", _34$$13, "\""); - zephir_concat_self(&sql, _35$$13 TSRMLS_CC); + ZEPHIR_INIT_VAR(_36$$13); + ZEPHIR_CONCAT_VSVSVS(_36$$13, sqlAlterTable, " ALTER COLUMN \"", _33$$13, "\" SET DEFAULT \"", _35$$13, "\""); + zephir_concat_self(&sql, _36$$13 TSRMLS_CC); } } } @@ -54138,7 +54309,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) { ZEPHIR_OBS_VAR(columns); if (!(zephir_array_isset_string_fetch(&columns, definition, SS("columns"), 0 TSRMLS_CC))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "The index 'columns' is required in the definition array", "phalcon/db/dialect/postgresql.zep", 350); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "The index 'columns' is required in the definition array", "phalcon/db/dialect/postgresql.zep", 351); return; } ZEPHIR_CALL_METHOD(&table, this_ptr, "preparetable", NULL, 0, tableName, schemaName); @@ -54160,7 +54331,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) { array_init(createLines); ZEPHIR_INIT_VAR(primaryColumns); array_init(primaryColumns); - zephir_is_iterable(columns, &_1, &_0, 0, 0, "phalcon/db/dialect/postgresql.zep", 406); + zephir_is_iterable(columns, &_1, &_0, 0, 0, "phalcon/db/dialect/postgresql.zep", 407); for ( ; zephir_hash_get_current_data_ex(_1, (void**) &_2, &_0) == SUCCESS ; zephir_hash_move_forward_ex(_1, &_0) @@ -54181,7 +54352,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) { zephir_fast_strtoupper(_6$$8, columnDefinition); ZEPHIR_INIT_NVAR(_7$$8); zephir_fast_strtoupper(_7$$8, defaultValue); - if (zephir_memnstr_str(_6$$8, SL("BOOLEAN"), "phalcon/db/dialect/postgresql.zep", 381)) { + if (zephir_memnstr_str(_6$$8, SL("BOOLEAN"), "phalcon/db/dialect/postgresql.zep", 382)) { ZEPHIR_INIT_LNVAR(_8$$9); if (zephir_is_true(defaultValue)) { ZEPHIR_INIT_NVAR(_8$$9); @@ -54193,12 +54364,12 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) { ZEPHIR_INIT_LNVAR(_9$$9); ZEPHIR_CONCAT_SV(_9$$9, " DEFAULT ", _8$$9); zephir_concat_self(&sql, _9$$9 TSRMLS_CC); - } else if (zephir_memnstr_str(_7$$8, SL("CURRENT_TIMESTAMP"), "phalcon/db/dialect/postgresql.zep", 383)) { + } else if (zephir_memnstr_str(_7$$8, SL("CURRENT_TIMESTAMP"), "phalcon/db/dialect/postgresql.zep", 384)) { zephir_concat_self_str(&columnLine, SL(" DEFAULT CURRENT_TIMESTAMP") TSRMLS_CC); } else { ZEPHIR_SINIT_NVAR(_10$$11); ZVAL_STRING(&_10$$11, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_11$$11, "addcslashes", &_12, 144, defaultValue, &_10$$11); + ZEPHIR_CALL_FUNCTION(&_11$$11, "addcslashes", &_12, 139, defaultValue, &_10$$11); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_13$$11); ZEPHIR_CONCAT_SVS(_13$$11, " DEFAULT \"", _11$$11, "\""); @@ -54215,22 +54386,22 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) { if (zephir_is_true(_15$$7)) { ZEPHIR_CALL_METHOD(&_16$$13, column, "getname", NULL, 0); zephir_check_call_status(); - zephir_array_append(&primaryColumns, _16$$13, PH_SEPARATE, "phalcon/db/dialect/postgresql.zep", 401); + zephir_array_append(&primaryColumns, _16$$13, PH_SEPARATE, "phalcon/db/dialect/postgresql.zep", 402); } - zephir_array_append(&createLines, columnLine, PH_SEPARATE, "phalcon/db/dialect/postgresql.zep", 404); + zephir_array_append(&createLines, columnLine, PH_SEPARATE, "phalcon/db/dialect/postgresql.zep", 405); } if (!(ZEPHIR_IS_EMPTY(primaryColumns))) { ZEPHIR_CALL_METHOD(&_17$$14, this_ptr, "getcolumnlist", NULL, 44, primaryColumns); zephir_check_call_status(); ZEPHIR_INIT_VAR(_18$$14); ZEPHIR_CONCAT_SVS(_18$$14, "PRIMARY KEY (", _17$$14, ")"); - zephir_array_append(&createLines, _18$$14, PH_SEPARATE, "phalcon/db/dialect/postgresql.zep", 407); + zephir_array_append(&createLines, _18$$14, PH_SEPARATE, "phalcon/db/dialect/postgresql.zep", 408); } ZEPHIR_INIT_VAR(indexSqlAfterCreate); ZVAL_STRING(indexSqlAfterCreate, "", 1); ZEPHIR_OBS_VAR(indexes); if (zephir_array_isset_string_fetch(&indexes, definition, SS("indexes"), 0 TSRMLS_CC)) { - zephir_is_iterable(indexes, &_20$$15, &_19$$15, 0, 0, "phalcon/db/dialect/postgresql.zep", 441); + zephir_is_iterable(indexes, &_20$$15, &_19$$15, 0, 0, "phalcon/db/dialect/postgresql.zep", 442); for ( ; zephir_hash_get_current_data_ex(_20$$15, (void**) &_21$$15, &_19$$15) == SUCCESS ; zephir_hash_move_forward_ex(_20$$15, &_19$$15) @@ -54260,7 +54431,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) { } else { ZEPHIR_CALL_METHOD(&_26$$20, index, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_27$$20, this_ptr, "preparetable", NULL, 146, tableName, schemaName); + ZEPHIR_CALL_METHOD(&_27$$20, this_ptr, "preparetable", NULL, 141, tableName, schemaName); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_28$$20); ZEPHIR_CONCAT_SVSV(_28$$20, "CREATE INDEX \"", _26$$20, "\" ON ", _27$$20); @@ -54275,13 +54446,13 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) { } } if (!(ZEPHIR_IS_EMPTY(indexSql))) { - zephir_array_append(&createLines, indexSql, PH_SEPARATE, "phalcon/db/dialect/postgresql.zep", 438); + zephir_array_append(&createLines, indexSql, PH_SEPARATE, "phalcon/db/dialect/postgresql.zep", 439); } } } ZEPHIR_OBS_VAR(references); if (zephir_array_isset_string_fetch(&references, definition, SS("references"), 0 TSRMLS_CC)) { - zephir_is_iterable(references, &_33$$22, &_32$$22, 0, 0, "phalcon/db/dialect/postgresql.zep", 466); + zephir_is_iterable(references, &_33$$22, &_32$$22, 0, 0, "phalcon/db/dialect/postgresql.zep", 467); for ( ; zephir_hash_get_current_data_ex(_33$$22, (void**) &_34$$22, &_32$$22) == SUCCESS ; zephir_hash_move_forward_ex(_33$$22, &_32$$22) @@ -54297,7 +54468,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) { ZEPHIR_CONCAT_SVSVS(referenceSql, "CONSTRAINT \"", _35$$23, "\" FOREIGN KEY (", _36$$23, ") REFERENCES "); ZEPHIR_CALL_METHOD(&_39$$23, reference, "getreferencedtable", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_38$$23, this_ptr, "preparetable", NULL, 146, _39$$23, schemaName); + ZEPHIR_CALL_METHOD(&_38$$23, this_ptr, "preparetable", NULL, 141, _39$$23, schemaName); zephir_check_call_status(); zephir_concat_self(&referenceSql, _38$$23 TSRMLS_CC); ZEPHIR_CALL_METHOD(&_41$$23, reference, "getreferencedcolumns", NULL, 0); @@ -54321,7 +54492,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) { ZEPHIR_CONCAT_SV(_44$$25, " ON UPDATE ", onUpdate); zephir_concat_self(&referenceSql, _44$$25 TSRMLS_CC); } - zephir_array_append(&createLines, referenceSql, PH_SEPARATE, "phalcon/db/dialect/postgresql.zep", 464); + zephir_array_append(&createLines, referenceSql, PH_SEPARATE, "phalcon/db/dialect/postgresql.zep", 465); } } ZEPHIR_INIT_VAR(_45); @@ -54423,7 +54594,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createView) { ZEPHIR_OBS_VAR(viewSql); if (!(zephir_array_isset_string_fetch(&viewSql, definition, SS("sql"), 0 TSRMLS_CC))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "The index 'sql' is required in the definition array", "phalcon/db/dialect/postgresql.zep", 503); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "The index 'sql' is required in the definition array", "phalcon/db/dialect/postgresql.zep", 504); return; } ZEPHIR_CALL_METHOD(&_0, this_ptr, "preparetable", NULL, 0, viewName, schemaName); @@ -54891,7 +55062,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, getColumnDefinition) { ZEPHIR_GET_HVALUE(value$$25, _12$$25); ZEPHIR_SINIT_NVAR(_13$$26); ZVAL_STRING(&_13$$26, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_14$$26, "addcslashes", &_15, 144, value$$25, &_13$$26); + ZEPHIR_CALL_FUNCTION(&_14$$26, "addcslashes", &_15, 139, value$$25, &_13$$26); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_16$$26); ZEPHIR_CONCAT_SVS(_16$$26, "\"", _14$$26, "\", "); @@ -54909,7 +55080,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, getColumnDefinition) { } else { ZEPHIR_SINIT_VAR(_21$$27); ZVAL_STRING(&_21$$27, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_22$$27, "addcslashes", &_15, 144, typeValues, &_21$$27); + ZEPHIR_CALL_FUNCTION(&_22$$27, "addcslashes", &_15, 139, typeValues, &_21$$27); zephir_check_call_status(); ZEPHIR_INIT_VAR(_23$$27); ZEPHIR_CONCAT_SVS(_23$$27, "(\"", _22$$27, "\")"); @@ -54976,7 +55147,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, addColumn) { } else { ZEPHIR_SINIT_VAR(_6$$5); ZVAL_STRING(&_6$$5, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_7$$5, "addcslashes", NULL, 144, defaultValue, &_6$$5); + ZEPHIR_CALL_FUNCTION(&_7$$5, "addcslashes", NULL, 139, defaultValue, &_6$$5); zephir_check_call_status(); ZEPHIR_INIT_VAR(_8$$5); ZEPHIR_CONCAT_SVS(_8$$5, " DEFAULT \"", _7$$5, "\""); @@ -55445,7 +55616,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, createTable) { } else { ZEPHIR_SINIT_NVAR(_12$$12); ZVAL_STRING(&_12$$12, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_13$$12, "addcslashes", &_14, 144, defaultValue, &_12$$12); + ZEPHIR_CALL_FUNCTION(&_13$$12, "addcslashes", &_14, 139, defaultValue, &_12$$12); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_15$$12); ZEPHIR_CONCAT_SVS(_15$$12, " DEFAULT \"", _13$$12, "\""); @@ -56640,7 +56811,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, all) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "variables", 1); zephir_array_fast_append(_0, _1); - ZEPHIR_CALL_FUNCTION(&_2, "func_get_args", NULL, 168); + ZEPHIR_CALL_FUNCTION(&_2, "func_get_args", NULL, 163); zephir_check_call_status(); ZEPHIR_CALL_USER_FUNC_ARRAY(return_value, _0, _2); zephir_check_call_status(); @@ -56839,7 +57010,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, output) { ZVAL_STRING(_21$$7, "", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_INIT_NVAR(_22$$7); ZVAL_LONG(_22$$7, (tab + 1)); - ZEPHIR_CALL_METHOD(&_20$$7, this_ptr, "output", &_23, 169, value, _21$$7, _22$$7); + ZEPHIR_CALL_METHOD(&_20$$7, this_ptr, "output", &_23, 164, value, _21$$7, _22$$7); zephir_check_temp_parameter(_21$$7); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_24$$7); @@ -56871,7 +57042,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, output) { ZEPHIR_CALL_FUNCTION(&_27$$8, "strtr", &_6, 55, &_29$$8, _26$$8); zephir_check_call_status(); zephir_concat_self(&output, _27$$8 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_30$$8, "get_parent_class", &_31, 170, variable); + ZEPHIR_CALL_FUNCTION(&_30$$8, "get_parent_class", &_31, 165, variable); zephir_check_call_status(); if (zephir_is_true(_30$$8)) { ZEPHIR_INIT_VAR(_32$$9); @@ -56882,7 +57053,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, output) { zephir_check_temp_parameter(_34$$9); zephir_check_call_status(); zephir_array_update_string(&_32$$9, SL(":style"), &_33$$9, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_FUNCTION(&_33$$9, "get_parent_class", &_31, 170, variable); + ZEPHIR_CALL_FUNCTION(&_33$$9, "get_parent_class", &_31, 165, variable); zephir_check_call_status(); zephir_array_update_string(&_32$$9, SL(":parent"), &_33$$9, PH_COPY | PH_SEPARATE); ZEPHIR_SINIT_VAR(_35$$9); @@ -56928,7 +57099,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, output) { ZVAL_STRING(_45$$11, "", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_INIT_NVAR(_48$$11); ZVAL_LONG(_48$$11, (tab + 1)); - ZEPHIR_CALL_METHOD(&_47$$11, this_ptr, "output", &_23, 169, value, _45$$11, _48$$11); + ZEPHIR_CALL_METHOD(&_47$$11, this_ptr, "output", &_23, 164, value, _45$$11, _48$$11); zephir_check_temp_parameter(_45$$11); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_49$$11); @@ -56938,7 +57109,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, output) { } else { do { ZEPHIR_MAKE_REF(variable); - ZEPHIR_CALL_FUNCTION(&attr, "each", &_50, 171, variable); + ZEPHIR_CALL_FUNCTION(&attr, "each", &_50, 166, variable); ZEPHIR_UNREF(variable); zephir_check_call_status(); if (!(zephir_is_true(attr))) { @@ -56984,7 +57155,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, output) { zephir_check_call_status(); zephir_array_update_string(&_59$$13, SL(":style"), &_60$$13, PH_COPY | PH_SEPARATE); ZEPHIR_MAKE_REF(key); - ZEPHIR_CALL_FUNCTION(&_60$$13, "end", &_61, 172, key); + ZEPHIR_CALL_FUNCTION(&_60$$13, "end", &_61, 167, key); ZEPHIR_UNREF(key); zephir_check_call_status(); zephir_array_update_string(&_59$$13, SL(":key"), &_60$$13, PH_COPY | PH_SEPARATE); @@ -57000,7 +57171,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, output) { ZVAL_STRING(_51$$13, "", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_INIT_NVAR(_64$$13); ZVAL_LONG(_64$$13, (tab + 1)); - ZEPHIR_CALL_METHOD(&_63$$13, this_ptr, "output", &_23, 169, value, _51$$13, _64$$13); + ZEPHIR_CALL_METHOD(&_63$$13, this_ptr, "output", &_23, 164, value, _51$$13, _64$$13); zephir_check_temp_parameter(_51$$13); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_65$$13); @@ -57008,7 +57179,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, output) { zephir_concat_self(&output, _65$$13 TSRMLS_CC); } while (zephir_is_true(attr)); } - ZEPHIR_CALL_FUNCTION(&attr, "get_class_methods", NULL, 173, variable); + ZEPHIR_CALL_FUNCTION(&attr, "get_class_methods", NULL, 168, variable); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_29$$8); ZVAL_LONG(&_29$$8, tab); @@ -57130,7 +57301,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, output) { ZEPHIR_CONCAT_VV(return_value, output, _95$$23); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_98, "is_float", NULL, 174, variable); + ZEPHIR_CALL_FUNCTION(&_98, "is_float", NULL, 169, variable); zephir_check_call_status(); if (zephir_is_true(_98)) { ZEPHIR_INIT_VAR(_99$$24); @@ -57181,9 +57352,9 @@ static PHP_METHOD(Phalcon_Debug_Dump, output) { ZVAL_LONG(&_110$$26, 4); ZEPHIR_SINIT_VAR(_111$$26); ZVAL_STRING(&_111$$26, "utf-8", 0); - ZEPHIR_CALL_FUNCTION(&_108$$26, "htmlentities", NULL, 154, variable, &_110$$26, &_111$$26); + ZEPHIR_CALL_FUNCTION(&_108$$26, "htmlentities", NULL, 149, variable, &_110$$26, &_111$$26); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_112$$26, "nl2br", NULL, 175, _108$$26); + ZEPHIR_CALL_FUNCTION(&_112$$26, "nl2br", NULL, 170, _108$$26); zephir_check_call_status(); zephir_array_update_string(&_107$$26, SL(":var"), &_112$$26, PH_COPY | PH_SEPARATE); ZEPHIR_SINIT_NVAR(_110$$26); @@ -57301,7 +57472,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, variables) { ZEPHIR_INIT_VAR(output); ZVAL_STRING(output, "", 1); - ZEPHIR_CALL_FUNCTION(&_0, "func_get_args", NULL, 168); + ZEPHIR_CALL_FUNCTION(&_0, "func_get_args", NULL, 163); zephir_check_call_status(); zephir_is_iterable(_0, &_2, &_1, 0, 0, "phalcon/debug/dump.zep", 290); for ( @@ -58070,7 +58241,7 @@ static PHP_METHOD(Phalcon_Di_Service, resolve) { ZEPHIR_CALL_METHOD(NULL, builder, "__construct", NULL, 0); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&instance, builder, "build", NULL, 177, dependencyInjector, definition, parameters); + ZEPHIR_CALL_METHOD(&instance, builder, "build", NULL, 172, dependencyInjector, definition, parameters); zephir_check_call_status(); } else { found = 0; @@ -58271,7 +58442,7 @@ static PHP_METHOD(Phalcon_Di_FactoryDefault_Cli, __construct) { ZEPHIR_MM_GROW(); - ZEPHIR_CALL_PARENT(NULL, phalcon_di_factorydefault_cli_ce, this_ptr, "__construct", &_0, 176); + ZEPHIR_CALL_PARENT(NULL, phalcon_di_factorydefault_cli_ce, this_ptr, "__construct", &_0, 171); zephir_check_call_status(); ZEPHIR_INIT_VAR(_1); zephir_create_array(_1, 10, 0 TSRMLS_CC); @@ -58571,7 +58742,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, _buildParameters) { ) { ZEPHIR_GET_HMKEY(position, _1, _0); ZEPHIR_GET_HVALUE(argument, _2); - ZEPHIR_CALL_METHOD(&_3$$3, this_ptr, "_buildparameter", &_4, 178, dependencyInjector, position, argument); + ZEPHIR_CALL_METHOD(&_3$$3, this_ptr, "_buildparameter", &_4, 173, dependencyInjector, position, argument); zephir_check_call_status(); zephir_array_append(&buildArguments, _3$$3, PH_SEPARATE, "phalcon/di/service/builder.zep", 117); } @@ -58615,7 +58786,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build) { } else { ZEPHIR_OBS_VAR(arguments); if (zephir_array_isset_string_fetch(&arguments, definition, SS("arguments"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_0$$8, this_ptr, "_buildparameters", &_1, 179, dependencyInjector, arguments); + ZEPHIR_CALL_METHOD(&_0$$8, this_ptr, "_buildparameters", &_1, 174, dependencyInjector, arguments); zephir_check_call_status(); ZEPHIR_INIT_NVAR(instance); ZEPHIR_LAST_CALL_STATUS = zephir_create_instance_params(instance, className, _0$$8 TSRMLS_CC); @@ -58685,7 +58856,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build) { } if (zephir_fast_count_int(arguments TSRMLS_CC)) { ZEPHIR_INIT_NVAR(_12$$18); - ZEPHIR_CALL_METHOD(&_13$$18, this_ptr, "_buildparameters", &_1, 179, dependencyInjector, arguments); + ZEPHIR_CALL_METHOD(&_13$$18, this_ptr, "_buildparameters", &_1, 174, dependencyInjector, arguments); zephir_check_call_status(); ZEPHIR_CALL_USER_FUNC_ARRAY(_12$$18, methodCall, _13$$18); zephir_check_call_status(); @@ -58749,7 +58920,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build) { ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_24$$22, this_ptr, "_buildparameter", &_25, 178, dependencyInjector, propertyPosition, propertyValue); + ZEPHIR_CALL_METHOD(&_24$$22, this_ptr, "_buildparameter", &_25, 173, dependencyInjector, propertyPosition, propertyValue); zephir_check_call_status(); zephir_update_property_zval_zval(instance, propertyName, _24$$22 TSRMLS_CC); } @@ -59067,7 +59238,7 @@ static PHP_METHOD(Phalcon_Events_Manager, attach) { } ZEPHIR_INIT_VAR(_2$$5); ZVAL_LONG(_2$$5, 1); - ZEPHIR_CALL_METHOD(NULL, priorityQueue, "setextractflags", NULL, 186, _2$$5); + ZEPHIR_CALL_METHOD(NULL, priorityQueue, "setextractflags", NULL, 181, _2$$5); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("_events"), eventType, priorityQueue TSRMLS_CC); } else { @@ -59077,7 +59248,7 @@ static PHP_METHOD(Phalcon_Events_Manager, attach) { if (Z_TYPE_P(priorityQueue) == IS_OBJECT) { ZEPHIR_INIT_VAR(_3$$7); ZVAL_LONG(_3$$7, priority); - ZEPHIR_CALL_METHOD(NULL, priorityQueue, "insert", NULL, 187, handler, _3$$7); + ZEPHIR_CALL_METHOD(NULL, priorityQueue, "insert", NULL, 182, handler, _3$$7); zephir_check_call_status(); } else { zephir_array_append(&priorityQueue, handler, PH_SEPARATE, "phalcon/events/manager.zep", 82); @@ -59125,7 +59296,7 @@ static PHP_METHOD(Phalcon_Events_Manager, detach) { } ZEPHIR_INIT_VAR(_1$$5); ZVAL_LONG(_1$$5, 1); - ZEPHIR_CALL_METHOD(NULL, newPriorityQueue, "setextractflags", NULL, 186, _1$$5); + ZEPHIR_CALL_METHOD(NULL, newPriorityQueue, "setextractflags", NULL, 181, _1$$5); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_1$$5); ZVAL_LONG(_1$$5, 3); @@ -59147,13 +59318,13 @@ static PHP_METHOD(Phalcon_Events_Manager, detach) { if (!ZEPHIR_IS_IDENTICAL(_5$$6, handler)) { zephir_array_fetch_string(&_6$$7, data, SL("data"), PH_NOISY | PH_READONLY, "phalcon/events/manager.zep", 117 TSRMLS_CC); zephir_array_fetch_string(&_7$$7, data, SL("priority"), PH_NOISY | PH_READONLY, "phalcon/events/manager.zep", 117 TSRMLS_CC); - ZEPHIR_CALL_METHOD(NULL, newPriorityQueue, "insert", &_8, 187, _6$$7, _7$$7); + ZEPHIR_CALL_METHOD(NULL, newPriorityQueue, "insert", &_8, 182, _6$$7, _7$$7); zephir_check_call_status(); } } zephir_update_property_array(this_ptr, SL("_events"), eventType, newPriorityQueue TSRMLS_CC); } else { - ZEPHIR_CALL_FUNCTION(&key, "array_search", NULL, 188, handler, priorityQueue, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(&key, "array_search", NULL, 183, handler, priorityQueue, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(key)) { zephir_array_unset(&priorityQueue, key, PH_SEPARATE); @@ -59318,7 +59489,7 @@ static PHP_METHOD(Phalcon_Events_Manager, fireQueue) { zephir_get_class(_1$$5, queue, 0 TSRMLS_CC); ZEPHIR_SINIT_VAR(_2$$5); ZVAL_STRING(&_2$$5, "Unexpected value type: expected object of type SplPriorityQueue, %s given", 0); - ZEPHIR_CALL_FUNCTION(&_3$$5, "sprintf", NULL, 189, &_2$$5, _1$$5); + ZEPHIR_CALL_FUNCTION(&_3$$5, "sprintf", NULL, 184, &_2$$5, _1$$5); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, _0$$5, "__construct", NULL, 9, _3$$5); zephir_check_call_status(); @@ -59536,9 +59707,9 @@ static PHP_METHOD(Phalcon_Events_Manager, fire) { } else { ZVAL_BOOL(_4$$7, 0); } - ZEPHIR_CALL_METHOD(NULL, event, "__construct", &_5, 190, eventName, source, data, _4$$7); + ZEPHIR_CALL_METHOD(NULL, event, "__construct", &_5, 185, eventName, source, data, _4$$7); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", &_6, 191, fireEvents, event); + ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", &_6, 186, fireEvents, event); zephir_check_call_status(); } } @@ -59558,10 +59729,10 @@ static PHP_METHOD(Phalcon_Events_Manager, fire) { } else { ZVAL_BOOL(_8$$10, 0); } - ZEPHIR_CALL_METHOD(NULL, event, "__construct", &_5, 190, eventName, source, data, _8$$10); + ZEPHIR_CALL_METHOD(NULL, event, "__construct", &_5, 185, eventName, source, data, _8$$10); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", &_6, 191, fireEvents, event); + ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", &_6, 186, fireEvents, event); zephir_check_call_status(); } } @@ -59772,7 +59943,7 @@ static PHP_METHOD(Phalcon_Flash_Direct, output) { } } if (remove) { - ZEPHIR_CALL_PARENT(NULL, phalcon_flash_direct_ce, this_ptr, "clear", &_3, 198); + ZEPHIR_CALL_PARENT(NULL, phalcon_flash_direct_ce, this_ptr, "clear", &_3, 193); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -60073,7 +60244,7 @@ static PHP_METHOD(Phalcon_Flash_Session, output) { zephir_check_call_status(); } } - ZEPHIR_CALL_PARENT(NULL, phalcon_flash_session_ce, this_ptr, "clear", &_5, 198); + ZEPHIR_CALL_PARENT(NULL, phalcon_flash_session_ce, this_ptr, "clear", &_5, 193); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -60091,7 +60262,7 @@ static PHP_METHOD(Phalcon_Flash_Session, clear) { ZVAL_BOOL(_0, 1); ZEPHIR_CALL_METHOD(NULL, this_ptr, "_getsessionmessages", NULL, 0, _0); zephir_check_call_status(); - ZEPHIR_CALL_PARENT(NULL, phalcon_flash_session_ce, this_ptr, "clear", &_1, 198); + ZEPHIR_CALL_PARENT(NULL, phalcon_flash_session_ce, this_ptr, "clear", &_1, 193); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -61101,7 +61272,7 @@ static PHP_METHOD(Phalcon_Forms_Form, bind) { ZEPHIR_CPY_WRT(filteredValue, value); } ZEPHIR_INIT_NVAR(_6$$4); - zephir_camelize(_6$$4, key); + zephir_camelize(_6$$4, key, NULL ); ZEPHIR_INIT_NVAR(method); ZEPHIR_CONCAT_SV(method, "set", _6$$4); if ((zephir_method_exists(entity, method TSRMLS_CC) == SUCCESS)) { @@ -61204,7 +61375,7 @@ static PHP_METHOD(Phalcon_Forms_Form, isValid) { } else { ZEPHIR_INIT_NVAR(validation); object_init_ex(validation, phalcon_validation_ce); - ZEPHIR_CALL_METHOD(NULL, validation, "__construct", &_11, 212, preparedValidators); + ZEPHIR_CALL_METHOD(NULL, validation, "__construct", &_11, 207, preparedValidators); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(&filters, element, "getfilters", NULL, 0); @@ -61212,10 +61383,10 @@ static PHP_METHOD(Phalcon_Forms_Form, isValid) { if (Z_TYPE_P(filters) == IS_ARRAY) { ZEPHIR_CALL_METHOD(&_12$$16, element, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, validation, "setfilters", &_13, 213, _12$$16, filters); + ZEPHIR_CALL_METHOD(NULL, validation, "setfilters", &_13, 208, _12$$16, filters); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&elementMessages, validation, "validate", &_14, 214, data, entity); + ZEPHIR_CALL_METHOD(&elementMessages, validation, "validate", &_14, 209, data, entity); zephir_check_call_status(); if (zephir_fast_count_int(elementMessages TSRMLS_CC)) { ZEPHIR_CALL_METHOD(&_15$$17, element, "getname", NULL, 0); @@ -61278,7 +61449,7 @@ static PHP_METHOD(Phalcon_Forms_Form, getMessages) { ; zephir_hash_move_forward_ex(_2$$5, &_1$$5) ) { ZEPHIR_GET_HVALUE(elementMessages, _3$$5); - ZEPHIR_CALL_METHOD(NULL, group, "appendmessages", &_4, 215, elementMessages); + ZEPHIR_CALL_METHOD(NULL, group, "appendmessages", &_4, 210, elementMessages); zephir_check_call_status(); } } @@ -61591,7 +61762,7 @@ static PHP_METHOD(Phalcon_Forms_Form, getValue) { } if (Z_TYPE_P(entity) == IS_OBJECT) { ZEPHIR_INIT_VAR(_0$$4); - zephir_camelize(_0$$4, name); + zephir_camelize(_0$$4, name, NULL ); ZEPHIR_INIT_VAR(method); ZEPHIR_CONCAT_SV(method, "get", _0$$4); if ((zephir_method_exists(entity, method TSRMLS_CC) == SUCCESS)) { @@ -61611,7 +61782,7 @@ static PHP_METHOD(Phalcon_Forms_Form, getValue) { } } ZEPHIR_INIT_VAR(_1); - zephir_camelize(_1, name); + zephir_camelize(_1, name, NULL ); ZEPHIR_INIT_NVAR(method); ZEPHIR_CONCAT_SV(method, "get", _1); if ((zephir_method_exists(this_ptr, method TSRMLS_CC) == SUCCESS)) { @@ -61741,7 +61912,7 @@ static PHP_METHOD(Phalcon_Forms_Form, rewind) { ZVAL_LONG(_0, 0); zephir_update_property_this(this_ptr, SL("_position"), _0 TSRMLS_CC); _0 = zephir_fetch_nproperty_this(this_ptr, SL("_elements"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_1, "array_values", NULL, 216, _0); + ZEPHIR_CALL_FUNCTION(&_1, "array_values", NULL, 211, _0); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_elementsIndexed"), _1 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -61835,7 +62006,7 @@ static PHP_METHOD(Phalcon_Forms_Manager, create) { } ZEPHIR_INIT_VAR(form); object_init_ex(form, phalcon_forms_form_ce); - ZEPHIR_CALL_METHOD(NULL, form, "__construct", NULL, 217, entity); + ZEPHIR_CALL_METHOD(NULL, form, "__construct", NULL, 212, entity); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("_forms"), name, form TSRMLS_CC); RETURN_CCTOR(form); @@ -61944,7 +62115,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Check, render) { ZVAL_BOOL(_2, 1); ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes, _2); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "checkfield", &_0, 199, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "checkfield", &_0, 194, _1); zephir_check_call_status(); RETURN_MM(); @@ -61989,7 +62160,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Date, render) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "datefield", &_0, 200, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "datefield", &_0, 195, _1); zephir_check_call_status(); RETURN_MM(); @@ -62034,7 +62205,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Email, render) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "emailfield", &_0, 201, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "emailfield", &_0, 196, _1); zephir_check_call_status(); RETURN_MM(); @@ -62079,7 +62250,7 @@ static PHP_METHOD(Phalcon_Forms_Element_File, render) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "filefield", &_0, 202, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "filefield", &_0, 197, _1); zephir_check_call_status(); RETURN_MM(); @@ -62124,7 +62295,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Hidden, render) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "hiddenfield", &_0, 203, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "hiddenfield", &_0, 198, _1); zephir_check_call_status(); RETURN_MM(); @@ -62169,7 +62340,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Numeric, render) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "numericfield", &_0, 204, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "numericfield", &_0, 199, _1); zephir_check_call_status(); RETURN_MM(); @@ -62214,7 +62385,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Password, render) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "passwordfield", &_0, 205, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "passwordfield", &_0, 200, _1); zephir_check_call_status(); RETURN_MM(); @@ -62261,7 +62432,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Radio, render) { ZVAL_BOOL(_2, 1); ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes, _2); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "radiofield", &_0, 206, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "radiofield", &_0, 201, _1); zephir_check_call_status(); RETURN_MM(); @@ -62312,7 +62483,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Select, __construct) { zephir_update_property_this(this_ptr, SL("_optionsValues"), options TSRMLS_CC); - ZEPHIR_CALL_PARENT(NULL, phalcon_forms_element_select_ce, this_ptr, "__construct", &_0, 207, name, attributes); + ZEPHIR_CALL_PARENT(NULL, phalcon_forms_element_select_ce, this_ptr, "__construct", &_0, 202, name, attributes); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -62384,7 +62555,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Select, render) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes); zephir_check_call_status(); _2 = zephir_fetch_nproperty_this(this_ptr, SL("_optionsValues"), PH_NOISY_CC); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_select_ce, "selectfield", &_0, 208, _1, _2); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_select_ce, "selectfield", &_0, 203, _1, _2); zephir_check_call_status(); RETURN_MM(); @@ -62429,7 +62600,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Submit, render) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "submitbutton", &_0, 209, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "submitbutton", &_0, 204, _1); zephir_check_call_status(); RETURN_MM(); @@ -62474,7 +62645,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Text, render) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "textfield", &_0, 210, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "textfield", &_0, 205, _1); zephir_check_call_status(); RETURN_MM(); @@ -62519,7 +62690,7 @@ static PHP_METHOD(Phalcon_Forms_Element_TextArea, render) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "textarea", &_0, 211, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "textarea", &_0, 206, _1); zephir_check_call_status(); RETURN_MM(); @@ -62837,7 +63008,7 @@ static PHP_METHOD(Phalcon_Http_Cookie, send) { } else { ZEPHIR_CPY_WRT(encryptValue, value); } - ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 218, name, encryptValue, expire, path, domain, secure, httpOnly); + ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 213, name, encryptValue, expire, path, domain, secure, httpOnly); zephir_check_call_status(); RETURN_THIS(); @@ -62937,7 +63108,7 @@ static PHP_METHOD(Phalcon_Http_Cookie, delete) { zephir_time(_4); ZEPHIR_SINIT_VAR(_5); ZVAL_LONG(&_5, (zephir_get_numberval(_4) - 691200)); - ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 218, name, ZEPHIR_GLOBAL(global_null), &_5, path, domain, secure, httpOnly); + ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 213, name, ZEPHIR_GLOBAL(global_null), &_5, path, domain, secure, httpOnly); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -63372,7 +63543,7 @@ static PHP_METHOD(Phalcon_Http_Request, get) { } else { ZVAL_BOOL(_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 219, _REQUEST, name, filters, defaultValue, _0, _1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 214, _REQUEST, name, filters, defaultValue, _0, _1); zephir_check_call_status(); RETURN_MM(); @@ -63434,7 +63605,7 @@ static PHP_METHOD(Phalcon_Http_Request, getPost) { } else { ZVAL_BOOL(_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 219, _POST, name, filters, defaultValue, _0, _1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 214, _POST, name, filters, defaultValue, _0, _1); zephir_check_call_status(); RETURN_MM(); @@ -63491,7 +63662,7 @@ static PHP_METHOD(Phalcon_Http_Request, getPut) { ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "getrawbody", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(put); - ZEPHIR_CALL_FUNCTION(NULL, "parse_str", NULL, 220, _0$$3, put); + ZEPHIR_CALL_FUNCTION(NULL, "parse_str", NULL, 215, _0$$3, put); ZEPHIR_UNREF(put); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_putCache"), put TSRMLS_CC); @@ -63508,7 +63679,7 @@ static PHP_METHOD(Phalcon_Http_Request, getPut) { } else { ZVAL_BOOL(_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 219, put, name, filters, defaultValue, _1, _2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 214, put, name, filters, defaultValue, _1, _2); zephir_check_call_status(); RETURN_MM(); @@ -63570,7 +63741,7 @@ static PHP_METHOD(Phalcon_Http_Request, getQuery) { } else { ZVAL_BOOL(_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 219, _GET, name, filters, defaultValue, _0, _1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 214, _GET, name, filters, defaultValue, _0, _1); zephir_check_call_status(); RETURN_MM(); @@ -64008,7 +64179,7 @@ static PHP_METHOD(Phalcon_Http_Request, getServerAddress) { } ZEPHIR_SINIT_VAR(_0); ZVAL_STRING(&_0, "localhost", 0); - ZEPHIR_RETURN_CALL_FUNCTION("gethostbyname", NULL, 221, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("gethostbyname", NULL, 216, &_0); zephir_check_call_status(); RETURN_MM(); @@ -64203,7 +64374,7 @@ static PHP_METHOD(Phalcon_Http_Request, isMethod) { } - ZEPHIR_CALL_METHOD(&httpMethod, this_ptr, "getmethod", NULL, 222); + ZEPHIR_CALL_METHOD(&httpMethod, this_ptr, "getmethod", NULL, 217); zephir_check_call_status(); if (Z_TYPE_P(methods) == IS_STRING) { _0$$3 = strict; @@ -64275,7 +64446,7 @@ static PHP_METHOD(Phalcon_Http_Request, isPost) { ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 222); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 217); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(_0, "POST")); @@ -64288,7 +64459,7 @@ static PHP_METHOD(Phalcon_Http_Request, isGet) { ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 222); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 217); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(_0, "GET")); @@ -64301,7 +64472,7 @@ static PHP_METHOD(Phalcon_Http_Request, isPut) { ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 222); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 217); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(_0, "PUT")); @@ -64314,7 +64485,7 @@ static PHP_METHOD(Phalcon_Http_Request, isPatch) { ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 222); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 217); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(_0, "PATCH")); @@ -64327,7 +64498,7 @@ static PHP_METHOD(Phalcon_Http_Request, isHead) { ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 222); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 217); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(_0, "HEAD")); @@ -64340,7 +64511,7 @@ static PHP_METHOD(Phalcon_Http_Request, isDelete) { ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 222); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 217); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(_0, "DELETE")); @@ -64353,7 +64524,7 @@ static PHP_METHOD(Phalcon_Http_Request, isOptions) { ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 222); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 217); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(_0, "OPTIONS")); @@ -64408,7 +64579,7 @@ static PHP_METHOD(Phalcon_Http_Request, hasFiles) { } else { ZVAL_BOOL(_5$$8, 0); } - ZEPHIR_CALL_METHOD(&_4$$8, this_ptr, "hasfilehelper", &_6, 223, error, _5$$8); + ZEPHIR_CALL_METHOD(&_4$$8, this_ptr, "hasfilehelper", &_6, 218, error, _5$$8); zephir_check_call_status(); numberFiles += zephir_get_numberval(_4$$8); } @@ -64459,7 +64630,7 @@ static PHP_METHOD(Phalcon_Http_Request, hasFileHelper) { } else { ZVAL_BOOL(_5$$7, 0); } - ZEPHIR_CALL_METHOD(&_4$$7, this_ptr, "hasfilehelper", &_6, 223, value, _5$$7); + ZEPHIR_CALL_METHOD(&_4$$7, this_ptr, "hasfilehelper", &_6, 218, value, _5$$7); zephir_check_call_status(); numberFiles += zephir_get_numberval(_4$$7); } @@ -64508,7 +64679,7 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) { zephir_array_fetch_string(&_6$$5, input, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/http/request.zep", 699 TSRMLS_CC); zephir_array_fetch_string(&_7$$5, input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/http/request.zep", 699 TSRMLS_CC); zephir_array_fetch_string(&_8$$5, input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/http/request.zep", 699 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_9, 224, _4$$5, _5$$5, _6$$5, _7$$5, _8$$5, prefix); + ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_9, 219, _4$$5, _5$$5, _6$$5, _7$$5, _8$$5, prefix); zephir_check_call_status(); zephir_is_iterable(smoothInput, &_11$$5, &_10$$5, 0, 0, "phalcon/http/request.zep", 714); for ( @@ -64542,7 +64713,7 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) { ZEPHIR_INIT_NVAR(_16$$7); object_init_ex(_16$$7, phalcon_http_request_file_ce); zephir_array_fetch_string(&_17$$7, file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/http/request.zep", 711 TSRMLS_CC); - ZEPHIR_CALL_METHOD(NULL, _16$$7, "__construct", &_18, 225, dataFile, _17$$7); + ZEPHIR_CALL_METHOD(NULL, _16$$7, "__construct", &_18, 220, dataFile, _17$$7); zephir_check_call_status(); zephir_array_append(&files, _16$$7, PH_SEPARATE, "phalcon/http/request.zep", 711); } @@ -64556,7 +64727,7 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) { if (_19$$8) { ZEPHIR_INIT_NVAR(_21$$9); object_init_ex(_21$$9, phalcon_http_request_file_ce); - ZEPHIR_CALL_METHOD(NULL, _21$$9, "__construct", &_18, 225, input, prefix); + ZEPHIR_CALL_METHOD(NULL, _21$$9, "__construct", &_18, 220, input, prefix); zephir_check_call_status(); zephir_array_append(&files, _21$$9, PH_SEPARATE, "phalcon/http/request.zep", 716); } @@ -64624,7 +64795,7 @@ static PHP_METHOD(Phalcon_Http_Request, smoothFiles) { zephir_array_fetch(&_7$$5, tmp_names, idx, PH_NOISY | PH_READONLY, "phalcon/http/request.zep", 750 TSRMLS_CC); zephir_array_fetch(&_8$$5, sizes, idx, PH_NOISY | PH_READONLY, "phalcon/http/request.zep", 750 TSRMLS_CC); zephir_array_fetch(&_9$$5, errors, idx, PH_NOISY | PH_READONLY, "phalcon/http/request.zep", 750 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_10, 224, _5$$5, _6$$5, _7$$5, _8$$5, _9$$5, p); + ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_10, 219, _5$$5, _6$$5, _7$$5, _8$$5, _9$$5, p); zephir_check_call_status(); zephir_is_iterable(parentFiles, &_12$$5, &_11$$5, 0, 0, "phalcon/http/request.zep", 755); for ( @@ -64678,7 +64849,7 @@ static PHP_METHOD(Phalcon_Http_Request, getHeaders) { ZVAL_STRING(&_8$$4, " ", 0); zephir_fast_str_replace(&_4$$4, &_7$$4, &_8$$4, _6$$4 TSRMLS_CC); zephir_fast_strtolower(_3$$4, _4$$4); - ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_9, 226, _3$$4); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_9, 221, _3$$4); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_10$$4); ZEPHIR_SINIT_NVAR(_11$$4); @@ -64697,7 +64868,7 @@ static PHP_METHOD(Phalcon_Http_Request, getHeaders) { ZVAL_STRING(&_16$$5, " ", 0); zephir_fast_str_replace(&_14$$5, &_15$$5, &_16$$5, name TSRMLS_CC); zephir_fast_strtolower(_13$$5, _14$$5); - ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_9, 226, _13$$5); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_9, 221, _13$$5); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_17$$5); ZEPHIR_SINIT_NVAR(_18$$5); @@ -64771,7 +64942,7 @@ static PHP_METHOD(Phalcon_Http_Request, _getQualityHeader) { ZVAL_LONG(&_2, -1); ZEPHIR_SINIT_VAR(_3); ZVAL_LONG(&_3, 1); - ZEPHIR_CALL_FUNCTION(&_4, "preg_split", &_5, 227, &_1, _0, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "preg_split", &_5, 222, &_1, _0, &_2, &_3); zephir_check_call_status(); zephir_is_iterable(_4, &_7, &_6, 0, 0, "phalcon/http/request.zep", 827); for ( @@ -64789,7 +64960,7 @@ static PHP_METHOD(Phalcon_Http_Request, _getQualityHeader) { ZVAL_LONG(&_11$$3, -1); ZEPHIR_SINIT_NVAR(_12$$3); ZVAL_LONG(&_12$$3, 1); - ZEPHIR_CALL_FUNCTION(&_13$$3, "preg_split", &_5, 227, &_10$$3, _9$$3, &_11$$3, &_12$$3); + ZEPHIR_CALL_FUNCTION(&_13$$3, "preg_split", &_5, 222, &_10$$3, _9$$3, &_11$$3, &_12$$3); zephir_check_call_status(); zephir_is_iterable(_13$$3, &_15$$3, &_14$$3, 0, 0, "phalcon/http/request.zep", 824); for ( @@ -64919,7 +65090,7 @@ static PHP_METHOD(Phalcon_Http_Request, getAcceptableContent) { ZVAL_STRING(_0, "HTTP_ACCEPT", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "accept", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getqualityheader", NULL, 228, _0, _1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getqualityheader", NULL, 223, _0, _1); zephir_check_temp_parameter(_0); zephir_check_temp_parameter(_1); zephir_check_call_status(); @@ -64938,7 +65109,7 @@ static PHP_METHOD(Phalcon_Http_Request, getBestAccept) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "accept", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getbestquality", NULL, 229, _0, _1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getbestquality", NULL, 224, _0, _1); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -64956,7 +65127,7 @@ static PHP_METHOD(Phalcon_Http_Request, getClientCharsets) { ZVAL_STRING(_0, "HTTP_ACCEPT_CHARSET", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "charset", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getqualityheader", NULL, 228, _0, _1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getqualityheader", NULL, 223, _0, _1); zephir_check_temp_parameter(_0); zephir_check_temp_parameter(_1); zephir_check_call_status(); @@ -64975,7 +65146,7 @@ static PHP_METHOD(Phalcon_Http_Request, getBestCharset) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "charset", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getbestquality", NULL, 229, _0, _1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getbestquality", NULL, 224, _0, _1); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -64993,7 +65164,7 @@ static PHP_METHOD(Phalcon_Http_Request, getLanguages) { ZVAL_STRING(_0, "HTTP_ACCEPT_LANGUAGE", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "language", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getqualityheader", NULL, 228, _0, _1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getqualityheader", NULL, 223, _0, _1); zephir_check_temp_parameter(_0); zephir_check_temp_parameter(_1); zephir_check_call_status(); @@ -65012,7 +65183,7 @@ static PHP_METHOD(Phalcon_Http_Request, getBestLanguage) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "language", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getbestquality", NULL, 229, _0, _1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getbestquality", NULL, 224, _0, _1); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -65228,7 +65399,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Response) { static PHP_METHOD(Phalcon_Http_Response, __construct) { int ZEPHIR_LAST_CALL_STATUS; - zval *content = NULL, *code = NULL, *status = NULL; + zval *content = NULL, *code = NULL, *status = NULL, *_0; ZEPHIR_MM_GROW(); zephir_fetch_params(1, 0, 3, &content, &code, &status); @@ -65244,6 +65415,13 @@ static PHP_METHOD(Phalcon_Http_Response, __construct) { } + ZEPHIR_INIT_VAR(_0); + object_init_ex(_0, phalcon_http_response_headers_ce); + if (zephir_has_constructor(_0 TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, _0, "__construct", NULL, 0); + zephir_check_call_status(); + } + zephir_update_property_this(this_ptr, SL("_headers"), _0 TSRMLS_CC); if (Z_TYPE_P(content) != IS_NULL) { zephir_update_property_this(this_ptr, SL("_content"), content TSRMLS_CC); } @@ -65281,7 +65459,7 @@ static PHP_METHOD(Phalcon_Http_Response, getDI) { ZEPHIR_CALL_CE_STATIC(&dependencyInjector, phalcon_di_ce, "getdefault", &_1, 1); zephir_check_call_status(); if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_response_exception_ce, "A dependency injection object is required to access the 'url' service", "phalcon/http/response.zep", 95); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_response_exception_ce, "A dependency injection object is required to access the 'url' service", "phalcon/http/response.zep", 101); return; } zephir_update_property_this(this_ptr, SL("_dependencyInjector"), dependencyInjector TSRMLS_CC); @@ -65318,7 +65496,7 @@ static PHP_METHOD(Phalcon_Http_Response, setStatusCode) { zephir_check_call_status(); if (Z_TYPE_P(currentHeadersRaw) == IS_ARRAY) { ZEPHIR_INIT_VAR(_0$$3); - zephir_is_iterable(currentHeadersRaw, &_2$$3, &_1$$3, 0, 0, "phalcon/http/response.zep", 127); + zephir_is_iterable(currentHeadersRaw, &_2$$3, &_1$$3, 0, 0, "phalcon/http/response.zep", 133); for ( ; zephir_hash_get_current_data_ex(_2$$3, (void**) &_3$$3, &_1$$3) == SUCCESS ; zephir_hash_move_forward_ex(_2$$3, &_1$$3) @@ -65329,7 +65507,7 @@ static PHP_METHOD(Phalcon_Http_Response, setStatusCode) { if (_4$$4) { ZEPHIR_SINIT_NVAR(_5$$4); ZVAL_STRING(&_5$$4, "HTTP/", 0); - ZEPHIR_CALL_FUNCTION(&_6$$4, "strstr", &_7, 236, key, &_5$$4); + ZEPHIR_CALL_FUNCTION(&_6$$4, "strstr", &_7, 231, key, &_5$$4); zephir_check_call_status(); _4$$4 = zephir_is_true(_6$$4); } @@ -65341,7 +65519,7 @@ static PHP_METHOD(Phalcon_Http_Response, setStatusCode) { } if (ZEPHIR_IS_STRING_IDENTICAL(message, "")) { ZEPHIR_INIT_VAR(statusCodes); - zephir_create_array(statusCodes, 67, 0 TSRMLS_CC); + zephir_create_array(statusCodes, 62, 0 TSRMLS_CC); add_index_stringl(statusCodes, 100, SL("Continue"), 1); add_index_stringl(statusCodes, 101, SL("Switching Protocols"), 1); add_index_stringl(statusCodes, 102, SL("Processing"), 1); @@ -65405,11 +65583,11 @@ static PHP_METHOD(Phalcon_Http_Response, setStatusCode) { add_index_stringl(statusCodes, 508, SL("Loop Detected"), 1); add_index_stringl(statusCodes, 511, SL("Network Authentication Required"), 1); if (!(zephir_array_isset_long(statusCodes, code))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_response_exception_ce, "Non-standard statuscode given without a message", "phalcon/http/response.zep", 204); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_response_exception_ce, "Non-standard statuscode given without a message", "phalcon/http/response.zep", 210); return; } ZEPHIR_OBS_VAR(defaultMessage); - zephir_array_fetch_long(&defaultMessage, statusCodes, code, PH_NOISY, "phalcon/http/response.zep", 207 TSRMLS_CC); + zephir_array_fetch_long(&defaultMessage, statusCodes, code, PH_NOISY, "phalcon/http/response.zep", 213 TSRMLS_CC); zephir_get_strval(message, defaultMessage); } ZEPHIR_SINIT_VAR(_9); @@ -65464,23 +65642,9 @@ static PHP_METHOD(Phalcon_Http_Response, setHeaders) { static PHP_METHOD(Phalcon_Http_Response, getHeaders) { - zval *headers = NULL; - int ZEPHIR_LAST_CALL_STATUS; - - ZEPHIR_MM_GROW(); + - ZEPHIR_OBS_VAR(headers); - zephir_read_property_this(&headers, this_ptr, SL("_headers"), PH_NOISY_CC); - if (Z_TYPE_P(headers) == IS_NULL) { - ZEPHIR_INIT_NVAR(headers); - object_init_ex(headers, phalcon_http_response_headers_ce); - if (zephir_has_constructor(headers TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(NULL, headers, "__construct", NULL, 0); - zephir_check_call_status(); - } - zephir_update_property_this(this_ptr, SL("_headers"), headers TSRMLS_CC); - } - RETURN_CCTOR(headers); + RETURN_MEMBER(this_ptr, "_headers"); } @@ -65660,8 +65824,9 @@ static PHP_METHOD(Phalcon_Http_Response, setNotModified) { static PHP_METHOD(Phalcon_Http_Response, setContentType) { + zephir_fcall_cache_entry *_1 = NULL; int ZEPHIR_LAST_CALL_STATUS; - zval *contentType_param = NULL, *charset = NULL, *headers = NULL, *_0$$3, *_1$$4, *_2$$4; + zval *contentType_param = NULL, *charset = NULL, *_0$$3, *_2$$4, *_3$$4; zval *contentType = NULL; ZEPHIR_MM_GROW(); @@ -65673,21 +65838,19 @@ static PHP_METHOD(Phalcon_Http_Response, setContentType) { } - ZEPHIR_CALL_METHOD(&headers, this_ptr, "getheaders", NULL, 0); - zephir_check_call_status(); if (Z_TYPE_P(charset) == IS_NULL) { ZEPHIR_INIT_VAR(_0$$3); ZVAL_STRING(_0$$3, "Content-Type", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, headers, "set", NULL, 0, _0$$3, contentType); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setheader", &_1, 0, _0$$3, contentType); zephir_check_temp_parameter(_0$$3); zephir_check_call_status(); } else { - ZEPHIR_INIT_VAR(_1$$4); - ZEPHIR_CONCAT_VSV(_1$$4, contentType, "; charset=", charset); ZEPHIR_INIT_VAR(_2$$4); - ZVAL_STRING(_2$$4, "Content-Type", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, headers, "set", NULL, 0, _2$$4, _1$$4); - zephir_check_temp_parameter(_2$$4); + ZEPHIR_CONCAT_VSV(_2$$4, contentType, "; charset=", charset); + ZEPHIR_INIT_VAR(_3$$4); + ZVAL_STRING(_3$$4, "Content-Type", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setheader", &_1, 0, _3$$4, _2$$4); + zephir_check_temp_parameter(_3$$4); zephir_check_call_status(); } RETURN_THIS(); @@ -65697,7 +65860,7 @@ static PHP_METHOD(Phalcon_Http_Response, setContentType) { static PHP_METHOD(Phalcon_Http_Response, setEtag) { int ZEPHIR_LAST_CALL_STATUS; - zval *etag_param = NULL, *headers = NULL, *_0; + zval *etag_param = NULL, *_0; zval *etag = NULL; ZEPHIR_MM_GROW(); @@ -65706,11 +65869,9 @@ static PHP_METHOD(Phalcon_Http_Response, setEtag) { zephir_get_strval(etag, etag_param); - ZEPHIR_CALL_METHOD(&headers, this_ptr, "getheaders", NULL, 0); - zephir_check_call_status(); ZEPHIR_INIT_VAR(_0); ZVAL_STRING(_0, "Etag", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, headers, "set", NULL, 0, _0, etag); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setheader", NULL, 0, _0, etag); zephir_check_temp_parameter(_0); zephir_check_call_status(); RETURN_THIS(); @@ -65754,7 +65915,7 @@ static PHP_METHOD(Phalcon_Http_Response, redirect) { if (_0$$5) { ZEPHIR_SINIT_VAR(_1$$5); ZVAL_STRING(&_1$$5, "://", 0); - ZEPHIR_CALL_FUNCTION(&_2$$5, "strstr", NULL, 236, location, &_1$$5); + ZEPHIR_CALL_FUNCTION(&_2$$5, "strstr", NULL, 231, location, &_1$$5); zephir_check_call_status(); _0$$5 = zephir_is_true(_2$$5); } @@ -65900,17 +66061,14 @@ static PHP_METHOD(Phalcon_Http_Response, isSent) { static PHP_METHOD(Phalcon_Http_Response, sendHeaders) { - zval *headers = NULL; + zval *_0; int ZEPHIR_LAST_CALL_STATUS; ZEPHIR_MM_GROW(); - ZEPHIR_OBS_VAR(headers); - zephir_read_property_this(&headers, this_ptr, SL("_headers"), PH_NOISY_CC); - if (Z_TYPE_P(headers) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(NULL, headers, "send", NULL, 0); - zephir_check_call_status(); - } + _0 = zephir_fetch_nproperty_this(this_ptr, SL("_headers"), PH_NOISY_CC); + ZEPHIR_CALL_METHOD(NULL, _0, "send", NULL, 0); + zephir_check_call_status(); RETURN_THIS(); } @@ -65934,29 +66092,21 @@ static PHP_METHOD(Phalcon_Http_Response, sendCookies) { static PHP_METHOD(Phalcon_Http_Response, send) { - zend_bool _1$$7; - zval *headers = NULL, *cookies = NULL, *content = NULL, *file = NULL, *_0; + zend_bool _1$$5; + zval *content = NULL, *file = NULL, *_0; int ZEPHIR_LAST_CALL_STATUS; ZEPHIR_MM_GROW(); _0 = zephir_fetch_nproperty_this(this_ptr, SL("_sent"), PH_NOISY_CC); if (zephir_is_true(_0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_response_exception_ce, "Response was already sent", "phalcon/http/response.zep", 585); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_response_exception_ce, "Response was already sent", "phalcon/http/response.zep", 577); return; } - ZEPHIR_OBS_VAR(headers); - zephir_read_property_this(&headers, this_ptr, SL("_headers"), PH_NOISY_CC); - if (Z_TYPE_P(headers) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(NULL, headers, "send", NULL, 0); - zephir_check_call_status(); - } - ZEPHIR_OBS_VAR(cookies); - zephir_read_property_this(&cookies, this_ptr, SL("_cookies"), PH_NOISY_CC); - if (Z_TYPE_P(cookies) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(NULL, cookies, "send", NULL, 0); - zephir_check_call_status(); - } + ZEPHIR_CALL_METHOD(NULL, this_ptr, "sendheaders", NULL, 0); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "sendcookies", NULL, 0); + zephir_check_call_status(); ZEPHIR_OBS_VAR(content); zephir_read_property_this(&content, this_ptr, SL("_content"), PH_NOISY_CC); if (Z_TYPE_P(content) != IS_NULL) { @@ -65964,12 +66114,12 @@ static PHP_METHOD(Phalcon_Http_Response, send) { } else { ZEPHIR_OBS_VAR(file); zephir_read_property_this(&file, this_ptr, SL("_file"), PH_NOISY_CC); - _1$$7 = Z_TYPE_P(file) == IS_STRING; - if (_1$$7) { - _1$$7 = (zephir_fast_strlen_ev(file)) ? 1 : 0; + _1$$5 = Z_TYPE_P(file) == IS_STRING; + if (_1$$5) { + _1$$5 = (zephir_fast_strlen_ev(file)) ? 1 : 0; } - if (_1$$7) { - ZEPHIR_CALL_FUNCTION(NULL, "readfile", NULL, 237, file); + if (_1$$5) { + ZEPHIR_CALL_FUNCTION(NULL, "readfile", NULL, 232, file); zephir_check_call_status(); } } @@ -65984,8 +66134,9 @@ static PHP_METHOD(Phalcon_Http_Response, send) { static PHP_METHOD(Phalcon_Http_Response, setFileToSend) { + zephir_fcall_cache_entry *_1 = NULL; int ZEPHIR_LAST_CALL_STATUS; - zval *filePath_param = NULL, *attachmentName = NULL, *attachment = NULL, *basePath = NULL, *headers = NULL, *_0$$5 = NULL, *_1$$5; + zval *filePath_param = NULL, *attachmentName = NULL, *attachment = NULL, *basePath = NULL, *_0$$5 = NULL, *_2$$5; zval *filePath = NULL; ZEPHIR_MM_GROW(); @@ -66007,25 +66158,23 @@ static PHP_METHOD(Phalcon_Http_Response, setFileToSend) { ZEPHIR_CPY_WRT(basePath, attachmentName); } if (zephir_is_true(attachment)) { - ZEPHIR_CALL_METHOD(&headers, this_ptr, "getheaders", NULL, 0); - zephir_check_call_status(); ZEPHIR_INIT_VAR(_0$$5); ZVAL_STRING(_0$$5, "Content-Description: File Transfer", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, headers, "setraw", NULL, 0, _0$$5); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setrawheader", &_1, 0, _0$$5); zephir_check_temp_parameter(_0$$5); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_0$$5); ZVAL_STRING(_0$$5, "Content-Type: application/octet-stream", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, headers, "setraw", NULL, 0, _0$$5); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setrawheader", &_1, 0, _0$$5); zephir_check_temp_parameter(_0$$5); zephir_check_call_status(); - ZEPHIR_INIT_VAR(_1$$5); - ZEPHIR_CONCAT_SV(_1$$5, "Content-Disposition: attachment; filename=", basePath); - ZEPHIR_CALL_METHOD(NULL, headers, "setraw", NULL, 0, _1$$5); + ZEPHIR_INIT_VAR(_2$$5); + ZEPHIR_CONCAT_SV(_2$$5, "Content-Disposition: attachment; filename=", basePath); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setrawheader", &_1, 0, _2$$5); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_0$$5); ZVAL_STRING(_0$$5, "Content-Transfer-Encoding: binary", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, headers, "setraw", NULL, 0, _0$$5); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setrawheader", &_1, 0, _0$$5); zephir_check_temp_parameter(_0$$5); zephir_check_call_status(); } @@ -66215,7 +66364,7 @@ static PHP_METHOD(Phalcon_Http_Request_File, __construct) { zephir_update_property_this(this_ptr, SL("_name"), name TSRMLS_CC); ZEPHIR_SINIT_VAR(_0$$3); ZVAL_STRING(&_0$$3, "PATHINFO_EXTENSION", 0); - ZEPHIR_CALL_FUNCTION(&_1$$3, "defined", NULL, 230, &_0$$3); + ZEPHIR_CALL_FUNCTION(&_1$$3, "defined", NULL, 225, &_0$$3); zephir_check_call_status(); if (zephir_is_true(_1$$3)) { ZEPHIR_SINIT_VAR(_2$$4); @@ -66285,15 +66434,15 @@ static PHP_METHOD(Phalcon_Http_Request_File, getRealType) { ZEPHIR_SINIT_VAR(_0); ZVAL_LONG(&_0, 16); - ZEPHIR_CALL_FUNCTION(&finfo, "finfo_open", NULL, 231, &_0); + ZEPHIR_CALL_FUNCTION(&finfo, "finfo_open", NULL, 226, &_0); zephir_check_call_status(); if (Z_TYPE_P(finfo) != IS_RESOURCE) { RETURN_MM_STRING("", 1); } _1 = zephir_fetch_nproperty_this(this_ptr, SL("_tmp"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 232, finfo, _1); + ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 227, finfo, _1); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 233, finfo); + ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 228, finfo); zephir_check_call_status(); RETURN_CCTOR(mime); @@ -66311,7 +66460,7 @@ static PHP_METHOD(Phalcon_Http_Request_File, isUploadedFile) { zephir_check_call_status(); _0 = Z_TYPE_P(tmp) == IS_STRING; if (_0) { - ZEPHIR_CALL_FUNCTION(&_1, "is_uploaded_file", NULL, 234, tmp); + ZEPHIR_CALL_FUNCTION(&_1, "is_uploaded_file", NULL, 229, tmp); zephir_check_call_status(); _0 = zephir_is_true(_1); } @@ -66341,7 +66490,7 @@ static PHP_METHOD(Phalcon_Http_Request_File, moveTo) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_tmp"), PH_NOISY_CC); - ZEPHIR_RETURN_CALL_FUNCTION("move_uploaded_file", NULL, 235, _0, destination); + ZEPHIR_RETURN_CALL_FUNCTION("move_uploaded_file", NULL, 230, _0, destination); zephir_check_call_status(); RETURN_MM(); @@ -66948,10 +67097,10 @@ static PHP_METHOD(Phalcon_Http_Response_Headers, send) { if (!(ZEPHIR_IS_EMPTY(value))) { ZEPHIR_INIT_LNVAR(_5$$5); ZEPHIR_CONCAT_VSV(_5$$5, header, ": ", value); - ZEPHIR_CALL_FUNCTION(NULL, "header", &_6, 238, _5$$5, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_6, 233, _5$$5, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); } else { - ZEPHIR_CALL_FUNCTION(NULL, "header", &_6, 238, header, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_6, 233, header, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); } } @@ -67012,7 +67161,7 @@ static PHP_METHOD(Phalcon_Http_Response_Headers, __set_state) { ) { ZEPHIR_GET_HMKEY(key, _1$$3, _0$$3); ZEPHIR_GET_HVALUE(value, _2$$3); - ZEPHIR_CALL_METHOD(NULL, headers, "set", &_3, 239, key, value); + ZEPHIR_CALL_METHOD(NULL, headers, "set", &_3, 234, key, value); zephir_check_call_status(); } } @@ -67020,7 +67169,7 @@ static PHP_METHOD(Phalcon_Http_Response_Headers, __set_state) { } -static zend_object_value zephir_init_properties_Phalcon_Http_Response_Headers(zend_class_entry *class_type TSRMLS_DC) { +zend_object_value zephir_init_properties_Phalcon_Http_Response_Headers(zend_class_entry *class_type TSRMLS_DC) { zval *_0, *_1$$3; @@ -68072,13 +68221,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, check) { ZVAL_NULL(version); ZEPHIR_SINIT_VAR(_1); ZVAL_STRING(&_1, "GD_VERSION", 0); - ZEPHIR_CALL_FUNCTION(&_2, "defined", NULL, 230, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "defined", NULL, 225, &_1); zephir_check_call_status(); if (zephir_is_true(_2)) { ZEPHIR_INIT_NVAR(version); ZEPHIR_GET_CONSTANT(version, "GD_VERSION"); } else { - ZEPHIR_CALL_FUNCTION(&info, "gd_info", NULL, 240); + ZEPHIR_CALL_FUNCTION(&info, "gd_info", NULL, 235); zephir_check_call_status(); ZEPHIR_INIT_VAR(matches); ZVAL_NULL(matches); @@ -68096,7 +68245,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, check) { ZVAL_STRING(&_1, "2.0.1", 0); ZEPHIR_SINIT_VAR(_6); ZVAL_STRING(&_6, ">=", 0); - ZEPHIR_CALL_FUNCTION(&_7, "version_compare", NULL, 241, version, &_1, &_6); + ZEPHIR_CALL_FUNCTION(&_7, "version_compare", NULL, 236, version, &_1, &_6); zephir_check_call_status(); if (!(zephir_is_true(_7))) { ZEPHIR_INIT_VAR(_8$$8); @@ -68161,7 +68310,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) { zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_realpath"), _3$$4 TSRMLS_CC); _4$$4 = zephir_fetch_nproperty_this(this_ptr, SL("_file"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&imageinfo, "getimagesize", NULL, 242, _4$$4); + ZEPHIR_CALL_FUNCTION(&imageinfo, "getimagesize", NULL, 237, _4$$4); zephir_check_call_status(); if (zephir_is_true(imageinfo)) { zephir_array_fetch_long(&_5$$5, imageinfo, 0, PH_NOISY | PH_READONLY, "phalcon/image/adapter/gd.zep", 77 TSRMLS_CC); @@ -68177,35 +68326,35 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) { do { if (ZEPHIR_IS_LONG(_9$$4, 1)) { _10$$6 = zephir_fetch_nproperty_this(this_ptr, SL("_file"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_11$$6, "imagecreatefromgif", NULL, 243, _10$$6); + ZEPHIR_CALL_FUNCTION(&_11$$6, "imagecreatefromgif", NULL, 238, _10$$6); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), _11$$6 TSRMLS_CC); break; } if (ZEPHIR_IS_LONG(_9$$4, 2)) { _12$$7 = zephir_fetch_nproperty_this(this_ptr, SL("_file"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_13$$7, "imagecreatefromjpeg", NULL, 244, _12$$7); + ZEPHIR_CALL_FUNCTION(&_13$$7, "imagecreatefromjpeg", NULL, 239, _12$$7); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), _13$$7 TSRMLS_CC); break; } if (ZEPHIR_IS_LONG(_9$$4, 3)) { _14$$8 = zephir_fetch_nproperty_this(this_ptr, SL("_file"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_15$$8, "imagecreatefrompng", NULL, 245, _14$$8); + ZEPHIR_CALL_FUNCTION(&_15$$8, "imagecreatefrompng", NULL, 240, _14$$8); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), _15$$8 TSRMLS_CC); break; } if (ZEPHIR_IS_LONG(_9$$4, 15)) { _16$$9 = zephir_fetch_nproperty_this(this_ptr, SL("_file"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_17$$9, "imagecreatefromwbmp", NULL, 246, _16$$9); + ZEPHIR_CALL_FUNCTION(&_17$$9, "imagecreatefromwbmp", NULL, 241, _16$$9); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), _17$$9 TSRMLS_CC); break; } if (ZEPHIR_IS_LONG(_9$$4, 16)) { _18$$10 = zephir_fetch_nproperty_this(this_ptr, SL("_file"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_19$$10, "imagecreatefromxbm", NULL, 247, _18$$10); + ZEPHIR_CALL_FUNCTION(&_19$$10, "imagecreatefromxbm", NULL, 242, _18$$10); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), _19$$10 TSRMLS_CC); break; @@ -68230,7 +68379,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) { } while(0); _24$$4 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", &_25, 248, _24$$4, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", &_25, 243, _24$$4, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); } else { _26$$14 = !width; @@ -68253,14 +68402,14 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) { ZVAL_LONG(&_30$$14, width); ZEPHIR_SINIT_VAR(_31$$14); ZVAL_LONG(&_31$$14, height); - ZEPHIR_CALL_FUNCTION(&_32$$14, "imagecreatetruecolor", NULL, 249, &_30$$14, &_31$$14); + ZEPHIR_CALL_FUNCTION(&_32$$14, "imagecreatetruecolor", NULL, 244, &_30$$14, &_31$$14); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), _32$$14 TSRMLS_CC); _33$$14 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 250, _33$$14, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 245, _33$$14, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); _34$$14 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", &_25, 248, _34$$14, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", &_25, 243, _34$$14, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); _35$$14 = zephir_fetch_nproperty_this(this_ptr, SL("_file"), PH_NOISY_CC); zephir_update_property_this(this_ptr, SL("_realpath"), _35$$14 TSRMLS_CC); @@ -68299,7 +68448,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _resize) { ZEPHIR_GET_CONSTANT(_0, "PHP_VERSION"); ZEPHIR_SINIT_VAR(_1); ZVAL_STRING(&_1, "5.5.0", 0); - ZEPHIR_CALL_FUNCTION(&_2, "version_compare", NULL, 241, _0, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "version_compare", NULL, 236, _0, &_1); zephir_check_call_status(); if (ZEPHIR_LT_LONG(_2, 0)) { ZEPHIR_OBS_VAR(pre_width); @@ -68347,11 +68496,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _resize) { ZVAL_LONG(&_15$$4, 0); ZEPHIR_SINIT_VAR(_16$$4); ZVAL_LONG(&_16$$4, 0); - ZEPHIR_CALL_FUNCTION(&_17$$4, "imagecopyresized", NULL, 251, image, _10$$4, &_13$$4, &_14$$4, &_15$$4, &_16$$4, pre_width, pre_height, _11$$4, _12$$4); + ZEPHIR_CALL_FUNCTION(&_17$$4, "imagecopyresized", NULL, 246, image, _10$$4, &_13$$4, &_14$$4, &_15$$4, &_16$$4, pre_width, pre_height, _11$$4, _12$$4); zephir_check_call_status(); if (zephir_is_true(_17$$4)) { _18$$6 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_19, 252, _18$$6); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_19, 247, _18$$6); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), image TSRMLS_CC); } @@ -68375,17 +68524,17 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _resize) { ZVAL_LONG(&_27$$3, width); ZEPHIR_SINIT_VAR(_28$$3); ZVAL_LONG(&_28$$3, height); - ZEPHIR_CALL_FUNCTION(&_29$$3, "imagecopyresampled", NULL, 253, image, _22$$3, &_23$$3, &_24$$3, &_25$$3, &_26$$3, &_27$$3, &_28$$3, pre_width, pre_height); + ZEPHIR_CALL_FUNCTION(&_29$$3, "imagecopyresampled", NULL, 248, image, _22$$3, &_23$$3, &_24$$3, &_25$$3, &_26$$3, &_27$$3, &_28$$3, pre_width, pre_height); zephir_check_call_status(); if (zephir_is_true(_29$$3)) { _30$$7 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_19, 252, _30$$7); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_19, 247, _30$$7); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), image TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_31$$7, "imagesx", &_32, 254, image); + ZEPHIR_CALL_FUNCTION(&_31$$7, "imagesx", &_32, 249, image); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_width"), _31$$7 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_33$$7, "imagesy", &_34, 255, image); + ZEPHIR_CALL_FUNCTION(&_33$$7, "imagesy", &_34, 250, image); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_height"), _33$$7 TSRMLS_CC); } @@ -68395,16 +68544,16 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _resize) { ZVAL_LONG(&_36$$8, width); ZEPHIR_SINIT_VAR(_37$$8); ZVAL_LONG(&_37$$8, height); - ZEPHIR_CALL_FUNCTION(&image, "imagescale", NULL, 256, _35$$8, &_36$$8, &_37$$8); + ZEPHIR_CALL_FUNCTION(&image, "imagescale", NULL, 251, _35$$8, &_36$$8, &_37$$8); zephir_check_call_status(); _38$$8 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_19, 252, _38$$8); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_19, 247, _38$$8); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), image TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_39$$8, "imagesx", &_32, 254, image); + ZEPHIR_CALL_FUNCTION(&_39$$8, "imagesx", &_32, 249, image); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_width"), _39$$8 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_40$$8, "imagesy", &_34, 255, image); + ZEPHIR_CALL_FUNCTION(&_40$$8, "imagesy", &_34, 250, image); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_height"), _40$$8 TSRMLS_CC); } @@ -68431,7 +68580,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _crop) { ZEPHIR_GET_CONSTANT(_0, "PHP_VERSION"); ZEPHIR_SINIT_VAR(_1); ZVAL_STRING(&_1, "5.5.0", 0); - ZEPHIR_CALL_FUNCTION(&_2, "version_compare", NULL, 241, _0, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "version_compare", NULL, 236, _0, &_1); zephir_check_call_status(); if (ZEPHIR_LT_LONG(_2, 0)) { ZEPHIR_INIT_VAR(_3$$3); @@ -68457,17 +68606,17 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _crop) { ZVAL_LONG(&_12$$3, width); ZEPHIR_SINIT_VAR(_13$$3); ZVAL_LONG(&_13$$3, height); - ZEPHIR_CALL_FUNCTION(&_14$$3, "imagecopyresampled", NULL, 253, image, _5$$3, &_6$$3, &_7$$3, &_8$$3, &_9$$3, &_10$$3, &_11$$3, &_12$$3, &_13$$3); + ZEPHIR_CALL_FUNCTION(&_14$$3, "imagecopyresampled", NULL, 248, image, _5$$3, &_6$$3, &_7$$3, &_8$$3, &_9$$3, &_10$$3, &_11$$3, &_12$$3, &_13$$3); zephir_check_call_status(); if (zephir_is_true(_14$$3)) { _15$$4 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_16, 252, _15$$4); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_16, 247, _15$$4); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), image TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_17$$4, "imagesx", &_18, 254, image); + ZEPHIR_CALL_FUNCTION(&_17$$4, "imagesx", &_18, 249, image); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_width"), _17$$4 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_19$$4, "imagesy", &_20, 255, image); + ZEPHIR_CALL_FUNCTION(&_19$$4, "imagesy", &_20, 250, image); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_height"), _19$$4 TSRMLS_CC); } @@ -68487,16 +68636,16 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _crop) { ZVAL_LONG(_21$$5, height); zephir_array_update_string(&rect, SL("height"), &_21$$5, PH_COPY | PH_SEPARATE); _22$$5 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&image, "imagecrop", NULL, 257, _22$$5, rect); + ZEPHIR_CALL_FUNCTION(&image, "imagecrop", NULL, 252, _22$$5, rect); zephir_check_call_status(); _23$$5 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_16, 252, _23$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_16, 247, _23$$5); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), image TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_24$$5, "imagesx", &_18, 254, image); + ZEPHIR_CALL_FUNCTION(&_24$$5, "imagesx", &_18, 249, image); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_width"), _24$$5 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_25$$5, "imagesy", &_20, 255, image); + ZEPHIR_CALL_FUNCTION(&_25$$5, "imagesy", &_20, 250, image); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_height"), _25$$5 TSRMLS_CC); } @@ -68524,20 +68673,20 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _rotate) { ZVAL_LONG(&_3, 0); ZEPHIR_SINIT_VAR(_4); ZVAL_LONG(&_4, 127); - ZEPHIR_CALL_FUNCTION(&transparent, "imagecolorallocatealpha", NULL, 258, _0, &_1, &_2, &_3, &_4); + ZEPHIR_CALL_FUNCTION(&transparent, "imagecolorallocatealpha", NULL, 253, _0, &_1, &_2, &_3, &_4); zephir_check_call_status(); _5 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_NVAR(_1); ZVAL_LONG(&_1, (360 - degrees)); ZEPHIR_SINIT_NVAR(_2); ZVAL_LONG(&_2, 1); - ZEPHIR_CALL_FUNCTION(&image, "imagerotate", NULL, 259, _5, &_1, transparent, &_2); + ZEPHIR_CALL_FUNCTION(&image, "imagerotate", NULL, 254, _5, &_1, transparent, &_2); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 248, image, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 243, image, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&width, "imagesx", NULL, 254, image); + ZEPHIR_CALL_FUNCTION(&width, "imagesx", NULL, 249, image); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&height, "imagesy", NULL, 255, image); + ZEPHIR_CALL_FUNCTION(&height, "imagesy", NULL, 250, image); zephir_check_call_status(); _6 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_NVAR(_1); @@ -68550,11 +68699,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _rotate) { ZVAL_LONG(&_4, 0); ZEPHIR_SINIT_VAR(_7); ZVAL_LONG(&_7, 100); - ZEPHIR_CALL_FUNCTION(&_8, "imagecopymerge", NULL, 260, _6, image, &_1, &_2, &_3, &_4, width, height, &_7); + ZEPHIR_CALL_FUNCTION(&_8, "imagecopymerge", NULL, 255, _6, image, &_1, &_2, &_3, &_4, width, height, &_7); zephir_check_call_status(); if (zephir_is_true(_8)) { _9$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 252, _9$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 247, _9$$3); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), image TSRMLS_CC); zephir_update_property_this(this_ptr, SL("_width"), width TSRMLS_CC); @@ -68580,7 +68729,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _flip) { ZEPHIR_GET_CONSTANT(_0, "PHP_VERSION"); ZEPHIR_SINIT_VAR(_1); ZVAL_STRING(&_1, "5.5.0", 0); - ZEPHIR_CALL_FUNCTION(&_2, "version_compare", NULL, 241, _0, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "version_compare", NULL, 236, _0, &_1); zephir_check_call_status(); if (ZEPHIR_LT_LONG(_2, 0)) { _3$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_width"), PH_NOISY_CC); @@ -68608,7 +68757,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _flip) { ZVAL_LONG(&_12$$5, 0); ZEPHIR_SINIT_NVAR(_13$$5); ZVAL_LONG(&_13$$5, 1); - ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", &_14, 261, image, _6$$5, &_9$$5, &_10$$5, &_11$$5, &_12$$5, &_13$$5, _8$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", &_14, 256, image, _6$$5, &_9$$5, &_10$$5, &_11$$5, &_12$$5, &_13$$5, _8$$5); zephir_check_call_status(); } } else { @@ -68632,18 +68781,18 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _flip) { ZVAL_LONG(&_22$$7, ((zephir_get_numberval(_17$$7) - x) - 1)); ZEPHIR_SINIT_NVAR(_23$$7); ZVAL_LONG(&_23$$7, 1); - ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", &_14, 261, image, _16$$7, &_19$$7, &_20$$7, &_21$$7, &_22$$7, _18$$7, &_23$$7); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", &_14, 256, image, _16$$7, &_19$$7, &_20$$7, &_21$$7, &_22$$7, _18$$7, &_23$$7); zephir_check_call_status(); } } _24$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 252, _24$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 247, _24$$3); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), image TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_25$$3, "imagesx", NULL, 254, image); + ZEPHIR_CALL_FUNCTION(&_25$$3, "imagesx", NULL, 249, image); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_width"), _25$$3 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_26$$3, "imagesy", NULL, 255, image); + ZEPHIR_CALL_FUNCTION(&_26$$3, "imagesy", NULL, 250, image); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_height"), _26$$3 TSRMLS_CC); } else { @@ -68651,13 +68800,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _flip) { _27$$9 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_VAR(_28$$9); ZVAL_LONG(&_28$$9, 1); - ZEPHIR_CALL_FUNCTION(NULL, "imageflip", &_29, 262, _27$$9, &_28$$9); + ZEPHIR_CALL_FUNCTION(NULL, "imageflip", &_29, 257, _27$$9, &_28$$9); zephir_check_call_status(); } else { _30$$10 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_VAR(_31$$10); ZVAL_LONG(&_31$$10, 2); - ZEPHIR_CALL_FUNCTION(NULL, "imageflip", &_29, 262, _30$$10, &_31$$10); + ZEPHIR_CALL_FUNCTION(NULL, "imageflip", &_29, 257, _30$$10, &_31$$10); zephir_check_call_status(); } } @@ -68680,7 +68829,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _sharpen) { ZEPHIR_INIT_VAR(_0); ZEPHIR_SINIT_VAR(_1); ZVAL_LONG(&_1, (-18 + ((amount * 0.08)))); - ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 194, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 189, &_1); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_1); ZVAL_LONG(&_1, 2); @@ -68729,15 +68878,15 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _sharpen) { ZVAL_LONG(&_6, (amount - 8)); ZEPHIR_SINIT_VAR(_7); ZVAL_LONG(&_7, 0); - ZEPHIR_CALL_FUNCTION(&_8, "imageconvolution", NULL, 263, _5, matrix, &_6, &_7); + ZEPHIR_CALL_FUNCTION(&_8, "imageconvolution", NULL, 258, _5, matrix, &_6, &_7); zephir_check_call_status(); if (zephir_is_true(_8)) { _9$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_10$$3, "imagesx", NULL, 254, _9$$3); + ZEPHIR_CALL_FUNCTION(&_10$$3, "imagesx", NULL, 249, _9$$3); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_width"), _10$$3 TSRMLS_CC); _11$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_12$$3, "imagesy", NULL, 255, _11$$3); + ZEPHIR_CALL_FUNCTION(&_12$$3, "imagesy", NULL, 250, _11$$3); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_height"), _12$$3 TSRMLS_CC); } @@ -68763,7 +68912,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _reflection) { ZEPHIR_INIT_VAR(_0); ZEPHIR_SINIT_VAR(_1); ZVAL_DOUBLE(&_1, ((zephir_safe_div_long_long((opacity * 127), 100 TSRMLS_CC)) - (double) (127))); - ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 194, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 189, &_1); zephir_check_call_status(); zephir_round(_0, _2, NULL, NULL TSRMLS_CC); opacity = zephir_get_intval(_0); @@ -68789,7 +68938,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _reflection) { ZVAL_LONG(&_11, 0); ZEPHIR_SINIT_VAR(_12); ZVAL_LONG(&_12, 0); - ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", &_13, 261, reflection, _7, &_1, &_10, &_11, &_12, _8, _9); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", &_13, 256, reflection, _7, &_1, &_10, &_11, &_12, _8, _9); zephir_check_call_status(); offset = 0; while (1) { @@ -68830,7 +68979,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _reflection) { ZVAL_LONG(&_27$$5, src_y); ZEPHIR_SINIT_NVAR(_28$$5); ZVAL_LONG(&_28$$5, 1); - ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", &_13, 261, line, _22$$5, &_24$$5, &_25$$5, &_26$$5, &_27$$5, _23$$5, &_28$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", &_13, 256, line, _22$$5, &_24$$5, &_25$$5, &_26$$5, &_27$$5, _23$$5, &_28$$5); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_24$$5); ZVAL_LONG(&_24$$5, 4); @@ -68842,7 +68991,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _reflection) { ZVAL_LONG(&_27$$5, 0); ZEPHIR_SINIT_NVAR(_28$$5); ZVAL_LONG(&_28$$5, dst_opacity); - ZEPHIR_CALL_FUNCTION(NULL, "imagefilter", &_29, 264, line, &_24$$5, &_25$$5, &_26$$5, &_27$$5, &_28$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagefilter", &_29, 259, line, &_24$$5, &_25$$5, &_26$$5, &_27$$5, &_28$$5); zephir_check_call_status(); _30$$5 = zephir_fetch_nproperty_this(this_ptr, SL("_width"), PH_NOISY_CC); ZEPHIR_SINIT_NVAR(_24$$5); @@ -68855,18 +69004,18 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _reflection) { ZVAL_LONG(&_27$$5, 0); ZEPHIR_SINIT_NVAR(_28$$5); ZVAL_LONG(&_28$$5, 1); - ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", &_13, 261, reflection, line, &_24$$5, &_25$$5, &_26$$5, &_27$$5, _30$$5, &_28$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", &_13, 256, reflection, line, &_24$$5, &_25$$5, &_26$$5, &_27$$5, _30$$5, &_28$$5); zephir_check_call_status(); offset++; } _31 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 252, _31); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 247, _31); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), reflection TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_32, "imagesx", NULL, 254, reflection); + ZEPHIR_CALL_FUNCTION(&_32, "imagesx", NULL, 249, reflection); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_width"), _32 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_33, "imagesy", NULL, 255, reflection); + ZEPHIR_CALL_FUNCTION(&_33, "imagesy", NULL, 250, reflection); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_height"), _33 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -68888,21 +69037,21 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _watermark) { ZEPHIR_CALL_METHOD(&_0, watermark, "render", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&overlay, "imagecreatefromstring", NULL, 265, _0); + ZEPHIR_CALL_FUNCTION(&overlay, "imagecreatefromstring", NULL, 260, _0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 248, overlay, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 243, overlay, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "imagesx", NULL, 254, overlay); + ZEPHIR_CALL_FUNCTION(&_1, "imagesx", NULL, 249, overlay); zephir_check_call_status(); width = zephir_get_intval(_1); - ZEPHIR_CALL_FUNCTION(&_2, "imagesy", NULL, 255, overlay); + ZEPHIR_CALL_FUNCTION(&_2, "imagesy", NULL, 250, overlay); zephir_check_call_status(); height = zephir_get_intval(_2); if (opacity < 100) { ZEPHIR_INIT_VAR(_3$$3); ZEPHIR_SINIT_VAR(_4$$3); ZVAL_DOUBLE(&_4$$3, ((zephir_safe_div_long_long((opacity * 127), 100 TSRMLS_CC)) - (double) (127))); - ZEPHIR_CALL_FUNCTION(&_5$$3, "abs", NULL, 194, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "abs", NULL, 189, &_4$$3); zephir_check_call_status(); zephir_round(_3$$3, _5$$3, NULL, NULL TSRMLS_CC); opacity = zephir_get_intval(_3$$3); @@ -68914,11 +69063,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _watermark) { ZVAL_LONG(&_7$$3, 127); ZEPHIR_SINIT_VAR(_8$$3); ZVAL_LONG(&_8$$3, opacity); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 258, overlay, &_4$$3, &_6$$3, &_7$$3, &_8$$3); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 253, overlay, &_4$$3, &_6$$3, &_7$$3, &_8$$3); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_4$$3); ZVAL_LONG(&_4$$3, 3); - ZEPHIR_CALL_FUNCTION(NULL, "imagelayereffect", NULL, 266, overlay, &_4$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagelayereffect", NULL, 261, overlay, &_4$$3); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_4$$3); ZVAL_LONG(&_4$$3, 0); @@ -68928,11 +69077,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _watermark) { ZVAL_LONG(&_7$$3, width); ZEPHIR_SINIT_NVAR(_8$$3); ZVAL_LONG(&_8$$3, height); - ZEPHIR_CALL_FUNCTION(NULL, "imagefilledrectangle", NULL, 267, overlay, &_4$$3, &_6$$3, &_7$$3, &_8$$3, color); + ZEPHIR_CALL_FUNCTION(NULL, "imagefilledrectangle", NULL, 262, overlay, &_4$$3, &_6$$3, &_7$$3, &_8$$3, color); zephir_check_call_status(); } _9 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 250, _9, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 245, _9, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); _10 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_VAR(_11); @@ -68947,10 +69096,10 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _watermark) { ZVAL_LONG(&_15, width); ZEPHIR_SINIT_VAR(_16); ZVAL_LONG(&_16, height); - ZEPHIR_CALL_FUNCTION(&_17, "imagecopy", NULL, 261, _10, overlay, &_11, &_12, &_13, &_14, &_15, &_16); + ZEPHIR_CALL_FUNCTION(&_17, "imagecopy", NULL, 256, _10, overlay, &_11, &_12, &_13, &_14, &_15, &_16); zephir_check_call_status(); if (zephir_is_true(_17)) { - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 252, overlay); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 247, overlay); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -68986,7 +69135,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _text) { ZEPHIR_INIT_VAR(_0); ZEPHIR_SINIT_VAR(_1); ZVAL_DOUBLE(&_1, ((zephir_safe_div_long_long((opacity * 127), 100 TSRMLS_CC)) - (double) (127))); - ZEPHIR_CALL_FUNCTION(&_2, "abs", &_3, 194, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", &_3, 189, &_1); zephir_check_call_status(); zephir_round(_0, _2, NULL, NULL TSRMLS_CC); opacity = zephir_get_intval(_0); @@ -68995,7 +69144,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _text) { ZVAL_LONG(&_4$$3, size); ZEPHIR_SINIT_VAR(_5$$3); ZVAL_LONG(&_5$$3, 0); - ZEPHIR_CALL_FUNCTION(&space, "imagettfbbox", NULL, 268, &_4$$3, &_5$$3, fontfile, text); + ZEPHIR_CALL_FUNCTION(&space, "imagettfbbox", NULL, 263, &_4$$3, &_5$$3, fontfile, text); zephir_check_call_status(); if (zephir_array_isset_long(space, 0)) { ZEPHIR_OBS_VAR(_6$$4); @@ -69029,12 +69178,12 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _text) { } ZEPHIR_SINIT_NVAR(_4$$3); ZVAL_LONG(&_4$$3, (s4 - s0)); - ZEPHIR_CALL_FUNCTION(&_13$$3, "abs", &_3, 194, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_13$$3, "abs", &_3, 189, &_4$$3); zephir_check_call_status(); width = (zephir_get_numberval(_13$$3) + 10); ZEPHIR_SINIT_NVAR(_4$$3); ZVAL_LONG(&_4$$3, (s5 - s1)); - ZEPHIR_CALL_FUNCTION(&_14$$3, "abs", &_3, 194, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_14$$3, "abs", &_3, 189, &_4$$3); zephir_check_call_status(); height = (zephir_get_numberval(_14$$3) + 10); if (offsetX < 0) { @@ -69054,7 +69203,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _text) { ZVAL_LONG(&_18$$3, b); ZEPHIR_SINIT_VAR(_19$$3); ZVAL_LONG(&_19$$3, opacity); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", &_20, 258, _17$$3, &_4$$3, &_5$$3, &_18$$3, &_19$$3); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", &_20, 253, _17$$3, &_4$$3, &_5$$3, &_18$$3, &_19$$3); zephir_check_call_status(); angle = 0; _21$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); @@ -69066,17 +69215,17 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _text) { ZVAL_LONG(&_18$$3, offsetX); ZEPHIR_SINIT_NVAR(_19$$3); ZVAL_LONG(&_19$$3, offsetY); - ZEPHIR_CALL_FUNCTION(NULL, "imagettftext", NULL, 269, _21$$3, &_4$$3, &_5$$3, &_18$$3, &_19$$3, color, fontfile, text); + ZEPHIR_CALL_FUNCTION(NULL, "imagettftext", NULL, 264, _21$$3, &_4$$3, &_5$$3, &_18$$3, &_19$$3, color, fontfile, text); zephir_check_call_status(); } else { ZEPHIR_SINIT_VAR(_22$$8); ZVAL_LONG(&_22$$8, size); - ZEPHIR_CALL_FUNCTION(&_23$$8, "imagefontwidth", NULL, 270, &_22$$8); + ZEPHIR_CALL_FUNCTION(&_23$$8, "imagefontwidth", NULL, 265, &_22$$8); zephir_check_call_status(); width = (zephir_get_intval(_23$$8) * zephir_fast_strlen_ev(text)); ZEPHIR_SINIT_NVAR(_22$$8); ZVAL_LONG(&_22$$8, size); - ZEPHIR_CALL_FUNCTION(&_24$$8, "imagefontheight", NULL, 271, &_22$$8); + ZEPHIR_CALL_FUNCTION(&_24$$8, "imagefontheight", NULL, 266, &_22$$8); zephir_check_call_status(); height = zephir_get_intval(_24$$8); if (offsetX < 0) { @@ -69096,7 +69245,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _text) { ZVAL_LONG(&_29$$8, b); ZEPHIR_SINIT_VAR(_30$$8); ZVAL_LONG(&_30$$8, opacity); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", &_20, 258, _27$$8, &_22$$8, &_28$$8, &_29$$8, &_30$$8); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", &_20, 253, _27$$8, &_22$$8, &_28$$8, &_29$$8, &_30$$8); zephir_check_call_status(); _31$$8 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_NVAR(_22$$8); @@ -69105,7 +69254,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _text) { ZVAL_LONG(&_28$$8, offsetX); ZEPHIR_SINIT_NVAR(_29$$8); ZVAL_LONG(&_29$$8, offsetY); - ZEPHIR_CALL_FUNCTION(NULL, "imagestring", NULL, 272, _31$$8, &_22$$8, &_28$$8, &_29$$8, text, color); + ZEPHIR_CALL_FUNCTION(NULL, "imagestring", NULL, 267, _31$$8, &_22$$8, &_28$$8, &_29$$8, text, color); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -69126,22 +69275,22 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _mask) { ZEPHIR_CALL_METHOD(&_0, mask, "render", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&maskImage, "imagecreatefromstring", NULL, 265, _0); + ZEPHIR_CALL_FUNCTION(&maskImage, "imagecreatefromstring", NULL, 260, _0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "imagesx", NULL, 254, maskImage); + ZEPHIR_CALL_FUNCTION(&_1, "imagesx", NULL, 249, maskImage); zephir_check_call_status(); mask_width = zephir_get_intval(_1); - ZEPHIR_CALL_FUNCTION(&_2, "imagesy", NULL, 255, maskImage); + ZEPHIR_CALL_FUNCTION(&_2, "imagesy", NULL, 250, maskImage); zephir_check_call_status(); mask_height = zephir_get_intval(_2); alpha = 127; - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", &_3, 248, maskImage, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", &_3, 243, maskImage, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); _4 = zephir_fetch_nproperty_this(this_ptr, SL("_width"), PH_NOISY_CC); _5 = zephir_fetch_nproperty_this(this_ptr, SL("_height"), PH_NOISY_CC); ZEPHIR_CALL_METHOD(&newimage, this_ptr, "_create", NULL, 0, _4, _5); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", &_3, 248, newimage, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", &_3, 243, newimage, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); ZEPHIR_SINIT_VAR(_6); ZVAL_LONG(&_6, 0); @@ -69151,13 +69300,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _mask) { ZVAL_LONG(&_8, 0); ZEPHIR_SINIT_VAR(_9); ZVAL_LONG(&_9, alpha); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", &_10, 258, newimage, &_6, &_7, &_8, &_9); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", &_10, 253, newimage, &_6, &_7, &_8, &_9); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_6); ZVAL_LONG(&_6, 0); ZEPHIR_SINIT_NVAR(_7); ZVAL_LONG(&_7, 0); - ZEPHIR_CALL_FUNCTION(NULL, "imagefill", NULL, 273, newimage, &_6, &_7, color); + ZEPHIR_CALL_FUNCTION(NULL, "imagefill", NULL, 268, newimage, &_6, &_7, color); zephir_check_call_status(); _11 = zephir_fetch_nproperty_this(this_ptr, SL("_width"), PH_NOISY_CC); _12 = !ZEPHIR_IS_LONG(_11, mask_width); @@ -69168,7 +69317,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _mask) { if (_12) { _14$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_width"), PH_NOISY_CC); _15$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_height"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&tempImage, "imagecreatetruecolor", NULL, 249, _14$$3, _15$$3); + ZEPHIR_CALL_FUNCTION(&tempImage, "imagecreatetruecolor", NULL, 244, _14$$3, _15$$3); zephir_check_call_status(); _16$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_width"), PH_NOISY_CC); _17$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_height"), PH_NOISY_CC); @@ -69184,9 +69333,9 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _mask) { ZVAL_LONG(&_22$$3, mask_width); ZEPHIR_SINIT_VAR(_23$$3); ZVAL_LONG(&_23$$3, mask_height); - ZEPHIR_CALL_FUNCTION(NULL, "imagecopyresampled", NULL, 253, tempImage, maskImage, &_18$$3, &_19$$3, &_20$$3, &_21$$3, _16$$3, _17$$3, &_22$$3, &_23$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopyresampled", NULL, 248, tempImage, maskImage, &_18$$3, &_19$$3, &_20$$3, &_21$$3, _16$$3, _17$$3, &_22$$3, &_23$$3); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_24, 252, maskImage); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_24, 247, maskImage); zephir_check_call_status(); ZEPHIR_CPY_WRT(maskImage, tempImage); } @@ -69206,9 +69355,9 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _mask) { ZVAL_LONG(&_27$$5, x); ZEPHIR_SINIT_NVAR(_28$$5); ZVAL_LONG(&_28$$5, y); - ZEPHIR_CALL_FUNCTION(&index, "imagecolorat", &_29, 274, maskImage, &_27$$5, &_28$$5); + ZEPHIR_CALL_FUNCTION(&index, "imagecolorat", &_29, 269, maskImage, &_27$$5, &_28$$5); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorsforindex", &_30, 275, maskImage, index); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorsforindex", &_30, 270, maskImage, index); zephir_check_call_status(); if (zephir_array_isset_string(color, SS("red"))) { zephir_array_fetch_string(&_31$$6, color, SL("red"), PH_NOISY | PH_READONLY, "phalcon/image/adapter/gd.zep", 431 TSRMLS_CC); @@ -69221,10 +69370,10 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _mask) { ZVAL_LONG(&_27$$5, x); ZEPHIR_SINIT_NVAR(_28$$5); ZVAL_LONG(&_28$$5, y); - ZEPHIR_CALL_FUNCTION(&index, "imagecolorat", &_29, 274, _33$$5, &_27$$5, &_28$$5); + ZEPHIR_CALL_FUNCTION(&index, "imagecolorat", &_29, 269, _33$$5, &_27$$5, &_28$$5); zephir_check_call_status(); _34$$5 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorsforindex", &_30, 275, _34$$5, index); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorsforindex", &_30, 270, _34$$5, index); zephir_check_call_status(); ZEPHIR_OBS_NVAR(r); zephir_array_fetch_string(&r, color, SL("red"), PH_NOISY, "phalcon/image/adapter/gd.zep", 436 TSRMLS_CC); @@ -69234,22 +69383,22 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _mask) { zephir_array_fetch_string(&b, color, SL("blue"), PH_NOISY, "phalcon/image/adapter/gd.zep", 436 TSRMLS_CC); ZEPHIR_SINIT_NVAR(_27$$5); ZVAL_LONG(&_27$$5, alpha); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", &_10, 258, newimage, r, g, b, &_27$$5); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", &_10, 253, newimage, r, g, b, &_27$$5); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_27$$5); ZVAL_LONG(&_27$$5, x); ZEPHIR_SINIT_NVAR(_28$$5); ZVAL_LONG(&_28$$5, y); - ZEPHIR_CALL_FUNCTION(NULL, "imagesetpixel", &_35, 276, newimage, &_27$$5, &_28$$5, color); + ZEPHIR_CALL_FUNCTION(NULL, "imagesetpixel", &_35, 271, newimage, &_27$$5, &_28$$5, color); zephir_check_call_status(); y++; } x++; } _36 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_24, 252, _36); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_24, 247, _36); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_24, 252, maskImage); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_24, 247, maskImage); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), newimage TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -69283,9 +69432,9 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _background) { ZVAL_LONG(&_4, b); ZEPHIR_SINIT_VAR(_5); ZVAL_LONG(&_5, opacity); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 258, background, &_2, &_3, &_4, &_5); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 253, background, &_2, &_3, &_4, &_5); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 250, background, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 245, background, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); _6 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); _7 = zephir_fetch_nproperty_this(this_ptr, SL("_width"), PH_NOISY_CC); @@ -69298,11 +69447,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _background) { ZVAL_LONG(&_4, 0); ZEPHIR_SINIT_NVAR(_5); ZVAL_LONG(&_5, 0); - ZEPHIR_CALL_FUNCTION(&_9, "imagecopy", NULL, 261, background, _6, &_2, &_3, &_4, &_5, _7, _8); + ZEPHIR_CALL_FUNCTION(&_9, "imagecopy", NULL, 256, background, _6, &_2, &_3, &_4, &_5, _7, _8); zephir_check_call_status(); if (zephir_is_true(_9)) { _10$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 252, _10$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 247, _10$$3); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), background TSRMLS_CC); } @@ -69330,7 +69479,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _blur) { _0$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_NVAR(_1$$3); ZVAL_LONG(&_1$$3, 7); - ZEPHIR_CALL_FUNCTION(NULL, "imagefilter", &_2, 264, _0$$3, &_1$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagefilter", &_2, 259, _0$$3, &_1$$3); zephir_check_call_status(); i++; } @@ -69369,7 +69518,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _pixelate) { ZVAL_LONG(&_3$$4, x1); ZEPHIR_SINIT_NVAR(_4$$4); ZVAL_LONG(&_4$$4, y1); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorat", &_5, 274, _2$$4, &_3$$4, &_4$$4); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorat", &_5, 269, _2$$4, &_3$$4, &_4$$4); zephir_check_call_status(); x2 = (x + amount); y2 = (y + amount); @@ -69382,7 +69531,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _pixelate) { ZVAL_LONG(&_7$$4, x2); ZEPHIR_SINIT_NVAR(_8$$4); ZVAL_LONG(&_8$$4, y2); - ZEPHIR_CALL_FUNCTION(NULL, "imagefilledrectangle", &_9, 267, _6$$4, &_3$$4, &_4$$4, &_7$$4, &_8$$4, color); + ZEPHIR_CALL_FUNCTION(NULL, "imagefilledrectangle", &_9, 262, _6$$4, &_3$$4, &_4$$4, &_7$$4, &_8$$4, color); zephir_check_call_status(); y += amount; } @@ -69413,7 +69562,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _save) { zephir_check_call_status(); if (!(zephir_is_true(ext))) { _1$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_type"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&ext, "image_type_to_extension", NULL, 277, _1$$3, ZEPHIR_GLOBAL(global_false)); + ZEPHIR_CALL_FUNCTION(&ext, "image_type_to_extension", NULL, 272, _1$$3, ZEPHIR_GLOBAL(global_false)); zephir_check_call_status(); } ZEPHIR_INIT_VAR(_2); @@ -69421,30 +69570,30 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _save) { ZEPHIR_CPY_WRT(ext, _2); ZEPHIR_SINIT_NVAR(_0); ZVAL_STRING(&_0, "gif", 0); - ZEPHIR_CALL_FUNCTION(&_3, "strcmp", &_4, 278, ext, &_0); + ZEPHIR_CALL_FUNCTION(&_3, "strcmp", &_4, 273, ext, &_0); zephir_check_call_status(); if (ZEPHIR_IS_LONG(_3, 0)) { ZEPHIR_INIT_ZVAL_NREF(_5$$4); ZVAL_LONG(_5$$4, 1); zephir_update_property_this(this_ptr, SL("_type"), _5$$4 TSRMLS_CC); _5$$4 = zephir_fetch_nproperty_this(this_ptr, SL("_type"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_6$$4, "image_type_to_mime_type", &_7, 279, _5$$4); + ZEPHIR_CALL_FUNCTION(&_6$$4, "image_type_to_mime_type", &_7, 274, _5$$4); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_mime"), _6$$4 TSRMLS_CC); _8$$4 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagegif", NULL, 280, _8$$4, file); + ZEPHIR_CALL_FUNCTION(NULL, "imagegif", NULL, 275, _8$$4, file); zephir_check_call_status(); RETURN_MM_BOOL(1); } ZEPHIR_SINIT_NVAR(_0); ZVAL_STRING(&_0, "jpg", 0); - ZEPHIR_CALL_FUNCTION(&_9, "strcmp", &_4, 278, ext, &_0); + ZEPHIR_CALL_FUNCTION(&_9, "strcmp", &_4, 273, ext, &_0); zephir_check_call_status(); _10 = ZEPHIR_IS_LONG(_9, 0); if (!(_10)) { ZEPHIR_SINIT_NVAR(_0); ZVAL_STRING(&_0, "jpeg", 0); - ZEPHIR_CALL_FUNCTION(&_11, "strcmp", &_4, 278, ext, &_0); + ZEPHIR_CALL_FUNCTION(&_11, "strcmp", &_4, 273, ext, &_0); zephir_check_call_status(); _10 = ZEPHIR_IS_LONG(_11, 0); } @@ -69453,64 +69602,64 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _save) { ZVAL_LONG(_12$$5, 2); zephir_update_property_this(this_ptr, SL("_type"), _12$$5 TSRMLS_CC); _12$$5 = zephir_fetch_nproperty_this(this_ptr, SL("_type"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_13$$5, "image_type_to_mime_type", &_7, 279, _12$$5); + ZEPHIR_CALL_FUNCTION(&_13$$5, "image_type_to_mime_type", &_7, 274, _12$$5); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_mime"), _13$$5 TSRMLS_CC); _14$$5 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_VAR(_15$$5); ZVAL_LONG(&_15$$5, quality); - ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 281, _14$$5, file, &_15$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 276, _14$$5, file, &_15$$5); zephir_check_call_status(); RETURN_MM_BOOL(1); } ZEPHIR_SINIT_NVAR(_0); ZVAL_STRING(&_0, "png", 0); - ZEPHIR_CALL_FUNCTION(&_16, "strcmp", &_4, 278, ext, &_0); + ZEPHIR_CALL_FUNCTION(&_16, "strcmp", &_4, 273, ext, &_0); zephir_check_call_status(); if (ZEPHIR_IS_LONG(_16, 0)) { ZEPHIR_INIT_ZVAL_NREF(_17$$6); ZVAL_LONG(_17$$6, 3); zephir_update_property_this(this_ptr, SL("_type"), _17$$6 TSRMLS_CC); _17$$6 = zephir_fetch_nproperty_this(this_ptr, SL("_type"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_18$$6, "image_type_to_mime_type", &_7, 279, _17$$6); + ZEPHIR_CALL_FUNCTION(&_18$$6, "image_type_to_mime_type", &_7, 274, _17$$6); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_mime"), _18$$6 TSRMLS_CC); _19$$6 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagepng", NULL, 282, _19$$6, file); + ZEPHIR_CALL_FUNCTION(NULL, "imagepng", NULL, 277, _19$$6, file); zephir_check_call_status(); RETURN_MM_BOOL(1); } ZEPHIR_SINIT_NVAR(_0); ZVAL_STRING(&_0, "wbmp", 0); - ZEPHIR_CALL_FUNCTION(&_20, "strcmp", &_4, 278, ext, &_0); + ZEPHIR_CALL_FUNCTION(&_20, "strcmp", &_4, 273, ext, &_0); zephir_check_call_status(); if (ZEPHIR_IS_LONG(_20, 0)) { ZEPHIR_INIT_ZVAL_NREF(_21$$7); ZVAL_LONG(_21$$7, 15); zephir_update_property_this(this_ptr, SL("_type"), _21$$7 TSRMLS_CC); _21$$7 = zephir_fetch_nproperty_this(this_ptr, SL("_type"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_22$$7, "image_type_to_mime_type", &_7, 279, _21$$7); + ZEPHIR_CALL_FUNCTION(&_22$$7, "image_type_to_mime_type", &_7, 274, _21$$7); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_mime"), _22$$7 TSRMLS_CC); _23$$7 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagewbmp", NULL, 283, _23$$7, file); + ZEPHIR_CALL_FUNCTION(NULL, "imagewbmp", NULL, 278, _23$$7, file); zephir_check_call_status(); RETURN_MM_BOOL(1); } ZEPHIR_SINIT_NVAR(_0); ZVAL_STRING(&_0, "xbm", 0); - ZEPHIR_CALL_FUNCTION(&_24, "strcmp", &_4, 278, ext, &_0); + ZEPHIR_CALL_FUNCTION(&_24, "strcmp", &_4, 273, ext, &_0); zephir_check_call_status(); if (ZEPHIR_IS_LONG(_24, 0)) { ZEPHIR_INIT_ZVAL_NREF(_25$$8); ZVAL_LONG(_25$$8, 16); zephir_update_property_this(this_ptr, SL("_type"), _25$$8 TSRMLS_CC); _25$$8 = zephir_fetch_nproperty_this(this_ptr, SL("_type"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_26$$8, "image_type_to_mime_type", &_7, 279, _25$$8); + ZEPHIR_CALL_FUNCTION(&_26$$8, "image_type_to_mime_type", &_7, 274, _25$$8); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_mime"), _26$$8 TSRMLS_CC); _27$$8 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagexbm", NULL, 284, _27$$8, file); + ZEPHIR_CALL_FUNCTION(NULL, "imagexbm", NULL, 279, _27$$8, file); zephir_check_call_status(); RETURN_MM_BOOL(1); } @@ -69548,25 +69697,25 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _render) { zephir_check_call_status(); ZEPHIR_SINIT_VAR(_1); ZVAL_STRING(&_1, "gif", 0); - ZEPHIR_CALL_FUNCTION(&_2, "strcmp", &_3, 278, ext, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "strcmp", &_3, 273, ext, &_1); zephir_check_call_status(); if (ZEPHIR_IS_LONG(_2, 0)) { _4$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagegif", NULL, 280, _4$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagegif", NULL, 275, _4$$3); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", &_5, 285); + ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", &_5, 280); zephir_check_call_status(); RETURN_MM(); } ZEPHIR_SINIT_NVAR(_1); ZVAL_STRING(&_1, "jpg", 0); - ZEPHIR_CALL_FUNCTION(&_6, "strcmp", &_3, 278, ext, &_1); + ZEPHIR_CALL_FUNCTION(&_6, "strcmp", &_3, 273, ext, &_1); zephir_check_call_status(); _7 = ZEPHIR_IS_LONG(_6, 0); if (!(_7)) { ZEPHIR_SINIT_NVAR(_1); ZVAL_STRING(&_1, "jpeg", 0); - ZEPHIR_CALL_FUNCTION(&_8, "strcmp", &_3, 278, ext, &_1); + ZEPHIR_CALL_FUNCTION(&_8, "strcmp", &_3, 273, ext, &_1); zephir_check_call_status(); _7 = ZEPHIR_IS_LONG(_8, 0); } @@ -69574,45 +69723,45 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _render) { _9$$4 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_VAR(_10$$4); ZVAL_LONG(&_10$$4, quality); - ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 281, _9$$4, ZEPHIR_GLOBAL(global_null), &_10$$4); + ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 276, _9$$4, ZEPHIR_GLOBAL(global_null), &_10$$4); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", &_5, 285); + ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", &_5, 280); zephir_check_call_status(); RETURN_MM(); } ZEPHIR_SINIT_NVAR(_1); ZVAL_STRING(&_1, "png", 0); - ZEPHIR_CALL_FUNCTION(&_11, "strcmp", &_3, 278, ext, &_1); + ZEPHIR_CALL_FUNCTION(&_11, "strcmp", &_3, 273, ext, &_1); zephir_check_call_status(); if (ZEPHIR_IS_LONG(_11, 0)) { _12$$5 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagepng", NULL, 282, _12$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagepng", NULL, 277, _12$$5); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", &_5, 285); + ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", &_5, 280); zephir_check_call_status(); RETURN_MM(); } ZEPHIR_SINIT_NVAR(_1); ZVAL_STRING(&_1, "wbmp", 0); - ZEPHIR_CALL_FUNCTION(&_13, "strcmp", &_3, 278, ext, &_1); + ZEPHIR_CALL_FUNCTION(&_13, "strcmp", &_3, 273, ext, &_1); zephir_check_call_status(); if (ZEPHIR_IS_LONG(_13, 0)) { _14$$6 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagewbmp", NULL, 283, _14$$6); + ZEPHIR_CALL_FUNCTION(NULL, "imagewbmp", NULL, 278, _14$$6); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", &_5, 285); + ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", &_5, 280); zephir_check_call_status(); RETURN_MM(); } ZEPHIR_SINIT_NVAR(_1); ZVAL_STRING(&_1, "xbm", 0); - ZEPHIR_CALL_FUNCTION(&_15, "strcmp", &_3, 278, ext, &_1); + ZEPHIR_CALL_FUNCTION(&_15, "strcmp", &_3, 273, ext, &_1); zephir_check_call_status(); if (ZEPHIR_IS_LONG(_15, 0)) { _16$$7 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagexbm", NULL, 284, _16$$7, ZEPHIR_GLOBAL(global_null)); + ZEPHIR_CALL_FUNCTION(NULL, "imagexbm", NULL, 279, _16$$7, ZEPHIR_GLOBAL(global_null)); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", &_5, 285); + ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", &_5, 280); zephir_check_call_status(); RETURN_MM(); } @@ -69644,11 +69793,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _create) { ZVAL_LONG(&_0, width); ZEPHIR_SINIT_VAR(_1); ZVAL_LONG(&_1, height); - ZEPHIR_CALL_FUNCTION(&image, "imagecreatetruecolor", NULL, 249, &_0, &_1); + ZEPHIR_CALL_FUNCTION(&image, "imagecreatetruecolor", NULL, 244, &_0, &_1); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 250, image, ZEPHIR_GLOBAL(global_false)); + ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 245, image, ZEPHIR_GLOBAL(global_false)); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 248, image, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 243, image, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); RETURN_CCTOR(image); @@ -69664,7 +69813,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, __destruct) { ZEPHIR_OBS_VAR(image); zephir_read_property_this(&image, this_ptr, SL("_image"), PH_NOISY_CC); if (Z_TYPE_P(image) == IS_RESOURCE) { - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 252, image); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 247, image); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -69717,12 +69866,12 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, check) { } ZEPHIR_SINIT_VAR(_2); ZVAL_STRING(&_2, "Imagick::IMAGICK_EXTNUM", 0); - ZEPHIR_CALL_FUNCTION(&_3, "defined", NULL, 230, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "defined", NULL, 225, &_2); zephir_check_call_status(); if (zephir_is_true(_3)) { ZEPHIR_SINIT_VAR(_4$$5); ZVAL_STRING(&_4$$5, "Imagick::IMAGICK_EXTNUM", 0); - ZEPHIR_CALL_FUNCTION(&_5$$5, "constant", NULL, 192, &_4$$5); + ZEPHIR_CALL_FUNCTION(&_5$$5, "constant", NULL, 187, &_4$$5); zephir_check_call_status(); zephir_update_static_property_ce(phalcon_image_adapter_imagick_ce, SL("_version"), &_5$$5 TSRMLS_CC); } @@ -69772,8 +69921,10 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, __construct) { zephir_update_property_this(this_ptr, SL("_file"), file TSRMLS_CC); ZEPHIR_INIT_VAR(_1); object_init_ex(_1, zephir_get_internal_ce(SS("imagick") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, _1, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(_1 TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, _1, "__construct", NULL, 0); + zephir_check_call_status(); + } zephir_update_property_this(this_ptr, SL("_image"), _1 TSRMLS_CC); _2 = zephir_fetch_nproperty_this(this_ptr, SL("_file"), PH_NOISY_CC); if ((zephir_file_exists(_2 TSRMLS_CC) == SUCCESS)) { @@ -69804,7 +69955,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, __construct) { _13$$6 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_VAR(_14$$6); ZVAL_STRING(&_14$$6, "Imagick::ALPHACHANNEL_SET", 0); - ZEPHIR_CALL_FUNCTION(&_15$$6, "constant", NULL, 192, &_14$$6); + ZEPHIR_CALL_FUNCTION(&_15$$6, "constant", NULL, 187, &_14$$6); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, _13$$6, "setimagealphachannel", NULL, 0, _15$$6); zephir_check_call_status(); @@ -69842,11 +69993,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, __construct) { _24$$8 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_INIT_VAR(_25$$8); object_init_ex(_25$$8, zephir_get_internal_ce(SS("imagickpixel") TSRMLS_CC)); - ZEPHIR_INIT_VAR(_26$$8); - ZVAL_STRING(_26$$8, "transparent", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _25$$8, "__construct", NULL, 0, _26$$8); - zephir_check_temp_parameter(_26$$8); - zephir_check_call_status(); + if (zephir_has_constructor(_25$$8 TSRMLS_CC)) { + ZEPHIR_INIT_VAR(_26$$8); + ZVAL_STRING(_26$$8, "transparent", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(NULL, _25$$8, "__construct", NULL, 0, _26$$8); + zephir_check_temp_parameter(_26$$8); + zephir_check_call_status(); + } ZEPHIR_INIT_NVAR(_26$$8); ZVAL_LONG(_26$$8, width); ZEPHIR_INIT_VAR(_27$$8); @@ -70064,8 +70217,10 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _rotate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(pixel); object_init_ex(pixel, zephir_get_internal_ce(SS("imagickpixel") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, pixel, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(pixel TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, pixel, "__construct", NULL, 0); + zephir_check_call_status(); + } while (1) { _2$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_INIT_NVAR(_3$$3); @@ -70254,8 +70409,10 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _reflection) { } ZEPHIR_INIT_VAR(fade); object_init_ex(fade, zephir_get_internal_ce(SS("imagick") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, fade, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(fade TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, fade, "__construct", NULL, 0); + zephir_check_call_status(); + } ZEPHIR_CALL_METHOD(&_17, reflection, "getimagewidth", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_18, reflection, "getimageheight", NULL, 0); @@ -70270,7 +70427,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _reflection) { while (1) { ZEPHIR_SINIT_NVAR(_19$$7); ZVAL_STRING(&_19$$7, "Imagick::COMPOSITE_DSTOUT", 0); - ZEPHIR_CALL_FUNCTION(&_20$$7, "constant", &_21, 192, &_19$$7); + ZEPHIR_CALL_FUNCTION(&_20$$7, "constant", &_21, 187, &_19$$7); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_22$$7); ZVAL_LONG(_22$$7, 0); @@ -70284,11 +70441,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _reflection) { } ZEPHIR_SINIT_NVAR(_19$$7); ZVAL_STRING(&_19$$7, "Imagick::EVALUATE_MULTIPLY", 0); - ZEPHIR_CALL_FUNCTION(&_25$$7, "constant", &_21, 192, &_19$$7); + ZEPHIR_CALL_FUNCTION(&_25$$7, "constant", &_21, 187, &_19$$7); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_19$$7); ZVAL_STRING(&_19$$7, "Imagick::CHANNEL_ALPHA", 0); - ZEPHIR_CALL_FUNCTION(&_26$$7, "constant", &_21, 192, &_19$$7); + ZEPHIR_CALL_FUNCTION(&_26$$7, "constant", &_21, 187, &_19$$7); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_22$$7); ZVAL_LONG(_22$$7, opacity); @@ -70304,12 +70461,16 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _reflection) { zephir_check_call_status(); ZEPHIR_INIT_VAR(image); object_init_ex(image, zephir_get_internal_ce(SS("imagick") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, image, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(image TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, image, "__construct", NULL, 0); + zephir_check_call_status(); + } ZEPHIR_INIT_VAR(pixel); object_init_ex(pixel, zephir_get_internal_ce(SS("imagickpixel") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, pixel, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(pixel TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, pixel, "__construct", NULL, 0); + zephir_check_call_status(); + } _30 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_CALL_METHOD(&_31, _30, "getimageheight", NULL, 0); zephir_check_call_status(); @@ -70327,7 +70488,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _reflection) { zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_36$$10); ZVAL_STRING(&_36$$10, "Imagick::ALPHACHANNEL_SET", 0); - ZEPHIR_CALL_FUNCTION(&_37$$10, "constant", &_21, 192, &_36$$10); + ZEPHIR_CALL_FUNCTION(&_37$$10, "constant", &_21, 187, &_36$$10); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, image, "setimagealphachannel", &_38, 0, _37$$10); zephir_check_call_status(); @@ -70344,7 +70505,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _reflection) { _45$$10 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_NVAR(_36$$10); ZVAL_STRING(&_36$$10, "Imagick::COMPOSITE_SRC", 0); - ZEPHIR_CALL_FUNCTION(&_46$$10, "constant", &_21, 192, &_36$$10); + ZEPHIR_CALL_FUNCTION(&_46$$10, "constant", &_21, 187, &_36$$10); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_34$$10); ZVAL_LONG(_34$$10, 0); @@ -70374,7 +70535,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _reflection) { while (1) { ZEPHIR_SINIT_NVAR(_51$$13); ZVAL_STRING(&_51$$13, "Imagick::COMPOSITE_OVER", 0); - ZEPHIR_CALL_FUNCTION(&_52$$13, "constant", &_21, 192, &_51$$13); + ZEPHIR_CALL_FUNCTION(&_52$$13, "constant", &_21, 187, &_51$$13); zephir_check_call_status(); _53$$13 = zephir_fetch_nproperty_this(this_ptr, SL("_height"), PH_NOISY_CC); ZEPHIR_INIT_NVAR(_54$$13); @@ -70435,8 +70596,10 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _watermark) { opacity = (long) (zephir_safe_div_long_long(opacity, 100 TSRMLS_CC)); ZEPHIR_INIT_VAR(watermark); object_init_ex(watermark, zephir_get_internal_ce(SS("imagick") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, watermark, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(watermark TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, watermark, "__construct", NULL, 0); + zephir_check_call_status(); + } ZEPHIR_CALL_METHOD(&_0, image, "render", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, watermark, "readimageblob", NULL, 0, _0); @@ -70454,7 +70617,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _watermark) { _3$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_NVAR(_4$$3); ZVAL_STRING(&_4$$3, "Imagick::COMPOSITE_OVER", 0); - ZEPHIR_CALL_FUNCTION(&_5$$3, "constant", &_6, 192, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "constant", &_6, 187, &_4$$3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_7$$3); ZVAL_LONG(_7$$3, offsetX); @@ -70506,8 +70669,10 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _text) { opacity = (long) (zephir_safe_div_long_long(opacity, 100 TSRMLS_CC)); ZEPHIR_INIT_VAR(draw); object_init_ex(draw, zephir_get_internal_ce(SS("imagickdraw") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, draw, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(draw TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, draw, "__construct", NULL, 0); + zephir_check_call_status(); + } ZEPHIR_SINIT_VAR(_0); ZVAL_STRING(&_0, "rgb(%d, %d, %d)", 0); ZEPHIR_SINIT_VAR(_1); @@ -70516,12 +70681,14 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _text) { ZVAL_LONG(&_2, g); ZEPHIR_SINIT_VAR(_3); ZVAL_LONG(&_3, b); - ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 189, &_0, &_1, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 184, &_0, &_1, &_2, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(_4); object_init_ex(_4, zephir_get_internal_ce(SS("imagickpixel") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, _4, "__construct", NULL, 0, color); - zephir_check_call_status(); + if (zephir_has_constructor(_4 TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, _4, "__construct", NULL, 0, color); + zephir_check_call_status(); + } ZEPHIR_CALL_METHOD(NULL, draw, "setfillcolor", NULL, 0, _4); zephir_check_call_status(); if (!(!fontfile) && Z_STRLEN_P(fontfile)) { @@ -70555,24 +70722,24 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _text) { if (_7$$7) { ZEPHIR_SINIT_VAR(_8$$8); ZVAL_STRING(&_8$$8, "Imagick::GRAVITY_SOUTHEAST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_8$$8); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_8$$8); zephir_check_call_status(); } else { if (zephir_is_true(offsetX)) { ZEPHIR_SINIT_VAR(_10$$10); ZVAL_STRING(&_10$$10, "Imagick::GRAVITY_EAST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_10$$10); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_10$$10); zephir_check_call_status(); } else { if (zephir_is_true(offsetY)) { ZEPHIR_SINIT_VAR(_11$$12); ZVAL_STRING(&_11$$12, "Imagick::GRAVITY_SOUTH", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_11$$12); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_11$$12); zephir_check_call_status(); } else { ZEPHIR_SINIT_VAR(_12$$13); ZVAL_STRING(&_12$$13, "Imagick::GRAVITY_CENTER", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_12$$13); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_12$$13); zephir_check_call_status(); } } @@ -70588,13 +70755,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _text) { ZVAL_LONG(offsetY, (y * -1)); ZEPHIR_SINIT_VAR(_13$$17); ZVAL_STRING(&_13$$17, "Imagick::GRAVITY_SOUTHEAST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_13$$17); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_13$$17); zephir_check_call_status(); } else { ZVAL_LONG(offsetX, 0); ZEPHIR_SINIT_VAR(_14$$18); ZVAL_STRING(&_14$$18, "Imagick::GRAVITY_NORTHEAST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_14$$18); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_14$$18); zephir_check_call_status(); } } else { @@ -70605,13 +70772,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _text) { ZVAL_LONG(offsetY, (y * -1)); ZEPHIR_SINIT_VAR(_15$$20); ZVAL_STRING(&_15$$20, "Imagick::GRAVITY_SOUTH", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_15$$20); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_15$$20); zephir_check_call_status(); } else { ZVAL_LONG(offsetX, 0); ZEPHIR_SINIT_VAR(_16$$21); ZVAL_STRING(&_16$$21, "Imagick::GRAVITY_NORTH", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_16$$21); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_16$$21); zephir_check_call_status(); } } @@ -70630,13 +70797,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _text) { ZVAL_LONG(offsetY, 0); ZEPHIR_SINIT_VAR(_17$$27); ZVAL_STRING(&_17$$27, "Imagick::GRAVITY_SOUTHEAST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_17$$27); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_17$$27); zephir_check_call_status(); } else { ZVAL_LONG(offsetY, 0); ZEPHIR_SINIT_VAR(_18$$28); ZVAL_STRING(&_18$$28, "Imagick::GRAVITY_SOUTH", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_18$$28); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_18$$28); zephir_check_call_status(); } } else { @@ -70647,13 +70814,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _text) { ZVAL_LONG(offsetY, 0); ZEPHIR_SINIT_VAR(_19$$30); ZVAL_STRING(&_19$$30, "Imagick::GRAVITY_EAST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_19$$30); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_19$$30); zephir_check_call_status(); } else { ZVAL_LONG(offsetY, 0); ZEPHIR_SINIT_VAR(_20$$31); ZVAL_STRING(&_20$$31, "Imagick::GRAVITY_WEST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_20$$31); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_20$$31); zephir_check_call_status(); } } @@ -70669,13 +70836,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _text) { ZVAL_LONG(offsetY, (y * -1)); ZEPHIR_SINIT_VAR(_21$$35); ZVAL_STRING(&_21$$35, "Imagick::GRAVITY_SOUTHEAST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_21$$35); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_21$$35); zephir_check_call_status(); } else { ZVAL_LONG(offsetX, (x * -1)); ZEPHIR_SINIT_VAR(_22$$36); ZVAL_STRING(&_22$$36, "Imagick::GRAVITY_NORTHEAST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_22$$36); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_22$$36); zephir_check_call_status(); } } else { @@ -70686,13 +70853,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _text) { ZVAL_LONG(offsetY, (y * -1)); ZEPHIR_SINIT_VAR(_23$$38); ZVAL_STRING(&_23$$38, "Imagick::GRAVITY_SOUTHWEST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_23$$38); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_23$$38); zephir_check_call_status(); } else { ZVAL_LONG(offsetX, 0); ZEPHIR_SINIT_VAR(_24$$39); ZVAL_STRING(&_24$$39, "Imagick::GRAVITY_NORTHWEST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_24$$39); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_24$$39); zephir_check_call_status(); } } @@ -70740,8 +70907,10 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _mask) { ZEPHIR_INIT_VAR(mask); object_init_ex(mask, zephir_get_internal_ce(SS("imagick") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, mask, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(mask TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, mask, "__construct", NULL, 0); + zephir_check_call_status(); + } ZEPHIR_CALL_METHOD(&_0, image, "render", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, mask, "readimageblob", NULL, 0, _0); @@ -70760,7 +70929,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _mask) { _5$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_NVAR(_6$$3); ZVAL_STRING(&_6$$3, "Imagick::COMPOSITE_DSTIN", 0); - ZEPHIR_CALL_FUNCTION(&_7$$3, "constant", &_8, 192, &_6$$3); + ZEPHIR_CALL_FUNCTION(&_7$$3, "constant", &_8, 187, &_6$$3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_4$$3); ZVAL_LONG(_4$$3, 0); @@ -70769,7 +70938,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _mask) { ZEPHIR_CALL_METHOD(&ret, _5$$3, "compositeimage", NULL, 0, mask, _7$$3, _4$$3, _9$$3); zephir_check_call_status(); if (!ZEPHIR_IS_TRUE_IDENTICAL(ret)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_image_exception_ce, "Imagick::compositeImage failed", "phalcon/image/adapter/imagick.zep", 531); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_image_exception_ce, "Imagick::compositeImage failed", "phalcon/image/adapter/imagick.zep", 529); return; } _10$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); @@ -70810,24 +70979,30 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _background) { ZVAL_LONG(&_2, g); ZEPHIR_SINIT_VAR(_3); ZVAL_LONG(&_3, b); - ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 189, &_0, &_1, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 184, &_0, &_1, &_2, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(pixel1); object_init_ex(pixel1, zephir_get_internal_ce(SS("imagickpixel") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, pixel1, "__construct", NULL, 0, color); - zephir_check_call_status(); + if (zephir_has_constructor(pixel1 TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, pixel1, "__construct", NULL, 0, color); + zephir_check_call_status(); + } opacity = (long) (zephir_safe_div_long_long(opacity, 100 TSRMLS_CC)); ZEPHIR_INIT_VAR(pixel2); object_init_ex(pixel2, zephir_get_internal_ce(SS("imagickpixel") TSRMLS_CC)); - ZEPHIR_INIT_VAR(_4); - ZVAL_STRING(_4, "transparent", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, pixel2, "__construct", NULL, 0, _4); - zephir_check_temp_parameter(_4); - zephir_check_call_status(); + if (zephir_has_constructor(pixel2 TSRMLS_CC)) { + ZEPHIR_INIT_VAR(_4); + ZVAL_STRING(_4, "transparent", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(NULL, pixel2, "__construct", NULL, 0, _4); + zephir_check_temp_parameter(_4); + zephir_check_call_status(); + } ZEPHIR_INIT_VAR(background); object_init_ex(background, zephir_get_internal_ce(SS("imagick") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, background, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(background TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, background, "__construct", NULL, 0); + zephir_check_call_status(); + } _5 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_INIT_NVAR(_4); ZVAL_LONG(_4, 0); @@ -70843,7 +71018,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _background) { if (!(zephir_is_true(_9$$3))) { ZEPHIR_SINIT_NVAR(_11$$4); ZVAL_STRING(&_11$$4, "Imagick::ALPHACHANNEL_SET", 0); - ZEPHIR_CALL_FUNCTION(&_12$$4, "constant", &_13, 192, &_11$$4); + ZEPHIR_CALL_FUNCTION(&_12$$4, "constant", &_13, 187, &_11$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, background, "setimagealphachannel", &_14, 0, _12$$4); zephir_check_call_status(); @@ -70852,11 +71027,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _background) { zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_16$$3); ZVAL_STRING(&_16$$3, "Imagick::EVALUATE_MULTIPLY", 0); - ZEPHIR_CALL_FUNCTION(&_17$$3, "constant", &_13, 192, &_16$$3); + ZEPHIR_CALL_FUNCTION(&_17$$3, "constant", &_13, 187, &_16$$3); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_16$$3); ZVAL_STRING(&_16$$3, "Imagick::CHANNEL_ALPHA", 0); - ZEPHIR_CALL_FUNCTION(&_18$$3, "constant", &_13, 192, &_16$$3); + ZEPHIR_CALL_FUNCTION(&_18$$3, "constant", &_13, 187, &_16$$3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_19$$3); ZVAL_LONG(_19$$3, opacity); @@ -70870,7 +71045,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _background) { _24$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_NVAR(_16$$3); ZVAL_STRING(&_16$$3, "Imagick::COMPOSITE_DISSOLVE", 0); - ZEPHIR_CALL_FUNCTION(&_25$$3, "constant", &_13, 192, &_16$$3); + ZEPHIR_CALL_FUNCTION(&_25$$3, "constant", &_13, 187, &_16$$3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_19$$3); ZVAL_LONG(_19$$3, 0); @@ -70879,7 +71054,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _background) { ZEPHIR_CALL_METHOD(&ret, background, "compositeimage", &_27, 0, _24$$3, _25$$3, _19$$3, _26$$3); zephir_check_call_status(); if (!ZEPHIR_IS_TRUE_IDENTICAL(ret)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_image_exception_ce, "Imagick::compositeImage failed", "phalcon/image/adapter/imagick.zep", 570); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_image_exception_ce, "Imagick::compositeImage failed", "phalcon/image/adapter/imagick.zep", 568); return; } _28$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); @@ -71024,7 +71199,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _save) { zephir_check_call_status(); ZEPHIR_SINIT_VAR(_11$$3); ZVAL_STRING(&_11$$3, "w", 0); - ZEPHIR_CALL_FUNCTION(&fp, "fopen", NULL, 286, file, &_11$$3); + ZEPHIR_CALL_FUNCTION(&fp, "fopen", NULL, 281, file, &_11$$3); zephir_check_call_status(); _12$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_CALL_METHOD(NULL, _12$$3, "writeimagesfile", NULL, 0, fp); @@ -71048,7 +71223,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _save) { _17$$5 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_VAR(_18$$5); ZVAL_STRING(&_18$$5, "Imagick::COMPRESSION_JPEG", 0); - ZEPHIR_CALL_FUNCTION(&_19$$5, "constant", NULL, 192, &_18$$5); + ZEPHIR_CALL_FUNCTION(&_19$$5, "constant", NULL, 187, &_18$$5); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, _17$$5, "setimagecompression", NULL, 0, _19$$5); zephir_check_call_status(); @@ -71120,7 +71295,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _render) { if (_8$$4) { ZEPHIR_SINIT_VAR(_10$$5); ZVAL_STRING(&_10$$5, "Imagick::COMPRESSION_JPEG", 0); - ZEPHIR_CALL_FUNCTION(&_11$$5, "constant", NULL, 192, &_10$$5); + ZEPHIR_CALL_FUNCTION(&_11$$5, "constant", NULL, 187, &_10$$5); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, image, "setimagecompression", NULL, 0, _11$$5); zephir_check_call_status(); @@ -71813,6 +71988,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Formatter) { ZEPHIR_REGISTER_CLASS(Phalcon\\Logger, Formatter, phalcon, logger_formatter, phalcon_logger_formatter_method_entry, ZEND_ACC_EXPLICIT_ABSTRACT_CLASS); + zend_class_implements(phalcon_logger_formatter_ce TSRMLS_CC, 1, phalcon_logger_formatterinterface_ce); return SUCCESS; } @@ -72049,6 +72225,8 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Multiple) { zend_declare_property_null(phalcon_logger_multiple_ce, SL("_formatter"), ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_null(phalcon_logger_multiple_ce, SL("_logLevel"), ZEND_ACC_PROTECTED TSRMLS_CC); + return SUCCESS; } @@ -72069,6 +72247,14 @@ static PHP_METHOD(Phalcon_Logger_Multiple, getFormatter) { } +static PHP_METHOD(Phalcon_Logger_Multiple, getLogLevel) { + + + + RETURN_MEMBER(this_ptr, "_logLevel"); + +} + static PHP_METHOD(Phalcon_Logger_Multiple, push) { zval *logger; @@ -72096,7 +72282,7 @@ static PHP_METHOD(Phalcon_Logger_Multiple, setFormatter) { ZEPHIR_OBS_VAR(loggers); zephir_read_property_this(&loggers, this_ptr, SL("_loggers"), PH_NOISY_CC); if (Z_TYPE_P(loggers) == IS_ARRAY) { - zephir_is_iterable(loggers, &_1$$3, &_0$$3, 0, 0, "phalcon/logger/multiple.zep", 59); + zephir_is_iterable(loggers, &_1$$3, &_0$$3, 0, 0, "phalcon/logger/multiple.zep", 61); for ( ; zephir_hash_get_current_data_ex(_1$$3, (void**) &_2$$3, &_0$$3) == SUCCESS ; zephir_hash_move_forward_ex(_1$$3, &_0$$3) @@ -72111,6 +72297,41 @@ static PHP_METHOD(Phalcon_Logger_Multiple, setFormatter) { } +static PHP_METHOD(Phalcon_Logger_Multiple, setLogLevel) { + + HashTable *_1$$3; + HashPosition _0$$3; + zval *level_param = NULL, *loggers = NULL, *logger = NULL, *_4, **_2$$3, *_3$$4 = NULL; + int level, ZEPHIR_LAST_CALL_STATUS; + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &level_param); + + level = zephir_get_intval(level_param); + + + ZEPHIR_OBS_VAR(loggers); + zephir_read_property_this(&loggers, this_ptr, SL("_loggers"), PH_NOISY_CC); + if (Z_TYPE_P(loggers) == IS_ARRAY) { + zephir_is_iterable(loggers, &_1$$3, &_0$$3, 0, 0, "phalcon/logger/multiple.zep", 77); + for ( + ; zephir_hash_get_current_data_ex(_1$$3, (void**) &_2$$3, &_0$$3) == SUCCESS + ; zephir_hash_move_forward_ex(_1$$3, &_0$$3) + ) { + ZEPHIR_GET_HVALUE(logger, _2$$3); + ZEPHIR_INIT_NVAR(_3$$4); + ZVAL_LONG(_3$$4, level); + ZEPHIR_CALL_METHOD(NULL, logger, "setloglevel", NULL, 0, _3$$4); + zephir_check_call_status(); + } + } + ZEPHIR_INIT_ZVAL_NREF(_4); + ZVAL_LONG(_4, level); + zephir_update_property_this(this_ptr, SL("_logLevel"), _4 TSRMLS_CC); + ZEPHIR_MM_RESTORE(); + +} + static PHP_METHOD(Phalcon_Logger_Multiple, log) { HashTable *_1$$3; @@ -72136,7 +72357,7 @@ static PHP_METHOD(Phalcon_Logger_Multiple, log) { ZEPHIR_OBS_VAR(loggers); zephir_read_property_this(&loggers, this_ptr, SL("_loggers"), PH_NOISY_CC); if (Z_TYPE_P(loggers) == IS_ARRAY) { - zephir_is_iterable(loggers, &_1$$3, &_0$$3, 0, 0, "phalcon/logger/multiple.zep", 75); + zephir_is_iterable(loggers, &_1$$3, &_0$$3, 0, 0, "phalcon/logger/multiple.zep", 93); for ( ; zephir_hash_get_current_data_ex(_1$$3, (void**) &_2$$3, &_0$$3) == SUCCESS ; zephir_hash_move_forward_ex(_1$$3, &_0$$3) @@ -72514,7 +72735,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_File, __construct) { ZEPHIR_INIT_NVAR(mode); ZVAL_STRING(mode, "ab", 1); } - ZEPHIR_CALL_FUNCTION(&handler, "fopen", NULL, 286, name, mode); + ZEPHIR_CALL_FUNCTION(&handler, "fopen", NULL, 281, name, mode); zephir_check_call_status(); if (Z_TYPE_P(handler) != IS_RESOURCE) { ZEPHIR_INIT_VAR(_0$$7); @@ -72546,7 +72767,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_File, getFormatter) { if (Z_TYPE_P(_0) != IS_OBJECT) { ZEPHIR_INIT_VAR(_1$$3); object_init_ex(_1$$3, phalcon_logger_formatter_line_ce); - ZEPHIR_CALL_METHOD(NULL, _1$$3, "__construct", NULL, 290); + ZEPHIR_CALL_METHOD(NULL, _1$$3, "__construct", NULL, 285); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_formatter"), _1$$3 TSRMLS_CC); } @@ -72626,7 +72847,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_File, __wakeup) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_logger_exception_ce, "Logger must be opened in append or write mode", "phalcon/logger/adapter/file.zep", 152); return; } - ZEPHIR_CALL_FUNCTION(&_1, "fopen", NULL, 286, path, mode); + ZEPHIR_CALL_FUNCTION(&_1, "fopen", NULL, 281, path, mode); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_fileHandler"), _1 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -72711,15 +72932,15 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Firephp, logInternal) { if (!ZEPHIR_IS_TRUE_IDENTICAL(_2)) { ZEPHIR_SINIT_VAR(_3$$4); ZVAL_STRING(&_3$$4, "X-Wf-Protocol-1: http://meta.wildfirehq.org/Protocol/JsonStream/0.2", 0); - ZEPHIR_CALL_FUNCTION(NULL, "header", &_4, 238, &_3$$4); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_4, 233, &_3$$4); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_3$$4); ZVAL_STRING(&_3$$4, "X-Wf-1-Plugin-1: http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/0.3", 0); - ZEPHIR_CALL_FUNCTION(NULL, "header", &_4, 238, &_3$$4); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_4, 233, &_3$$4); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_3$$4); ZVAL_STRING(&_3$$4, "X-Wf-Structure-1: http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1", 0); - ZEPHIR_CALL_FUNCTION(NULL, "header", &_4, 238, &_3$$4); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_4, 233, &_3$$4); zephir_check_call_status(); zephir_update_static_property_ce(phalcon_logger_adapter_firephp_ce, SL("_initialized"), &ZEPHIR_GLOBAL(global_true) TSRMLS_CC); } @@ -72749,7 +72970,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Firephp, logInternal) { if (zephir_array_isset_long(chunk, (zephir_get_numberval(key) + 1))) { zephir_concat_self_str(&content, SL("|\\") TSRMLS_CC); } - ZEPHIR_CALL_FUNCTION(NULL, "header", &_4, 238, content); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_4, 233, content); zephir_check_call_status(); _13$$5 = zephir_fetch_static_property_ce(phalcon_logger_adapter_firephp_ce, SL("_index") TSRMLS_CC); ZEPHIR_INIT_ZVAL_NREF(_14$$5); @@ -72827,7 +73048,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Stream, __construct) { ZEPHIR_INIT_NVAR(mode); ZVAL_STRING(mode, "ab", 1); } - ZEPHIR_CALL_FUNCTION(&stream, "fopen", NULL, 286, name, mode); + ZEPHIR_CALL_FUNCTION(&stream, "fopen", NULL, 281, name, mode); zephir_check_call_status(); if (!(zephir_is_true(stream))) { ZEPHIR_INIT_VAR(_0$$6); @@ -72857,7 +73078,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Stream, getFormatter) { if (Z_TYPE_P(_0) != IS_OBJECT) { ZEPHIR_INIT_VAR(_1$$3); object_init_ex(_1$$3, phalcon_logger_formatter_line_ce); - ZEPHIR_CALL_METHOD(NULL, _1$$3, "__construct", NULL, 290); + ZEPHIR_CALL_METHOD(NULL, _1$$3, "__construct", NULL, 285); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_formatter"), _1$$3 TSRMLS_CC); } @@ -72959,7 +73180,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Syslog, __construct) { ZEPHIR_INIT_NVAR(facility); ZVAL_LONG(facility, 8); } - ZEPHIR_CALL_FUNCTION(NULL, "openlog", NULL, 291, name, option, facility); + ZEPHIR_CALL_FUNCTION(NULL, "openlog", NULL, 286, name, option, facility); zephir_check_call_status(); if (1) { zephir_update_property_this(this_ptr, SL("_opened"), ZEPHIR_GLOBAL(global_true) TSRMLS_CC); @@ -73023,7 +73244,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Syslog, logInternal) { } zephir_array_fetch_long(&_3, appliedFormat, 0, PH_NOISY | PH_READONLY, "phalcon/logger/adapter/syslog.zep", 102 TSRMLS_CC); zephir_array_fetch_long(&_4, appliedFormat, 1, PH_NOISY | PH_READONLY, "phalcon/logger/adapter/syslog.zep", 102 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(NULL, "syslog", NULL, 292, _3, _4); + ZEPHIR_CALL_FUNCTION(NULL, "syslog", NULL, 287, _3, _4); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -73038,7 +73259,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Syslog, close) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_opened"), PH_NOISY_CC); if (zephir_is_true(_0)) { - ZEPHIR_CALL_FUNCTION(NULL, "closelog", NULL, 293); + ZEPHIR_CALL_FUNCTION(NULL, "closelog", NULL, 288); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -73067,7 +73288,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Formatter_Firephp) { zend_declare_property_bool(phalcon_logger_formatter_firephp_ce, SL("_enableLabels"), 1, ZEND_ACC_PROTECTED TSRMLS_CC); - zend_class_implements(phalcon_logger_formatter_firephp_ce TSRMLS_CC, 1, phalcon_logger_formatterinterface_ce); return SUCCESS; } @@ -73205,28 +73425,28 @@ static PHP_METHOD(Phalcon_Logger_Formatter_Firephp, format) { ZVAL_STRING(&_5$$4, "5.3.6", 0); ZEPHIR_SINIT_VAR(_6$$4); ZVAL_STRING(&_6$$4, "<", 0); - ZEPHIR_CALL_FUNCTION(&_7$$4, "version_compare", NULL, 241, _4$$4, &_5$$4, &_6$$4); + ZEPHIR_CALL_FUNCTION(&_7$$4, "version_compare", NULL, 236, _4$$4, &_5$$4, &_6$$4); zephir_check_call_status(); if (!(zephir_is_true(_7$$4))) { param$$4 = (2) ? 1 : 0; } ZEPHIR_SINIT_NVAR(_5$$4); ZVAL_BOOL(&_5$$4, (param$$4 ? 1 : 0)); - ZEPHIR_CALL_FUNCTION(&backtrace, "debug_backtrace", NULL, 153, &_5$$4); + ZEPHIR_CALL_FUNCTION(&backtrace, "debug_backtrace", NULL, 148, &_5$$4); zephir_check_call_status(); ZEPHIR_MAKE_REF(backtrace); - ZEPHIR_CALL_FUNCTION(&lastTrace, "end", NULL, 172, backtrace); + ZEPHIR_CALL_FUNCTION(&lastTrace, "end", NULL, 167, backtrace); ZEPHIR_UNREF(backtrace); zephir_check_call_status(); if (zephir_array_isset_string(lastTrace, SS("file"))) { - zephir_array_fetch_string(&_8$$6, lastTrace, SL("file"), PH_NOISY | PH_READONLY, "phalcon/logger/formatter/firephp.zep", 133 TSRMLS_CC); + zephir_array_fetch_string(&_8$$6, lastTrace, SL("file"), PH_NOISY | PH_READONLY, "phalcon/logger/formatter/firephp.zep", 132 TSRMLS_CC); zephir_array_update_string(&meta, SL("File"), &_8$$6, PH_COPY | PH_SEPARATE); } if (zephir_array_isset_string(lastTrace, SS("line"))) { - zephir_array_fetch_string(&_9$$7, lastTrace, SL("line"), PH_NOISY | PH_READONLY, "phalcon/logger/formatter/firephp.zep", 137 TSRMLS_CC); + zephir_array_fetch_string(&_9$$7, lastTrace, SL("line"), PH_NOISY | PH_READONLY, "phalcon/logger/formatter/firephp.zep", 136 TSRMLS_CC); zephir_array_update_string(&meta, SL("Line"), &_9$$7, PH_COPY | PH_SEPARATE); } - zephir_is_iterable(backtrace, &_11$$4, &_10$$4, 1, 0, "phalcon/logger/formatter/firephp.zep", 146); + zephir_is_iterable(backtrace, &_11$$4, &_10$$4, 1, 0, "phalcon/logger/formatter/firephp.zep", 145); for ( ; zephir_hash_get_current_data_ex(_11$$4, (void**) &_12$$4, &_10$$4) == SUCCESS ; zephir_hash_move_forward_ex(_11$$4, &_10$$4) @@ -73304,7 +73524,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Formatter_Json) { ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Logger\\Formatter, Json, phalcon, logger_formatter_json, phalcon_logger_formatter_ce, phalcon_logger_formatter_json_method_entry, 0); - zend_class_implements(phalcon_logger_formatter_json_ce TSRMLS_CC, 1, phalcon_logger_formatterinterface_ce); return SUCCESS; } @@ -73374,7 +73593,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Formatter_Line) { zend_declare_property_string(phalcon_logger_formatter_line_ce, SL("_format"), "[%date%][%type%] %message%", ZEND_ACC_PROTECTED TSRMLS_CC); - zend_class_implements(phalcon_logger_formatter_line_ce TSRMLS_CC, 1, phalcon_logger_formatterinterface_ce); return SUCCESS; } @@ -73469,19 +73687,19 @@ static PHP_METHOD(Phalcon_Logger_Formatter_Line, format) { ZEPHIR_OBS_VAR(format); zephir_read_property_this(&format, this_ptr, SL("_format"), PH_NOISY_CC); - if (zephir_memnstr_str(format, SL("%date%"), "phalcon/logger/formatter/line.zep", 81)) { + if (zephir_memnstr_str(format, SL("%date%"), "phalcon/logger/formatter/line.zep", 80)) { ZEPHIR_INIT_VAR(_0$$3); _1$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_dateFormat"), PH_NOISY_CC); ZEPHIR_SINIT_VAR(_2$$3); ZVAL_LONG(&_2$$3, timestamp); - ZEPHIR_CALL_FUNCTION(&_3$$3, "date", NULL, 294, _1$$3, &_2$$3); + ZEPHIR_CALL_FUNCTION(&_3$$3, "date", NULL, 289, _1$$3, &_2$$3); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_2$$3); ZVAL_STRING(&_2$$3, "%date%", 0); zephir_fast_str_replace(&_0$$3, &_2$$3, _3$$3, format TSRMLS_CC); ZEPHIR_CPY_WRT(format, _0$$3); } - if (zephir_memnstr_str(format, SL("%type%"), "phalcon/logger/formatter/line.zep", 88)) { + if (zephir_memnstr_str(format, SL("%type%"), "phalcon/logger/formatter/line.zep", 87)) { ZEPHIR_INIT_VAR(_4$$4); ZEPHIR_INIT_VAR(_6$$4); ZVAL_LONG(_6$$4, type); @@ -73528,7 +73746,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Formatter_Syslog) { ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Logger\\Formatter, Syslog, phalcon, logger_formatter_syslog, phalcon_logger_formatter_ce, phalcon_logger_formatter_syslog_method_entry, 0); - zend_class_implements(phalcon_logger_formatter_syslog_ce TSRMLS_CC, 1, phalcon_logger_formatterinterface_ce); return SUCCESS; } @@ -74291,7 +74508,7 @@ static PHP_METHOD(Phalcon_Mvc_Collection, getSource) { ZEPHIR_INIT_VAR(_0$$3); zephir_get_class_ns(_0$$3, collection, 0 TSRMLS_CC); ZEPHIR_INIT_NVAR(source); - zephir_uncamelize(source, _0$$3); + zephir_uncamelize(source, _0$$3, NULL ); zephir_update_property_this(this_ptr, SL("_source"), source TSRMLS_CC); } RETURN_CCTOR(source); @@ -74555,7 +74772,7 @@ static PHP_METHOD(Phalcon_Mvc_Collection, _getResultset) { } ZEPHIR_INIT_VAR(collections); array_init(collections); - ZEPHIR_CALL_FUNCTION(&_5, "iterator_to_array", NULL, 295, documentsCursor); + ZEPHIR_CALL_FUNCTION(&_5, "iterator_to_array", NULL, 290, documentsCursor); zephir_check_call_status(); zephir_is_iterable(_5, &_7, &_6, 0, 0, "phalcon/mvc/collection.zep", 444); for ( @@ -75023,7 +75240,7 @@ static PHP_METHOD(Phalcon_Mvc_Collection, save) { zephir_update_property_this(this_ptr, SL("_errorMessages"), _2 TSRMLS_CC); ZEPHIR_OBS_VAR(disableEvents); zephir_read_static_property_ce(&disableEvents, phalcon_mvc_collection_ce, SL("_disableEvents") TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "_presave", NULL, 296, dependencyInjector, disableEvents, exists); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "_presave", NULL, 291, dependencyInjector, disableEvents, exists); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(_3)) { RETURN_MM_BOOL(0); @@ -75058,7 +75275,7 @@ static PHP_METHOD(Phalcon_Mvc_Collection, save) { } else { ZVAL_BOOL(_5, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_postsave", NULL, 297, disableEvents, _5, exists); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_postsave", NULL, 292, disableEvents, _5, exists); zephir_check_call_status(); RETURN_MM(); @@ -76382,7 +76599,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, mount) { if (zephir_is_true(_0$$5)) { ZEPHIR_INIT_VAR(lazyHandler); object_init_ex(lazyHandler, phalcon_mvc_micro_lazyloader_ce); - ZEPHIR_CALL_METHOD(NULL, lazyHandler, "__construct", NULL, 298, mainHandler); + ZEPHIR_CALL_METHOD(NULL, lazyHandler, "__construct", NULL, 293, mainHandler); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(lazyHandler, mainHandler); @@ -76530,7 +76747,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, setService) { if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { ZEPHIR_INIT_NVAR(dependencyInjector); object_init_ex(dependencyInjector, phalcon_di_factorydefault_ce); - ZEPHIR_CALL_METHOD(NULL, dependencyInjector, "__construct", NULL, 176); + ZEPHIR_CALL_METHOD(NULL, dependencyInjector, "__construct", NULL, 171); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_dependencyInjector"), dependencyInjector TSRMLS_CC); } @@ -76540,7 +76757,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, setService) { } else { ZVAL_BOOL(_0, 0); } - ZEPHIR_RETURN_CALL_METHOD(dependencyInjector, "set", NULL, 299, serviceName, definition, _0); + ZEPHIR_RETURN_CALL_METHOD(dependencyInjector, "set", NULL, 294, serviceName, definition, _0); zephir_check_call_status(); RETURN_MM(); @@ -76572,11 +76789,11 @@ static PHP_METHOD(Phalcon_Mvc_Micro, hasService) { if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { ZEPHIR_INIT_NVAR(dependencyInjector); object_init_ex(dependencyInjector, phalcon_di_factorydefault_ce); - ZEPHIR_CALL_METHOD(NULL, dependencyInjector, "__construct", NULL, 176); + ZEPHIR_CALL_METHOD(NULL, dependencyInjector, "__construct", NULL, 171); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_dependencyInjector"), dependencyInjector TSRMLS_CC); } - ZEPHIR_RETURN_CALL_METHOD(dependencyInjector, "has", NULL, 300, serviceName); + ZEPHIR_RETURN_CALL_METHOD(dependencyInjector, "has", NULL, 295, serviceName); zephir_check_call_status(); RETURN_MM(); @@ -76608,11 +76825,11 @@ static PHP_METHOD(Phalcon_Mvc_Micro, getService) { if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { ZEPHIR_INIT_NVAR(dependencyInjector); object_init_ex(dependencyInjector, phalcon_di_factorydefault_ce); - ZEPHIR_CALL_METHOD(NULL, dependencyInjector, "__construct", NULL, 176); + ZEPHIR_CALL_METHOD(NULL, dependencyInjector, "__construct", NULL, 171); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_dependencyInjector"), dependencyInjector TSRMLS_CC); } - ZEPHIR_RETURN_CALL_METHOD(dependencyInjector, "get", NULL, 301, serviceName); + ZEPHIR_RETURN_CALL_METHOD(dependencyInjector, "get", NULL, 296, serviceName); zephir_check_call_status(); RETURN_MM(); @@ -76633,11 +76850,11 @@ static PHP_METHOD(Phalcon_Mvc_Micro, getSharedService) { if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { ZEPHIR_INIT_NVAR(dependencyInjector); object_init_ex(dependencyInjector, phalcon_di_factorydefault_ce); - ZEPHIR_CALL_METHOD(NULL, dependencyInjector, "__construct", NULL, 176); + ZEPHIR_CALL_METHOD(NULL, dependencyInjector, "__construct", NULL, 171); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_dependencyInjector"), dependencyInjector TSRMLS_CC); } - ZEPHIR_RETURN_CALL_METHOD(dependencyInjector, "getshared", NULL, 302, serviceName); + ZEPHIR_RETURN_CALL_METHOD(dependencyInjector, "getshared", NULL, 297, serviceName); zephir_check_call_status(); RETURN_MM(); @@ -77311,10 +77528,6 @@ static PHP_METHOD(Phalcon_Mvc_Model, getModelsMetaData) { if (Z_TYPE_P(metaData) != IS_OBJECT) { _0$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_dependencyInjector"), PH_NOISY_CC); ZEPHIR_CPY_WRT(dependencyInjector, _0$$3); - if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injector container is required to obtain the services related to the ORM", "phalcon/mvc/model.zep", 214); - return; - } ZEPHIR_INIT_VAR(_2$$3); ZVAL_STRING(_2$$3, "modelsMetadata", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_CALL_METHOD(&_1$$3, dependencyInjector, "getshared", NULL, 0, _2$$3); @@ -77322,7 +77535,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, getModelsMetaData) { zephir_check_call_status(); ZEPHIR_CPY_WRT(metaData, _1$$3); if (Z_TYPE_P(metaData) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsMetadata' is not valid", "phalcon/mvc/model.zep", 222); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsMetadata' is not valid", "phalcon/mvc/model.zep", 216); return; } zephir_update_property_this(this_ptr, SL("_modelsMetaData"), metaData TSRMLS_CC); @@ -77619,9 +77832,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, assign) { HashTable *_5, *_1$$3; HashPosition _4, _0$$3; - zephir_fcall_cache_entry *_9 = NULL; + zephir_fcall_cache_entry *_9 = NULL, *_11 = NULL; int ZEPHIR_LAST_CALL_STATUS; - zval *data_param = NULL, *dataColumnMap = NULL, *whiteList = NULL, *key = NULL, *keyMapped = NULL, *value = NULL, *attribute = NULL, *attributeField = NULL, *possibleSetter = NULL, *metaData = NULL, *columnMap = NULL, *dataMapped = NULL, *_3 = NULL, **_6, **_2$$3, *_7$$13 = NULL, *_8$$13 = NULL, *_10$$16 = NULL; + zval *data_param = NULL, *dataColumnMap = NULL, *whiteList = NULL, *key = NULL, *keyMapped = NULL, *value = NULL, *attribute = NULL, *attributeField = NULL, *metaData = NULL, *columnMap = NULL, *dataMapped = NULL, *_3 = NULL, **_6, **_2$$3, *_7$$13 = NULL, *_8$$13 = NULL, *_10$$16 = NULL; zval *data = NULL; ZEPHIR_MM_GROW(); @@ -77639,7 +77852,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, assign) { if (Z_TYPE_P(dataColumnMap) == IS_ARRAY) { ZEPHIR_INIT_VAR(dataMapped); array_init(dataMapped); - zephir_is_iterable(data, &_1$$3, &_0$$3, 0, 0, "phalcon/mvc/model.zep", 443); + zephir_is_iterable(data, &_1$$3, &_0$$3, 0, 0, "phalcon/mvc/model.zep", 437); for ( ; zephir_hash_get_current_data_ex(_1$$3, (void**) &_2$$3, &_0$$3) == SUCCESS ; zephir_hash_move_forward_ex(_1$$3, &_0$$3) @@ -77668,7 +77881,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, assign) { } ZEPHIR_CALL_METHOD(&_3, metaData, "getattributes", NULL, 0, this_ptr); zephir_check_call_status(); - zephir_is_iterable(_3, &_5, &_4, 0, 0, "phalcon/mvc/model.zep", 495); + zephir_is_iterable(_3, &_5, &_4, 0, 0, "phalcon/mvc/model.zep", 486); for ( ; zephir_hash_get_current_data_ex(_5, (void**) &_6, &_4) == SUCCESS ; zephir_hash_move_forward_ex(_5, &_4) @@ -77684,7 +77897,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, assign) { ZEPHIR_CONCAT_SVS(_8$$13, "Column '", attribute, "' doesn\\'t make part of the column map"); ZEPHIR_CALL_METHOD(NULL, _7$$13, "__construct", &_9, 9, _8$$13); zephir_check_call_status(); - zephir_throw_exception_debug(_7$$13, "phalcon/mvc/model.zep", 465 TSRMLS_CC); + zephir_throw_exception_debug(_7$$13, "phalcon/mvc/model.zep", 459 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -77701,14 +77914,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, assign) { continue; } } - ZEPHIR_INIT_NVAR(_10$$16); - zephir_camelize(_10$$16, attributeField); - ZEPHIR_INIT_NVAR(possibleSetter); - ZEPHIR_CONCAT_SV(possibleSetter, "set", _10$$16); - if ((zephir_method_exists(this_ptr, possibleSetter TSRMLS_CC) == SUCCESS)) { - ZEPHIR_CALL_METHOD_ZVAL(NULL, this_ptr, possibleSetter, NULL, 0, value); - zephir_check_call_status(); - } else { + ZEPHIR_CALL_METHOD(&_10$$16, this_ptr, "_possiblesetter", &_11, 298, attributeField, value); + zephir_check_call_status(); + if (!(zephir_is_true(_10$$16))) { zephir_update_property_zval_zval(this_ptr, attributeField, value TSRMLS_CC); } } @@ -77751,7 +77959,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap) { ZVAL_LONG(_0, dirtyState); ZEPHIR_CALL_METHOD(NULL, instance, "setdirtystate", NULL, 0, _0); zephir_check_call_status(); - zephir_is_iterable(data, &_2, &_1, 0, 0, "phalcon/mvc/model.zep", 595); + zephir_is_iterable(data, &_2, &_1, 0, 0, "phalcon/mvc/model.zep", 586); for ( ; zephir_hash_get_current_data_ex(_2, (void**) &_3, &_1) == SUCCESS ; zephir_hash_move_forward_ex(_2, &_1) @@ -77772,7 +77980,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap) { ZEPHIR_CONCAT_SVS(_5$$7, "Column '", key, "' doesn't make part of the column map"); ZEPHIR_CALL_METHOD(NULL, _4$$7, "__construct", &_6, 9, _5$$7); zephir_check_call_status(); - zephir_throw_exception_debug(_4$$7, "phalcon/mvc/model.zep", 538 TSRMLS_CC); + zephir_throw_exception_debug(_4$$7, "phalcon/mvc/model.zep", 529 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -77788,7 +77996,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap) { _7$$4 = Z_TYPE_P(value) != IS_NULL; } if (_7$$4) { - zephir_array_fetch_long(&_8$$10, attribute, 1, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 550 TSRMLS_CC); + zephir_array_fetch_long(&_8$$10, attribute, 1, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 541 TSRMLS_CC); do { if (ZEPHIR_IS_LONG(_8$$10, 0)) { ZEPHIR_SINIT_NVAR(_9$$11); @@ -77812,7 +78020,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap) { } while(0); } else { - zephir_array_fetch_long(&_11$$15, attribute, 1, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 571 TSRMLS_CC); + zephir_array_fetch_long(&_11$$15, attribute, 1, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 562 TSRMLS_CC); do { if (ZEPHIR_IS_LONG(_11$$15, 0) || ZEPHIR_IS_LONG(_11$$15, 9) || ZEPHIR_IS_LONG(_11$$15, 3) || ZEPHIR_IS_LONG(_11$$15, 7) || ZEPHIR_IS_LONG(_11$$15, 8)) { ZEPHIR_INIT_NVAR(castValue); @@ -77825,7 +78033,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap) { } ZEPHIR_OBS_NVAR(attributeName); - zephir_array_fetch_long(&attributeName, attribute, 0, PH_NOISY, "phalcon/mvc/model.zep", 587 TSRMLS_CC); + zephir_array_fetch_long(&attributeName, attribute, 0, PH_NOISY, "phalcon/mvc/model.zep", 578 TSRMLS_CC); zephir_update_property_zval_zval(instance, attributeName, castValue TSRMLS_CC); } } @@ -77869,7 +78077,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate) { ZEPHIR_INIT_VAR(hydrateObject); object_init(hydrateObject); } - zephir_is_iterable(data, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 669); + zephir_is_iterable(data, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 660); for ( ; zephir_hash_get_current_data_ex(_1, (void**) &_2, &_0) == SUCCESS ; zephir_hash_move_forward_ex(_1, &_0) @@ -77887,7 +78095,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate) { ZEPHIR_CONCAT_SVS(_4$$11, "Column '", key, "' doesn't make part of the column map"); ZEPHIR_CALL_METHOD(NULL, _3$$11, "__construct", &_5, 9, _4$$11); zephir_check_call_status(); - zephir_throw_exception_debug(_3$$11, "phalcon/mvc/model.zep", 648 TSRMLS_CC); + zephir_throw_exception_debug(_3$$11, "phalcon/mvc/model.zep", 639 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -77942,7 +78150,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResult) { ZVAL_LONG(_0, dirtyState); ZEPHIR_CALL_METHOD(NULL, instance, "setdirtystate", NULL, 0, _0); zephir_check_call_status(); - zephir_is_iterable(data, &_2, &_1, 0, 0, "phalcon/mvc/model.zep", 716); + zephir_is_iterable(data, &_2, &_1, 0, 0, "phalcon/mvc/model.zep", 707); for ( ; zephir_hash_get_current_data_ex(_2, (void**) &_3, &_1) == SUCCESS ; zephir_hash_move_forward_ex(_2, &_1) @@ -77950,7 +78158,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResult) { ZEPHIR_GET_HMKEY(key, _2, _1); ZEPHIR_GET_HVALUE(value, _3); if (Z_TYPE_P(key) != IS_STRING) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid key in array data provided to dumpResult()", "phalcon/mvc/model.zep", 708); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid key in array data provided to dumpResult()", "phalcon/mvc/model.zep", 699); return; } zephir_update_property_zval_zval(instance, key, value TSRMLS_CC); @@ -77989,7 +78197,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, find) { ZEPHIR_INIT_VAR(params); array_init(params); if (Z_TYPE_P(parameters) != IS_NULL) { - zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/mvc/model.zep", 762); + zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/mvc/model.zep", 753); } } else { ZEPHIR_CPY_WRT(params, parameters); @@ -78064,7 +78272,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, findFirst) { ZEPHIR_INIT_VAR(params); array_init(params); if (Z_TYPE_P(parameters) != IS_NULL) { - zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/mvc/model.zep", 849); + zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/mvc/model.zep", 840); } } else { ZEPHIR_CPY_WRT(params, parameters); @@ -78148,12 +78356,12 @@ static PHP_METHOD(Phalcon_Mvc_Model, query) { ZEPHIR_CALL_METHOD(NULL, criteria, "__construct", NULL, 0); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, criteria, "setdi", NULL, 303, dependencyInjector); + ZEPHIR_CALL_METHOD(NULL, criteria, "setdi", NULL, 299, dependencyInjector); zephir_check_call_status(); } ZEPHIR_INIT_VAR(_3); zephir_get_called_class(_3 TSRMLS_CC); - ZEPHIR_CALL_METHOD(NULL, criteria, "setmodelname", NULL, 304, _3); + ZEPHIR_CALL_METHOD(NULL, criteria, "setmodelname", NULL, 300, _3); zephir_check_call_status(); RETURN_CCTOR(criteria); @@ -78207,7 +78415,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _exists) { array_init(uniqueParams); ZEPHIR_INIT_NVAR(uniqueTypes); array_init(uniqueTypes); - zephir_is_iterable(primaryKeys, &_1$$3, &_0$$3, 0, 0, "phalcon/mvc/model.zep", 1020); + zephir_is_iterable(primaryKeys, &_1$$3, &_0$$3, 0, 0, "phalcon/mvc/model.zep", 1011); for ( ; zephir_hash_get_current_data_ex(_1$$3, (void**) &_2$$3, &_0$$3) == SUCCESS ; zephir_hash_move_forward_ex(_1$$3, &_0$$3) @@ -78222,7 +78430,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _exists) { ZEPHIR_CONCAT_SVS(_4$$9, "Column '", field, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, _3$$9, "__construct", &_5, 9, _4$$9); zephir_check_call_status(); - zephir_throw_exception_debug(_3$$9, "phalcon/mvc/model.zep", 984 TSRMLS_CC); + zephir_throw_exception_debug(_3$$9, "phalcon/mvc/model.zep", 975 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -78240,9 +78448,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, _exists) { if (_6$$11) { numberEmpty++; } - zephir_array_append(&uniqueParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1002); + zephir_array_append(&uniqueParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 993); } else { - zephir_array_append(&uniqueParams, ZEPHIR_GLOBAL(global_null), PH_SEPARATE, "phalcon/mvc/model.zep", 1005); + zephir_array_append(&uniqueParams, ZEPHIR_GLOBAL(global_null), PH_SEPARATE, "phalcon/mvc/model.zep", 996); numberEmpty++; } ZEPHIR_OBS_NVAR(type); @@ -78253,16 +78461,16 @@ static PHP_METHOD(Phalcon_Mvc_Model, _exists) { ZEPHIR_CONCAT_SVS(_8$$14, "Column '", field, "' isn't part of the table columns"); ZEPHIR_CALL_METHOD(NULL, _7$$14, "__construct", &_5, 9, _8$$14); zephir_check_call_status(); - zephir_throw_exception_debug(_7$$14, "phalcon/mvc/model.zep", 1010 TSRMLS_CC); + zephir_throw_exception_debug(_7$$14, "phalcon/mvc/model.zep", 1001 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&uniqueTypes, type, PH_SEPARATE, "phalcon/mvc/model.zep", 1013); + zephir_array_append(&uniqueTypes, type, PH_SEPARATE, "phalcon/mvc/model.zep", 1004); ZEPHIR_CALL_METHOD(&_9$$7, connection, "escapeidentifier", &_10, 0, field); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_11$$7); ZEPHIR_CONCAT_VS(_11$$7, _9$$7, " = ?"); - zephir_array_append(&wherePk, _11$$7, PH_SEPARATE, "phalcon/mvc/model.zep", 1014); + zephir_array_append(&wherePk, _11$$7, PH_SEPARATE, "phalcon/mvc/model.zep", 1005); } if (numberPrimary == numberEmpty) { RETURN_MM_BOOL(0); @@ -78307,10 +78515,10 @@ static PHP_METHOD(Phalcon_Mvc_Model, _exists) { ZEPHIR_INIT_VAR(_14); ZEPHIR_CONCAT_SVSV(_14, "SELECT COUNT(*) \"rowcount\" FROM ", _13, " WHERE ", uniqueKey); ZEPHIR_INIT_VAR(_15); - ZVAL_NULL(_15); + ZVAL_LONG(_15, 2); ZEPHIR_CALL_METHOD(&num, connection, "fetchone", NULL, 0, _14, _15, uniqueParams, uniqueTypes); zephir_check_call_status(); - zephir_array_fetch_string(&_16, num, SL("rowcount"), PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1070 TSRMLS_CC); + zephir_array_fetch_string(&_16, num, SL("rowcount"), PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1061 TSRMLS_CC); if (zephir_is_true(_16)) { ZEPHIR_INIT_ZVAL_NREF(_17$$22); ZVAL_LONG(_17$$22, 0); @@ -78369,7 +78577,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _groupResult) { ZEPHIR_INIT_VAR(params); array_init(params); if (Z_TYPE_P(parameters) != IS_NULL) { - zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/mvc/model.zep", 1100); + zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/mvc/model.zep", 1091); } } else { ZEPHIR_CPY_WRT(params, parameters); @@ -78683,7 +78891,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, validate) { if (ZEPHIR_IS_FALSE_IDENTICAL(_0)) { ZEPHIR_CALL_METHOD(&_1$$3, validator, "getmessages", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(_1$$3, &_3$$3, &_2$$3, 0, 0, "phalcon/mvc/model.zep", 1400); + zephir_is_iterable(_1$$3, &_3$$3, &_2$$3, 0, 0, "phalcon/mvc/model.zep", 1391); for ( ; zephir_hash_get_current_data_ex(_3$$3, (void**) &_4$$3, &_2$$3) == SUCCESS ; zephir_hash_move_forward_ex(_3$$3, &_2$$3) @@ -78735,7 +78943,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, getMessages) { ZEPHIR_INIT_VAR(filtered); array_init(filtered); _1$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_errorMessages"), PH_NOISY_CC); - zephir_is_iterable(_1$$3, &_3$$3, &_2$$3, 0, 0, "phalcon/mvc/model.zep", 1466); + zephir_is_iterable(_1$$3, &_3$$3, &_2$$3, 0, 0, "phalcon/mvc/model.zep", 1457); for ( ; zephir_hash_get_current_data_ex(_3$$3, (void**) &_4$$3, &_2$$3) == SUCCESS ; zephir_hash_move_forward_ex(_3$$3, &_2$$3) @@ -78744,7 +78952,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, getMessages) { ZEPHIR_CALL_METHOD(&_5$$4, message, "getfield", NULL, 0); zephir_check_call_status(); if (ZEPHIR_IS_EQUAL(_5$$4, filter)) { - zephir_array_append(&filtered, message, PH_SEPARATE, "phalcon/mvc/model.zep", 1463); + zephir_array_append(&filtered, message, PH_SEPARATE, "phalcon/mvc/model.zep", 1454); } } RETURN_CCTOR(filtered); @@ -78772,7 +78980,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { zephir_check_call_status(); if (zephir_fast_count_int(belongsTo TSRMLS_CC)) { error = 0; - zephir_is_iterable(belongsTo, &_2$$3, &_1$$3, 0, 0, "phalcon/mvc/model.zep", 1609); + zephir_is_iterable(belongsTo, &_2$$3, &_1$$3, 0, 0, "phalcon/mvc/model.zep", 1600); for ( ; zephir_hash_get_current_data_ex(_2$$3, (void**) &_3$$3, &_1$$3) == SUCCESS ; zephir_hash_move_forward_ex(_2$$3, &_1$$3) @@ -78785,7 +78993,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { if (Z_TYPE_P(foreignKey) == IS_ARRAY) { if (zephir_array_isset_string(foreignKey, SS("action"))) { ZEPHIR_OBS_NVAR(_4$$7); - zephir_array_fetch_string(&_4$$7, foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 1510 TSRMLS_CC); + zephir_array_fetch_string(&_4$$7, foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 1501 TSRMLS_CC); action = zephir_get_intval(_4$$7); } } @@ -78804,7 +79012,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { ZEPHIR_CALL_METHOD(&referencedFields, relation, "getreferencedfields", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(fields) == IS_ARRAY) { - zephir_is_iterable(fields, &_8$$9, &_7$$9, 0, 0, "phalcon/mvc/model.zep", 1546); + zephir_is_iterable(fields, &_8$$9, &_7$$9, 0, 0, "phalcon/mvc/model.zep", 1537); for ( ; zephir_hash_get_current_data_ex(_8$$9, (void**) &_9$$9, &_7$$9) == SUCCESS ; zephir_hash_move_forward_ex(_8$$9, &_7$$9) @@ -78813,11 +79021,11 @@ static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { ZEPHIR_GET_HVALUE(field, _9$$9); ZEPHIR_OBS_NVAR(value); zephir_fetch_property_zval(&value, this_ptr, field, PH_SILENT_CC); - zephir_array_fetch(&_10$$10, referencedFields, position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1539 TSRMLS_CC); + zephir_array_fetch(&_10$$10, referencedFields, position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1530 TSRMLS_CC); ZEPHIR_INIT_LNVAR(_11$$10); ZEPHIR_CONCAT_SVSV(_11$$10, "[", _10$$10, "] = ?", position); - zephir_array_append(&conditions, _11$$10, PH_SEPARATE, "phalcon/mvc/model.zep", 1539); - zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1540); + zephir_array_append(&conditions, _11$$10, PH_SEPARATE, "phalcon/mvc/model.zep", 1530); + zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1531); if (Z_TYPE_P(value) == IS_NULL) { numberNull++; } @@ -78828,15 +79036,15 @@ static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { zephir_fetch_property_zval(&value, this_ptr, fields, PH_SILENT_CC); ZEPHIR_INIT_LNVAR(_12$$12); ZEPHIR_CONCAT_SVS(_12$$12, "[", referencedFields, "] = ?0"); - zephir_array_append(&conditions, _12$$12, PH_SEPARATE, "phalcon/mvc/model.zep", 1551); - zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1552); + zephir_array_append(&conditions, _12$$12, PH_SEPARATE, "phalcon/mvc/model.zep", 1542); + zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1543); if (Z_TYPE_P(value) == IS_NULL) { validateWithNulls = 1; } } ZEPHIR_OBS_NVAR(extraConditions); if (zephir_array_isset_string_fetch(&extraConditions, foreignKey, SS("conditions"), 0 TSRMLS_CC)) { - zephir_array_append(&conditions, extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 1563); + zephir_array_append(&conditions, extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 1554); } if (validateWithNulls) { ZEPHIR_OBS_NVAR(allowNulls); @@ -78904,10 +79112,10 @@ static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseCascade) { - zval *_13$$8 = NULL; - HashTable *_2$$3, *_8$$9; - HashPosition _1$$3, _7$$9; - zval *manager = NULL, *relations = NULL, *relation = NULL, *foreignKey = NULL, *resultset = NULL, *conditions = NULL, *bindParams = NULL, *referencedModel = NULL, *referencedFields = NULL, *fields = NULL, *field = NULL, *position = NULL, *value = NULL, *extraConditions = NULL, *_0, **_3$$3, *_4$$7 = NULL, *_5$$8 = NULL, *_14$$8 = NULL, *_15$$8 = NULL, **_9$$9, *_10$$10, *_11$$10 = NULL, *_12$$11 = NULL; + zval *_13$$7 = NULL; + HashTable *_2, *_8$$8; + HashPosition _1, _7$$8; + zval *manager = NULL, *relations = NULL, *relation = NULL, *foreignKey = NULL, *resultset = NULL, *conditions = NULL, *bindParams = NULL, *referencedModel = NULL, *referencedFields = NULL, *fields = NULL, *field = NULL, *position = NULL, *value = NULL, *extraConditions = NULL, *_0, **_3, *_4$$6 = NULL, *_5$$7 = NULL, *_14$$7 = NULL, *_15$$7 = NULL, **_9$$8, *_10$$9, *_11$$9 = NULL, *_12$$10 = NULL; zephir_fcall_cache_entry *_6 = NULL; int ZEPHIR_LAST_CALL_STATUS, action = 0; @@ -78917,78 +79125,76 @@ static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseCascade) { ZEPHIR_CPY_WRT(manager, _0); ZEPHIR_CALL_METHOD(&relations, manager, "gethasoneandhasmany", NULL, 0, this_ptr); zephir_check_call_status(); - if (zephir_fast_count_int(relations TSRMLS_CC)) { - zephir_is_iterable(relations, &_2$$3, &_1$$3, 0, 0, "phalcon/mvc/model.zep", 1723); - for ( - ; zephir_hash_get_current_data_ex(_2$$3, (void**) &_3$$3, &_1$$3) == SUCCESS - ; zephir_hash_move_forward_ex(_2$$3, &_1$$3) - ) { - ZEPHIR_GET_HVALUE(relation, _3$$3); - ZEPHIR_CALL_METHOD(&foreignKey, relation, "getforeignkey", NULL, 0); - zephir_check_call_status(); - if (!ZEPHIR_IS_FALSE_IDENTICAL(foreignKey)) { - action = 0; - if (Z_TYPE_P(foreignKey) == IS_ARRAY) { - if (zephir_array_isset_string(foreignKey, SS("action"))) { - ZEPHIR_OBS_NVAR(_4$$7); - zephir_array_fetch_string(&_4$$7, foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 1662 TSRMLS_CC); - action = zephir_get_intval(_4$$7); - } + zephir_is_iterable(relations, &_2, &_1, 0, 0, "phalcon/mvc/model.zep", 1713); + for ( + ; zephir_hash_get_current_data_ex(_2, (void**) &_3, &_1) == SUCCESS + ; zephir_hash_move_forward_ex(_2, &_1) + ) { + ZEPHIR_GET_HVALUE(relation, _3); + ZEPHIR_CALL_METHOD(&foreignKey, relation, "getforeignkey", NULL, 0); + zephir_check_call_status(); + if (!ZEPHIR_IS_FALSE_IDENTICAL(foreignKey)) { + action = 0; + if (Z_TYPE_P(foreignKey) == IS_ARRAY) { + if (zephir_array_isset_string(foreignKey, SS("action"))) { + ZEPHIR_OBS_NVAR(_4$$6); + zephir_array_fetch_string(&_4$$6, foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 1651 TSRMLS_CC); + action = zephir_get_intval(_4$$6); } - if (action == 2) { - ZEPHIR_CALL_METHOD(&_5$$8, relation, "getreferencedmodel", NULL, 0); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&referencedModel, manager, "load", &_6, 0, _5$$8); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&fields, relation, "getfields", NULL, 0); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&referencedFields, relation, "getreferencedfields", NULL, 0); - zephir_check_call_status(); - ZEPHIR_INIT_NVAR(conditions); - array_init(conditions); - ZEPHIR_INIT_NVAR(bindParams); - array_init(bindParams); - if (Z_TYPE_P(fields) == IS_ARRAY) { - zephir_is_iterable(fields, &_8$$9, &_7$$9, 0, 0, "phalcon/mvc/model.zep", 1690); - for ( - ; zephir_hash_get_current_data_ex(_8$$9, (void**) &_9$$9, &_7$$9) == SUCCESS - ; zephir_hash_move_forward_ex(_8$$9, &_7$$9) - ) { - ZEPHIR_GET_HMKEY(position, _8$$9, _7$$9); - ZEPHIR_GET_HVALUE(field, _9$$9); - ZEPHIR_OBS_NVAR(value); - zephir_fetch_property_zval(&value, this_ptr, field, PH_SILENT_CC); - zephir_array_fetch(&_10$$10, referencedFields, position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1687 TSRMLS_CC); - ZEPHIR_INIT_LNVAR(_11$$10); - ZEPHIR_CONCAT_SVSV(_11$$10, "[", _10$$10, "] = ?", position); - zephir_array_append(&conditions, _11$$10, PH_SEPARATE, "phalcon/mvc/model.zep", 1687); - zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1688); - } - } else { + } + if (action == 2) { + ZEPHIR_CALL_METHOD(&_5$$7, relation, "getreferencedmodel", NULL, 0); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&referencedModel, manager, "load", &_6, 0, _5$$7); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&fields, relation, "getfields", NULL, 0); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&referencedFields, relation, "getreferencedfields", NULL, 0); + zephir_check_call_status(); + ZEPHIR_INIT_NVAR(conditions); + array_init(conditions); + ZEPHIR_INIT_NVAR(bindParams); + array_init(bindParams); + if (Z_TYPE_P(fields) == IS_ARRAY) { + zephir_is_iterable(fields, &_8$$8, &_7$$8, 0, 0, "phalcon/mvc/model.zep", 1679); + for ( + ; zephir_hash_get_current_data_ex(_8$$8, (void**) &_9$$8, &_7$$8) == SUCCESS + ; zephir_hash_move_forward_ex(_8$$8, &_7$$8) + ) { + ZEPHIR_GET_HMKEY(position, _8$$8, _7$$8); + ZEPHIR_GET_HVALUE(field, _9$$8); ZEPHIR_OBS_NVAR(value); - zephir_fetch_property_zval(&value, this_ptr, fields, PH_SILENT_CC); - ZEPHIR_INIT_LNVAR(_12$$11); - ZEPHIR_CONCAT_SVS(_12$$11, "[", referencedFields, "] = ?0"); - zephir_array_append(&conditions, _12$$11, PH_SEPARATE, "phalcon/mvc/model.zep", 1692); - zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1693); - } - ZEPHIR_OBS_NVAR(extraConditions); - if (zephir_array_isset_string_fetch(&extraConditions, foreignKey, SS("conditions"), 0 TSRMLS_CC)) { - zephir_array_append(&conditions, extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 1700); - } - ZEPHIR_INIT_NVAR(_13$$8); - zephir_create_array(_13$$8, 2, 0 TSRMLS_CC); - ZEPHIR_INIT_NVAR(_14$$8); - zephir_fast_join_str(_14$$8, SL(" AND "), conditions TSRMLS_CC); - zephir_array_fast_append(_13$$8, _14$$8); - zephir_array_update_string(&_13$$8, SL("bind"), &bindParams, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&resultset, referencedModel, "find", NULL, 0, _13$$8); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_15$$8, resultset, "delete", NULL, 0); - zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(_15$$8)) { - RETURN_MM_BOOL(0); + zephir_fetch_property_zval(&value, this_ptr, field, PH_SILENT_CC); + zephir_array_fetch(&_10$$9, referencedFields, position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1676 TSRMLS_CC); + ZEPHIR_INIT_LNVAR(_11$$9); + ZEPHIR_CONCAT_SVSV(_11$$9, "[", _10$$9, "] = ?", position); + zephir_array_append(&conditions, _11$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 1676); + zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1677); } + } else { + ZEPHIR_OBS_NVAR(value); + zephir_fetch_property_zval(&value, this_ptr, fields, PH_SILENT_CC); + ZEPHIR_INIT_LNVAR(_12$$10); + ZEPHIR_CONCAT_SVS(_12$$10, "[", referencedFields, "] = ?0"); + zephir_array_append(&conditions, _12$$10, PH_SEPARATE, "phalcon/mvc/model.zep", 1681); + zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1682); + } + ZEPHIR_OBS_NVAR(extraConditions); + if (zephir_array_isset_string_fetch(&extraConditions, foreignKey, SS("conditions"), 0 TSRMLS_CC)) { + zephir_array_append(&conditions, extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 1689); + } + ZEPHIR_INIT_NVAR(_13$$7); + zephir_create_array(_13$$7, 2, 0 TSRMLS_CC); + ZEPHIR_INIT_NVAR(_14$$7); + zephir_fast_join_str(_14$$7, SL(" AND "), conditions TSRMLS_CC); + zephir_array_fast_append(_13$$7, _14$$7); + zephir_array_update_string(&_13$$7, SL("bind"), &bindParams, PH_COPY | PH_SEPARATE); + ZEPHIR_CALL_METHOD(&resultset, referencedModel, "find", NULL, 0, _13$$7); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&_15$$7, resultset, "delete", NULL, 0); + zephir_check_call_status(); + if (ZEPHIR_IS_FALSE_IDENTICAL(_15$$7)) { + RETURN_MM_BOOL(0); } } } @@ -78999,10 +79205,10 @@ static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseCascade) { static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseRestrict) { - zval *_13$$8 = NULL; - HashTable *_2$$3, *_7$$9; - HashPosition _1$$3, _6$$9; - zval *manager = NULL, *relations = NULL, *foreignKey = NULL, *relation = NULL, *relationClass = NULL, *referencedModel = NULL, *fields = NULL, *referencedFields = NULL, *conditions = NULL, *bindParams = NULL, *position = NULL, *field = NULL, *value = NULL, *extraConditions = NULL, *message = NULL, *_0, **_3$$3, *_4$$7 = NULL, **_8$$9, *_9$$10, *_10$$10 = NULL, *_11$$11 = NULL, *_12$$8 = NULL, *_14$$8 = NULL, *_15$$13 = NULL, *_16$$13 = NULL, *_19$$16; + zval *_13$$7 = NULL; + HashTable *_2, *_7$$8; + HashPosition _1, _6$$8; + zval *manager = NULL, *relations = NULL, *foreignKey = NULL, *relation = NULL, *relationClass = NULL, *referencedModel = NULL, *fields = NULL, *referencedFields = NULL, *conditions = NULL, *bindParams = NULL, *position = NULL, *field = NULL, *value = NULL, *extraConditions = NULL, *message = NULL, *_0, **_3, *_4$$6 = NULL, **_8$$8, *_9$$9, *_10$$9 = NULL, *_11$$10 = NULL, *_12$$7 = NULL, *_14$$7 = NULL, *_15$$12 = NULL, *_16$$12 = NULL, *_19$$15; zend_bool error = 0; zephir_fcall_cache_entry *_5 = NULL, *_17 = NULL, *_18 = NULL; int ZEPHIR_LAST_CALL_STATUS, action = 0; @@ -79013,107 +79219,105 @@ static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseRestrict) { ZEPHIR_CPY_WRT(manager, _0); ZEPHIR_CALL_METHOD(&relations, manager, "gethasoneandhasmany", NULL, 0, this_ptr); zephir_check_call_status(); - if (zephir_fast_count_int(relations TSRMLS_CC)) { - error = 0; - zephir_is_iterable(relations, &_2$$3, &_1$$3, 0, 0, "phalcon/mvc/model.zep", 1842); - for ( - ; zephir_hash_get_current_data_ex(_2$$3, (void**) &_3$$3, &_1$$3) == SUCCESS - ; zephir_hash_move_forward_ex(_2$$3, &_1$$3) - ) { - ZEPHIR_GET_HVALUE(relation, _3$$3); - ZEPHIR_CALL_METHOD(&foreignKey, relation, "getforeignkey", NULL, 0); - zephir_check_call_status(); - if (!ZEPHIR_IS_FALSE_IDENTICAL(foreignKey)) { - action = 1; - if (Z_TYPE_P(foreignKey) == IS_ARRAY) { - if (zephir_array_isset_string(foreignKey, SS("action"))) { - ZEPHIR_OBS_NVAR(_4$$7); - zephir_array_fetch_string(&_4$$7, foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 1770 TSRMLS_CC); - action = zephir_get_intval(_4$$7); - } + error = 0; + zephir_is_iterable(relations, &_2, &_1, 0, 0, "phalcon/mvc/model.zep", 1829); + for ( + ; zephir_hash_get_current_data_ex(_2, (void**) &_3, &_1) == SUCCESS + ; zephir_hash_move_forward_ex(_2, &_1) + ) { + ZEPHIR_GET_HVALUE(relation, _3); + ZEPHIR_CALL_METHOD(&foreignKey, relation, "getforeignkey", NULL, 0); + zephir_check_call_status(); + if (!ZEPHIR_IS_FALSE_IDENTICAL(foreignKey)) { + action = 1; + if (Z_TYPE_P(foreignKey) == IS_ARRAY) { + if (zephir_array_isset_string(foreignKey, SS("action"))) { + ZEPHIR_OBS_NVAR(_4$$6); + zephir_array_fetch_string(&_4$$6, foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 1757 TSRMLS_CC); + action = zephir_get_intval(_4$$6); } - if (action == 1) { - ZEPHIR_CALL_METHOD(&relationClass, relation, "getreferencedmodel", NULL, 0); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&referencedModel, manager, "load", &_5, 0, relationClass); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&fields, relation, "getfields", NULL, 0); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&referencedFields, relation, "getreferencedfields", NULL, 0); - zephir_check_call_status(); - ZEPHIR_INIT_NVAR(conditions); - array_init(conditions); - ZEPHIR_INIT_NVAR(bindParams); - array_init(bindParams); - if (Z_TYPE_P(fields) == IS_ARRAY) { - zephir_is_iterable(fields, &_7$$9, &_6$$9, 0, 0, "phalcon/mvc/model.zep", 1802); - for ( - ; zephir_hash_get_current_data_ex(_7$$9, (void**) &_8$$9, &_6$$9) == SUCCESS - ; zephir_hash_move_forward_ex(_7$$9, &_6$$9) - ) { - ZEPHIR_GET_HMKEY(position, _7$$9, _6$$9); - ZEPHIR_GET_HVALUE(field, _8$$9); - ZEPHIR_OBS_NVAR(value); - zephir_fetch_property_zval(&value, this_ptr, field, PH_SILENT_CC); - zephir_array_fetch(&_9$$10, referencedFields, position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1798 TSRMLS_CC); - ZEPHIR_INIT_LNVAR(_10$$10); - ZEPHIR_CONCAT_SVSV(_10$$10, "[", _9$$10, "] = ?", position); - zephir_array_append(&conditions, _10$$10, PH_SEPARATE, "phalcon/mvc/model.zep", 1798); - zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1799); - } - } else { + } + if (action == 1) { + ZEPHIR_CALL_METHOD(&relationClass, relation, "getreferencedmodel", NULL, 0); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&referencedModel, manager, "load", &_5, 0, relationClass); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&fields, relation, "getfields", NULL, 0); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&referencedFields, relation, "getreferencedfields", NULL, 0); + zephir_check_call_status(); + ZEPHIR_INIT_NVAR(conditions); + array_init(conditions); + ZEPHIR_INIT_NVAR(bindParams); + array_init(bindParams); + if (Z_TYPE_P(fields) == IS_ARRAY) { + zephir_is_iterable(fields, &_7$$8, &_6$$8, 0, 0, "phalcon/mvc/model.zep", 1789); + for ( + ; zephir_hash_get_current_data_ex(_7$$8, (void**) &_8$$8, &_6$$8) == SUCCESS + ; zephir_hash_move_forward_ex(_7$$8, &_6$$8) + ) { + ZEPHIR_GET_HMKEY(position, _7$$8, _6$$8); + ZEPHIR_GET_HVALUE(field, _8$$8); ZEPHIR_OBS_NVAR(value); - zephir_fetch_property_zval(&value, this_ptr, fields, PH_SILENT_CC); - ZEPHIR_INIT_LNVAR(_11$$11); - ZEPHIR_CONCAT_SVS(_11$$11, "[", referencedFields, "] = ?0"); - zephir_array_append(&conditions, _11$$11, PH_SEPARATE, "phalcon/mvc/model.zep", 1804); - zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1805); + zephir_fetch_property_zval(&value, this_ptr, field, PH_SILENT_CC); + zephir_array_fetch(&_9$$9, referencedFields, position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1785 TSRMLS_CC); + ZEPHIR_INIT_LNVAR(_10$$9); + ZEPHIR_CONCAT_SVSV(_10$$9, "[", _9$$9, "] = ?", position); + zephir_array_append(&conditions, _10$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 1785); + zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1786); } - ZEPHIR_OBS_NVAR(extraConditions); - if (zephir_array_isset_string_fetch(&extraConditions, foreignKey, SS("conditions"), 0 TSRMLS_CC)) { - zephir_array_append(&conditions, extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 1812); + } else { + ZEPHIR_OBS_NVAR(value); + zephir_fetch_property_zval(&value, this_ptr, fields, PH_SILENT_CC); + ZEPHIR_INIT_LNVAR(_11$$10); + ZEPHIR_CONCAT_SVS(_11$$10, "[", referencedFields, "] = ?0"); + zephir_array_append(&conditions, _11$$10, PH_SEPARATE, "phalcon/mvc/model.zep", 1791); + zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1792); + } + ZEPHIR_OBS_NVAR(extraConditions); + if (zephir_array_isset_string_fetch(&extraConditions, foreignKey, SS("conditions"), 0 TSRMLS_CC)) { + zephir_array_append(&conditions, extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 1799); + } + ZEPHIR_INIT_NVAR(_13$$7); + zephir_create_array(_13$$7, 2, 0 TSRMLS_CC); + ZEPHIR_INIT_NVAR(_14$$7); + zephir_fast_join_str(_14$$7, SL(" AND "), conditions TSRMLS_CC); + zephir_array_fast_append(_13$$7, _14$$7); + zephir_array_update_string(&_13$$7, SL("bind"), &bindParams, PH_COPY | PH_SEPARATE); + ZEPHIR_CALL_METHOD(&_12$$7, referencedModel, "count", NULL, 0, _13$$7); + zephir_check_call_status(); + if (zephir_is_true(_12$$7)) { + ZEPHIR_OBS_NVAR(message); + if (!(zephir_array_isset_string_fetch(&message, foreignKey, SS("message"), 0 TSRMLS_CC))) { + ZEPHIR_INIT_NVAR(message); + ZEPHIR_CONCAT_SV(message, "Record is referenced by model ", relationClass); } - ZEPHIR_INIT_NVAR(_13$$8); - zephir_create_array(_13$$8, 2, 0 TSRMLS_CC); - ZEPHIR_INIT_NVAR(_14$$8); - zephir_fast_join_str(_14$$8, SL(" AND "), conditions TSRMLS_CC); - zephir_array_fast_append(_13$$8, _14$$8); - zephir_array_update_string(&_13$$8, SL("bind"), &bindParams, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_12$$8, referencedModel, "count", NULL, 0, _13$$8); + ZEPHIR_INIT_NVAR(_15$$12); + object_init_ex(_15$$12, phalcon_mvc_model_message_ce); + ZEPHIR_INIT_NVAR(_16$$12); + ZVAL_STRING(_16$$12, "ConstraintViolation", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(NULL, _15$$12, "__construct", &_17, 8, message, fields, _16$$12); + zephir_check_temp_parameter(_16$$12); zephir_check_call_status(); - if (zephir_is_true(_12$$8)) { - ZEPHIR_OBS_NVAR(message); - if (!(zephir_array_isset_string_fetch(&message, foreignKey, SS("message"), 0 TSRMLS_CC))) { - ZEPHIR_INIT_NVAR(message); - ZEPHIR_CONCAT_SV(message, "Record is referenced by model ", relationClass); - } - ZEPHIR_INIT_NVAR(_15$$13); - object_init_ex(_15$$13, phalcon_mvc_model_message_ce); - ZEPHIR_INIT_NVAR(_16$$13); - ZVAL_STRING(_16$$13, "ConstraintViolation", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _15$$13, "__construct", &_17, 8, message, fields, _16$$13); - zephir_check_temp_parameter(_16$$13); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "appendmessage", &_18, 0, _15$$13); - zephir_check_call_status(); - error = 1; - break; - } + ZEPHIR_CALL_METHOD(NULL, this_ptr, "appendmessage", &_18, 0, _15$$12); + zephir_check_call_status(); + error = 1; + break; } } } - if (error == 1) { - if (ZEPHIR_GLOBAL(orm).events) { - ZEPHIR_INIT_VAR(_19$$16); - ZVAL_STRING(_19$$16, "onValidationFails", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "fireevent", NULL, 0, _19$$16); - zephir_check_temp_parameter(_19$$16); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "_canceloperation", NULL, 0); - zephir_check_call_status(); - } - RETURN_MM_BOOL(0); + } + if (error == 1) { + if (ZEPHIR_GLOBAL(orm).events) { + ZEPHIR_INIT_VAR(_19$$15); + ZVAL_STRING(_19$$15, "onValidationFails", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "fireevent", NULL, 0, _19$$15); + zephir_check_temp_parameter(_19$$15); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "_canceloperation", NULL, 0); + zephir_check_call_status(); } + RETURN_MM_BOOL(0); } RETURN_MM_BOOL(1); @@ -79195,7 +79399,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _preSave) { ZEPHIR_CALL_METHOD(&emptyStringValues, metaData, "getemptystringattributes", NULL, 0, this_ptr); zephir_check_call_status(); error = 0; - zephir_is_iterable(notNull, &_9$$12, &_8$$12, 0, 0, "phalcon/mvc/model.zep", 2008); + zephir_is_iterable(notNull, &_9$$12, &_8$$12, 0, 0, "phalcon/mvc/model.zep", 1994); for ( ; zephir_hash_get_current_data_ex(_9$$12, (void**) &_10$$12, &_8$$12) == SUCCESS ; zephir_hash_move_forward_ex(_9$$12, &_8$$12) @@ -79212,7 +79416,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _preSave) { ZEPHIR_CONCAT_SVS(_12$$20, "Column '", field, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, _11$$20, "__construct", &_13, 9, _12$$20); zephir_check_call_status(); - zephir_throw_exception_debug(_11$$20, "phalcon/mvc/model.zep", 1944 TSRMLS_CC); + zephir_throw_exception_debug(_11$$20, "phalcon/mvc/model.zep", 1930 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -79436,7 +79640,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { ZEPHIR_INIT_NVAR(columnMap); ZVAL_NULL(columnMap); } - zephir_is_iterable(attributes, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 2192); + zephir_is_iterable(attributes, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 2178); for ( ; zephir_hash_get_current_data_ex(_1, (void**) &_2, &_0) == SUCCESS ; zephir_hash_move_forward_ex(_1, &_0) @@ -79452,7 +79656,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { ZEPHIR_CONCAT_SVS(_4$$8, "Column '", field, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, _3$$8, "__construct", &_5, 9, _4$$8); zephir_check_call_status(); - zephir_throw_exception_debug(_3$$8, "phalcon/mvc/model.zep", 2146 TSRMLS_CC); + zephir_throw_exception_debug(_3$$8, "phalcon/mvc/model.zep", 2132 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -79478,23 +79682,23 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { ZEPHIR_CONCAT_SVS(_9$$13, "Column '", field, "' have not defined a bind data type"); ZEPHIR_CALL_METHOD(NULL, _8$$13, "__construct", &_5, 9, _9$$13); zephir_check_call_status(); - zephir_throw_exception_debug(_8$$13, "phalcon/mvc/model.zep", 2170 TSRMLS_CC); + zephir_throw_exception_debug(_8$$13, "phalcon/mvc/model.zep", 2156 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&fields, field, PH_SEPARATE, "phalcon/mvc/model.zep", 2173); - zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2173); - zephir_array_append(&bindTypes, bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 2173); + zephir_array_append(&fields, field, PH_SEPARATE, "phalcon/mvc/model.zep", 2159); + zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2159); + zephir_array_append(&bindTypes, bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 2159); } else { if (zephir_array_isset(defaultValues, field)) { ZEPHIR_CALL_METHOD(&_10$$15, connection, "getdefaultvalue", &_11, 0); zephir_check_call_status(); - zephir_array_append(&values, _10$$15, PH_SEPARATE, "phalcon/mvc/model.zep", 2178); + zephir_array_append(&values, _10$$15, PH_SEPARATE, "phalcon/mvc/model.zep", 2164); } else { - zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2180); + zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2166); } - zephir_array_append(&fields, field, PH_SEPARATE, "phalcon/mvc/model.zep", 2183); - zephir_array_append(&bindTypes, bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 2183); + zephir_array_append(&fields, field, PH_SEPARATE, "phalcon/mvc/model.zep", 2169); + zephir_array_append(&bindTypes, bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 2169); } } } @@ -79506,7 +79710,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { zephir_check_call_status(); useExplicitIdentity = zephir_get_boolval(_12$$17); if (useExplicitIdentity) { - zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/mvc/model.zep", 2201); + zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/mvc/model.zep", 2187); } if (Z_TYPE_P(columnMap) == IS_ARRAY) { ZEPHIR_OBS_NVAR(attributeField); @@ -79517,7 +79721,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { ZEPHIR_CONCAT_SVS(_14$$20, "Identity column '", identityField, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, _13$$20, "__construct", &_5, 9, _14$$20); zephir_check_call_status(); - zephir_throw_exception_debug(_13$$20, "phalcon/mvc/model.zep", 2209 TSRMLS_CC); + zephir_throw_exception_debug(_13$$20, "phalcon/mvc/model.zep", 2195 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -79532,12 +79736,12 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { } if (_15$$22) { if (useExplicitIdentity) { - zephir_array_append(&values, defaultValue, PH_SEPARATE, "phalcon/mvc/model.zep", 2222); - zephir_array_append(&bindTypes, bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 2222); + zephir_array_append(&values, defaultValue, PH_SEPARATE, "phalcon/mvc/model.zep", 2208); + zephir_array_append(&bindTypes, bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 2208); } } else { if (!(useExplicitIdentity)) { - zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/mvc/model.zep", 2230); + zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/mvc/model.zep", 2216); } ZEPHIR_OBS_NVAR(bindType); if (!(zephir_array_isset_fetch(&bindType, bindDataTypes, identityField, 0 TSRMLS_CC))) { @@ -79547,17 +79751,17 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { ZEPHIR_CONCAT_SVS(_17$$27, "Identity column '", identityField, "' isn\\'t part of the table columns"); ZEPHIR_CALL_METHOD(NULL, _16$$27, "__construct", &_5, 9, _17$$27); zephir_check_call_status(); - zephir_throw_exception_debug(_16$$27, "phalcon/mvc/model.zep", 2237 TSRMLS_CC); + zephir_throw_exception_debug(_16$$27, "phalcon/mvc/model.zep", 2223 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2240); - zephir_array_append(&bindTypes, bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 2240); + zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2226); + zephir_array_append(&bindTypes, bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 2226); } } else { if (useExplicitIdentity) { - zephir_array_append(&values, defaultValue, PH_SEPARATE, "phalcon/mvc/model.zep", 2244); - zephir_array_append(&bindTypes, bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 2244); + zephir_array_append(&values, defaultValue, PH_SEPARATE, "phalcon/mvc/model.zep", 2230); + zephir_array_append(&bindTypes, bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 2230); } } } @@ -79647,7 +79851,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_INIT_NVAR(columnMap); ZVAL_NULL(columnMap); } - zephir_is_iterable(nonPrimary, &_3, &_2, 0, 0, "phalcon/mvc/model.zep", 2444); + zephir_is_iterable(nonPrimary, &_3, &_2, 0, 0, "phalcon/mvc/model.zep", 2430); for ( ; zephir_hash_get_current_data_ex(_3, (void**) &_4, &_2) == SUCCESS ; zephir_hash_move_forward_ex(_3, &_2) @@ -79662,7 +79866,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_CONCAT_SVS(_6$$9, "Column '", field, "' have not defined a bind data type"); ZEPHIR_CALL_METHOD(NULL, _5$$9, "__construct", &_7, 9, _6$$9); zephir_check_call_status(); - zephir_throw_exception_debug(_5$$9, "phalcon/mvc/model.zep", 2343 TSRMLS_CC); + zephir_throw_exception_debug(_5$$9, "phalcon/mvc/model.zep", 2329 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -79675,7 +79879,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_CONCAT_SVS(_9$$11, "Column '", field, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, _8$$11, "__construct", &_7, 9, _9$$11); zephir_check_call_status(); - zephir_throw_exception_debug(_8$$11, "phalcon/mvc/model.zep", 2351 TSRMLS_CC); + zephir_throw_exception_debug(_8$$11, "phalcon/mvc/model.zep", 2337 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -79685,9 +79889,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_OBS_NVAR(value); if (zephir_fetch_property_zval(&value, this_ptr, attributeField, PH_SILENT_CC)) { if (!(useDynamicUpdate)) { - zephir_array_append(&fields, field, PH_SEPARATE, "phalcon/mvc/model.zep", 2367); - zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2367); - zephir_array_append(&bindTypes, bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 2368); + zephir_array_append(&fields, field, PH_SEPARATE, "phalcon/mvc/model.zep", 2353); + zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2353); + zephir_array_append(&bindTypes, bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 2354); } else { ZEPHIR_OBS_NVAR(snapshotValue); if (!(zephir_array_isset_fetch(&snapshotValue, snapshot, attributeField, 0 TSRMLS_CC))) { @@ -79709,9 +79913,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { break; } if (ZEPHIR_IS_LONG(bindType, 3) || ZEPHIR_IS_LONG(bindType, 7)) { - ZEPHIR_CALL_FUNCTION(&_10$$24, "floatval", &_11, 305, snapshotValue); + ZEPHIR_CALL_FUNCTION(&_10$$24, "floatval", &_11, 301, snapshotValue); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_12$$24, "floatval", &_11, 305, value); + ZEPHIR_CALL_FUNCTION(&_12$$24, "floatval", &_11, 301, value); zephir_check_call_status(); changed = !ZEPHIR_IS_IDENTICAL(_10$$24, _12$$24); break; @@ -79729,15 +79933,15 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { } } if (changed) { - zephir_array_append(&fields, field, PH_SEPARATE, "phalcon/mvc/model.zep", 2430); - zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2430); - zephir_array_append(&bindTypes, bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 2431); + zephir_array_append(&fields, field, PH_SEPARATE, "phalcon/mvc/model.zep", 2416); + zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2416); + zephir_array_append(&bindTypes, bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 2417); } } } else { - zephir_array_append(&fields, field, PH_SEPARATE, "phalcon/mvc/model.zep", 2436); - zephir_array_append(&values, ZEPHIR_GLOBAL(global_null), PH_SEPARATE, "phalcon/mvc/model.zep", 2436); - zephir_array_append(&bindTypes, bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 2436); + zephir_array_append(&fields, field, PH_SEPARATE, "phalcon/mvc/model.zep", 2422); + zephir_array_append(&values, ZEPHIR_GLOBAL(global_null), PH_SEPARATE, "phalcon/mvc/model.zep", 2422); + zephir_array_append(&bindTypes, bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 2422); } } } @@ -79754,12 +79958,12 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_CALL_METHOD(&primaryKeys, metaData, "getprimarykeyattributes", NULL, 0, this_ptr); zephir_check_call_status(); if (!(zephir_fast_count_int(primaryKeys TSRMLS_CC))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A primary key must be defined in the model in order to perform the operation", "phalcon/mvc/model.zep", 2463); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A primary key must be defined in the model in order to perform the operation", "phalcon/mvc/model.zep", 2449); return; } ZEPHIR_INIT_NVAR(uniqueParams); array_init(uniqueParams); - zephir_is_iterable(primaryKeys, &_16$$30, &_15$$30, 0, 0, "phalcon/mvc/model.zep", 2486); + zephir_is_iterable(primaryKeys, &_16$$30, &_15$$30, 0, 0, "phalcon/mvc/model.zep", 2472); for ( ; zephir_hash_get_current_data_ex(_16$$30, (void**) &_17$$30, &_15$$30) == SUCCESS ; zephir_hash_move_forward_ex(_16$$30, &_15$$30) @@ -79774,7 +79978,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_CONCAT_SVS(_19$$34, "Column '", field, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, _18$$34, "__construct", &_7, 9, _19$$34); zephir_check_call_status(); - zephir_throw_exception_debug(_18$$34, "phalcon/mvc/model.zep", 2474 TSRMLS_CC); + zephir_throw_exception_debug(_18$$34, "phalcon/mvc/model.zep", 2460 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -79783,9 +79987,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { } ZEPHIR_OBS_NVAR(value); if (zephir_fetch_property_zval(&value, this_ptr, attributeField, PH_SILENT_CC)) { - zephir_array_append(&uniqueParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2481); + zephir_array_append(&uniqueParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2467); } else { - zephir_array_append(&uniqueParams, ZEPHIR_GLOBAL(global_null), PH_SEPARATE, "phalcon/mvc/model.zep", 2483); + zephir_array_append(&uniqueParams, ZEPHIR_GLOBAL(global_null), PH_SEPARATE, "phalcon/mvc/model.zep", 2469); } } } @@ -79828,7 +80032,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _preSaveRelatedRecords) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "getmodelsmanager", NULL, 0); zephir_check_call_status(); ZEPHIR_CPY_WRT(manager, _1); - zephir_is_iterable(related, &_3, &_2, 0, 0, "phalcon/mvc/model.zep", 2592); + zephir_is_iterable(related, &_3, &_2, 0, 0, "phalcon/mvc/model.zep", 2578); for ( ; zephir_hash_get_current_data_ex(_3, (void**) &_4, &_2) == SUCCESS ; zephir_hash_move_forward_ex(_3, &_2) @@ -79851,7 +80055,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _preSaveRelatedRecords) { } ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_8, 0, _7$$6); zephir_check_call_status(); - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects can be stored as part of belongs-to relations", "phalcon/mvc/model.zep", 2541); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects can be stored as part of belongs-to relations", "phalcon/mvc/model.zep", 2527); return; } ZEPHIR_CALL_METHOD(&columns, relation, "getfields", NULL, 0); @@ -79869,7 +80073,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _preSaveRelatedRecords) { } ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_10, 0, _9$$7); zephir_check_call_status(); - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/mvc/model.zep", 2550); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/mvc/model.zep", 2536); return; } ZEPHIR_CALL_METHOD(&_11$$5, record, "save", NULL, 0); @@ -79877,7 +80081,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _preSaveRelatedRecords) { if (!(zephir_is_true(_11$$5))) { ZEPHIR_CALL_METHOD(&_12$$8, record, "getmessages", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(_12$$8, &_14$$8, &_13$$8, 0, 0, "phalcon/mvc/model.zep", 2579); + zephir_is_iterable(_12$$8, &_14$$8, &_13$$8, 0, 0, "phalcon/mvc/model.zep", 2565); for ( ; zephir_hash_get_current_data_ex(_14$$8, (void**) &_15$$8, &_13$$8) == SUCCESS ; zephir_hash_move_forward_ex(_14$$8, &_13$$8) @@ -79930,7 +80134,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmodelsmanager", NULL, 0); zephir_check_call_status(); ZEPHIR_CPY_WRT(manager, _0); - zephir_is_iterable(related, &_2, &_1, 0, 0, "phalcon/mvc/model.zep", 2780); + zephir_is_iterable(related, &_2, &_1, 0, 0, "phalcon/mvc/model.zep", 2766); for ( ; zephir_hash_get_current_data_ex(_2, (void**) &_3, &_1) == SUCCESS ; zephir_hash_move_forward_ex(_2, &_1) @@ -79959,7 +80163,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { } ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_9, 0, _8$$6); zephir_check_call_status(); - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects/arrays can be stored as part of has-many/has-one/has-many-to-many relations", "phalcon/mvc/model.zep", 2631); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects/arrays can be stored as part of has-many/has-one/has-many-to-many relations", "phalcon/mvc/model.zep", 2617); return; } ZEPHIR_CALL_METHOD(&columns, relation, "getfields", NULL, 0); @@ -79977,7 +80181,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { } ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_11, 0, _10$$7); zephir_check_call_status(); - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/mvc/model.zep", 2640); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/mvc/model.zep", 2626); return; } if (Z_TYPE_P(record) == IS_OBJECT) { @@ -80003,7 +80207,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { ZEPHIR_CONCAT_SVS(_15$$10, "The column '", columns, "' needs to be present in the model"); ZEPHIR_CALL_METHOD(NULL, _14$$10, "__construct", &_16, 9, _15$$10); zephir_check_call_status(); - zephir_throw_exception_debug(_14$$10, "phalcon/mvc/model.zep", 2654 TSRMLS_CC); + zephir_throw_exception_debug(_14$$10, "phalcon/mvc/model.zep", 2640 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -80018,7 +80222,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { ZEPHIR_CALL_METHOD(&intermediateReferencedFields, relation, "getintermediatereferencedfields", NULL, 0); zephir_check_call_status(); } - zephir_is_iterable(relatedRecords, &_19$$4, &_18$$4, 0, 0, "phalcon/mvc/model.zep", 2769); + zephir_is_iterable(relatedRecords, &_19$$4, &_18$$4, 0, 0, "phalcon/mvc/model.zep", 2755); for ( ; zephir_hash_get_current_data_ex(_19$$4, (void**) &_20$$4, &_18$$4) == SUCCESS ; zephir_hash_move_forward_ex(_19$$4, &_18$$4) @@ -80033,7 +80237,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { if (!(zephir_is_true(_21$$12))) { ZEPHIR_CALL_METHOD(&_22$$14, recordAfter, "getmessages", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(_22$$14, &_24$$14, &_23$$14, 0, 0, "phalcon/mvc/model.zep", 2711); + zephir_is_iterable(_22$$14, &_24$$14, &_23$$14, 0, 0, "phalcon/mvc/model.zep", 2697); for ( ; zephir_hash_get_current_data_ex(_24$$14, (void**) &_25$$14, &_23$$14) == SUCCESS ; zephir_hash_move_forward_ex(_24$$14, &_23$$14) @@ -80072,7 +80276,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { if (!(zephir_is_true(_31$$17))) { ZEPHIR_CALL_METHOD(&_32$$18, intermediateModel, "getmessages", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(_32$$18, &_34$$18, &_33$$18, 0, 0, "phalcon/mvc/model.zep", 2763); + zephir_is_iterable(_32$$18, &_34$$18, &_33$$18, 0, 0, "phalcon/mvc/model.zep", 2749); for ( ; zephir_hash_get_current_data_ex(_34$$18, (void**) &_35$$18, &_33$$18) == SUCCESS ; zephir_hash_move_forward_ex(_34$$18, &_33$$18) @@ -80113,7 +80317,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { ZEPHIR_CONCAT_SVSVS(_41$$22, "There are no defined relations for the model '", className, "' using alias '", name, "'"); ZEPHIR_CALL_METHOD(NULL, _40$$22, "__construct", &_16, 9, _41$$22); zephir_check_call_status(); - zephir_throw_exception_debug(_40$$22, "phalcon/mvc/model.zep", 2772 TSRMLS_CC); + zephir_throw_exception_debug(_40$$22, "phalcon/mvc/model.zep", 2758 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -80134,8 +80338,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { static PHP_METHOD(Phalcon_Mvc_Model, save) { zend_bool _0; + zephir_fcall_cache_entry *_3 = NULL; int ZEPHIR_LAST_CALL_STATUS; - zval *data = NULL, *whiteList = NULL, *metaData = NULL, *related = NULL, *schema = NULL, *writeConnection = NULL, *readConnection = NULL, *source = NULL, *table = NULL, *identityField = NULL, *exists = NULL, *success = NULL, *_5, *_6 = NULL, *_1$$3, *_2$$4 = NULL, *_3$$8, *_4$$9, *_7$$11, *_8$$12, *_9$$12 = NULL, *_10$$15, *_11$$17, *_12$$19 = NULL, *_13$$21; + zval *data = NULL, *whiteList = NULL, *metaData = NULL, *related = NULL, *schema = NULL, *writeConnection = NULL, *readConnection = NULL, *source = NULL, *table = NULL, *identityField = NULL, *exists = NULL, *success = NULL, *_2 = NULL, *_7 = NULL, *_1$$3, *_4$$4 = NULL, *_5$$8, *_6$$9, *_8$$11, *_9$$12, *_10$$12 = NULL, *_11$$15, *_12$$17, *_13$$19 = NULL, *_14$$21; ZEPHIR_MM_GROW(); zephir_fetch_params(1, 0, 2, &data, &whiteList); @@ -80162,12 +80367,17 @@ static PHP_METHOD(Phalcon_Mvc_Model, save) { } ZEPHIR_CALL_METHOD(&writeConnection, this_ptr, "getwriteconnection", NULL, 0); zephir_check_call_status(); + ZEPHIR_INIT_VAR(_2); + ZVAL_STRING(_2, "prepareSave", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "fireevent", &_3, 0, _2); + zephir_check_temp_parameter(_2); + zephir_check_call_status(); ZEPHIR_OBS_VAR(related); zephir_read_property_this(&related, this_ptr, SL("_related"), PH_NOISY_CC); if (Z_TYPE_P(related) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "_presaverelatedrecords", NULL, 0, writeConnection, related); + ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "_presaverelatedrecords", NULL, 0, writeConnection, related); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(_2$$4)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(_4$$4)) { RETURN_MM_BOOL(0); } } @@ -80188,36 +80398,36 @@ static PHP_METHOD(Phalcon_Mvc_Model, save) { ZEPHIR_CALL_METHOD(&exists, this_ptr, "_exists", NULL, 0, metaData, readConnection, table); zephir_check_call_status(); if (zephir_is_true(exists)) { - ZEPHIR_INIT_ZVAL_NREF(_3$$8); - ZVAL_LONG(_3$$8, 2); - zephir_update_property_this(this_ptr, SL("_operationMade"), _3$$8 TSRMLS_CC); + ZEPHIR_INIT_ZVAL_NREF(_5$$8); + ZVAL_LONG(_5$$8, 2); + zephir_update_property_this(this_ptr, SL("_operationMade"), _5$$8 TSRMLS_CC); } else { - ZEPHIR_INIT_ZVAL_NREF(_4$$9); - ZVAL_LONG(_4$$9, 1); - zephir_update_property_this(this_ptr, SL("_operationMade"), _4$$9 TSRMLS_CC); + ZEPHIR_INIT_ZVAL_NREF(_6$$9); + ZVAL_LONG(_6$$9, 1); + zephir_update_property_this(this_ptr, SL("_operationMade"), _6$$9 TSRMLS_CC); } - ZEPHIR_INIT_VAR(_5); - array_init(_5); - zephir_update_property_this(this_ptr, SL("_errorMessages"), _5 TSRMLS_CC); + ZEPHIR_INIT_NVAR(_2); + array_init(_2); + zephir_update_property_this(this_ptr, SL("_errorMessages"), _2 TSRMLS_CC); ZEPHIR_CALL_METHOD(&identityField, metaData, "getidentityfield", NULL, 0, this_ptr); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_6, this_ptr, "_presave", NULL, 0, metaData, exists, identityField); + ZEPHIR_CALL_METHOD(&_7, this_ptr, "_presave", NULL, 0, metaData, exists, identityField); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(_6)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(_7)) { if (Z_TYPE_P(related) == IS_ARRAY) { - ZEPHIR_INIT_VAR(_7$$11); - ZVAL_BOOL(_7$$11, 0); - ZEPHIR_CALL_METHOD(NULL, writeConnection, "rollback", NULL, 0, _7$$11); + ZEPHIR_INIT_VAR(_8$$11); + ZVAL_BOOL(_8$$11, 0); + ZEPHIR_CALL_METHOD(NULL, writeConnection, "rollback", NULL, 0, _8$$11); zephir_check_call_status(); } if (ZEPHIR_GLOBAL(orm).exception_on_failed_save) { - ZEPHIR_INIT_VAR(_8$$12); - object_init_ex(_8$$12, phalcon_mvc_model_validationfailed_ce); - ZEPHIR_CALL_METHOD(&_9$$12, this_ptr, "getmessages", NULL, 0); + ZEPHIR_INIT_VAR(_9$$12); + object_init_ex(_9$$12, phalcon_mvc_model_validationfailed_ce); + ZEPHIR_CALL_METHOD(&_10$$12, this_ptr, "getmessages", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, _8$$12, "__construct", NULL, 306, this_ptr, _9$$12); + ZEPHIR_CALL_METHOD(NULL, _9$$12, "__construct", NULL, 302, this_ptr, _10$$12); zephir_check_call_status(); - zephir_throw_exception_debug(_8$$12, "phalcon/mvc/model.zep", 2885 TSRMLS_CC); + zephir_throw_exception_debug(_9$$12, "phalcon/mvc/model.zep", 2876 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -80231,15 +80441,15 @@ static PHP_METHOD(Phalcon_Mvc_Model, save) { zephir_check_call_status(); } if (zephir_is_true(success)) { - ZEPHIR_INIT_ZVAL_NREF(_10$$15); - ZVAL_LONG(_10$$15, 0); - zephir_update_property_this(this_ptr, SL("_dirtyState"), _10$$15 TSRMLS_CC); + ZEPHIR_INIT_ZVAL_NREF(_11$$15); + ZVAL_LONG(_11$$15, 0); + zephir_update_property_this(this_ptr, SL("_dirtyState"), _11$$15 TSRMLS_CC); } if (Z_TYPE_P(related) == IS_ARRAY) { if (ZEPHIR_IS_FALSE_IDENTICAL(success)) { - ZEPHIR_INIT_VAR(_11$$17); - ZVAL_BOOL(_11$$17, 0); - ZEPHIR_CALL_METHOD(NULL, writeConnection, "rollback", NULL, 0, _11$$17); + ZEPHIR_INIT_VAR(_12$$17); + ZVAL_BOOL(_12$$17, 0); + ZEPHIR_CALL_METHOD(NULL, writeConnection, "rollback", NULL, 0, _12$$17); zephir_check_call_status(); } else { ZEPHIR_CALL_METHOD(&success, this_ptr, "_postsaverelatedrecords", NULL, 0, writeConnection, related); @@ -80247,18 +80457,18 @@ static PHP_METHOD(Phalcon_Mvc_Model, save) { } } if (ZEPHIR_GLOBAL(orm).events) { - ZEPHIR_CALL_METHOD(&_12$$19, this_ptr, "_postsave", NULL, 0, success, exists); + ZEPHIR_CALL_METHOD(&_13$$19, this_ptr, "_postsave", NULL, 0, success, exists); zephir_check_call_status(); - ZEPHIR_CPY_WRT(success, _12$$19); + ZEPHIR_CPY_WRT(success, _13$$19); } if (ZEPHIR_IS_FALSE_IDENTICAL(success)) { ZEPHIR_CALL_METHOD(NULL, this_ptr, "_canceloperation", NULL, 0); zephir_check_call_status(); } else { - ZEPHIR_INIT_VAR(_13$$21); - ZVAL_STRING(_13$$21, "afterSave", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "fireevent", NULL, 0, _13$$21); - zephir_check_temp_parameter(_13$$21); + ZEPHIR_INIT_VAR(_14$$21); + ZVAL_STRING(_14$$21, "afterSave", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "fireevent", &_3, 0, _14$$21); + zephir_check_temp_parameter(_14$$21); zephir_check_call_status(); } RETURN_CCTOR(success); @@ -80409,10 +80619,10 @@ static PHP_METHOD(Phalcon_Mvc_Model, delete) { ZVAL_NULL(columnMap); } if (!(zephir_fast_count_int(primaryKeys TSRMLS_CC))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A primary key must be defined in the model in order to perform the operation", "phalcon/mvc/model.zep", 3069); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A primary key must be defined in the model in order to perform the operation", "phalcon/mvc/model.zep", 3060); return; } - zephir_is_iterable(primaryKeys, &_4, &_3, 0, 0, "phalcon/mvc/model.zep", 3110); + zephir_is_iterable(primaryKeys, &_4, &_3, 0, 0, "phalcon/mvc/model.zep", 3101); for ( ; zephir_hash_get_current_data_ex(_4, (void**) &_5, &_3) == SUCCESS ; zephir_hash_move_forward_ex(_4, &_3) @@ -80426,7 +80636,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, delete) { ZEPHIR_CONCAT_SVS(_7$$9, "Column '", primaryKey, "' have not defined a bind data type"); ZEPHIR_CALL_METHOD(NULL, _6$$9, "__construct", &_8, 9, _7$$9); zephir_check_call_status(); - zephir_throw_exception_debug(_6$$9, "phalcon/mvc/model.zep", 3081 TSRMLS_CC); + zephir_throw_exception_debug(_6$$9, "phalcon/mvc/model.zep", 3072 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -80439,7 +80649,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, delete) { ZEPHIR_CONCAT_SVS(_10$$11, "Column '", primaryKey, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, _9$$11, "__construct", &_8, 9, _10$$11); zephir_check_call_status(); - zephir_throw_exception_debug(_9$$11, "phalcon/mvc/model.zep", 3089 TSRMLS_CC); + zephir_throw_exception_debug(_9$$11, "phalcon/mvc/model.zep", 3080 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -80454,17 +80664,17 @@ static PHP_METHOD(Phalcon_Mvc_Model, delete) { ZEPHIR_CONCAT_SVS(_12$$13, "Cannot delete the record because the primary key attribute: '", attributeField, "' wasn't set"); ZEPHIR_CALL_METHOD(NULL, _11$$13, "__construct", &_8, 9, _12$$13); zephir_check_call_status(); - zephir_throw_exception_debug(_11$$13, "phalcon/mvc/model.zep", 3099 TSRMLS_CC); + zephir_throw_exception_debug(_11$$13, "phalcon/mvc/model.zep", 3090 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 3105); + zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 3096); ZEPHIR_CALL_METHOD(&_13$$8, writeConnection, "escapeidentifier", &_14, 0, primaryKey); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_15$$8); ZEPHIR_CONCAT_VS(_15$$8, _13$$8, " = ?"); - zephir_array_append(&conditions, _15$$8, PH_SEPARATE, "phalcon/mvc/model.zep", 3106); - zephir_array_append(&bindTypes, bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 3107); + zephir_array_append(&conditions, _15$$8, PH_SEPARATE, "phalcon/mvc/model.zep", 3097); + zephir_array_append(&bindTypes, bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 3098); } if (ZEPHIR_GLOBAL(orm).events) { if (0) { @@ -80545,7 +80755,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, refresh) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_dirtyState"), PH_NOISY_CC); if (!ZEPHIR_IS_LONG(_0, 0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 3185); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 3176); return; } ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); @@ -80570,7 +80780,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, refresh) { ZEPHIR_CALL_METHOD(&_1$$6, this_ptr, "_exists", NULL, 0, metaData, readConnection, table); zephir_check_call_status(); if (!(zephir_is_true(_1$$6))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 3207); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 3198); return; } ZEPHIR_OBS_NVAR(uniqueKey); @@ -80579,14 +80789,14 @@ static PHP_METHOD(Phalcon_Mvc_Model, refresh) { ZEPHIR_OBS_VAR(uniqueParams); zephir_read_property_this(&uniqueParams, this_ptr, SL("_uniqueParams"), PH_NOISY_CC); if (Z_TYPE_P(uniqueParams) != IS_ARRAY) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 3215); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 3206); return; } ZEPHIR_INIT_VAR(fields); array_init(fields); ZEPHIR_CALL_METHOD(&_2, metaData, "getattributes", NULL, 0, this_ptr); zephir_check_call_status(); - zephir_is_iterable(_2, &_4, &_3, 0, 0, "phalcon/mvc/model.zep", 3229); + zephir_is_iterable(_2, &_4, &_3, 0, 0, "phalcon/mvc/model.zep", 3220); for ( ; zephir_hash_get_current_data_ex(_4, (void**) &_5, &_3) == SUCCESS ; zephir_hash_move_forward_ex(_4, &_3) @@ -80595,7 +80805,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, refresh) { ZEPHIR_INIT_NVAR(_6$$9); zephir_create_array(_6$$9, 1, 0 TSRMLS_CC); zephir_array_fast_append(_6$$9, attribute); - zephir_array_append(&fields, _6$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 3223); + zephir_array_append(&fields, _6$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 3214); } ZEPHIR_CALL_METHOD(&dialect, readConnection, "getdialect", NULL, 0); zephir_check_call_status(); @@ -80711,7 +80921,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, skipAttributes) { ZEPHIR_INIT_VAR(keysAttributes); array_init(keysAttributes); - zephir_is_iterable(attributes, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 3310); + zephir_is_iterable(attributes, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 3301); for ( ; zephir_hash_get_current_data_ex(_1, (void**) &_2, &_0) == SUCCESS ; zephir_hash_move_forward_ex(_1, &_0) @@ -80745,7 +80955,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, skipAttributesOnCreate) { ZEPHIR_INIT_VAR(keysAttributes); array_init(keysAttributes); - zephir_is_iterable(attributes, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 3341); + zephir_is_iterable(attributes, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 3332); for ( ; zephir_hash_get_current_data_ex(_1, (void**) &_2, &_0) == SUCCESS ; zephir_hash_move_forward_ex(_1, &_0) @@ -80777,7 +80987,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, skipAttributesOnUpdate) { ZEPHIR_INIT_VAR(keysAttributes); array_init(keysAttributes); - zephir_is_iterable(attributes, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 3370); + zephir_is_iterable(attributes, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 3361); for ( ; zephir_hash_get_current_data_ex(_1, (void**) &_2, &_0) == SUCCESS ; zephir_hash_move_forward_ex(_1, &_0) @@ -80809,7 +81019,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, allowEmptyStringValues) { ZEPHIR_INIT_VAR(keysAttributes); array_init(keysAttributes); - zephir_is_iterable(attributes, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 3399); + zephir_is_iterable(attributes, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 3390); for ( ; zephir_hash_get_current_data_ex(_1, (void**) &_2, &_0) == SUCCESS ; zephir_hash_move_forward_ex(_1, &_0) @@ -81022,7 +81232,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) { if (Z_TYPE_P(columnMap) == IS_ARRAY) { ZEPHIR_INIT_VAR(snapshot); array_init(snapshot); - zephir_is_iterable(data, &_1$$3, &_0$$3, 0, 0, "phalcon/mvc/model.zep", 3615); + zephir_is_iterable(data, &_1$$3, &_0$$3, 0, 0, "phalcon/mvc/model.zep", 3606); for ( ; zephir_hash_get_current_data_ex(_1$$3, (void**) &_2$$3, &_0$$3) == SUCCESS ; zephir_hash_move_forward_ex(_1$$3, &_0$$3) @@ -81041,7 +81251,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) { ZEPHIR_CONCAT_SVS(_4$$7, "Column '", key, "' doesn't make part of the column map"); ZEPHIR_CALL_METHOD(NULL, _3$$7, "__construct", &_5, 9, _4$$7); zephir_check_call_status(); - zephir_throw_exception_debug(_3$$7, "phalcon/mvc/model.zep", 3596 TSRMLS_CC); + zephir_throw_exception_debug(_3$$7, "phalcon/mvc/model.zep", 3587 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -81058,7 +81268,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) { ZEPHIR_CONCAT_SVS(_7$$11, "Column '", key, "' doesn't make part of the column map"); ZEPHIR_CALL_METHOD(NULL, _6$$11, "__construct", &_5, 9, _7$$11); zephir_check_call_status(); - zephir_throw_exception_debug(_6$$11, "phalcon/mvc/model.zep", 3605 TSRMLS_CC); + zephir_throw_exception_debug(_6$$11, "phalcon/mvc/model.zep", 3596 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -81112,12 +81322,12 @@ static PHP_METHOD(Phalcon_Mvc_Model, hasChanged) { ZEPHIR_OBS_VAR(snapshot); zephir_read_property_this(&snapshot, this_ptr, SL("_snapshot"), PH_NOISY_CC); if (Z_TYPE_P(snapshot) != IS_ARRAY) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record doesn't have a valid data snapshot", "phalcon/mvc/model.zep", 3654); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record doesn't have a valid data snapshot", "phalcon/mvc/model.zep", 3645); return; } _0 = zephir_fetch_nproperty_this(this_ptr, SL("_dirtyState"), PH_NOISY_CC); if (!ZEPHIR_IS_LONG(_0, 0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Change checking cannot be performed because the object has not been persisted or is deleted", "phalcon/mvc/model.zep", 3661); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Change checking cannot be performed because the object has not been persisted or is deleted", "phalcon/mvc/model.zep", 3652); return; } ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); @@ -81139,7 +81349,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, hasChanged) { ZEPHIR_CONCAT_SVS(_2$$9, "The field '", fieldName, "' is not part of the model"); ZEPHIR_CALL_METHOD(NULL, _1$$9, "__construct", NULL, 9, _2$$9); zephir_check_call_status(); - zephir_throw_exception_debug(_1$$9, "phalcon/mvc/model.zep", 3693 TSRMLS_CC); + zephir_throw_exception_debug(_1$$9, "phalcon/mvc/model.zep", 3684 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -81151,7 +81361,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, hasChanged) { ZEPHIR_CONCAT_SVS(_4$$11, "The field '", fieldName, "' is not part of the model"); ZEPHIR_CALL_METHOD(NULL, _3$$11, "__construct", NULL, 9, _4$$11); zephir_check_call_status(); - zephir_throw_exception_debug(_3$$11, "phalcon/mvc/model.zep", 3697 TSRMLS_CC); + zephir_throw_exception_debug(_3$$11, "phalcon/mvc/model.zep", 3688 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -81164,7 +81374,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, hasChanged) { ZEPHIR_CONCAT_SVS(_6$$12, "The field '", fieldName, "' is not defined on the model"); ZEPHIR_CALL_METHOD(NULL, _5$$12, "__construct", NULL, 9, _6$$12); zephir_check_call_status(); - zephir_throw_exception_debug(_5$$12, "phalcon/mvc/model.zep", 3705 TSRMLS_CC); + zephir_throw_exception_debug(_5$$12, "phalcon/mvc/model.zep", 3696 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -81176,14 +81386,14 @@ static PHP_METHOD(Phalcon_Mvc_Model, hasChanged) { ZEPHIR_CONCAT_SVS(_8$$13, "The field '", fieldName, "' was not found in the snapshot"); ZEPHIR_CALL_METHOD(NULL, _7$$13, "__construct", NULL, 9, _8$$13); zephir_check_call_status(); - zephir_throw_exception_debug(_7$$13, "phalcon/mvc/model.zep", 3712 TSRMLS_CC); + zephir_throw_exception_debug(_7$$13, "phalcon/mvc/model.zep", 3703 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } RETURN_MM_BOOL(!ZEPHIR_IS_EQUAL(value, originalValue)); } ZEPHIR_INIT_VAR(_9); - zephir_is_iterable(allAttributes, &_11, &_10, 0, 0, "phalcon/mvc/model.zep", 3748); + zephir_is_iterable(allAttributes, &_11, &_10, 0, 0, "phalcon/mvc/model.zep", 3739); for ( ; zephir_hash_get_current_data_ex(_11, (void**) &_12, &_10) == SUCCESS ; zephir_hash_move_forward_ex(_11, &_10) @@ -81218,12 +81428,12 @@ static PHP_METHOD(Phalcon_Mvc_Model, getChangedFields) { ZEPHIR_OBS_VAR(snapshot); zephir_read_property_this(&snapshot, this_ptr, SL("_snapshot"), PH_NOISY_CC); if (Z_TYPE_P(snapshot) != IS_ARRAY) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record doesn't have a valid data snapshot", "phalcon/mvc/model.zep", 3761); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record doesn't have a valid data snapshot", "phalcon/mvc/model.zep", 3752); return; } _0 = zephir_fetch_nproperty_this(this_ptr, SL("_dirtyState"), PH_NOISY_CC); if (!ZEPHIR_IS_LONG(_0, 0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Change checking cannot be performed because the object has not been persisted or is deleted", "phalcon/mvc/model.zep", 3768); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Change checking cannot be performed because the object has not been persisted or is deleted", "phalcon/mvc/model.zep", 3759); return; } ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); @@ -81239,7 +81449,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, getChangedFields) { ZEPHIR_INIT_VAR(changed); array_init(changed); ZEPHIR_INIT_VAR(_1); - zephir_is_iterable(allAttributes, &_3, &_2, 0, 0, "phalcon/mvc/model.zep", 3822); + zephir_is_iterable(allAttributes, &_3, &_2, 0, 0, "phalcon/mvc/model.zep", 3813); for ( ; zephir_hash_get_current_data_ex(_3, (void**) &_4, &_2) == SUCCESS ; zephir_hash_move_forward_ex(_3, &_2) @@ -81247,17 +81457,17 @@ static PHP_METHOD(Phalcon_Mvc_Model, getChangedFields) { ZEPHIR_GET_HMKEY(name, _3, _2); ZEPHIR_GET_HVALUE(_1, _4); if (!(zephir_array_isset(snapshot, name))) { - zephir_array_append(&changed, name, PH_SEPARATE, "phalcon/mvc/model.zep", 3801); + zephir_array_append(&changed, name, PH_SEPARATE, "phalcon/mvc/model.zep", 3792); continue; } ZEPHIR_OBS_NVAR(value); if (!(zephir_fetch_property_zval(&value, this_ptr, name, PH_SILENT_CC))) { - zephir_array_append(&changed, name, PH_SEPARATE, "phalcon/mvc/model.zep", 3809); + zephir_array_append(&changed, name, PH_SEPARATE, "phalcon/mvc/model.zep", 3800); continue; } - zephir_array_fetch(&_5$$7, snapshot, name, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 3816 TSRMLS_CC); + zephir_array_fetch(&_5$$7, snapshot, name, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 3807 TSRMLS_CC); if (!ZEPHIR_IS_EQUAL(value, _5$$7)) { - zephir_array_append(&changed, name, PH_SEPARATE, "phalcon/mvc/model.zep", 3817); + zephir_array_append(&changed, name, PH_SEPARATE, "phalcon/mvc/model.zep", 3808); continue; } } @@ -81320,7 +81530,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, getRelated) { ZEPHIR_CONCAT_SVSVS(_3$$3, "There is no defined relations for the model '", className, "' using alias '", alias, "'"); ZEPHIR_CALL_METHOD(NULL, _2$$3, "__construct", NULL, 9, _3$$3); zephir_check_call_status(); - zephir_throw_exception_debug(_2$$3, "phalcon/mvc/model.zep", 3865 TSRMLS_CC); + zephir_throw_exception_debug(_2$$3, "phalcon/mvc/model.zep", 3856 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -81480,7 +81690,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _invokeFinder) { ZEPHIR_CONCAT_SVS(_4$$9, "The static method '", method, "' requires one argument"); ZEPHIR_CALL_METHOD(NULL, _3$$9, "__construct", NULL, 9, _4$$9); zephir_check_call_status(); - zephir_throw_exception_debug(_3$$9, "phalcon/mvc/model.zep", 3977 TSRMLS_CC); + zephir_throw_exception_debug(_3$$9, "phalcon/mvc/model.zep", 3968 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -81509,7 +81719,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _invokeFinder) { ZEPHIR_CPY_WRT(field, extraMethodFirst); } else { ZEPHIR_INIT_NVAR(field); - zephir_uncamelize(field, extraMethod); + zephir_uncamelize(field, extraMethod, NULL ); if (!(zephir_array_isset(attributes, field))) { ZEPHIR_INIT_VAR(_7$$15); object_init_ex(_7$$15, phalcon_mvc_model_exception_ce); @@ -81517,7 +81727,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _invokeFinder) { ZEPHIR_CONCAT_SVS(_8$$15, "Cannot resolve attribute '", extraMethod, "' in the model"); ZEPHIR_CALL_METHOD(NULL, _7$$15, "__construct", NULL, 9, _8$$15); zephir_check_call_status(); - zephir_throw_exception_debug(_7$$15, "phalcon/mvc/model.zep", 4011 TSRMLS_CC); + zephir_throw_exception_debug(_7$$15, "phalcon/mvc/model.zep", 4002 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -81552,7 +81762,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __call) { zephir_get_strval(method, method_param); - ZEPHIR_CALL_SELF(&records, "_invokefinder", &_0, 307, method, arguments); + ZEPHIR_CALL_SELF(&records, "_invokefinder", &_0, 303, method, arguments); zephir_check_call_status(); if (Z_TYPE_P(records) != IS_NULL) { RETURN_CCTOR(records); @@ -81576,7 +81786,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __call) { ZEPHIR_CONCAT_SVSVS(_3, "The method '", method, "' doesn't exist on model '", modelName, "'"); ZEPHIR_CALL_METHOD(NULL, _2, "__construct", NULL, 9, _3); zephir_check_call_status(); - zephir_throw_exception_debug(_2, "phalcon/mvc/model.zep", 4062 TSRMLS_CC); + zephir_throw_exception_debug(_2, "phalcon/mvc/model.zep", 4053 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; @@ -81595,7 +81805,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __callStatic) { zephir_get_strval(method, method_param); - ZEPHIR_CALL_SELF(&records, "_invokefinder", &_0, 307, method, arguments); + ZEPHIR_CALL_SELF(&records, "_invokefinder", &_0, 303, method, arguments); zephir_check_call_status(); if (Z_TYPE_P(records) == IS_NULL) { ZEPHIR_INIT_VAR(_1$$3); @@ -81604,7 +81814,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __callStatic) { ZEPHIR_CONCAT_SVS(_2$$3, "The static method '", method, "' doesn't exist"); ZEPHIR_CALL_METHOD(NULL, _1$$3, "__construct", NULL, 9, _2$$3); zephir_check_call_status(); - zephir_throw_exception_debug(_1$$3, "phalcon/mvc/model.zep", 4078 TSRMLS_CC); + zephir_throw_exception_debug(_1$$3, "phalcon/mvc/model.zep", 4069 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -81618,8 +81828,8 @@ static PHP_METHOD(Phalcon_Mvc_Model, __set) { HashPosition _1$$6; zephir_fcall_cache_entry *_5 = NULL, *_7 = NULL; int ZEPHIR_LAST_CALL_STATUS; - zval *property_param = NULL, *value, *lowerProperty = NULL, *related = NULL, *modelName = NULL, *manager = NULL, *lowerKey = NULL, *relation = NULL, *referencedModel = NULL, *key = NULL, *item = NULL, *dirtyState = NULL, *_0$$4 = NULL, **_3$$6, *_4$$10 = NULL, *_6$$11 = NULL, *_8$$12; - zval *property = NULL; + zval *property_param = NULL, *value, *lowerProperty = NULL, *related = NULL, *modelName = NULL, *manager = NULL, *lowerKey = NULL, *relation = NULL, *referencedModel = NULL, *key = NULL, *item = NULL, *dirtyState = NULL, *_9 = NULL, *_10 = NULL, *_0$$4 = NULL, **_3$$6, *_4$$10 = NULL, *_6$$11 = NULL, *_8$$12, *_11$$14; + zval *property = NULL, *_12$$14; ZEPHIR_MM_GROW(); zephir_fetch_params(1, 2, 0, &property_param, &value); @@ -81655,7 +81865,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __set) { zephir_check_call_status(); ZEPHIR_INIT_VAR(related); array_init(related); - zephir_is_iterable(value, &_2$$6, &_1$$6, 0, 0, "phalcon/mvc/model.zep", 4138); + zephir_is_iterable(value, &_2$$6, &_1$$6, 0, 0, "phalcon/mvc/model.zep", 4129); for ( ; zephir_hash_get_current_data_ex(_2$$6, (void**) &_3$$6, &_1$$6) == SUCCESS ; zephir_hash_move_forward_ex(_2$$6, &_1$$6) @@ -81664,7 +81874,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __set) { ZEPHIR_GET_HVALUE(item, _3$$6); if (Z_TYPE_P(item) == IS_OBJECT) { if (zephir_instance_of_ev(item, phalcon_mvc_modelinterface_ce TSRMLS_CC)) { - zephir_array_append(&related, item, PH_SEPARATE, "phalcon/mvc/model.zep", 4125); + zephir_array_append(&related, item, PH_SEPARATE, "phalcon/mvc/model.zep", 4116); } } else { ZEPHIR_INIT_NVAR(lowerKey); @@ -81692,12 +81902,94 @@ static PHP_METHOD(Phalcon_Mvc_Model, __set) { RETVAL_ZVAL(value, 1, 0); RETURN_MM(); } + ZEPHIR_CALL_METHOD(&_9, this_ptr, "_possiblesetter", NULL, 298, property, value); + zephir_check_call_status(); + if (zephir_is_true(_9)) { + RETVAL_ZVAL(value, 1, 0); + RETURN_MM(); + } + ZEPHIR_CALL_METHOD(&_10, this_ptr, "_isvisible", NULL, 304, property); + zephir_check_call_status(); + if (!(zephir_is_true(_10))) { + ZEPHIR_INIT_VAR(_11$$14); + object_init_ex(_11$$14, phalcon_mvc_model_exception_ce); + ZEPHIR_INIT_VAR(_12$$14); + ZEPHIR_CONCAT_SVS(_12$$14, "Property '", property, "' does not have a setter."); + ZEPHIR_CALL_METHOD(NULL, _11$$14, "__construct", NULL, 9, _12$$14); + zephir_check_call_status(); + zephir_throw_exception_debug(_11$$14, "phalcon/mvc/model.zep", 4144 TSRMLS_CC); + ZEPHIR_MM_RESTORE(); + return; + } zephir_update_property_zval_zval(this_ptr, property, value TSRMLS_CC); RETVAL_ZVAL(value, 1, 0); RETURN_MM(); } +static PHP_METHOD(Phalcon_Mvc_Model, _possibleSetter) { + + int ZEPHIR_LAST_CALL_STATUS; + zval *property_param = NULL, *value, *possibleSetter = NULL, *_0; + zval *property = NULL; + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 2, 0, &property_param, &value); + + zephir_get_strval(property, property_param); + + + ZEPHIR_INIT_VAR(_0); + zephir_camelize(_0, property, NULL ); + ZEPHIR_INIT_VAR(possibleSetter); + ZEPHIR_CONCAT_SV(possibleSetter, "set", _0); + if ((zephir_method_exists(this_ptr, possibleSetter TSRMLS_CC) == SUCCESS)) { + ZEPHIR_CALL_METHOD_ZVAL(NULL, this_ptr, possibleSetter, NULL, 0, value); + zephir_check_call_status(); + RETURN_MM_BOOL(1); + } + RETURN_MM_BOOL(0); + +} + +static PHP_METHOD(Phalcon_Mvc_Model, _isVisible) { + + int ZEPHIR_LAST_CALL_STATUS; + zval *property, *reflectionClass = NULL, *reflectionProp = NULL, *e = NULL, *_0$$3 = NULL; + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &property); + + + + ZEPHIR_INIT_VAR(reflectionClass); + object_init_ex(reflectionClass, zephir_get_internal_ce(SS("reflectionclass") TSRMLS_CC)); + ZEPHIR_CALL_METHOD(NULL, reflectionClass, "__construct", NULL, 66, this_ptr); + zephir_check_call_status(); + + /* try_start_1: */ + + ZEPHIR_CALL_METHOD(&reflectionProp, reflectionClass, "getproperty", NULL, 305, property); + zephir_check_call_status_or_jump(try_end_1); + ZEPHIR_CALL_METHOD(&_0$$3, reflectionProp, "ispublic", NULL, 0); + zephir_check_call_status_or_jump(try_end_1); + if (!(zephir_is_true(_0$$3))) { + RETURN_MM_BOOL(0); + } + + try_end_1: + + if (EG(exception)) { + ZEPHIR_CPY_WRT(e, EG(exception)); + if (zephir_instance_of_ev(e, zend_exception_get_default(TSRMLS_C) TSRMLS_CC)) { + zend_clear_exception(TSRMLS_C); + RETURN_MM_BOOL(1); + } + } + RETURN_MM_BOOL(1); + +} + static PHP_METHOD(Phalcon_Mvc_Model, __get) { zval *_1$$3, *_3$$3; @@ -81754,7 +82046,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __get) { RETURN_CCTOR(result); } ZEPHIR_INIT_VAR(_4); - zephir_camelize(_4, property); + zephir_camelize(_4, property, NULL ); ZEPHIR_INIT_VAR(method); ZEPHIR_CONCAT_SV(method, "get", _4); if ((zephir_method_exists(this_ptr, method TSRMLS_CC) == SUCCESS)) { @@ -81848,7 +82140,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, unserialize) { ZEPHIR_CALL_CE_STATIC(&dependencyInjector, phalcon_di_ce, "getdefault", &_0, 1); zephir_check_call_status(); if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injector container is required to obtain the services related to the ORM", "phalcon/mvc/model.zep", 4262); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injector container is required to obtain the services related to the ORM", "phalcon/mvc/model.zep", 4304); return; } zephir_update_property_this(this_ptr, SL("_dependencyInjector"), dependencyInjector TSRMLS_CC); @@ -81859,13 +82151,13 @@ static PHP_METHOD(Phalcon_Mvc_Model, unserialize) { zephir_check_call_status(); ZEPHIR_CPY_WRT(manager, _1$$3); if (Z_TYPE_P(manager) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsManager' is not valid", "phalcon/mvc/model.zep", 4275); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsManager' is not valid", "phalcon/mvc/model.zep", 4317); return; } zephir_update_property_this(this_ptr, SL("_modelsManager"), manager TSRMLS_CC); ZEPHIR_CALL_METHOD(NULL, manager, "initialize", NULL, 0, this_ptr); zephir_check_call_status(); - zephir_is_iterable(attributes, &_4$$3, &_3$$3, 0, 0, "phalcon/mvc/model.zep", 4294); + zephir_is_iterable(attributes, &_4$$3, &_3$$3, 0, 0, "phalcon/mvc/model.zep", 4336); for ( ; zephir_hash_get_current_data_ex(_4$$3, (void**) &_5$$3, &_3$$3) == SUCCESS ; zephir_hash_move_forward_ex(_4$$3, &_3$$3) @@ -81915,7 +82207,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, toArray) { zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_0, metaData, "getattributes", NULL, 0, this_ptr); zephir_check_call_status(); - zephir_is_iterable(_0, &_2, &_1, 0, 0, "phalcon/mvc/model.zep", 4358); + zephir_is_iterable(_0, &_2, &_1, 0, 0, "phalcon/mvc/model.zep", 4400); for ( ; zephir_hash_get_current_data_ex(_2, (void**) &_3, &_1) == SUCCESS ; zephir_hash_move_forward_ex(_2, &_1) @@ -81931,7 +82223,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, toArray) { ZEPHIR_CONCAT_SVS(_5$$6, "Column '", attribute, "' doesn't make part of the column map"); ZEPHIR_CALL_METHOD(NULL, _4$$6, "__construct", &_6, 9, _5$$6); zephir_check_call_status(); - zephir_throw_exception_debug(_4$$6, "phalcon/mvc/model.zep", 4336 TSRMLS_CC); + zephir_throw_exception_debug(_4$$6, "phalcon/mvc/model.zep", 4378 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -82602,12 +82894,16 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle) { zephir_check_call_status(); } _4 = zephir_fetch_nproperty_this(this_ptr, SL("_routes"), PH_NOISY_CC); - zephir_is_iterable(_4, &_6, &_5, 0, 1, "phalcon/mvc/router.zep", 556); + zephir_is_iterable(_4, &_6, &_5, 0, 1, "phalcon/mvc/router.zep", 558); for ( ; zephir_hash_get_current_data_ex(_6, (void**) &_7, &_5) == SUCCESS ; zephir_hash_move_backwards_ex(_6, &_5) ) { ZEPHIR_GET_HVALUE(route, _7); + ZEPHIR_INIT_NVAR(params); + array_init(params); + ZEPHIR_INIT_NVAR(matches); + ZVAL_NULL(matches); ZEPHIR_CALL_METHOD(&methods, route, "gethttpmethods", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(methods) != IS_NULL) { @@ -82615,7 +82911,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle) { _8$$10 = zephir_fetch_nproperty_this(this_ptr, SL("_dependencyInjector"), PH_NOISY_CC); ZEPHIR_CPY_WRT(dependencyInjector, _8$$10); if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/mvc/router.zep", 382); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/mvc/router.zep", 384); return; } ZEPHIR_INIT_NVAR(_10$$10); @@ -82640,7 +82936,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle) { _13$$14 = zephir_fetch_nproperty_this(this_ptr, SL("_dependencyInjector"), PH_NOISY_CC); ZEPHIR_CPY_WRT(dependencyInjector, _13$$14); if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/mvc/router.zep", 409); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/mvc/router.zep", 411); return; } ZEPHIR_INIT_NVAR(_15$$14); @@ -82657,8 +82953,8 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle) { if (Z_TYPE_P(currentHostName) == IS_NULL) { continue; } - if (zephir_memnstr_str(hostname, SL("("), "phalcon/mvc/router.zep", 432)) { - if (!(zephir_memnstr_str(hostname, SL("#"), "phalcon/mvc/router.zep", 433))) { + if (zephir_memnstr_str(hostname, SL("("), "phalcon/mvc/router.zep", 434)) { + if (!(zephir_memnstr_str(hostname, SL("#"), "phalcon/mvc/router.zep", 435))) { ZEPHIR_INIT_NVAR(regexHostName); ZEPHIR_CONCAT_SVS(regexHostName, "#^", hostname, "$#"); } else { @@ -82684,7 +82980,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle) { } ZEPHIR_CALL_METHOD(&pattern, route, "getcompiledpattern", NULL, 0); zephir_check_call_status(); - if (zephir_memnstr_str(pattern, SL("^"), "phalcon/mvc/router.zep", 457)) { + if (zephir_memnstr_str(pattern, SL("^"), "phalcon/mvc/router.zep", 459)) { ZEPHIR_INIT_NVAR(routeFound); zephir_preg_match(routeFound, pattern, handledUri, matches, 0, 0 , 0 TSRMLS_CC); } else { @@ -82703,7 +82999,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle) { zephir_check_call_status(); if (Z_TYPE_P(beforeMatch) != IS_NULL) { if (!(zephir_is_callable(beforeMatch TSRMLS_CC))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "Before-Match callback is not callable in matched route", "phalcon/mvc/router.zep", 479); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "Before-Match callback is not callable in matched route", "phalcon/mvc/router.zep", 481); return; } ZEPHIR_INIT_NVAR(_21$$28); @@ -82731,7 +83027,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle) { if (Z_TYPE_P(matches) == IS_ARRAY) { ZEPHIR_CALL_METHOD(&converters, route, "getconverters", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(paths, &_25$$33, &_24$$33, 0, 0, "phalcon/mvc/router.zep", 545); + zephir_is_iterable(paths, &_25$$33, &_24$$33, 0, 0, "phalcon/mvc/router.zep", 547); for ( ; zephir_hash_get_current_data_ex(_25$$33, (void**) &_26$$33, &_24$$33) == SUCCESS ; zephir_hash_move_forward_ex(_25$$33, &_24$$33) @@ -82921,7 +83217,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, add) { zephir_update_property_this(this_ptr, SL("_routes"), _0$$4 TSRMLS_CC); break; } - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "Invalid route position", "phalcon/mvc/router.zep", 681); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "Invalid route position", "phalcon/mvc/router.zep", 683); return; } while(0); @@ -83203,13 +83499,13 @@ static PHP_METHOD(Phalcon_Mvc_Router, mount) { ZEPHIR_CALL_METHOD(&groupRoutes, group, "getroutes", NULL, 0); zephir_check_call_status(); if (!(zephir_fast_count_int(groupRoutes TSRMLS_CC))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "The group of routes does not contain any routes", "phalcon/mvc/router.zep", 752); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "The group of routes does not contain any routes", "phalcon/mvc/router.zep", 754); return; } ZEPHIR_CALL_METHOD(&beforeMatch, group, "getbeforematch", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(beforeMatch) != IS_NULL) { - zephir_is_iterable(groupRoutes, &_1$$4, &_0$$4, 0, 0, "phalcon/mvc/router.zep", 764); + zephir_is_iterable(groupRoutes, &_1$$4, &_0$$4, 0, 0, "phalcon/mvc/router.zep", 766); for ( ; zephir_hash_get_current_data_ex(_1$$4, (void**) &_2$$4, &_0$$4) == SUCCESS ; zephir_hash_move_forward_ex(_1$$4, &_0$$4) @@ -83222,7 +83518,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, mount) { ZEPHIR_CALL_METHOD(&hostname, group, "gethostname", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(hostname) != IS_NULL) { - zephir_is_iterable(groupRoutes, &_4$$6, &_3$$6, 0, 0, "phalcon/mvc/router.zep", 773); + zephir_is_iterable(groupRoutes, &_4$$6, &_3$$6, 0, 0, "phalcon/mvc/router.zep", 775); for ( ; zephir_hash_get_current_data_ex(_4$$6, (void**) &_5$$6, &_3$$6) == SUCCESS ; zephir_hash_move_forward_ex(_4$$6, &_3$$6) @@ -83259,7 +83555,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, notFound) { _0 = Z_TYPE_P(paths) != IS_STRING; } if (_0) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_router_exception_ce, "The not-found paths must be an array or string", "phalcon/mvc/router.zep", 792); + ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_router_exception_ce, "The not-found paths must be an array or string", "phalcon/mvc/router.zep", 794); return; } zephir_update_property_this(this_ptr, SL("_notFoundPaths"), paths TSRMLS_CC); @@ -83365,7 +83661,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, getRouteById) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_routes"), PH_NOISY_CC); - zephir_is_iterable(_0, &_2, &_1, 0, 0, "phalcon/mvc/router.zep", 891); + zephir_is_iterable(_0, &_2, &_1, 0, 0, "phalcon/mvc/router.zep", 893); for ( ; zephir_hash_get_current_data_ex(_2, (void**) &_3, &_1) == SUCCESS ; zephir_hash_move_forward_ex(_2, &_1) @@ -83405,7 +83701,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, getRouteByName) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_routes"), PH_NOISY_CC); - zephir_is_iterable(_0, &_2, &_1, 0, 0, "phalcon/mvc/router.zep", 906); + zephir_is_iterable(_0, &_2, &_1, 0, 0, "phalcon/mvc/router.zep", 908); for ( ; zephir_hash_get_current_data_ex(_2, (void**) &_3, &_1) == SUCCESS ; zephir_hash_move_forward_ex(_2, &_1) @@ -83839,7 +84135,7 @@ static PHP_METHOD(Phalcon_Mvc_Url, get) { } } if (zephir_is_true(args)) { - ZEPHIR_CALL_FUNCTION(&queryString, "http_build_query", NULL, 362, args); + ZEPHIR_CALL_FUNCTION(&queryString, "http_build_query", NULL, 360, args); zephir_check_call_status(); _25$$19 = Z_TYPE_P(queryString) == IS_STRING; if (_25$$19) { @@ -84501,7 +84797,7 @@ static PHP_METHOD(Phalcon_Mvc_View, _loadTemplateEngines) { if (Z_TYPE_P(registeredEngines) != IS_ARRAY) { ZEPHIR_INIT_VAR(_1$$4); object_init_ex(_1$$4, phalcon_mvc_view_engine_php_ce); - ZEPHIR_CALL_METHOD(NULL, _1$$4, "__construct", NULL, 363, this_ptr, dependencyInjector); + ZEPHIR_CALL_METHOD(NULL, _1$$4, "__construct", NULL, 361, this_ptr, dependencyInjector); zephir_check_call_status(); zephir_array_update_string(&engines, SL(".phtml"), &_1$$4, PH_COPY | PH_SEPARATE); } else { @@ -85113,7 +85409,7 @@ static PHP_METHOD(Phalcon_Mvc_View, getPartial) { zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "partial", NULL, 0, partialPath, params); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", NULL, 285); + ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", NULL, 280); zephir_check_call_status(); RETURN_MM(); @@ -86264,6 +86560,29 @@ static PHP_METHOD(Phalcon_Mvc_Collection_Manager, setConnectionService) { } +static PHP_METHOD(Phalcon_Mvc_Collection_Manager, getConnectionService) { + + zval *model, *service = NULL, *entityName = NULL, *_0, *_1$$3; + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &model); + + + + ZEPHIR_INIT_VAR(service); + ZVAL_STRING(service, "mongo", 1); + ZEPHIR_INIT_VAR(entityName); + zephir_get_class(entityName, model, 0 TSRMLS_CC); + _0 = zephir_fetch_nproperty_this(this_ptr, SL("_connectionServices"), PH_NOISY_CC); + if (zephir_array_isset(_0, entityName)) { + _1$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_connectionServices"), PH_NOISY_CC); + ZEPHIR_OBS_NVAR(service); + zephir_array_fetch(&service, _1$$3, entityName, PH_NOISY, "phalcon/mvc/collection/manager.zep", 194 TSRMLS_CC); + } + RETURN_CCTOR(service); + +} + static PHP_METHOD(Phalcon_Mvc_Collection_Manager, useImplicitObjectIds) { zend_bool useImplicitObjectIds; @@ -86322,19 +86641,19 @@ static PHP_METHOD(Phalcon_Mvc_Collection_Manager, getConnection) { zephir_get_class(entityName, model, 0 TSRMLS_CC); if (zephir_array_isset(connectionService, entityName)) { ZEPHIR_OBS_NVAR(service); - zephir_array_fetch(&service, connectionService, entityName, PH_NOISY, "phalcon/mvc/collection/manager.zep", 228 TSRMLS_CC); + zephir_array_fetch(&service, connectionService, entityName, PH_NOISY, "phalcon/mvc/collection/manager.zep", 244 TSRMLS_CC); } } ZEPHIR_OBS_VAR(dependencyInjector); zephir_read_property_this(&dependencyInjector, this_ptr, SL("_dependencyInjector"), PH_NOISY_CC); if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_collection_exception_ce, "A dependency injector container is required to obtain the services related to the ORM", "phalcon/mvc/collection/manager.zep", 234); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_collection_exception_ce, "A dependency injector container is required to obtain the services related to the ORM", "phalcon/mvc/collection/manager.zep", 250); return; } ZEPHIR_CALL_METHOD(&connection, dependencyInjector, "getshared", NULL, 0, service); zephir_check_call_status(); if (Z_TYPE_P(connection) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_collection_exception_ce, "Invalid injected connection service", "phalcon/mvc/collection/manager.zep", 242); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_collection_exception_ce, "Invalid injected connection service", "phalcon/mvc/collection/manager.zep", 258); return; } RETURN_CCTOR(connection); @@ -86373,7 +86692,7 @@ static PHP_METHOD(Phalcon_Mvc_Collection_Manager, notifyEvent) { ZEPHIR_INIT_VAR(_0$$3); zephir_get_class(_0$$3, model, 1 TSRMLS_CC); if (zephir_array_isset_fetch(&modelsBehaviors, behaviors, _0$$3, 0 TSRMLS_CC)) { - zephir_is_iterable(modelsBehaviors, &_2$$4, &_1$$4, 0, 0, "phalcon/mvc/collection/manager.zep", 269); + zephir_is_iterable(modelsBehaviors, &_2$$4, &_1$$4, 0, 0, "phalcon/mvc/collection/manager.zep", 285); for ( ; zephir_hash_get_current_data_ex(_2$$4, (void**) &_3$$4, &_1$$4) == SUCCESS ; zephir_hash_move_forward_ex(_2$$4, &_1$$4) @@ -86447,7 +86766,7 @@ static PHP_METHOD(Phalcon_Mvc_Collection_Manager, missingMethod) { ZEPHIR_INIT_VAR(_0$$3); zephir_get_class(_0$$3, model, 1 TSRMLS_CC); if (zephir_array_isset_fetch(&modelsBehaviors, behaviors, _0$$3, 0 TSRMLS_CC)) { - zephir_is_iterable(modelsBehaviors, &_2$$4, &_1$$4, 0, 0, "phalcon/mvc/collection/manager.zep", 325); + zephir_is_iterable(modelsBehaviors, &_2$$4, &_1$$4, 0, 0, "phalcon/mvc/collection/manager.zep", 341); for ( ; zephir_hash_get_current_data_ex(_2$$4, (void**) &_3$$4, &_1$$4) == SUCCESS ; zephir_hash_move_forward_ex(_2$$4, &_1$$4) @@ -86491,7 +86810,7 @@ static PHP_METHOD(Phalcon_Mvc_Collection_Manager, addBehavior) { ZEPHIR_INIT_NVAR(modelsBehaviors); array_init(modelsBehaviors); } - zephir_array_append(&modelsBehaviors, behavior, PH_SEPARATE, "phalcon/mvc/collection/manager.zep", 358); + zephir_array_append(&modelsBehaviors, behavior, PH_SEPARATE, "phalcon/mvc/collection/manager.zep", 374); zephir_update_property_array(this_ptr, SL("_behaviors"), entityName, modelsBehaviors TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -86700,7 +87019,7 @@ static PHP_METHOD(Phalcon_Mvc_Collection_Behavior_Timestampable, notify) { ZVAL_NULL(timestamp); ZEPHIR_OBS_VAR(format); if (zephir_array_isset_string_fetch(&format, options, SS("format"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_FUNCTION(×tamp, "date", NULL, 294, format); + ZEPHIR_CALL_FUNCTION(×tamp, "date", NULL, 289, format); zephir_check_call_status(); } else { ZEPHIR_OBS_VAR(generator); @@ -88760,12 +89079,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Criteria, fromInput) { ZEPHIR_INIT_VAR(_12$$10); ZEPHIR_CONCAT_SVS(_12$$10, " ", operator, " "); zephir_fast_join(_11$$10, _12$$10, conditions TSRMLS_CC); - ZEPHIR_CALL_METHOD(NULL, criteria, "where", NULL, 308, _11$$10); + ZEPHIR_CALL_METHOD(NULL, criteria, "where", NULL, 306, _11$$10); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, criteria, "bind", NULL, 309, bind); + ZEPHIR_CALL_METHOD(NULL, criteria, "bind", NULL, 307, bind); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, criteria, "setmodelname", NULL, 304, modelName); + ZEPHIR_CALL_METHOD(NULL, criteria, "setmodelname", NULL, 300, modelName); zephir_check_call_status(); RETURN_CCTOR(criteria); @@ -89221,7 +89540,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, getModelSource) { ZEPHIR_INIT_VAR(_0); zephir_get_class_ns(_0, model, 0 TSRMLS_CC); ZEPHIR_INIT_NVAR(source); - zephir_uncamelize(source, _0); + zephir_uncamelize(source, _0, NULL ); zephir_update_property_array(this_ptr, SL("_sources"), entityName, source TSRMLS_CC); RETURN_CCTOR(source); @@ -89778,7 +90097,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasOne) { object_init_ex(relation, phalcon_mvc_model_relation_ce); ZEPHIR_INIT_VAR(_1); ZVAL_LONG(_1, 1); - ZEPHIR_CALL_METHOD(NULL, relation, "__construct", NULL, 310, _1, referencedModel, fields, referencedFields, options); + ZEPHIR_CALL_METHOD(NULL, relation, "__construct", NULL, 308, _1, referencedModel, fields, referencedFields, options); zephir_check_call_status(); ZEPHIR_OBS_VAR(alias); if (zephir_array_isset_string_fetch(&alias, options, SS("alias"), 0 TSRMLS_CC)) { @@ -89854,7 +90173,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, addBelongsTo) { object_init_ex(relation, phalcon_mvc_model_relation_ce); ZEPHIR_INIT_VAR(_1); ZVAL_LONG(_1, 0); - ZEPHIR_CALL_METHOD(NULL, relation, "__construct", NULL, 310, _1, referencedModel, fields, referencedFields, options); + ZEPHIR_CALL_METHOD(NULL, relation, "__construct", NULL, 308, _1, referencedModel, fields, referencedFields, options); zephir_check_call_status(); ZEPHIR_OBS_VAR(alias); if (zephir_array_isset_string_fetch(&alias, options, SS("alias"), 0 TSRMLS_CC)) { @@ -89931,7 +90250,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasMany) { object_init_ex(relation, phalcon_mvc_model_relation_ce); ZEPHIR_INIT_VAR(_0); ZVAL_LONG(_0, 2); - ZEPHIR_CALL_METHOD(NULL, relation, "__construct", NULL, 310, _0, referencedModel, fields, referencedFields, options); + ZEPHIR_CALL_METHOD(NULL, relation, "__construct", NULL, 308, _0, referencedModel, fields, referencedFields, options); zephir_check_call_status(); ZEPHIR_OBS_VAR(alias); if (zephir_array_isset_string_fetch(&alias, options, SS("alias"), 0 TSRMLS_CC)) { @@ -90026,9 +90345,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasManyToMany) { object_init_ex(relation, phalcon_mvc_model_relation_ce); ZEPHIR_INIT_VAR(_0); ZVAL_LONG(_0, 4); - ZEPHIR_CALL_METHOD(NULL, relation, "__construct", NULL, 310, _0, referencedModel, fields, referencedFields, options); + ZEPHIR_CALL_METHOD(NULL, relation, "__construct", NULL, 308, _0, referencedModel, fields, referencedFields, options); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, relation, "setintermediaterelation", NULL, 311, intermediateFields, intermediateModel, intermediateReferencedFields); + ZEPHIR_CALL_METHOD(NULL, relation, "setintermediaterelation", NULL, 309, intermediateFields, intermediateModel, intermediateReferencedFields); zephir_check_call_status(); ZEPHIR_OBS_VAR(alias); if (zephir_array_isset_string_fetch(&alias, options, SS("alias"), 0 TSRMLS_CC)) { @@ -90478,7 +90797,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, getRelationRecords) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not supported", "phalcon/mvc/model/manager.zep", 1242); return; } - ZEPHIR_CALL_METHOD(&_5$$3, this_ptr, "_mergefindparameters", &_6, 312, extraParameters, parameters); + ZEPHIR_CALL_METHOD(&_5$$3, this_ptr, "_mergefindparameters", &_6, 310, extraParameters, parameters); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&builder, this_ptr, "createbuilder", NULL, 0, _5$$3); zephir_check_call_status(); @@ -90543,10 +90862,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, getRelationRecords) { ZEPHIR_CALL_METHOD(&_23, record, "getdi", NULL, 0); zephir_check_call_status(); zephir_array_update_string(&findParams, SL("di"), &_23, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&findArguments, this_ptr, "_mergefindparameters", &_6, 312, findParams, parameters); + ZEPHIR_CALL_METHOD(&findArguments, this_ptr, "_mergefindparameters", &_6, 310, findParams, parameters); zephir_check_call_status(); if (Z_TYPE_P(extraParameters) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&findParams, this_ptr, "_mergefindparameters", &_6, 312, findArguments, extraParameters); + ZEPHIR_CALL_METHOD(&findParams, this_ptr, "_mergefindparameters", &_6, 310, findArguments, extraParameters); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(findParams, findArguments); @@ -92989,7 +93308,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getCallArgument) { add_assoc_stringl_ex(return_value, SS("type"), SL("all"), 1); RETURN_MM(); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getexpression", NULL, 318, argument); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getexpression", NULL, 316, argument); zephir_check_call_status(); RETURN_MM(); @@ -93024,11 +93343,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getCaseExpression) { zephir_create_array(_4$$4, 3, 0 TSRMLS_CC); add_assoc_stringl_ex(_4$$4, SS("type"), SL("when"), 1); zephir_array_fetch_string(&_6$$4, whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/mvc/model/query.zep", 356 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "_getexpression", &_7, 318, _6$$4); + ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "_getexpression", &_7, 316, _6$$4); zephir_check_call_status(); zephir_array_update_string(&_4$$4, SL("expr"), &_5$$4, PH_COPY | PH_SEPARATE); zephir_array_fetch_string(&_8$$4, whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/mvc/model/query.zep", 357 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "_getexpression", &_7, 318, _8$$4); + ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "_getexpression", &_7, 316, _8$$4); zephir_check_call_status(); zephir_array_update_string(&_4$$4, SL("then"), &_5$$4, PH_COPY | PH_SEPARATE); zephir_array_append(&whenClauses, _4$$4, PH_SEPARATE, "phalcon/mvc/model/query.zep", 358); @@ -93037,7 +93356,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getCaseExpression) { zephir_create_array(_9$$5, 2, 0 TSRMLS_CC); add_assoc_stringl_ex(_9$$5, SS("type"), SL("else"), 1); zephir_array_fetch_string(&_11$$5, whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/mvc/model/query.zep", 362 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_10$$5, this_ptr, "_getexpression", &_7, 318, _11$$5); + ZEPHIR_CALL_METHOD(&_10$$5, this_ptr, "_getexpression", &_7, 316, _11$$5); zephir_check_call_status(); zephir_array_update_string(&_9$$5, SL("expr"), &_10$$5, PH_COPY | PH_SEPARATE); zephir_array_append(&whenClauses, _9$$5, PH_SEPARATE, "phalcon/mvc/model/query.zep", 363); @@ -93046,7 +93365,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getCaseExpression) { zephir_create_array(return_value, 3, 0 TSRMLS_CC); add_assoc_stringl_ex(return_value, SS("type"), SL("case"), 1); zephir_array_fetch_string(&_13, expr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/mvc/model/query.zep", 369 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_12, this_ptr, "_getexpression", &_7, 318, _13); + ZEPHIR_CALL_METHOD(&_12, this_ptr, "_getexpression", &_7, 316, _13); zephir_check_call_status(); zephir_array_update_string(&return_value, SL("expr"), &_12, PH_COPY | PH_SEPARATE); zephir_array_update_string(&return_value, SL("when-clauses"), &whenClauses, PH_COPY | PH_SEPARATE); @@ -93085,13 +93404,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getFunctionCall) { ; zephir_hash_move_forward_ex(_1$$6, &_0$$6) ) { ZEPHIR_GET_HVALUE(argument, _2$$6); - ZEPHIR_CALL_METHOD(&_3$$7, this_ptr, "_getcallargument", &_4, 319, argument); + ZEPHIR_CALL_METHOD(&_3$$7, this_ptr, "_getcallargument", &_4, 317, argument); zephir_check_call_status(); zephir_array_append(&functionArgs, _3$$7, PH_SEPARATE, "phalcon/mvc/model/query.zep", 393); } } else { zephir_create_array(functionArgs, 1, 0 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_5$$8, this_ptr, "_getcallargument", &_4, 319, arguments); + ZEPHIR_CALL_METHOD(&_5$$8, this_ptr, "_getcallargument", &_4, 317, arguments); zephir_check_call_status(); zephir_array_fast_append(functionArgs, _5$$8); } @@ -93160,7 +93479,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getExpression) { } else { ZVAL_BOOL(_0$$5, 0); } - ZEPHIR_CALL_METHOD(&left, this_ptr, "_getexpression", &_1, 318, exprLeft, _0$$5); + ZEPHIR_CALL_METHOD(&left, this_ptr, "_getexpression", &_1, 316, exprLeft, _0$$5); zephir_check_call_status(); } ZEPHIR_OBS_VAR(exprRight); @@ -93171,7 +93490,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getExpression) { } else { ZVAL_BOOL(_2$$6, 0); } - ZEPHIR_CALL_METHOD(&right, this_ptr, "_getexpression", &_1, 318, exprRight, _2$$6); + ZEPHIR_CALL_METHOD(&right, this_ptr, "_getexpression", &_1, 316, exprRight, _2$$6); zephir_check_call_status(); } } @@ -93249,7 +93568,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getExpression) { break; } if (ZEPHIR_IS_LONG(exprType, 355)) { - ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "_getqualified", &_3, 320, expr); + ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "_getqualified", &_3, 318, expr); zephir_check_call_status(); break; } @@ -93694,12 +94013,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getExpression) { break; } if (ZEPHIR_IS_LONG(exprType, 350)) { - ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "_getfunctioncall", NULL, 321, expr); + ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "_getfunctioncall", NULL, 319, expr); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(exprType, 409)) { - ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "_getcaseexpression", NULL, 322, expr); + ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "_getcaseexpression", NULL, 320, expr); zephir_check_call_status(); break; } @@ -93709,7 +94028,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getExpression) { add_assoc_stringl_ex(exprReturn, SS("type"), SL("select"), 1); ZEPHIR_INIT_VAR(_36$$68); ZVAL_BOOL(_36$$68, 1); - ZEPHIR_CALL_METHOD(&_35$$68, this_ptr, "_prepareselect", NULL, 323, expr, _36$$68); + ZEPHIR_CALL_METHOD(&_35$$68, this_ptr, "_prepareselect", NULL, 321, expr, _36$$68); zephir_check_call_status(); zephir_array_update_string(&exprReturn, SL("value"), &_35$$68, PH_COPY | PH_SEPARATE); break; @@ -93728,7 +94047,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getExpression) { RETURN_CCTOR(exprReturn); } if (zephir_array_isset_string(expr, SS("domain"))) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getqualified", &_3, 320, expr); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getqualified", &_3, 318, expr); zephir_check_call_status(); RETURN_MM(); } @@ -93741,7 +94060,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getExpression) { ; zephir_hash_move_forward_ex(_40$$71, &_39$$71) ) { ZEPHIR_GET_HVALUE(exprListItem, _41$$71); - ZEPHIR_CALL_METHOD(&_42$$72, this_ptr, "_getexpression", &_1, 318, exprListItem); + ZEPHIR_CALL_METHOD(&_42$$72, this_ptr, "_getexpression", &_1, 316, exprListItem); zephir_check_call_status(); zephir_array_append(&listItems, _42$$72, PH_SEPARATE, "phalcon/mvc/model/query.zep", 747); } @@ -93862,7 +94181,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getSelectColumn) { add_assoc_stringl_ex(sqlColumn, SS("type"), SL("scalar"), 1); ZEPHIR_OBS_VAR(columnData); zephir_array_fetch_string(&columnData, column, SL("column"), PH_NOISY, "phalcon/mvc/model/query.zep", 873 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&sqlExprColumn, this_ptr, "_getexpression", NULL, 318, columnData); + ZEPHIR_CALL_METHOD(&sqlExprColumn, this_ptr, "_getexpression", NULL, 316, columnData); zephir_check_call_status(); ZEPHIR_OBS_VAR(balias); if (zephir_array_isset_string_fetch(&balias, sqlExprColumn, SS("balias"), 0 TSRMLS_CC)) { @@ -94059,7 +94378,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getSingleJoin) { add_assoc_long_ex(_2$$3, SS("type"), 355); zephir_array_update_string(&_2$$3, SL("domain"), &modelAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_2$$3, SL("name"), &fields, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "_getqualified", &_3, 320, _2$$3); + ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "_getqualified", &_3, 318, _2$$3); zephir_check_call_status(); zephir_array_update_string(&_0$$3, SL("left"), &_1$$3, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_VAR(_4$$3); @@ -94067,7 +94386,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getSingleJoin) { add_assoc_stringl_ex(_4$$3, SS("type"), SL("qualified"), 1); zephir_array_update_string(&_4$$3, SL("domain"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_4$$3, SL("name"), &referencedFields, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "_getqualified", &_3, 320, _4$$3); + ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "_getqualified", &_3, 318, _4$$3); zephir_check_call_status(); zephir_array_update_string(&_0$$3, SL("right"), &_1$$3, PH_COPY | PH_SEPARATE); zephir_array_fast_append(sqlJoinConditions, _0$$3); @@ -94103,7 +94422,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getSingleJoin) { add_assoc_long_ex(_14$$5, SS("type"), 355); zephir_array_update_string(&_14$$5, SL("domain"), &modelAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_14$$5, SL("name"), &field, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_13$$5, this_ptr, "_getqualified", &_3, 320, _14$$5); + ZEPHIR_CALL_METHOD(&_13$$5, this_ptr, "_getqualified", &_3, 318, _14$$5); zephir_check_call_status(); zephir_array_update_string(&_12$$5, SL("left"), &_13$$5, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(_15$$5); @@ -94111,7 +94430,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getSingleJoin) { add_assoc_stringl_ex(_15$$5, SS("type"), SL("qualified"), 1); zephir_array_update_string(&_15$$5, SL("domain"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_15$$5, SL("name"), &referencedField, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_13$$5, this_ptr, "_getqualified", &_3, 320, _15$$5); + ZEPHIR_CALL_METHOD(&_13$$5, this_ptr, "_getqualified", &_3, 318, _15$$5); zephir_check_call_status(); zephir_array_update_string(&_12$$5, SL("right"), &_13$$5, PH_COPY | PH_SEPARATE); zephir_array_append(&sqlJoinPartialConditions, _12$$5, PH_SEPARATE, "phalcon/mvc/model/query.zep", 1078); @@ -94194,7 +94513,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getMultiJoin) { add_assoc_long_ex(_8$$4, SS("type"), 355); zephir_array_update_string(&_8$$4, SL("domain"), &modelAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_8$$4, SL("name"), &field, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "_getqualified", &_9, 320, _8$$4); + ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "_getqualified", &_9, 318, _8$$4); zephir_check_call_status(); zephir_array_update_string(&sqlEqualsJoinCondition, SL("left"), &_7$$4, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(_10$$4); @@ -94202,7 +94521,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getMultiJoin) { add_assoc_stringl_ex(_10$$4, SS("type"), SL("qualified"), 1); zephir_array_update_string(&_10$$4, SL("domain"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_10$$4, SL("name"), &referencedFields, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "_getqualified", &_9, 320, _10$$4); + ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "_getqualified", &_9, 318, _10$$4); zephir_check_call_status(); zephir_array_update_string(&sqlEqualsJoinCondition, SL("right"), &_7$$4, PH_COPY | PH_SEPARATE); } @@ -94224,7 +94543,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getMultiJoin) { add_assoc_long_ex(_15$$6, SS("type"), 355); zephir_array_update_string(&_15$$6, SL("domain"), &modelAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_15$$6, SL("name"), &fields, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_14$$6, this_ptr, "_getqualified", &_9, 320, _15$$6); + ZEPHIR_CALL_METHOD(&_14$$6, this_ptr, "_getqualified", &_9, 318, _15$$6); zephir_check_call_status(); zephir_array_update_string(&_13$$6, SL("left"), &_14$$6, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_VAR(_16$$6); @@ -94232,7 +94551,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getMultiJoin) { add_assoc_stringl_ex(_16$$6, SS("type"), SL("qualified"), 1); zephir_array_update_string(&_16$$6, SL("domain"), &intermediateModelName, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_16$$6, SL("name"), &intermediateFields, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_14$$6, this_ptr, "_getqualified", &_9, 320, _16$$6); + ZEPHIR_CALL_METHOD(&_14$$6, this_ptr, "_getqualified", &_9, 318, _16$$6); zephir_check_call_status(); zephir_array_update_string(&_13$$6, SL("right"), &_14$$6, PH_COPY | PH_SEPARATE); zephir_array_fast_append(_12$$6, _13$$6); @@ -94253,7 +94572,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getMultiJoin) { add_assoc_long_ex(_17$$6, SS("type"), 355); zephir_array_update_string(&_17$$6, SL("domain"), &intermediateModelName, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_17$$6, SL("name"), &intermediateReferencedFields, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_14$$6, this_ptr, "_getqualified", &_9, 320, _17$$6); + ZEPHIR_CALL_METHOD(&_14$$6, this_ptr, "_getqualified", &_9, 318, _17$$6); zephir_check_call_status(); zephir_array_update_string(&_13$$6, SL("left"), &_14$$6, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_VAR(_18$$6); @@ -94261,7 +94580,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getMultiJoin) { add_assoc_stringl_ex(_18$$6, SS("type"), SL("qualified"), 1); zephir_array_update_string(&_18$$6, SL("domain"), &referencedModelName, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_18$$6, SL("name"), &referencedFields, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_14$$6, this_ptr, "_getqualified", &_9, 320, _18$$6); + ZEPHIR_CALL_METHOD(&_14$$6, this_ptr, "_getqualified", &_9, 318, _18$$6); zephir_check_call_status(); zephir_array_update_string(&_13$$6, SL("right"), &_14$$6, PH_COPY | PH_SEPARATE); zephir_array_fast_append(_12$$6, _13$$6); @@ -94337,7 +94656,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getJoins) { ; zephir_hash_move_forward_ex(_1, &_0) ) { ZEPHIR_GET_HVALUE(joinItem, _2); - ZEPHIR_CALL_METHOD(&joinData, this_ptr, "_getjoin", &_3, 324, manager, joinItem); + ZEPHIR_CALL_METHOD(&joinData, this_ptr, "_getjoin", &_3, 322, manager, joinItem); zephir_check_call_status(); ZEPHIR_OBS_NVAR(source); zephir_array_fetch_string(&source, joinData, SL("source"), PH_NOISY, "phalcon/mvc/model/query.zep", 1317 TSRMLS_CC); @@ -94351,7 +94670,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getJoins) { zephir_create_array(completeSource, 2, 0 TSRMLS_CC); zephir_array_fast_append(completeSource, source); zephir_array_fast_append(completeSource, schema); - ZEPHIR_CALL_METHOD(&joinType, this_ptr, "_getjointype", &_4, 325, joinItem); + ZEPHIR_CALL_METHOD(&joinType, this_ptr, "_getjointype", &_4, 323, joinItem); zephir_check_call_status(); ZEPHIR_OBS_NVAR(aliasExpr); if (zephir_array_isset_string_fetch(&aliasExpr, joinItem, SS("alias"), 0 TSRMLS_CC)) { @@ -94419,7 +94738,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getJoins) { ZEPHIR_GET_HVALUE(joinItem, _14); ZEPHIR_OBS_NVAR(joinExpr); if (zephir_array_isset_string_fetch(&joinExpr, joinItem, SS("conditions"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_15$$13, this_ptr, "_getexpression", &_16, 318, joinExpr); + ZEPHIR_CALL_METHOD(&_15$$13, this_ptr, "_getexpression", &_16, 316, joinExpr); zephir_check_call_status(); zephir_array_update_zval(&joinPreCondition, joinAliasName, &_15$$13, PH_COPY | PH_SEPARATE); } @@ -94516,10 +94835,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getJoins) { ZEPHIR_CALL_METHOD(&_41$$23, relation, "isthrough", NULL, 0); zephir_check_call_status(); if (!(zephir_is_true(_41$$23))) { - ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "_getsinglejoin", &_42, 326, joinType, joinSource, modelAlias, joinAlias, relation); + ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "_getsinglejoin", &_42, 324, joinType, joinSource, modelAlias, joinAlias, relation); zephir_check_call_status(); } else { - ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "_getmultijoin", &_43, 327, joinType, joinSource, modelAlias, joinAlias, relation); + ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "_getmultijoin", &_43, 325, joinType, joinSource, modelAlias, joinAlias, relation); zephir_check_call_status(); } if (zephir_array_isset_long(sqlJoin, 0)) { @@ -94590,7 +94909,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getOrderClause) { ) { ZEPHIR_GET_HVALUE(orderItem, _2); zephir_array_fetch_string(&_3$$5, orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/mvc/model/query.zep", 1627 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "_getexpression", &_4, 318, _3$$5); + ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "_getexpression", &_4, 316, _3$$5); zephir_check_call_status(); if (zephir_array_isset_string_fetch(&orderSort, orderItem, SS("sort"), 1 TSRMLS_CC)) { ZEPHIR_INIT_NVAR(orderPartSort); @@ -94642,13 +94961,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getGroupClause) { ; zephir_hash_move_forward_ex(_1$$3, &_0$$3) ) { ZEPHIR_GET_HVALUE(groupItem, _2$$3); - ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "_getexpression", &_4, 318, groupItem); + ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "_getexpression", &_4, 316, groupItem); zephir_check_call_status(); zephir_array_append(&groupParts, _3$$4, PH_SEPARATE, "phalcon/mvc/model/query.zep", 1661); } } else { zephir_create_array(groupParts, 1, 0 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_5$$5, this_ptr, "_getexpression", &_4, 318, group); + ZEPHIR_CALL_METHOD(&_5$$5, this_ptr, "_getexpression", &_4, 316, group); zephir_check_call_status(); zephir_array_fast_append(groupParts, _5$$5); } @@ -94673,13 +94992,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getLimitClause) { array_init(limit); ZEPHIR_OBS_VAR(number); if (zephir_array_isset_string_fetch(&number, limitClause, SS("number"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "_getexpression", &_1, 318, number); + ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "_getexpression", &_1, 316, number); zephir_check_call_status(); zephir_array_update_string(&limit, SL("number"), &_0$$3, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_VAR(offset); if (zephir_array_isset_string_fetch(&offset, limitClause, SS("offset"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "_getexpression", &_1, 318, offset); + ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "_getexpression", &_1, 316, offset); zephir_check_call_status(); zephir_array_update_string(&limit, SL("offset"), &_2$$4, PH_COPY | PH_SEPARATE); } @@ -95002,12 +95321,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) { zephir_array_update_string(&select, SL("joins"), &automaticJoins, PH_COPY | PH_SEPARATE); } } - ZEPHIR_CALL_METHOD(&sqlJoins, this_ptr, "_getjoins", &_41, 328, select); + ZEPHIR_CALL_METHOD(&sqlJoins, this_ptr, "_getjoins", &_41, 326, select); zephir_check_call_status(); } else { if (zephir_fast_count_int(automaticJoins TSRMLS_CC)) { zephir_array_update_string(&select, SL("joins"), &automaticJoins, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&sqlJoins, this_ptr, "_getjoins", &_41, 328, select); + ZEPHIR_CALL_METHOD(&sqlJoins, this_ptr, "_getjoins", &_41, 326, select); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(sqlJoins); @@ -95023,7 +95342,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) { ; zephir_hash_move_forward_ex(_43, &_42) ) { ZEPHIR_GET_HVALUE(column, _44); - ZEPHIR_CALL_METHOD(&_45$$41, this_ptr, "_getselectcolumn", &_46, 329, column); + ZEPHIR_CALL_METHOD(&_45$$41, this_ptr, "_getselectcolumn", &_46, 327, column); zephir_check_call_status(); zephir_is_iterable(_45$$41, &_48$$41, &_47$$41, 0, 0, "phalcon/mvc/model/query.zep", 1999); for ( @@ -95072,31 +95391,31 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) { } ZEPHIR_OBS_VAR(where); if (zephir_array_isset_string_fetch(&where, ast, SS("where"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_53$$51, this_ptr, "_getexpression", &_54, 318, where); + ZEPHIR_CALL_METHOD(&_53$$51, this_ptr, "_getexpression", &_54, 316, where); zephir_check_call_status(); zephir_array_update_string(&sqlSelect, SL("where"), &_53$$51, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_VAR(groupBy); if (zephir_array_isset_string_fetch(&groupBy, ast, SS("groupBy"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_55$$52, this_ptr, "_getgroupclause", NULL, 330, groupBy); + ZEPHIR_CALL_METHOD(&_55$$52, this_ptr, "_getgroupclause", NULL, 328, groupBy); zephir_check_call_status(); zephir_array_update_string(&sqlSelect, SL("group"), &_55$$52, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_VAR(having); if (zephir_array_isset_string_fetch(&having, ast, SS("having"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_56$$53, this_ptr, "_getexpression", &_54, 318, having); + ZEPHIR_CALL_METHOD(&_56$$53, this_ptr, "_getexpression", &_54, 316, having); zephir_check_call_status(); zephir_array_update_string(&sqlSelect, SL("having"), &_56$$53, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_VAR(order); if (zephir_array_isset_string_fetch(&order, ast, SS("orderBy"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_57$$54, this_ptr, "_getorderclause", NULL, 331, order); + ZEPHIR_CALL_METHOD(&_57$$54, this_ptr, "_getorderclause", NULL, 329, order); zephir_check_call_status(); zephir_array_update_string(&sqlSelect, SL("order"), &_57$$54, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_VAR(limit); if (zephir_array_isset_string_fetch(&limit, ast, SS("limit"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_58$$55, this_ptr, "_getlimitclause", NULL, 332, limit); + ZEPHIR_CALL_METHOD(&_58$$55, this_ptr, "_getlimitclause", NULL, 330, limit); zephir_check_call_status(); zephir_array_update_string(&sqlSelect, SL("limit"), &_58$$55, PH_COPY | PH_SEPARATE); } @@ -95194,7 +95513,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) { } else { ZVAL_BOOL(_11$$9, 0); } - ZEPHIR_CALL_METHOD(&_10$$9, this_ptr, "_getexpression", &_12, 318, exprValue, _11$$9); + ZEPHIR_CALL_METHOD(&_10$$9, this_ptr, "_getexpression", &_12, 316, exprValue, _11$$9); zephir_check_call_status(); zephir_array_update_string(&_8$$9, SL("value"), &_10$$9, PH_COPY | PH_SEPARATE); zephir_array_append(&exprValues, _8$$9, PH_SEPARATE, "phalcon/mvc/model/query.zep", 2114); @@ -95375,7 +95694,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) { } else { ZVAL_BOOL(_14$$17, 0); } - ZEPHIR_CALL_METHOD(&_12$$17, this_ptr, "_getexpression", &_15, 318, _13$$17, _14$$17); + ZEPHIR_CALL_METHOD(&_12$$17, this_ptr, "_getexpression", &_15, 316, _13$$17, _14$$17); zephir_check_call_status(); zephir_array_append(&sqlFields, _12$$17, PH_SEPARATE, "phalcon/mvc/model/query.zep", 2262); ZEPHIR_OBS_NVAR(exprColumn); @@ -95391,7 +95710,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) { } else { ZVAL_BOOL(_19$$17, 0); } - ZEPHIR_CALL_METHOD(&_18$$17, this_ptr, "_getexpression", &_15, 318, exprColumn, _19$$17); + ZEPHIR_CALL_METHOD(&_18$$17, this_ptr, "_getexpression", &_15, 316, exprColumn, _19$$17); zephir_check_call_status(); zephir_array_update_string(&_16$$17, SL("value"), &_18$$17, PH_COPY | PH_SEPARATE); zephir_array_append(&sqlValues, _16$$17, PH_SEPARATE, "phalcon/mvc/model/query.zep", 2267); @@ -95406,13 +95725,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) { if (zephir_array_isset_string_fetch(&where, ast, SS("where"), 0 TSRMLS_CC)) { ZEPHIR_INIT_VAR(_21$$18); ZVAL_BOOL(_21$$18, 1); - ZEPHIR_CALL_METHOD(&_20$$18, this_ptr, "_getexpression", &_15, 318, where, _21$$18); + ZEPHIR_CALL_METHOD(&_20$$18, this_ptr, "_getexpression", &_15, 316, where, _21$$18); zephir_check_call_status(); zephir_array_update_string(&sqlUpdate, SL("where"), &_20$$18, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_VAR(limit); if (zephir_array_isset_string_fetch(&limit, ast, SS("limit"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_22$$19, this_ptr, "_getlimitclause", NULL, 332, limit); + ZEPHIR_CALL_METHOD(&_22$$19, this_ptr, "_getlimitclause", NULL, 330, limit); zephir_check_call_status(); zephir_array_update_string(&sqlUpdate, SL("limit"), &_22$$19, PH_COPY | PH_SEPARATE); } @@ -95531,13 +95850,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete) { if (zephir_array_isset_string_fetch(&where, ast, SS("where"), 0 TSRMLS_CC)) { ZEPHIR_INIT_VAR(_10$$14); ZVAL_BOOL(_10$$14, 1); - ZEPHIR_CALL_METHOD(&_9$$14, this_ptr, "_getexpression", NULL, 318, where, _10$$14); + ZEPHIR_CALL_METHOD(&_9$$14, this_ptr, "_getexpression", NULL, 316, where, _10$$14); zephir_check_call_status(); zephir_array_update_string(&sqlDelete, SL("where"), &_9$$14, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_VAR(limit); if (zephir_array_isset_string_fetch(&limit, ast, SS("limit"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_11$$15, this_ptr, "_getlimitclause", NULL, 332, limit); + ZEPHIR_CALL_METHOD(&_11$$15, this_ptr, "_getlimitclause", NULL, 330, limit); zephir_check_call_status(); zephir_array_update_string(&sqlDelete, SL("limit"), &_11$$15, PH_COPY | PH_SEPARATE); } @@ -95585,22 +95904,22 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, parse) { zephir_update_property_this(this_ptr, SL("_type"), type TSRMLS_CC); do { if (ZEPHIR_IS_LONG(type, 309)) { - ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareselect", NULL, 323); + ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareselect", NULL, 321); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(type, 306)) { - ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareinsert", NULL, 333); + ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareinsert", NULL, 331); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(type, 300)) { - ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareupdate", NULL, 334); + ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareupdate", NULL, 332); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(type, 303)) { - ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_preparedelete", NULL, 335); + ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_preparedelete", NULL, 333); zephir_check_call_status(); break; } @@ -96000,12 +96319,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _executeSelect) { } else { ZVAL_BOOL(_55$$53, 0); } - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 336, simpleColumnMap, resultObject, resultData, cache, _55$$53); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 334, simpleColumnMap, resultObject, resultData, cache, _55$$53); zephir_check_call_status(); RETURN_MM(); } object_init_ex(return_value, phalcon_mvc_model_resultset_complex_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 337, columns1, resultData, cache); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 335, columns1, resultData, cache); zephir_check_call_status(); RETURN_MM(); @@ -96165,7 +96484,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _executeInsert) { object_init_ex(return_value, phalcon_mvc_model_query_status_ce); ZEPHIR_CALL_METHOD(&_20, insertModel, "create", NULL, 0, insertValues); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 338, _20, insertModel); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 336, _20, insertModel); zephir_check_call_status(); RETURN_MM(); @@ -96296,13 +96615,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _executeUpdate) { zephir_array_update_zval(&updateValues, fieldName, &updateValue, PH_COPY | PH_SEPARATE); } - ZEPHIR_CALL_METHOD(&records, this_ptr, "_getrelatedrecords", NULL, 339, model, intermediate, selectBindParams, selectBindTypes); + ZEPHIR_CALL_METHOD(&records, this_ptr, "_getrelatedrecords", NULL, 337, model, intermediate, selectBindParams, selectBindTypes); zephir_check_call_status(); if (!(zephir_fast_count_int(records TSRMLS_CC))) { object_init_ex(return_value, phalcon_mvc_model_query_status_ce); ZEPHIR_INIT_VAR(_17$$19); ZVAL_BOOL(_17$$19, 1); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_18, 338, _17$$19); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_18, 336, _17$$19); zephir_check_call_status(); RETURN_MM(); } @@ -96335,7 +96654,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _executeUpdate) { object_init_ex(return_value, phalcon_mvc_model_query_status_ce); ZEPHIR_INIT_NVAR(_22$$24); ZVAL_BOOL(_22$$24, 0); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_18, 338, _22$$24, record); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_18, 336, _22$$24, record); zephir_check_call_status(); RETURN_MM(); } @@ -96346,7 +96665,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _executeUpdate) { object_init_ex(return_value, phalcon_mvc_model_query_status_ce); ZEPHIR_INIT_VAR(_23); ZVAL_BOOL(_23, 1); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_18, 338, _23); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_18, 336, _23); zephir_check_call_status(); RETURN_MM(); @@ -96379,13 +96698,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _executeDelete) { ZEPHIR_CALL_METHOD(&model, _1$$4, "load", NULL, 0, modelName); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&records, this_ptr, "_getrelatedrecords", NULL, 339, model, intermediate, bindParams, bindTypes); + ZEPHIR_CALL_METHOD(&records, this_ptr, "_getrelatedrecords", NULL, 337, model, intermediate, bindParams, bindTypes); zephir_check_call_status(); if (!(zephir_fast_count_int(records TSRMLS_CC))) { object_init_ex(return_value, phalcon_mvc_model_query_status_ce); ZEPHIR_INIT_VAR(_2$$5); ZVAL_BOOL(_2$$5, 1); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_3, 338, _2$$5); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_3, 336, _2$$5); zephir_check_call_status(); RETURN_MM(); } @@ -96418,7 +96737,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _executeDelete) { object_init_ex(return_value, phalcon_mvc_model_query_status_ce); ZEPHIR_INIT_NVAR(_7$$10); ZVAL_BOOL(_7$$10, 0); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_3, 338, _7$$10, record); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_3, 336, _7$$10, record); zephir_check_call_status(); RETURN_MM(); } @@ -96429,7 +96748,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _executeDelete) { object_init_ex(return_value, phalcon_mvc_model_query_status_ce); ZEPHIR_INIT_VAR(_8); ZVAL_BOOL(_8, 1); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_3, 338, _8); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_3, 336, _8); zephir_check_call_status(); RETURN_MM(); @@ -96477,18 +96796,18 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getRelatedRecords) { } ZEPHIR_INIT_VAR(query); object_init_ex(query, phalcon_mvc_model_query_ce); - ZEPHIR_CALL_METHOD(NULL, query, "__construct", NULL, 340); + ZEPHIR_CALL_METHOD(NULL, query, "__construct", NULL, 338); zephir_check_call_status(); _5 = zephir_fetch_nproperty_this(this_ptr, SL("_dependencyInjector"), PH_NOISY_CC); - ZEPHIR_CALL_METHOD(NULL, query, "setdi", NULL, 341, _5); + ZEPHIR_CALL_METHOD(NULL, query, "setdi", NULL, 339, _5); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_2); ZVAL_LONG(_2, 309); - ZEPHIR_CALL_METHOD(NULL, query, "settype", NULL, 342, _2); + ZEPHIR_CALL_METHOD(NULL, query, "settype", NULL, 340, _2); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, query, "setintermediate", NULL, 343, selectIr); + ZEPHIR_CALL_METHOD(NULL, query, "setintermediate", NULL, 341, selectIr); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(query, "execute", NULL, 344, bindParams, bindTypes); + ZEPHIR_RETURN_CALL_METHOD(query, "execute", NULL, 342, bindParams, bindTypes); zephir_check_call_status(); RETURN_MM(); @@ -96609,22 +96928,22 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, execute) { zephir_read_property_this(&type, this_ptr, SL("_type"), PH_NOISY_CC); do { if (ZEPHIR_IS_LONG(type, 309)) { - ZEPHIR_CALL_METHOD(&result, this_ptr, "_executeselect", NULL, 345, intermediate, mergedParams, mergedTypes); + ZEPHIR_CALL_METHOD(&result, this_ptr, "_executeselect", NULL, 343, intermediate, mergedParams, mergedTypes); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(type, 306)) { - ZEPHIR_CALL_METHOD(&result, this_ptr, "_executeinsert", NULL, 346, intermediate, mergedParams, mergedTypes); + ZEPHIR_CALL_METHOD(&result, this_ptr, "_executeinsert", NULL, 344, intermediate, mergedParams, mergedTypes); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(type, 300)) { - ZEPHIR_CALL_METHOD(&result, this_ptr, "_executeupdate", NULL, 347, intermediate, mergedParams, mergedTypes); + ZEPHIR_CALL_METHOD(&result, this_ptr, "_executeupdate", NULL, 345, intermediate, mergedParams, mergedTypes); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(type, 303)) { - ZEPHIR_CALL_METHOD(&result, this_ptr, "_executedelete", NULL, 348, intermediate, mergedParams, mergedTypes); + ZEPHIR_CALL_METHOD(&result, this_ptr, "_executedelete", NULL, 346, intermediate, mergedParams, mergedTypes); zephir_check_call_status(); break; } @@ -96679,7 +96998,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleResult) { zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&_1, this_ptr, "execute", NULL, 344, bindParams, bindTypes); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "execute", NULL, 342, bindParams, bindTypes); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(_1, "getfirst", NULL, 0); zephir_check_call_status(); @@ -96876,7 +97195,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSql) { _2$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_bindTypes"), PH_NOISY_CC); ZEPHIR_INIT_VAR(_3$$3); ZVAL_BOOL(_3$$3, 1); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_executeselect", NULL, 345, intermediate, _1$$3, _2$$3, _3$$3); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_executeselect", NULL, 343, intermediate, _1$$3, _2$$3, _3$$3); zephir_check_call_status(); RETURN_MM(); } @@ -98278,7 +98597,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Transaction, rollback) { ZEPHIR_INIT_VAR(_5$$4); object_init_ex(_5$$4, phalcon_mvc_model_transaction_failed_ce); _6$$4 = zephir_fetch_nproperty_this(this_ptr, SL("_rollbackRecord"), PH_NOISY_CC); - ZEPHIR_CALL_METHOD(NULL, _5$$4, "__construct", NULL, 353, rollbackMessage, _6$$4); + ZEPHIR_CALL_METHOD(NULL, _5$$4, "__construct", NULL, 351, rollbackMessage, _6$$4); zephir_check_call_status(); zephir_throw_exception_debug(_5$$4, "phalcon/mvc/model/transaction.zep", 160 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -98297,7 +98616,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Transaction, getConnection) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_rollbackOnAbort"), PH_NOISY_CC); if (zephir_is_true(_0)) { - ZEPHIR_CALL_FUNCTION(&_1$$3, "connection_aborted", NULL, 354); + ZEPHIR_CALL_FUNCTION(&_1$$3, "connection_aborted", NULL, 352); zephir_check_call_status(); if (zephir_is_true(_1$$3)) { ZEPHIR_INIT_VAR(_2$$4); @@ -98351,9 +98670,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Transaction, isManaged) { zval *_0; + ZEPHIR_MM_GROW(); - _0 = zephir_fetch_nproperty_this(this_ptr, SL("_manager"), PH_NOISY_CC); - RETURN_BOOL(!zephir_is_true(_0)); + ZEPHIR_OBS_VAR(_0); + zephir_read_property_this(&_0, this_ptr, SL("_manager"), PH_NOISY_CC); + RETURN_MM_BOOL(Z_TYPE_P(_0) == IS_OBJECT); } @@ -98667,7 +98988,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Validator, isSetOption) { } -static zend_object_value zephir_init_properties_Phalcon_Mvc_Model_Validator(zend_class_entry *class_type TSRMLS_DC) { +zend_object_value zephir_init_properties_Phalcon_Mvc_Model_Validator(zend_class_entry *class_type TSRMLS_DC) { zval *_0, *_1$$3; @@ -98873,7 +99194,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Behavior_Timestampable, notify) { ZVAL_NULL(timestamp); ZEPHIR_OBS_VAR(format); if (zephir_array_isset_string_fetch(&format, options, SS("format"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_FUNCTION(×tamp, "date", NULL, 294, format); + ZEPHIR_CALL_FUNCTION(×tamp, "date", NULL, 289, format); zephir_check_call_status(); } else { ZEPHIR_OBS_VAR(generator); @@ -99222,9 +99543,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData_Libmemcached, __construct) { ZEPHIR_OBS_VAR(_4); zephir_read_property_this(&_4, this_ptr, SL("_ttl"), PH_NOISY_CC); zephir_array_update_string(&_3, SL("lifetime"), &_4, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, _2, "__construct", NULL, 313, _3); + ZEPHIR_CALL_METHOD(NULL, _2, "__construct", NULL, 311, _3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, _1, "__construct", NULL, 314, _2, options); + ZEPHIR_CALL_METHOD(NULL, _1, "__construct", NULL, 312, _2, options); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_memcache"), _1 TSRMLS_CC); ZEPHIR_INIT_VAR(_5); @@ -99321,7 +99642,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData_Libmemcached, reset) { zephir_check_call_status(); } } - ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_model_metadata_libmemcached_ce, this_ptr, "reset", &_5, 315); + ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_model_metadata_libmemcached_ce, this_ptr, "reset", &_5, 313); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -99405,9 +99726,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData_Memcache, __construct) { ZEPHIR_OBS_VAR(_7); zephir_read_property_this(&_7, this_ptr, SL("_ttl"), PH_NOISY_CC); zephir_array_update_string(&_6, SL("lifetime"), &_7, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, _5, "__construct", NULL, 313, _6); + ZEPHIR_CALL_METHOD(NULL, _5, "__construct", NULL, 311, _6); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, _4, "__construct", NULL, 316, _5, options); + ZEPHIR_CALL_METHOD(NULL, _4, "__construct", NULL, 314, _5, options); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_memcache"), _4 TSRMLS_CC); ZEPHIR_INIT_VAR(_8); @@ -99504,7 +99825,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData_Memcache, reset) { zephir_check_call_status(); } } - ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_model_metadata_memcache_ce, this_ptr, "reset", &_5, 315); + ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_model_metadata_memcache_ce, this_ptr, "reset", &_5, 313); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -99677,9 +99998,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData_Redis, __construct) { ZEPHIR_OBS_VAR(_7); zephir_read_property_this(&_7, this_ptr, SL("_ttl"), PH_NOISY_CC); zephir_array_update_string(&_6, SL("lifetime"), &_7, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, _5, "__construct", NULL, 313, _6); + ZEPHIR_CALL_METHOD(NULL, _5, "__construct", NULL, 311, _6); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, _4, "__construct", NULL, 317, _5, options); + ZEPHIR_CALL_METHOD(NULL, _4, "__construct", NULL, 315, _5, options); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_redis"), _4 TSRMLS_CC); ZEPHIR_INIT_VAR(_8); @@ -99776,7 +100097,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData_Redis, reset) { zephir_check_call_status(); } } - ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_model_metadata_redis_ce, this_ptr, "reset", &_5, 315); + ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_model_metadata_redis_ce, this_ptr, "reset", &_5, 313); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -102103,7 +102424,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getQuery) { ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&phql, this_ptr, "getphql", NULL, 349); + ZEPHIR_CALL_METHOD(&phql, this_ptr, "getphql", NULL, 347); zephir_check_call_status(); _0 = zephir_fetch_nproperty_this(this_ptr, SL("_dependencyInjector"), PH_NOISY_CC); ZEPHIR_CPY_WRT(dependencyInjector, _0); @@ -112092,7 +112413,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, __construct) { zephir_update_property_this(this_ptr, SL("_columnTypes"), columnTypes TSRMLS_CC); - ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_model_resultset_complex_ce, this_ptr, "__construct", &_0, 350, result, cache); + ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_model_resultset_complex_ce, this_ptr, "__construct", &_0, 348, result, cache); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -112417,7 +112738,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, __construct) { zephir_update_property_this(this_ptr, SL("_model"), model TSRMLS_CC); zephir_update_property_this(this_ptr, SL("_columnMap"), columnMap TSRMLS_CC); zephir_update_property_this(this_ptr, SL("_keepSnapshots"), keepSnapshots TSRMLS_CC); - ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_model_resultset_simple_ce, this_ptr, "__construct", &_0, 350, result, cache); + ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_model_resultset_simple_ce, this_ptr, "__construct", &_0, 348, result, cache); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -112476,12 +112797,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, current) { _8$$9 = zephir_fetch_nproperty_this(this_ptr, SL("_keepSnapshots"), PH_NOISY_CC); ZEPHIR_INIT_VAR(_9$$9); ZVAL_LONG(_9$$9, 0); - ZEPHIR_CALL_CE_STATIC(&activeRow, phalcon_mvc_model_ce, "cloneresultmap", &_6, 351, _7$$9, row, columnMap, _9$$9, _8$$9); + ZEPHIR_CALL_CE_STATIC(&activeRow, phalcon_mvc_model_ce, "cloneresultmap", &_6, 349, _7$$9, row, columnMap, _9$$9, _8$$9); zephir_check_call_status(); } break; } - ZEPHIR_CALL_CE_STATIC(&activeRow, phalcon_mvc_model_ce, "cloneresultmaphydrate", &_10, 352, row, columnMap, hydrateMode); + ZEPHIR_CALL_CE_STATIC(&activeRow, phalcon_mvc_model_ce, "cloneresultmaphydrate", &_10, 350, row, columnMap, hydrateMode); zephir_check_call_status(); break; } while(0); @@ -112953,7 +113274,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Transaction_Manager, get) { ZEPHIR_INIT_VAR(_3$$4); ZVAL_STRING(_3$$4, "rollbackPendent", 1); zephir_array_fast_append(_2$$4, _3$$4); - ZEPHIR_CALL_FUNCTION(NULL, "register_shutdown_function", NULL, 355, _2$$4); + ZEPHIR_CALL_FUNCTION(NULL, "register_shutdown_function", NULL, 353, _2$$4); zephir_check_call_status(); } if (1) { @@ -113028,9 +113349,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Transaction_Manager, getOrCreateTransaction) } else { ZVAL_BOOL(_6, 0); } - ZEPHIR_CALL_METHOD(NULL, transaction, "__construct", NULL, 356, dependencyInjector, _6, _5); + ZEPHIR_CALL_METHOD(NULL, transaction, "__construct", NULL, 354, dependencyInjector, _6, _5); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, transaction, "settransactionmanager", NULL, 357, this_ptr); + ZEPHIR_CALL_METHOD(NULL, transaction, "settransactionmanager", NULL, 355, this_ptr); zephir_check_call_status(); zephir_update_property_array_append(this_ptr, SL("_transactions"), transaction TSRMLS_CC); RETURN_ON_FAILURE(zephir_property_incr(this_ptr, SL("_number") TSRMLS_CC)); @@ -113316,7 +113637,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Validator_Email, validate) { } ZEPHIR_SINIT_VAR(_3); ZVAL_LONG(&_3, 274); - ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 193, value, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 188, value, &_3); zephir_check_call_status(); if (!(zephir_is_true(_4))) { ZEPHIR_INIT_VAR(_5$$5); @@ -113543,7 +113864,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Validator_Inclusionin, validate) { zephir_check_temp_parameter(_5$$7); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_6, "in_array", NULL, 358, value, domain, strict); + ZEPHIR_CALL_FUNCTION(&_6, "in_array", NULL, 356, value, domain, strict); zephir_check_call_status(); if (!(zephir_is_true(_6))) { ZEPHIR_INIT_VAR(_7$$9); @@ -113682,7 +114003,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Validator_Ip, validate) { zephir_array_update_string(&options, SL("flags"), &_8, PH_COPY | PH_SEPARATE); ZEPHIR_SINIT_NVAR(_7); ZVAL_LONG(&_7, 275); - ZEPHIR_CALL_FUNCTION(&_9, "filter_var", NULL, 193, value, &_7, options); + ZEPHIR_CALL_FUNCTION(&_9, "filter_var", NULL, 188, value, &_7, options); zephir_check_call_status(); if (!(zephir_is_true(_9))) { ZEPHIR_INIT_VAR(_10$$5); @@ -114060,7 +114381,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Validator_StringLength, validate) { RETURN_MM_BOOL(1); } if ((zephir_function_exists_ex(SS("mb_strlen") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 359, value); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 357, value); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(length); @@ -114447,7 +114768,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Validator_Url, validate) { } ZEPHIR_SINIT_VAR(_3); ZVAL_LONG(&_3, 273); - ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 193, value, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 188, value, &_3); zephir_check_call_status(); if (!(zephir_is_true(_4))) { ZEPHIR_INIT_VAR(_5$$5); @@ -114495,8 +114816,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Router_Annotations) { zend_declare_property_null(phalcon_mvc_router_annotations_ce, SL("_handlers"), ZEND_ACC_PROTECTED TSRMLS_CC); - zend_declare_property_bool(phalcon_mvc_router_annotations_ce, SL("_processed"), 0, ZEND_ACC_PROTECTED TSRMLS_CC); - zend_declare_property_string(phalcon_mvc_router_annotations_ce, SL("_controllerSuffix"), "Controller", ZEND_ACC_PROTECTED TSRMLS_CC); zend_declare_property_string(phalcon_mvc_router_annotations_ce, SL("_actionSuffix"), "Action", ZEND_ACC_PROTECTED TSRMLS_CC); @@ -114548,11 +114867,6 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, addResource) { zephir_array_fast_append(_0, prefix); zephir_array_fast_append(_0, handler); zephir_update_property_array_append(this_ptr, SL("_handlers"), _0 TSRMLS_CC); - if (0) { - zephir_update_property_this(this_ptr, SL("_processed"), ZEPHIR_GLOBAL(global_true) TSRMLS_CC); - } else { - zephir_update_property_this(this_ptr, SL("_processed"), ZEPHIR_GLOBAL(global_false) TSRMLS_CC); - } RETURN_THIS(); } @@ -114609,22 +114923,17 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, addModuleResource) { zephir_array_fast_append(_0, handler); zephir_array_fast_append(_0, module); zephir_update_property_array_append(this_ptr, SL("_handlers"), _0 TSRMLS_CC); - if (0) { - zephir_update_property_this(this_ptr, SL("_processed"), ZEPHIR_GLOBAL(global_true) TSRMLS_CC); - } else { - zephir_update_property_this(this_ptr, SL("_processed"), ZEPHIR_GLOBAL(global_false) TSRMLS_CC); - } RETURN_THIS(); } static PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) { - HashTable *_2$$6, *_7$$17, *_11$$19, *_15$$21; - HashPosition _1$$6, _6$$17, _10$$19, _14$$21; - zephir_fcall_cache_entry *_9 = NULL, *_17 = NULL, *_18 = NULL; + HashTable *_1$$5, *_6$$16, *_10$$18, *_14$$20; + HashPosition _0$$5, _5$$16, _9$$18, _13$$20; + zephir_fcall_cache_entry *_8 = NULL, *_16 = NULL, *_17 = NULL; int ZEPHIR_LAST_CALL_STATUS; - zval *uri_param = NULL, *realUri = NULL, *annotationsService = NULL, *handlers = NULL, *controllerSuffix = NULL, *scope = NULL, *prefix = NULL, *dependencyInjector = NULL, *handler = NULL, *controllerName = NULL, *lowerControllerName = NULL, *namespaceName = NULL, *moduleName = NULL, *sufixed = NULL, *handlerAnnotations = NULL, *classAnnotations = NULL, *annotations = NULL, *annotation = NULL, *methodAnnotations = NULL, *lowercased = NULL, *method = NULL, *collection = NULL, *_0, **_3$$6, *_4$$11, *_5$$11 = NULL, **_8$$17, **_12$$19, *_13$$21 = NULL, **_16$$21; + zval *uri_param = NULL, *realUri = NULL, *annotationsService = NULL, *handlers = NULL, *controllerSuffix = NULL, *scope = NULL, *prefix = NULL, *dependencyInjector = NULL, *handler = NULL, *controllerName = NULL, *lowerControllerName = NULL, *namespaceName = NULL, *moduleName = NULL, *sufixed = NULL, *handlerAnnotations = NULL, *classAnnotations = NULL, *annotations = NULL, *annotation = NULL, *methodAnnotations = NULL, *lowercased = NULL, *method = NULL, *collection = NULL, **_2$$5, *_3$$10, *_4$$10 = NULL, **_7$$16, **_11$$18, *_12$$20 = NULL, **_15$$20; zval *uri = NULL; ZEPHIR_MM_GROW(); @@ -114653,107 +114962,104 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) { } else { ZEPHIR_CPY_WRT(realUri, uri); } - _0 = zephir_fetch_nproperty_this(this_ptr, SL("_processed"), PH_NOISY_CC); - if (!(zephir_is_true(_0))) { - ZEPHIR_INIT_VAR(annotationsService); - ZVAL_NULL(annotationsService); - ZEPHIR_OBS_VAR(handlers); - zephir_read_property_this(&handlers, this_ptr, SL("_handlers"), PH_NOISY_CC); - if (Z_TYPE_P(handlers) == IS_ARRAY) { - ZEPHIR_OBS_VAR(controllerSuffix); - zephir_read_property_this(&controllerSuffix, this_ptr, SL("_controllerSuffix"), PH_NOISY_CC); - zephir_is_iterable(handlers, &_2$$6, &_1$$6, 0, 0, "phalcon/mvc/router/annotations.zep", 208); - for ( - ; zephir_hash_get_current_data_ex(_2$$6, (void**) &_3$$6, &_1$$6) == SUCCESS - ; zephir_hash_move_forward_ex(_2$$6, &_1$$6) - ) { - ZEPHIR_GET_HVALUE(scope, _3$$6); - if (Z_TYPE_P(scope) == IS_ARRAY) { - ZEPHIR_OBS_NVAR(prefix); - zephir_array_fetch_long(&prefix, scope, 0, PH_NOISY, "phalcon/mvc/router/annotations.zep", 117 TSRMLS_CC); - if (!(ZEPHIR_IS_EMPTY(prefix))) { - if (!(zephir_start_with(realUri, prefix, NULL))) { - continue; - } - } - if (Z_TYPE_P(annotationsService) != IS_OBJECT) { - _4$$11 = zephir_fetch_nproperty_this(this_ptr, SL("_dependencyInjector"), PH_NOISY_CC); - ZEPHIR_CPY_WRT(dependencyInjector, _4$$11); - if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'annotations' service", "phalcon/mvc/router/annotations.zep", 129); - return; - } - ZEPHIR_INIT_NVAR(_5$$11); - ZVAL_STRING(_5$$11, "annotations", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(&annotationsService, dependencyInjector, "getshared", NULL, 0, _5$$11); - zephir_check_temp_parameter(_5$$11); - zephir_check_call_status(); + ZEPHIR_INIT_VAR(annotationsService); + ZVAL_NULL(annotationsService); + ZEPHIR_OBS_VAR(handlers); + zephir_read_property_this(&handlers, this_ptr, SL("_handlers"), PH_NOISY_CC); + if (Z_TYPE_P(handlers) == IS_ARRAY) { + ZEPHIR_OBS_VAR(controllerSuffix); + zephir_read_property_this(&controllerSuffix, this_ptr, SL("_controllerSuffix"), PH_NOISY_CC); + zephir_is_iterable(handlers, &_1$$5, &_0$$5, 0, 0, "phalcon/mvc/router/annotations.zep", 203); + for ( + ; zephir_hash_get_current_data_ex(_1$$5, (void**) &_2$$5, &_0$$5) == SUCCESS + ; zephir_hash_move_forward_ex(_1$$5, &_0$$5) + ) { + ZEPHIR_GET_HVALUE(scope, _2$$5); + if (Z_TYPE_P(scope) == IS_ARRAY) { + ZEPHIR_OBS_NVAR(prefix); + zephir_array_fetch_long(&prefix, scope, 0, PH_NOISY, "phalcon/mvc/router/annotations.zep", 112 TSRMLS_CC); + if (!(ZEPHIR_IS_EMPTY(prefix))) { + if (!(zephir_start_with(realUri, prefix, NULL))) { + continue; } - ZEPHIR_OBS_NVAR(handler); - zephir_array_fetch_long(&handler, scope, 1, PH_NOISY, "phalcon/mvc/router/annotations.zep", 138 TSRMLS_CC); - if (zephir_memnstr_str(handler, SL("\\"), "phalcon/mvc/router/annotations.zep", 140)) { - ZEPHIR_INIT_NVAR(controllerName); - zephir_get_class_ns(controllerName, handler, 0 TSRMLS_CC); - ZEPHIR_INIT_NVAR(lowerControllerName); - zephir_uncamelize(lowerControllerName, controllerName); - ZEPHIR_INIT_NVAR(namespaceName); - zephir_get_ns_class(namespaceName, handler, 0 TSRMLS_CC); - } else { - ZEPHIR_CPY_WRT(controllerName, handler); - ZEPHIR_INIT_NVAR(lowerControllerName); - zephir_uncamelize(lowerControllerName, controllerName); - ZEPHIR_INIT_NVAR(namespaceName); - ZVAL_NULL(namespaceName); + } + if (Z_TYPE_P(annotationsService) != IS_OBJECT) { + _3$$10 = zephir_fetch_nproperty_this(this_ptr, SL("_dependencyInjector"), PH_NOISY_CC); + ZEPHIR_CPY_WRT(dependencyInjector, _3$$10); + if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'annotations' service", "phalcon/mvc/router/annotations.zep", 124); + return; } - zephir_update_property_this(this_ptr, SL("_routePrefix"), ZEPHIR_GLOBAL(global_null) TSRMLS_CC); - ZEPHIR_OBS_NVAR(moduleName); - zephir_array_isset_long_fetch(&moduleName, scope, 2, 0 TSRMLS_CC); - ZEPHIR_INIT_NVAR(sufixed); - ZEPHIR_CONCAT_VV(sufixed, handler, controllerSuffix); - ZEPHIR_CALL_METHOD(&handlerAnnotations, annotationsService, "get", NULL, 0, sufixed); + ZEPHIR_INIT_NVAR(_4$$10); + ZVAL_STRING(_4$$10, "annotations", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(&annotationsService, dependencyInjector, "getshared", NULL, 0, _4$$10); + zephir_check_temp_parameter(_4$$10); zephir_check_call_status(); - if (Z_TYPE_P(handlerAnnotations) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(&classAnnotations, handlerAnnotations, "getclassannotations", NULL, 0); - zephir_check_call_status(); - if (Z_TYPE_P(classAnnotations) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(&annotations, classAnnotations, "getannotations", NULL, 0); - zephir_check_call_status(); - if (Z_TYPE_P(annotations) == IS_ARRAY) { - zephir_is_iterable(annotations, &_7$$17, &_6$$17, 0, 0, "phalcon/mvc/router/annotations.zep", 187); - for ( - ; zephir_hash_get_current_data_ex(_7$$17, (void**) &_8$$17, &_6$$17) == SUCCESS - ; zephir_hash_move_forward_ex(_7$$17, &_6$$17) - ) { - ZEPHIR_GET_HVALUE(annotation, _8$$17); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "processcontrollerannotation", &_9, 0, controllerName, annotation); - zephir_check_call_status(); - } - } - } - ZEPHIR_CALL_METHOD(&methodAnnotations, handlerAnnotations, "getmethodsannotations", NULL, 0); + } + ZEPHIR_OBS_NVAR(handler); + zephir_array_fetch_long(&handler, scope, 1, PH_NOISY, "phalcon/mvc/router/annotations.zep", 133 TSRMLS_CC); + if (zephir_memnstr_str(handler, SL("\\"), "phalcon/mvc/router/annotations.zep", 135)) { + ZEPHIR_INIT_NVAR(controllerName); + zephir_get_class_ns(controllerName, handler, 0 TSRMLS_CC); + ZEPHIR_INIT_NVAR(lowerControllerName); + zephir_uncamelize(lowerControllerName, controllerName, NULL ); + ZEPHIR_INIT_NVAR(namespaceName); + zephir_get_ns_class(namespaceName, handler, 0 TSRMLS_CC); + } else { + ZEPHIR_CPY_WRT(controllerName, handler); + ZEPHIR_INIT_NVAR(lowerControllerName); + zephir_uncamelize(lowerControllerName, controllerName, NULL ); + ZEPHIR_INIT_NVAR(namespaceName); + ZVAL_NULL(namespaceName); + } + zephir_update_property_this(this_ptr, SL("_routePrefix"), ZEPHIR_GLOBAL(global_null) TSRMLS_CC); + ZEPHIR_OBS_NVAR(moduleName); + zephir_array_isset_long_fetch(&moduleName, scope, 2, 0 TSRMLS_CC); + ZEPHIR_INIT_NVAR(sufixed); + ZEPHIR_CONCAT_VV(sufixed, handler, controllerSuffix); + ZEPHIR_CALL_METHOD(&handlerAnnotations, annotationsService, "get", NULL, 0, sufixed); + zephir_check_call_status(); + if (Z_TYPE_P(handlerAnnotations) == IS_OBJECT) { + ZEPHIR_CALL_METHOD(&classAnnotations, handlerAnnotations, "getclassannotations", NULL, 0); + zephir_check_call_status(); + if (Z_TYPE_P(classAnnotations) == IS_OBJECT) { + ZEPHIR_CALL_METHOD(&annotations, classAnnotations, "getannotations", NULL, 0); zephir_check_call_status(); - if (Z_TYPE_P(methodAnnotations) == IS_ARRAY) { - ZEPHIR_INIT_NVAR(lowercased); - zephir_uncamelize(lowercased, handler); - zephir_is_iterable(methodAnnotations, &_11$$19, &_10$$19, 0, 0, "phalcon/mvc/router/annotations.zep", 203); + if (Z_TYPE_P(annotations) == IS_ARRAY) { + zephir_is_iterable(annotations, &_6$$16, &_5$$16, 0, 0, "phalcon/mvc/router/annotations.zep", 182); for ( - ; zephir_hash_get_current_data_ex(_11$$19, (void**) &_12$$19, &_10$$19) == SUCCESS - ; zephir_hash_move_forward_ex(_11$$19, &_10$$19) + ; zephir_hash_get_current_data_ex(_6$$16, (void**) &_7$$16, &_5$$16) == SUCCESS + ; zephir_hash_move_forward_ex(_6$$16, &_5$$16) ) { - ZEPHIR_GET_HMKEY(method, _11$$19, _10$$19); - ZEPHIR_GET_HVALUE(collection, _12$$19); - if (Z_TYPE_P(collection) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(&_13$$21, collection, "getannotations", NULL, 0); + ZEPHIR_GET_HVALUE(annotation, _7$$16); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "processcontrollerannotation", &_8, 0, controllerName, annotation); + zephir_check_call_status(); + } + } + } + ZEPHIR_CALL_METHOD(&methodAnnotations, handlerAnnotations, "getmethodsannotations", NULL, 0); + zephir_check_call_status(); + if (Z_TYPE_P(methodAnnotations) == IS_ARRAY) { + ZEPHIR_INIT_NVAR(lowercased); + zephir_uncamelize(lowercased, handler, NULL ); + zephir_is_iterable(methodAnnotations, &_10$$18, &_9$$18, 0, 0, "phalcon/mvc/router/annotations.zep", 198); + for ( + ; zephir_hash_get_current_data_ex(_10$$18, (void**) &_11$$18, &_9$$18) == SUCCESS + ; zephir_hash_move_forward_ex(_10$$18, &_9$$18) + ) { + ZEPHIR_GET_HMKEY(method, _10$$18, _9$$18); + ZEPHIR_GET_HVALUE(collection, _11$$18); + if (Z_TYPE_P(collection) == IS_OBJECT) { + ZEPHIR_CALL_METHOD(&_12$$20, collection, "getannotations", NULL, 0); + zephir_check_call_status(); + zephir_is_iterable(_12$$20, &_14$$20, &_13$$20, 0, 0, "phalcon/mvc/router/annotations.zep", 196); + for ( + ; zephir_hash_get_current_data_ex(_14$$20, (void**) &_15$$20, &_13$$20) == SUCCESS + ; zephir_hash_move_forward_ex(_14$$20, &_13$$20) + ) { + ZEPHIR_GET_HVALUE(annotation, _15$$20); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "processactionannotation", &_16, 0, moduleName, namespaceName, lowerControllerName, method, annotation); zephir_check_call_status(); - zephir_is_iterable(_13$$21, &_15$$21, &_14$$21, 0, 0, "phalcon/mvc/router/annotations.zep", 201); - for ( - ; zephir_hash_get_current_data_ex(_15$$21, (void**) &_16$$21, &_14$$21) == SUCCESS - ; zephir_hash_move_forward_ex(_15$$21, &_14$$21) - ) { - ZEPHIR_GET_HVALUE(annotation, _16$$21); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "processactionannotation", &_17, 0, moduleName, namespaceName, lowerControllerName, method, annotation); - zephir_check_call_status(); - } } } } @@ -114761,13 +115067,8 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) { } } } - if (1) { - zephir_update_property_this(this_ptr, SL("_processed"), ZEPHIR_GLOBAL(global_true) TSRMLS_CC); - } else { - zephir_update_property_this(this_ptr, SL("_processed"), ZEPHIR_GLOBAL(global_false) TSRMLS_CC); - } } - ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_router_annotations_ce, this_ptr, "handle", &_18, 360, realUri); + ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_router_annotations_ce, this_ptr, "handle", &_17, 358, realUri); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -114977,7 +115278,7 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, processActionAnnotation) { zephir_check_temp_parameter(_3$$9); zephir_check_call_status(); if (Z_TYPE_P(converts) == IS_ARRAY) { - zephir_is_iterable(converts, &_6$$24, &_5$$24, 0, 0, "phalcon/mvc/router/annotations.zep", 354); + zephir_is_iterable(converts, &_6$$24, &_5$$24, 0, 0, "phalcon/mvc/router/annotations.zep", 346); for ( ; zephir_hash_get_current_data_ex(_6$$24, (void**) &_7$$24, &_5$$24) == SUCCESS ; zephir_hash_move_forward_ex(_6$$24, &_5$$24) @@ -114994,7 +115295,7 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, processActionAnnotation) { zephir_check_temp_parameter(_3$$9); zephir_check_call_status(); if (Z_TYPE_P(converts) == IS_ARRAY) { - zephir_is_iterable(converts, &_10$$26, &_9$$26, 0, 0, "phalcon/mvc/router/annotations.zep", 364); + zephir_is_iterable(converts, &_10$$26, &_9$$26, 0, 0, "phalcon/mvc/router/annotations.zep", 356); for ( ; zephir_hash_get_current_data_ex(_10$$26, (void**) &_11$$26, &_9$$26) == SUCCESS ; zephir_hash_move_forward_ex(_10$$26, &_9$$26) @@ -115610,7 +115911,7 @@ static PHP_METHOD(Phalcon_Mvc_Router_Group, _addRoute) { ZEPHIR_CALL_METHOD(NULL, route, "__construct", NULL, 78, _2, mergedPaths, httpMethods); zephir_check_call_status(); zephir_update_property_array_append(this_ptr, SL("_routes"), route TSRMLS_CC); - ZEPHIR_CALL_METHOD(NULL, route, "setgroup", NULL, 361, this_ptr); + ZEPHIR_CALL_METHOD(NULL, route, "setgroup", NULL, 359, this_ptr); zephir_check_call_status(); RETURN_CCTOR(route); @@ -116196,7 +116497,7 @@ static PHP_METHOD(Phalcon_Mvc_Router_Route, getRoutePaths) { ZEPHIR_CPY_WRT(realClassName, controllerName); } ZEPHIR_INIT_VAR(_1$$9); - zephir_uncamelize(_1$$9, realClassName); + zephir_uncamelize(_1$$9, realClassName, NULL ); zephir_array_update_string(&routePaths, SL("controller"), &_1$$9, PH_COPY | PH_SEPARATE); } if (Z_TYPE_P(actionName) != IS_NULL) { @@ -117133,7 +117434,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, _loadTemplateEngines) { if (Z_TYPE_P(registeredEngines) != IS_ARRAY) { ZEPHIR_INIT_VAR(_0$$4); object_init_ex(_0$$4, phalcon_mvc_view_engine_php_ce); - ZEPHIR_CALL_METHOD(NULL, _0$$4, "__construct", NULL, 363, this_ptr, dependencyInjector); + ZEPHIR_CALL_METHOD(NULL, _0$$4, "__construct", NULL, 361, this_ptr, dependencyInjector); zephir_check_call_status(); zephir_array_update_string(&engines, SL(".phtml"), &_0$$4, PH_COPY | PH_SEPARATE); } else { @@ -117390,7 +117691,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, render) { } else { ZEPHIR_CPY_WRT(mergedParams, viewParams); } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "_internalrender", NULL, 382, path, mergedParams); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "_internalrender", NULL, 379, path, mergedParams); zephir_check_call_status(); if (Z_TYPE_P(cache) == IS_OBJECT) { ZEPHIR_CALL_METHOD(&_2$$12, cache, "isstarted", NULL, 0); @@ -117457,7 +117758,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, partial) { } else { ZEPHIR_CPY_WRT(mergedParams, params); } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "_internalrender", NULL, 382, partialPath, mergedParams); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "_internalrender", NULL, 379, partialPath, mergedParams); zephir_check_call_status(); if (Z_TYPE_P(params) == IS_ARRAY) { zephir_update_property_this(this_ptr, SL("_viewParams"), viewParams TSRMLS_CC); @@ -117849,7 +118150,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Php, render) { if (mustClean == 1) { - ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 364); + ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 362); zephir_check_call_status(); } if (Z_TYPE_P(params) == IS_ARRAY) { @@ -117944,18 +118245,18 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, getCompiler) { ZEPHIR_INIT_NVAR(compiler); object_init_ex(compiler, phalcon_mvc_view_engine_volt_compiler_ce); _0$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_view"), PH_NOISY_CC); - ZEPHIR_CALL_METHOD(NULL, compiler, "__construct", NULL, 365, _0$$3); + ZEPHIR_CALL_METHOD(NULL, compiler, "__construct", NULL, 363, _0$$3); zephir_check_call_status(); _1$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_dependencyInjector"), PH_NOISY_CC); ZEPHIR_CPY_WRT(dependencyInjector, _1$$3); if (Z_TYPE_P(dependencyInjector) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(NULL, compiler, "setdi", NULL, 366, dependencyInjector); + ZEPHIR_CALL_METHOD(NULL, compiler, "setdi", NULL, 364, dependencyInjector); zephir_check_call_status(); } ZEPHIR_OBS_VAR(options); zephir_read_property_this(&options, this_ptr, SL("_options"), PH_NOISY_CC); if (Z_TYPE_P(options) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(NULL, compiler, "setoptions", NULL, 367, options); + ZEPHIR_CALL_METHOD(NULL, compiler, "setoptions", NULL, 365, options); zephir_check_call_status(); } zephir_update_property_this(this_ptr, SL("_compiler"), compiler TSRMLS_CC); @@ -117994,7 +118295,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, render) { if (mustClean) { - ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 364); + ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 362); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(&compiler, this_ptr, "getcompiler", NULL, 0); @@ -118053,7 +118354,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, length) { ZVAL_LONG(length, zephir_fast_count_int(item TSRMLS_CC)); } else { if ((zephir_function_exists_ex(SS("mb_strlen") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 359, item); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 357, item); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(length); @@ -118079,7 +118380,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, isIncluded) { } if (Z_TYPE_P(haystack) == IS_STRING) { if ((zephir_function_exists_ex(SS("mb_strpos") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&_0$$5, "mb_strpos", NULL, 368, haystack, needle); + ZEPHIR_CALL_FUNCTION(&_0$$5, "mb_strpos", NULL, 366, haystack, needle); zephir_check_call_status(); RETURN_MM_BOOL(!ZEPHIR_IS_FALSE_IDENTICAL(_0$$5)); } @@ -118130,7 +118431,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, convertEncoding) { _0 = ZEPHIR_IS_STRING(to, "utf8"); } if (_0) { - ZEPHIR_RETURN_CALL_FUNCTION("utf8_encode", NULL, 369, text); + ZEPHIR_RETURN_CALL_FUNCTION("utf8_encode", NULL, 367, text); zephir_check_call_status(); RETURN_MM(); } @@ -118139,17 +118440,17 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, convertEncoding) { _1 = ZEPHIR_IS_STRING(from, "utf8"); } if (_1) { - ZEPHIR_RETURN_CALL_FUNCTION("utf8_decode", NULL, 370, text); + ZEPHIR_RETURN_CALL_FUNCTION("utf8_decode", NULL, 368, text); zephir_check_call_status(); RETURN_MM(); } if ((zephir_function_exists_ex(SS("mb_convert_encoding") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 182, text, from, to); + ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 177, text, from, to); zephir_check_call_status(); RETURN_MM(); } if ((zephir_function_exists_ex(SS("iconv") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("iconv", NULL, 371, from, to, text); + ZEPHIR_RETURN_CALL_FUNCTION("iconv", NULL, 369, from, to, text); zephir_check_call_status(); RETURN_MM(); } @@ -118220,7 +118521,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, slice) { if (Z_TYPE_P(value) == IS_ARRAY) { ZEPHIR_SINIT_VAR(_5$$9); ZVAL_LONG(&_5$$9, start); - ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 372, value, &_5$$9, length); + ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 370, value, &_5$$9, length); zephir_check_call_status(); RETURN_MM(); } @@ -118228,13 +118529,13 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, slice) { if (Z_TYPE_P(length) != IS_NULL) { ZEPHIR_SINIT_VAR(_6$$11); ZVAL_LONG(&_6$$11, start); - ZEPHIR_RETURN_CALL_FUNCTION("mb_substr", &_7, 373, value, &_6$$11, length); + ZEPHIR_RETURN_CALL_FUNCTION("mb_substr", &_7, 371, value, &_6$$11, length); zephir_check_call_status(); RETURN_MM(); } ZEPHIR_SINIT_VAR(_8$$10); ZVAL_LONG(&_8$$10, start); - ZEPHIR_RETURN_CALL_FUNCTION("mb_substr", &_7, 373, value, &_8$$10); + ZEPHIR_RETURN_CALL_FUNCTION("mb_substr", &_7, 371, value, &_8$$10); zephir_check_call_status(); RETURN_MM(); } @@ -118264,7 +118565,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, sort) { ZEPHIR_MAKE_REF(value); - ZEPHIR_CALL_FUNCTION(NULL, "asort", NULL, 374, value); + ZEPHIR_CALL_FUNCTION(NULL, "asort", NULL, 372, value); ZEPHIR_UNREF(value); zephir_check_call_status(); RETURN_CTOR(value); @@ -118307,7 +118608,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, callMacro) { ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_RETURN_CALL_FUNCTION("call_user_func", NULL, 375, macro, arguments); + ZEPHIR_CALL_USER_FUNC_ARRAY(return_value, macro, arguments); zephir_check_call_status(); RETURN_MM(); @@ -118767,7 +119068,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, attributeReader) { } } } else { - ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", &_7, 376, left); + ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", &_7, 373, left); zephir_check_call_status(); ZEPHIR_OBS_VAR(leftType); zephir_array_fetch_string(&leftType, left, SL("type"), PH_NOISY, "phalcon/mvc/view/engine/volt/compiler.zep", 339 TSRMLS_CC); @@ -118789,7 +119090,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, attributeReader) { zephir_array_fetch_string(&_10$$13, right, SL("value"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 352 TSRMLS_CC); zephir_concat_self(&exprCode, _10$$13 TSRMLS_CC); } else { - ZEPHIR_CALL_METHOD(&_11$$14, this_ptr, "expression", &_7, 376, right); + ZEPHIR_CALL_METHOD(&_11$$14, this_ptr, "expression", &_7, 373, right); zephir_check_call_status(); zephir_concat_self(&exprCode, _11$$14 TSRMLS_CC); } @@ -118817,7 +119118,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) { ZVAL_NULL(funcArguments); ZEPHIR_OBS_NVAR(funcArguments); if (zephir_array_isset_string_fetch(&funcArguments, expr, SS("arguments"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", &_0, 376, funcArguments); + ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", &_0, 373, funcArguments); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(arguments); @@ -118840,7 +119141,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) { zephir_array_fast_append(_1$$6, funcArguments); ZEPHIR_INIT_VAR(_2$$6); ZVAL_STRING(_2$$6, "compileFunction", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 377, _2$$6, _1$$6); + ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 374, _2$$6, _1$$6); zephir_check_temp_parameter(_2$$6); zephir_check_call_status(); if (Z_TYPE_P(code) == IS_STRING) { @@ -118902,7 +119203,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) { ZEPHIR_OBS_VAR(exprLevel); zephir_read_property_this(&exprLevel, this_ptr, SL("_exprLevel"), PH_NOISY_CC); if (Z_TYPE_P(block) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&code, this_ptr, "_statementlistorextends", NULL, 378, block); + ZEPHIR_CALL_METHOD(&code, this_ptr, "_statementlistorextends", NULL, 375, block); zephir_check_call_status(); if (ZEPHIR_IS_LONG(exprLevel, 1)) { ZEPHIR_CPY_WRT(escapedCode, code); @@ -118928,7 +119229,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) { RETURN_MM_STRING("''", 1); } ZEPHIR_INIT_VAR(_9$$5); - zephir_camelize(_9$$5, name); + zephir_camelize(_9$$5, name, NULL ); ZEPHIR_CALL_FUNCTION(&method, "lcfirst", NULL, 69, _9$$5); zephir_check_call_status(); ZEPHIR_INIT_VAR(className); @@ -118998,7 +119299,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) { ZEPHIR_CONCAT_SVSVS(return_value, "$this->callMacro('", name, "', array(", arguments, "))"); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&_10, this_ptr, "expression", &_0, 376, nameExpr); + ZEPHIR_CALL_METHOD(&_10, this_ptr, "expression", &_0, 373, nameExpr); zephir_check_call_status(); ZEPHIR_CONCAT_VSVS(return_value, _10, "(", arguments, ")"); RETURN_MM(); @@ -119057,28 +119358,28 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveTest) { if (zephir_array_isset_string_fetch(&name, testName, SS("value"), 0 TSRMLS_CC)) { if (ZEPHIR_IS_STRING(name, "divisibleby")) { zephir_array_fetch_string(&_1$$12, test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 641 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_0$$12, this_ptr, "expression", &_2, 376, _1$$12); + ZEPHIR_CALL_METHOD(&_0$$12, this_ptr, "expression", &_2, 373, _1$$12); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "(((", left, ") % (", _0$$12, ")) == 0)"); RETURN_MM(); } if (ZEPHIR_IS_STRING(name, "sameas")) { zephir_array_fetch_string(&_4$$13, test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 648 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_3$$13, this_ptr, "expression", &_2, 376, _4$$13); + ZEPHIR_CALL_METHOD(&_3$$13, this_ptr, "expression", &_2, 373, _4$$13); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "(", left, ") === (", _3$$13, ")"); RETURN_MM(); } if (ZEPHIR_IS_STRING(name, "type")) { zephir_array_fetch_string(&_6$$14, test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 655 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_5$$14, this_ptr, "expression", &_2, 376, _6$$14); + ZEPHIR_CALL_METHOD(&_5$$14, this_ptr, "expression", &_2, 373, _6$$14); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "gettype(", left, ") === (", _5$$14, ")"); RETURN_MM(); } } } - ZEPHIR_CALL_METHOD(&_7, this_ptr, "expression", &_2, 376, test); + ZEPHIR_CALL_METHOD(&_7, this_ptr, "expression", &_2, 373, test); zephir_check_call_status(); ZEPHIR_CONCAT_VSV(return_value, left, " == ", _7); RETURN_MM(); @@ -119149,11 +119450,11 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) { zephir_array_update_string(&_4$$7, SL("file"), &file, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_4$$7, SL("line"), &line, PH_COPY | PH_SEPARATE); ZEPHIR_MAKE_REF(funcArguments); - ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 379, funcArguments, _4$$7); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 376, funcArguments, _4$$7); ZEPHIR_UNREF(funcArguments); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 376, funcArguments); + ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 373, funcArguments); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(arguments, left); @@ -119168,7 +119469,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) { zephir_array_fast_append(_6$$9, funcArguments); ZEPHIR_INIT_VAR(_7$$9); ZVAL_STRING(_7$$9, "compileFilter", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 377, _7$$9, _6$$9); + ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 374, _7$$9, _6$$9); zephir_check_temp_parameter(_7$$9); zephir_check_call_status(); if (Z_TYPE_P(code) == IS_STRING) { @@ -119365,7 +119666,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { zephir_array_fast_append(_0$$4, expr); ZEPHIR_INIT_NVAR(_1$$4); ZVAL_STRING(_1$$4, "resolveExpression", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "fireextensionevent", &_2, 377, _1$$4, _0$$4); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "fireextensionevent", &_2, 374, _1$$4, _0$$4); zephir_check_temp_parameter(_1$$4); zephir_check_call_status(); if (Z_TYPE_P(exprCode) == IS_STRING) { @@ -119383,7 +119684,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { ) { ZEPHIR_GET_HVALUE(singleExpr, _5$$6); zephir_array_fetch_string(&_6$$7, singleExpr, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 993 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_7, 376, _6$$7); + ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_7, 373, _6$$7); zephir_check_call_status(); ZEPHIR_OBS_NVAR(name); if (zephir_array_isset_string_fetch(&name, singleExpr, SS("name"), 0 TSRMLS_CC)) { @@ -119405,7 +119706,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { } ZEPHIR_OBS_NVAR(left); if (zephir_array_isset_string_fetch(&left, expr, SS("left"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", &_7, 376, left); + ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", &_7, 373, left); zephir_check_call_status(); } if (ZEPHIR_IS_LONG(type, 311)) { @@ -119416,13 +119717,13 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { } if (ZEPHIR_IS_LONG(type, 124)) { zephir_array_fetch_string(&_12$$13, expr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1031 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "resolvefilter", &_13, 380, _12$$13, leftCode); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "resolvefilter", &_13, 377, _12$$13, leftCode); zephir_check_call_status(); break; } ZEPHIR_OBS_NVAR(right); if (zephir_array_isset_string_fetch(&right, expr, SS("right"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&rightCode, this_ptr, "expression", &_7, 376, right); + ZEPHIR_CALL_METHOD(&rightCode, this_ptr, "expression", &_7, 373, right); zephir_check_call_status(); } ZEPHIR_INIT_NVAR(exprCode); @@ -119598,7 +119899,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { if (ZEPHIR_IS_LONG(type, 365)) { ZEPHIR_OBS_NVAR(start); if (zephir_array_isset_string_fetch(&start, expr, SS("start"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&startCode, this_ptr, "expression", &_7, 376, start); + ZEPHIR_CALL_METHOD(&startCode, this_ptr, "expression", &_7, 373, start); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(startCode); @@ -119606,7 +119907,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { } ZEPHIR_OBS_NVAR(end); if (zephir_array_isset_string_fetch(&end, expr, SS("end"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&endCode, this_ptr, "expression", &_7, 376, end); + ZEPHIR_CALL_METHOD(&endCode, this_ptr, "expression", &_7, 373, end); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(endCode); @@ -119698,7 +119999,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { } if (ZEPHIR_IS_LONG(type, 366)) { zephir_array_fetch_string(&_21$$69, expr, SL("ternary"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1261 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_20$$69, this_ptr, "expression", &_7, 376, _21$$69); + ZEPHIR_CALL_METHOD(&_20$$69, this_ptr, "expression", &_7, 373, _21$$69); zephir_check_call_status(); ZEPHIR_INIT_NVAR(exprCode); ZEPHIR_CONCAT_SVSVSVS(exprCode, "(", _20$$69, " ? ", leftCode, " : ", rightCode, ")"); @@ -119771,7 +120072,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, _statementListOrExtends } } if (isStatementList == 1) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_statementlist", NULL, 381, statements); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_statementlist", NULL, 378, statements); zephir_check_call_status(); RETURN_MM(); } @@ -119818,7 +120119,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach) { ZEPHIR_CONCAT_VV(prefixLevel, prefix, level); ZEPHIR_OBS_VAR(expr); zephir_array_fetch_string(&expr, statement, SL("expr"), PH_NOISY, "phalcon/mvc/view/engine/volt/compiler.zep", 1363 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_0, 376, expr); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_0, 373, expr); zephir_check_call_status(); ZEPHIR_OBS_VAR(blockStatements); zephir_array_fetch_string(&blockStatements, statement, SL("block_statements"), PH_NOISY, "phalcon/mvc/view/engine/volt/compiler.zep", 1369 TSRMLS_CC); @@ -119854,7 +120155,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach) { } else { ZVAL_BOOL(_5, 0); } - ZEPHIR_CALL_METHOD(&code, this_ptr, "_statementlist", NULL, 381, blockStatements, _5); + ZEPHIR_CALL_METHOD(&code, this_ptr, "_statementlist", NULL, 378, blockStatements, _5); zephir_check_call_status(); ZEPHIR_OBS_VAR(loopContext); zephir_read_property_this(&loopContext, this_ptr, SL("_loopPointers"), PH_NOISY_CC); @@ -119902,7 +120203,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach) { } ZEPHIR_OBS_VAR(ifExpr); if (zephir_array_isset_string_fetch(&ifExpr, statement, SS("if_expr"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_16$$13, this_ptr, "expression", &_0, 376, ifExpr); + ZEPHIR_CALL_METHOD(&_16$$13, this_ptr, "expression", &_0, 373, ifExpr); zephir_check_call_status(); ZEPHIR_INIT_VAR(_17$$13); ZEPHIR_CONCAT_SVS(_17$$13, "if (", _16$$13, ") { ?>"); @@ -119999,7 +120300,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileIf) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupt statement", "phalcon/mvc/view/engine/volt/compiler.zep", 1515); return; } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 376, expr); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 373, expr); zephir_check_call_status(); zephir_array_fetch_string(&_2, statement, SL("true_statements"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1521 TSRMLS_CC); ZEPHIR_INIT_VAR(_3); @@ -120008,7 +120309,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileIf) { } else { ZVAL_BOOL(_3, 0); } - ZEPHIR_CALL_METHOD(&_1, this_ptr, "_statementlist", &_4, 381, _2, _3); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "_statementlist", &_4, 378, _2, _3); zephir_check_call_status(); ZEPHIR_INIT_VAR(compilation); ZEPHIR_CONCAT_SVSV(compilation, "", _1); @@ -120020,7 +120321,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileIf) { } else { ZVAL_BOOL(_6$$4, 0); } - ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "_statementlist", &_4, 381, blockStatements, _6$$4); + ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "_statementlist", &_4, 378, blockStatements, _6$$4); zephir_check_call_status(); ZEPHIR_INIT_VAR(_7$$4); ZEPHIR_CONCAT_SV(_7$$4, "", _5$$4); @@ -120048,7 +120349,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileElseIf) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupt statement", "phalcon/mvc/view/engine/volt/compiler.zep", 1550); return; } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 376, expr); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 373, expr); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, ""); RETURN_MM(); @@ -120079,9 +120380,9 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileCache) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupt statement", "phalcon/mvc/view/engine/volt/compiler.zep", 1570); return; } - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_0, 376, expr); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_0, 373, expr); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "expression", &_0, 376, expr); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "expression", &_0, 373, expr); zephir_check_call_status(); ZEPHIR_INIT_VAR(compilation); ZEPHIR_CONCAT_SVS(compilation, "di->get('viewCache'); "); @@ -120117,7 +120418,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileCache) { } else { ZVAL_BOOL(_12, 0); } - ZEPHIR_CALL_METHOD(&_10, this_ptr, "_statementlist", NULL, 381, _11, _12); + ZEPHIR_CALL_METHOD(&_10, this_ptr, "_statementlist", NULL, 378, _11, _12); zephir_check_call_status(); zephir_concat_self(&compilation, _10 TSRMLS_CC); ZEPHIR_OBS_NVAR(lifetime); @@ -120175,10 +120476,10 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSet) { ) { ZEPHIR_GET_HVALUE(assignment, _2); zephir_array_fetch_string(&_3$$4, assignment, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1633 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_4, 376, _3$$4); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_4, 373, _3$$4); zephir_check_call_status(); zephir_array_fetch_string(&_5$$4, assignment, SL("variable"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1638 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_4, 376, _5$$4); + ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_4, 373, _5$$4); zephir_check_call_status(); zephir_array_fetch_string(&_6$$4, assignment, SL("op"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1644 TSRMLS_CC); do { @@ -120235,7 +120536,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileDo) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/mvc/view/engine/volt/compiler.zep", 1684); return; } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 376, expr); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 373, expr); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, ""); RETURN_MM(); @@ -120259,7 +120560,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileReturn) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/mvc/view/engine/volt/compiler.zep", 1704); return; } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 376, expr); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 373, expr); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, ""); RETURN_MM(); @@ -120295,7 +120596,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileAutoEscape) { } else { ZVAL_BOOL(_1, 0); } - ZEPHIR_CALL_METHOD(&compilation, this_ptr, "_statementlist", NULL, 381, _0, _1); + ZEPHIR_CALL_METHOD(&compilation, this_ptr, "_statementlist", NULL, 378, _0, _1); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_autoescape"), oldAutoescape TSRMLS_CC); RETURN_CCTOR(compilation); @@ -120319,7 +120620,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileEcho) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupt statement", "phalcon/mvc/view/engine/volt/compiler.zep", 1754); return; } - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 376, expr); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 373, expr); zephir_check_call_status(); zephir_array_fetch_string(&_0, expr, SL("type"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1762 TSRMLS_CC); if (ZEPHIR_IS_LONG(_0, 350)) { @@ -120392,14 +120693,14 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileInclude) { RETURN_CCTOR(compilation); } } - ZEPHIR_CALL_METHOD(&path, this_ptr, "expression", &_4, 376, pathExpr); + ZEPHIR_CALL_METHOD(&path, this_ptr, "expression", &_4, 373, pathExpr); zephir_check_call_status(); ZEPHIR_OBS_VAR(params); if (!(zephir_array_isset_string_fetch(¶ms, statement, SS("params"), 0 TSRMLS_CC))) { ZEPHIR_CONCAT_SVS(return_value, "partial(", path, "); ?>"); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&_5, this_ptr, "expression", &_4, 376, params); + ZEPHIR_CALL_METHOD(&_5, this_ptr, "expression", &_4, 373, params); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "partial(", path, ", ", _5, "); ?>"); RETURN_MM(); @@ -120479,7 +120780,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro) { zephir_concat_self_str(&code, SL(" } else { ") TSRMLS_CC); ZEPHIR_OBS_NVAR(defaultValue); if (zephir_array_isset_string_fetch(&defaultValue, parameter, SS("default"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_12$$8, this_ptr, "expression", &_13, 376, defaultValue); + ZEPHIR_CALL_METHOD(&_12$$8, this_ptr, "expression", &_13, 373, defaultValue); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_14$$8); ZEPHIR_CONCAT_SVSVS(_14$$8, "$", variableName, " = ", _12$$8, ";"); @@ -120501,7 +120802,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro) { } else { ZVAL_BOOL(_17$$10, 0); } - ZEPHIR_CALL_METHOD(&_16$$10, this_ptr, "_statementlist", NULL, 381, blockStatements, _17$$10); + ZEPHIR_CALL_METHOD(&_16$$10, this_ptr, "_statementlist", NULL, 378, blockStatements, _17$$10); zephir_check_call_status(); ZEPHIR_INIT_VAR(_18$$10); ZEPHIR_CONCAT_VS(_18$$10, _16$$10, " 1) { ZEPHIR_OBS_VAR(numberOfBytes); - zephir_array_fetch_long(&numberOfBytes, response, 1, PH_NOISY, "phalcon/queue/beanstalk.zep", 335 TSRMLS_CC); + zephir_array_fetch_long(&numberOfBytes, response, 1, PH_NOISY, "phalcon/queue/beanstalk.zep", 332 TSRMLS_CC); ZEPHIR_CALL_METHOD(&response, this_ptr, "read", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&data, "yaml_parse", NULL, 387, response); + ZEPHIR_CALL_FUNCTION(&data, "yaml_parse", NULL, 384, response); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(numberOfBytes); @@ -131983,13 +132292,13 @@ static PHP_METHOD(Phalcon_Queue_Beanstalk, read) { } ZEPHIR_SINIT_VAR(_0$$5); ZVAL_LONG(&_0$$5, (length + 2)); - ZEPHIR_CALL_FUNCTION(&data, "stream_get_line", &_1, 388, connection, &_0$$5); + ZEPHIR_CALL_FUNCTION(&data, "stream_get_line", &_1, 385, connection, &_0$$5); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_2$$5, "stream_get_meta_data", NULL, 389, connection); + ZEPHIR_CALL_FUNCTION(&_2$$5, "stream_get_meta_data", NULL, 386, connection); zephir_check_call_status(); - zephir_array_fetch_string(&_3$$5, _2$$5, SL("timed_out"), PH_NOISY | PH_READONLY, "phalcon/queue/beanstalk.zep", 376 TSRMLS_CC); + zephir_array_fetch_string(&_3$$5, _2$$5, SL("timed_out"), PH_NOISY | PH_READONLY, "phalcon/queue/beanstalk.zep", 373 TSRMLS_CC); if (zephir_is_true(_3$$5)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_queue_beanstalk_exception_ce, "Connection timed out", "phalcon/queue/beanstalk.zep", 377); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_queue_beanstalk_exception_ce, "Connection timed out", "phalcon/queue/beanstalk.zep", 374); return; } ZEPHIR_SINIT_NVAR(_0$$5); @@ -132001,7 +132310,7 @@ static PHP_METHOD(Phalcon_Queue_Beanstalk, read) { ZVAL_LONG(&_4, 16384); ZEPHIR_SINIT_VAR(_5); ZVAL_STRING(&_5, "\r\n", 0); - ZEPHIR_RETURN_CALL_FUNCTION("stream_get_line", &_1, 388, connection, &_4, &_5); + ZEPHIR_RETURN_CALL_FUNCTION("stream_get_line", &_1, 385, connection, &_4, &_5); zephir_check_call_status(); RETURN_MM(); @@ -132033,7 +132342,7 @@ static PHP_METHOD(Phalcon_Queue_Beanstalk, write) { ZEPHIR_CPY_WRT(packet, _0); ZEPHIR_SINIT_VAR(_1); ZVAL_LONG(&_1, zephir_fast_strlen_ev(packet)); - ZEPHIR_RETURN_CALL_FUNCTION("fwrite", NULL, 390, connection, packet, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("fwrite", NULL, 387, connection, packet, &_1); zephir_check_call_status(); RETURN_MM(); @@ -132396,7 +132705,7 @@ static PHP_METHOD(Phalcon_Security_Random, bytes) { if ((zephir_function_exists_ex(SS("openssl_random_pseudo_bytes") TSRMLS_CC) == SUCCESS)) { ZEPHIR_INIT_VAR(_1$$5); ZVAL_LONG(_1$$5, len); - ZEPHIR_RETURN_CALL_FUNCTION("openssl_random_pseudo_bytes", NULL, 399, _1$$5); + ZEPHIR_RETURN_CALL_FUNCTION("openssl_random_pseudo_bytes", NULL, 396, _1$$5); zephir_check_call_status(); RETURN_MM(); } @@ -132407,16 +132716,16 @@ static PHP_METHOD(Phalcon_Security_Random, bytes) { ZVAL_STRING(&_3$$6, "/dev/urandom", 0); ZEPHIR_SINIT_VAR(_4$$6); ZVAL_STRING(&_4$$6, "rb", 0); - ZEPHIR_CALL_FUNCTION(&handle, "fopen", NULL, 286, &_3$$6, &_4$$6); + ZEPHIR_CALL_FUNCTION(&handle, "fopen", NULL, 281, &_3$$6, &_4$$6); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(handle)) { ZEPHIR_SINIT_VAR(_5$$7); ZVAL_LONG(&_5$$7, 0); - ZEPHIR_CALL_FUNCTION(NULL, "stream_set_read_buffer", NULL, 402, handle, &_5$$7); + ZEPHIR_CALL_FUNCTION(NULL, "stream_set_read_buffer", NULL, 399, handle, &_5$$7); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_5$$7); ZVAL_LONG(&_5$$7, len); - ZEPHIR_CALL_FUNCTION(&ret, "fread", NULL, 403, handle, &_5$$7); + ZEPHIR_CALL_FUNCTION(&ret, "fread", NULL, 400, handle, &_5$$7); zephir_check_call_status(); zephir_fclose(handle TSRMLS_CC); if (zephir_fast_strlen_ev(ret) != len) { @@ -132452,7 +132761,7 @@ static PHP_METHOD(Phalcon_Security_Random, hex) { zephir_check_call_status(); ZEPHIR_SINIT_VAR(_2); ZVAL_STRING(&_2, "H*", 0); - ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 404, &_2, _0); + ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 401, &_2, _0); zephir_check_call_status(); ZEPHIR_MAKE_REF(_3); ZEPHIR_RETURN_CALL_FUNCTION("array_shift", NULL, 123, _3); @@ -132489,7 +132798,7 @@ static PHP_METHOD(Phalcon_Security_Random, base58) { zephir_check_call_status(); ZEPHIR_SINIT_VAR(_1); ZVAL_STRING(&_1, "C*", 0); - ZEPHIR_CALL_FUNCTION(&bytes, "unpack", NULL, 404, &_1, _0); + ZEPHIR_CALL_FUNCTION(&bytes, "unpack", NULL, 401, &_1, _0); zephir_check_call_status(); zephir_is_iterable(bytes, &_3, &_2, 0, 0, "phalcon/security/random.zep", 199); for ( @@ -132594,9 +132903,9 @@ static PHP_METHOD(Phalcon_Security_Random, uuid) { zephir_check_call_status(); ZEPHIR_SINIT_VAR(_2); ZVAL_STRING(&_2, "N1a/n1b/n1c/n1d/n1e/N1f", 0); - ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 404, &_2, _0); + ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 401, &_2, _0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&ary, "array_values", NULL, 216, _3); + ZEPHIR_CALL_FUNCTION(&ary, "array_values", NULL, 211, _3); zephir_check_call_status(); zephir_array_fetch_long(&_4, ary, 2, PH_NOISY | PH_READONLY, "phalcon/security/random.zep", 279 TSRMLS_CC); ZEPHIR_INIT_NVAR(_1); @@ -132609,7 +132918,7 @@ static PHP_METHOD(Phalcon_Security_Random, uuid) { ZEPHIR_INIT_VAR(_7); ZVAL_STRING(_7, "%08x-%04x-%04x-%04x-%04x%08x", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_MAKE_REF(ary); - ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 379, ary, _7); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 376, ary, _7); zephir_check_temp_parameter(_7); ZEPHIR_UNREF(ary); zephir_check_call_status(); @@ -132650,7 +132959,7 @@ static PHP_METHOD(Phalcon_Security_Random, number) { } ZEPHIR_SINIT_VAR(_1); ZVAL_LONG(&_1, len); - ZEPHIR_CALL_FUNCTION(&hex, "dechex", NULL, 405, &_1); + ZEPHIR_CALL_FUNCTION(&hex, "dechex", NULL, 402, &_1); zephir_check_call_status(); if (((zephir_fast_strlen_ev(hex) & 1)) == 1) { ZEPHIR_INIT_VAR(_2$$5); @@ -132659,7 +132968,7 @@ static PHP_METHOD(Phalcon_Security_Random, number) { } ZEPHIR_SINIT_NVAR(_1); ZVAL_STRING(&_1, "H*", 0); - ZEPHIR_CALL_FUNCTION(&_3, "pack", NULL, 406, &_1, hex); + ZEPHIR_CALL_FUNCTION(&_3, "pack", NULL, 403, &_1, hex); zephir_check_call_status(); zephir_concat_self(&bin, _3 TSRMLS_CC); _4 = ZEPHIR_STRING_OFFSET(bin, 0); @@ -132697,19 +133006,19 @@ static PHP_METHOD(Phalcon_Security_Random, number) { ZVAL_LONG(&_16$$6, 0); ZEPHIR_SINIT_NVAR(_17$$6); ZVAL_LONG(&_17$$6, 1); - ZEPHIR_CALL_FUNCTION(&_18$$6, "substr_replace", &_19, 407, rnd, _13$$6, &_16$$6, &_17$$6); + ZEPHIR_CALL_FUNCTION(&_18$$6, "substr_replace", &_19, 404, rnd, _13$$6, &_16$$6, &_17$$6); zephir_check_call_status(); ZEPHIR_CPY_WRT(rnd, _18$$6); } while (ZEPHIR_LT(bin, rnd)); ZEPHIR_SINIT_NVAR(_1); ZVAL_STRING(&_1, "H*", 0); - ZEPHIR_CALL_FUNCTION(&ret, "unpack", NULL, 404, &_1, rnd); + ZEPHIR_CALL_FUNCTION(&ret, "unpack", NULL, 401, &_1, rnd); zephir_check_call_status(); ZEPHIR_MAKE_REF(ret); ZEPHIR_CALL_FUNCTION(&_20, "array_shift", NULL, 123, ret); ZEPHIR_UNREF(ret); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("hexdec", NULL, 408, _20); + ZEPHIR_RETURN_CALL_FUNCTION("hexdec", NULL, 405, _20); zephir_check_call_status(); RETURN_MM(); @@ -133687,7 +133996,7 @@ static PHP_METHOD(Phalcon_Session_Bag, getIterator) { } object_init_ex(return_value, zephir_get_internal_ce(SS("arrayiterator") TSRMLS_CC)); _1 = zephir_fetch_nproperty_this(this_ptr, SL("_data"), PH_NOISY_CC); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 412, _1); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 409, _1); zephir_check_call_status(); RETURN_MM(); @@ -133955,7 +134264,7 @@ static PHP_METHOD(Phalcon_Session_Adapter_Libmemcached, __construct) { } ZEPHIR_INIT_VAR(_0); ZVAL_LONG(_0, 2592000); - ZEPHIR_CALL_FUNCTION(&_1, "min", NULL, 409, lifetime, _0); + ZEPHIR_CALL_FUNCTION(&_1, "min", NULL, 406, lifetime, _0); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_lifetime"), _1 TSRMLS_CC); ZEPHIR_OBS_VAR(prefix); @@ -133977,7 +134286,7 @@ static PHP_METHOD(Phalcon_Session_Adapter_Libmemcached, __construct) { ZEPHIR_OBS_VAR(_4); zephir_read_property_this(&_4, this_ptr, SL("_lifetime"), PH_NOISY_CC); zephir_array_update_string(&_3, SL("lifetime"), &_4, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, _2, "__construct", NULL, 313, _3); + ZEPHIR_CALL_METHOD(NULL, _2, "__construct", NULL, 311, _3); zephir_check_call_status(); ZEPHIR_INIT_VAR(_5); zephir_create_array(_5, 4, 0 TSRMLS_CC); @@ -133985,7 +134294,7 @@ static PHP_METHOD(Phalcon_Session_Adapter_Libmemcached, __construct) { zephir_array_update_string(&_5, SL("client"), &client, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_5, SL("prefix"), &prefix, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_5, SL("statsKey"), &statsKey, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, _0, "__construct", NULL, 314, _2, _5); + ZEPHIR_CALL_METHOD(NULL, _0, "__construct", NULL, 312, _2, _5); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_libmemcached"), _0 TSRMLS_CC); ZEPHIR_INIT_VAR(_6); @@ -134024,9 +134333,9 @@ static PHP_METHOD(Phalcon_Session_Adapter_Libmemcached, __construct) { ZEPHIR_INIT_NVAR(_7); ZVAL_STRING(_7, "gc", 1); zephir_array_fast_append(_12, _7); - ZEPHIR_CALL_FUNCTION(NULL, "session_set_save_handler", NULL, 410, _6, _8, _9, _10, _11, _12); + ZEPHIR_CALL_FUNCTION(NULL, "session_set_save_handler", NULL, 407, _6, _8, _9, _10, _11, _12); zephir_check_call_status(); - ZEPHIR_CALL_PARENT(NULL, phalcon_session_adapter_libmemcached_ce, this_ptr, "__construct", &_13, 411, options); + ZEPHIR_CALL_PARENT(NULL, phalcon_session_adapter_libmemcached_ce, this_ptr, "__construct", &_13, 408, options); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -134216,9 +134525,9 @@ static PHP_METHOD(Phalcon_Session_Adapter_Memcache, __construct) { ZEPHIR_OBS_VAR(_6); zephir_read_property_this(&_6, this_ptr, SL("_lifetime"), PH_NOISY_CC); zephir_array_update_string(&_5, SL("lifetime"), &_6, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, _4, "__construct", NULL, 313, _5); + ZEPHIR_CALL_METHOD(NULL, _4, "__construct", NULL, 311, _5); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, _3, "__construct", NULL, 316, _4, options); + ZEPHIR_CALL_METHOD(NULL, _3, "__construct", NULL, 314, _4, options); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_memcache"), _3 TSRMLS_CC); ZEPHIR_INIT_VAR(_7); @@ -134257,9 +134566,9 @@ static PHP_METHOD(Phalcon_Session_Adapter_Memcache, __construct) { ZEPHIR_INIT_NVAR(_8); ZVAL_STRING(_8, "gc", 1); zephir_array_fast_append(_13, _8); - ZEPHIR_CALL_FUNCTION(NULL, "session_set_save_handler", NULL, 410, _7, _9, _10, _11, _12, _13); + ZEPHIR_CALL_FUNCTION(NULL, "session_set_save_handler", NULL, 407, _7, _9, _10, _11, _12, _13); zephir_check_call_status(); - ZEPHIR_CALL_PARENT(NULL, phalcon_session_adapter_memcache_ce, this_ptr, "__construct", &_14, 411, options); + ZEPHIR_CALL_PARENT(NULL, phalcon_session_adapter_memcache_ce, this_ptr, "__construct", &_14, 408, options); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -134451,7 +134760,7 @@ static PHP_METHOD(Phalcon_Session_Adapter_Redis, __construct) { ZEPHIR_CALL_METHOD(NULL, _3, "__construct", NULL, 0, _4); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, _2, "__construct", NULL, 317, _3, options); + ZEPHIR_CALL_METHOD(NULL, _2, "__construct", NULL, 315, _3, options); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_redis"), _2 TSRMLS_CC); ZEPHIR_INIT_VAR(_6); @@ -134490,9 +134799,9 @@ static PHP_METHOD(Phalcon_Session_Adapter_Redis, __construct) { ZEPHIR_INIT_NVAR(_7); ZVAL_STRING(_7, "gc", 1); zephir_array_fast_append(_12, _7); - ZEPHIR_CALL_FUNCTION(NULL, "session_set_save_handler", NULL, 410, _6, _8, _9, _10, _11, _12); + ZEPHIR_CALL_FUNCTION(NULL, "session_set_save_handler", NULL, 407, _6, _8, _9, _10, _11, _12); zephir_check_call_status(); - ZEPHIR_CALL_PARENT(NULL, phalcon_session_adapter_redis_ce, this_ptr, "__construct", &_13, 411, options); + ZEPHIR_CALL_PARENT(NULL, phalcon_session_adapter_redis_ce, this_ptr, "__construct", &_13, 408, options); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -134743,7 +135052,7 @@ static PHP_METHOD(Phalcon_Tag_Select, selectField) { ZEPHIR_GET_CONSTANT(_10$$24, "PHP_EOL"); ZEPHIR_INIT_VAR(_11$$24); ZEPHIR_CONCAT_SV(_11$$24, "", _10$$24); - ZEPHIR_CALL_SELF(&_8$$24, "_optionsfromresultset", &_9, 416, options, using, value, _11$$24); + ZEPHIR_CALL_SELF(&_8$$24, "_optionsfromresultset", &_9, 413, options, using, value, _11$$24); zephir_check_call_status(); zephir_concat_self(&code, _8$$24 TSRMLS_CC); } else { @@ -134752,7 +135061,7 @@ static PHP_METHOD(Phalcon_Tag_Select, selectField) { ZEPHIR_GET_CONSTANT(_14$$26, "PHP_EOL"); ZEPHIR_INIT_VAR(_15$$26); ZEPHIR_CONCAT_SV(_15$$26, "", _14$$26); - ZEPHIR_CALL_SELF(&_12$$26, "_optionsfromarray", &_13, 417, options, value, _15$$26); + ZEPHIR_CALL_SELF(&_12$$26, "_optionsfromarray", &_13, 414, options, value, _15$$26); zephir_check_call_status(); zephir_concat_self(&code, _12$$26 TSRMLS_CC); } else { @@ -134890,12 +135199,12 @@ static PHP_METHOD(Phalcon_Tag_Select, _optionsFromArray) { ) { ZEPHIR_GET_HMKEY(optionValue, _1, _0); ZEPHIR_GET_HVALUE(optionText, _2); - ZEPHIR_CALL_FUNCTION(&escaped, "htmlspecialchars", &_3, 183, optionValue); + ZEPHIR_CALL_FUNCTION(&escaped, "htmlspecialchars", &_3, 178, optionValue); zephir_check_call_status(); if (Z_TYPE_P(optionText) == IS_ARRAY) { ZEPHIR_INIT_NVAR(_4$$4); ZEPHIR_GET_CONSTANT(_4$$4, "PHP_EOL"); - ZEPHIR_CALL_SELF(&_5$$4, "_optionsfromarray", &_6, 417, optionText, value, closeOption); + ZEPHIR_CALL_SELF(&_5$$4, "_optionsfromarray", &_6, 414, optionText, value, closeOption); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_7$$4); ZEPHIR_GET_CONSTANT(_7$$4, "PHP_EOL"); @@ -135282,7 +135591,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Csv, __construct) { options = options_param; - ZEPHIR_CALL_PARENT(NULL, phalcon_translate_adapter_csv_ce, this_ptr, "__construct", &_0, 426, options); + ZEPHIR_CALL_PARENT(NULL, phalcon_translate_adapter_csv_ce, this_ptr, "__construct", &_0, 423, options); zephir_check_call_status(); if (!(zephir_array_isset_string(options, SS("content")))) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_translate_exception_ce, "Parameter 'content' is required", "phalcon/translate/adapter/csv.zep", 43); @@ -135295,7 +135604,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Csv, __construct) { ZVAL_STRING(_3, ";", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_INIT_VAR(_4); ZVAL_STRING(_4, "\"", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "_load", NULL, 427, _1, _2, _3, _4); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "_load", NULL, 424, _1, _2, _3, _4); zephir_check_temp_parameter(_3); zephir_check_temp_parameter(_4); zephir_check_call_status(); @@ -135317,7 +135626,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Csv, _load) { ZEPHIR_SINIT_VAR(_0); ZVAL_STRING(&_0, "rb", 0); - ZEPHIR_CALL_FUNCTION(&fileHandler, "fopen", NULL, 286, file, &_0); + ZEPHIR_CALL_FUNCTION(&fileHandler, "fopen", NULL, 281, file, &_0); zephir_check_call_status(); if (Z_TYPE_P(fileHandler) != IS_RESOURCE) { ZEPHIR_INIT_VAR(_1$$3); @@ -135331,7 +135640,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Csv, _load) { return; } while (1) { - ZEPHIR_CALL_FUNCTION(&data, "fgetcsv", &_3, 428, fileHandler, length, delimiter, enclosure); + ZEPHIR_CALL_FUNCTION(&data, "fgetcsv", &_3, 425, fileHandler, length, delimiter, enclosure); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(data)) { break; @@ -135420,7 +135729,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Csv, exists) { } -static zend_object_value zephir_init_properties_Phalcon_Translate_Adapter_Csv(zend_class_entry *class_type TSRMLS_DC) { +zend_object_value zephir_init_properties_Phalcon_Translate_Adapter_Csv(zend_class_entry *class_type TSRMLS_DC) { zval *_0, *_1$$3; @@ -135522,9 +135831,9 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, __construct) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_translate_exception_ce, "This class requires the gettext extension for PHP", "phalcon/translate/adapter/gettext.zep", 60); return; } - ZEPHIR_CALL_PARENT(NULL, phalcon_translate_adapter_gettext_ce, this_ptr, "__construct", &_0, 426, options); + ZEPHIR_CALL_PARENT(NULL, phalcon_translate_adapter_gettext_ce, this_ptr, "__construct", &_0, 423, options); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "prepareoptions", NULL, 429, options); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "prepareoptions", NULL, 0, options); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -135556,19 +135865,19 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, query) { ZEPHIR_INIT_VAR(domain); ZVAL_NULL(domain); - ZEPHIR_CALL_FUNCTION(&_0, "func_num_args", NULL, 421); + ZEPHIR_CALL_FUNCTION(&_0, "func_num_args", NULL, 418); zephir_check_call_status(); if (ZEPHIR_GT_LONG(_0, 2)) { ZEPHIR_SINIT_VAR(_1$$3); ZVAL_LONG(&_1$$3, 2); - ZEPHIR_CALL_FUNCTION(&domain, "func_get_arg", NULL, 420, &_1$$3); + ZEPHIR_CALL_FUNCTION(&domain, "func_get_arg", NULL, 417, &_1$$3); zephir_check_call_status(); } if (!(zephir_is_true(domain))) { - ZEPHIR_CALL_FUNCTION(&translation, "gettext", NULL, 430, index); + ZEPHIR_CALL_FUNCTION(&translation, "gettext", NULL, 426, index); zephir_check_call_status(); } else { - ZEPHIR_CALL_FUNCTION(&translation, "dgettext", NULL, 431, domain, index); + ZEPHIR_CALL_FUNCTION(&translation, "dgettext", NULL, 427, domain, index); zephir_check_call_status(); } ZEPHIR_RETURN_CALL_METHOD(this_ptr, "replaceplaceholders", NULL, 0, translation, placeholders); @@ -135661,12 +135970,12 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, nquery) { if (!(!(!domain) && Z_STRLEN_P(domain))) { ZEPHIR_SINIT_VAR(_0$$3); ZVAL_LONG(&_0$$3, count); - ZEPHIR_CALL_FUNCTION(&translation, "ngettext", NULL, 432, msgid1, msgid2, &_0$$3); + ZEPHIR_CALL_FUNCTION(&translation, "ngettext", NULL, 428, msgid1, msgid2, &_0$$3); zephir_check_call_status(); } else { ZEPHIR_SINIT_VAR(_1$$4); ZVAL_LONG(&_1$$4, count); - ZEPHIR_CALL_FUNCTION(&translation, "dngettext", NULL, 433, domain, msgid1, msgid2, &_1$$4); + ZEPHIR_CALL_FUNCTION(&translation, "dngettext", NULL, 429, domain, msgid1, msgid2, &_1$$4); zephir_check_call_status(); } ZEPHIR_RETURN_CALL_METHOD(this_ptr, "replaceplaceholders", NULL, 0, translation, placeholders); @@ -135685,7 +135994,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, setDomain) { - ZEPHIR_RETURN_CALL_FUNCTION("textdomain", NULL, 434, domain); + ZEPHIR_RETURN_CALL_FUNCTION("textdomain", NULL, 430, domain); zephir_check_call_status(); RETURN_MM(); @@ -135700,7 +136009,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, resetDomain) { ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdefaultdomain", NULL, 0); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("textdomain", NULL, 434, _0); + ZEPHIR_RETURN_CALL_FUNCTION("textdomain", NULL, 430, _0); zephir_check_call_status(); RETURN_MM(); @@ -135756,13 +136065,13 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, setDirectory) { ) { ZEPHIR_GET_HMKEY(key, _1$$4, _0$$4); ZEPHIR_GET_HVALUE(value, _2$$4); - ZEPHIR_CALL_FUNCTION(NULL, "bindtextdomain", &_3, 435, key, value); + ZEPHIR_CALL_FUNCTION(NULL, "bindtextdomain", &_3, 431, key, value); zephir_check_call_status(); } } else { ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "getdefaultdomain", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "bindtextdomain", &_3, 435, _4$$6, directory); + ZEPHIR_CALL_FUNCTION(NULL, "bindtextdomain", &_3, 431, _4$$6, directory); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -135797,7 +136106,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, setLocale) { ZEPHIR_INIT_VAR(_0); - ZEPHIR_CALL_FUNCTION(&_1, "func_get_args", NULL, 168); + ZEPHIR_CALL_FUNCTION(&_1, "func_get_args", NULL, 163); zephir_check_call_status(); ZEPHIR_SINIT_VAR(_2); ZVAL_STRING(&_2, "setlocale", 0); @@ -135810,22 +136119,22 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, setLocale) { _3 = zephir_fetch_nproperty_this(this_ptr, SL("_locale"), PH_NOISY_CC); ZEPHIR_INIT_VAR(_4); ZEPHIR_CONCAT_SV(_4, "LC_ALL=", _3); - ZEPHIR_CALL_FUNCTION(NULL, "putenv", &_5, 436, _4); + ZEPHIR_CALL_FUNCTION(NULL, "putenv", &_5, 432, _4); zephir_check_call_status(); _6 = zephir_fetch_nproperty_this(this_ptr, SL("_locale"), PH_NOISY_CC); ZEPHIR_INIT_VAR(_7); ZEPHIR_CONCAT_SV(_7, "LANG=", _6); - ZEPHIR_CALL_FUNCTION(NULL, "putenv", &_5, 436, _7); + ZEPHIR_CALL_FUNCTION(NULL, "putenv", &_5, 432, _7); zephir_check_call_status(); _8 = zephir_fetch_nproperty_this(this_ptr, SL("_locale"), PH_NOISY_CC); ZEPHIR_INIT_VAR(_9); ZEPHIR_CONCAT_SV(_9, "LANGUAGE=", _8); - ZEPHIR_CALL_FUNCTION(NULL, "putenv", &_5, 436, _9); + ZEPHIR_CALL_FUNCTION(NULL, "putenv", &_5, 432, _9); zephir_check_call_status(); _10 = zephir_fetch_nproperty_this(this_ptr, SL("_locale"), PH_NOISY_CC); ZEPHIR_SINIT_VAR(_11); ZVAL_LONG(&_11, 0); - ZEPHIR_CALL_FUNCTION(NULL, "setlocale", NULL, 415, &_11, _10); + ZEPHIR_CALL_FUNCTION(NULL, "setlocale", NULL, 412, &_11, _10); zephir_check_call_status(); RETURN_MM_MEMBER(this_ptr, "_locale"); @@ -135852,7 +136161,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, prepareOptions) { return; } ZEPHIR_INIT_VAR(_0); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "getoptionsdefault", NULL, 437); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "getoptionsdefault", NULL, 433); zephir_check_call_status(); zephir_fast_array_merge(_0, &(_1), &(options) TSRMLS_CC); ZEPHIR_CPY_WRT(options, _0); @@ -135923,7 +136232,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_NativeArray, __construct) { options = options_param; - ZEPHIR_CALL_PARENT(NULL, phalcon_translate_adapter_nativearray_ce, this_ptr, "__construct", &_0, 426, options); + ZEPHIR_CALL_PARENT(NULL, phalcon_translate_adapter_nativearray_ce, this_ptr, "__construct", &_0, 423, options); zephir_check_call_status(); ZEPHIR_OBS_VAR(data); if (!(zephir_array_isset_string_fetch(&data, options, SS("content"), 0 TSRMLS_CC))) { @@ -136125,7 +136434,7 @@ static PHP_METHOD(Phalcon_Translate_Interpolator_IndexedArray, replacePlaceholde } if (_0) { ZEPHIR_MAKE_REF(placeholders); - ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 379, placeholders, translation); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 376, placeholders, translation); ZEPHIR_UNREF(placeholders); zephir_check_call_status(); ZEPHIR_SINIT_VAR(_1$$3); @@ -136387,7 +136696,7 @@ static PHP_METHOD(Phalcon_Validation_Message, __set_state) { zephir_array_fetch_string(&_0, message, SL("_message"), PH_NOISY | PH_READONLY, "phalcon/validation/message.zep", 134 TSRMLS_CC); zephir_array_fetch_string(&_1, message, SL("_field"), PH_NOISY | PH_READONLY, "phalcon/validation/message.zep", 134 TSRMLS_CC); zephir_array_fetch_string(&_2, message, SL("_type"), PH_NOISY | PH_READONLY, "phalcon/validation/message.zep", 134 TSRMLS_CC); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 438, _0, _1, _2); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 434, _0, _1, _2); zephir_check_call_status(); RETURN_MM(); @@ -136781,7 +137090,7 @@ static PHP_METHOD(Phalcon_Validation_Message_Group, appendMessages) { ZEPHIR_OBS_VAR(currentMessages); zephir_read_property_this(¤tMessages, this_ptr, SL("_messages"), PH_NOISY_CC); if (Z_TYPE_P(messages) == IS_ARRAY) { - if (ZEPHIR_IS_STRING(currentMessages, "array")) { + if (Z_TYPE_P(currentMessages) == IS_ARRAY) { ZEPHIR_INIT_VAR(finalMessages); zephir_fast_array_merge(finalMessages, &(currentMessages), &(messages) TSRMLS_CC); } else { @@ -136991,7 +137300,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Alnum, validate) { if (_2) { RETURN_MM_BOOL(1); } - ZEPHIR_CALL_FUNCTION(&_3, "ctype_alnum", NULL, 439, value); + ZEPHIR_CALL_FUNCTION(&_3, "ctype_alnum", NULL, 435, value); zephir_check_call_status(); if (!(zephir_is_true(_3))) { ZEPHIR_INIT_VAR(_4$$4); @@ -137024,7 +137333,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Alnum, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_7$$4); ZVAL_STRING(_7$$4, "Alnum", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _4$$4, "__construct", NULL, 438, _6$$4, field, _7$$4); + ZEPHIR_CALL_METHOD(NULL, _4$$4, "__construct", NULL, 434, _6$$4, field, _7$$4); zephir_check_temp_parameter(_7$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _4$$4); @@ -137093,7 +137402,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Alpha, validate) { if (_2) { RETURN_MM_BOOL(1); } - ZEPHIR_CALL_FUNCTION(&_3, "ctype_alpha", NULL, 440, value); + ZEPHIR_CALL_FUNCTION(&_3, "ctype_alpha", NULL, 436, value); zephir_check_call_status(); if (!(zephir_is_true(_3))) { ZEPHIR_INIT_VAR(_4$$4); @@ -137126,7 +137435,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Alpha, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_7$$4); ZVAL_STRING(_7$$4, "Alpha", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _4$$4, "__construct", NULL, 438, _6$$4, field, _7$$4); + ZEPHIR_CALL_METHOD(NULL, _4$$4, "__construct", NULL, 434, _6$$4, field, _7$$4); zephir_check_temp_parameter(_7$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _4$$4); @@ -137242,7 +137551,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Between, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_7$$4); ZVAL_STRING(_7$$4, "Between", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _4$$4, "__construct", NULL, 438, _6$$4, field, _7$$4); + ZEPHIR_CALL_METHOD(NULL, _4$$4, "__construct", NULL, 434, _6$$4, field, _7$$4); zephir_check_temp_parameter(_7$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _4$$4); @@ -137305,7 +137614,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Confirmation, validate) { zephir_check_call_status(); ZEPHIR_CALL_METHOD(&valueWith, validation, "getvalue", NULL, 0, fieldWith); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "compare", NULL, 441, value, valueWith); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "compare", NULL, 437, value, valueWith); zephir_check_call_status(); if (!(zephir_is_true(_1))) { ZEPHIR_INIT_VAR(_2$$3); @@ -137348,7 +137657,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Confirmation, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_5$$3); ZVAL_STRING(_5$$3, "Confirmation", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _2$$3, "__construct", NULL, 438, _4$$3, field, _5$$3); + ZEPHIR_CALL_METHOD(NULL, _2$$3, "__construct", NULL, 434, _4$$3, field, _5$$3); zephir_check_temp_parameter(_5$$3); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _2$$3); @@ -137387,12 +137696,12 @@ static PHP_METHOD(Phalcon_Validation_Validator_Confirmation, compare) { } ZEPHIR_SINIT_VAR(_3$$3); ZVAL_STRING(&_3$$3, "utf-8", 0); - ZEPHIR_CALL_FUNCTION(&_4$$3, "mb_strtolower", &_5, 196, a, &_3$$3); + ZEPHIR_CALL_FUNCTION(&_4$$3, "mb_strtolower", &_5, 191, a, &_3$$3); zephir_check_call_status(); zephir_get_strval(a, _4$$3); ZEPHIR_SINIT_NVAR(_3$$3); ZVAL_STRING(&_3$$3, "utf-8", 0); - ZEPHIR_CALL_FUNCTION(&_6$$3, "mb_strtolower", &_5, 196, b, &_3$$3); + ZEPHIR_CALL_FUNCTION(&_6$$3, "mb_strtolower", &_5, 191, b, &_3$$3); zephir_check_call_status(); zephir_get_strval(b, _6$$3); } @@ -137445,7 +137754,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_CreditCard, validate) { ZEPHIR_CALL_METHOD(&value, validation, "getvalue", NULL, 0, field); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&valid, this_ptr, "verifybyluhnalgorithm", NULL, 442, value); + ZEPHIR_CALL_METHOD(&valid, this_ptr, "verifybyluhnalgorithm", NULL, 438, value); zephir_check_call_status(); if (!(zephir_is_true(valid))) { ZEPHIR_INIT_VAR(_0$$3); @@ -137478,7 +137787,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_CreditCard, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_3$$3); ZVAL_STRING(_3$$3, "CreditCard", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _0$$3, "__construct", NULL, 438, _2$$3, field, _3$$3); + ZEPHIR_CALL_METHOD(NULL, _0$$3, "__construct", NULL, 434, _2$$3, field, _3$$3); zephir_check_temp_parameter(_3$$3); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _0$$3); @@ -137509,7 +137818,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_CreditCard, verifyByLuhnAlgorithm ZEPHIR_CPY_WRT(digits, _2); ZEPHIR_INIT_VAR(hash); ZVAL_STRING(hash, "", 1); - ZEPHIR_CALL_FUNCTION(&_4, "array_reverse", NULL, 443, digits); + ZEPHIR_CALL_FUNCTION(&_4, "array_reverse", NULL, 439, digits); zephir_check_call_status(); zephir_is_iterable(_4, &_6, &_5, 0, 0, "phalcon/validation/validator/creditcard.zep", 87); for ( @@ -137529,7 +137838,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_CreditCard, verifyByLuhnAlgorithm } ZEPHIR_CALL_FUNCTION(&_9, "str_split", &_1, 71, hash); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&result, "array_sum", NULL, 444, _9); + ZEPHIR_CALL_FUNCTION(&result, "array_sum", NULL, 440, _9); zephir_check_call_status(); RETURN_MM_BOOL((zephir_safe_mod_zval_long(result, 10 TSRMLS_CC) == 0)); @@ -137538,6 +137847,140 @@ static PHP_METHOD(Phalcon_Validation_Validator_CreditCard, verifyByLuhnAlgorithm +#ifdef HAVE_CONFIG_H +#endif + +#include + +#include +#include +#include + + + +ZEPHIR_INIT_CLASS(Phalcon_Validation_Validator_Date) { + + ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Validation\\Validator, Date, phalcon, validation_validator_date, phalcon_validation_validator_ce, phalcon_validation_validator_date_method_entry, 0); + + zend_declare_class_constant_string(phalcon_validation_validator_date_ce, SL("DEFAULT_DATE_FORMAT"), "Y-m-d" TSRMLS_CC); + + return SUCCESS; + +} + +static PHP_METHOD(Phalcon_Validation_Validator_Date, validate) { + + int ZEPHIR_LAST_CALL_STATUS; + zval *field = NULL; + zval *validation, *field_param = NULL, *value = NULL, *format = NULL, *label = NULL, *message = NULL, *replacePairs = NULL, *_0, *_1 = NULL, *_2$$4 = NULL, *_4$$4 = NULL, *_5$$4, *_3$$6; + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 2, 0, &validation, &field_param); + + if (unlikely(Z_TYPE_P(field_param) != IS_STRING && Z_TYPE_P(field_param) != IS_NULL)) { + zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'field' must be a string") TSRMLS_CC); + RETURN_MM_NULL(); + } + if (likely(Z_TYPE_P(field_param) == IS_STRING)) { + zephir_get_strval(field, field_param); + } else { + ZEPHIR_INIT_VAR(field); + ZVAL_EMPTY_STRING(field); + } + + + ZEPHIR_CALL_METHOD(&value, validation, "getvalue", NULL, 0, field); + zephir_check_call_status(); + ZEPHIR_INIT_VAR(_0); + ZVAL_STRING(_0, "format", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(&format, this_ptr, "getoption", NULL, 0, _0); + zephir_check_temp_parameter(_0); + zephir_check_call_status(); + if (ZEPHIR_IS_EMPTY(format)) { + ZEPHIR_INIT_NVAR(format); + ZVAL_STRING(format, "Y-m-d", 1); + } + ZEPHIR_CALL_METHOD(&_1, this_ptr, "checkdate", NULL, 441, value, format); + zephir_check_call_status(); + if (!(zephir_is_true(_1))) { + ZEPHIR_INIT_VAR(_2$$4); + ZVAL_STRING(_2$$4, "label", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(&label, this_ptr, "getoption", NULL, 0, _2$$4); + zephir_check_temp_parameter(_2$$4); + zephir_check_call_status(); + if (ZEPHIR_IS_EMPTY(label)) { + ZEPHIR_CALL_METHOD(&label, validation, "getlabel", NULL, 0, field); + zephir_check_call_status(); + } + ZEPHIR_INIT_NVAR(_2$$4); + ZVAL_STRING(_2$$4, "message", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(&message, this_ptr, "getoption", NULL, 0, _2$$4); + zephir_check_temp_parameter(_2$$4); + zephir_check_call_status(); + ZEPHIR_INIT_VAR(replacePairs); + zephir_create_array(replacePairs, 1, 0 TSRMLS_CC); + zephir_array_update_string(&replacePairs, SL(":field"), &label, PH_COPY | PH_SEPARATE); + if (ZEPHIR_IS_EMPTY(message)) { + ZEPHIR_INIT_VAR(_3$$6); + ZVAL_STRING(_3$$6, "Date", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(&message, validation, "getdefaultmessage", NULL, 0, _3$$6); + zephir_check_temp_parameter(_3$$6); + zephir_check_call_status(); + } + ZEPHIR_INIT_NVAR(_2$$4); + object_init_ex(_2$$4, phalcon_validation_message_ce); + ZEPHIR_CALL_FUNCTION(&_4$$4, "strtr", NULL, 55, message, replacePairs); + zephir_check_call_status(); + ZEPHIR_INIT_VAR(_5$$4); + ZVAL_STRING(_5$$4, "Date", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(NULL, _2$$4, "__construct", NULL, 434, _4$$4, field, _5$$4); + zephir_check_temp_parameter(_5$$4); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _2$$4); + zephir_check_call_status(); + RETURN_MM_BOOL(0); + } + RETURN_MM_BOOL(1); + +} + +static PHP_METHOD(Phalcon_Validation_Validator_Date, checkDate) { + + zend_bool _3; + zend_class_entry *_0, *_1; + int ZEPHIR_LAST_CALL_STATUS; + zval *value, *format, *date = NULL, *errors = NULL, *_2, *_4; + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 2, 0, &value, &format); + + + + if (!(Z_TYPE_P(value) == IS_STRING)) { + RETURN_MM_BOOL(0); + } + _0 = zend_fetch_class(SL("DateTime"), ZEND_FETCH_CLASS_AUTO TSRMLS_CC); + ZEPHIR_CALL_CE_STATIC(&date, _0, "createfromformat", NULL, 0, format, value); + zephir_check_call_status(); + _1 = zend_fetch_class(SL("DateTime"), ZEND_FETCH_CLASS_AUTO TSRMLS_CC); + ZEPHIR_CALL_CE_STATIC(&errors, _1, "getlasterrors", NULL, 0); + zephir_check_call_status(); + zephir_array_fetch_string(&_2, errors, SL("warning_count"), PH_NOISY | PH_READONLY, "phalcon/validation/validator/date.zep", 90 TSRMLS_CC); + _3 = ZEPHIR_GT_LONG(_2, 0); + if (!(_3)) { + zephir_array_fetch_string(&_4, errors, SL("error_count"), PH_NOISY | PH_READONLY, "phalcon/validation/validator/date.zep", 90 TSRMLS_CC); + _3 = ZEPHIR_GT_LONG(_4, 0); + } + if (_3) { + RETURN_MM_BOOL(0); + } + RETURN_MM_BOOL(1); + +} + + + + #ifdef HAVE_CONFIG_H #endif @@ -137593,7 +138036,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Digit, validate) { if (_2) { RETURN_MM_BOOL(1); } - ZEPHIR_CALL_FUNCTION(&_3, "ctype_digit", NULL, 445, value); + ZEPHIR_CALL_FUNCTION(&_3, "ctype_digit", NULL, 442, value); zephir_check_call_status(); if (!(zephir_is_true(_3))) { ZEPHIR_INIT_VAR(_4$$4); @@ -137626,7 +138069,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Digit, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_7$$4); ZVAL_STRING(_7$$4, "Digit", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _4$$4, "__construct", NULL, 438, _6$$4, field, _7$$4); + ZEPHIR_CALL_METHOD(NULL, _4$$4, "__construct", NULL, 434, _6$$4, field, _7$$4); zephir_check_temp_parameter(_7$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _4$$4); @@ -137697,7 +138140,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Email, validate) { } ZEPHIR_SINIT_VAR(_3); ZVAL_LONG(&_3, 274); - ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 193, value, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 188, value, &_3); zephir_check_call_status(); if (!(zephir_is_true(_4))) { ZEPHIR_INIT_VAR(_5$$4); @@ -137730,7 +138173,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Email, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_8$$4); ZVAL_STRING(_8$$4, "Email", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _5$$4, "__construct", NULL, 438, _7$$4, field, _8$$4); + ZEPHIR_CALL_METHOD(NULL, _5$$4, "__construct", NULL, 434, _7$$4, field, _8$$4); zephir_check_temp_parameter(_8$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _5$$4); @@ -137826,7 +138269,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_ExclusionIn, validate) { zephir_check_temp_parameter(_4$$5); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 358, value, domain, strict); + ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 356, value, domain, strict); zephir_check_call_status(); if (zephir_is_true(_5)) { ZEPHIR_INIT_VAR(_6$$7); @@ -137862,7 +138305,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_ExclusionIn, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_9$$7); ZVAL_STRING(_9$$7, "ExclusionIn", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _6$$7, "__construct", NULL, 438, _8$$7, field, _9$$7); + ZEPHIR_CALL_METHOD(NULL, _6$$7, "__construct", NULL, 434, _8$$7, field, _9$$7); zephir_check_temp_parameter(_9$$7); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _6$$7); @@ -137977,7 +138420,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_13$$4); ZVAL_STRING(_13$$4, "FileIniSize", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _9$$4, "__construct", &_14, 438, _11$$4, field, _13$$4); + ZEPHIR_CALL_METHOD(NULL, _9$$4, "__construct", &_14, 434, _11$$4, field, _13$$4); zephir_check_temp_parameter(_13$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _9$$4); @@ -138017,7 +138460,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { _23 = _21; if (!(_23)) { zephir_array_fetch_string(&_24, value, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/validation/validator/file.zep", 79 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_25, "is_uploaded_file", NULL, 234, _24); + ZEPHIR_CALL_FUNCTION(&_25, "is_uploaded_file", NULL, 229, _24); zephir_check_call_status(); _23 = !zephir_is_true(_25); } @@ -138043,7 +138486,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_29$$7); ZVAL_STRING(_29$$7, "FileEmpty", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _26$$7, "__construct", &_14, 438, _28$$7, field, _29$$7); + ZEPHIR_CALL_METHOD(NULL, _26$$7, "__construct", &_14, 434, _28$$7, field, _29$$7); zephir_check_temp_parameter(_29$$7); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _26$$7); @@ -138080,7 +138523,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_35$$9); ZVAL_STRING(_35$$9, "FileValid", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _32$$9, "__construct", &_14, 438, _34$$9, field, _35$$9); + ZEPHIR_CALL_METHOD(NULL, _32$$9, "__construct", &_14, 434, _34$$9, field, _35$$9); zephir_check_temp_parameter(_35$$9); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _32$$9); @@ -138126,7 +138569,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { zephir_array_fetch_long(&unit, matches, 2, PH_NOISY, "phalcon/validation/validator/file.zep", 115 TSRMLS_CC); } zephir_array_fetch_long(&_41$$11, matches, 1, PH_NOISY | PH_READONLY, "phalcon/validation/validator/file.zep", 118 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_42$$11, "floatval", &_43, 305, _41$$11); + ZEPHIR_CALL_FUNCTION(&_42$$11, "floatval", &_43, 301, _41$$11); zephir_check_call_status(); ZEPHIR_INIT_VAR(_44$$11); zephir_array_fetch(&_45$$11, byteUnits, unit, PH_NOISY | PH_READONLY, "phalcon/validation/validator/file.zep", 118 TSRMLS_CC); @@ -138136,9 +138579,9 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { ZEPHIR_INIT_VAR(bytes); mul_function(bytes, _42$$11, _44$$11 TSRMLS_CC); zephir_array_fetch_string(&_47$$11, value, SL("size"), PH_NOISY | PH_READONLY, "phalcon/validation/validator/file.zep", 120 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_42$$11, "floatval", &_43, 305, _47$$11); + ZEPHIR_CALL_FUNCTION(&_42$$11, "floatval", &_43, 301, _47$$11); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_48$$11, "floatval", &_43, 305, bytes); + ZEPHIR_CALL_FUNCTION(&_48$$11, "floatval", &_43, 301, bytes); zephir_check_call_status(); if (ZEPHIR_GT(_42$$11, _48$$11)) { ZEPHIR_INIT_VAR(_49$$13); @@ -138163,7 +138606,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_52$$13); ZVAL_STRING(_52$$13, "FileSize", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _49$$13, "__construct", &_14, 438, _51$$13, field, _52$$13); + ZEPHIR_CALL_METHOD(NULL, _49$$13, "__construct", &_14, 434, _51$$13, field, _52$$13); zephir_check_temp_parameter(_52$$13); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _49$$13); @@ -138189,12 +138632,12 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { if ((zephir_function_exists_ex(SS("finfo_open") TSRMLS_CC) == SUCCESS)) { ZEPHIR_SINIT_VAR(_55$$17); ZVAL_LONG(&_55$$17, 16); - ZEPHIR_CALL_FUNCTION(&tmp, "finfo_open", NULL, 231, &_55$$17); + ZEPHIR_CALL_FUNCTION(&tmp, "finfo_open", NULL, 226, &_55$$17); zephir_check_call_status(); zephir_array_fetch_string(&_56$$17, value, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/validation/validator/file.zep", 143 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 232, tmp, _56$$17); + ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 227, tmp, _56$$17); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 233, tmp); + ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 228, tmp); zephir_check_call_status(); } else { ZEPHIR_OBS_NVAR(mime); @@ -138225,7 +138668,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_60$$19); ZVAL_STRING(_60$$19, "FileType", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _57$$19, "__construct", &_14, 438, _59$$19, field, _60$$19); + ZEPHIR_CALL_METHOD(NULL, _57$$19, "__construct", &_14, 434, _59$$19, field, _60$$19); zephir_check_temp_parameter(_60$$19); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _57$$19); @@ -138249,7 +138692,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { } if (_62) { zephir_array_fetch_string(&_64$$21, value, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/validation/validator/file.zep", 164 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 242, _64$$21); + ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 237, _64$$21); zephir_check_call_status(); ZEPHIR_OBS_VAR(width); zephir_array_fetch_long(&width, tmp, 0, PH_NOISY, "phalcon/validation/validator/file.zep", 165 TSRMLS_CC); @@ -138310,7 +138753,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_73$$24); ZVAL_STRING(_73$$24, "FileMinResolution", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _70$$24, "__construct", &_14, 438, _71$$24, field, _73$$24); + ZEPHIR_CALL_METHOD(NULL, _70$$24, "__construct", &_14, 434, _71$$24, field, _73$$24); zephir_check_temp_parameter(_73$$24); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _70$$24); @@ -138366,7 +138809,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_81$$27); ZVAL_STRING(_81$$27, "FileMaxResolution", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _78$$27, "__construct", &_14, 438, _79$$27, field, _81$$27); + ZEPHIR_CALL_METHOD(NULL, _78$$27, "__construct", &_14, 434, _79$$27, field, _81$$27); zephir_check_temp_parameter(_81$$27); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _78$$27); @@ -138483,7 +138926,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Identical, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_11$$6); ZVAL_STRING(_11$$6, "Identical", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _8$$6, "__construct", NULL, 438, _10$$6, field, _11$$6); + ZEPHIR_CALL_METHOD(NULL, _8$$6, "__construct", NULL, 434, _10$$6, field, _11$$6); zephir_check_temp_parameter(_11$$6); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _8$$6); @@ -138579,7 +139022,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_InclusionIn, validate) { zephir_check_temp_parameter(_4$$5); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 358, value, domain, strict); + ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 356, value, domain, strict); zephir_check_call_status(); if (!(zephir_is_true(_5))) { ZEPHIR_INIT_VAR(_6$$7); @@ -138615,7 +139058,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_InclusionIn, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_9$$7); ZVAL_STRING(_9$$7, "InclusionIn", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _6$$7, "__construct", NULL, 438, _8$$7, field, _9$$7); + ZEPHIR_CALL_METHOD(NULL, _6$$7, "__construct", NULL, 434, _8$$7, field, _9$$7); zephir_check_temp_parameter(_9$$7); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _6$$7); @@ -138720,7 +139163,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Numericality, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_8$$4); ZVAL_STRING(_8$$4, "Numericality", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _5$$4, "__construct", NULL, 438, _7$$4, field, _8$$4); + ZEPHIR_CALL_METHOD(NULL, _5$$4, "__construct", NULL, 434, _7$$4, field, _8$$4); zephir_check_temp_parameter(_8$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _5$$4); @@ -138812,7 +139255,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_PresenceOf, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_4$$3); ZVAL_STRING(_4$$3, "PresenceOf", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _1$$3, "__construct", NULL, 438, _3$$3, field, _4$$3); + ZEPHIR_CALL_METHOD(NULL, _1$$3, "__construct", NULL, 434, _3$$3, field, _4$$3); zephir_check_temp_parameter(_4$$3); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _1$$3); @@ -138927,7 +139370,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Regex, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_9$$6); ZVAL_STRING(_9$$6, "Regex", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _6$$6, "__construct", NULL, 438, _8$$6, field, _9$$6); + ZEPHIR_CALL_METHOD(NULL, _6$$6, "__construct", NULL, 434, _8$$6, field, _9$$6); zephir_check_temp_parameter(_9$$6); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _6$$6); @@ -139025,7 +139468,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_StringLength, validate) { zephir_check_call_status(); } if ((zephir_function_exists_ex(SS("mb_strlen") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 359, value); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 357, value); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(length); @@ -139060,7 +139503,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_StringLength, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_9$$9); ZVAL_STRING(_9$$9, "TooLong", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _5$$9, "__construct", &_10, 438, _7$$9, field, _9$$9); + ZEPHIR_CALL_METHOD(NULL, _5$$9, "__construct", &_10, 434, _7$$9, field, _9$$9); zephir_check_temp_parameter(_9$$9); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _5$$9); @@ -139097,7 +139540,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_StringLength, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_15$$12); ZVAL_STRING(_15$$12, "TooShort", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _12$$12, "__construct", &_10, 438, _14$$12, field, _15$$12); + ZEPHIR_CALL_METHOD(NULL, _12$$12, "__construct", &_10, 434, _14$$12, field, _15$$12); zephir_check_temp_parameter(_15$$12); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _12$$12); @@ -139237,7 +139680,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Uniqueness, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_12$$7); ZVAL_STRING(_12$$7, "Uniqueness", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _9$$7, "__construct", NULL, 438, _11$$7, field, _12$$7); + ZEPHIR_CALL_METHOD(NULL, _9$$7, "__construct", NULL, 434, _11$$7, field, _12$$7); zephir_check_temp_parameter(_12$$7); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _9$$7); @@ -139308,7 +139751,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Url, validate) { } ZEPHIR_SINIT_VAR(_3); ZVAL_LONG(&_3, 273); - ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 193, value, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 188, value, &_3); zephir_check_call_status(); if (!(zephir_is_true(_4))) { ZEPHIR_INIT_VAR(_5$$4); @@ -139341,7 +139784,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Url, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_8$$4); ZVAL_STRING(_8$$4, "Url", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _5$$4, "__construct", NULL, 438, _7$$4, field, _8$$4); + ZEPHIR_CALL_METHOD(NULL, _5$$4, "__construct", NULL, 434, _7$$4, field, _8$$4); zephir_check_temp_parameter(_8$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _5$$4); @@ -139386,9 +139829,9 @@ zend_class_entry *phalcon_cache_frontendinterface_ce; zend_class_entry *phalcon_annotations_adapterinterface_ce; zend_class_entry *phalcon_db_dialectinterface_ce; zend_class_entry *phalcon_dispatcherinterface_ce; +zend_class_entry *phalcon_logger_formatterinterface_ce; zend_class_entry *phalcon_db_adapterinterface_ce; zend_class_entry *phalcon_logger_adapterinterface_ce; -zend_class_entry *phalcon_logger_formatterinterface_ce; zend_class_entry *phalcon_mvc_entityinterface_ce; zend_class_entry *phalcon_mvc_model_resultsetinterface_ce; zend_class_entry *phalcon_session_adapterinterface_ce; @@ -139721,6 +140164,7 @@ zend_class_entry *phalcon_validation_validator_alpha_ce; zend_class_entry *phalcon_validation_validator_between_ce; zend_class_entry *phalcon_validation_validator_confirmation_ce; zend_class_entry *phalcon_validation_validator_creditcard_ce; +zend_class_entry *phalcon_validation_validator_date_ce; zend_class_entry *phalcon_validation_validator_digit_ce; zend_class_entry *phalcon_validation_validator_email_ce; zend_class_entry *phalcon_validation_validator_exclusionin_ce; @@ -139785,9 +140229,9 @@ static PHP_MINIT_FUNCTION(phalcon) ZEPHIR_INIT(Phalcon_Annotations_AdapterInterface); ZEPHIR_INIT(Phalcon_Db_DialectInterface); ZEPHIR_INIT(Phalcon_DispatcherInterface); + ZEPHIR_INIT(Phalcon_Logger_FormatterInterface); ZEPHIR_INIT(Phalcon_Db_AdapterInterface); ZEPHIR_INIT(Phalcon_Logger_AdapterInterface); - ZEPHIR_INIT(Phalcon_Logger_FormatterInterface); ZEPHIR_INIT(Phalcon_Mvc_EntityInterface); ZEPHIR_INIT(Phalcon_Mvc_Model_ResultsetInterface); ZEPHIR_INIT(Phalcon_Session_AdapterInterface); @@ -140119,6 +140563,7 @@ static PHP_MINIT_FUNCTION(phalcon) ZEPHIR_INIT(Phalcon_Validation_Validator_Between); ZEPHIR_INIT(Phalcon_Validation_Validator_Confirmation); ZEPHIR_INIT(Phalcon_Validation_Validator_CreditCard); + ZEPHIR_INIT(Phalcon_Validation_Validator_Date); ZEPHIR_INIT(Phalcon_Validation_Validator_Digit); ZEPHIR_INIT(Phalcon_Validation_Validator_Email); ZEPHIR_INIT(Phalcon_Validation_Validator_ExclusionIn); diff --git a/build/32bits/phalcon.zep.h b/build/32bits/phalcon.zep.h index 537f2625846..c85d23ded2a 100644 --- a/build/32bits/phalcon.zep.h +++ b/build/32bits/phalcon.zep.h @@ -430,7 +430,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Validator, getMessages); static PHP_METHOD(Phalcon_Mvc_Model_Validator, getOptions); static PHP_METHOD(Phalcon_Mvc_Model_Validator, getOption); static PHP_METHOD(Phalcon_Mvc_Model_Validator, isSetOption); -static zend_object_value zephir_init_properties_Phalcon_Mvc_Model_Validator(zend_class_entry *class_type TSRMLS_DC); +zend_object_value zephir_init_properties_Phalcon_Mvc_Model_Validator(zend_class_entry *class_type TSRMLS_DC); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_validator___construct, 0, 0, 1) ZEND_ARG_ARRAY_INFO(0, options, 0) @@ -1579,6 +1579,22 @@ ZEPHIR_INIT_FUNCS(phalcon_dispatcherinterface_method_entry) { PHP_FE_END }; +zend_class_entry *phalcon_logger_formatterinterface_ce; + +ZEPHIR_INIT_CLASS(Phalcon_Logger_FormatterInterface); + +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_formatterinterface_format, 0, 0, 3) + ZEND_ARG_INFO(0, message) + ZEND_ARG_INFO(0, type) + ZEND_ARG_INFO(0, timestamp) + ZEND_ARG_INFO(0, context) +ZEND_END_ARG_INFO() + +ZEPHIR_INIT_FUNCS(phalcon_logger_formatterinterface_method_entry) { + PHP_ABSTRACT_ME(Phalcon_Logger_FormatterInterface, format, arginfo_phalcon_logger_formatterinterface_format) + PHP_FE_END +}; + zend_class_entry *phalcon_annotations_adapter_ce; ZEPHIR_INIT_CLASS(Phalcon_Annotations_Adapter); @@ -2572,22 +2588,6 @@ ZEPHIR_INIT_FUNCS(phalcon_logger_formatter_method_entry) { PHP_FE_END }; -zend_class_entry *phalcon_logger_formatterinterface_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Logger_FormatterInterface); - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_formatterinterface_format, 0, 0, 3) - ZEND_ARG_INFO(0, message) - ZEND_ARG_INFO(0, type) - ZEND_ARG_INFO(0, timestamp) - ZEND_ARG_INFO(0, context) -ZEND_END_ARG_INFO() - -ZEPHIR_INIT_FUNCS(phalcon_logger_formatterinterface_method_entry) { - PHP_ABSTRACT_ME(Phalcon_Logger_FormatterInterface, format, arginfo_phalcon_logger_formatterinterface_format) - PHP_FE_END -}; - zend_class_entry *phalcon_mvc_entityinterface_ce; ZEPHIR_INIT_CLASS(Phalcon_Mvc_EntityInterface); @@ -7100,7 +7100,7 @@ static PHP_METHOD(Phalcon_Assets_Collection, setTargetLocal); static PHP_METHOD(Phalcon_Assets_Collection, join); static PHP_METHOD(Phalcon_Assets_Collection, getRealTargetPath); static PHP_METHOD(Phalcon_Assets_Collection, addFilter); -static zend_object_value zephir_init_properties_Phalcon_Assets_Collection(zend_class_entry *class_type TSRMLS_DC); +zend_object_value zephir_init_properties_Phalcon_Assets_Collection(zend_class_entry *class_type TSRMLS_DC); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_assets_collection_add, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, resource, Phalcon\\Assets\\Resource, 0) @@ -8787,6 +8787,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Db_Adapter_Pdo_Mysql); static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, escapeIdentifier); static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns); static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeIndexes); +static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeReferences); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_adapter_pdo_mysql_escapeidentifier, 0, 0, 1) ZEND_ARG_INFO(0, identifier) @@ -8802,10 +8803,16 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_adapter_pdo_mysql_describeindexes, 0, ZEND_ARG_INFO(0, schema) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_adapter_pdo_mysql_describereferences, 0, 0, 1) + ZEND_ARG_INFO(0, table) + ZEND_ARG_INFO(0, schema) +ZEND_END_ARG_INFO() + ZEPHIR_INIT_FUNCS(phalcon_db_adapter_pdo_mysql_method_entry) { PHP_ME(Phalcon_Db_Adapter_Pdo_Mysql, escapeIdentifier, arginfo_phalcon_db_adapter_pdo_mysql_escapeidentifier, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns, arginfo_phalcon_db_adapter_pdo_mysql_describecolumns, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Db_Adapter_Pdo_Mysql, describeIndexes, arginfo_phalcon_db_adapter_pdo_mysql_describeindexes, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Db_Adapter_Pdo_Mysql, describeReferences, arginfo_phalcon_db_adapter_pdo_mysql_describereferences, ZEND_ACC_PUBLIC) PHP_FE_END }; @@ -11590,7 +11597,7 @@ static PHP_METHOD(Phalcon_Http_Response_Headers, send); static PHP_METHOD(Phalcon_Http_Response_Headers, reset); static PHP_METHOD(Phalcon_Http_Response_Headers, toArray); static PHP_METHOD(Phalcon_Http_Response_Headers, __set_state); -static zend_object_value zephir_init_properties_Phalcon_Http_Response_Headers(zend_class_entry *class_type TSRMLS_DC); +zend_object_value zephir_init_properties_Phalcon_Http_Response_Headers(zend_class_entry *class_type TSRMLS_DC); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_response_headers_set, 0, 0, 2) ZEND_ARG_INFO(0, name) @@ -12283,8 +12290,10 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Multiple); static PHP_METHOD(Phalcon_Logger_Multiple, getLoggers); static PHP_METHOD(Phalcon_Logger_Multiple, getFormatter); +static PHP_METHOD(Phalcon_Logger_Multiple, getLogLevel); static PHP_METHOD(Phalcon_Logger_Multiple, push); static PHP_METHOD(Phalcon_Logger_Multiple, setFormatter); +static PHP_METHOD(Phalcon_Logger_Multiple, setLogLevel); static PHP_METHOD(Phalcon_Logger_Multiple, log); static PHP_METHOD(Phalcon_Logger_Multiple, critical); static PHP_METHOD(Phalcon_Logger_Multiple, emergency); @@ -12303,6 +12312,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_multiple_setformatter, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, formatter, Phalcon\\Logger\\FormatterInterface, 0) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_multiple_setloglevel, 0, 0, 1) + ZEND_ARG_INFO(0, level) +ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_multiple_log, 0, 0, 1) ZEND_ARG_INFO(0, type) ZEND_ARG_INFO(0, message) @@ -12352,8 +12365,10 @@ ZEND_END_ARG_INFO() ZEPHIR_INIT_FUNCS(phalcon_logger_multiple_method_entry) { PHP_ME(Phalcon_Logger_Multiple, getLoggers, NULL, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Logger_Multiple, getFormatter, NULL, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Logger_Multiple, getLogLevel, NULL, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Logger_Multiple, push, arginfo_phalcon_logger_multiple_push, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Logger_Multiple, setFormatter, arginfo_phalcon_logger_multiple_setformatter, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Logger_Multiple, setLogLevel, arginfo_phalcon_logger_multiple_setloglevel, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Logger_Multiple, log, arginfo_phalcon_logger_multiple_log, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Logger_Multiple, critical, arginfo_phalcon_logger_multiple_critical, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Logger_Multiple, emergency, arginfo_phalcon_logger_multiple_emergency, ZEND_ACC_PUBLIC) @@ -12746,6 +12761,7 @@ static PHP_METHOD(Phalcon_Mvc_Collection_Manager, initialize); static PHP_METHOD(Phalcon_Mvc_Collection_Manager, isInitialized); static PHP_METHOD(Phalcon_Mvc_Collection_Manager, getLastInitialized); static PHP_METHOD(Phalcon_Mvc_Collection_Manager, setConnectionService); +static PHP_METHOD(Phalcon_Mvc_Collection_Manager, getConnectionService); static PHP_METHOD(Phalcon_Mvc_Collection_Manager, useImplicitObjectIds); static PHP_METHOD(Phalcon_Mvc_Collection_Manager, isUsingImplicitObjectIds); static PHP_METHOD(Phalcon_Mvc_Collection_Manager, getConnection); @@ -12783,6 +12799,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_collection_manager_setconnectionservi ZEND_ARG_INFO(0, connectionService) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_collection_manager_getconnectionservice, 0, 0, 1) + ZEND_ARG_OBJ_INFO(0, model, Phalcon\\Mvc\\CollectionInterface, 0) +ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_collection_manager_useimplicitobjectids, 0, 0, 2) ZEND_ARG_OBJ_INFO(0, model, Phalcon\\Mvc\\CollectionInterface, 0) ZEND_ARG_INFO(0, useImplicitObjectIds) @@ -12823,6 +12843,7 @@ ZEPHIR_INIT_FUNCS(phalcon_mvc_collection_manager_method_entry) { PHP_ME(Phalcon_Mvc_Collection_Manager, isInitialized, arginfo_phalcon_mvc_collection_manager_isinitialized, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Collection_Manager, getLastInitialized, NULL, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Collection_Manager, setConnectionService, arginfo_phalcon_mvc_collection_manager_setconnectionservice, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Mvc_Collection_Manager, getConnectionService, arginfo_phalcon_mvc_collection_manager_getconnectionservice, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Collection_Manager, useImplicitObjectIds, arginfo_phalcon_mvc_collection_manager_useimplicitobjectids, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Collection_Manager, isUsingImplicitObjectIds, arginfo_phalcon_mvc_collection_manager_isusingimplicitobjectids, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Collection_Manager, getConnection, arginfo_phalcon_mvc_collection_manager_getconnection, ZEND_ACC_PUBLIC) @@ -13385,6 +13406,8 @@ static PHP_METHOD(Phalcon_Mvc_Model, _invokeFinder); static PHP_METHOD(Phalcon_Mvc_Model, __call); static PHP_METHOD(Phalcon_Mvc_Model, __callStatic); static PHP_METHOD(Phalcon_Mvc_Model, __set); +static PHP_METHOD(Phalcon_Mvc_Model, _possibleSetter); +static PHP_METHOD(Phalcon_Mvc_Model, _isVisible); static PHP_METHOD(Phalcon_Mvc_Model, __get); static PHP_METHOD(Phalcon_Mvc_Model, __isset); static PHP_METHOD(Phalcon_Mvc_Model, serialize); @@ -13686,6 +13709,15 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model___set, 0, 0, 2) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model__possiblesetter, 0, 0, 2) + ZEND_ARG_INFO(0, property) + ZEND_ARG_INFO(0, value) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model__isvisible, 0, 0, 1) + ZEND_ARG_INFO(0, property) +ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model___get, 0, 0, 1) ZEND_ARG_INFO(0, property) ZEND_END_ARG_INFO() @@ -13789,6 +13821,8 @@ ZEPHIR_INIT_FUNCS(phalcon_mvc_model_method_entry) { PHP_ME(Phalcon_Mvc_Model, __call, arginfo_phalcon_mvc_model___call, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model, __callStatic, arginfo_phalcon_mvc_model___callstatic, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) PHP_ME(Phalcon_Mvc_Model, __set, arginfo_phalcon_mvc_model___set, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Mvc_Model, _possibleSetter, arginfo_phalcon_mvc_model__possiblesetter, ZEND_ACC_PROTECTED|ZEND_ACC_FINAL) + PHP_ME(Phalcon_Mvc_Model, _isVisible, arginfo_phalcon_mvc_model__isvisible, ZEND_ACC_PROTECTED|ZEND_ACC_FINAL) PHP_ME(Phalcon_Mvc_Model, __get, arginfo_phalcon_mvc_model___get, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model, __isset, arginfo_phalcon_mvc_model___isset, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model, serialize, NULL, ZEND_ACC_PUBLIC) @@ -17001,7 +17035,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_queue_beanstalk_put, 0, 0, 1) ZEND_ARG_INFO(0, data) - ZEND_ARG_INFO(0, options) + ZEND_ARG_ARRAY_INFO(0, options, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_queue_beanstalk_reserve, 0, 0, 0) @@ -18063,7 +18097,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Csv, __construct); static PHP_METHOD(Phalcon_Translate_Adapter_Csv, _load); static PHP_METHOD(Phalcon_Translate_Adapter_Csv, query); static PHP_METHOD(Phalcon_Translate_Adapter_Csv, exists); -static zend_object_value zephir_init_properties_Phalcon_Translate_Adapter_Csv(zend_class_entry *class_type TSRMLS_DC); +zend_object_value zephir_init_properties_Phalcon_Translate_Adapter_Csv(zend_class_entry *class_type TSRMLS_DC); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_translate_adapter_csv___construct, 0, 0, 1) ZEND_ARG_ARRAY_INFO(0, options, 0) @@ -18169,7 +18203,7 @@ ZEPHIR_INIT_FUNCS(phalcon_translate_adapter_gettext_method_entry) { PHP_ME(Phalcon_Translate_Adapter_Gettext, setDefaultDomain, arginfo_phalcon_translate_adapter_gettext_setdefaultdomain, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Translate_Adapter_Gettext, setDirectory, arginfo_phalcon_translate_adapter_gettext_setdirectory, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Translate_Adapter_Gettext, setLocale, arginfo_phalcon_translate_adapter_gettext_setlocale, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Translate_Adapter_Gettext, prepareOptions, arginfo_phalcon_translate_adapter_gettext_prepareoptions, ZEND_ACC_PRIVATE) + PHP_ME(Phalcon_Translate_Adapter_Gettext, prepareOptions, arginfo_phalcon_translate_adapter_gettext_prepareoptions, ZEND_ACC_PROTECTED) PHP_ME(Phalcon_Translate_Adapter_Gettext, getOptionsDefault, NULL, ZEND_ACC_PRIVATE) PHP_FE_END }; @@ -18582,6 +18616,29 @@ ZEPHIR_INIT_FUNCS(phalcon_validation_validator_creditcard_method_entry) { PHP_FE_END }; +zend_class_entry *phalcon_validation_validator_date_ce; + +ZEPHIR_INIT_CLASS(Phalcon_Validation_Validator_Date); + +static PHP_METHOD(Phalcon_Validation_Validator_Date, validate); +static PHP_METHOD(Phalcon_Validation_Validator_Date, checkDate); + +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_validation_validator_date_validate, 0, 0, 2) + ZEND_ARG_OBJ_INFO(0, validation, Phalcon\\Validation, 0) + ZEND_ARG_INFO(0, field) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_validation_validator_date_checkdate, 0, 0, 2) + ZEND_ARG_INFO(0, value) + ZEND_ARG_INFO(0, format) +ZEND_END_ARG_INFO() + +ZEPHIR_INIT_FUNCS(phalcon_validation_validator_date_method_entry) { + PHP_ME(Phalcon_Validation_Validator_Date, validate, arginfo_phalcon_validation_validator_date_validate, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Validation_Validator_Date, checkDate, arginfo_phalcon_validation_validator_date_checkdate, ZEND_ACC_PRIVATE) + PHP_FE_END +}; + zend_class_entry *phalcon_validation_validator_digit_ce; ZEPHIR_INIT_CLASS(Phalcon_Validation_Validator_Digit); diff --git a/build/32bits/php_phalcon.h b/build/32bits/php_phalcon.h index 687d79bba0b..3b1a8c8d703 100644 --- a/build/32bits/php_phalcon.h +++ b/build/32bits/php_phalcon.h @@ -182,10 +182,10 @@ typedef zend_function zephir_fcall_cache_entry; #define PHP_PHALCON_NAME "phalcon" -#define PHP_PHALCON_VERSION "2.0.10" +#define PHP_PHALCON_VERSION "2.0.11" #define PHP_PHALCON_EXTNAME "phalcon" #define PHP_PHALCON_AUTHOR "Phalcon Team and contributors" -#define PHP_PHALCON_ZEPVERSION "0.9.2a-dev" +#define PHP_PHALCON_ZEPVERSION "0.9.3a-dev" #define PHP_PHALCON_DESCRIPTION "Web framework delivered as a C-extension for PHP" typedef struct _zephir_struct_db { diff --git a/build/64bits/phalcon.zep.c b/build/64bits/phalcon.zep.c index f26ad3f593b..20fc73e6041 100644 --- a/build/64bits/phalcon.zep.c +++ b/build/64bits/phalcon.zep.c @@ -2219,8 +2219,8 @@ static void zephir_fast_strip_tags(zval *return_value, zval *str); static void zephir_fast_strtoupper(zval *return_value, zval *str); /** Camelize/Uncamelize */ -static void zephir_camelize(zval *return_value, const zval *str); -static void zephir_uncamelize(zval *return_value, const zval *str); +static void zephir_camelize(zval *return_value, const zval *str, const zval *delimiter); +static void zephir_uncamelize(zval *return_value, const zval *str, const zval *delimiter); /** Starts/Ends with */ static int zephir_start_with(const zval *str, const zval *compared, zval *case_sensitive); @@ -9671,17 +9671,26 @@ static void zephir_fast_join_str(zval *return_value, char *glue, unsigned int gl } } -static void zephir_camelize(zval *return_value, const zval *str) { +static void zephir_camelize(zval *return_value, const zval *str, const zval *delimiter) { int i, len, first = 0; smart_str camelize_str = {0}; - char *marker, ch; + char *marker, ch, delim; if (unlikely(Z_TYPE_P(str) != IS_STRING)) { zend_error(E_WARNING, "Invalid arguments supplied for camelize()"); RETURN_EMPTY_STRING(); } + if (delimiter == NULL || Z_TYPE_P(delimiter) == IS_NULL) { + delim = '_'; + } else if (Z_TYPE_P(delimiter) == IS_STRING && Z_STRLEN_P(delimiter) == 1) { + delim = *(Z_STRVAL_P(delimiter)); + } else { + zend_error(E_WARNING, "Second argument passed to the camelize() must be a string of one character"); + RETURN_EMPTY_STRING(); + } + marker = Z_STRVAL_P(str); len = Z_STRLEN_P(str); @@ -9691,7 +9700,7 @@ static void zephir_camelize(zval *return_value, const zval *str) { if (first == 0) { - if (ch == '-' || ch == '_') { + if (ch == delim) { continue; } @@ -9700,7 +9709,7 @@ static void zephir_camelize(zval *return_value, const zval *str) { continue; } - if (ch == '-' || ch == '_') { + if (ch == delim) { if (i != (len - 1)) { i++; ch = marker[i]; @@ -9721,15 +9730,24 @@ static void zephir_camelize(zval *return_value, const zval *str) { RETURN_EMPTY_STRING(); } -static void zephir_uncamelize(zval *return_value, const zval *str) { +static void zephir_uncamelize(zval *return_value, const zval *str, const zval *delimiter) { unsigned int i; smart_str uncamelize_str = {0}; - char *marker, ch; + char *marker, ch, delim; if (Z_TYPE_P(str) != IS_STRING) { zend_error(E_WARNING, "Invalid arguments supplied for uncamelize()"); - return; + RETURN_EMPTY_STRING(); + } + + if (delimiter == NULL || Z_TYPE_P(delimiter) == IS_NULL) { + delim = '_'; + } else if (Z_TYPE_P(delimiter) == IS_STRING && Z_STRLEN_P(delimiter) == 1) { + delim = *(Z_STRVAL_P(delimiter)); + } else { + zend_error(E_WARNING, "Second argument passed to the uncamelize() must be a string of one character"); + RETURN_EMPTY_STRING(); } marker = Z_STRVAL_P(str); @@ -9743,7 +9761,7 @@ static void zephir_uncamelize(zval *return_value, const zval *str) { if (ch >= 'A' && ch <= 'Z') { if (i > 0) { - smart_str_appendc(&uncamelize_str, '_'); + smart_str_appendc(&uncamelize_str, delim); } smart_str_appendc(&uncamelize_str, (*marker) + 32); } else { @@ -16996,7 +17014,7 @@ static PHP_METHOD(phalcon_0__closure, __invoke) { zephir_array_fetch_long(&_0, matches, 1, PH_NOISY | PH_READONLY, "phalcon/text.zep", 272 TSRMLS_CC); ZEPHIR_INIT_VAR(words); zephir_fast_explode_str(words, SL("|"), _0, LONG_MAX TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_2, "array_rand", NULL, 447, words); + ZEPHIR_CALL_FUNCTION(&_2, "array_rand", NULL, 444, words); zephir_check_call_status(); zephir_array_fetch(&_1, words, _2, PH_NOISY | PH_READONLY, "phalcon/text.zep", 273 TSRMLS_CC); RETURN_CTOR(_1); @@ -17902,7 +17920,7 @@ static PHP_METHOD(Phalcon_Crypt, encrypt) { zend_bool _3, _4; int ZEPHIR_LAST_CALL_STATUS, _2$$9; - zval *text_param = NULL, *key_param = NULL, *encryptKey = NULL, *ivSize = NULL, *iv = NULL, *cipher = NULL, *mode = NULL, *blockSize = NULL, *paddingType = NULL, *padded = NULL, _0, *_5 = NULL, *_1$$8 = NULL; + zval *text_param = NULL, *key_param = NULL, *encryptKey = NULL, *ivSize = NULL, *iv = NULL, *cipher = NULL, *mode = NULL, *blockSize = NULL, *paddingType = NULL, *padded = NULL, *_0, *_5 = NULL, *_1$$8 = NULL; zval *text = NULL, *key = NULL; ZEPHIR_MM_GROW(); @@ -17953,22 +17971,22 @@ static PHP_METHOD(Phalcon_Crypt, encrypt) { zephir_read_property_this(&cipher, this_ptr, SL("_cipher"), PH_NOISY_CC); ZEPHIR_OBS_VAR(mode); zephir_read_property_this(&mode, this_ptr, SL("_mode"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&ivSize, "mcrypt_get_iv_size", NULL, 135, cipher, mode); + ZEPHIR_CALL_FUNCTION(&ivSize, "mcrypt_get_iv_size", NULL, 0, cipher, mode); zephir_check_call_status(); if (ZEPHIR_LT_LONG(ivSize, zephir_fast_strlen_ev(encryptKey))) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_crypt_exception_ce, "Size of key is too large for this algorithm", "phalcon/crypt.zep", 319); return; } - ZEPHIR_SINIT_VAR(_0); - ZVAL_LONG(&_0, 2); - ZEPHIR_CALL_FUNCTION(&iv, "mcrypt_create_iv", NULL, 136, ivSize, &_0); + ZEPHIR_INIT_VAR(_0); + ZEPHIR_GET_CONSTANT(_0, "MCRYPT_RAND"); + ZEPHIR_CALL_FUNCTION(&iv, "mcrypt_create_iv", NULL, 0, ivSize, _0); zephir_check_call_status(); if (Z_TYPE_P(iv) != IS_STRING) { ZEPHIR_CALL_FUNCTION(&_1$$8, "strval", NULL, 21, iv); zephir_check_call_status(); ZEPHIR_CPY_WRT(iv, _1$$8); } - ZEPHIR_CALL_FUNCTION(&blockSize, "mcrypt_get_block_size", NULL, 137, cipher, mode); + ZEPHIR_CALL_FUNCTION(&blockSize, "mcrypt_get_block_size", NULL, 0, cipher, mode); zephir_check_call_status(); if (Z_TYPE_P(blockSize) != IS_LONG) { _2$$9 = zephir_get_intval(blockSize); @@ -17991,7 +18009,7 @@ static PHP_METHOD(Phalcon_Crypt, encrypt) { } else { ZEPHIR_CPY_WRT(padded, text); } - ZEPHIR_CALL_FUNCTION(&_5, "mcrypt_encrypt", NULL, 138, cipher, encryptKey, padded, mode, iv); + ZEPHIR_CALL_FUNCTION(&_5, "mcrypt_encrypt", NULL, 0, cipher, encryptKey, padded, mode, iv); zephir_check_call_status(); ZEPHIR_CONCAT_VV(return_value, iv, _5); RETURN_MM(); @@ -18041,7 +18059,7 @@ static PHP_METHOD(Phalcon_Crypt, decrypt) { zephir_read_property_this(&cipher, this_ptr, SL("_cipher"), PH_NOISY_CC); ZEPHIR_OBS_VAR(mode); zephir_read_property_this(&mode, this_ptr, SL("_mode"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&ivSize, "mcrypt_get_iv_size", NULL, 135, cipher, mode); + ZEPHIR_CALL_FUNCTION(&ivSize, "mcrypt_get_iv_size", NULL, 0, cipher, mode); zephir_check_call_status(); ZEPHIR_INIT_VAR(keySize); ZVAL_LONG(keySize, zephir_fast_strlen_ev(decryptKey)); @@ -18061,9 +18079,9 @@ static PHP_METHOD(Phalcon_Crypt, decrypt) { ZVAL_LONG(&_1, 0); ZEPHIR_INIT_VAR(_2); zephir_substr(_2, text, 0 , zephir_get_intval(ivSize), 0); - ZEPHIR_CALL_FUNCTION(&decrypted, "mcrypt_decrypt", NULL, 139, cipher, decryptKey, _0, mode, _2); + ZEPHIR_CALL_FUNCTION(&decrypted, "mcrypt_decrypt", NULL, 0, cipher, decryptKey, _0, mode, _2); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&blockSize, "mcrypt_get_block_size", NULL, 137, cipher, mode); + ZEPHIR_CALL_FUNCTION(&blockSize, "mcrypt_get_block_size", NULL, 0, cipher, mode); zephir_check_call_status(); ZEPHIR_OBS_VAR(paddingType); zephir_read_property_this(&paddingType, this_ptr, SL("_padding"), PH_NOISY_CC); @@ -18198,7 +18216,7 @@ static PHP_METHOD(Phalcon_Crypt, getAvailableCiphers) { ZEPHIR_MM_GROW(); - ZEPHIR_RETURN_CALL_FUNCTION("mcrypt_list_algorithms", NULL, 140); + ZEPHIR_RETURN_CALL_FUNCTION("mcrypt_list_algorithms", NULL, 135); zephir_check_call_status(); RETURN_MM(); @@ -18210,7 +18228,7 @@ static PHP_METHOD(Phalcon_Crypt, getAvailableModes) { ZEPHIR_MM_GROW(); - ZEPHIR_RETURN_CALL_FUNCTION("mcrypt_list_modes", NULL, 141); + ZEPHIR_RETURN_CALL_FUNCTION("mcrypt_list_modes", NULL, 136); zephir_check_call_status(); RETURN_MM(); @@ -18506,7 +18524,7 @@ static PHP_METHOD(Phalcon_Debug, listenExceptions) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "onUncaughtException", 1); zephir_array_fast_append(_0, _1); - ZEPHIR_CALL_FUNCTION(NULL, "set_exception_handler", NULL, 151, _0); + ZEPHIR_CALL_FUNCTION(NULL, "set_exception_handler", NULL, 146, _0); zephir_check_call_status(); RETURN_THIS(); @@ -18526,7 +18544,7 @@ static PHP_METHOD(Phalcon_Debug, listenLowSeverity) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "onUncaughtLowSeverity", 1); zephir_array_fast_append(_0, _1); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 152, _0); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 147, _0); zephir_check_call_status(); ZEPHIR_INIT_VAR(_2); zephir_create_array(_2, 2, 0 TSRMLS_CC); @@ -18534,7 +18552,7 @@ static PHP_METHOD(Phalcon_Debug, listenLowSeverity) { ZEPHIR_INIT_NVAR(_1); ZVAL_STRING(_1, "onUncaughtException", 1); zephir_array_fast_append(_2, _1); - ZEPHIR_CALL_FUNCTION(NULL, "set_exception_handler", NULL, 151, _2); + ZEPHIR_CALL_FUNCTION(NULL, "set_exception_handler", NULL, 146, _2); zephir_check_call_status(); RETURN_THIS(); @@ -18570,7 +18588,7 @@ static PHP_METHOD(Phalcon_Debug, debugVar) { ZEPHIR_INIT_VAR(_0); zephir_create_array(_0, 3, 0 TSRMLS_CC); zephir_array_fast_append(_0, varz); - ZEPHIR_CALL_FUNCTION(&_1, "debug_backtrace", NULL, 153); + ZEPHIR_CALL_FUNCTION(&_1, "debug_backtrace", NULL, 148); zephir_check_call_status(); zephir_array_fast_append(_0, _1); ZEPHIR_INIT_VAR(_2); @@ -18611,7 +18629,7 @@ static PHP_METHOD(Phalcon_Debug, _escapeString) { ZVAL_LONG(&_3$$3, 2); ZEPHIR_SINIT_VAR(_4$$3); ZVAL_STRING(&_4$$3, "utf-8", 0); - ZEPHIR_RETURN_CALL_FUNCTION("htmlentities", NULL, 154, _0$$3, &_3$$3, &_4$$3); + ZEPHIR_RETURN_CALL_FUNCTION("htmlentities", NULL, 149, _0$$3, &_3$$3, &_4$$3); zephir_check_call_status(); RETURN_MM(); } @@ -18676,7 +18694,7 @@ static PHP_METHOD(Phalcon_Debug, _getArrayDump) { if (Z_TYPE_P(v) == IS_ARRAY) { ZEPHIR_INIT_NVAR(_7$$9); ZVAL_LONG(_7$$9, (zephir_get_numberval(n) + 1)); - ZEPHIR_CALL_METHOD(&_6$$9, this_ptr, "_getarraydump", &_8, 155, v, _7$$9); + ZEPHIR_CALL_METHOD(&_6$$9, this_ptr, "_getarraydump", &_8, 150, v, _7$$9); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_9$$9); ZEPHIR_CONCAT_SVSVS(_9$$9, "[", k, "] => Array(", _6$$9, ")"); @@ -18749,7 +18767,7 @@ static PHP_METHOD(Phalcon_Debug, _getVarDump) { } } if (Z_TYPE_P(variable) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&_2$$11, this_ptr, "_getarraydump", &_1, 155, variable); + ZEPHIR_CALL_METHOD(&_2$$11, this_ptr, "_getarraydump", &_1, 150, variable); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, "Array(", _2$$11, ")"); RETURN_MM(); @@ -18770,7 +18788,7 @@ static PHP_METHOD(Phalcon_Debug, getMajorVersion) { ZEPHIR_MM_GROW(); - ZEPHIR_CALL_CE_STATIC(&_0, phalcon_version_ce, "get", &_1, 156); + ZEPHIR_CALL_CE_STATIC(&_0, phalcon_version_ce, "get", &_1, 151); zephir_check_call_status(); ZEPHIR_INIT_VAR(parts); zephir_fast_explode_str(parts, SL(" "), _0, LONG_MAX TSRMLS_CC); @@ -18789,7 +18807,7 @@ static PHP_METHOD(Phalcon_Debug, getVersion) { ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmajorversion", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_CE_STATIC(&_1, phalcon_version_ce, "get", &_2, 156); + ZEPHIR_CALL_CE_STATIC(&_1, phalcon_version_ce, "get", &_2, 151); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "
Phalcon Framework ", _1, "
"); RETURN_MM(); @@ -18882,7 +18900,7 @@ static PHP_METHOD(Phalcon_Debug, showTraceItem) { object_init_ex(classReflection, zephir_get_internal_ce(SS("reflectionclass") TSRMLS_CC)); ZEPHIR_CALL_METHOD(NULL, classReflection, "__construct", NULL, 66, className); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_8$$5, classReflection, "isinternal", NULL, 157); + ZEPHIR_CALL_METHOD(&_8$$5, classReflection, "isinternal", NULL, 152); zephir_check_call_status(); if (zephir_is_true(_8$$5)) { ZEPHIR_INIT_VAR(_9$$6); @@ -18915,9 +18933,9 @@ static PHP_METHOD(Phalcon_Debug, showTraceItem) { if ((zephir_function_exists(functionName TSRMLS_CC) == SUCCESS)) { ZEPHIR_INIT_VAR(functionReflection); object_init_ex(functionReflection, zephir_get_internal_ce(SS("reflectionfunction") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, functionReflection, "__construct", NULL, 158, functionName); + ZEPHIR_CALL_METHOD(NULL, functionReflection, "__construct", NULL, 153, functionName); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_16$$10, functionReflection, "isinternal", NULL, 159); + ZEPHIR_CALL_METHOD(&_16$$10, functionReflection, "isinternal", NULL, 154); zephir_check_call_status(); if (zephir_is_true(_16$$10)) { ZEPHIR_SINIT_VAR(_17$$11); @@ -18978,7 +18996,7 @@ static PHP_METHOD(Phalcon_Debug, showTraceItem) { ZEPHIR_OBS_VAR(showFiles); zephir_read_property_this(&showFiles, this_ptr, SL("_showFiles"), PH_NOISY_CC); if (zephir_is_true(showFiles)) { - ZEPHIR_CALL_FUNCTION(&lines, "file", NULL, 160, filez); + ZEPHIR_CALL_FUNCTION(&lines, "file", NULL, 155, filez); zephir_check_call_status(); ZEPHIR_INIT_VAR(numberLines); ZVAL_LONG(numberLines, zephir_fast_count_int(lines TSRMLS_CC)); @@ -19061,7 +19079,7 @@ static PHP_METHOD(Phalcon_Debug, showTraceItem) { ZVAL_LONG(&_49$$31, 2); ZEPHIR_SINIT_NVAR(_50$$31); ZVAL_STRING(&_50$$31, "UTF-8", 0); - ZEPHIR_CALL_FUNCTION(&_51$$31, "htmlentities", &_52, 154, _46$$31, &_49$$31, &_50$$31); + ZEPHIR_CALL_FUNCTION(&_51$$31, "htmlentities", &_52, 149, _46$$31, &_49$$31, &_50$$31); zephir_check_call_status(); zephir_concat_self(&html, _51$$31 TSRMLS_CC); } @@ -19085,7 +19103,7 @@ static PHP_METHOD(Phalcon_Debug, onUncaughtLowSeverity) { - ZEPHIR_CALL_FUNCTION(&_0, "error_reporting", NULL, 161); + ZEPHIR_CALL_FUNCTION(&_0, "error_reporting", NULL, 156); zephir_check_call_status(); ZEPHIR_SINIT_VAR(_1); zephir_bitwise_and_function(&_1, _0, severity TSRMLS_CC); @@ -19094,7 +19112,7 @@ static PHP_METHOD(Phalcon_Debug, onUncaughtLowSeverity) { object_init_ex(_2$$3, zephir_get_internal_ce(SS("errorexception") TSRMLS_CC)); ZEPHIR_INIT_VAR(_3$$3); ZVAL_LONG(_3$$3, 0); - ZEPHIR_CALL_METHOD(NULL, _2$$3, "__construct", NULL, 162, message, _3$$3, severity, file, line); + ZEPHIR_CALL_METHOD(NULL, _2$$3, "__construct", NULL, 157, message, _3$$3, severity, file, line); zephir_check_call_status(); zephir_throw_exception_debug(_2$$3, "phalcon/debug.zep", 566 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -19119,7 +19137,7 @@ static PHP_METHOD(Phalcon_Debug, onUncaughtException) { - ZEPHIR_CALL_FUNCTION(&obLevel, "ob_get_level", NULL, 163); + ZEPHIR_CALL_FUNCTION(&obLevel, "ob_get_level", NULL, 158); zephir_check_call_status(); if (ZEPHIR_GT_LONG(obLevel, 0)) { ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 122); @@ -19186,7 +19204,7 @@ static PHP_METHOD(Phalcon_Debug, onUncaughtException) { ) { ZEPHIR_GET_HMKEY(n, _12$$5, _11$$5); ZEPHIR_GET_HVALUE(traceItem, _13$$5); - ZEPHIR_CALL_METHOD(&_14$$7, this_ptr, "showtraceitem", &_15, 164, n, traceItem); + ZEPHIR_CALL_METHOD(&_14$$7, this_ptr, "showtraceitem", &_15, 159, n, traceItem); zephir_check_call_status(); zephir_concat_self(&html, _14$$7 TSRMLS_CC); } @@ -19205,7 +19223,7 @@ static PHP_METHOD(Phalcon_Debug, onUncaughtException) { ZEPHIR_CONCAT_SVSVS(_19$$9, ""); zephir_concat_self(&html, _19$$9 TSRMLS_CC); } else { - ZEPHIR_CALL_FUNCTION(&_20$$10, "print_r", &_21, 165, value, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(&_20$$10, "print_r", &_21, 160, value, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_22$$10); ZEPHIR_CONCAT_SVSVS(_22$$10, ""); @@ -19231,7 +19249,7 @@ static PHP_METHOD(Phalcon_Debug, onUncaughtException) { zephir_concat_self_str(&html, SL("
Memory
Usage", _34$$5, "
", keyRequest, "", value, "
", keyRequest, "", _20$$10, "
") TSRMLS_CC); zephir_concat_self_str(&html, SL("
") TSRMLS_CC); zephir_concat_self_str(&html, SL("") TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_29$$5, "get_included_files", NULL, 166); + ZEPHIR_CALL_FUNCTION(&_29$$5, "get_included_files", NULL, 161); zephir_check_call_status(); zephir_is_iterable(_29$$5, &_31$$5, &_30$$5, 0, 0, "phalcon/debug.zep", 694); for ( @@ -19246,7 +19264,7 @@ static PHP_METHOD(Phalcon_Debug, onUncaughtException) { } zephir_concat_self_str(&html, SL("
#Path
") TSRMLS_CC); zephir_concat_self_str(&html, SL("
") TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_34$$5, "memory_get_usage", NULL, 167, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(&_34$$5, "memory_get_usage", NULL, 162, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); ZEPHIR_INIT_VAR(_35$$5); ZEPHIR_CONCAT_SVS(_35$$5, ""); @@ -20458,10 +20476,10 @@ static PHP_METHOD(Phalcon_Dispatcher, getReturnedValue) { static PHP_METHOD(Phalcon_Dispatcher, dispatch) { - zval *_49$$39 = NULL; - zval *value = NULL, *handler = NULL, *dependencyInjector = NULL, *namespaceName = NULL, *handlerName = NULL, *actionName = NULL, *params = NULL, *eventsManager = NULL, *actionSuffix = NULL, *handlerClass = NULL, *status = NULL, *actionMethod = NULL, *e = NULL, *_0, *_1$$3, *_2$$3, *_3$$4 = NULL, *_4$$4, *_5$$7 = NULL, *_6$$7 = NULL, *_10$$8 = NULL, *_11$$8 = NULL, *_13$$8, *_14$$6 = NULL, *_16$$12 = NULL, *_17$$12 = NULL, *_19$$13, *_22$$16 = NULL, *_23$$16 = NULL, *_25$$17, *_26$$19 = NULL, *_27$$19 = NULL, *_29$$20, *_30$$23 = NULL, *_31$$23 = NULL, *_33$$23, *_34$$22 = NULL, *_35$$22 = NULL, *_37$$26, *_38$$28 = NULL, *_39$$28 = NULL, *_41$$28, *_42$$31 = NULL, *_43$$31, *_44$$36 = NULL, *_45$$36 = NULL, *_47$$36, *_48$$39 = NULL, *_50$$40 = NULL, *_52$$41, *_53$$44 = NULL, *_54$$44 = NULL, *_56$$44, *_58$$47 = NULL, *_59$$47, *_60$$50; + zval *_30$$6 = NULL, *_50$$39 = NULL; + zval *value = NULL, *handler = NULL, *dependencyInjector = NULL, *namespaceName = NULL, *handlerName = NULL, *actionName = NULL, *params = NULL, *eventsManager = NULL, *actionSuffix = NULL, *handlerClass = NULL, *status = NULL, *actionMethod = NULL, *e = NULL, *_0, *_1$$3, *_2$$3, *_3$$4 = NULL, *_4$$4, *_5$$7 = NULL, *_6$$7 = NULL, *_10$$8 = NULL, *_11$$8 = NULL, *_13$$8, *_14$$6 = NULL, *_16$$12 = NULL, *_17$$12 = NULL, *_19$$13, *_22$$16 = NULL, *_23$$16 = NULL, *_25$$17, *_26$$19 = NULL, *_27$$19 = NULL, *_29$$20, *_31$$23 = NULL, *_32$$23 = NULL, *_34$$23, *_35$$22 = NULL, *_36$$22 = NULL, *_38$$26, *_39$$28 = NULL, *_40$$28 = NULL, *_42$$28, *_43$$31 = NULL, *_44$$31, *_45$$36 = NULL, *_46$$36 = NULL, *_48$$36, *_49$$39 = NULL, *_51$$40 = NULL, *_53$$41, *_54$$44 = NULL, *_55$$44 = NULL, *_57$$44, *_59$$47 = NULL, *_60$$47, *_61$$50; zend_bool hasService = 0, wasFresh; - zephir_fcall_cache_entry *_7 = NULL, *_8 = NULL, *_9 = NULL, *_12 = NULL, *_15 = NULL, *_18 = NULL, *_20 = NULL, *_21 = NULL, *_24 = NULL, *_28 = NULL, *_32 = NULL, *_36 = NULL, *_40 = NULL, *_46 = NULL, *_51 = NULL, *_55 = NULL, *_57 = NULL; + zephir_fcall_cache_entry *_7 = NULL, *_8 = NULL, *_9 = NULL, *_12 = NULL, *_15 = NULL, *_18 = NULL, *_20 = NULL, *_21 = NULL, *_24 = NULL, *_28 = NULL, *_33 = NULL, *_37 = NULL, *_41 = NULL, *_47 = NULL, *_52 = NULL, *_56 = NULL, *_58 = NULL; int ZEPHIR_LAST_CALL_STATUS, numberDispatches = 0; ZEPHIR_MM_GROW(); @@ -20613,57 +20631,61 @@ static PHP_METHOD(Phalcon_Dispatcher, dispatch) { } ZEPHIR_INIT_NVAR(actionMethod); ZEPHIR_CONCAT_VV(actionMethod, actionName, actionSuffix); - if (!((zephir_method_exists(handler, actionMethod TSRMLS_CC) == SUCCESS))) { + ZEPHIR_INIT_NVAR(_30$$6); + zephir_create_array(_30$$6, 2, 0 TSRMLS_CC); + zephir_array_fast_append(_30$$6, handler); + zephir_array_fast_append(_30$$6, actionMethod); + if (!(zephir_is_callable(_30$$6 TSRMLS_CC))) { if (Z_TYPE_P(eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_NVAR(_31$$23); - ZVAL_STRING(_31$$23, "dispatch:beforeNotFoundAction", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(&_30$$23, eventsManager, "fire", &_32, 0, _31$$23, this_ptr); - zephir_check_temp_parameter(_31$$23); + ZEPHIR_INIT_NVAR(_32$$23); + ZVAL_STRING(_32$$23, "dispatch:beforeNotFoundAction", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(&_31$$23, eventsManager, "fire", &_33, 0, _32$$23, this_ptr); + zephir_check_temp_parameter(_32$$23); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(_30$$23)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(_31$$23)) { continue; } - _33$$23 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); - if (ZEPHIR_IS_FALSE_IDENTICAL(_33$$23)) { + _34$$23 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); + if (ZEPHIR_IS_FALSE_IDENTICAL(_34$$23)) { continue; } } - ZEPHIR_INIT_LNVAR(_34$$22); - ZEPHIR_CONCAT_SVSVS(_34$$22, "Action '", actionName, "' was not found on handler '", handlerName, "'"); - ZEPHIR_INIT_NVAR(_35$$22); - ZVAL_LONG(_35$$22, 5); - ZEPHIR_CALL_METHOD(&status, this_ptr, "_throwdispatchexception", &_36, 0, _34$$22, _35$$22); + ZEPHIR_INIT_LNVAR(_35$$22); + ZEPHIR_CONCAT_SVSVS(_35$$22, "Action '", actionName, "' was not found on handler '", handlerName, "'"); + ZEPHIR_INIT_NVAR(_36$$22); + ZVAL_LONG(_36$$22, 5); + ZEPHIR_CALL_METHOD(&status, this_ptr, "_throwdispatchexception", &_37, 0, _35$$22, _36$$22); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(status)) { - _37$$26 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); - if (ZEPHIR_IS_FALSE_IDENTICAL(_37$$26)) { + _38$$26 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); + if (ZEPHIR_IS_FALSE_IDENTICAL(_38$$26)) { continue; } } break; } if (Z_TYPE_P(eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_NVAR(_39$$28); - ZVAL_STRING(_39$$28, "dispatch:beforeExecuteRoute", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(&_38$$28, eventsManager, "fire", &_40, 0, _39$$28, this_ptr); - zephir_check_temp_parameter(_39$$28); + ZEPHIR_INIT_NVAR(_40$$28); + ZVAL_STRING(_40$$28, "dispatch:beforeExecuteRoute", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(&_39$$28, eventsManager, "fire", &_41, 0, _40$$28, this_ptr); + zephir_check_temp_parameter(_40$$28); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(_38$$28)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(_39$$28)) { continue; } - _41$$28 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); - if (ZEPHIR_IS_FALSE_IDENTICAL(_41$$28)) { + _42$$28 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); + if (ZEPHIR_IS_FALSE_IDENTICAL(_42$$28)) { continue; } } if ((zephir_method_exists_ex(handler, SS("beforeexecuteroute") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_CALL_METHOD(&_42$$31, handler, "beforeexecuteroute", NULL, 0, this_ptr); + ZEPHIR_CALL_METHOD(&_43$$31, handler, "beforeexecuteroute", NULL, 0, this_ptr); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(_42$$31)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(_43$$31)) { continue; } - _43$$31 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); - if (ZEPHIR_IS_FALSE_IDENTICAL(_43$$31)) { + _44$$31 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); + if (ZEPHIR_IS_FALSE_IDENTICAL(_44$$31)) { continue; } } @@ -20673,32 +20695,32 @@ static PHP_METHOD(Phalcon_Dispatcher, dispatch) { zephir_check_call_status(); } if (zephir_is_true(eventsManager)) { - ZEPHIR_INIT_NVAR(_45$$36); - ZVAL_STRING(_45$$36, "dispatch:afterInitialize", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(&_44$$36, eventsManager, "fire", &_46, 0, _45$$36, this_ptr); - zephir_check_temp_parameter(_45$$36); + ZEPHIR_INIT_NVAR(_46$$36); + ZVAL_STRING(_46$$36, "dispatch:afterInitialize", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(&_45$$36, eventsManager, "fire", &_47, 0, _46$$36, this_ptr); + zephir_check_temp_parameter(_46$$36); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(_44$$36)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(_45$$36)) { continue; } - _47$$36 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); - if (ZEPHIR_IS_FALSE_IDENTICAL(_47$$36)) { + _48$$36 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); + if (ZEPHIR_IS_FALSE_IDENTICAL(_48$$36)) { continue; } } } + zephir_update_property_this(this_ptr, SL("_lastHandler"), handler TSRMLS_CC); /* try_start_1: */ - ZEPHIR_INIT_NVAR(_48$$39); ZEPHIR_INIT_NVAR(_49$$39); - zephir_create_array(_49$$39, 2, 0 TSRMLS_CC); - zephir_array_fast_append(_49$$39, handler); - zephir_array_fast_append(_49$$39, actionMethod); - ZEPHIR_CALL_USER_FUNC_ARRAY(_48$$39, _49$$39, params); + ZEPHIR_INIT_NVAR(_50$$39); + zephir_create_array(_50$$39, 2, 0 TSRMLS_CC); + zephir_array_fast_append(_50$$39, handler); + zephir_array_fast_append(_50$$39, actionMethod); + ZEPHIR_CALL_USER_FUNC_ARRAY(_49$$39, _50$$39, params); zephir_check_call_status_or_jump(try_end_1); - zephir_update_property_this(this_ptr, SL("_returnedValue"), _48$$39 TSRMLS_CC); - zephir_update_property_this(this_ptr, SL("_lastHandler"), handler TSRMLS_CC); + zephir_update_property_this(this_ptr, SL("_returnedValue"), _49$$39 TSRMLS_CC); try_end_1: @@ -20706,56 +20728,57 @@ static PHP_METHOD(Phalcon_Dispatcher, dispatch) { ZEPHIR_CPY_WRT(e, EG(exception)); if (zephir_instance_of_ev(e, zend_exception_get_default(TSRMLS_C) TSRMLS_CC)) { zend_clear_exception(TSRMLS_C); - ZEPHIR_CALL_METHOD(&_50$$40, this_ptr, "_handleexception", &_51, 0, e); + zephir_update_property_this(this_ptr, SL("_lastHandler"), handler TSRMLS_CC); + ZEPHIR_CALL_METHOD(&_51$$40, this_ptr, "_handleexception", &_52, 0, e); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(_50$$40)) { - _52$$41 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); - if (ZEPHIR_IS_FALSE_IDENTICAL(_52$$41)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(_51$$40)) { + _53$$41 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); + if (ZEPHIR_IS_FALSE_IDENTICAL(_53$$41)) { continue; } } else { - zephir_throw_exception_debug(e, "phalcon/dispatcher.zep", 518 TSRMLS_CC); + zephir_throw_exception_debug(e, "phalcon/dispatcher.zep", 522 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } } } if (Z_TYPE_P(eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_NVAR(_54$$44); - ZVAL_STRING(_54$$44, "dispatch:afterExecuteRoute", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(&_53$$44, eventsManager, "fire", &_55, 0, _54$$44, this_ptr, value); - zephir_check_temp_parameter(_54$$44); + ZEPHIR_INIT_NVAR(_55$$44); + ZVAL_STRING(_55$$44, "dispatch:afterExecuteRoute", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(&_54$$44, eventsManager, "fire", &_56, 0, _55$$44, this_ptr, value); + zephir_check_temp_parameter(_55$$44); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(_53$$44)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(_54$$44)) { continue; } - _56$$44 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); - if (ZEPHIR_IS_FALSE_IDENTICAL(_56$$44)) { + _57$$44 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); + if (ZEPHIR_IS_FALSE_IDENTICAL(_57$$44)) { continue; } - ZEPHIR_INIT_NVAR(_54$$44); - ZVAL_STRING(_54$$44, "dispatch:afterDispatch", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, eventsManager, "fire", &_57, 0, _54$$44, this_ptr); - zephir_check_temp_parameter(_54$$44); + ZEPHIR_INIT_NVAR(_55$$44); + ZVAL_STRING(_55$$44, "dispatch:afterDispatch", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(NULL, eventsManager, "fire", &_58, 0, _55$$44, this_ptr); + zephir_check_temp_parameter(_55$$44); zephir_check_call_status(); } if ((zephir_method_exists_ex(handler, SS("afterexecuteroute") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_CALL_METHOD(&_58$$47, handler, "afterexecuteroute", NULL, 0, this_ptr, value); + ZEPHIR_CALL_METHOD(&_59$$47, handler, "afterexecuteroute", NULL, 0, this_ptr, value); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(_58$$47)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(_59$$47)) { continue; } - _59$$47 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); - if (ZEPHIR_IS_FALSE_IDENTICAL(_59$$47)) { + _60$$47 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); + if (ZEPHIR_IS_FALSE_IDENTICAL(_60$$47)) { continue; } } } if (Z_TYPE_P(eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_VAR(_60$$50); - ZVAL_STRING(_60$$50, "dispatch:afterDispatchLoop", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, eventsManager, "fire", NULL, 0, _60$$50, this_ptr); - zephir_check_temp_parameter(_60$$50); + ZEPHIR_INIT_VAR(_61$$50); + ZVAL_STRING(_61$$50, "dispatch:afterDispatchLoop", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(NULL, eventsManager, "fire", NULL, 0, _61$$50, this_ptr); + zephir_check_temp_parameter(_61$$50); zephir_check_call_status(); } RETURN_CCTOR(handler); @@ -20839,9 +20862,9 @@ static PHP_METHOD(Phalcon_Dispatcher, getHandlerClass) { zephir_read_property_this(&handlerName, this_ptr, SL("_handlerName"), PH_NOISY_CC); ZEPHIR_OBS_VAR(namespaceName); zephir_read_property_this(&namespaceName, this_ptr, SL("_namespaceName"), PH_NOISY_CC); - if (!(zephir_memnstr_str(handlerName, SL("\\"), "phalcon/dispatcher.zep", 631))) { + if (!(zephir_memnstr_str(handlerName, SL("\\"), "phalcon/dispatcher.zep", 635))) { ZEPHIR_INIT_VAR(camelizedClass); - zephir_camelize(camelizedClass, handlerName); + zephir_camelize(camelizedClass, handlerName, NULL ); } else { ZEPHIR_CPY_WRT(camelizedClass, handlerName); } @@ -21046,13 +21069,13 @@ static PHP_METHOD(Phalcon_Escaper, detectEncoding) { ; zephir_hash_move_forward_ex(_3, &_2) ) { ZEPHIR_GET_HVALUE(charset, _4); - ZEPHIR_CALL_FUNCTION(&_5$$5, "mb_detect_encoding", &_6, 180, str, charset, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(&_5$$5, "mb_detect_encoding", &_6, 175, str, charset, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); if (zephir_is_true(_5$$5)) { RETURN_CCTOR(charset); } } - ZEPHIR_RETURN_CALL_FUNCTION("mb_detect_encoding", &_6, 180, str); + ZEPHIR_RETURN_CALL_FUNCTION("mb_detect_encoding", &_6, 175, str); zephir_check_call_status(); RETURN_MM(); @@ -21074,11 +21097,11 @@ static PHP_METHOD(Phalcon_Escaper, normalizeEncoding) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_escaper_exception_ce, "Extension 'mbstring' is required", "phalcon/escaper.zep", 128); return; } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "detectencoding", NULL, 181, str); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "detectencoding", NULL, 176, str); zephir_check_call_status(); ZEPHIR_SINIT_VAR(_1); ZVAL_STRING(&_1, "UTF-32", 0); - ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 182, str, &_1, _0); + ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 177, str, &_1, _0); zephir_check_call_status(); RETURN_MM(); @@ -21098,7 +21121,7 @@ static PHP_METHOD(Phalcon_Escaper, escapeHtml) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_htmlQuoteType"), PH_NOISY_CC); _1 = zephir_fetch_nproperty_this(this_ptr, SL("_encoding"), PH_NOISY_CC); - ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 183, text, _0, _1); + ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 178, text, _0, _1); zephir_check_call_status(); RETURN_MM(); @@ -21119,7 +21142,7 @@ static PHP_METHOD(Phalcon_Escaper, escapeHtmlAttr) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_encoding"), PH_NOISY_CC); ZEPHIR_SINIT_VAR(_1); ZVAL_LONG(&_1, 3); - ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 183, attribute, &_1, _0); + ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 178, attribute, &_1, _0); zephir_check_call_status(); RETURN_MM(); @@ -21137,7 +21160,7 @@ static PHP_METHOD(Phalcon_Escaper, escapeCss) { zephir_get_strval(css, css_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 184, css); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 179, css); zephir_check_call_status(); zephir_escape_css(return_value, _0); RETURN_MM(); @@ -21156,7 +21179,7 @@ static PHP_METHOD(Phalcon_Escaper, escapeJs) { zephir_get_strval(js, js_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 184, js); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 179, js); zephir_check_call_status(); zephir_escape_js(return_value, _0); RETURN_MM(); @@ -21175,7 +21198,7 @@ static PHP_METHOD(Phalcon_Escaper, escapeUrl) { zephir_get_strval(url, url_param); - ZEPHIR_RETURN_CALL_FUNCTION("rawurlencode", NULL, 185, url); + ZEPHIR_RETURN_CALL_FUNCTION("rawurlencode", NULL, 180, url); zephir_check_call_status(); RETURN_MM(); @@ -21452,16 +21475,16 @@ static PHP_METHOD(Phalcon_Filter, _sanitize) { if (ZEPHIR_IS_STRING(filter, "email")) { ZEPHIR_SINIT_VAR(_3$$5); ZVAL_STRING(&_3$$5, "FILTER_SANITIZE_EMAIL", 0); - ZEPHIR_CALL_FUNCTION(&_4$$5, "constant", NULL, 192, &_3$$5); + ZEPHIR_CALL_FUNCTION(&_4$$5, "constant", NULL, 187, &_3$$5); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", &_5, 193, value, _4$$5); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", &_5, 188, value, _4$$5); zephir_check_call_status(); RETURN_MM(); } if (ZEPHIR_IS_STRING(filter, "int")) { ZEPHIR_SINIT_VAR(_6$$6); ZVAL_LONG(&_6$$6, 519); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", &_5, 193, value, &_6$$6); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", &_5, 188, value, &_6$$6); zephir_check_call_status(); RETURN_MM(); } @@ -21471,14 +21494,14 @@ static PHP_METHOD(Phalcon_Filter, _sanitize) { if (ZEPHIR_IS_STRING(filter, "absint")) { ZEPHIR_SINIT_VAR(_7$$8); ZVAL_LONG(&_7$$8, zephir_get_intval(value)); - ZEPHIR_RETURN_CALL_FUNCTION("abs", NULL, 194, &_7$$8); + ZEPHIR_RETURN_CALL_FUNCTION("abs", NULL, 189, &_7$$8); zephir_check_call_status(); RETURN_MM(); } if (ZEPHIR_IS_STRING(filter, "string")) { ZEPHIR_SINIT_VAR(_8$$9); ZVAL_LONG(&_8$$9, 513); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", &_5, 193, value, &_8$$9); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", &_5, 188, value, &_8$$9); zephir_check_call_status(); RETURN_MM(); } @@ -21488,7 +21511,7 @@ static PHP_METHOD(Phalcon_Filter, _sanitize) { add_assoc_long_ex(_9$$10, SS("flags"), 4096); ZEPHIR_SINIT_VAR(_10$$10); ZVAL_LONG(&_10$$10, 520); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", &_5, 193, value, &_10$$10, _9$$10); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", &_5, 188, value, &_10$$10, _9$$10); zephir_check_call_status(); RETURN_MM(); } @@ -21511,13 +21534,13 @@ static PHP_METHOD(Phalcon_Filter, _sanitize) { RETURN_MM(); } if (ZEPHIR_IS_STRING(filter, "striptags")) { - ZEPHIR_RETURN_CALL_FUNCTION("strip_tags", NULL, 195, value); + ZEPHIR_RETURN_CALL_FUNCTION("strip_tags", NULL, 190, value); zephir_check_call_status(); RETURN_MM(); } if (ZEPHIR_IS_STRING(filter, "lower")) { if ((zephir_function_exists_ex(SS("mb_strtolower") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("mb_strtolower", NULL, 196, value); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strtolower", NULL, 191, value); zephir_check_call_status(); RETURN_MM(); } @@ -21526,7 +21549,7 @@ static PHP_METHOD(Phalcon_Filter, _sanitize) { } if (ZEPHIR_IS_STRING(filter, "upper")) { if ((zephir_function_exists_ex(SS("mb_strtoupper") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("mb_strtoupper", NULL, 197, value); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strtoupper", NULL, 192, value); zephir_check_call_status(); RETURN_MM(); } @@ -22315,7 +22338,7 @@ static PHP_METHOD(Phalcon_Loader, register) { ZEPHIR_INIT_VAR(_2$$3); ZVAL_STRING(_2$$3, "autoLoad", 1); zephir_array_fast_append(_1$$3, _2$$3); - ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_register", NULL, 287, _1$$3); + ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_register", NULL, 282, _1$$3); zephir_check_call_status(); if (1) { zephir_update_property_this(this_ptr, SL("_registered"), ZEPHIR_GLOBAL(global_true) TSRMLS_CC); @@ -22343,7 +22366,7 @@ static PHP_METHOD(Phalcon_Loader, unregister) { ZEPHIR_INIT_VAR(_2$$3); ZVAL_STRING(_2$$3, "autoLoad", 1); zephir_array_fast_append(_1$$3, _2$$3); - ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_unregister", NULL, 288, _1$$3); + ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_unregister", NULL, 283, _1$$3); zephir_check_call_status(); if (0) { zephir_update_property_this(this_ptr, SL("_registered"), ZEPHIR_GLOBAL(global_true) TSRMLS_CC); @@ -22454,7 +22477,7 @@ static PHP_METHOD(Phalcon_Loader, autoLoad) { zephir_check_temp_parameter(_12$$12); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_14$$11, "is_file", &_15, 289, filePath); + ZEPHIR_CALL_FUNCTION(&_14$$11, "is_file", &_15, 284, filePath); zephir_check_call_status(); if (zephir_is_true(_14$$11)) { if (Z_TYPE_P(eventsManager) == IS_OBJECT) { @@ -22525,7 +22548,7 @@ static PHP_METHOD(Phalcon_Loader, autoLoad) { zephir_check_temp_parameter(_31$$20); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_33$$19, "is_file", &_15, 289, filePath); + ZEPHIR_CALL_FUNCTION(&_33$$19, "is_file", &_15, 284, filePath); zephir_check_call_status(); if (zephir_is_true(_33$$19)) { if (Z_TYPE_P(eventsManager) == IS_OBJECT) { @@ -22583,7 +22606,7 @@ static PHP_METHOD(Phalcon_Loader, autoLoad) { zephir_check_temp_parameter(_45$$26); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_47$$25, "is_file", &_15, 289, filePath); + ZEPHIR_CALL_FUNCTION(&_47$$25, "is_file", &_15, 284, filePath); zephir_check_call_status(); if (zephir_is_true(_47$$25)) { if (Z_TYPE_P(eventsManager) == IS_OBJECT) { @@ -22834,7 +22857,7 @@ static PHP_METHOD(Phalcon_Registry, next) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_data"), PH_NOISY_CC); ZEPHIR_MAKE_REF(_0); - ZEPHIR_CALL_FUNCTION(NULL, "next", NULL, 391, _0); + ZEPHIR_CALL_FUNCTION(NULL, "next", NULL, 388, _0); ZEPHIR_UNREF(_0); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -22850,7 +22873,7 @@ static PHP_METHOD(Phalcon_Registry, key) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_data"), PH_NOISY_CC); ZEPHIR_MAKE_REF(_0); - ZEPHIR_RETURN_CALL_FUNCTION("key", NULL, 392, _0); + ZEPHIR_RETURN_CALL_FUNCTION("key", NULL, 389, _0); ZEPHIR_UNREF(_0); zephir_check_call_status(); RETURN_MM(); @@ -22866,7 +22889,7 @@ static PHP_METHOD(Phalcon_Registry, rewind) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_data"), PH_NOISY_CC); ZEPHIR_MAKE_REF(_0); - ZEPHIR_CALL_FUNCTION(NULL, "reset", NULL, 393, _0); + ZEPHIR_CALL_FUNCTION(NULL, "reset", NULL, 390, _0); ZEPHIR_UNREF(_0); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -22882,7 +22905,7 @@ static PHP_METHOD(Phalcon_Registry, valid) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_data"), PH_NOISY_CC); ZEPHIR_MAKE_REF(_0); - ZEPHIR_CALL_FUNCTION(&_1, "key", NULL, 392, _0); + ZEPHIR_CALL_FUNCTION(&_1, "key", NULL, 389, _0); ZEPHIR_UNREF(_0); zephir_check_call_status(); RETURN_MM_BOOL(Z_TYPE_P(_1) != IS_NULL); @@ -22898,7 +22921,7 @@ static PHP_METHOD(Phalcon_Registry, current) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_data"), PH_NOISY_CC); ZEPHIR_MAKE_REF(_0); - ZEPHIR_RETURN_CALL_FUNCTION("current", NULL, 394, _0); + ZEPHIR_RETURN_CALL_FUNCTION("current", NULL, 391, _0); ZEPHIR_UNREF(_0); zephir_check_call_status(); RETURN_MM(); @@ -22926,7 +22949,7 @@ static PHP_METHOD(Phalcon_Registry, __set) { } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "offsetset", NULL, 395, key, value); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "offsetset", NULL, 392, key, value); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -22953,7 +22976,7 @@ static PHP_METHOD(Phalcon_Registry, __get) { } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "offsetget", NULL, 396, key); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "offsetget", NULL, 393, key); zephir_check_call_status(); RETURN_MM(); @@ -22980,7 +23003,7 @@ static PHP_METHOD(Phalcon_Registry, __isset) { } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "offsetexists", NULL, 397, key); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "offsetexists", NULL, 394, key); zephir_check_call_status(); RETURN_MM(); @@ -23007,7 +23030,7 @@ static PHP_METHOD(Phalcon_Registry, __unset) { } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "offsetunset", NULL, 398, key); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "offsetunset", NULL, 395, key); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -23165,7 +23188,7 @@ static PHP_METHOD(Phalcon_Security, getSaltBytes) { ZEPHIR_INIT_NVAR(safeBytes); ZEPHIR_INIT_NVAR(_1$$5); ZVAL_LONG(_1$$5, numberBytes); - ZEPHIR_CALL_FUNCTION(&_2$$5, "openssl_random_pseudo_bytes", &_3, 399, _1$$5); + ZEPHIR_CALL_FUNCTION(&_2$$5, "openssl_random_pseudo_bytes", &_3, 396, _1$$5); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&_4$$5, "base64_encode", &_5, 116, _2$$5); zephir_check_call_status(); @@ -23257,7 +23280,7 @@ static PHP_METHOD(Phalcon_Security, hash) { } ZEPHIR_INIT_VAR(_5$$11); ZEPHIR_CONCAT_SVSV(_5$$11, "$", variant, "$", saltBytes); - ZEPHIR_RETURN_CALL_FUNCTION("crypt", &_6, 400, password, _5$$11); + ZEPHIR_RETURN_CALL_FUNCTION("crypt", &_6, 397, password, _5$$11); zephir_check_call_status(); RETURN_MM(); } @@ -23280,11 +23303,11 @@ static PHP_METHOD(Phalcon_Security, hash) { ZVAL_STRING(&_8$$13, "%02s", 0); ZEPHIR_SINIT_VAR(_9$$13); ZVAL_LONG(&_9$$13, workFactor); - ZEPHIR_CALL_FUNCTION(&_10$$13, "sprintf", NULL, 189, &_8$$13, &_9$$13); + ZEPHIR_CALL_FUNCTION(&_10$$13, "sprintf", NULL, 184, &_8$$13, &_9$$13); zephir_check_call_status(); ZEPHIR_INIT_VAR(_11$$13); ZEPHIR_CONCAT_SVSVSV(_11$$13, "$2", variant, "$", _10$$13, "$", saltBytes); - ZEPHIR_RETURN_CALL_FUNCTION("crypt", &_6, 400, password, _11$$13); + ZEPHIR_RETURN_CALL_FUNCTION("crypt", &_6, 397, password, _11$$13); zephir_check_call_status(); RETURN_MM(); } while(0); @@ -23324,7 +23347,7 @@ static PHP_METHOD(Phalcon_Security, checkHash) { RETURN_MM_BOOL(0); } } - ZEPHIR_CALL_FUNCTION(&_1, "crypt", NULL, 400, password, passwordHash); + ZEPHIR_CALL_FUNCTION(&_1, "crypt", NULL, 397, password, passwordHash); zephir_check_call_status(); zephir_get_strval(_2, _1); ZEPHIR_CPY_WRT(cryptedHash, _2); @@ -23388,7 +23411,7 @@ static PHP_METHOD(Phalcon_Security, getTokenKey) { ZEPHIR_INIT_VAR(safeBytes); ZEPHIR_INIT_VAR(_1); ZVAL_LONG(_1, numberBytes); - ZEPHIR_CALL_FUNCTION(&_2, "openssl_random_pseudo_bytes", NULL, 399, _1); + ZEPHIR_CALL_FUNCTION(&_2, "openssl_random_pseudo_bytes", NULL, 396, _1); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&_3, "base64_encode", NULL, 116, _2); zephir_check_call_status(); @@ -23430,7 +23453,7 @@ static PHP_METHOD(Phalcon_Security, getToken) { } ZEPHIR_INIT_VAR(_0); ZVAL_LONG(_0, numberBytes); - ZEPHIR_CALL_FUNCTION(&token, "openssl_random_pseudo_bytes", NULL, 399, _0); + ZEPHIR_CALL_FUNCTION(&token, "openssl_random_pseudo_bytes", NULL, 396, _0); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&_1, "base64_encode", NULL, 116, token); zephir_check_call_status(); @@ -23605,7 +23628,7 @@ static PHP_METHOD(Phalcon_Security, computeHmac) { ZEPHIR_SINIT_VAR(_0); ZVAL_BOOL(&_0, (raw ? 1 : 0)); - ZEPHIR_CALL_FUNCTION(&hmac, "hash_hmac", NULL, 401, algo, data, key, &_0); + ZEPHIR_CALL_FUNCTION(&hmac, "hash_hmac", NULL, 398, algo, data, key, &_0); zephir_check_call_status(); if (!(zephir_is_true(hmac))) { ZEPHIR_INIT_VAR(_1$$3); @@ -24393,7 +24416,7 @@ static PHP_METHOD(Phalcon_Tag, colorField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "color", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24413,7 +24436,7 @@ static PHP_METHOD(Phalcon_Tag, textField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "text", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24433,7 +24456,7 @@ static PHP_METHOD(Phalcon_Tag, numericField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "number", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24453,7 +24476,7 @@ static PHP_METHOD(Phalcon_Tag, rangeField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "range", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24473,7 +24496,7 @@ static PHP_METHOD(Phalcon_Tag, emailField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "email", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24493,7 +24516,7 @@ static PHP_METHOD(Phalcon_Tag, dateField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "date", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24513,7 +24536,7 @@ static PHP_METHOD(Phalcon_Tag, dateTimeField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "datetime", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24533,7 +24556,7 @@ static PHP_METHOD(Phalcon_Tag, dateTimeLocalField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "datetime-local", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24553,7 +24576,7 @@ static PHP_METHOD(Phalcon_Tag, monthField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "month", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24573,7 +24596,7 @@ static PHP_METHOD(Phalcon_Tag, timeField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "time", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24593,7 +24616,7 @@ static PHP_METHOD(Phalcon_Tag, weekField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "week", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24613,7 +24636,7 @@ static PHP_METHOD(Phalcon_Tag, passwordField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "password", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24633,7 +24656,7 @@ static PHP_METHOD(Phalcon_Tag, hiddenField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "hidden", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24653,7 +24676,7 @@ static PHP_METHOD(Phalcon_Tag, fileField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "file", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24673,7 +24696,7 @@ static PHP_METHOD(Phalcon_Tag, searchField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "search", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24693,7 +24716,7 @@ static PHP_METHOD(Phalcon_Tag, telField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "tel", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24713,7 +24736,7 @@ static PHP_METHOD(Phalcon_Tag, urlField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "url", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24733,7 +24756,7 @@ static PHP_METHOD(Phalcon_Tag, checkField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "checkbox", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfieldchecked", &_0, 414, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfieldchecked", &_0, 411, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24753,7 +24776,7 @@ static PHP_METHOD(Phalcon_Tag, radioField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "radio", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfieldchecked", &_0, 414, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfieldchecked", &_0, 411, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24775,7 +24798,7 @@ static PHP_METHOD(Phalcon_Tag, imageInput) { ZVAL_STRING(_1, "image", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_INIT_VAR(_2); ZVAL_BOOL(_2, 1); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters, _2); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters, _2); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24797,7 +24820,7 @@ static PHP_METHOD(Phalcon_Tag, submitButton) { ZVAL_STRING(_1, "submit", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_INIT_VAR(_2); ZVAL_BOOL(_2, 1); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters, _2); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters, _2); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24818,7 +24841,7 @@ static PHP_METHOD(Phalcon_Tag, selectStatic) { } - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_select_ce, "selectfield", &_0, 208, parameters, data); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_select_ce, "selectfield", &_0, 203, parameters, data); zephir_check_call_status(); RETURN_MM(); @@ -24838,7 +24861,7 @@ static PHP_METHOD(Phalcon_Tag, select) { } - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_select_ce, "selectfield", &_0, 208, parameters, data); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_select_ce, "selectfield", &_0, 203, parameters, data); zephir_check_call_status(); RETURN_MM(); @@ -25359,13 +25382,13 @@ static PHP_METHOD(Phalcon_Tag, friendlyTitle) { ZVAL_LONG(&_3$$3, 0); ZEPHIR_SINIT_VAR(_4$$3); ZVAL_STRING(&_4$$3, "en_US.UTF-8", 0); - ZEPHIR_CALL_FUNCTION(&locale, "setlocale", &_5, 415, &_3$$3, &_4$$3); + ZEPHIR_CALL_FUNCTION(&locale, "setlocale", &_5, 412, &_3$$3, &_4$$3); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_3$$3); ZVAL_STRING(&_3$$3, "UTF-8", 0); ZEPHIR_SINIT_NVAR(_4$$3); ZVAL_STRING(&_4$$3, "ASCII//TRANSLIT", 0); - ZEPHIR_CALL_FUNCTION(&_6$$3, "iconv", NULL, 371, &_3$$3, &_4$$3, text); + ZEPHIR_CALL_FUNCTION(&_6$$3, "iconv", NULL, 369, &_3$$3, &_4$$3, text); zephir_check_call_status(); zephir_get_strval(text, _6$$3); } @@ -25428,7 +25451,7 @@ static PHP_METHOD(Phalcon_Tag, friendlyTitle) { if (zephir_is_true(_19)) { ZEPHIR_SINIT_VAR(_20$$10); ZVAL_LONG(&_20$$10, 0); - ZEPHIR_CALL_FUNCTION(NULL, "setlocale", &_5, 415, &_20$$10, locale); + ZEPHIR_CALL_FUNCTION(NULL, "setlocale", &_5, 412, &_20$$10, locale); zephir_check_call_status(); } RETURN_CCTOR(friendly); @@ -25700,7 +25723,7 @@ static PHP_METHOD(Phalcon_Text, camelize) { ZEPHIR_INIT_VAR(_0); - zephir_camelize(_0, str); + zephir_camelize(_0, str, NULL ); RETURN_CCTOR(_0); } @@ -25726,7 +25749,7 @@ static PHP_METHOD(Phalcon_Text, uncamelize) { ZEPHIR_INIT_VAR(_0); - zephir_uncamelize(_0, str); + zephir_uncamelize(_0, str, NULL ); RETURN_CCTOR(_0); } @@ -25794,13 +25817,13 @@ static PHP_METHOD(Phalcon_Text, random) { ZVAL_STRING(&_0$$3, "a", 0); ZEPHIR_SINIT_VAR(_1$$3); ZVAL_STRING(&_1$$3, "z", 0); - ZEPHIR_CALL_FUNCTION(&_2$$3, "range", &_3, 418, &_0$$3, &_1$$3); + ZEPHIR_CALL_FUNCTION(&_2$$3, "range", &_3, 415, &_0$$3, &_1$$3); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_0$$3); ZVAL_STRING(&_0$$3, "A", 0); ZEPHIR_SINIT_NVAR(_1$$3); ZVAL_STRING(&_1$$3, "Z", 0); - ZEPHIR_CALL_FUNCTION(&_4$$3, "range", &_3, 418, &_0$$3, &_1$$3); + ZEPHIR_CALL_FUNCTION(&_4$$3, "range", &_3, 415, &_0$$3, &_1$$3); zephir_check_call_status(); ZEPHIR_INIT_VAR(pool); zephir_fast_array_merge(pool, &(_2$$3), &(_4$$3) TSRMLS_CC); @@ -25811,13 +25834,13 @@ static PHP_METHOD(Phalcon_Text, random) { ZVAL_LONG(&_5$$4, 0); ZEPHIR_SINIT_VAR(_6$$4); ZVAL_LONG(&_6$$4, 9); - ZEPHIR_CALL_FUNCTION(&_7$$4, "range", &_3, 418, &_5$$4, &_6$$4); + ZEPHIR_CALL_FUNCTION(&_7$$4, "range", &_3, 415, &_5$$4, &_6$$4); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_5$$4); ZVAL_STRING(&_5$$4, "a", 0); ZEPHIR_SINIT_NVAR(_6$$4); ZVAL_STRING(&_6$$4, "f", 0); - ZEPHIR_CALL_FUNCTION(&_8$$4, "range", &_3, 418, &_5$$4, &_6$$4); + ZEPHIR_CALL_FUNCTION(&_8$$4, "range", &_3, 415, &_5$$4, &_6$$4); zephir_check_call_status(); ZEPHIR_INIT_NVAR(pool); zephir_fast_array_merge(pool, &(_7$$4), &(_8$$4) TSRMLS_CC); @@ -25828,7 +25851,7 @@ static PHP_METHOD(Phalcon_Text, random) { ZVAL_LONG(&_9$$5, 0); ZEPHIR_SINIT_VAR(_10$$5); ZVAL_LONG(&_10$$5, 9); - ZEPHIR_CALL_FUNCTION(&pool, "range", &_3, 418, &_9$$5, &_10$$5); + ZEPHIR_CALL_FUNCTION(&pool, "range", &_3, 415, &_9$$5, &_10$$5); zephir_check_call_status(); break; } @@ -25837,7 +25860,7 @@ static PHP_METHOD(Phalcon_Text, random) { ZVAL_LONG(&_11$$6, 1); ZEPHIR_SINIT_VAR(_12$$6); ZVAL_LONG(&_12$$6, 9); - ZEPHIR_CALL_FUNCTION(&pool, "range", &_3, 418, &_11$$6, &_12$$6); + ZEPHIR_CALL_FUNCTION(&pool, "range", &_3, 415, &_11$$6, &_12$$6); zephir_check_call_status(); break; } @@ -25845,21 +25868,21 @@ static PHP_METHOD(Phalcon_Text, random) { ZVAL_LONG(&_13$$7, 0); ZEPHIR_SINIT_VAR(_14$$7); ZVAL_LONG(&_14$$7, 9); - ZEPHIR_CALL_FUNCTION(&_15$$7, "range", &_3, 418, &_13$$7, &_14$$7); + ZEPHIR_CALL_FUNCTION(&_15$$7, "range", &_3, 415, &_13$$7, &_14$$7); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_13$$7); ZVAL_STRING(&_13$$7, "a", 0); ZEPHIR_SINIT_NVAR(_14$$7); ZVAL_STRING(&_14$$7, "z", 0); - ZEPHIR_CALL_FUNCTION(&_16$$7, "range", &_3, 418, &_13$$7, &_14$$7); + ZEPHIR_CALL_FUNCTION(&_16$$7, "range", &_3, 415, &_13$$7, &_14$$7); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_13$$7); ZVAL_STRING(&_13$$7, "A", 0); ZEPHIR_SINIT_NVAR(_14$$7); ZVAL_STRING(&_14$$7, "Z", 0); - ZEPHIR_CALL_FUNCTION(&_17$$7, "range", &_3, 418, &_13$$7, &_14$$7); + ZEPHIR_CALL_FUNCTION(&_17$$7, "range", &_3, 415, &_13$$7, &_14$$7); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&pool, "array_merge", &_18, 419, _15$$7, _16$$7, _17$$7); + ZEPHIR_CALL_FUNCTION(&pool, "array_merge", &_18, 416, _15$$7, _16$$7, _17$$7); zephir_check_call_status(); break; } while(0); @@ -25965,7 +25988,7 @@ static PHP_METHOD(Phalcon_Text, lower) { if ((zephir_function_exists_ex(SS("mb_strtolower") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("mb_strtolower", NULL, 196, str, encoding); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strtolower", NULL, 191, str, encoding); zephir_check_call_status(); RETURN_MM(); } @@ -26011,7 +26034,7 @@ static PHP_METHOD(Phalcon_Text, upper) { if ((zephir_function_exists_ex(SS("mb_strtoupper") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("mb_strtoupper", NULL, 197, str, encoding); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strtoupper", NULL, 192, str, encoding); zephir_check_call_status(); RETURN_MM(); } @@ -26056,24 +26079,24 @@ static PHP_METHOD(Phalcon_Text, concat) { ZEPHIR_SINIT_VAR(_0); ZVAL_LONG(&_0, 0); - ZEPHIR_CALL_FUNCTION(&separator, "func_get_arg", &_1, 420, &_0); + ZEPHIR_CALL_FUNCTION(&separator, "func_get_arg", &_1, 417, &_0); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_0); ZVAL_LONG(&_0, 1); - ZEPHIR_CALL_FUNCTION(&a, "func_get_arg", &_1, 420, &_0); + ZEPHIR_CALL_FUNCTION(&a, "func_get_arg", &_1, 417, &_0); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_0); ZVAL_LONG(&_0, 2); - ZEPHIR_CALL_FUNCTION(&b, "func_get_arg", &_1, 420, &_0); + ZEPHIR_CALL_FUNCTION(&b, "func_get_arg", &_1, 417, &_0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_2, "func_num_args", NULL, 421); + ZEPHIR_CALL_FUNCTION(&_2, "func_num_args", NULL, 418); zephir_check_call_status(); if (ZEPHIR_GT_LONG(_2, 3)) { - ZEPHIR_CALL_FUNCTION(&_3$$3, "func_get_args", NULL, 168); + ZEPHIR_CALL_FUNCTION(&_3$$3, "func_get_args", NULL, 163); zephir_check_call_status(); ZEPHIR_SINIT_VAR(_4$$3); ZVAL_LONG(&_4$$3, 3); - ZEPHIR_CALL_FUNCTION(&_5$$3, "array_slice", NULL, 372, _3$$3, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "array_slice", NULL, 370, _3$$3, &_4$$3); zephir_check_call_status(); zephir_is_iterable(_5$$3, &_7$$3, &_6$$3, 0, 0, "phalcon/text.zep", 242); for ( @@ -26166,24 +26189,24 @@ static PHP_METHOD(Phalcon_Text, dynamic) { } - ZEPHIR_CALL_FUNCTION(&_0, "substr_count", &_1, 422, text, leftDelimiter); + ZEPHIR_CALL_FUNCTION(&_0, "substr_count", &_1, 419, text, leftDelimiter); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_2, "substr_count", &_1, 422, text, rightDelimiter); + ZEPHIR_CALL_FUNCTION(&_2, "substr_count", &_1, 419, text, rightDelimiter); zephir_check_call_status(); if (!ZEPHIR_IS_IDENTICAL(_0, _2)) { ZEPHIR_INIT_VAR(_3$$3); object_init_ex(_3$$3, spl_ce_RuntimeException); ZEPHIR_INIT_VAR(_4$$3); ZEPHIR_CONCAT_SVS(_4$$3, "Syntax error in string \"", text, "\""); - ZEPHIR_CALL_METHOD(NULL, _3$$3, "__construct", NULL, 423, _4$$3); + ZEPHIR_CALL_METHOD(NULL, _3$$3, "__construct", NULL, 420, _4$$3); zephir_check_call_status(); zephir_throw_exception_debug(_3$$3, "phalcon/text.zep", 261 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_FUNCTION(&ldS, "preg_quote", &_5, 424, leftDelimiter); + ZEPHIR_CALL_FUNCTION(&ldS, "preg_quote", &_5, 421, leftDelimiter); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&rdS, "preg_quote", &_5, 424, rightDelimiter); + ZEPHIR_CALL_FUNCTION(&rdS, "preg_quote", &_5, 421, rightDelimiter); zephir_check_call_status(); ZEPHIR_INIT_VAR(pattern); ZEPHIR_CONCAT_SVSVVSVS(pattern, "/", ldS, "([^", ldS, rdS, "]+)", rdS, "/"); @@ -26195,7 +26218,7 @@ static PHP_METHOD(Phalcon_Text, dynamic) { ZEPHIR_INIT_NVAR(_6$$4); ZEPHIR_INIT_NVAR(_6$$4); zephir_create_closure_ex(_6$$4, NULL, phalcon_0__closure_ce, SS("__invoke") TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_7$$4, "preg_replace_callback", &_8, 425, pattern, _6$$4, result); + ZEPHIR_CALL_FUNCTION(&_7$$4, "preg_replace_callback", &_8, 422, pattern, _6$$4, result); zephir_check_call_status(); ZEPHIR_CPY_WRT(result, _7$$4); } @@ -26618,7 +26641,7 @@ static PHP_METHOD(Phalcon_Validation, setDefaultMessages) { ZEPHIR_INIT_VAR(defaultMessages); - zephir_create_array(defaultMessages, 24, 0 TSRMLS_CC); + zephir_create_array(defaultMessages, 25, 0 TSRMLS_CC); add_assoc_stringl_ex(defaultMessages, SS("Alnum"), SL("Field :field must contain only letters and numbers"), 1); add_assoc_stringl_ex(defaultMessages, SS("Alpha"), SL("Field :field must contain only letters"), 1); add_assoc_stringl_ex(defaultMessages, SS("Between"), SL("Field :field must be within the range of :min to :max"), 1); @@ -26643,6 +26666,7 @@ static PHP_METHOD(Phalcon_Validation, setDefaultMessages) { add_assoc_stringl_ex(defaultMessages, SS("Uniqueness"), SL("Field :field must be unique"), 1); add_assoc_stringl_ex(defaultMessages, SS("Url"), SL("Field :field must be a url"), 1); add_assoc_stringl_ex(defaultMessages, SS("CreditCard"), SL("Field :field is not valid for a credit card number"), 1); + add_assoc_stringl_ex(defaultMessages, SS("Date"), SL("Field :field is not a valid date"), 1); ZEPHIR_INIT_VAR(_0); zephir_fast_array_merge(_0, &(defaultMessages), &(messages) TSRMLS_CC); zephir_update_property_this(this_ptr, SL("_defaultMessages"), _0 TSRMLS_CC); @@ -26675,7 +26699,7 @@ static PHP_METHOD(Phalcon_Validation, getDefaultMessage) { RETURN_MM_STRING("", 1); } _1 = zephir_fetch_nproperty_this(this_ptr, SL("_defaultMessages"), PH_NOISY_CC); - zephir_array_fetch(&_2, _1, type, PH_NOISY | PH_READONLY, "phalcon/validation.zep", 279 TSRMLS_CC); + zephir_array_fetch(&_2, _1, type, PH_NOISY | PH_READONLY, "phalcon/validation.zep", 280 TSRMLS_CC); RETURN_CTOR(_2); } @@ -26759,7 +26783,7 @@ static PHP_METHOD(Phalcon_Validation, bind) { if (Z_TYPE_P(entity) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_validation_exception_ce, "Entity must be an object", "phalcon/validation.zep", 336); + ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_validation_exception_ce, "Entity must be an object", "phalcon/validation.zep", 337); return; } _0 = Z_TYPE_P(data) != IS_ARRAY; @@ -26767,7 +26791,7 @@ static PHP_METHOD(Phalcon_Validation, bind) { _0 = Z_TYPE_P(data) != IS_OBJECT; } if (_0) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_validation_exception_ce, "Data to validate must be an array or object", "phalcon/validation.zep", 340); + ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_validation_exception_ce, "Data to validate must be an array or object", "phalcon/validation.zep", 341); return; } zephir_update_property_this(this_ptr, SL("_entity"), entity TSRMLS_CC); @@ -26821,7 +26845,7 @@ static PHP_METHOD(Phalcon_Validation, getValue) { _1 = Z_TYPE_P(data) != IS_OBJECT; } if (_1) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_validation_exception_ce, "There is no data to validate", "phalcon/validation.zep", 387); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_validation_exception_ce, "There is no data to validate", "phalcon/validation.zep", 388); return; } ZEPHIR_OBS_VAR(values); @@ -26835,7 +26859,7 @@ static PHP_METHOD(Phalcon_Validation, getValue) { if (Z_TYPE_P(data) == IS_ARRAY) { if (zephir_array_isset(data, field)) { ZEPHIR_OBS_NVAR(value); - zephir_array_fetch(&value, data, field, PH_NOISY, "phalcon/validation.zep", 401 TSRMLS_CC); + zephir_array_fetch(&value, data, field, PH_NOISY, "phalcon/validation.zep", 402 TSRMLS_CC); } } else if (Z_TYPE_P(data) == IS_OBJECT) { if (zephir_isset_property_zval(data, field TSRMLS_CC)) { @@ -26858,7 +26882,7 @@ static PHP_METHOD(Phalcon_Validation, getValue) { ZEPHIR_CALL_CE_STATIC(&dependencyInjector, phalcon_di_ce, "getdefault", &_2, 1); zephir_check_call_status(); if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_validation_exception_ce, "A dependency injector is required to obtain the 'filter' service", "phalcon/validation.zep", 424); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_validation_exception_ce, "A dependency injector is required to obtain the 'filter' service", "phalcon/validation.zep", 425); return; } } @@ -26868,7 +26892,7 @@ static PHP_METHOD(Phalcon_Validation, getValue) { zephir_check_temp_parameter(_3$$19); zephir_check_call_status(); if (Z_TYPE_P(filterService) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_validation_exception_ce, "Returned 'filter' service is invalid", "phalcon/validation.zep", 430); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_validation_exception_ce, "Returned 'filter' service is invalid", "phalcon/validation.zep", 431); return; } ZEPHIR_RETURN_CALL_METHOD(filterService, "sanitize", NULL, 0, value, fieldFilters); @@ -26928,7 +26952,7 @@ static PHP_METHOD(Phalcon_Version, _getVersion) { ZVAL_LONG(_0, 0); zephir_array_fast_append(return_value, _0); ZEPHIR_INIT_NVAR(_0); - ZVAL_LONG(_0, 10); + ZVAL_LONG(_0, 11); zephir_array_fast_append(return_value, _0); ZEPHIR_INIT_NVAR(_0); ZVAL_LONG(_0, 4); @@ -26997,7 +27021,7 @@ static PHP_METHOD(Phalcon_Version, get) { zephir_array_fetch_long(&specialNumber, version, 4, PH_NOISY, "phalcon/version.zep", 128 TSRMLS_CC); ZEPHIR_INIT_VAR(result); ZEPHIR_CONCAT_VSVSVS(result, major, ".", medium, ".", minor, " "); - ZEPHIR_CALL_STATIC(&suffix, "_getspecial", &_0, 446, special); + ZEPHIR_CALL_STATIC(&suffix, "_getspecial", &_0, 443, special); zephir_check_call_status(); if (!ZEPHIR_IS_STRING(suffix, "")) { ZEPHIR_INIT_VAR(_1$$3); @@ -27031,11 +27055,11 @@ static PHP_METHOD(Phalcon_Version, getId) { zephir_array_fetch_long(&specialNumber, version, 4, PH_NOISY, "phalcon/version.zep", 158 TSRMLS_CC); ZEPHIR_SINIT_VAR(_0); ZVAL_STRING(&_0, "%02s", 0); - ZEPHIR_CALL_FUNCTION(&_1, "sprintf", &_2, 189, &_0, medium); + ZEPHIR_CALL_FUNCTION(&_1, "sprintf", &_2, 184, &_0, medium); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_0); ZVAL_STRING(&_0, "%02s", 0); - ZEPHIR_CALL_FUNCTION(&_3, "sprintf", &_2, 189, &_0, minor); + ZEPHIR_CALL_FUNCTION(&_3, "sprintf", &_2, 184, &_0, minor); zephir_check_call_status(); ZEPHIR_CONCAT_VVVVV(return_value, major, _1, _3, special, specialNumber); RETURN_MM(); @@ -27064,7 +27088,7 @@ static PHP_METHOD(Phalcon_Version, getPart) { } if (part == 3) { zephir_array_fetch_long(&_1$$4, version, 3, PH_NOISY | PH_READONLY, "phalcon/version.zep", 187 TSRMLS_CC); - ZEPHIR_CALL_STATIC(&result, "_getspecial", &_0, 446, _1$$4); + ZEPHIR_CALL_STATIC(&result, "_getspecial", &_0, 443, _1$$4); zephir_check_call_status(); break; } @@ -32929,7 +32953,7 @@ static PHP_METHOD(Phalcon_Assets_Collection, addFilter) { } -static zend_object_value zephir_init_properties_Phalcon_Assets_Collection(zend_class_entry *class_type TSRMLS_DC) { +zend_object_value zephir_init_properties_Phalcon_Assets_Collection(zend_class_entry *class_type TSRMLS_DC) { zval *_0, *_2, *_4, *_6, *_1$$3, *_3$$4, *_5$$5, *_7$$6; @@ -38626,7 +38650,7 @@ static PHP_METHOD(Phalcon_Cache_Backend_Mongo, decrement) { static PHP_METHOD(Phalcon_Cache_Backend_Mongo, flush) { - zval *_0 = NULL, *_1 = NULL; + zval *_0 = NULL; int ZEPHIR_LAST_CALL_STATUS; ZEPHIR_MM_GROW(); @@ -38635,12 +38659,6 @@ static PHP_METHOD(Phalcon_Cache_Backend_Mongo, flush) { zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, _0, "remove", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "rand", NULL, 111); - zephir_check_call_status(); - if (zephir_safe_mod_long_long(zephir_get_intval(_1), 100 TSRMLS_CC) == 0) { - ZEPHIR_CALL_METHOD(NULL, this_ptr, "gc", NULL, 0); - zephir_check_call_status(); - } RETURN_MM_BOOL(1); } @@ -38737,8 +38755,10 @@ static PHP_METHOD(Phalcon_Cache_Backend_Redis, _connect) { zephir_read_property_this(&options, this_ptr, SL("_options"), PH_NOISY_CC); ZEPHIR_INIT_VAR(redis); object_init_ex(redis, zephir_get_internal_ce(SS("redis") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, redis, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(redis TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, redis, "__construct", NULL, 0); + zephir_check_call_status(); + } ZEPHIR_OBS_VAR(host); _0 = !(zephir_array_isset_string_fetch(&host, options, SS("host"), 0 TSRMLS_CC)); if (!(_0)) { @@ -42220,7 +42240,7 @@ static PHP_METHOD(Phalcon_Cli_Router_Route, reConfigure) { ZEPHIR_CPY_WRT(realClassName, taskName); } ZEPHIR_INIT_VAR(_1$$9); - zephir_uncamelize(_1$$9, realClassName); + zephir_uncamelize(_1$$9, realClassName, NULL ); zephir_array_update_string(&routePaths, SL("task"), &_1$$9, PH_COPY | PH_SEPARATE); } if (Z_TYPE_P(actionName) != IS_NULL) { @@ -45456,7 +45476,7 @@ static PHP_METHOD(Phalcon_Db_Column, __set_state) { zephir_array_update_string(&definition, SL("bindType"), &bindType, PH_COPY | PH_SEPARATE); } object_init_ex(return_value, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 142, columnName, definition); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 137, columnName, definition); zephir_check_call_status(); RETURN_MM(); @@ -47668,19 +47688,19 @@ static PHP_METHOD(Phalcon_Db_Profiler, startProfile) { ZEPHIR_CALL_METHOD(NULL, activeProfile, "__construct", NULL, 0); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, activeProfile, "setsqlstatement", NULL, 147, sqlStatement); + ZEPHIR_CALL_METHOD(NULL, activeProfile, "setsqlstatement", NULL, 142, sqlStatement); zephir_check_call_status(); if (Z_TYPE_P(sqlVariables) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(NULL, activeProfile, "setsqlvariables", NULL, 148, sqlVariables); + ZEPHIR_CALL_METHOD(NULL, activeProfile, "setsqlvariables", NULL, 143, sqlVariables); zephir_check_call_status(); } if (Z_TYPE_P(sqlBindTypes) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(NULL, activeProfile, "setsqlbindtypes", NULL, 149, sqlBindTypes); + ZEPHIR_CALL_METHOD(NULL, activeProfile, "setsqlbindtypes", NULL, 144, sqlBindTypes); zephir_check_call_status(); } ZEPHIR_INIT_VAR(_0); zephir_microtime(_0, ZEPHIR_GLOBAL(global_true) TSRMLS_CC); - ZEPHIR_CALL_METHOD(NULL, activeProfile, "setinitialtime", NULL, 150, _0); + ZEPHIR_CALL_METHOD(NULL, activeProfile, "setinitialtime", NULL, 145, _0); zephir_check_call_status(); if ((zephir_method_exists_ex(this_ptr, SS("beforestartprofile") TSRMLS_CC) == SUCCESS)) { ZEPHIR_CALL_METHOD(NULL, this_ptr, "beforestartprofile", NULL, 0, activeProfile); @@ -49063,9 +49083,9 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, escapeIdentifier) { if (Z_TYPE_P(identifier) == IS_ARRAY) { ZEPHIR_OBS_VAR(domain); - zephir_array_fetch_long(&domain, identifier, 0, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 71 TSRMLS_CC); + zephir_array_fetch_long(&domain, identifier, 0, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 72 TSRMLS_CC); ZEPHIR_OBS_VAR(name); - zephir_array_fetch_long(&name, identifier, 1, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 72 TSRMLS_CC); + zephir_array_fetch_long(&name, identifier, 1, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 73 TSRMLS_CC); if (ZEPHIR_GLOBAL(db).escape_identifiers) { ZEPHIR_CONCAT_SVSVS(return_value, "`", domain, "`.`", name, "`"); RETURN_MM(); @@ -49088,7 +49108,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { HashPosition _4; zephir_fcall_cache_entry *_41 = NULL; int ZEPHIR_LAST_CALL_STATUS; - zval *table_param = NULL, *schema_param = NULL, *columns = NULL, *columnType = NULL, *field = NULL, *definition = NULL, *oldColumn = NULL, *sizePattern = NULL, *matches = NULL, *matchOne = NULL, *matchTwo = NULL, *columnName = NULL, *_0 = NULL, *_1, *_2 = NULL, *_3, **_6, *_7$$5 = NULL, *_8$$5 = NULL, *_9$$6 = NULL, *_10$$6 = NULL, *_11$$7 = NULL, *_12$$8 = NULL, *_13$$9 = NULL, *_14$$10 = NULL, *_15$$11 = NULL, *_16$$12 = NULL, *_17$$13 = NULL, *_18$$14 = NULL, *_19$$14 = NULL, *_20$$15 = NULL, *_21$$15 = NULL, *_22$$16 = NULL, *_23$$16 = NULL, *_24$$17 = NULL, *_25$$17 = NULL, *_26$$18 = NULL, *_27$$18 = NULL, *_28$$19 = NULL, *_29$$20 = NULL, *_30$$21 = NULL, *_31$$4 = NULL, *_32$$22 = NULL, *_33$$24 = NULL, *_34$$25 = NULL, *_35$$3, *_36$$3, *_37$$3, *_38$$3 = NULL, *_40$$3 = NULL, *_39$$32; + zval *table_param = NULL, *schema_param = NULL, *columns = NULL, *columnType = NULL, *field = NULL, *definition = NULL, *oldColumn = NULL, *sizePattern = NULL, *matches = NULL, *matchOne = NULL, *matchTwo = NULL, *columnName = NULL, *_0 = NULL, *_1, *_2 = NULL, *_3, **_6, *_7$$5 = NULL, *_8$$6 = NULL, *_9$$6 = NULL, *_10$$7 = NULL, *_11$$7 = NULL, *_12$$8 = NULL, *_13$$9 = NULL, *_14$$10 = NULL, *_15$$11 = NULL, *_16$$12 = NULL, *_17$$13 = NULL, *_18$$14 = NULL, *_19$$14 = NULL, *_20$$15 = NULL, *_21$$15 = NULL, *_22$$16 = NULL, *_23$$16 = NULL, *_24$$17 = NULL, *_25$$17 = NULL, *_26$$18 = NULL, *_27$$18 = NULL, *_28$$19 = NULL, *_29$$20 = NULL, *_30$$21 = NULL, *_31$$4 = NULL, *_32$$22 = NULL, *_33$$24 = NULL, *_34$$25 = NULL, *_35$$3, *_36$$3, *_37$$3, *_38$$3 = NULL, *_40$$3 = NULL, *_39$$32; zval *table = NULL, *schema = NULL; ZEPHIR_MM_GROW(); @@ -49116,7 +49136,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { ZVAL_LONG(_3, 3); ZEPHIR_CALL_METHOD(&_0, this_ptr, "fetchall", NULL, 0, _2, _3); zephir_check_call_status(); - zephir_is_iterable(_0, &_5, &_4, 0, 0, "phalcon/db/adapter/pdo/mysql.zep", 345); + zephir_is_iterable(_0, &_5, &_4, 0, 0, "phalcon/db/adapter/pdo/mysql.zep", 346); for ( ; zephir_hash_get_current_data_ex(_5, (void**) &_6, &_4) == SUCCESS ; zephir_hash_move_forward_ex(_5, &_4) @@ -49126,71 +49146,71 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { zephir_create_array(definition, 1, 0 TSRMLS_CC); add_assoc_long_ex(definition, SS("bindType"), 2); ZEPHIR_OBS_NVAR(columnType); - zephir_array_fetch_long(&columnType, field, 1, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 119 TSRMLS_CC); + zephir_array_fetch_long(&columnType, field, 1, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 120 TSRMLS_CC); while (1) { - if (zephir_memnstr_str(columnType, SL("bigint"), "phalcon/db/adapter/pdo/mysql.zep", 126)) { + if (zephir_memnstr_str(columnType, SL("enum"), "phalcon/db/adapter/pdo/mysql.zep", 127)) { ZEPHIR_INIT_NVAR(_7$$5); - ZVAL_LONG(_7$$5, 14); + ZVAL_LONG(_7$$5, 5); zephir_array_update_string(&definition, SL("type"), &_7$$5, PH_COPY | PH_SEPARATE); - zephir_array_update_string(&definition, SL("isNumeric"), &ZEPHIR_GLOBAL(global_true), PH_COPY | PH_SEPARATE); - ZEPHIR_INIT_NVAR(_8$$5); - ZVAL_LONG(_8$$5, 1); - zephir_array_update_string(&definition, SL("bindType"), &_8$$5, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("int"), "phalcon/db/adapter/pdo/mysql.zep", 136)) { - ZEPHIR_INIT_NVAR(_9$$6); - ZVAL_LONG(_9$$6, 0); - zephir_array_update_string(&definition, SL("type"), &_9$$6, PH_COPY | PH_SEPARATE); + if (zephir_memnstr_str(columnType, SL("bigint"), "phalcon/db/adapter/pdo/mysql.zep", 135)) { + ZEPHIR_INIT_NVAR(_8$$6); + ZVAL_LONG(_8$$6, 14); + zephir_array_update_string(&definition, SL("type"), &_8$$6, PH_COPY | PH_SEPARATE); zephir_array_update_string(&definition, SL("isNumeric"), &ZEPHIR_GLOBAL(global_true), PH_COPY | PH_SEPARATE); - ZEPHIR_INIT_NVAR(_10$$6); - ZVAL_LONG(_10$$6, 1); - zephir_array_update_string(&definition, SL("bindType"), &_10$$6, PH_COPY | PH_SEPARATE); + ZEPHIR_INIT_NVAR(_9$$6); + ZVAL_LONG(_9$$6, 1); + zephir_array_update_string(&definition, SL("bindType"), &_9$$6, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("varchar"), "phalcon/db/adapter/pdo/mysql.zep", 146)) { + if (zephir_memnstr_str(columnType, SL("int"), "phalcon/db/adapter/pdo/mysql.zep", 145)) { + ZEPHIR_INIT_NVAR(_10$$7); + ZVAL_LONG(_10$$7, 0); + zephir_array_update_string(&definition, SL("type"), &_10$$7, PH_COPY | PH_SEPARATE); + zephir_array_update_string(&definition, SL("isNumeric"), &ZEPHIR_GLOBAL(global_true), PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(_11$$7); - ZVAL_LONG(_11$$7, 2); - zephir_array_update_string(&definition, SL("type"), &_11$$7, PH_COPY | PH_SEPARATE); + ZVAL_LONG(_11$$7, 1); + zephir_array_update_string(&definition, SL("bindType"), &_11$$7, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("datetime"), "phalcon/db/adapter/pdo/mysql.zep", 154)) { + if (zephir_memnstr_str(columnType, SL("varchar"), "phalcon/db/adapter/pdo/mysql.zep", 155)) { ZEPHIR_INIT_NVAR(_12$$8); - ZVAL_LONG(_12$$8, 4); + ZVAL_LONG(_12$$8, 2); zephir_array_update_string(&definition, SL("type"), &_12$$8, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("enum"), "phalcon/db/adapter/pdo/mysql.zep", 162)) { + if (zephir_memnstr_str(columnType, SL("datetime"), "phalcon/db/adapter/pdo/mysql.zep", 163)) { ZEPHIR_INIT_NVAR(_13$$9); - ZVAL_LONG(_13$$9, 5); + ZVAL_LONG(_13$$9, 4); zephir_array_update_string(&definition, SL("type"), &_13$$9, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("char"), "phalcon/db/adapter/pdo/mysql.zep", 170)) { + if (zephir_memnstr_str(columnType, SL("char"), "phalcon/db/adapter/pdo/mysql.zep", 171)) { ZEPHIR_INIT_NVAR(_14$$10); ZVAL_LONG(_14$$10, 5); zephir_array_update_string(&definition, SL("type"), &_14$$10, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("date"), "phalcon/db/adapter/pdo/mysql.zep", 178)) { + if (zephir_memnstr_str(columnType, SL("date"), "phalcon/db/adapter/pdo/mysql.zep", 179)) { ZEPHIR_INIT_NVAR(_15$$11); ZVAL_LONG(_15$$11, 1); zephir_array_update_string(&definition, SL("type"), &_15$$11, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("timestamp"), "phalcon/db/adapter/pdo/mysql.zep", 186)) { + if (zephir_memnstr_str(columnType, SL("timestamp"), "phalcon/db/adapter/pdo/mysql.zep", 187)) { ZEPHIR_INIT_NVAR(_16$$12); ZVAL_LONG(_16$$12, 17); zephir_array_update_string(&definition, SL("type"), &_16$$12, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("text"), "phalcon/db/adapter/pdo/mysql.zep", 194)) { + if (zephir_memnstr_str(columnType, SL("text"), "phalcon/db/adapter/pdo/mysql.zep", 195)) { ZEPHIR_INIT_NVAR(_17$$13); ZVAL_LONG(_17$$13, 6); zephir_array_update_string(&definition, SL("type"), &_17$$13, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("decimal"), "phalcon/db/adapter/pdo/mysql.zep", 202)) { + if (zephir_memnstr_str(columnType, SL("decimal"), "phalcon/db/adapter/pdo/mysql.zep", 203)) { ZEPHIR_INIT_NVAR(_18$$14); ZVAL_LONG(_18$$14, 3); zephir_array_update_string(&definition, SL("type"), &_18$$14, PH_COPY | PH_SEPARATE); @@ -49200,7 +49220,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { zephir_array_update_string(&definition, SL("bindType"), &_19$$14, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("double"), "phalcon/db/adapter/pdo/mysql.zep", 212)) { + if (zephir_memnstr_str(columnType, SL("double"), "phalcon/db/adapter/pdo/mysql.zep", 213)) { ZEPHIR_INIT_NVAR(_20$$15); ZVAL_LONG(_20$$15, 9); zephir_array_update_string(&definition, SL("type"), &_20$$15, PH_COPY | PH_SEPARATE); @@ -49210,7 +49230,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { zephir_array_update_string(&definition, SL("bindType"), &_21$$15, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("float"), "phalcon/db/adapter/pdo/mysql.zep", 222)) { + if (zephir_memnstr_str(columnType, SL("float"), "phalcon/db/adapter/pdo/mysql.zep", 223)) { ZEPHIR_INIT_NVAR(_22$$16); ZVAL_LONG(_22$$16, 7); zephir_array_update_string(&definition, SL("type"), &_22$$16, PH_COPY | PH_SEPARATE); @@ -49220,7 +49240,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { zephir_array_update_string(&definition, SL("bindType"), &_23$$16, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("bit"), "phalcon/db/adapter/pdo/mysql.zep", 232)) { + if (zephir_memnstr_str(columnType, SL("bit"), "phalcon/db/adapter/pdo/mysql.zep", 233)) { ZEPHIR_INIT_NVAR(_24$$17); ZVAL_LONG(_24$$17, 8); zephir_array_update_string(&definition, SL("type"), &_24$$17, PH_COPY | PH_SEPARATE); @@ -49229,7 +49249,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { zephir_array_update_string(&definition, SL("bindType"), &_25$$17, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("tinyblob"), "phalcon/db/adapter/pdo/mysql.zep", 241)) { + if (zephir_memnstr_str(columnType, SL("tinyblob"), "phalcon/db/adapter/pdo/mysql.zep", 242)) { ZEPHIR_INIT_NVAR(_26$$18); ZVAL_LONG(_26$$18, 10); zephir_array_update_string(&definition, SL("type"), &_26$$18, PH_COPY | PH_SEPARATE); @@ -49238,19 +49258,19 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { zephir_array_update_string(&definition, SL("bindType"), &_27$$18, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("mediumblob"), "phalcon/db/adapter/pdo/mysql.zep", 250)) { + if (zephir_memnstr_str(columnType, SL("mediumblob"), "phalcon/db/adapter/pdo/mysql.zep", 251)) { ZEPHIR_INIT_NVAR(_28$$19); ZVAL_LONG(_28$$19, 12); zephir_array_update_string(&definition, SL("type"), &_28$$19, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("longblob"), "phalcon/db/adapter/pdo/mysql.zep", 258)) { + if (zephir_memnstr_str(columnType, SL("longblob"), "phalcon/db/adapter/pdo/mysql.zep", 259)) { ZEPHIR_INIT_NVAR(_29$$20); ZVAL_LONG(_29$$20, 13); zephir_array_update_string(&definition, SL("type"), &_29$$20, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("blob"), "phalcon/db/adapter/pdo/mysql.zep", 266)) { + if (zephir_memnstr_str(columnType, SL("blob"), "phalcon/db/adapter/pdo/mysql.zep", 267)) { ZEPHIR_INIT_NVAR(_30$$21); ZVAL_LONG(_30$$21, 11); zephir_array_update_string(&definition, SL("type"), &_30$$21, PH_COPY | PH_SEPARATE); @@ -49261,7 +49281,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { zephir_array_update_string(&definition, SL("type"), &_31$$4, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("("), "phalcon/db/adapter/pdo/mysql.zep", 281)) { + if (zephir_memnstr_str(columnType, SL("("), "phalcon/db/adapter/pdo/mysql.zep", 282)) { ZEPHIR_INIT_NVAR(matches); ZVAL_NULL(matches); ZEPHIR_INIT_NVAR(_32$$22); @@ -49281,7 +49301,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { } } } - if (zephir_memnstr_str(columnType, SL("unsigned"), "phalcon/db/adapter/pdo/mysql.zep", 296)) { + if (zephir_memnstr_str(columnType, SL("unsigned"), "phalcon/db/adapter/pdo/mysql.zep", 297)) { zephir_array_update_string(&definition, SL("unsigned"), &ZEPHIR_GLOBAL(global_true), PH_COPY | PH_SEPARATE); } if (Z_TYPE_P(oldColumn) == IS_NULL) { @@ -49289,30 +49309,30 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { } else { zephir_array_update_string(&definition, SL("after"), &oldColumn, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_35$$3, field, 3, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 312 TSRMLS_CC); + zephir_array_fetch_long(&_35$$3, field, 3, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 313 TSRMLS_CC); if (ZEPHIR_IS_STRING(_35$$3, "PRI")) { zephir_array_update_string(&definition, SL("primary"), &ZEPHIR_GLOBAL(global_true), PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_36$$3, field, 2, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 319 TSRMLS_CC); + zephir_array_fetch_long(&_36$$3, field, 2, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 320 TSRMLS_CC); if (ZEPHIR_IS_STRING(_36$$3, "NO")) { zephir_array_update_string(&definition, SL("notNull"), &ZEPHIR_GLOBAL(global_true), PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_37$$3, field, 5, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 326 TSRMLS_CC); + zephir_array_fetch_long(&_37$$3, field, 5, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 327 TSRMLS_CC); if (ZEPHIR_IS_STRING(_37$$3, "auto_increment")) { zephir_array_update_string(&definition, SL("autoIncrement"), &ZEPHIR_GLOBAL(global_true), PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_NVAR(_38$$3); - zephir_array_fetch_long(&_38$$3, field, 4, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 333 TSRMLS_CC); + zephir_array_fetch_long(&_38$$3, field, 4, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 334 TSRMLS_CC); if (Z_TYPE_P(_38$$3) != IS_NULL) { - zephir_array_fetch_long(&_39$$32, field, 4, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 334 TSRMLS_CC); + zephir_array_fetch_long(&_39$$32, field, 4, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 335 TSRMLS_CC); zephir_array_update_string(&definition, SL("default"), &_39$$32, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&columnName, field, 0, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 340 TSRMLS_CC); + zephir_array_fetch_long(&columnName, field, 0, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 341 TSRMLS_CC); ZEPHIR_INIT_NVAR(_40$$3); object_init_ex(_40$$3, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, _40$$3, "__construct", &_41, 142, columnName, definition); + ZEPHIR_CALL_METHOD(NULL, _40$$3, "__construct", &_41, 137, columnName, definition); zephir_check_call_status(); - zephir_array_append(&columns, _40$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/mysql.zep", 341); + zephir_array_append(&columns, _40$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/mysql.zep", 342); ZEPHIR_CPY_WRT(oldColumn, columnName); } RETURN_CCTOR(columns); @@ -49355,31 +49375,31 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeIndexes) { ZVAL_LONG(_3, 2); ZEPHIR_CALL_METHOD(&_0, this_ptr, "fetchall", NULL, 0, _2, _3); zephir_check_call_status(); - zephir_is_iterable(_0, &_5, &_4, 0, 0, "phalcon/db/adapter/pdo/mysql.zep", 389); + zephir_is_iterable(_0, &_5, &_4, 0, 0, "phalcon/db/adapter/pdo/mysql.zep", 390); for ( ; zephir_hash_get_current_data_ex(_5, (void**) &_6, &_4) == SUCCESS ; zephir_hash_move_forward_ex(_5, &_4) ) { ZEPHIR_GET_HVALUE(index, _6); - zephir_array_fetch_string(&keyName, index, SL("Key_name"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 365 TSRMLS_CC); + zephir_array_fetch_string(&keyName, index, SL("Key_name"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 366 TSRMLS_CC); if (!(zephir_array_isset(indexes, keyName))) { ZEPHIR_INIT_NVAR(_7$$4); array_init(_7$$4); zephir_array_update_zval(&indexes, keyName, &_7$$4, PH_COPY | PH_SEPARATE); } - zephir_array_fetch(&_8$$3, indexes, keyName, PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 371 TSRMLS_CC); + zephir_array_fetch(&_8$$3, indexes, keyName, PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 372 TSRMLS_CC); if (!(zephir_array_isset_string(_8$$3, SS("columns")))) { ZEPHIR_INIT_NVAR(columns); array_init(columns); } else { - zephir_array_fetch(&_9$$6, indexes, keyName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 374 TSRMLS_CC); + zephir_array_fetch(&_9$$6, indexes, keyName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 375 TSRMLS_CC); ZEPHIR_OBS_NVAR(columns); - zephir_array_fetch_string(&columns, _9$$6, SL("columns"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 374 TSRMLS_CC); + zephir_array_fetch_string(&columns, _9$$6, SL("columns"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 375 TSRMLS_CC); } - zephir_array_fetch_string(&_10$$3, index, SL("Column_name"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 377 TSRMLS_CC); - zephir_array_append(&columns, _10$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/mysql.zep", 377); + zephir_array_fetch_string(&_10$$3, index, SL("Column_name"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 378 TSRMLS_CC); + zephir_array_append(&columns, _10$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/mysql.zep", 378); zephir_array_update_multi(&indexes, &columns TSRMLS_CC, SL("zs"), 3, keyName, SL("columns")); - zephir_array_fetch_string(&_11$$3, index, SL("Non_unique"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 382 TSRMLS_CC); + zephir_array_fetch_string(&_11$$3, index, SL("Non_unique"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 383 TSRMLS_CC); if (ZEPHIR_IS_STRING(keyName, "PRIMARY")) { ZEPHIR_INIT_NVAR(_12$$7); ZVAL_STRING(_12$$7, "PRIMARY", 1); @@ -49394,7 +49414,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeIndexes) { } ZEPHIR_INIT_VAR(indexObjects); array_init(indexObjects); - zephir_is_iterable(indexes, &_15, &_14, 0, 0, "phalcon/db/adapter/pdo/mysql.zep", 394); + zephir_is_iterable(indexes, &_15, &_14, 0, 0, "phalcon/db/adapter/pdo/mysql.zep", 395); for ( ; zephir_hash_get_current_data_ex(_15, (void**) &_16, &_14) == SUCCESS ; zephir_hash_move_forward_ex(_15, &_14) @@ -49403,8 +49423,8 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeIndexes) { ZEPHIR_GET_HVALUE(index, _16); ZEPHIR_INIT_NVAR(_17$$10); object_init_ex(_17$$10, phalcon_db_index_ce); - zephir_array_fetch_string(&_18$$10, index, SL("columns"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 391 TSRMLS_CC); - zephir_array_fetch_string(&_19$$10, index, SL("type"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 391 TSRMLS_CC); + zephir_array_fetch_string(&_18$$10, index, SL("columns"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 392 TSRMLS_CC); + zephir_array_fetch_string(&_19$$10, index, SL("type"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 392 TSRMLS_CC); ZEPHIR_CALL_METHOD(NULL, _17$$10, "__construct", &_20, 15, name, _18$$10, _19$$10); zephir_check_call_status(); zephir_array_update_zval(&indexObjects, name, &_17$$10, PH_COPY | PH_SEPARATE); @@ -49413,6 +49433,148 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeIndexes) { } +static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeReferences) { + + zval *_15$$3 = NULL, *_20$$6 = NULL; + HashTable *_5, *_17; + HashPosition _4, _16; + zephir_fcall_cache_entry *_22 = NULL; + int ZEPHIR_LAST_CALL_STATUS; + zval *table_param = NULL, *schema_param = NULL, *references = NULL, *reference = NULL, *arrayReference = NULL, *constraintName = NULL, *referenceObjects = NULL, *name = NULL, *referencedSchema = NULL, *referencedTable = NULL, *columns = NULL, *referencedColumns = NULL, *referenceUpdate = NULL, *referenceDelete = NULL, *_0 = NULL, *_1, *_2 = NULL, *_3, **_6, **_18, *_7$$5, *_8$$5, *_9$$5, *_10$$5, *_11$$5, *_12$$5, *_13$$3, *_14$$3, *_19$$6 = NULL, *_21$$6 = NULL; + zval *table = NULL, *schema = NULL; + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 1, &table_param, &schema_param); + + if (unlikely(Z_TYPE_P(table_param) != IS_STRING && Z_TYPE_P(table_param) != IS_NULL)) { + zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'table' must be a string") TSRMLS_CC); + RETURN_MM_NULL(); + } + if (likely(Z_TYPE_P(table_param) == IS_STRING)) { + zephir_get_strval(table, table_param); + } else { + ZEPHIR_INIT_VAR(table); + ZVAL_EMPTY_STRING(table); + } + if (!schema_param) { + ZEPHIR_INIT_VAR(schema); + ZVAL_EMPTY_STRING(schema); + } else { + if (unlikely(Z_TYPE_P(schema_param) != IS_STRING && Z_TYPE_P(schema_param) != IS_NULL)) { + zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'schema' must be a string") TSRMLS_CC); + RETURN_MM_NULL(); + } + if (likely(Z_TYPE_P(schema_param) == IS_STRING)) { + zephir_get_strval(schema, schema_param); + } else { + ZEPHIR_INIT_VAR(schema); + ZVAL_EMPTY_STRING(schema); + } + } + + + ZEPHIR_INIT_VAR(references); + array_init(references); + _1 = zephir_fetch_nproperty_this(this_ptr, SL("_dialect"), PH_NOISY_CC); + ZEPHIR_CALL_METHOD(&_2, _1, "describereferences", NULL, 0, table, schema); + zephir_check_call_status(); + ZEPHIR_INIT_VAR(_3); + ZVAL_LONG(_3, 3); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "fetchall", NULL, 0, _2, _3); + zephir_check_call_status(); + zephir_is_iterable(_0, &_5, &_4, 0, 0, "phalcon/db/adapter/pdo/mysql.zep", 447); + for ( + ; zephir_hash_get_current_data_ex(_5, (void**) &_6, &_4) == SUCCESS + ; zephir_hash_move_forward_ex(_5, &_4) + ) { + ZEPHIR_GET_HVALUE(reference, _6); + zephir_array_fetch_long(&constraintName, reference, 2, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 416 TSRMLS_CC); + if (!(zephir_array_isset(references, constraintName))) { + ZEPHIR_OBS_NVAR(referencedSchema); + zephir_array_fetch_long(&referencedSchema, reference, 3, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 418 TSRMLS_CC); + ZEPHIR_OBS_NVAR(referencedTable); + zephir_array_fetch_long(&referencedTable, reference, 4, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 419 TSRMLS_CC); + ZEPHIR_OBS_NVAR(referenceUpdate); + zephir_array_fetch_long(&referenceUpdate, reference, 6, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 420 TSRMLS_CC); + ZEPHIR_OBS_NVAR(referenceDelete); + zephir_array_fetch_long(&referenceDelete, reference, 7, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 421 TSRMLS_CC); + ZEPHIR_INIT_NVAR(columns); + array_init(columns); + ZEPHIR_INIT_NVAR(referencedColumns); + array_init(referencedColumns); + } else { + zephir_array_fetch(&_7$$5, references, constraintName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 426 TSRMLS_CC); + ZEPHIR_OBS_NVAR(referencedSchema); + zephir_array_fetch_string(&referencedSchema, _7$$5, SL("referencedSchema"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 426 TSRMLS_CC); + zephir_array_fetch(&_8$$5, references, constraintName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 427 TSRMLS_CC); + ZEPHIR_OBS_NVAR(referencedTable); + zephir_array_fetch_string(&referencedTable, _8$$5, SL("referencedTable"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 427 TSRMLS_CC); + zephir_array_fetch(&_9$$5, references, constraintName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 428 TSRMLS_CC); + ZEPHIR_OBS_NVAR(columns); + zephir_array_fetch_string(&columns, _9$$5, SL("columns"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 428 TSRMLS_CC); + zephir_array_fetch(&_10$$5, references, constraintName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 429 TSRMLS_CC); + ZEPHIR_OBS_NVAR(referencedColumns); + zephir_array_fetch_string(&referencedColumns, _10$$5, SL("referencedColumns"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 429 TSRMLS_CC); + zephir_array_fetch(&_11$$5, references, constraintName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 430 TSRMLS_CC); + ZEPHIR_OBS_NVAR(referenceUpdate); + zephir_array_fetch_string(&referenceUpdate, _11$$5, SL("onUpdate"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 430 TSRMLS_CC); + zephir_array_fetch(&_12$$5, references, constraintName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 431 TSRMLS_CC); + ZEPHIR_OBS_NVAR(referenceDelete); + zephir_array_fetch_string(&referenceDelete, _12$$5, SL("onDelete"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 431 TSRMLS_CC); + } + zephir_array_fetch_long(&_13$$3, reference, 1, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 434 TSRMLS_CC); + zephir_array_append(&columns, _13$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/mysql.zep", 434); + zephir_array_fetch_long(&_14$$3, reference, 5, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 435 TSRMLS_CC); + zephir_array_append(&referencedColumns, _14$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/mysql.zep", 435); + ZEPHIR_INIT_NVAR(_15$$3); + zephir_create_array(_15$$3, 6, 0 TSRMLS_CC); + zephir_array_update_string(&_15$$3, SL("referencedSchema"), &referencedSchema, PH_COPY | PH_SEPARATE); + zephir_array_update_string(&_15$$3, SL("referencedTable"), &referencedTable, PH_COPY | PH_SEPARATE); + zephir_array_update_string(&_15$$3, SL("columns"), &columns, PH_COPY | PH_SEPARATE); + zephir_array_update_string(&_15$$3, SL("referencedColumns"), &referencedColumns, PH_COPY | PH_SEPARATE); + zephir_array_update_string(&_15$$3, SL("onUpdate"), &referenceUpdate, PH_COPY | PH_SEPARATE); + zephir_array_update_string(&_15$$3, SL("onDelete"), &referenceDelete, PH_COPY | PH_SEPARATE); + zephir_array_update_zval(&references, constraintName, &_15$$3, PH_COPY | PH_SEPARATE); + } + ZEPHIR_INIT_VAR(referenceObjects); + array_init(referenceObjects); + zephir_is_iterable(references, &_17, &_16, 0, 0, "phalcon/db/adapter/pdo/mysql.zep", 459); + for ( + ; zephir_hash_get_current_data_ex(_17, (void**) &_18, &_16) == SUCCESS + ; zephir_hash_move_forward_ex(_17, &_16) + ) { + ZEPHIR_GET_HMKEY(name, _17, _16); + ZEPHIR_GET_HVALUE(arrayReference, _18); + ZEPHIR_INIT_NVAR(_19$$6); + object_init_ex(_19$$6, phalcon_db_reference_ce); + ZEPHIR_INIT_NVAR(_20$$6); + zephir_create_array(_20$$6, 6, 0 TSRMLS_CC); + ZEPHIR_OBS_NVAR(_21$$6); + zephir_array_fetch_string(&_21$$6, arrayReference, SL("referencedSchema"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 450 TSRMLS_CC); + zephir_array_update_string(&_20$$6, SL("referencedSchema"), &_21$$6, PH_COPY | PH_SEPARATE); + ZEPHIR_OBS_NVAR(_21$$6); + zephir_array_fetch_string(&_21$$6, arrayReference, SL("referencedTable"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 451 TSRMLS_CC); + zephir_array_update_string(&_20$$6, SL("referencedTable"), &_21$$6, PH_COPY | PH_SEPARATE); + ZEPHIR_OBS_NVAR(_21$$6); + zephir_array_fetch_string(&_21$$6, arrayReference, SL("columns"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 452 TSRMLS_CC); + zephir_array_update_string(&_20$$6, SL("columns"), &_21$$6, PH_COPY | PH_SEPARATE); + ZEPHIR_OBS_NVAR(_21$$6); + zephir_array_fetch_string(&_21$$6, arrayReference, SL("referencedColumns"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 453 TSRMLS_CC); + zephir_array_update_string(&_20$$6, SL("referencedColumns"), &_21$$6, PH_COPY | PH_SEPARATE); + ZEPHIR_OBS_NVAR(_21$$6); + zephir_array_fetch_string(&_21$$6, arrayReference, SL("onUpdate"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 454 TSRMLS_CC); + zephir_array_update_string(&_20$$6, SL("onUpdate"), &_21$$6, PH_COPY | PH_SEPARATE); + ZEPHIR_OBS_NVAR(_21$$6); + zephir_array_fetch_string(&_21$$6, arrayReference, SL("onDelete"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 456 TSRMLS_CC); + zephir_array_update_string(&_20$$6, SL("onDelete"), &_21$$6, PH_COPY | PH_SEPARATE); + ZEPHIR_CALL_METHOD(NULL, _19$$6, "__construct", &_22, 16, name, _20$$6); + zephir_check_call_status(); + zephir_array_update_zval(&referenceObjects, name, &_19$$6, PH_COPY | PH_SEPARATE); + } + RETURN_CCTOR(referenceObjects); + +} + @@ -49462,7 +49624,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Oracle, connect) { ZEPHIR_OBS_NVAR(descriptor); zephir_read_property_this(&descriptor, this_ptr, SL("_descriptor"), PH_NOISY_CC); } - ZEPHIR_CALL_PARENT(&status, phalcon_db_adapter_pdo_oracle_ce, this_ptr, "connect", &_0, 143, descriptor); + ZEPHIR_CALL_PARENT(&status, phalcon_db_adapter_pdo_oracle_ce, this_ptr, "connect", &_0, 138, descriptor); zephir_check_call_status(); ZEPHIR_OBS_VAR(startup); if (zephir_array_isset_string_fetch(&startup, descriptor, SS("startup"), 0 TSRMLS_CC)) { @@ -49641,7 +49803,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Oracle, describeColumns) { zephir_array_fetch_long(&columnName, field, 0, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/oracle.zep", 199 TSRMLS_CC); ZEPHIR_INIT_NVAR(_23$$3); object_init_ex(_23$$3, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, _23$$3, "__construct", &_24, 142, columnName, definition); + ZEPHIR_CALL_METHOD(NULL, _23$$3, "__construct", &_24, 137, columnName, definition); zephir_check_call_status(); zephir_array_append(&columns, _23$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/oracle.zep", 204); ZEPHIR_CPY_WRT(oldColumn, columnName); @@ -49778,7 +49940,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Postgresql, connect) { zephir_array_update_string(&descriptor, SL("password"), &ZEPHIR_GLOBAL(global_null), PH_COPY | PH_SEPARATE); } } - ZEPHIR_CALL_PARENT(NULL, phalcon_db_adapter_pdo_postgresql_ce, this_ptr, "connect", &_3, 143, descriptor); + ZEPHIR_CALL_PARENT(NULL, phalcon_db_adapter_pdo_postgresql_ce, this_ptr, "connect", &_3, 138, descriptor); zephir_check_call_status(); if (!(ZEPHIR_IS_EMPTY(schema))) { ZEPHIR_INIT_VAR(sql); @@ -50021,7 +50183,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Postgresql, describeColumns) { zephir_array_fetch_long(&columnName, field, 0, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/postgresql.zep", 321 TSRMLS_CC); ZEPHIR_INIT_NVAR(_46$$3); object_init_ex(_46$$3, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, _46$$3, "__construct", &_47, 142, columnName, definition); + ZEPHIR_CALL_METHOD(NULL, _46$$3, "__construct", &_47, 137, columnName, definition); zephir_check_call_status(); zephir_array_append(&columns, _46$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/postgresql.zep", 322); ZEPHIR_CPY_WRT(oldColumn, columnName); @@ -50311,7 +50473,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, connect) { return; } zephir_array_update_string(&descriptor, SL("dsn"), &dbname, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_PARENT(NULL, phalcon_db_adapter_pdo_sqlite_ce, this_ptr, "connect", &_0, 143, descriptor); + ZEPHIR_CALL_PARENT(NULL, phalcon_db_adapter_pdo_sqlite_ce, this_ptr, "connect", &_0, 138, descriptor); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -50531,7 +50693,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) { zephir_array_fetch_long(&columnName, field, 1, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/sqlite.zep", 286 TSRMLS_CC); ZEPHIR_INIT_NVAR(_43$$3); object_init_ex(_43$$3, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, _43$$3, "__construct", &_44, 142, columnName, definition); + ZEPHIR_CALL_METHOD(NULL, _43$$3, "__construct", &_44, 137, columnName, definition); zephir_check_call_status(); zephir_array_append(&columns, _43$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/sqlite.zep", 287); ZEPHIR_CPY_WRT(oldColumn, columnName); @@ -51035,7 +51197,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_MySQL, getColumnDefinition) { ZEPHIR_GET_HVALUE(value$$51, _25$$51); ZEPHIR_SINIT_NVAR(_26$$52); ZVAL_STRING(&_26$$52, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_27$$52, "addcslashes", &_28, 144, value$$51, &_26$$52); + ZEPHIR_CALL_FUNCTION(&_27$$52, "addcslashes", &_28, 139, value$$51, &_26$$52); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_29$$52); ZEPHIR_CONCAT_SVS(_29$$52, "\"", _27$$52, "\", "); @@ -51053,7 +51215,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_MySQL, getColumnDefinition) { } else { ZEPHIR_SINIT_VAR(_34$$53); ZVAL_STRING(&_34$$53, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_35$$53, "addcslashes", &_28, 144, typeValues, &_34$$53); + ZEPHIR_CALL_FUNCTION(&_35$$53, "addcslashes", &_28, 139, typeValues, &_34$$53); zephir_check_call_status(); ZEPHIR_INIT_VAR(_36$$53); ZEPHIR_CONCAT_SVS(_36$$53, "(\"", _35$$53, "\")"); @@ -51117,7 +51279,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_MySQL, addColumn) { } else { ZEPHIR_SINIT_VAR(_5$$5); ZVAL_STRING(&_5$$5, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_6$$5, "addcslashes", NULL, 144, defaultValue, &_5$$5); + ZEPHIR_CALL_FUNCTION(&_6$$5, "addcslashes", NULL, 139, defaultValue, &_5$$5); zephir_check_call_status(); ZEPHIR_INIT_VAR(_7$$5); ZEPHIR_CONCAT_SVS(_7$$5, " DEFAULT \"", _6$$5, "\""); @@ -51205,7 +51367,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_MySQL, modifyColumn) { } else { ZEPHIR_SINIT_VAR(_5$$5); ZVAL_STRING(&_5$$5, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_6$$5, "addcslashes", NULL, 144, defaultValue, &_5$$5); + ZEPHIR_CALL_FUNCTION(&_6$$5, "addcslashes", NULL, 139, defaultValue, &_5$$5); zephir_check_call_status(); ZEPHIR_INIT_VAR(_7$$5); ZEPHIR_CONCAT_SVS(_7$$5, " DEFAULT \"", _6$$5, "\""); @@ -51671,7 +51833,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_MySQL, createTable) { } else { ZEPHIR_SINIT_NVAR(_8$$10); ZVAL_STRING(&_8$$10, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_9$$10, "addcslashes", &_10, 144, defaultValue, &_8$$10); + ZEPHIR_CALL_FUNCTION(&_9$$10, "addcslashes", &_10, 139, defaultValue, &_8$$10); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_11$$10); ZEPHIR_CONCAT_SVS(_11$$10, " DEFAULT \"", _9$$10, "\""); @@ -52149,14 +52311,14 @@ static PHP_METHOD(Phalcon_Db_Dialect_MySQL, describeReferences) { ZEPHIR_INIT_VAR(sql); - ZVAL_STRING(sql, "SELECT TABLE_NAME,COLUMN_NAME,CONSTRAINT_NAME,REFERENCED_TABLE_SCHEMA,REFERENCED_TABLE_NAME,REFERENCED_COLUMN_NAME FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE REFERENCED_TABLE_NAME IS NOT NULL AND ", 1); + ZVAL_STRING(sql, "SELECT KCU.TABLE_NAME, KCU.COLUMN_NAME, KCU.CONSTRAINT_NAME, KCU.REFERENCED_TABLE_SCHEMA, KCU.REFERENCED_TABLE_NAME, KCU.REFERENCED_COLUMN_NAME, RC.UPDATE_RULE, RC.DELETE_RULE FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE AS KCU LEFT JOIN INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS AS RC ON RC.CONSTRAINT_NAME = KCU.CONSTRAINT_NAME WHERE KCU.REFERENCED_TABLE_NAME IS NOT NULL AND ", 1); if (!(!schema) && Z_STRLEN_P(schema)) { ZEPHIR_INIT_VAR(_0$$3); - ZEPHIR_CONCAT_SVSVS(_0$$3, "CONSTRAINT_SCHEMA = '", schema, "' AND TABLE_NAME = '", table, "'"); + ZEPHIR_CONCAT_SVSVS(_0$$3, "KCU.CONSTRAINT_SCHEMA = '", schema, "' AND KCU.TABLE_NAME = '", table, "'"); zephir_concat_self(&sql, _0$$3 TSRMLS_CC); } else { ZEPHIR_INIT_VAR(_1$$4); - ZEPHIR_CONCAT_SVS(_1$$4, "TABLE_NAME = '", table, "'"); + ZEPHIR_CONCAT_SVS(_1$$4, "KCU.TABLE_NAME = '", table, "'"); zephir_concat_self(&sql, _1$$4 TSRMLS_CC); } RETURN_CCTOR(sql); @@ -52959,14 +53121,14 @@ static PHP_METHOD(Phalcon_Db_Dialect_Oracle, viewExists) { if (!ZEPHIR_IS_STRING(schemaName, "")) { - ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 145, viewName); + ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 140, viewName); zephir_check_call_status(); - ZEPHIR_CALL_CE_STATIC(&_2$$3, phalcon_text_ce, "upper", &_1, 145, schemaName); + ZEPHIR_CALL_CE_STATIC(&_2$$3, phalcon_text_ce, "upper", &_1, 140, schemaName); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "SELECT CASE WHEN COUNT(*) > 0 THEN 1 ELSE 0 END RET FROM ALL_VIEWS WHERE VIEW_NAME='", _0$$3, "' AND OWNER='", _2$$3, "'"); RETURN_MM(); } - ZEPHIR_CALL_CE_STATIC(&_3, phalcon_text_ce, "upper", &_1, 145, viewName); + ZEPHIR_CALL_CE_STATIC(&_3, phalcon_text_ce, "upper", &_1, 140, viewName); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, "SELECT CASE WHEN COUNT(*) > 0 THEN 1 ELSE 0 END RET FROM ALL_VIEWS WHERE VIEW_NAME='", _3, "'"); RETURN_MM(); @@ -52992,7 +53154,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Oracle, listViews) { if (!ZEPHIR_IS_STRING(schemaName, "")) { - ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 145, schemaName); + ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 140, schemaName); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, "SELECT VIEW_NAME FROM ALL_VIEWS WHERE OWNER='", _0$$3, "' ORDER BY VIEW_NAME"); RETURN_MM(); @@ -53030,14 +53192,14 @@ static PHP_METHOD(Phalcon_Db_Dialect_Oracle, tableExists) { if (!ZEPHIR_IS_STRING(schemaName, "")) { - ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 145, tableName); + ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 140, tableName); zephir_check_call_status(); - ZEPHIR_CALL_CE_STATIC(&_2$$3, phalcon_text_ce, "upper", &_1, 145, schemaName); + ZEPHIR_CALL_CE_STATIC(&_2$$3, phalcon_text_ce, "upper", &_1, 140, schemaName); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "SELECT CASE WHEN COUNT(*) > 0 THEN 1 ELSE 0 END RET FROM ALL_TABLES WHERE TABLE_NAME='", _0$$3, "' AND OWNER = '", _2$$3, "'"); RETURN_MM(); } - ZEPHIR_CALL_CE_STATIC(&_3, phalcon_text_ce, "upper", &_1, 145, tableName); + ZEPHIR_CALL_CE_STATIC(&_3, phalcon_text_ce, "upper", &_1, 140, tableName); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, "SELECT CASE WHEN COUNT(*) > 0 THEN 1 ELSE 0 END RET FROM ALL_TABLES WHERE TABLE_NAME='", _3, "'"); RETURN_MM(); @@ -53073,14 +53235,14 @@ static PHP_METHOD(Phalcon_Db_Dialect_Oracle, describeColumns) { if (!ZEPHIR_IS_STRING(schema, "")) { - ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 145, table); + ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 140, table); zephir_check_call_status(); - ZEPHIR_CALL_CE_STATIC(&_2$$3, phalcon_text_ce, "upper", &_1, 145, schema); + ZEPHIR_CALL_CE_STATIC(&_2$$3, phalcon_text_ce, "upper", &_1, 140, schema); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "SELECT TC.COLUMN_NAME, TC.DATA_TYPE, TC.DATA_LENGTH, TC.DATA_PRECISION, TC.DATA_SCALE, TC.NULLABLE, C.CONSTRAINT_TYPE, TC.DATA_DEFAULT, CC.POSITION FROM ALL_TAB_COLUMNS TC LEFT JOIN (ALL_CONS_COLUMNS CC JOIN ALL_CONSTRAINTS C ON (CC.CONSTRAINT_NAME = C.CONSTRAINT_NAME AND CC.TABLE_NAME = C.TABLE_NAME AND CC.OWNER = C.OWNER AND C.CONSTRAINT_TYPE = 'P')) ON TC.TABLE_NAME = CC.TABLE_NAME AND TC.COLUMN_NAME = CC.COLUMN_NAME WHERE TC.TABLE_NAME = '", _0$$3, "' AND TC.OWNER = '", _2$$3, "' ORDER BY TC.COLUMN_ID"); RETURN_MM(); } - ZEPHIR_CALL_CE_STATIC(&_3, phalcon_text_ce, "upper", &_1, 145, table); + ZEPHIR_CALL_CE_STATIC(&_3, phalcon_text_ce, "upper", &_1, 140, table); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, "SELECT TC.COLUMN_NAME, TC.DATA_TYPE, TC.DATA_LENGTH, TC.DATA_PRECISION, TC.DATA_SCALE, TC.NULLABLE, C.CONSTRAINT_TYPE, TC.DATA_DEFAULT, CC.POSITION FROM ALL_TAB_COLUMNS TC LEFT JOIN (ALL_CONS_COLUMNS CC JOIN ALL_CONSTRAINTS C ON (CC.CONSTRAINT_NAME = C.CONSTRAINT_NAME AND CC.TABLE_NAME = C.TABLE_NAME AND CC.OWNER = C.OWNER AND C.CONSTRAINT_TYPE = 'P')) ON TC.TABLE_NAME = CC.TABLE_NAME AND TC.COLUMN_NAME = CC.COLUMN_NAME WHERE TC.TABLE_NAME = '", _3, "' ORDER BY TC.COLUMN_ID"); RETURN_MM(); @@ -53106,7 +53268,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Oracle, listTables) { if (!ZEPHIR_IS_STRING(schemaName, "")) { - ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 145, schemaName); + ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 140, schemaName); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, "SELECT TABLE_NAME, OWNER FROM ALL_TABLES WHERE OWNER='", _0$$3, "' ORDER BY OWNER, TABLE_NAME"); RETURN_MM(); @@ -53144,14 +53306,14 @@ static PHP_METHOD(Phalcon_Db_Dialect_Oracle, describeIndexes) { if (!ZEPHIR_IS_STRING(schema, "")) { - ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 145, table); + ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 140, table); zephir_check_call_status(); - ZEPHIR_CALL_CE_STATIC(&_2$$3, phalcon_text_ce, "upper", &_1, 145, schema); + ZEPHIR_CALL_CE_STATIC(&_2$$3, phalcon_text_ce, "upper", &_1, 140, schema); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "SELECT I.TABLE_NAME, 0 AS C0, I.INDEX_NAME, IC.COLUMN_POSITION, IC.COLUMN_NAME FROM ALL_INDEXES I JOIN ALL_IND_COLUMNS IC ON I.INDEX_NAME = IC.INDEX_NAME WHERE I.TABLE_NAME = '", _0$$3, "' AND IC.INDEX_OWNER = '", _2$$3, "'"); RETURN_MM(); } - ZEPHIR_CALL_CE_STATIC(&_3, phalcon_text_ce, "upper", &_1, 145, table); + ZEPHIR_CALL_CE_STATIC(&_3, phalcon_text_ce, "upper", &_1, 140, table); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, "SELECT I.TABLE_NAME, 0 AS C0, I.INDEX_NAME, IC.COLUMN_POSITION, IC.COLUMN_NAME FROM ALL_INDEXES I JOIN ALL_IND_COLUMNS IC ON I.INDEX_NAME = IC.INDEX_NAME WHERE I.TABLE_NAME = '", _3, "'"); RETURN_MM(); @@ -53189,15 +53351,15 @@ static PHP_METHOD(Phalcon_Db_Dialect_Oracle, describeReferences) { ZEPHIR_INIT_VAR(sql); ZVAL_STRING(sql, "SELECT AC.TABLE_NAME, CC.COLUMN_NAME, AC.CONSTRAINT_NAME, AC.R_OWNER, RCC.TABLE_NAME R_TABLE_NAME, RCC.COLUMN_NAME R_COLUMN_NAME FROM ALL_CONSTRAINTS AC JOIN ALL_CONS_COLUMNS CC ON AC.CONSTRAINT_NAME = CC.CONSTRAINT_NAME JOIN ALL_CONS_COLUMNS RCC ON AC.R_OWNER = RCC.OWNER AND AC.R_CONSTRAINT_NAME = RCC.CONSTRAINT_NAME WHERE AC.CONSTRAINT_TYPE='R' ", 1); if (!ZEPHIR_IS_STRING(schema, "")) { - ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 145, schema); + ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 140, schema); zephir_check_call_status(); - ZEPHIR_CALL_CE_STATIC(&_2$$3, phalcon_text_ce, "upper", &_1, 145, table); + ZEPHIR_CALL_CE_STATIC(&_2$$3, phalcon_text_ce, "upper", &_1, 140, table); zephir_check_call_status(); ZEPHIR_INIT_VAR(_3$$3); ZEPHIR_CONCAT_SVSVS(_3$$3, "AND AC.OWNER='", _0$$3, "' AND AC.TABLE_NAME = '", _2$$3, "'"); zephir_concat_self(&sql, _3$$3 TSRMLS_CC); } else { - ZEPHIR_CALL_CE_STATIC(&_4$$4, phalcon_text_ce, "upper", &_1, 145, table); + ZEPHIR_CALL_CE_STATIC(&_4$$4, phalcon_text_ce, "upper", &_1, 140, table); zephir_check_call_status(); ZEPHIR_INIT_VAR(_5$$4); ZEPHIR_CONCAT_SVS(_5$$4, "AND AC.TABLE_NAME = '", _4$$4, "'"); @@ -53293,11 +53455,11 @@ static PHP_METHOD(Phalcon_Db_Dialect_Oracle, prepareTable) { } - ZEPHIR_CALL_CE_STATIC(&_1, phalcon_text_ce, "upper", &_2, 145, table); + ZEPHIR_CALL_CE_STATIC(&_1, phalcon_text_ce, "upper", &_2, 140, table); zephir_check_call_status(); - ZEPHIR_CALL_CE_STATIC(&_3, phalcon_text_ce, "upper", &_2, 145, schema); + ZEPHIR_CALL_CE_STATIC(&_3, phalcon_text_ce, "upper", &_2, 140, schema); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_PARENT(phalcon_db_dialect_oracle_ce, this_ptr, "preparetable", &_0, 146, _1, _3, alias, escapeChar); + ZEPHIR_RETURN_CALL_PARENT(phalcon_db_dialect_oracle_ce, this_ptr, "preparetable", &_0, 141, _1, _3, alias, escapeChar); zephir_check_call_status(); RETURN_MM(); @@ -53480,7 +53642,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, getColumnDefinition) { ZEPHIR_GET_HVALUE(value$$37, _11$$37); ZEPHIR_SINIT_NVAR(_12$$38); ZVAL_STRING(&_12$$38, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_13$$38, "addcslashes", &_14, 144, value$$37, &_12$$38); + ZEPHIR_CALL_FUNCTION(&_13$$38, "addcslashes", &_14, 139, value$$37, &_12$$38); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_15$$38); ZEPHIR_CONCAT_SVS(_15$$38, "\"", _13$$38, "\", "); @@ -53498,7 +53660,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, getColumnDefinition) { } else { ZEPHIR_SINIT_VAR(_20$$39); ZVAL_STRING(&_20$$39, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_21$$39, "addcslashes", &_14, 144, typeValues, &_20$$39); + ZEPHIR_CALL_FUNCTION(&_21$$39, "addcslashes", &_14, 139, typeValues, &_20$$39); zephir_check_call_status(); ZEPHIR_INIT_VAR(_22$$39); ZEPHIR_CONCAT_SVS(_22$$39, "(\"", _21$$39, "\")"); @@ -53579,7 +53741,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, addColumn) { } else { ZEPHIR_SINIT_VAR(_8$$6); ZVAL_STRING(&_8$$6, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_9$$6, "addcslashes", NULL, 144, defaultValue, &_8$$6); + ZEPHIR_CALL_FUNCTION(&_9$$6, "addcslashes", NULL, 139, defaultValue, &_8$$6); zephir_check_call_status(); ZEPHIR_INIT_VAR(_10$$6); ZEPHIR_CONCAT_SVS(_10$$6, " DEFAULT \"", _9$$6, "\""); @@ -53597,9 +53759,9 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, addColumn) { static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, modifyColumn) { - zend_bool _20$$8; + zend_bool _21$$8; int ZEPHIR_LAST_CALL_STATUS; - zval *tableName_param = NULL, *schemaName_param = NULL, *column, *currentColumn = NULL, *sql = NULL, *sqlAlterTable = NULL, *defaultValue = NULL, *columnDefinition = NULL, *_0 = NULL, *_1 = NULL, *_2 = NULL, *_6 = NULL, *_7 = NULL, *_10 = NULL, *_11 = NULL, *_17 = NULL, *_18 = NULL, *_3$$3 = NULL, *_4$$3 = NULL, *_5$$3, *_8$$4 = NULL, *_9$$4, *_12$$5 = NULL, *_13$$6 = NULL, *_14$$6, *_15$$7 = NULL, *_16$$7, *_19$$8 = NULL, *_21$$8 = NULL, *_24$$8 = NULL, *_22$$9 = NULL, *_23$$9, *_25$$10, *_26$$10, *_27$$11 = NULL, *_28$$11 = NULL, *_29$$11, *_30$$12 = NULL, *_31$$12, *_32$$13 = NULL, _33$$13, *_34$$13 = NULL, *_35$$13; + zval *tableName_param = NULL, *schemaName_param = NULL, *column, *currentColumn = NULL, *sql = NULL, *sqlAlterTable = NULL, *defaultValue = NULL, *columnDefinition = NULL, *_0 = NULL, *_1 = NULL, *_2 = NULL, *_3 = NULL, *_7 = NULL, *_8 = NULL, *_11 = NULL, *_12 = NULL, *_18 = NULL, *_19 = NULL, *_4$$3 = NULL, *_5$$3 = NULL, *_6$$3, *_9$$4 = NULL, *_10$$4, *_13$$5 = NULL, *_14$$6 = NULL, *_15$$6, *_16$$7 = NULL, *_17$$7, *_20$$8 = NULL, *_22$$8 = NULL, *_25$$8 = NULL, *_23$$9 = NULL, *_24$$9, *_26$$10, *_27$$10, *_28$$11 = NULL, *_29$$11 = NULL, *_30$$11, *_31$$12 = NULL, *_32$$12, *_33$$13 = NULL, _34$$13, *_35$$13 = NULL, *_36$$13; zval *tableName = NULL, *schemaName = NULL; ZEPHIR_MM_GROW(); @@ -53626,7 +53788,9 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, modifyColumn) { ZVAL_EMPTY_STRING(schemaName); } if (!currentColumn) { - currentColumn = ZEPHIR_GLOBAL(global_null); + ZEPHIR_CPY_WRT(currentColumn, ZEPHIR_GLOBAL(global_null)); + } else { + ZEPHIR_SEPARATE_PARAM(currentColumn); } @@ -53638,110 +53802,117 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, modifyColumn) { zephir_check_call_status(); ZEPHIR_INIT_VAR(sqlAlterTable); ZEPHIR_CONCAT_SV(sqlAlterTable, "ALTER TABLE ", _0); - ZEPHIR_CALL_METHOD(&_1, column, "getname", NULL, 0); + ZEPHIR_INIT_VAR(_1); + if (Z_TYPE_P(currentColumn) == IS_NULL) { + ZEPHIR_CPY_WRT(_1, column); + } else { + ZEPHIR_CPY_WRT(_1, currentColumn); + } + ZEPHIR_CPY_WRT(currentColumn, _1); + ZEPHIR_CALL_METHOD(&_2, column, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_2, currentColumn, "getname", NULL, 0); + ZEPHIR_CALL_METHOD(&_3, currentColumn, "getname", NULL, 0); zephir_check_call_status(); - if (!ZEPHIR_IS_EQUAL(_1, _2)) { - ZEPHIR_CALL_METHOD(&_3$$3, currentColumn, "getname", NULL, 0); + if (!ZEPHIR_IS_EQUAL(_2, _3)) { + ZEPHIR_CALL_METHOD(&_4$$3, currentColumn, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_4$$3, column, "getname", NULL, 0); + ZEPHIR_CALL_METHOD(&_5$$3, column, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_INIT_VAR(_5$$3); - ZEPHIR_CONCAT_VSVSVS(_5$$3, sqlAlterTable, " RENAME COLUMN \"", _3$$3, "\" TO \"", _4$$3, "\";"); - zephir_concat_self(&sql, _5$$3 TSRMLS_CC); + ZEPHIR_INIT_VAR(_6$$3); + ZEPHIR_CONCAT_VSVSVS(_6$$3, sqlAlterTable, " RENAME COLUMN \"", _4$$3, "\" TO \"", _5$$3, "\";"); + zephir_concat_self(&sql, _6$$3 TSRMLS_CC); } - ZEPHIR_CALL_METHOD(&_6, column, "gettype", NULL, 0); + ZEPHIR_CALL_METHOD(&_7, column, "gettype", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_7, currentColumn, "gettype", NULL, 0); + ZEPHIR_CALL_METHOD(&_8, currentColumn, "gettype", NULL, 0); zephir_check_call_status(); - if (!ZEPHIR_IS_EQUAL(_6, _7)) { - ZEPHIR_CALL_METHOD(&_8$$4, column, "getname", NULL, 0); + if (!ZEPHIR_IS_EQUAL(_7, _8)) { + ZEPHIR_CALL_METHOD(&_9$$4, column, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_INIT_VAR(_9$$4); - ZEPHIR_CONCAT_VSVSVS(_9$$4, sqlAlterTable, " ALTER COLUMN \"", _8$$4, "\" TYPE ", columnDefinition, ";"); - zephir_concat_self(&sql, _9$$4 TSRMLS_CC); + ZEPHIR_INIT_VAR(_10$$4); + ZEPHIR_CONCAT_VSVSVS(_10$$4, sqlAlterTable, " ALTER COLUMN \"", _9$$4, "\" TYPE ", columnDefinition, ";"); + zephir_concat_self(&sql, _10$$4 TSRMLS_CC); } - ZEPHIR_CALL_METHOD(&_10, column, "isnotnull", NULL, 0); + ZEPHIR_CALL_METHOD(&_11, column, "isnotnull", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_11, currentColumn, "isnotnull", NULL, 0); + ZEPHIR_CALL_METHOD(&_12, currentColumn, "isnotnull", NULL, 0); zephir_check_call_status(); - if (!ZEPHIR_IS_EQUAL(_10, _11)) { - ZEPHIR_CALL_METHOD(&_12$$5, column, "isnotnull", NULL, 0); + if (!ZEPHIR_IS_EQUAL(_11, _12)) { + ZEPHIR_CALL_METHOD(&_13$$5, column, "isnotnull", NULL, 0); zephir_check_call_status(); - if (zephir_is_true(_12$$5)) { - ZEPHIR_CALL_METHOD(&_13$$6, column, "getname", NULL, 0); + if (zephir_is_true(_13$$5)) { + ZEPHIR_CALL_METHOD(&_14$$6, column, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_INIT_VAR(_14$$6); - ZEPHIR_CONCAT_VSVS(_14$$6, sqlAlterTable, " ALTER COLUMN \"", _13$$6, "\" SET NOT NULL;"); - zephir_concat_self(&sql, _14$$6 TSRMLS_CC); + ZEPHIR_INIT_VAR(_15$$6); + ZEPHIR_CONCAT_VSVS(_15$$6, sqlAlterTable, " ALTER COLUMN \"", _14$$6, "\" SET NOT NULL;"); + zephir_concat_self(&sql, _15$$6 TSRMLS_CC); } else { - ZEPHIR_CALL_METHOD(&_15$$7, column, "getname", NULL, 0); + ZEPHIR_CALL_METHOD(&_16$$7, column, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_INIT_VAR(_16$$7); - ZEPHIR_CONCAT_VSVS(_16$$7, sqlAlterTable, " ALTER COLUMN \"", _15$$7, "\" DROP NOT NULL;"); - zephir_concat_self(&sql, _16$$7 TSRMLS_CC); + ZEPHIR_INIT_VAR(_17$$7); + ZEPHIR_CONCAT_VSVS(_17$$7, sqlAlterTable, " ALTER COLUMN \"", _16$$7, "\" DROP NOT NULL;"); + zephir_concat_self(&sql, _17$$7 TSRMLS_CC); } } - ZEPHIR_CALL_METHOD(&_17, column, "getdefault", NULL, 0); + ZEPHIR_CALL_METHOD(&_18, column, "getdefault", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_18, currentColumn, "getdefault", NULL, 0); + ZEPHIR_CALL_METHOD(&_19, currentColumn, "getdefault", NULL, 0); zephir_check_call_status(); - if (!ZEPHIR_IS_EQUAL(_17, _18)) { - ZEPHIR_CALL_METHOD(&_19$$8, column, "hasdefault", NULL, 0); + if (!ZEPHIR_IS_EQUAL(_18, _19)) { + ZEPHIR_CALL_METHOD(&_20$$8, column, "hasdefault", NULL, 0); zephir_check_call_status(); - _20$$8 = !zephir_is_true(_19$$8); - if (_20$$8) { - ZEPHIR_CALL_METHOD(&_21$$8, currentColumn, "getdefault", NULL, 0); + _21$$8 = !zephir_is_true(_20$$8); + if (_21$$8) { + ZEPHIR_CALL_METHOD(&_22$$8, currentColumn, "getdefault", NULL, 0); zephir_check_call_status(); - _20$$8 = !(ZEPHIR_IS_EMPTY(_21$$8)); + _21$$8 = !(ZEPHIR_IS_EMPTY(_22$$8)); } - if (_20$$8) { - ZEPHIR_CALL_METHOD(&_22$$9, column, "getname", NULL, 0); + if (_21$$8) { + ZEPHIR_CALL_METHOD(&_23$$9, column, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_INIT_VAR(_23$$9); - ZEPHIR_CONCAT_VSVS(_23$$9, sqlAlterTable, " ALTER COLUMN \"", _22$$9, "\" DROP DEFAULT;"); - zephir_concat_self(&sql, _23$$9 TSRMLS_CC); + ZEPHIR_INIT_VAR(_24$$9); + ZEPHIR_CONCAT_VSVS(_24$$9, sqlAlterTable, " ALTER COLUMN \"", _23$$9, "\" DROP DEFAULT;"); + zephir_concat_self(&sql, _24$$9 TSRMLS_CC); } - ZEPHIR_CALL_METHOD(&_24$$8, column, "hasdefault", NULL, 0); + ZEPHIR_CALL_METHOD(&_25$$8, column, "hasdefault", NULL, 0); zephir_check_call_status(); - if (zephir_is_true(_24$$8)) { + if (zephir_is_true(_25$$8)) { ZEPHIR_CALL_METHOD(&defaultValue, column, "getdefault", NULL, 0); zephir_check_call_status(); - ZEPHIR_INIT_VAR(_25$$10); - zephir_fast_strtoupper(_25$$10, columnDefinition); ZEPHIR_INIT_VAR(_26$$10); - zephir_fast_strtoupper(_26$$10, defaultValue); - if (zephir_memnstr_str(_25$$10, SL("BOOLEAN"), "phalcon/db/dialect/postgresql.zep", 238)) { - ZEPHIR_CALL_METHOD(&_27$$11, column, "getname", NULL, 0); + zephir_fast_strtoupper(_26$$10, columnDefinition); + ZEPHIR_INIT_VAR(_27$$10); + zephir_fast_strtoupper(_27$$10, defaultValue); + if (zephir_memnstr_str(_26$$10, SL("BOOLEAN"), "phalcon/db/dialect/postgresql.zep", 239)) { + ZEPHIR_CALL_METHOD(&_28$$11, column, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_INIT_VAR(_28$$11); + ZEPHIR_INIT_VAR(_29$$11); if (zephir_is_true(defaultValue)) { - ZEPHIR_INIT_NVAR(_28$$11); - ZVAL_STRING(_28$$11, "true", 1); + ZEPHIR_INIT_NVAR(_29$$11); + ZVAL_STRING(_29$$11, "true", 1); } else { - ZEPHIR_INIT_NVAR(_28$$11); - ZVAL_STRING(_28$$11, "false", 1); + ZEPHIR_INIT_NVAR(_29$$11); + ZVAL_STRING(_29$$11, "false", 1); } - ZEPHIR_INIT_VAR(_29$$11); - ZEPHIR_CONCAT_SVSV(_29$$11, " ALTER COLUMN \"", _27$$11, "\" SET DEFAULT ", _28$$11); - zephir_concat_self(&sql, _29$$11 TSRMLS_CC); - } else if (zephir_memnstr_str(_26$$10, SL("CURRENT_TIMESTAMP"), "phalcon/db/dialect/postgresql.zep", 240)) { - ZEPHIR_CALL_METHOD(&_30$$12, column, "getname", NULL, 0); + ZEPHIR_INIT_VAR(_30$$11); + ZEPHIR_CONCAT_SVSV(_30$$11, " ALTER COLUMN \"", _28$$11, "\" SET DEFAULT ", _29$$11); + zephir_concat_self(&sql, _30$$11 TSRMLS_CC); + } else if (zephir_memnstr_str(_27$$10, SL("CURRENT_TIMESTAMP"), "phalcon/db/dialect/postgresql.zep", 241)) { + ZEPHIR_CALL_METHOD(&_31$$12, column, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_INIT_VAR(_31$$12); - ZEPHIR_CONCAT_VSVS(_31$$12, sqlAlterTable, " ALTER COLUMN \"", _30$$12, "\" SET DEFAULT CURRENT_TIMESTAMP"); - zephir_concat_self(&sql, _31$$12 TSRMLS_CC); + ZEPHIR_INIT_VAR(_32$$12); + ZEPHIR_CONCAT_VSVS(_32$$12, sqlAlterTable, " ALTER COLUMN \"", _31$$12, "\" SET DEFAULT CURRENT_TIMESTAMP"); + zephir_concat_self(&sql, _32$$12 TSRMLS_CC); } else { - ZEPHIR_CALL_METHOD(&_32$$13, column, "getname", NULL, 0); + ZEPHIR_CALL_METHOD(&_33$$13, column, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_SINIT_VAR(_33$$13); - ZVAL_STRING(&_33$$13, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_34$$13, "addcslashes", NULL, 144, defaultValue, &_33$$13); + ZEPHIR_SINIT_VAR(_34$$13); + ZVAL_STRING(&_34$$13, "\"", 0); + ZEPHIR_CALL_FUNCTION(&_35$$13, "addcslashes", NULL, 139, defaultValue, &_34$$13); zephir_check_call_status(); - ZEPHIR_INIT_VAR(_35$$13); - ZEPHIR_CONCAT_VSVSVS(_35$$13, sqlAlterTable, " ALTER COLUMN \"", _32$$13, "\" SET DEFAULT \"", _34$$13, "\""); - zephir_concat_self(&sql, _35$$13 TSRMLS_CC); + ZEPHIR_INIT_VAR(_36$$13); + ZEPHIR_CONCAT_VSVSVS(_36$$13, sqlAlterTable, " ALTER COLUMN \"", _33$$13, "\" SET DEFAULT \"", _35$$13, "\""); + zephir_concat_self(&sql, _36$$13 TSRMLS_CC); } } } @@ -54138,7 +54309,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) { ZEPHIR_OBS_VAR(columns); if (!(zephir_array_isset_string_fetch(&columns, definition, SS("columns"), 0 TSRMLS_CC))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "The index 'columns' is required in the definition array", "phalcon/db/dialect/postgresql.zep", 350); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "The index 'columns' is required in the definition array", "phalcon/db/dialect/postgresql.zep", 351); return; } ZEPHIR_CALL_METHOD(&table, this_ptr, "preparetable", NULL, 0, tableName, schemaName); @@ -54160,7 +54331,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) { array_init(createLines); ZEPHIR_INIT_VAR(primaryColumns); array_init(primaryColumns); - zephir_is_iterable(columns, &_1, &_0, 0, 0, "phalcon/db/dialect/postgresql.zep", 406); + zephir_is_iterable(columns, &_1, &_0, 0, 0, "phalcon/db/dialect/postgresql.zep", 407); for ( ; zephir_hash_get_current_data_ex(_1, (void**) &_2, &_0) == SUCCESS ; zephir_hash_move_forward_ex(_1, &_0) @@ -54181,7 +54352,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) { zephir_fast_strtoupper(_6$$8, columnDefinition); ZEPHIR_INIT_NVAR(_7$$8); zephir_fast_strtoupper(_7$$8, defaultValue); - if (zephir_memnstr_str(_6$$8, SL("BOOLEAN"), "phalcon/db/dialect/postgresql.zep", 381)) { + if (zephir_memnstr_str(_6$$8, SL("BOOLEAN"), "phalcon/db/dialect/postgresql.zep", 382)) { ZEPHIR_INIT_LNVAR(_8$$9); if (zephir_is_true(defaultValue)) { ZEPHIR_INIT_NVAR(_8$$9); @@ -54193,12 +54364,12 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) { ZEPHIR_INIT_LNVAR(_9$$9); ZEPHIR_CONCAT_SV(_9$$9, " DEFAULT ", _8$$9); zephir_concat_self(&sql, _9$$9 TSRMLS_CC); - } else if (zephir_memnstr_str(_7$$8, SL("CURRENT_TIMESTAMP"), "phalcon/db/dialect/postgresql.zep", 383)) { + } else if (zephir_memnstr_str(_7$$8, SL("CURRENT_TIMESTAMP"), "phalcon/db/dialect/postgresql.zep", 384)) { zephir_concat_self_str(&columnLine, SL(" DEFAULT CURRENT_TIMESTAMP") TSRMLS_CC); } else { ZEPHIR_SINIT_NVAR(_10$$11); ZVAL_STRING(&_10$$11, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_11$$11, "addcslashes", &_12, 144, defaultValue, &_10$$11); + ZEPHIR_CALL_FUNCTION(&_11$$11, "addcslashes", &_12, 139, defaultValue, &_10$$11); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_13$$11); ZEPHIR_CONCAT_SVS(_13$$11, " DEFAULT \"", _11$$11, "\""); @@ -54215,22 +54386,22 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) { if (zephir_is_true(_15$$7)) { ZEPHIR_CALL_METHOD(&_16$$13, column, "getname", NULL, 0); zephir_check_call_status(); - zephir_array_append(&primaryColumns, _16$$13, PH_SEPARATE, "phalcon/db/dialect/postgresql.zep", 401); + zephir_array_append(&primaryColumns, _16$$13, PH_SEPARATE, "phalcon/db/dialect/postgresql.zep", 402); } - zephir_array_append(&createLines, columnLine, PH_SEPARATE, "phalcon/db/dialect/postgresql.zep", 404); + zephir_array_append(&createLines, columnLine, PH_SEPARATE, "phalcon/db/dialect/postgresql.zep", 405); } if (!(ZEPHIR_IS_EMPTY(primaryColumns))) { ZEPHIR_CALL_METHOD(&_17$$14, this_ptr, "getcolumnlist", NULL, 44, primaryColumns); zephir_check_call_status(); ZEPHIR_INIT_VAR(_18$$14); ZEPHIR_CONCAT_SVS(_18$$14, "PRIMARY KEY (", _17$$14, ")"); - zephir_array_append(&createLines, _18$$14, PH_SEPARATE, "phalcon/db/dialect/postgresql.zep", 407); + zephir_array_append(&createLines, _18$$14, PH_SEPARATE, "phalcon/db/dialect/postgresql.zep", 408); } ZEPHIR_INIT_VAR(indexSqlAfterCreate); ZVAL_STRING(indexSqlAfterCreate, "", 1); ZEPHIR_OBS_VAR(indexes); if (zephir_array_isset_string_fetch(&indexes, definition, SS("indexes"), 0 TSRMLS_CC)) { - zephir_is_iterable(indexes, &_20$$15, &_19$$15, 0, 0, "phalcon/db/dialect/postgresql.zep", 441); + zephir_is_iterable(indexes, &_20$$15, &_19$$15, 0, 0, "phalcon/db/dialect/postgresql.zep", 442); for ( ; zephir_hash_get_current_data_ex(_20$$15, (void**) &_21$$15, &_19$$15) == SUCCESS ; zephir_hash_move_forward_ex(_20$$15, &_19$$15) @@ -54260,7 +54431,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) { } else { ZEPHIR_CALL_METHOD(&_26$$20, index, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_27$$20, this_ptr, "preparetable", NULL, 146, tableName, schemaName); + ZEPHIR_CALL_METHOD(&_27$$20, this_ptr, "preparetable", NULL, 141, tableName, schemaName); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_28$$20); ZEPHIR_CONCAT_SVSV(_28$$20, "CREATE INDEX \"", _26$$20, "\" ON ", _27$$20); @@ -54275,13 +54446,13 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) { } } if (!(ZEPHIR_IS_EMPTY(indexSql))) { - zephir_array_append(&createLines, indexSql, PH_SEPARATE, "phalcon/db/dialect/postgresql.zep", 438); + zephir_array_append(&createLines, indexSql, PH_SEPARATE, "phalcon/db/dialect/postgresql.zep", 439); } } } ZEPHIR_OBS_VAR(references); if (zephir_array_isset_string_fetch(&references, definition, SS("references"), 0 TSRMLS_CC)) { - zephir_is_iterable(references, &_33$$22, &_32$$22, 0, 0, "phalcon/db/dialect/postgresql.zep", 466); + zephir_is_iterable(references, &_33$$22, &_32$$22, 0, 0, "phalcon/db/dialect/postgresql.zep", 467); for ( ; zephir_hash_get_current_data_ex(_33$$22, (void**) &_34$$22, &_32$$22) == SUCCESS ; zephir_hash_move_forward_ex(_33$$22, &_32$$22) @@ -54297,7 +54468,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) { ZEPHIR_CONCAT_SVSVS(referenceSql, "CONSTRAINT \"", _35$$23, "\" FOREIGN KEY (", _36$$23, ") REFERENCES "); ZEPHIR_CALL_METHOD(&_39$$23, reference, "getreferencedtable", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_38$$23, this_ptr, "preparetable", NULL, 146, _39$$23, schemaName); + ZEPHIR_CALL_METHOD(&_38$$23, this_ptr, "preparetable", NULL, 141, _39$$23, schemaName); zephir_check_call_status(); zephir_concat_self(&referenceSql, _38$$23 TSRMLS_CC); ZEPHIR_CALL_METHOD(&_41$$23, reference, "getreferencedcolumns", NULL, 0); @@ -54321,7 +54492,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) { ZEPHIR_CONCAT_SV(_44$$25, " ON UPDATE ", onUpdate); zephir_concat_self(&referenceSql, _44$$25 TSRMLS_CC); } - zephir_array_append(&createLines, referenceSql, PH_SEPARATE, "phalcon/db/dialect/postgresql.zep", 464); + zephir_array_append(&createLines, referenceSql, PH_SEPARATE, "phalcon/db/dialect/postgresql.zep", 465); } } ZEPHIR_INIT_VAR(_45); @@ -54423,7 +54594,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createView) { ZEPHIR_OBS_VAR(viewSql); if (!(zephir_array_isset_string_fetch(&viewSql, definition, SS("sql"), 0 TSRMLS_CC))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "The index 'sql' is required in the definition array", "phalcon/db/dialect/postgresql.zep", 503); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "The index 'sql' is required in the definition array", "phalcon/db/dialect/postgresql.zep", 504); return; } ZEPHIR_CALL_METHOD(&_0, this_ptr, "preparetable", NULL, 0, viewName, schemaName); @@ -54891,7 +55062,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, getColumnDefinition) { ZEPHIR_GET_HVALUE(value$$25, _12$$25); ZEPHIR_SINIT_NVAR(_13$$26); ZVAL_STRING(&_13$$26, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_14$$26, "addcslashes", &_15, 144, value$$25, &_13$$26); + ZEPHIR_CALL_FUNCTION(&_14$$26, "addcslashes", &_15, 139, value$$25, &_13$$26); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_16$$26); ZEPHIR_CONCAT_SVS(_16$$26, "\"", _14$$26, "\", "); @@ -54909,7 +55080,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, getColumnDefinition) { } else { ZEPHIR_SINIT_VAR(_21$$27); ZVAL_STRING(&_21$$27, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_22$$27, "addcslashes", &_15, 144, typeValues, &_21$$27); + ZEPHIR_CALL_FUNCTION(&_22$$27, "addcslashes", &_15, 139, typeValues, &_21$$27); zephir_check_call_status(); ZEPHIR_INIT_VAR(_23$$27); ZEPHIR_CONCAT_SVS(_23$$27, "(\"", _22$$27, "\")"); @@ -54976,7 +55147,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, addColumn) { } else { ZEPHIR_SINIT_VAR(_6$$5); ZVAL_STRING(&_6$$5, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_7$$5, "addcslashes", NULL, 144, defaultValue, &_6$$5); + ZEPHIR_CALL_FUNCTION(&_7$$5, "addcslashes", NULL, 139, defaultValue, &_6$$5); zephir_check_call_status(); ZEPHIR_INIT_VAR(_8$$5); ZEPHIR_CONCAT_SVS(_8$$5, " DEFAULT \"", _7$$5, "\""); @@ -55445,7 +55616,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, createTable) { } else { ZEPHIR_SINIT_NVAR(_12$$12); ZVAL_STRING(&_12$$12, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_13$$12, "addcslashes", &_14, 144, defaultValue, &_12$$12); + ZEPHIR_CALL_FUNCTION(&_13$$12, "addcslashes", &_14, 139, defaultValue, &_12$$12); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_15$$12); ZEPHIR_CONCAT_SVS(_15$$12, " DEFAULT \"", _13$$12, "\""); @@ -56640,7 +56811,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, all) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "variables", 1); zephir_array_fast_append(_0, _1); - ZEPHIR_CALL_FUNCTION(&_2, "func_get_args", NULL, 168); + ZEPHIR_CALL_FUNCTION(&_2, "func_get_args", NULL, 163); zephir_check_call_status(); ZEPHIR_CALL_USER_FUNC_ARRAY(return_value, _0, _2); zephir_check_call_status(); @@ -56839,7 +57010,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, output) { ZVAL_STRING(_21$$7, "", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_INIT_NVAR(_22$$7); ZVAL_LONG(_22$$7, (tab + 1)); - ZEPHIR_CALL_METHOD(&_20$$7, this_ptr, "output", &_23, 169, value, _21$$7, _22$$7); + ZEPHIR_CALL_METHOD(&_20$$7, this_ptr, "output", &_23, 164, value, _21$$7, _22$$7); zephir_check_temp_parameter(_21$$7); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_24$$7); @@ -56871,7 +57042,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, output) { ZEPHIR_CALL_FUNCTION(&_27$$8, "strtr", &_6, 55, &_29$$8, _26$$8); zephir_check_call_status(); zephir_concat_self(&output, _27$$8 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_30$$8, "get_parent_class", &_31, 170, variable); + ZEPHIR_CALL_FUNCTION(&_30$$8, "get_parent_class", &_31, 165, variable); zephir_check_call_status(); if (zephir_is_true(_30$$8)) { ZEPHIR_INIT_VAR(_32$$9); @@ -56882,7 +57053,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, output) { zephir_check_temp_parameter(_34$$9); zephir_check_call_status(); zephir_array_update_string(&_32$$9, SL(":style"), &_33$$9, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_FUNCTION(&_33$$9, "get_parent_class", &_31, 170, variable); + ZEPHIR_CALL_FUNCTION(&_33$$9, "get_parent_class", &_31, 165, variable); zephir_check_call_status(); zephir_array_update_string(&_32$$9, SL(":parent"), &_33$$9, PH_COPY | PH_SEPARATE); ZEPHIR_SINIT_VAR(_35$$9); @@ -56928,7 +57099,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, output) { ZVAL_STRING(_45$$11, "", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_INIT_NVAR(_48$$11); ZVAL_LONG(_48$$11, (tab + 1)); - ZEPHIR_CALL_METHOD(&_47$$11, this_ptr, "output", &_23, 169, value, _45$$11, _48$$11); + ZEPHIR_CALL_METHOD(&_47$$11, this_ptr, "output", &_23, 164, value, _45$$11, _48$$11); zephir_check_temp_parameter(_45$$11); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_49$$11); @@ -56938,7 +57109,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, output) { } else { do { ZEPHIR_MAKE_REF(variable); - ZEPHIR_CALL_FUNCTION(&attr, "each", &_50, 171, variable); + ZEPHIR_CALL_FUNCTION(&attr, "each", &_50, 166, variable); ZEPHIR_UNREF(variable); zephir_check_call_status(); if (!(zephir_is_true(attr))) { @@ -56984,7 +57155,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, output) { zephir_check_call_status(); zephir_array_update_string(&_59$$13, SL(":style"), &_60$$13, PH_COPY | PH_SEPARATE); ZEPHIR_MAKE_REF(key); - ZEPHIR_CALL_FUNCTION(&_60$$13, "end", &_61, 172, key); + ZEPHIR_CALL_FUNCTION(&_60$$13, "end", &_61, 167, key); ZEPHIR_UNREF(key); zephir_check_call_status(); zephir_array_update_string(&_59$$13, SL(":key"), &_60$$13, PH_COPY | PH_SEPARATE); @@ -57000,7 +57171,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, output) { ZVAL_STRING(_51$$13, "", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_INIT_NVAR(_64$$13); ZVAL_LONG(_64$$13, (tab + 1)); - ZEPHIR_CALL_METHOD(&_63$$13, this_ptr, "output", &_23, 169, value, _51$$13, _64$$13); + ZEPHIR_CALL_METHOD(&_63$$13, this_ptr, "output", &_23, 164, value, _51$$13, _64$$13); zephir_check_temp_parameter(_51$$13); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_65$$13); @@ -57008,7 +57179,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, output) { zephir_concat_self(&output, _65$$13 TSRMLS_CC); } while (zephir_is_true(attr)); } - ZEPHIR_CALL_FUNCTION(&attr, "get_class_methods", NULL, 173, variable); + ZEPHIR_CALL_FUNCTION(&attr, "get_class_methods", NULL, 168, variable); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_29$$8); ZVAL_LONG(&_29$$8, tab); @@ -57130,7 +57301,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, output) { ZEPHIR_CONCAT_VV(return_value, output, _95$$23); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_98, "is_float", NULL, 174, variable); + ZEPHIR_CALL_FUNCTION(&_98, "is_float", NULL, 169, variable); zephir_check_call_status(); if (zephir_is_true(_98)) { ZEPHIR_INIT_VAR(_99$$24); @@ -57181,9 +57352,9 @@ static PHP_METHOD(Phalcon_Debug_Dump, output) { ZVAL_LONG(&_110$$26, 4); ZEPHIR_SINIT_VAR(_111$$26); ZVAL_STRING(&_111$$26, "utf-8", 0); - ZEPHIR_CALL_FUNCTION(&_108$$26, "htmlentities", NULL, 154, variable, &_110$$26, &_111$$26); + ZEPHIR_CALL_FUNCTION(&_108$$26, "htmlentities", NULL, 149, variable, &_110$$26, &_111$$26); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_112$$26, "nl2br", NULL, 175, _108$$26); + ZEPHIR_CALL_FUNCTION(&_112$$26, "nl2br", NULL, 170, _108$$26); zephir_check_call_status(); zephir_array_update_string(&_107$$26, SL(":var"), &_112$$26, PH_COPY | PH_SEPARATE); ZEPHIR_SINIT_NVAR(_110$$26); @@ -57301,7 +57472,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, variables) { ZEPHIR_INIT_VAR(output); ZVAL_STRING(output, "", 1); - ZEPHIR_CALL_FUNCTION(&_0, "func_get_args", NULL, 168); + ZEPHIR_CALL_FUNCTION(&_0, "func_get_args", NULL, 163); zephir_check_call_status(); zephir_is_iterable(_0, &_2, &_1, 0, 0, "phalcon/debug/dump.zep", 290); for ( @@ -58070,7 +58241,7 @@ static PHP_METHOD(Phalcon_Di_Service, resolve) { ZEPHIR_CALL_METHOD(NULL, builder, "__construct", NULL, 0); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&instance, builder, "build", NULL, 177, dependencyInjector, definition, parameters); + ZEPHIR_CALL_METHOD(&instance, builder, "build", NULL, 172, dependencyInjector, definition, parameters); zephir_check_call_status(); } else { found = 0; @@ -58271,7 +58442,7 @@ static PHP_METHOD(Phalcon_Di_FactoryDefault_Cli, __construct) { ZEPHIR_MM_GROW(); - ZEPHIR_CALL_PARENT(NULL, phalcon_di_factorydefault_cli_ce, this_ptr, "__construct", &_0, 176); + ZEPHIR_CALL_PARENT(NULL, phalcon_di_factorydefault_cli_ce, this_ptr, "__construct", &_0, 171); zephir_check_call_status(); ZEPHIR_INIT_VAR(_1); zephir_create_array(_1, 10, 0 TSRMLS_CC); @@ -58571,7 +58742,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, _buildParameters) { ) { ZEPHIR_GET_HMKEY(position, _1, _0); ZEPHIR_GET_HVALUE(argument, _2); - ZEPHIR_CALL_METHOD(&_3$$3, this_ptr, "_buildparameter", &_4, 178, dependencyInjector, position, argument); + ZEPHIR_CALL_METHOD(&_3$$3, this_ptr, "_buildparameter", &_4, 173, dependencyInjector, position, argument); zephir_check_call_status(); zephir_array_append(&buildArguments, _3$$3, PH_SEPARATE, "phalcon/di/service/builder.zep", 117); } @@ -58615,7 +58786,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build) { } else { ZEPHIR_OBS_VAR(arguments); if (zephir_array_isset_string_fetch(&arguments, definition, SS("arguments"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_0$$8, this_ptr, "_buildparameters", &_1, 179, dependencyInjector, arguments); + ZEPHIR_CALL_METHOD(&_0$$8, this_ptr, "_buildparameters", &_1, 174, dependencyInjector, arguments); zephir_check_call_status(); ZEPHIR_INIT_NVAR(instance); ZEPHIR_LAST_CALL_STATUS = zephir_create_instance_params(instance, className, _0$$8 TSRMLS_CC); @@ -58685,7 +58856,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build) { } if (zephir_fast_count_int(arguments TSRMLS_CC)) { ZEPHIR_INIT_NVAR(_12$$18); - ZEPHIR_CALL_METHOD(&_13$$18, this_ptr, "_buildparameters", &_1, 179, dependencyInjector, arguments); + ZEPHIR_CALL_METHOD(&_13$$18, this_ptr, "_buildparameters", &_1, 174, dependencyInjector, arguments); zephir_check_call_status(); ZEPHIR_CALL_USER_FUNC_ARRAY(_12$$18, methodCall, _13$$18); zephir_check_call_status(); @@ -58749,7 +58920,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build) { ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_24$$22, this_ptr, "_buildparameter", &_25, 178, dependencyInjector, propertyPosition, propertyValue); + ZEPHIR_CALL_METHOD(&_24$$22, this_ptr, "_buildparameter", &_25, 173, dependencyInjector, propertyPosition, propertyValue); zephir_check_call_status(); zephir_update_property_zval_zval(instance, propertyName, _24$$22 TSRMLS_CC); } @@ -59067,7 +59238,7 @@ static PHP_METHOD(Phalcon_Events_Manager, attach) { } ZEPHIR_INIT_VAR(_2$$5); ZVAL_LONG(_2$$5, 1); - ZEPHIR_CALL_METHOD(NULL, priorityQueue, "setextractflags", NULL, 186, _2$$5); + ZEPHIR_CALL_METHOD(NULL, priorityQueue, "setextractflags", NULL, 181, _2$$5); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("_events"), eventType, priorityQueue TSRMLS_CC); } else { @@ -59077,7 +59248,7 @@ static PHP_METHOD(Phalcon_Events_Manager, attach) { if (Z_TYPE_P(priorityQueue) == IS_OBJECT) { ZEPHIR_INIT_VAR(_3$$7); ZVAL_LONG(_3$$7, priority); - ZEPHIR_CALL_METHOD(NULL, priorityQueue, "insert", NULL, 187, handler, _3$$7); + ZEPHIR_CALL_METHOD(NULL, priorityQueue, "insert", NULL, 182, handler, _3$$7); zephir_check_call_status(); } else { zephir_array_append(&priorityQueue, handler, PH_SEPARATE, "phalcon/events/manager.zep", 82); @@ -59125,7 +59296,7 @@ static PHP_METHOD(Phalcon_Events_Manager, detach) { } ZEPHIR_INIT_VAR(_1$$5); ZVAL_LONG(_1$$5, 1); - ZEPHIR_CALL_METHOD(NULL, newPriorityQueue, "setextractflags", NULL, 186, _1$$5); + ZEPHIR_CALL_METHOD(NULL, newPriorityQueue, "setextractflags", NULL, 181, _1$$5); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_1$$5); ZVAL_LONG(_1$$5, 3); @@ -59147,13 +59318,13 @@ static PHP_METHOD(Phalcon_Events_Manager, detach) { if (!ZEPHIR_IS_IDENTICAL(_5$$6, handler)) { zephir_array_fetch_string(&_6$$7, data, SL("data"), PH_NOISY | PH_READONLY, "phalcon/events/manager.zep", 117 TSRMLS_CC); zephir_array_fetch_string(&_7$$7, data, SL("priority"), PH_NOISY | PH_READONLY, "phalcon/events/manager.zep", 117 TSRMLS_CC); - ZEPHIR_CALL_METHOD(NULL, newPriorityQueue, "insert", &_8, 187, _6$$7, _7$$7); + ZEPHIR_CALL_METHOD(NULL, newPriorityQueue, "insert", &_8, 182, _6$$7, _7$$7); zephir_check_call_status(); } } zephir_update_property_array(this_ptr, SL("_events"), eventType, newPriorityQueue TSRMLS_CC); } else { - ZEPHIR_CALL_FUNCTION(&key, "array_search", NULL, 188, handler, priorityQueue, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(&key, "array_search", NULL, 183, handler, priorityQueue, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(key)) { zephir_array_unset(&priorityQueue, key, PH_SEPARATE); @@ -59318,7 +59489,7 @@ static PHP_METHOD(Phalcon_Events_Manager, fireQueue) { zephir_get_class(_1$$5, queue, 0 TSRMLS_CC); ZEPHIR_SINIT_VAR(_2$$5); ZVAL_STRING(&_2$$5, "Unexpected value type: expected object of type SplPriorityQueue, %s given", 0); - ZEPHIR_CALL_FUNCTION(&_3$$5, "sprintf", NULL, 189, &_2$$5, _1$$5); + ZEPHIR_CALL_FUNCTION(&_3$$5, "sprintf", NULL, 184, &_2$$5, _1$$5); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, _0$$5, "__construct", NULL, 9, _3$$5); zephir_check_call_status(); @@ -59536,9 +59707,9 @@ static PHP_METHOD(Phalcon_Events_Manager, fire) { } else { ZVAL_BOOL(_4$$7, 0); } - ZEPHIR_CALL_METHOD(NULL, event, "__construct", &_5, 190, eventName, source, data, _4$$7); + ZEPHIR_CALL_METHOD(NULL, event, "__construct", &_5, 185, eventName, source, data, _4$$7); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", &_6, 191, fireEvents, event); + ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", &_6, 186, fireEvents, event); zephir_check_call_status(); } } @@ -59558,10 +59729,10 @@ static PHP_METHOD(Phalcon_Events_Manager, fire) { } else { ZVAL_BOOL(_8$$10, 0); } - ZEPHIR_CALL_METHOD(NULL, event, "__construct", &_5, 190, eventName, source, data, _8$$10); + ZEPHIR_CALL_METHOD(NULL, event, "__construct", &_5, 185, eventName, source, data, _8$$10); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", &_6, 191, fireEvents, event); + ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", &_6, 186, fireEvents, event); zephir_check_call_status(); } } @@ -59772,7 +59943,7 @@ static PHP_METHOD(Phalcon_Flash_Direct, output) { } } if (remove) { - ZEPHIR_CALL_PARENT(NULL, phalcon_flash_direct_ce, this_ptr, "clear", &_3, 198); + ZEPHIR_CALL_PARENT(NULL, phalcon_flash_direct_ce, this_ptr, "clear", &_3, 193); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -60073,7 +60244,7 @@ static PHP_METHOD(Phalcon_Flash_Session, output) { zephir_check_call_status(); } } - ZEPHIR_CALL_PARENT(NULL, phalcon_flash_session_ce, this_ptr, "clear", &_5, 198); + ZEPHIR_CALL_PARENT(NULL, phalcon_flash_session_ce, this_ptr, "clear", &_5, 193); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -60091,7 +60262,7 @@ static PHP_METHOD(Phalcon_Flash_Session, clear) { ZVAL_BOOL(_0, 1); ZEPHIR_CALL_METHOD(NULL, this_ptr, "_getsessionmessages", NULL, 0, _0); zephir_check_call_status(); - ZEPHIR_CALL_PARENT(NULL, phalcon_flash_session_ce, this_ptr, "clear", &_1, 198); + ZEPHIR_CALL_PARENT(NULL, phalcon_flash_session_ce, this_ptr, "clear", &_1, 193); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -61101,7 +61272,7 @@ static PHP_METHOD(Phalcon_Forms_Form, bind) { ZEPHIR_CPY_WRT(filteredValue, value); } ZEPHIR_INIT_NVAR(_6$$4); - zephir_camelize(_6$$4, key); + zephir_camelize(_6$$4, key, NULL ); ZEPHIR_INIT_NVAR(method); ZEPHIR_CONCAT_SV(method, "set", _6$$4); if ((zephir_method_exists(entity, method TSRMLS_CC) == SUCCESS)) { @@ -61204,7 +61375,7 @@ static PHP_METHOD(Phalcon_Forms_Form, isValid) { } else { ZEPHIR_INIT_NVAR(validation); object_init_ex(validation, phalcon_validation_ce); - ZEPHIR_CALL_METHOD(NULL, validation, "__construct", &_11, 212, preparedValidators); + ZEPHIR_CALL_METHOD(NULL, validation, "__construct", &_11, 207, preparedValidators); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(&filters, element, "getfilters", NULL, 0); @@ -61212,10 +61383,10 @@ static PHP_METHOD(Phalcon_Forms_Form, isValid) { if (Z_TYPE_P(filters) == IS_ARRAY) { ZEPHIR_CALL_METHOD(&_12$$16, element, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, validation, "setfilters", &_13, 213, _12$$16, filters); + ZEPHIR_CALL_METHOD(NULL, validation, "setfilters", &_13, 208, _12$$16, filters); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&elementMessages, validation, "validate", &_14, 214, data, entity); + ZEPHIR_CALL_METHOD(&elementMessages, validation, "validate", &_14, 209, data, entity); zephir_check_call_status(); if (zephir_fast_count_int(elementMessages TSRMLS_CC)) { ZEPHIR_CALL_METHOD(&_15$$17, element, "getname", NULL, 0); @@ -61278,7 +61449,7 @@ static PHP_METHOD(Phalcon_Forms_Form, getMessages) { ; zephir_hash_move_forward_ex(_2$$5, &_1$$5) ) { ZEPHIR_GET_HVALUE(elementMessages, _3$$5); - ZEPHIR_CALL_METHOD(NULL, group, "appendmessages", &_4, 215, elementMessages); + ZEPHIR_CALL_METHOD(NULL, group, "appendmessages", &_4, 210, elementMessages); zephir_check_call_status(); } } @@ -61591,7 +61762,7 @@ static PHP_METHOD(Phalcon_Forms_Form, getValue) { } if (Z_TYPE_P(entity) == IS_OBJECT) { ZEPHIR_INIT_VAR(_0$$4); - zephir_camelize(_0$$4, name); + zephir_camelize(_0$$4, name, NULL ); ZEPHIR_INIT_VAR(method); ZEPHIR_CONCAT_SV(method, "get", _0$$4); if ((zephir_method_exists(entity, method TSRMLS_CC) == SUCCESS)) { @@ -61611,7 +61782,7 @@ static PHP_METHOD(Phalcon_Forms_Form, getValue) { } } ZEPHIR_INIT_VAR(_1); - zephir_camelize(_1, name); + zephir_camelize(_1, name, NULL ); ZEPHIR_INIT_NVAR(method); ZEPHIR_CONCAT_SV(method, "get", _1); if ((zephir_method_exists(this_ptr, method TSRMLS_CC) == SUCCESS)) { @@ -61741,7 +61912,7 @@ static PHP_METHOD(Phalcon_Forms_Form, rewind) { ZVAL_LONG(_0, 0); zephir_update_property_this(this_ptr, SL("_position"), _0 TSRMLS_CC); _0 = zephir_fetch_nproperty_this(this_ptr, SL("_elements"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_1, "array_values", NULL, 216, _0); + ZEPHIR_CALL_FUNCTION(&_1, "array_values", NULL, 211, _0); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_elementsIndexed"), _1 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -61835,7 +62006,7 @@ static PHP_METHOD(Phalcon_Forms_Manager, create) { } ZEPHIR_INIT_VAR(form); object_init_ex(form, phalcon_forms_form_ce); - ZEPHIR_CALL_METHOD(NULL, form, "__construct", NULL, 217, entity); + ZEPHIR_CALL_METHOD(NULL, form, "__construct", NULL, 212, entity); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("_forms"), name, form TSRMLS_CC); RETURN_CCTOR(form); @@ -61944,7 +62115,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Check, render) { ZVAL_BOOL(_2, 1); ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes, _2); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "checkfield", &_0, 199, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "checkfield", &_0, 194, _1); zephir_check_call_status(); RETURN_MM(); @@ -61989,7 +62160,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Date, render) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "datefield", &_0, 200, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "datefield", &_0, 195, _1); zephir_check_call_status(); RETURN_MM(); @@ -62034,7 +62205,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Email, render) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "emailfield", &_0, 201, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "emailfield", &_0, 196, _1); zephir_check_call_status(); RETURN_MM(); @@ -62079,7 +62250,7 @@ static PHP_METHOD(Phalcon_Forms_Element_File, render) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "filefield", &_0, 202, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "filefield", &_0, 197, _1); zephir_check_call_status(); RETURN_MM(); @@ -62124,7 +62295,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Hidden, render) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "hiddenfield", &_0, 203, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "hiddenfield", &_0, 198, _1); zephir_check_call_status(); RETURN_MM(); @@ -62169,7 +62340,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Numeric, render) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "numericfield", &_0, 204, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "numericfield", &_0, 199, _1); zephir_check_call_status(); RETURN_MM(); @@ -62214,7 +62385,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Password, render) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "passwordfield", &_0, 205, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "passwordfield", &_0, 200, _1); zephir_check_call_status(); RETURN_MM(); @@ -62261,7 +62432,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Radio, render) { ZVAL_BOOL(_2, 1); ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes, _2); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "radiofield", &_0, 206, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "radiofield", &_0, 201, _1); zephir_check_call_status(); RETURN_MM(); @@ -62312,7 +62483,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Select, __construct) { zephir_update_property_this(this_ptr, SL("_optionsValues"), options TSRMLS_CC); - ZEPHIR_CALL_PARENT(NULL, phalcon_forms_element_select_ce, this_ptr, "__construct", &_0, 207, name, attributes); + ZEPHIR_CALL_PARENT(NULL, phalcon_forms_element_select_ce, this_ptr, "__construct", &_0, 202, name, attributes); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -62384,7 +62555,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Select, render) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes); zephir_check_call_status(); _2 = zephir_fetch_nproperty_this(this_ptr, SL("_optionsValues"), PH_NOISY_CC); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_select_ce, "selectfield", &_0, 208, _1, _2); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_select_ce, "selectfield", &_0, 203, _1, _2); zephir_check_call_status(); RETURN_MM(); @@ -62429,7 +62600,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Submit, render) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "submitbutton", &_0, 209, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "submitbutton", &_0, 204, _1); zephir_check_call_status(); RETURN_MM(); @@ -62474,7 +62645,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Text, render) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "textfield", &_0, 210, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "textfield", &_0, 205, _1); zephir_check_call_status(); RETURN_MM(); @@ -62519,7 +62690,7 @@ static PHP_METHOD(Phalcon_Forms_Element_TextArea, render) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "textarea", &_0, 211, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "textarea", &_0, 206, _1); zephir_check_call_status(); RETURN_MM(); @@ -62837,7 +63008,7 @@ static PHP_METHOD(Phalcon_Http_Cookie, send) { } else { ZEPHIR_CPY_WRT(encryptValue, value); } - ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 218, name, encryptValue, expire, path, domain, secure, httpOnly); + ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 213, name, encryptValue, expire, path, domain, secure, httpOnly); zephir_check_call_status(); RETURN_THIS(); @@ -62937,7 +63108,7 @@ static PHP_METHOD(Phalcon_Http_Cookie, delete) { zephir_time(_4); ZEPHIR_SINIT_VAR(_5); ZVAL_LONG(&_5, (zephir_get_numberval(_4) - 691200)); - ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 218, name, ZEPHIR_GLOBAL(global_null), &_5, path, domain, secure, httpOnly); + ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 213, name, ZEPHIR_GLOBAL(global_null), &_5, path, domain, secure, httpOnly); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -63372,7 +63543,7 @@ static PHP_METHOD(Phalcon_Http_Request, get) { } else { ZVAL_BOOL(_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 219, _REQUEST, name, filters, defaultValue, _0, _1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 214, _REQUEST, name, filters, defaultValue, _0, _1); zephir_check_call_status(); RETURN_MM(); @@ -63434,7 +63605,7 @@ static PHP_METHOD(Phalcon_Http_Request, getPost) { } else { ZVAL_BOOL(_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 219, _POST, name, filters, defaultValue, _0, _1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 214, _POST, name, filters, defaultValue, _0, _1); zephir_check_call_status(); RETURN_MM(); @@ -63491,7 +63662,7 @@ static PHP_METHOD(Phalcon_Http_Request, getPut) { ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "getrawbody", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(put); - ZEPHIR_CALL_FUNCTION(NULL, "parse_str", NULL, 220, _0$$3, put); + ZEPHIR_CALL_FUNCTION(NULL, "parse_str", NULL, 215, _0$$3, put); ZEPHIR_UNREF(put); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_putCache"), put TSRMLS_CC); @@ -63508,7 +63679,7 @@ static PHP_METHOD(Phalcon_Http_Request, getPut) { } else { ZVAL_BOOL(_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 219, put, name, filters, defaultValue, _1, _2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 214, put, name, filters, defaultValue, _1, _2); zephir_check_call_status(); RETURN_MM(); @@ -63570,7 +63741,7 @@ static PHP_METHOD(Phalcon_Http_Request, getQuery) { } else { ZVAL_BOOL(_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 219, _GET, name, filters, defaultValue, _0, _1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 214, _GET, name, filters, defaultValue, _0, _1); zephir_check_call_status(); RETURN_MM(); @@ -64008,7 +64179,7 @@ static PHP_METHOD(Phalcon_Http_Request, getServerAddress) { } ZEPHIR_SINIT_VAR(_0); ZVAL_STRING(&_0, "localhost", 0); - ZEPHIR_RETURN_CALL_FUNCTION("gethostbyname", NULL, 221, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("gethostbyname", NULL, 216, &_0); zephir_check_call_status(); RETURN_MM(); @@ -64203,7 +64374,7 @@ static PHP_METHOD(Phalcon_Http_Request, isMethod) { } - ZEPHIR_CALL_METHOD(&httpMethod, this_ptr, "getmethod", NULL, 222); + ZEPHIR_CALL_METHOD(&httpMethod, this_ptr, "getmethod", NULL, 217); zephir_check_call_status(); if (Z_TYPE_P(methods) == IS_STRING) { _0$$3 = strict; @@ -64275,7 +64446,7 @@ static PHP_METHOD(Phalcon_Http_Request, isPost) { ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 222); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 217); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(_0, "POST")); @@ -64288,7 +64459,7 @@ static PHP_METHOD(Phalcon_Http_Request, isGet) { ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 222); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 217); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(_0, "GET")); @@ -64301,7 +64472,7 @@ static PHP_METHOD(Phalcon_Http_Request, isPut) { ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 222); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 217); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(_0, "PUT")); @@ -64314,7 +64485,7 @@ static PHP_METHOD(Phalcon_Http_Request, isPatch) { ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 222); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 217); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(_0, "PATCH")); @@ -64327,7 +64498,7 @@ static PHP_METHOD(Phalcon_Http_Request, isHead) { ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 222); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 217); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(_0, "HEAD")); @@ -64340,7 +64511,7 @@ static PHP_METHOD(Phalcon_Http_Request, isDelete) { ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 222); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 217); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(_0, "DELETE")); @@ -64353,7 +64524,7 @@ static PHP_METHOD(Phalcon_Http_Request, isOptions) { ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 222); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 217); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(_0, "OPTIONS")); @@ -64408,7 +64579,7 @@ static PHP_METHOD(Phalcon_Http_Request, hasFiles) { } else { ZVAL_BOOL(_5$$8, 0); } - ZEPHIR_CALL_METHOD(&_4$$8, this_ptr, "hasfilehelper", &_6, 223, error, _5$$8); + ZEPHIR_CALL_METHOD(&_4$$8, this_ptr, "hasfilehelper", &_6, 218, error, _5$$8); zephir_check_call_status(); numberFiles += zephir_get_numberval(_4$$8); } @@ -64459,7 +64630,7 @@ static PHP_METHOD(Phalcon_Http_Request, hasFileHelper) { } else { ZVAL_BOOL(_5$$7, 0); } - ZEPHIR_CALL_METHOD(&_4$$7, this_ptr, "hasfilehelper", &_6, 223, value, _5$$7); + ZEPHIR_CALL_METHOD(&_4$$7, this_ptr, "hasfilehelper", &_6, 218, value, _5$$7); zephir_check_call_status(); numberFiles += zephir_get_numberval(_4$$7); } @@ -64508,7 +64679,7 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) { zephir_array_fetch_string(&_6$$5, input, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/http/request.zep", 699 TSRMLS_CC); zephir_array_fetch_string(&_7$$5, input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/http/request.zep", 699 TSRMLS_CC); zephir_array_fetch_string(&_8$$5, input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/http/request.zep", 699 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_9, 224, _4$$5, _5$$5, _6$$5, _7$$5, _8$$5, prefix); + ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_9, 219, _4$$5, _5$$5, _6$$5, _7$$5, _8$$5, prefix); zephir_check_call_status(); zephir_is_iterable(smoothInput, &_11$$5, &_10$$5, 0, 0, "phalcon/http/request.zep", 714); for ( @@ -64542,7 +64713,7 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) { ZEPHIR_INIT_NVAR(_16$$7); object_init_ex(_16$$7, phalcon_http_request_file_ce); zephir_array_fetch_string(&_17$$7, file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/http/request.zep", 711 TSRMLS_CC); - ZEPHIR_CALL_METHOD(NULL, _16$$7, "__construct", &_18, 225, dataFile, _17$$7); + ZEPHIR_CALL_METHOD(NULL, _16$$7, "__construct", &_18, 220, dataFile, _17$$7); zephir_check_call_status(); zephir_array_append(&files, _16$$7, PH_SEPARATE, "phalcon/http/request.zep", 711); } @@ -64556,7 +64727,7 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) { if (_19$$8) { ZEPHIR_INIT_NVAR(_21$$9); object_init_ex(_21$$9, phalcon_http_request_file_ce); - ZEPHIR_CALL_METHOD(NULL, _21$$9, "__construct", &_18, 225, input, prefix); + ZEPHIR_CALL_METHOD(NULL, _21$$9, "__construct", &_18, 220, input, prefix); zephir_check_call_status(); zephir_array_append(&files, _21$$9, PH_SEPARATE, "phalcon/http/request.zep", 716); } @@ -64624,7 +64795,7 @@ static PHP_METHOD(Phalcon_Http_Request, smoothFiles) { zephir_array_fetch(&_7$$5, tmp_names, idx, PH_NOISY | PH_READONLY, "phalcon/http/request.zep", 750 TSRMLS_CC); zephir_array_fetch(&_8$$5, sizes, idx, PH_NOISY | PH_READONLY, "phalcon/http/request.zep", 750 TSRMLS_CC); zephir_array_fetch(&_9$$5, errors, idx, PH_NOISY | PH_READONLY, "phalcon/http/request.zep", 750 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_10, 224, _5$$5, _6$$5, _7$$5, _8$$5, _9$$5, p); + ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_10, 219, _5$$5, _6$$5, _7$$5, _8$$5, _9$$5, p); zephir_check_call_status(); zephir_is_iterable(parentFiles, &_12$$5, &_11$$5, 0, 0, "phalcon/http/request.zep", 755); for ( @@ -64678,7 +64849,7 @@ static PHP_METHOD(Phalcon_Http_Request, getHeaders) { ZVAL_STRING(&_8$$4, " ", 0); zephir_fast_str_replace(&_4$$4, &_7$$4, &_8$$4, _6$$4 TSRMLS_CC); zephir_fast_strtolower(_3$$4, _4$$4); - ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_9, 226, _3$$4); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_9, 221, _3$$4); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_10$$4); ZEPHIR_SINIT_NVAR(_11$$4); @@ -64697,7 +64868,7 @@ static PHP_METHOD(Phalcon_Http_Request, getHeaders) { ZVAL_STRING(&_16$$5, " ", 0); zephir_fast_str_replace(&_14$$5, &_15$$5, &_16$$5, name TSRMLS_CC); zephir_fast_strtolower(_13$$5, _14$$5); - ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_9, 226, _13$$5); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_9, 221, _13$$5); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_17$$5); ZEPHIR_SINIT_NVAR(_18$$5); @@ -64771,7 +64942,7 @@ static PHP_METHOD(Phalcon_Http_Request, _getQualityHeader) { ZVAL_LONG(&_2, -1); ZEPHIR_SINIT_VAR(_3); ZVAL_LONG(&_3, 1); - ZEPHIR_CALL_FUNCTION(&_4, "preg_split", &_5, 227, &_1, _0, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "preg_split", &_5, 222, &_1, _0, &_2, &_3); zephir_check_call_status(); zephir_is_iterable(_4, &_7, &_6, 0, 0, "phalcon/http/request.zep", 827); for ( @@ -64789,7 +64960,7 @@ static PHP_METHOD(Phalcon_Http_Request, _getQualityHeader) { ZVAL_LONG(&_11$$3, -1); ZEPHIR_SINIT_NVAR(_12$$3); ZVAL_LONG(&_12$$3, 1); - ZEPHIR_CALL_FUNCTION(&_13$$3, "preg_split", &_5, 227, &_10$$3, _9$$3, &_11$$3, &_12$$3); + ZEPHIR_CALL_FUNCTION(&_13$$3, "preg_split", &_5, 222, &_10$$3, _9$$3, &_11$$3, &_12$$3); zephir_check_call_status(); zephir_is_iterable(_13$$3, &_15$$3, &_14$$3, 0, 0, "phalcon/http/request.zep", 824); for ( @@ -64919,7 +65090,7 @@ static PHP_METHOD(Phalcon_Http_Request, getAcceptableContent) { ZVAL_STRING(_0, "HTTP_ACCEPT", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "accept", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getqualityheader", NULL, 228, _0, _1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getqualityheader", NULL, 223, _0, _1); zephir_check_temp_parameter(_0); zephir_check_temp_parameter(_1); zephir_check_call_status(); @@ -64938,7 +65109,7 @@ static PHP_METHOD(Phalcon_Http_Request, getBestAccept) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "accept", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getbestquality", NULL, 229, _0, _1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getbestquality", NULL, 224, _0, _1); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -64956,7 +65127,7 @@ static PHP_METHOD(Phalcon_Http_Request, getClientCharsets) { ZVAL_STRING(_0, "HTTP_ACCEPT_CHARSET", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "charset", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getqualityheader", NULL, 228, _0, _1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getqualityheader", NULL, 223, _0, _1); zephir_check_temp_parameter(_0); zephir_check_temp_parameter(_1); zephir_check_call_status(); @@ -64975,7 +65146,7 @@ static PHP_METHOD(Phalcon_Http_Request, getBestCharset) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "charset", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getbestquality", NULL, 229, _0, _1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getbestquality", NULL, 224, _0, _1); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -64993,7 +65164,7 @@ static PHP_METHOD(Phalcon_Http_Request, getLanguages) { ZVAL_STRING(_0, "HTTP_ACCEPT_LANGUAGE", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "language", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getqualityheader", NULL, 228, _0, _1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getqualityheader", NULL, 223, _0, _1); zephir_check_temp_parameter(_0); zephir_check_temp_parameter(_1); zephir_check_call_status(); @@ -65012,7 +65183,7 @@ static PHP_METHOD(Phalcon_Http_Request, getBestLanguage) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "language", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getbestquality", NULL, 229, _0, _1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getbestquality", NULL, 224, _0, _1); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -65228,7 +65399,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Response) { static PHP_METHOD(Phalcon_Http_Response, __construct) { int ZEPHIR_LAST_CALL_STATUS; - zval *content = NULL, *code = NULL, *status = NULL; + zval *content = NULL, *code = NULL, *status = NULL, *_0; ZEPHIR_MM_GROW(); zephir_fetch_params(1, 0, 3, &content, &code, &status); @@ -65244,6 +65415,13 @@ static PHP_METHOD(Phalcon_Http_Response, __construct) { } + ZEPHIR_INIT_VAR(_0); + object_init_ex(_0, phalcon_http_response_headers_ce); + if (zephir_has_constructor(_0 TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, _0, "__construct", NULL, 0); + zephir_check_call_status(); + } + zephir_update_property_this(this_ptr, SL("_headers"), _0 TSRMLS_CC); if (Z_TYPE_P(content) != IS_NULL) { zephir_update_property_this(this_ptr, SL("_content"), content TSRMLS_CC); } @@ -65281,7 +65459,7 @@ static PHP_METHOD(Phalcon_Http_Response, getDI) { ZEPHIR_CALL_CE_STATIC(&dependencyInjector, phalcon_di_ce, "getdefault", &_1, 1); zephir_check_call_status(); if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_response_exception_ce, "A dependency injection object is required to access the 'url' service", "phalcon/http/response.zep", 95); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_response_exception_ce, "A dependency injection object is required to access the 'url' service", "phalcon/http/response.zep", 101); return; } zephir_update_property_this(this_ptr, SL("_dependencyInjector"), dependencyInjector TSRMLS_CC); @@ -65318,7 +65496,7 @@ static PHP_METHOD(Phalcon_Http_Response, setStatusCode) { zephir_check_call_status(); if (Z_TYPE_P(currentHeadersRaw) == IS_ARRAY) { ZEPHIR_INIT_VAR(_0$$3); - zephir_is_iterable(currentHeadersRaw, &_2$$3, &_1$$3, 0, 0, "phalcon/http/response.zep", 127); + zephir_is_iterable(currentHeadersRaw, &_2$$3, &_1$$3, 0, 0, "phalcon/http/response.zep", 133); for ( ; zephir_hash_get_current_data_ex(_2$$3, (void**) &_3$$3, &_1$$3) == SUCCESS ; zephir_hash_move_forward_ex(_2$$3, &_1$$3) @@ -65329,7 +65507,7 @@ static PHP_METHOD(Phalcon_Http_Response, setStatusCode) { if (_4$$4) { ZEPHIR_SINIT_NVAR(_5$$4); ZVAL_STRING(&_5$$4, "HTTP/", 0); - ZEPHIR_CALL_FUNCTION(&_6$$4, "strstr", &_7, 236, key, &_5$$4); + ZEPHIR_CALL_FUNCTION(&_6$$4, "strstr", &_7, 231, key, &_5$$4); zephir_check_call_status(); _4$$4 = zephir_is_true(_6$$4); } @@ -65341,7 +65519,7 @@ static PHP_METHOD(Phalcon_Http_Response, setStatusCode) { } if (ZEPHIR_IS_STRING_IDENTICAL(message, "")) { ZEPHIR_INIT_VAR(statusCodes); - zephir_create_array(statusCodes, 67, 0 TSRMLS_CC); + zephir_create_array(statusCodes, 62, 0 TSRMLS_CC); add_index_stringl(statusCodes, 100, SL("Continue"), 1); add_index_stringl(statusCodes, 101, SL("Switching Protocols"), 1); add_index_stringl(statusCodes, 102, SL("Processing"), 1); @@ -65405,11 +65583,11 @@ static PHP_METHOD(Phalcon_Http_Response, setStatusCode) { add_index_stringl(statusCodes, 508, SL("Loop Detected"), 1); add_index_stringl(statusCodes, 511, SL("Network Authentication Required"), 1); if (!(zephir_array_isset_long(statusCodes, code))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_response_exception_ce, "Non-standard statuscode given without a message", "phalcon/http/response.zep", 204); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_response_exception_ce, "Non-standard statuscode given without a message", "phalcon/http/response.zep", 210); return; } ZEPHIR_OBS_VAR(defaultMessage); - zephir_array_fetch_long(&defaultMessage, statusCodes, code, PH_NOISY, "phalcon/http/response.zep", 207 TSRMLS_CC); + zephir_array_fetch_long(&defaultMessage, statusCodes, code, PH_NOISY, "phalcon/http/response.zep", 213 TSRMLS_CC); zephir_get_strval(message, defaultMessage); } ZEPHIR_SINIT_VAR(_9); @@ -65464,23 +65642,9 @@ static PHP_METHOD(Phalcon_Http_Response, setHeaders) { static PHP_METHOD(Phalcon_Http_Response, getHeaders) { - zval *headers = NULL; - int ZEPHIR_LAST_CALL_STATUS; - - ZEPHIR_MM_GROW(); + - ZEPHIR_OBS_VAR(headers); - zephir_read_property_this(&headers, this_ptr, SL("_headers"), PH_NOISY_CC); - if (Z_TYPE_P(headers) == IS_NULL) { - ZEPHIR_INIT_NVAR(headers); - object_init_ex(headers, phalcon_http_response_headers_ce); - if (zephir_has_constructor(headers TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(NULL, headers, "__construct", NULL, 0); - zephir_check_call_status(); - } - zephir_update_property_this(this_ptr, SL("_headers"), headers TSRMLS_CC); - } - RETURN_CCTOR(headers); + RETURN_MEMBER(this_ptr, "_headers"); } @@ -65660,8 +65824,9 @@ static PHP_METHOD(Phalcon_Http_Response, setNotModified) { static PHP_METHOD(Phalcon_Http_Response, setContentType) { + zephir_fcall_cache_entry *_1 = NULL; int ZEPHIR_LAST_CALL_STATUS; - zval *contentType_param = NULL, *charset = NULL, *headers = NULL, *_0$$3, *_1$$4, *_2$$4; + zval *contentType_param = NULL, *charset = NULL, *_0$$3, *_2$$4, *_3$$4; zval *contentType = NULL; ZEPHIR_MM_GROW(); @@ -65673,21 +65838,19 @@ static PHP_METHOD(Phalcon_Http_Response, setContentType) { } - ZEPHIR_CALL_METHOD(&headers, this_ptr, "getheaders", NULL, 0); - zephir_check_call_status(); if (Z_TYPE_P(charset) == IS_NULL) { ZEPHIR_INIT_VAR(_0$$3); ZVAL_STRING(_0$$3, "Content-Type", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, headers, "set", NULL, 0, _0$$3, contentType); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setheader", &_1, 0, _0$$3, contentType); zephir_check_temp_parameter(_0$$3); zephir_check_call_status(); } else { - ZEPHIR_INIT_VAR(_1$$4); - ZEPHIR_CONCAT_VSV(_1$$4, contentType, "; charset=", charset); ZEPHIR_INIT_VAR(_2$$4); - ZVAL_STRING(_2$$4, "Content-Type", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, headers, "set", NULL, 0, _2$$4, _1$$4); - zephir_check_temp_parameter(_2$$4); + ZEPHIR_CONCAT_VSV(_2$$4, contentType, "; charset=", charset); + ZEPHIR_INIT_VAR(_3$$4); + ZVAL_STRING(_3$$4, "Content-Type", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setheader", &_1, 0, _3$$4, _2$$4); + zephir_check_temp_parameter(_3$$4); zephir_check_call_status(); } RETURN_THIS(); @@ -65697,7 +65860,7 @@ static PHP_METHOD(Phalcon_Http_Response, setContentType) { static PHP_METHOD(Phalcon_Http_Response, setEtag) { int ZEPHIR_LAST_CALL_STATUS; - zval *etag_param = NULL, *headers = NULL, *_0; + zval *etag_param = NULL, *_0; zval *etag = NULL; ZEPHIR_MM_GROW(); @@ -65706,11 +65869,9 @@ static PHP_METHOD(Phalcon_Http_Response, setEtag) { zephir_get_strval(etag, etag_param); - ZEPHIR_CALL_METHOD(&headers, this_ptr, "getheaders", NULL, 0); - zephir_check_call_status(); ZEPHIR_INIT_VAR(_0); ZVAL_STRING(_0, "Etag", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, headers, "set", NULL, 0, _0, etag); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setheader", NULL, 0, _0, etag); zephir_check_temp_parameter(_0); zephir_check_call_status(); RETURN_THIS(); @@ -65754,7 +65915,7 @@ static PHP_METHOD(Phalcon_Http_Response, redirect) { if (_0$$5) { ZEPHIR_SINIT_VAR(_1$$5); ZVAL_STRING(&_1$$5, "://", 0); - ZEPHIR_CALL_FUNCTION(&_2$$5, "strstr", NULL, 236, location, &_1$$5); + ZEPHIR_CALL_FUNCTION(&_2$$5, "strstr", NULL, 231, location, &_1$$5); zephir_check_call_status(); _0$$5 = zephir_is_true(_2$$5); } @@ -65900,17 +66061,14 @@ static PHP_METHOD(Phalcon_Http_Response, isSent) { static PHP_METHOD(Phalcon_Http_Response, sendHeaders) { - zval *headers = NULL; + zval *_0; int ZEPHIR_LAST_CALL_STATUS; ZEPHIR_MM_GROW(); - ZEPHIR_OBS_VAR(headers); - zephir_read_property_this(&headers, this_ptr, SL("_headers"), PH_NOISY_CC); - if (Z_TYPE_P(headers) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(NULL, headers, "send", NULL, 0); - zephir_check_call_status(); - } + _0 = zephir_fetch_nproperty_this(this_ptr, SL("_headers"), PH_NOISY_CC); + ZEPHIR_CALL_METHOD(NULL, _0, "send", NULL, 0); + zephir_check_call_status(); RETURN_THIS(); } @@ -65934,29 +66092,21 @@ static PHP_METHOD(Phalcon_Http_Response, sendCookies) { static PHP_METHOD(Phalcon_Http_Response, send) { - zend_bool _1$$7; - zval *headers = NULL, *cookies = NULL, *content = NULL, *file = NULL, *_0; + zend_bool _1$$5; + zval *content = NULL, *file = NULL, *_0; int ZEPHIR_LAST_CALL_STATUS; ZEPHIR_MM_GROW(); _0 = zephir_fetch_nproperty_this(this_ptr, SL("_sent"), PH_NOISY_CC); if (zephir_is_true(_0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_response_exception_ce, "Response was already sent", "phalcon/http/response.zep", 585); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_response_exception_ce, "Response was already sent", "phalcon/http/response.zep", 577); return; } - ZEPHIR_OBS_VAR(headers); - zephir_read_property_this(&headers, this_ptr, SL("_headers"), PH_NOISY_CC); - if (Z_TYPE_P(headers) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(NULL, headers, "send", NULL, 0); - zephir_check_call_status(); - } - ZEPHIR_OBS_VAR(cookies); - zephir_read_property_this(&cookies, this_ptr, SL("_cookies"), PH_NOISY_CC); - if (Z_TYPE_P(cookies) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(NULL, cookies, "send", NULL, 0); - zephir_check_call_status(); - } + ZEPHIR_CALL_METHOD(NULL, this_ptr, "sendheaders", NULL, 0); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "sendcookies", NULL, 0); + zephir_check_call_status(); ZEPHIR_OBS_VAR(content); zephir_read_property_this(&content, this_ptr, SL("_content"), PH_NOISY_CC); if (Z_TYPE_P(content) != IS_NULL) { @@ -65964,12 +66114,12 @@ static PHP_METHOD(Phalcon_Http_Response, send) { } else { ZEPHIR_OBS_VAR(file); zephir_read_property_this(&file, this_ptr, SL("_file"), PH_NOISY_CC); - _1$$7 = Z_TYPE_P(file) == IS_STRING; - if (_1$$7) { - _1$$7 = (zephir_fast_strlen_ev(file)) ? 1 : 0; + _1$$5 = Z_TYPE_P(file) == IS_STRING; + if (_1$$5) { + _1$$5 = (zephir_fast_strlen_ev(file)) ? 1 : 0; } - if (_1$$7) { - ZEPHIR_CALL_FUNCTION(NULL, "readfile", NULL, 237, file); + if (_1$$5) { + ZEPHIR_CALL_FUNCTION(NULL, "readfile", NULL, 232, file); zephir_check_call_status(); } } @@ -65984,8 +66134,9 @@ static PHP_METHOD(Phalcon_Http_Response, send) { static PHP_METHOD(Phalcon_Http_Response, setFileToSend) { + zephir_fcall_cache_entry *_1 = NULL; int ZEPHIR_LAST_CALL_STATUS; - zval *filePath_param = NULL, *attachmentName = NULL, *attachment = NULL, *basePath = NULL, *headers = NULL, *_0$$5 = NULL, *_1$$5; + zval *filePath_param = NULL, *attachmentName = NULL, *attachment = NULL, *basePath = NULL, *_0$$5 = NULL, *_2$$5; zval *filePath = NULL; ZEPHIR_MM_GROW(); @@ -66007,25 +66158,23 @@ static PHP_METHOD(Phalcon_Http_Response, setFileToSend) { ZEPHIR_CPY_WRT(basePath, attachmentName); } if (zephir_is_true(attachment)) { - ZEPHIR_CALL_METHOD(&headers, this_ptr, "getheaders", NULL, 0); - zephir_check_call_status(); ZEPHIR_INIT_VAR(_0$$5); ZVAL_STRING(_0$$5, "Content-Description: File Transfer", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, headers, "setraw", NULL, 0, _0$$5); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setrawheader", &_1, 0, _0$$5); zephir_check_temp_parameter(_0$$5); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_0$$5); ZVAL_STRING(_0$$5, "Content-Type: application/octet-stream", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, headers, "setraw", NULL, 0, _0$$5); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setrawheader", &_1, 0, _0$$5); zephir_check_temp_parameter(_0$$5); zephir_check_call_status(); - ZEPHIR_INIT_VAR(_1$$5); - ZEPHIR_CONCAT_SV(_1$$5, "Content-Disposition: attachment; filename=", basePath); - ZEPHIR_CALL_METHOD(NULL, headers, "setraw", NULL, 0, _1$$5); + ZEPHIR_INIT_VAR(_2$$5); + ZEPHIR_CONCAT_SV(_2$$5, "Content-Disposition: attachment; filename=", basePath); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setrawheader", &_1, 0, _2$$5); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_0$$5); ZVAL_STRING(_0$$5, "Content-Transfer-Encoding: binary", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, headers, "setraw", NULL, 0, _0$$5); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setrawheader", &_1, 0, _0$$5); zephir_check_temp_parameter(_0$$5); zephir_check_call_status(); } @@ -66215,7 +66364,7 @@ static PHP_METHOD(Phalcon_Http_Request_File, __construct) { zephir_update_property_this(this_ptr, SL("_name"), name TSRMLS_CC); ZEPHIR_SINIT_VAR(_0$$3); ZVAL_STRING(&_0$$3, "PATHINFO_EXTENSION", 0); - ZEPHIR_CALL_FUNCTION(&_1$$3, "defined", NULL, 230, &_0$$3); + ZEPHIR_CALL_FUNCTION(&_1$$3, "defined", NULL, 225, &_0$$3); zephir_check_call_status(); if (zephir_is_true(_1$$3)) { ZEPHIR_SINIT_VAR(_2$$4); @@ -66285,15 +66434,15 @@ static PHP_METHOD(Phalcon_Http_Request_File, getRealType) { ZEPHIR_SINIT_VAR(_0); ZVAL_LONG(&_0, 16); - ZEPHIR_CALL_FUNCTION(&finfo, "finfo_open", NULL, 231, &_0); + ZEPHIR_CALL_FUNCTION(&finfo, "finfo_open", NULL, 226, &_0); zephir_check_call_status(); if (Z_TYPE_P(finfo) != IS_RESOURCE) { RETURN_MM_STRING("", 1); } _1 = zephir_fetch_nproperty_this(this_ptr, SL("_tmp"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 232, finfo, _1); + ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 227, finfo, _1); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 233, finfo); + ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 228, finfo); zephir_check_call_status(); RETURN_CCTOR(mime); @@ -66311,7 +66460,7 @@ static PHP_METHOD(Phalcon_Http_Request_File, isUploadedFile) { zephir_check_call_status(); _0 = Z_TYPE_P(tmp) == IS_STRING; if (_0) { - ZEPHIR_CALL_FUNCTION(&_1, "is_uploaded_file", NULL, 234, tmp); + ZEPHIR_CALL_FUNCTION(&_1, "is_uploaded_file", NULL, 229, tmp); zephir_check_call_status(); _0 = zephir_is_true(_1); } @@ -66341,7 +66490,7 @@ static PHP_METHOD(Phalcon_Http_Request_File, moveTo) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_tmp"), PH_NOISY_CC); - ZEPHIR_RETURN_CALL_FUNCTION("move_uploaded_file", NULL, 235, _0, destination); + ZEPHIR_RETURN_CALL_FUNCTION("move_uploaded_file", NULL, 230, _0, destination); zephir_check_call_status(); RETURN_MM(); @@ -66948,10 +67097,10 @@ static PHP_METHOD(Phalcon_Http_Response_Headers, send) { if (!(ZEPHIR_IS_EMPTY(value))) { ZEPHIR_INIT_LNVAR(_5$$5); ZEPHIR_CONCAT_VSV(_5$$5, header, ": ", value); - ZEPHIR_CALL_FUNCTION(NULL, "header", &_6, 238, _5$$5, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_6, 233, _5$$5, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); } else { - ZEPHIR_CALL_FUNCTION(NULL, "header", &_6, 238, header, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_6, 233, header, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); } } @@ -67012,7 +67161,7 @@ static PHP_METHOD(Phalcon_Http_Response_Headers, __set_state) { ) { ZEPHIR_GET_HMKEY(key, _1$$3, _0$$3); ZEPHIR_GET_HVALUE(value, _2$$3); - ZEPHIR_CALL_METHOD(NULL, headers, "set", &_3, 239, key, value); + ZEPHIR_CALL_METHOD(NULL, headers, "set", &_3, 234, key, value); zephir_check_call_status(); } } @@ -67020,7 +67169,7 @@ static PHP_METHOD(Phalcon_Http_Response_Headers, __set_state) { } -static zend_object_value zephir_init_properties_Phalcon_Http_Response_Headers(zend_class_entry *class_type TSRMLS_DC) { +zend_object_value zephir_init_properties_Phalcon_Http_Response_Headers(zend_class_entry *class_type TSRMLS_DC) { zval *_0, *_1$$3; @@ -68072,13 +68221,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, check) { ZVAL_NULL(version); ZEPHIR_SINIT_VAR(_1); ZVAL_STRING(&_1, "GD_VERSION", 0); - ZEPHIR_CALL_FUNCTION(&_2, "defined", NULL, 230, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "defined", NULL, 225, &_1); zephir_check_call_status(); if (zephir_is_true(_2)) { ZEPHIR_INIT_NVAR(version); ZEPHIR_GET_CONSTANT(version, "GD_VERSION"); } else { - ZEPHIR_CALL_FUNCTION(&info, "gd_info", NULL, 240); + ZEPHIR_CALL_FUNCTION(&info, "gd_info", NULL, 235); zephir_check_call_status(); ZEPHIR_INIT_VAR(matches); ZVAL_NULL(matches); @@ -68096,7 +68245,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, check) { ZVAL_STRING(&_1, "2.0.1", 0); ZEPHIR_SINIT_VAR(_6); ZVAL_STRING(&_6, ">=", 0); - ZEPHIR_CALL_FUNCTION(&_7, "version_compare", NULL, 241, version, &_1, &_6); + ZEPHIR_CALL_FUNCTION(&_7, "version_compare", NULL, 236, version, &_1, &_6); zephir_check_call_status(); if (!(zephir_is_true(_7))) { ZEPHIR_INIT_VAR(_8$$8); @@ -68161,7 +68310,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) { zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_realpath"), _3$$4 TSRMLS_CC); _4$$4 = zephir_fetch_nproperty_this(this_ptr, SL("_file"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&imageinfo, "getimagesize", NULL, 242, _4$$4); + ZEPHIR_CALL_FUNCTION(&imageinfo, "getimagesize", NULL, 237, _4$$4); zephir_check_call_status(); if (zephir_is_true(imageinfo)) { zephir_array_fetch_long(&_5$$5, imageinfo, 0, PH_NOISY | PH_READONLY, "phalcon/image/adapter/gd.zep", 77 TSRMLS_CC); @@ -68177,35 +68326,35 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) { do { if (ZEPHIR_IS_LONG(_9$$4, 1)) { _10$$6 = zephir_fetch_nproperty_this(this_ptr, SL("_file"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_11$$6, "imagecreatefromgif", NULL, 243, _10$$6); + ZEPHIR_CALL_FUNCTION(&_11$$6, "imagecreatefromgif", NULL, 238, _10$$6); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), _11$$6 TSRMLS_CC); break; } if (ZEPHIR_IS_LONG(_9$$4, 2)) { _12$$7 = zephir_fetch_nproperty_this(this_ptr, SL("_file"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_13$$7, "imagecreatefromjpeg", NULL, 244, _12$$7); + ZEPHIR_CALL_FUNCTION(&_13$$7, "imagecreatefromjpeg", NULL, 239, _12$$7); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), _13$$7 TSRMLS_CC); break; } if (ZEPHIR_IS_LONG(_9$$4, 3)) { _14$$8 = zephir_fetch_nproperty_this(this_ptr, SL("_file"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_15$$8, "imagecreatefrompng", NULL, 245, _14$$8); + ZEPHIR_CALL_FUNCTION(&_15$$8, "imagecreatefrompng", NULL, 240, _14$$8); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), _15$$8 TSRMLS_CC); break; } if (ZEPHIR_IS_LONG(_9$$4, 15)) { _16$$9 = zephir_fetch_nproperty_this(this_ptr, SL("_file"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_17$$9, "imagecreatefromwbmp", NULL, 246, _16$$9); + ZEPHIR_CALL_FUNCTION(&_17$$9, "imagecreatefromwbmp", NULL, 241, _16$$9); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), _17$$9 TSRMLS_CC); break; } if (ZEPHIR_IS_LONG(_9$$4, 16)) { _18$$10 = zephir_fetch_nproperty_this(this_ptr, SL("_file"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_19$$10, "imagecreatefromxbm", NULL, 247, _18$$10); + ZEPHIR_CALL_FUNCTION(&_19$$10, "imagecreatefromxbm", NULL, 242, _18$$10); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), _19$$10 TSRMLS_CC); break; @@ -68230,7 +68379,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) { } while(0); _24$$4 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", &_25, 248, _24$$4, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", &_25, 243, _24$$4, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); } else { _26$$14 = !width; @@ -68253,14 +68402,14 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) { ZVAL_LONG(&_30$$14, width); ZEPHIR_SINIT_VAR(_31$$14); ZVAL_LONG(&_31$$14, height); - ZEPHIR_CALL_FUNCTION(&_32$$14, "imagecreatetruecolor", NULL, 249, &_30$$14, &_31$$14); + ZEPHIR_CALL_FUNCTION(&_32$$14, "imagecreatetruecolor", NULL, 244, &_30$$14, &_31$$14); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), _32$$14 TSRMLS_CC); _33$$14 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 250, _33$$14, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 245, _33$$14, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); _34$$14 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", &_25, 248, _34$$14, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", &_25, 243, _34$$14, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); _35$$14 = zephir_fetch_nproperty_this(this_ptr, SL("_file"), PH_NOISY_CC); zephir_update_property_this(this_ptr, SL("_realpath"), _35$$14 TSRMLS_CC); @@ -68299,7 +68448,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _resize) { ZEPHIR_GET_CONSTANT(_0, "PHP_VERSION"); ZEPHIR_SINIT_VAR(_1); ZVAL_STRING(&_1, "5.5.0", 0); - ZEPHIR_CALL_FUNCTION(&_2, "version_compare", NULL, 241, _0, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "version_compare", NULL, 236, _0, &_1); zephir_check_call_status(); if (ZEPHIR_LT_LONG(_2, 0)) { ZEPHIR_OBS_VAR(pre_width); @@ -68347,11 +68496,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _resize) { ZVAL_LONG(&_15$$4, 0); ZEPHIR_SINIT_VAR(_16$$4); ZVAL_LONG(&_16$$4, 0); - ZEPHIR_CALL_FUNCTION(&_17$$4, "imagecopyresized", NULL, 251, image, _10$$4, &_13$$4, &_14$$4, &_15$$4, &_16$$4, pre_width, pre_height, _11$$4, _12$$4); + ZEPHIR_CALL_FUNCTION(&_17$$4, "imagecopyresized", NULL, 246, image, _10$$4, &_13$$4, &_14$$4, &_15$$4, &_16$$4, pre_width, pre_height, _11$$4, _12$$4); zephir_check_call_status(); if (zephir_is_true(_17$$4)) { _18$$6 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_19, 252, _18$$6); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_19, 247, _18$$6); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), image TSRMLS_CC); } @@ -68375,17 +68524,17 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _resize) { ZVAL_LONG(&_27$$3, width); ZEPHIR_SINIT_VAR(_28$$3); ZVAL_LONG(&_28$$3, height); - ZEPHIR_CALL_FUNCTION(&_29$$3, "imagecopyresampled", NULL, 253, image, _22$$3, &_23$$3, &_24$$3, &_25$$3, &_26$$3, &_27$$3, &_28$$3, pre_width, pre_height); + ZEPHIR_CALL_FUNCTION(&_29$$3, "imagecopyresampled", NULL, 248, image, _22$$3, &_23$$3, &_24$$3, &_25$$3, &_26$$3, &_27$$3, &_28$$3, pre_width, pre_height); zephir_check_call_status(); if (zephir_is_true(_29$$3)) { _30$$7 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_19, 252, _30$$7); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_19, 247, _30$$7); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), image TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_31$$7, "imagesx", &_32, 254, image); + ZEPHIR_CALL_FUNCTION(&_31$$7, "imagesx", &_32, 249, image); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_width"), _31$$7 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_33$$7, "imagesy", &_34, 255, image); + ZEPHIR_CALL_FUNCTION(&_33$$7, "imagesy", &_34, 250, image); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_height"), _33$$7 TSRMLS_CC); } @@ -68395,16 +68544,16 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _resize) { ZVAL_LONG(&_36$$8, width); ZEPHIR_SINIT_VAR(_37$$8); ZVAL_LONG(&_37$$8, height); - ZEPHIR_CALL_FUNCTION(&image, "imagescale", NULL, 256, _35$$8, &_36$$8, &_37$$8); + ZEPHIR_CALL_FUNCTION(&image, "imagescale", NULL, 251, _35$$8, &_36$$8, &_37$$8); zephir_check_call_status(); _38$$8 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_19, 252, _38$$8); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_19, 247, _38$$8); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), image TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_39$$8, "imagesx", &_32, 254, image); + ZEPHIR_CALL_FUNCTION(&_39$$8, "imagesx", &_32, 249, image); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_width"), _39$$8 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_40$$8, "imagesy", &_34, 255, image); + ZEPHIR_CALL_FUNCTION(&_40$$8, "imagesy", &_34, 250, image); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_height"), _40$$8 TSRMLS_CC); } @@ -68431,7 +68580,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _crop) { ZEPHIR_GET_CONSTANT(_0, "PHP_VERSION"); ZEPHIR_SINIT_VAR(_1); ZVAL_STRING(&_1, "5.5.0", 0); - ZEPHIR_CALL_FUNCTION(&_2, "version_compare", NULL, 241, _0, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "version_compare", NULL, 236, _0, &_1); zephir_check_call_status(); if (ZEPHIR_LT_LONG(_2, 0)) { ZEPHIR_INIT_VAR(_3$$3); @@ -68457,17 +68606,17 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _crop) { ZVAL_LONG(&_12$$3, width); ZEPHIR_SINIT_VAR(_13$$3); ZVAL_LONG(&_13$$3, height); - ZEPHIR_CALL_FUNCTION(&_14$$3, "imagecopyresampled", NULL, 253, image, _5$$3, &_6$$3, &_7$$3, &_8$$3, &_9$$3, &_10$$3, &_11$$3, &_12$$3, &_13$$3); + ZEPHIR_CALL_FUNCTION(&_14$$3, "imagecopyresampled", NULL, 248, image, _5$$3, &_6$$3, &_7$$3, &_8$$3, &_9$$3, &_10$$3, &_11$$3, &_12$$3, &_13$$3); zephir_check_call_status(); if (zephir_is_true(_14$$3)) { _15$$4 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_16, 252, _15$$4); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_16, 247, _15$$4); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), image TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_17$$4, "imagesx", &_18, 254, image); + ZEPHIR_CALL_FUNCTION(&_17$$4, "imagesx", &_18, 249, image); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_width"), _17$$4 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_19$$4, "imagesy", &_20, 255, image); + ZEPHIR_CALL_FUNCTION(&_19$$4, "imagesy", &_20, 250, image); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_height"), _19$$4 TSRMLS_CC); } @@ -68487,16 +68636,16 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _crop) { ZVAL_LONG(_21$$5, height); zephir_array_update_string(&rect, SL("height"), &_21$$5, PH_COPY | PH_SEPARATE); _22$$5 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&image, "imagecrop", NULL, 257, _22$$5, rect); + ZEPHIR_CALL_FUNCTION(&image, "imagecrop", NULL, 252, _22$$5, rect); zephir_check_call_status(); _23$$5 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_16, 252, _23$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_16, 247, _23$$5); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), image TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_24$$5, "imagesx", &_18, 254, image); + ZEPHIR_CALL_FUNCTION(&_24$$5, "imagesx", &_18, 249, image); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_width"), _24$$5 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_25$$5, "imagesy", &_20, 255, image); + ZEPHIR_CALL_FUNCTION(&_25$$5, "imagesy", &_20, 250, image); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_height"), _25$$5 TSRMLS_CC); } @@ -68524,20 +68673,20 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _rotate) { ZVAL_LONG(&_3, 0); ZEPHIR_SINIT_VAR(_4); ZVAL_LONG(&_4, 127); - ZEPHIR_CALL_FUNCTION(&transparent, "imagecolorallocatealpha", NULL, 258, _0, &_1, &_2, &_3, &_4); + ZEPHIR_CALL_FUNCTION(&transparent, "imagecolorallocatealpha", NULL, 253, _0, &_1, &_2, &_3, &_4); zephir_check_call_status(); _5 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_NVAR(_1); ZVAL_LONG(&_1, (360 - degrees)); ZEPHIR_SINIT_NVAR(_2); ZVAL_LONG(&_2, 1); - ZEPHIR_CALL_FUNCTION(&image, "imagerotate", NULL, 259, _5, &_1, transparent, &_2); + ZEPHIR_CALL_FUNCTION(&image, "imagerotate", NULL, 254, _5, &_1, transparent, &_2); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 248, image, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 243, image, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&width, "imagesx", NULL, 254, image); + ZEPHIR_CALL_FUNCTION(&width, "imagesx", NULL, 249, image); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&height, "imagesy", NULL, 255, image); + ZEPHIR_CALL_FUNCTION(&height, "imagesy", NULL, 250, image); zephir_check_call_status(); _6 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_NVAR(_1); @@ -68550,11 +68699,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _rotate) { ZVAL_LONG(&_4, 0); ZEPHIR_SINIT_VAR(_7); ZVAL_LONG(&_7, 100); - ZEPHIR_CALL_FUNCTION(&_8, "imagecopymerge", NULL, 260, _6, image, &_1, &_2, &_3, &_4, width, height, &_7); + ZEPHIR_CALL_FUNCTION(&_8, "imagecopymerge", NULL, 255, _6, image, &_1, &_2, &_3, &_4, width, height, &_7); zephir_check_call_status(); if (zephir_is_true(_8)) { _9$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 252, _9$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 247, _9$$3); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), image TSRMLS_CC); zephir_update_property_this(this_ptr, SL("_width"), width TSRMLS_CC); @@ -68580,7 +68729,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _flip) { ZEPHIR_GET_CONSTANT(_0, "PHP_VERSION"); ZEPHIR_SINIT_VAR(_1); ZVAL_STRING(&_1, "5.5.0", 0); - ZEPHIR_CALL_FUNCTION(&_2, "version_compare", NULL, 241, _0, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "version_compare", NULL, 236, _0, &_1); zephir_check_call_status(); if (ZEPHIR_LT_LONG(_2, 0)) { _3$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_width"), PH_NOISY_CC); @@ -68608,7 +68757,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _flip) { ZVAL_LONG(&_12$$5, 0); ZEPHIR_SINIT_NVAR(_13$$5); ZVAL_LONG(&_13$$5, 1); - ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", &_14, 261, image, _6$$5, &_9$$5, &_10$$5, &_11$$5, &_12$$5, &_13$$5, _8$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", &_14, 256, image, _6$$5, &_9$$5, &_10$$5, &_11$$5, &_12$$5, &_13$$5, _8$$5); zephir_check_call_status(); } } else { @@ -68632,18 +68781,18 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _flip) { ZVAL_LONG(&_22$$7, ((zephir_get_numberval(_17$$7) - x) - 1)); ZEPHIR_SINIT_NVAR(_23$$7); ZVAL_LONG(&_23$$7, 1); - ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", &_14, 261, image, _16$$7, &_19$$7, &_20$$7, &_21$$7, &_22$$7, _18$$7, &_23$$7); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", &_14, 256, image, _16$$7, &_19$$7, &_20$$7, &_21$$7, &_22$$7, _18$$7, &_23$$7); zephir_check_call_status(); } } _24$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 252, _24$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 247, _24$$3); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), image TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_25$$3, "imagesx", NULL, 254, image); + ZEPHIR_CALL_FUNCTION(&_25$$3, "imagesx", NULL, 249, image); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_width"), _25$$3 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_26$$3, "imagesy", NULL, 255, image); + ZEPHIR_CALL_FUNCTION(&_26$$3, "imagesy", NULL, 250, image); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_height"), _26$$3 TSRMLS_CC); } else { @@ -68651,13 +68800,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _flip) { _27$$9 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_VAR(_28$$9); ZVAL_LONG(&_28$$9, 1); - ZEPHIR_CALL_FUNCTION(NULL, "imageflip", &_29, 262, _27$$9, &_28$$9); + ZEPHIR_CALL_FUNCTION(NULL, "imageflip", &_29, 257, _27$$9, &_28$$9); zephir_check_call_status(); } else { _30$$10 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_VAR(_31$$10); ZVAL_LONG(&_31$$10, 2); - ZEPHIR_CALL_FUNCTION(NULL, "imageflip", &_29, 262, _30$$10, &_31$$10); + ZEPHIR_CALL_FUNCTION(NULL, "imageflip", &_29, 257, _30$$10, &_31$$10); zephir_check_call_status(); } } @@ -68680,7 +68829,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _sharpen) { ZEPHIR_INIT_VAR(_0); ZEPHIR_SINIT_VAR(_1); ZVAL_LONG(&_1, (-18 + ((amount * 0.08)))); - ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 194, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 189, &_1); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_1); ZVAL_LONG(&_1, 2); @@ -68729,15 +68878,15 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _sharpen) { ZVAL_LONG(&_6, (amount - 8)); ZEPHIR_SINIT_VAR(_7); ZVAL_LONG(&_7, 0); - ZEPHIR_CALL_FUNCTION(&_8, "imageconvolution", NULL, 263, _5, matrix, &_6, &_7); + ZEPHIR_CALL_FUNCTION(&_8, "imageconvolution", NULL, 258, _5, matrix, &_6, &_7); zephir_check_call_status(); if (zephir_is_true(_8)) { _9$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_10$$3, "imagesx", NULL, 254, _9$$3); + ZEPHIR_CALL_FUNCTION(&_10$$3, "imagesx", NULL, 249, _9$$3); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_width"), _10$$3 TSRMLS_CC); _11$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_12$$3, "imagesy", NULL, 255, _11$$3); + ZEPHIR_CALL_FUNCTION(&_12$$3, "imagesy", NULL, 250, _11$$3); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_height"), _12$$3 TSRMLS_CC); } @@ -68763,7 +68912,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _reflection) { ZEPHIR_INIT_VAR(_0); ZEPHIR_SINIT_VAR(_1); ZVAL_DOUBLE(&_1, ((zephir_safe_div_long_long((opacity * 127), 100 TSRMLS_CC)) - (double) (127))); - ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 194, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 189, &_1); zephir_check_call_status(); zephir_round(_0, _2, NULL, NULL TSRMLS_CC); opacity = zephir_get_intval(_0); @@ -68789,7 +68938,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _reflection) { ZVAL_LONG(&_11, 0); ZEPHIR_SINIT_VAR(_12); ZVAL_LONG(&_12, 0); - ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", &_13, 261, reflection, _7, &_1, &_10, &_11, &_12, _8, _9); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", &_13, 256, reflection, _7, &_1, &_10, &_11, &_12, _8, _9); zephir_check_call_status(); offset = 0; while (1) { @@ -68830,7 +68979,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _reflection) { ZVAL_LONG(&_27$$5, src_y); ZEPHIR_SINIT_NVAR(_28$$5); ZVAL_LONG(&_28$$5, 1); - ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", &_13, 261, line, _22$$5, &_24$$5, &_25$$5, &_26$$5, &_27$$5, _23$$5, &_28$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", &_13, 256, line, _22$$5, &_24$$5, &_25$$5, &_26$$5, &_27$$5, _23$$5, &_28$$5); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_24$$5); ZVAL_LONG(&_24$$5, 4); @@ -68842,7 +68991,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _reflection) { ZVAL_LONG(&_27$$5, 0); ZEPHIR_SINIT_NVAR(_28$$5); ZVAL_LONG(&_28$$5, dst_opacity); - ZEPHIR_CALL_FUNCTION(NULL, "imagefilter", &_29, 264, line, &_24$$5, &_25$$5, &_26$$5, &_27$$5, &_28$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagefilter", &_29, 259, line, &_24$$5, &_25$$5, &_26$$5, &_27$$5, &_28$$5); zephir_check_call_status(); _30$$5 = zephir_fetch_nproperty_this(this_ptr, SL("_width"), PH_NOISY_CC); ZEPHIR_SINIT_NVAR(_24$$5); @@ -68855,18 +69004,18 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _reflection) { ZVAL_LONG(&_27$$5, 0); ZEPHIR_SINIT_NVAR(_28$$5); ZVAL_LONG(&_28$$5, 1); - ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", &_13, 261, reflection, line, &_24$$5, &_25$$5, &_26$$5, &_27$$5, _30$$5, &_28$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", &_13, 256, reflection, line, &_24$$5, &_25$$5, &_26$$5, &_27$$5, _30$$5, &_28$$5); zephir_check_call_status(); offset++; } _31 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 252, _31); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 247, _31); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), reflection TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_32, "imagesx", NULL, 254, reflection); + ZEPHIR_CALL_FUNCTION(&_32, "imagesx", NULL, 249, reflection); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_width"), _32 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_33, "imagesy", NULL, 255, reflection); + ZEPHIR_CALL_FUNCTION(&_33, "imagesy", NULL, 250, reflection); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_height"), _33 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -68888,21 +69037,21 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _watermark) { ZEPHIR_CALL_METHOD(&_0, watermark, "render", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&overlay, "imagecreatefromstring", NULL, 265, _0); + ZEPHIR_CALL_FUNCTION(&overlay, "imagecreatefromstring", NULL, 260, _0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 248, overlay, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 243, overlay, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "imagesx", NULL, 254, overlay); + ZEPHIR_CALL_FUNCTION(&_1, "imagesx", NULL, 249, overlay); zephir_check_call_status(); width = zephir_get_intval(_1); - ZEPHIR_CALL_FUNCTION(&_2, "imagesy", NULL, 255, overlay); + ZEPHIR_CALL_FUNCTION(&_2, "imagesy", NULL, 250, overlay); zephir_check_call_status(); height = zephir_get_intval(_2); if (opacity < 100) { ZEPHIR_INIT_VAR(_3$$3); ZEPHIR_SINIT_VAR(_4$$3); ZVAL_DOUBLE(&_4$$3, ((zephir_safe_div_long_long((opacity * 127), 100 TSRMLS_CC)) - (double) (127))); - ZEPHIR_CALL_FUNCTION(&_5$$3, "abs", NULL, 194, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "abs", NULL, 189, &_4$$3); zephir_check_call_status(); zephir_round(_3$$3, _5$$3, NULL, NULL TSRMLS_CC); opacity = zephir_get_intval(_3$$3); @@ -68914,11 +69063,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _watermark) { ZVAL_LONG(&_7$$3, 127); ZEPHIR_SINIT_VAR(_8$$3); ZVAL_LONG(&_8$$3, opacity); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 258, overlay, &_4$$3, &_6$$3, &_7$$3, &_8$$3); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 253, overlay, &_4$$3, &_6$$3, &_7$$3, &_8$$3); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_4$$3); ZVAL_LONG(&_4$$3, 3); - ZEPHIR_CALL_FUNCTION(NULL, "imagelayereffect", NULL, 266, overlay, &_4$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagelayereffect", NULL, 261, overlay, &_4$$3); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_4$$3); ZVAL_LONG(&_4$$3, 0); @@ -68928,11 +69077,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _watermark) { ZVAL_LONG(&_7$$3, width); ZEPHIR_SINIT_NVAR(_8$$3); ZVAL_LONG(&_8$$3, height); - ZEPHIR_CALL_FUNCTION(NULL, "imagefilledrectangle", NULL, 267, overlay, &_4$$3, &_6$$3, &_7$$3, &_8$$3, color); + ZEPHIR_CALL_FUNCTION(NULL, "imagefilledrectangle", NULL, 262, overlay, &_4$$3, &_6$$3, &_7$$3, &_8$$3, color); zephir_check_call_status(); } _9 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 250, _9, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 245, _9, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); _10 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_VAR(_11); @@ -68947,10 +69096,10 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _watermark) { ZVAL_LONG(&_15, width); ZEPHIR_SINIT_VAR(_16); ZVAL_LONG(&_16, height); - ZEPHIR_CALL_FUNCTION(&_17, "imagecopy", NULL, 261, _10, overlay, &_11, &_12, &_13, &_14, &_15, &_16); + ZEPHIR_CALL_FUNCTION(&_17, "imagecopy", NULL, 256, _10, overlay, &_11, &_12, &_13, &_14, &_15, &_16); zephir_check_call_status(); if (zephir_is_true(_17)) { - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 252, overlay); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 247, overlay); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -68986,7 +69135,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _text) { ZEPHIR_INIT_VAR(_0); ZEPHIR_SINIT_VAR(_1); ZVAL_DOUBLE(&_1, ((zephir_safe_div_long_long((opacity * 127), 100 TSRMLS_CC)) - (double) (127))); - ZEPHIR_CALL_FUNCTION(&_2, "abs", &_3, 194, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", &_3, 189, &_1); zephir_check_call_status(); zephir_round(_0, _2, NULL, NULL TSRMLS_CC); opacity = zephir_get_intval(_0); @@ -68995,7 +69144,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _text) { ZVAL_LONG(&_4$$3, size); ZEPHIR_SINIT_VAR(_5$$3); ZVAL_LONG(&_5$$3, 0); - ZEPHIR_CALL_FUNCTION(&space, "imagettfbbox", NULL, 268, &_4$$3, &_5$$3, fontfile, text); + ZEPHIR_CALL_FUNCTION(&space, "imagettfbbox", NULL, 263, &_4$$3, &_5$$3, fontfile, text); zephir_check_call_status(); if (zephir_array_isset_long(space, 0)) { ZEPHIR_OBS_VAR(_6$$4); @@ -69029,12 +69178,12 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _text) { } ZEPHIR_SINIT_NVAR(_4$$3); ZVAL_LONG(&_4$$3, (s4 - s0)); - ZEPHIR_CALL_FUNCTION(&_13$$3, "abs", &_3, 194, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_13$$3, "abs", &_3, 189, &_4$$3); zephir_check_call_status(); width = (zephir_get_numberval(_13$$3) + 10); ZEPHIR_SINIT_NVAR(_4$$3); ZVAL_LONG(&_4$$3, (s5 - s1)); - ZEPHIR_CALL_FUNCTION(&_14$$3, "abs", &_3, 194, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_14$$3, "abs", &_3, 189, &_4$$3); zephir_check_call_status(); height = (zephir_get_numberval(_14$$3) + 10); if (offsetX < 0) { @@ -69054,7 +69203,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _text) { ZVAL_LONG(&_18$$3, b); ZEPHIR_SINIT_VAR(_19$$3); ZVAL_LONG(&_19$$3, opacity); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", &_20, 258, _17$$3, &_4$$3, &_5$$3, &_18$$3, &_19$$3); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", &_20, 253, _17$$3, &_4$$3, &_5$$3, &_18$$3, &_19$$3); zephir_check_call_status(); angle = 0; _21$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); @@ -69066,17 +69215,17 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _text) { ZVAL_LONG(&_18$$3, offsetX); ZEPHIR_SINIT_NVAR(_19$$3); ZVAL_LONG(&_19$$3, offsetY); - ZEPHIR_CALL_FUNCTION(NULL, "imagettftext", NULL, 269, _21$$3, &_4$$3, &_5$$3, &_18$$3, &_19$$3, color, fontfile, text); + ZEPHIR_CALL_FUNCTION(NULL, "imagettftext", NULL, 264, _21$$3, &_4$$3, &_5$$3, &_18$$3, &_19$$3, color, fontfile, text); zephir_check_call_status(); } else { ZEPHIR_SINIT_VAR(_22$$8); ZVAL_LONG(&_22$$8, size); - ZEPHIR_CALL_FUNCTION(&_23$$8, "imagefontwidth", NULL, 270, &_22$$8); + ZEPHIR_CALL_FUNCTION(&_23$$8, "imagefontwidth", NULL, 265, &_22$$8); zephir_check_call_status(); width = (zephir_get_intval(_23$$8) * zephir_fast_strlen_ev(text)); ZEPHIR_SINIT_NVAR(_22$$8); ZVAL_LONG(&_22$$8, size); - ZEPHIR_CALL_FUNCTION(&_24$$8, "imagefontheight", NULL, 271, &_22$$8); + ZEPHIR_CALL_FUNCTION(&_24$$8, "imagefontheight", NULL, 266, &_22$$8); zephir_check_call_status(); height = zephir_get_intval(_24$$8); if (offsetX < 0) { @@ -69096,7 +69245,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _text) { ZVAL_LONG(&_29$$8, b); ZEPHIR_SINIT_VAR(_30$$8); ZVAL_LONG(&_30$$8, opacity); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", &_20, 258, _27$$8, &_22$$8, &_28$$8, &_29$$8, &_30$$8); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", &_20, 253, _27$$8, &_22$$8, &_28$$8, &_29$$8, &_30$$8); zephir_check_call_status(); _31$$8 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_NVAR(_22$$8); @@ -69105,7 +69254,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _text) { ZVAL_LONG(&_28$$8, offsetX); ZEPHIR_SINIT_NVAR(_29$$8); ZVAL_LONG(&_29$$8, offsetY); - ZEPHIR_CALL_FUNCTION(NULL, "imagestring", NULL, 272, _31$$8, &_22$$8, &_28$$8, &_29$$8, text, color); + ZEPHIR_CALL_FUNCTION(NULL, "imagestring", NULL, 267, _31$$8, &_22$$8, &_28$$8, &_29$$8, text, color); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -69126,22 +69275,22 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _mask) { ZEPHIR_CALL_METHOD(&_0, mask, "render", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&maskImage, "imagecreatefromstring", NULL, 265, _0); + ZEPHIR_CALL_FUNCTION(&maskImage, "imagecreatefromstring", NULL, 260, _0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "imagesx", NULL, 254, maskImage); + ZEPHIR_CALL_FUNCTION(&_1, "imagesx", NULL, 249, maskImage); zephir_check_call_status(); mask_width = zephir_get_intval(_1); - ZEPHIR_CALL_FUNCTION(&_2, "imagesy", NULL, 255, maskImage); + ZEPHIR_CALL_FUNCTION(&_2, "imagesy", NULL, 250, maskImage); zephir_check_call_status(); mask_height = zephir_get_intval(_2); alpha = 127; - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", &_3, 248, maskImage, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", &_3, 243, maskImage, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); _4 = zephir_fetch_nproperty_this(this_ptr, SL("_width"), PH_NOISY_CC); _5 = zephir_fetch_nproperty_this(this_ptr, SL("_height"), PH_NOISY_CC); ZEPHIR_CALL_METHOD(&newimage, this_ptr, "_create", NULL, 0, _4, _5); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", &_3, 248, newimage, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", &_3, 243, newimage, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); ZEPHIR_SINIT_VAR(_6); ZVAL_LONG(&_6, 0); @@ -69151,13 +69300,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _mask) { ZVAL_LONG(&_8, 0); ZEPHIR_SINIT_VAR(_9); ZVAL_LONG(&_9, alpha); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", &_10, 258, newimage, &_6, &_7, &_8, &_9); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", &_10, 253, newimage, &_6, &_7, &_8, &_9); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_6); ZVAL_LONG(&_6, 0); ZEPHIR_SINIT_NVAR(_7); ZVAL_LONG(&_7, 0); - ZEPHIR_CALL_FUNCTION(NULL, "imagefill", NULL, 273, newimage, &_6, &_7, color); + ZEPHIR_CALL_FUNCTION(NULL, "imagefill", NULL, 268, newimage, &_6, &_7, color); zephir_check_call_status(); _11 = zephir_fetch_nproperty_this(this_ptr, SL("_width"), PH_NOISY_CC); _12 = !ZEPHIR_IS_LONG(_11, mask_width); @@ -69168,7 +69317,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _mask) { if (_12) { _14$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_width"), PH_NOISY_CC); _15$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_height"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&tempImage, "imagecreatetruecolor", NULL, 249, _14$$3, _15$$3); + ZEPHIR_CALL_FUNCTION(&tempImage, "imagecreatetruecolor", NULL, 244, _14$$3, _15$$3); zephir_check_call_status(); _16$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_width"), PH_NOISY_CC); _17$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_height"), PH_NOISY_CC); @@ -69184,9 +69333,9 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _mask) { ZVAL_LONG(&_22$$3, mask_width); ZEPHIR_SINIT_VAR(_23$$3); ZVAL_LONG(&_23$$3, mask_height); - ZEPHIR_CALL_FUNCTION(NULL, "imagecopyresampled", NULL, 253, tempImage, maskImage, &_18$$3, &_19$$3, &_20$$3, &_21$$3, _16$$3, _17$$3, &_22$$3, &_23$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopyresampled", NULL, 248, tempImage, maskImage, &_18$$3, &_19$$3, &_20$$3, &_21$$3, _16$$3, _17$$3, &_22$$3, &_23$$3); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_24, 252, maskImage); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_24, 247, maskImage); zephir_check_call_status(); ZEPHIR_CPY_WRT(maskImage, tempImage); } @@ -69206,9 +69355,9 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _mask) { ZVAL_LONG(&_27$$5, x); ZEPHIR_SINIT_NVAR(_28$$5); ZVAL_LONG(&_28$$5, y); - ZEPHIR_CALL_FUNCTION(&index, "imagecolorat", &_29, 274, maskImage, &_27$$5, &_28$$5); + ZEPHIR_CALL_FUNCTION(&index, "imagecolorat", &_29, 269, maskImage, &_27$$5, &_28$$5); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorsforindex", &_30, 275, maskImage, index); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorsforindex", &_30, 270, maskImage, index); zephir_check_call_status(); if (zephir_array_isset_string(color, SS("red"))) { zephir_array_fetch_string(&_31$$6, color, SL("red"), PH_NOISY | PH_READONLY, "phalcon/image/adapter/gd.zep", 431 TSRMLS_CC); @@ -69221,10 +69370,10 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _mask) { ZVAL_LONG(&_27$$5, x); ZEPHIR_SINIT_NVAR(_28$$5); ZVAL_LONG(&_28$$5, y); - ZEPHIR_CALL_FUNCTION(&index, "imagecolorat", &_29, 274, _33$$5, &_27$$5, &_28$$5); + ZEPHIR_CALL_FUNCTION(&index, "imagecolorat", &_29, 269, _33$$5, &_27$$5, &_28$$5); zephir_check_call_status(); _34$$5 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorsforindex", &_30, 275, _34$$5, index); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorsforindex", &_30, 270, _34$$5, index); zephir_check_call_status(); ZEPHIR_OBS_NVAR(r); zephir_array_fetch_string(&r, color, SL("red"), PH_NOISY, "phalcon/image/adapter/gd.zep", 436 TSRMLS_CC); @@ -69234,22 +69383,22 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _mask) { zephir_array_fetch_string(&b, color, SL("blue"), PH_NOISY, "phalcon/image/adapter/gd.zep", 436 TSRMLS_CC); ZEPHIR_SINIT_NVAR(_27$$5); ZVAL_LONG(&_27$$5, alpha); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", &_10, 258, newimage, r, g, b, &_27$$5); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", &_10, 253, newimage, r, g, b, &_27$$5); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_27$$5); ZVAL_LONG(&_27$$5, x); ZEPHIR_SINIT_NVAR(_28$$5); ZVAL_LONG(&_28$$5, y); - ZEPHIR_CALL_FUNCTION(NULL, "imagesetpixel", &_35, 276, newimage, &_27$$5, &_28$$5, color); + ZEPHIR_CALL_FUNCTION(NULL, "imagesetpixel", &_35, 271, newimage, &_27$$5, &_28$$5, color); zephir_check_call_status(); y++; } x++; } _36 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_24, 252, _36); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_24, 247, _36); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_24, 252, maskImage); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_24, 247, maskImage); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), newimage TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -69283,9 +69432,9 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _background) { ZVAL_LONG(&_4, b); ZEPHIR_SINIT_VAR(_5); ZVAL_LONG(&_5, opacity); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 258, background, &_2, &_3, &_4, &_5); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 253, background, &_2, &_3, &_4, &_5); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 250, background, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 245, background, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); _6 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); _7 = zephir_fetch_nproperty_this(this_ptr, SL("_width"), PH_NOISY_CC); @@ -69298,11 +69447,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _background) { ZVAL_LONG(&_4, 0); ZEPHIR_SINIT_NVAR(_5); ZVAL_LONG(&_5, 0); - ZEPHIR_CALL_FUNCTION(&_9, "imagecopy", NULL, 261, background, _6, &_2, &_3, &_4, &_5, _7, _8); + ZEPHIR_CALL_FUNCTION(&_9, "imagecopy", NULL, 256, background, _6, &_2, &_3, &_4, &_5, _7, _8); zephir_check_call_status(); if (zephir_is_true(_9)) { _10$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 252, _10$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 247, _10$$3); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), background TSRMLS_CC); } @@ -69330,7 +69479,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _blur) { _0$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_NVAR(_1$$3); ZVAL_LONG(&_1$$3, 7); - ZEPHIR_CALL_FUNCTION(NULL, "imagefilter", &_2, 264, _0$$3, &_1$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagefilter", &_2, 259, _0$$3, &_1$$3); zephir_check_call_status(); i++; } @@ -69369,7 +69518,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _pixelate) { ZVAL_LONG(&_3$$4, x1); ZEPHIR_SINIT_NVAR(_4$$4); ZVAL_LONG(&_4$$4, y1); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorat", &_5, 274, _2$$4, &_3$$4, &_4$$4); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorat", &_5, 269, _2$$4, &_3$$4, &_4$$4); zephir_check_call_status(); x2 = (x + amount); y2 = (y + amount); @@ -69382,7 +69531,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _pixelate) { ZVAL_LONG(&_7$$4, x2); ZEPHIR_SINIT_NVAR(_8$$4); ZVAL_LONG(&_8$$4, y2); - ZEPHIR_CALL_FUNCTION(NULL, "imagefilledrectangle", &_9, 267, _6$$4, &_3$$4, &_4$$4, &_7$$4, &_8$$4, color); + ZEPHIR_CALL_FUNCTION(NULL, "imagefilledrectangle", &_9, 262, _6$$4, &_3$$4, &_4$$4, &_7$$4, &_8$$4, color); zephir_check_call_status(); y += amount; } @@ -69413,7 +69562,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _save) { zephir_check_call_status(); if (!(zephir_is_true(ext))) { _1$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_type"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&ext, "image_type_to_extension", NULL, 277, _1$$3, ZEPHIR_GLOBAL(global_false)); + ZEPHIR_CALL_FUNCTION(&ext, "image_type_to_extension", NULL, 272, _1$$3, ZEPHIR_GLOBAL(global_false)); zephir_check_call_status(); } ZEPHIR_INIT_VAR(_2); @@ -69421,30 +69570,30 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _save) { ZEPHIR_CPY_WRT(ext, _2); ZEPHIR_SINIT_NVAR(_0); ZVAL_STRING(&_0, "gif", 0); - ZEPHIR_CALL_FUNCTION(&_3, "strcmp", &_4, 278, ext, &_0); + ZEPHIR_CALL_FUNCTION(&_3, "strcmp", &_4, 273, ext, &_0); zephir_check_call_status(); if (ZEPHIR_IS_LONG(_3, 0)) { ZEPHIR_INIT_ZVAL_NREF(_5$$4); ZVAL_LONG(_5$$4, 1); zephir_update_property_this(this_ptr, SL("_type"), _5$$4 TSRMLS_CC); _5$$4 = zephir_fetch_nproperty_this(this_ptr, SL("_type"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_6$$4, "image_type_to_mime_type", &_7, 279, _5$$4); + ZEPHIR_CALL_FUNCTION(&_6$$4, "image_type_to_mime_type", &_7, 274, _5$$4); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_mime"), _6$$4 TSRMLS_CC); _8$$4 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagegif", NULL, 280, _8$$4, file); + ZEPHIR_CALL_FUNCTION(NULL, "imagegif", NULL, 275, _8$$4, file); zephir_check_call_status(); RETURN_MM_BOOL(1); } ZEPHIR_SINIT_NVAR(_0); ZVAL_STRING(&_0, "jpg", 0); - ZEPHIR_CALL_FUNCTION(&_9, "strcmp", &_4, 278, ext, &_0); + ZEPHIR_CALL_FUNCTION(&_9, "strcmp", &_4, 273, ext, &_0); zephir_check_call_status(); _10 = ZEPHIR_IS_LONG(_9, 0); if (!(_10)) { ZEPHIR_SINIT_NVAR(_0); ZVAL_STRING(&_0, "jpeg", 0); - ZEPHIR_CALL_FUNCTION(&_11, "strcmp", &_4, 278, ext, &_0); + ZEPHIR_CALL_FUNCTION(&_11, "strcmp", &_4, 273, ext, &_0); zephir_check_call_status(); _10 = ZEPHIR_IS_LONG(_11, 0); } @@ -69453,64 +69602,64 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _save) { ZVAL_LONG(_12$$5, 2); zephir_update_property_this(this_ptr, SL("_type"), _12$$5 TSRMLS_CC); _12$$5 = zephir_fetch_nproperty_this(this_ptr, SL("_type"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_13$$5, "image_type_to_mime_type", &_7, 279, _12$$5); + ZEPHIR_CALL_FUNCTION(&_13$$5, "image_type_to_mime_type", &_7, 274, _12$$5); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_mime"), _13$$5 TSRMLS_CC); _14$$5 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_VAR(_15$$5); ZVAL_LONG(&_15$$5, quality); - ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 281, _14$$5, file, &_15$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 276, _14$$5, file, &_15$$5); zephir_check_call_status(); RETURN_MM_BOOL(1); } ZEPHIR_SINIT_NVAR(_0); ZVAL_STRING(&_0, "png", 0); - ZEPHIR_CALL_FUNCTION(&_16, "strcmp", &_4, 278, ext, &_0); + ZEPHIR_CALL_FUNCTION(&_16, "strcmp", &_4, 273, ext, &_0); zephir_check_call_status(); if (ZEPHIR_IS_LONG(_16, 0)) { ZEPHIR_INIT_ZVAL_NREF(_17$$6); ZVAL_LONG(_17$$6, 3); zephir_update_property_this(this_ptr, SL("_type"), _17$$6 TSRMLS_CC); _17$$6 = zephir_fetch_nproperty_this(this_ptr, SL("_type"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_18$$6, "image_type_to_mime_type", &_7, 279, _17$$6); + ZEPHIR_CALL_FUNCTION(&_18$$6, "image_type_to_mime_type", &_7, 274, _17$$6); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_mime"), _18$$6 TSRMLS_CC); _19$$6 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagepng", NULL, 282, _19$$6, file); + ZEPHIR_CALL_FUNCTION(NULL, "imagepng", NULL, 277, _19$$6, file); zephir_check_call_status(); RETURN_MM_BOOL(1); } ZEPHIR_SINIT_NVAR(_0); ZVAL_STRING(&_0, "wbmp", 0); - ZEPHIR_CALL_FUNCTION(&_20, "strcmp", &_4, 278, ext, &_0); + ZEPHIR_CALL_FUNCTION(&_20, "strcmp", &_4, 273, ext, &_0); zephir_check_call_status(); if (ZEPHIR_IS_LONG(_20, 0)) { ZEPHIR_INIT_ZVAL_NREF(_21$$7); ZVAL_LONG(_21$$7, 15); zephir_update_property_this(this_ptr, SL("_type"), _21$$7 TSRMLS_CC); _21$$7 = zephir_fetch_nproperty_this(this_ptr, SL("_type"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_22$$7, "image_type_to_mime_type", &_7, 279, _21$$7); + ZEPHIR_CALL_FUNCTION(&_22$$7, "image_type_to_mime_type", &_7, 274, _21$$7); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_mime"), _22$$7 TSRMLS_CC); _23$$7 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagewbmp", NULL, 283, _23$$7, file); + ZEPHIR_CALL_FUNCTION(NULL, "imagewbmp", NULL, 278, _23$$7, file); zephir_check_call_status(); RETURN_MM_BOOL(1); } ZEPHIR_SINIT_NVAR(_0); ZVAL_STRING(&_0, "xbm", 0); - ZEPHIR_CALL_FUNCTION(&_24, "strcmp", &_4, 278, ext, &_0); + ZEPHIR_CALL_FUNCTION(&_24, "strcmp", &_4, 273, ext, &_0); zephir_check_call_status(); if (ZEPHIR_IS_LONG(_24, 0)) { ZEPHIR_INIT_ZVAL_NREF(_25$$8); ZVAL_LONG(_25$$8, 16); zephir_update_property_this(this_ptr, SL("_type"), _25$$8 TSRMLS_CC); _25$$8 = zephir_fetch_nproperty_this(this_ptr, SL("_type"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_26$$8, "image_type_to_mime_type", &_7, 279, _25$$8); + ZEPHIR_CALL_FUNCTION(&_26$$8, "image_type_to_mime_type", &_7, 274, _25$$8); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_mime"), _26$$8 TSRMLS_CC); _27$$8 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagexbm", NULL, 284, _27$$8, file); + ZEPHIR_CALL_FUNCTION(NULL, "imagexbm", NULL, 279, _27$$8, file); zephir_check_call_status(); RETURN_MM_BOOL(1); } @@ -69548,25 +69697,25 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _render) { zephir_check_call_status(); ZEPHIR_SINIT_VAR(_1); ZVAL_STRING(&_1, "gif", 0); - ZEPHIR_CALL_FUNCTION(&_2, "strcmp", &_3, 278, ext, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "strcmp", &_3, 273, ext, &_1); zephir_check_call_status(); if (ZEPHIR_IS_LONG(_2, 0)) { _4$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagegif", NULL, 280, _4$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagegif", NULL, 275, _4$$3); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", &_5, 285); + ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", &_5, 280); zephir_check_call_status(); RETURN_MM(); } ZEPHIR_SINIT_NVAR(_1); ZVAL_STRING(&_1, "jpg", 0); - ZEPHIR_CALL_FUNCTION(&_6, "strcmp", &_3, 278, ext, &_1); + ZEPHIR_CALL_FUNCTION(&_6, "strcmp", &_3, 273, ext, &_1); zephir_check_call_status(); _7 = ZEPHIR_IS_LONG(_6, 0); if (!(_7)) { ZEPHIR_SINIT_NVAR(_1); ZVAL_STRING(&_1, "jpeg", 0); - ZEPHIR_CALL_FUNCTION(&_8, "strcmp", &_3, 278, ext, &_1); + ZEPHIR_CALL_FUNCTION(&_8, "strcmp", &_3, 273, ext, &_1); zephir_check_call_status(); _7 = ZEPHIR_IS_LONG(_8, 0); } @@ -69574,45 +69723,45 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _render) { _9$$4 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_VAR(_10$$4); ZVAL_LONG(&_10$$4, quality); - ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 281, _9$$4, ZEPHIR_GLOBAL(global_null), &_10$$4); + ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 276, _9$$4, ZEPHIR_GLOBAL(global_null), &_10$$4); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", &_5, 285); + ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", &_5, 280); zephir_check_call_status(); RETURN_MM(); } ZEPHIR_SINIT_NVAR(_1); ZVAL_STRING(&_1, "png", 0); - ZEPHIR_CALL_FUNCTION(&_11, "strcmp", &_3, 278, ext, &_1); + ZEPHIR_CALL_FUNCTION(&_11, "strcmp", &_3, 273, ext, &_1); zephir_check_call_status(); if (ZEPHIR_IS_LONG(_11, 0)) { _12$$5 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagepng", NULL, 282, _12$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagepng", NULL, 277, _12$$5); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", &_5, 285); + ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", &_5, 280); zephir_check_call_status(); RETURN_MM(); } ZEPHIR_SINIT_NVAR(_1); ZVAL_STRING(&_1, "wbmp", 0); - ZEPHIR_CALL_FUNCTION(&_13, "strcmp", &_3, 278, ext, &_1); + ZEPHIR_CALL_FUNCTION(&_13, "strcmp", &_3, 273, ext, &_1); zephir_check_call_status(); if (ZEPHIR_IS_LONG(_13, 0)) { _14$$6 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagewbmp", NULL, 283, _14$$6); + ZEPHIR_CALL_FUNCTION(NULL, "imagewbmp", NULL, 278, _14$$6); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", &_5, 285); + ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", &_5, 280); zephir_check_call_status(); RETURN_MM(); } ZEPHIR_SINIT_NVAR(_1); ZVAL_STRING(&_1, "xbm", 0); - ZEPHIR_CALL_FUNCTION(&_15, "strcmp", &_3, 278, ext, &_1); + ZEPHIR_CALL_FUNCTION(&_15, "strcmp", &_3, 273, ext, &_1); zephir_check_call_status(); if (ZEPHIR_IS_LONG(_15, 0)) { _16$$7 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagexbm", NULL, 284, _16$$7, ZEPHIR_GLOBAL(global_null)); + ZEPHIR_CALL_FUNCTION(NULL, "imagexbm", NULL, 279, _16$$7, ZEPHIR_GLOBAL(global_null)); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", &_5, 285); + ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", &_5, 280); zephir_check_call_status(); RETURN_MM(); } @@ -69644,11 +69793,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _create) { ZVAL_LONG(&_0, width); ZEPHIR_SINIT_VAR(_1); ZVAL_LONG(&_1, height); - ZEPHIR_CALL_FUNCTION(&image, "imagecreatetruecolor", NULL, 249, &_0, &_1); + ZEPHIR_CALL_FUNCTION(&image, "imagecreatetruecolor", NULL, 244, &_0, &_1); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 250, image, ZEPHIR_GLOBAL(global_false)); + ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 245, image, ZEPHIR_GLOBAL(global_false)); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 248, image, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 243, image, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); RETURN_CCTOR(image); @@ -69664,7 +69813,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, __destruct) { ZEPHIR_OBS_VAR(image); zephir_read_property_this(&image, this_ptr, SL("_image"), PH_NOISY_CC); if (Z_TYPE_P(image) == IS_RESOURCE) { - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 252, image); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 247, image); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -69717,12 +69866,12 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, check) { } ZEPHIR_SINIT_VAR(_2); ZVAL_STRING(&_2, "Imagick::IMAGICK_EXTNUM", 0); - ZEPHIR_CALL_FUNCTION(&_3, "defined", NULL, 230, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "defined", NULL, 225, &_2); zephir_check_call_status(); if (zephir_is_true(_3)) { ZEPHIR_SINIT_VAR(_4$$5); ZVAL_STRING(&_4$$5, "Imagick::IMAGICK_EXTNUM", 0); - ZEPHIR_CALL_FUNCTION(&_5$$5, "constant", NULL, 192, &_4$$5); + ZEPHIR_CALL_FUNCTION(&_5$$5, "constant", NULL, 187, &_4$$5); zephir_check_call_status(); zephir_update_static_property_ce(phalcon_image_adapter_imagick_ce, SL("_version"), &_5$$5 TSRMLS_CC); } @@ -69772,8 +69921,10 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, __construct) { zephir_update_property_this(this_ptr, SL("_file"), file TSRMLS_CC); ZEPHIR_INIT_VAR(_1); object_init_ex(_1, zephir_get_internal_ce(SS("imagick") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, _1, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(_1 TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, _1, "__construct", NULL, 0); + zephir_check_call_status(); + } zephir_update_property_this(this_ptr, SL("_image"), _1 TSRMLS_CC); _2 = zephir_fetch_nproperty_this(this_ptr, SL("_file"), PH_NOISY_CC); if ((zephir_file_exists(_2 TSRMLS_CC) == SUCCESS)) { @@ -69804,7 +69955,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, __construct) { _13$$6 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_VAR(_14$$6); ZVAL_STRING(&_14$$6, "Imagick::ALPHACHANNEL_SET", 0); - ZEPHIR_CALL_FUNCTION(&_15$$6, "constant", NULL, 192, &_14$$6); + ZEPHIR_CALL_FUNCTION(&_15$$6, "constant", NULL, 187, &_14$$6); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, _13$$6, "setimagealphachannel", NULL, 0, _15$$6); zephir_check_call_status(); @@ -69842,11 +69993,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, __construct) { _24$$8 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_INIT_VAR(_25$$8); object_init_ex(_25$$8, zephir_get_internal_ce(SS("imagickpixel") TSRMLS_CC)); - ZEPHIR_INIT_VAR(_26$$8); - ZVAL_STRING(_26$$8, "transparent", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _25$$8, "__construct", NULL, 0, _26$$8); - zephir_check_temp_parameter(_26$$8); - zephir_check_call_status(); + if (zephir_has_constructor(_25$$8 TSRMLS_CC)) { + ZEPHIR_INIT_VAR(_26$$8); + ZVAL_STRING(_26$$8, "transparent", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(NULL, _25$$8, "__construct", NULL, 0, _26$$8); + zephir_check_temp_parameter(_26$$8); + zephir_check_call_status(); + } ZEPHIR_INIT_NVAR(_26$$8); ZVAL_LONG(_26$$8, width); ZEPHIR_INIT_VAR(_27$$8); @@ -70064,8 +70217,10 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _rotate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(pixel); object_init_ex(pixel, zephir_get_internal_ce(SS("imagickpixel") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, pixel, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(pixel TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, pixel, "__construct", NULL, 0); + zephir_check_call_status(); + } while (1) { _2$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_INIT_NVAR(_3$$3); @@ -70254,8 +70409,10 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _reflection) { } ZEPHIR_INIT_VAR(fade); object_init_ex(fade, zephir_get_internal_ce(SS("imagick") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, fade, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(fade TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, fade, "__construct", NULL, 0); + zephir_check_call_status(); + } ZEPHIR_CALL_METHOD(&_17, reflection, "getimagewidth", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_18, reflection, "getimageheight", NULL, 0); @@ -70270,7 +70427,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _reflection) { while (1) { ZEPHIR_SINIT_NVAR(_19$$7); ZVAL_STRING(&_19$$7, "Imagick::COMPOSITE_DSTOUT", 0); - ZEPHIR_CALL_FUNCTION(&_20$$7, "constant", &_21, 192, &_19$$7); + ZEPHIR_CALL_FUNCTION(&_20$$7, "constant", &_21, 187, &_19$$7); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_22$$7); ZVAL_LONG(_22$$7, 0); @@ -70284,11 +70441,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _reflection) { } ZEPHIR_SINIT_NVAR(_19$$7); ZVAL_STRING(&_19$$7, "Imagick::EVALUATE_MULTIPLY", 0); - ZEPHIR_CALL_FUNCTION(&_25$$7, "constant", &_21, 192, &_19$$7); + ZEPHIR_CALL_FUNCTION(&_25$$7, "constant", &_21, 187, &_19$$7); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_19$$7); ZVAL_STRING(&_19$$7, "Imagick::CHANNEL_ALPHA", 0); - ZEPHIR_CALL_FUNCTION(&_26$$7, "constant", &_21, 192, &_19$$7); + ZEPHIR_CALL_FUNCTION(&_26$$7, "constant", &_21, 187, &_19$$7); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_22$$7); ZVAL_LONG(_22$$7, opacity); @@ -70304,12 +70461,16 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _reflection) { zephir_check_call_status(); ZEPHIR_INIT_VAR(image); object_init_ex(image, zephir_get_internal_ce(SS("imagick") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, image, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(image TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, image, "__construct", NULL, 0); + zephir_check_call_status(); + } ZEPHIR_INIT_VAR(pixel); object_init_ex(pixel, zephir_get_internal_ce(SS("imagickpixel") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, pixel, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(pixel TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, pixel, "__construct", NULL, 0); + zephir_check_call_status(); + } _30 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_CALL_METHOD(&_31, _30, "getimageheight", NULL, 0); zephir_check_call_status(); @@ -70327,7 +70488,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _reflection) { zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_36$$10); ZVAL_STRING(&_36$$10, "Imagick::ALPHACHANNEL_SET", 0); - ZEPHIR_CALL_FUNCTION(&_37$$10, "constant", &_21, 192, &_36$$10); + ZEPHIR_CALL_FUNCTION(&_37$$10, "constant", &_21, 187, &_36$$10); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, image, "setimagealphachannel", &_38, 0, _37$$10); zephir_check_call_status(); @@ -70344,7 +70505,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _reflection) { _45$$10 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_NVAR(_36$$10); ZVAL_STRING(&_36$$10, "Imagick::COMPOSITE_SRC", 0); - ZEPHIR_CALL_FUNCTION(&_46$$10, "constant", &_21, 192, &_36$$10); + ZEPHIR_CALL_FUNCTION(&_46$$10, "constant", &_21, 187, &_36$$10); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_34$$10); ZVAL_LONG(_34$$10, 0); @@ -70374,7 +70535,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _reflection) { while (1) { ZEPHIR_SINIT_NVAR(_51$$13); ZVAL_STRING(&_51$$13, "Imagick::COMPOSITE_OVER", 0); - ZEPHIR_CALL_FUNCTION(&_52$$13, "constant", &_21, 192, &_51$$13); + ZEPHIR_CALL_FUNCTION(&_52$$13, "constant", &_21, 187, &_51$$13); zephir_check_call_status(); _53$$13 = zephir_fetch_nproperty_this(this_ptr, SL("_height"), PH_NOISY_CC); ZEPHIR_INIT_NVAR(_54$$13); @@ -70435,8 +70596,10 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _watermark) { opacity = (long) (zephir_safe_div_long_long(opacity, 100 TSRMLS_CC)); ZEPHIR_INIT_VAR(watermark); object_init_ex(watermark, zephir_get_internal_ce(SS("imagick") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, watermark, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(watermark TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, watermark, "__construct", NULL, 0); + zephir_check_call_status(); + } ZEPHIR_CALL_METHOD(&_0, image, "render", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, watermark, "readimageblob", NULL, 0, _0); @@ -70454,7 +70617,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _watermark) { _3$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_NVAR(_4$$3); ZVAL_STRING(&_4$$3, "Imagick::COMPOSITE_OVER", 0); - ZEPHIR_CALL_FUNCTION(&_5$$3, "constant", &_6, 192, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "constant", &_6, 187, &_4$$3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_7$$3); ZVAL_LONG(_7$$3, offsetX); @@ -70506,8 +70669,10 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _text) { opacity = (long) (zephir_safe_div_long_long(opacity, 100 TSRMLS_CC)); ZEPHIR_INIT_VAR(draw); object_init_ex(draw, zephir_get_internal_ce(SS("imagickdraw") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, draw, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(draw TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, draw, "__construct", NULL, 0); + zephir_check_call_status(); + } ZEPHIR_SINIT_VAR(_0); ZVAL_STRING(&_0, "rgb(%d, %d, %d)", 0); ZEPHIR_SINIT_VAR(_1); @@ -70516,12 +70681,14 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _text) { ZVAL_LONG(&_2, g); ZEPHIR_SINIT_VAR(_3); ZVAL_LONG(&_3, b); - ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 189, &_0, &_1, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 184, &_0, &_1, &_2, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(_4); object_init_ex(_4, zephir_get_internal_ce(SS("imagickpixel") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, _4, "__construct", NULL, 0, color); - zephir_check_call_status(); + if (zephir_has_constructor(_4 TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, _4, "__construct", NULL, 0, color); + zephir_check_call_status(); + } ZEPHIR_CALL_METHOD(NULL, draw, "setfillcolor", NULL, 0, _4); zephir_check_call_status(); if (!(!fontfile) && Z_STRLEN_P(fontfile)) { @@ -70555,24 +70722,24 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _text) { if (_7$$7) { ZEPHIR_SINIT_VAR(_8$$8); ZVAL_STRING(&_8$$8, "Imagick::GRAVITY_SOUTHEAST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_8$$8); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_8$$8); zephir_check_call_status(); } else { if (zephir_is_true(offsetX)) { ZEPHIR_SINIT_VAR(_10$$10); ZVAL_STRING(&_10$$10, "Imagick::GRAVITY_EAST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_10$$10); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_10$$10); zephir_check_call_status(); } else { if (zephir_is_true(offsetY)) { ZEPHIR_SINIT_VAR(_11$$12); ZVAL_STRING(&_11$$12, "Imagick::GRAVITY_SOUTH", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_11$$12); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_11$$12); zephir_check_call_status(); } else { ZEPHIR_SINIT_VAR(_12$$13); ZVAL_STRING(&_12$$13, "Imagick::GRAVITY_CENTER", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_12$$13); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_12$$13); zephir_check_call_status(); } } @@ -70588,13 +70755,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _text) { ZVAL_LONG(offsetY, (y * -1)); ZEPHIR_SINIT_VAR(_13$$17); ZVAL_STRING(&_13$$17, "Imagick::GRAVITY_SOUTHEAST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_13$$17); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_13$$17); zephir_check_call_status(); } else { ZVAL_LONG(offsetX, 0); ZEPHIR_SINIT_VAR(_14$$18); ZVAL_STRING(&_14$$18, "Imagick::GRAVITY_NORTHEAST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_14$$18); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_14$$18); zephir_check_call_status(); } } else { @@ -70605,13 +70772,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _text) { ZVAL_LONG(offsetY, (y * -1)); ZEPHIR_SINIT_VAR(_15$$20); ZVAL_STRING(&_15$$20, "Imagick::GRAVITY_SOUTH", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_15$$20); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_15$$20); zephir_check_call_status(); } else { ZVAL_LONG(offsetX, 0); ZEPHIR_SINIT_VAR(_16$$21); ZVAL_STRING(&_16$$21, "Imagick::GRAVITY_NORTH", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_16$$21); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_16$$21); zephir_check_call_status(); } } @@ -70630,13 +70797,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _text) { ZVAL_LONG(offsetY, 0); ZEPHIR_SINIT_VAR(_17$$27); ZVAL_STRING(&_17$$27, "Imagick::GRAVITY_SOUTHEAST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_17$$27); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_17$$27); zephir_check_call_status(); } else { ZVAL_LONG(offsetY, 0); ZEPHIR_SINIT_VAR(_18$$28); ZVAL_STRING(&_18$$28, "Imagick::GRAVITY_SOUTH", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_18$$28); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_18$$28); zephir_check_call_status(); } } else { @@ -70647,13 +70814,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _text) { ZVAL_LONG(offsetY, 0); ZEPHIR_SINIT_VAR(_19$$30); ZVAL_STRING(&_19$$30, "Imagick::GRAVITY_EAST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_19$$30); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_19$$30); zephir_check_call_status(); } else { ZVAL_LONG(offsetY, 0); ZEPHIR_SINIT_VAR(_20$$31); ZVAL_STRING(&_20$$31, "Imagick::GRAVITY_WEST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_20$$31); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_20$$31); zephir_check_call_status(); } } @@ -70669,13 +70836,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _text) { ZVAL_LONG(offsetY, (y * -1)); ZEPHIR_SINIT_VAR(_21$$35); ZVAL_STRING(&_21$$35, "Imagick::GRAVITY_SOUTHEAST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_21$$35); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_21$$35); zephir_check_call_status(); } else { ZVAL_LONG(offsetX, (x * -1)); ZEPHIR_SINIT_VAR(_22$$36); ZVAL_STRING(&_22$$36, "Imagick::GRAVITY_NORTHEAST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_22$$36); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_22$$36); zephir_check_call_status(); } } else { @@ -70686,13 +70853,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _text) { ZVAL_LONG(offsetY, (y * -1)); ZEPHIR_SINIT_VAR(_23$$38); ZVAL_STRING(&_23$$38, "Imagick::GRAVITY_SOUTHWEST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_23$$38); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_23$$38); zephir_check_call_status(); } else { ZVAL_LONG(offsetX, 0); ZEPHIR_SINIT_VAR(_24$$39); ZVAL_STRING(&_24$$39, "Imagick::GRAVITY_NORTHWEST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_24$$39); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_24$$39); zephir_check_call_status(); } } @@ -70740,8 +70907,10 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _mask) { ZEPHIR_INIT_VAR(mask); object_init_ex(mask, zephir_get_internal_ce(SS("imagick") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, mask, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(mask TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, mask, "__construct", NULL, 0); + zephir_check_call_status(); + } ZEPHIR_CALL_METHOD(&_0, image, "render", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, mask, "readimageblob", NULL, 0, _0); @@ -70760,7 +70929,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _mask) { _5$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_NVAR(_6$$3); ZVAL_STRING(&_6$$3, "Imagick::COMPOSITE_DSTIN", 0); - ZEPHIR_CALL_FUNCTION(&_7$$3, "constant", &_8, 192, &_6$$3); + ZEPHIR_CALL_FUNCTION(&_7$$3, "constant", &_8, 187, &_6$$3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_4$$3); ZVAL_LONG(_4$$3, 0); @@ -70769,7 +70938,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _mask) { ZEPHIR_CALL_METHOD(&ret, _5$$3, "compositeimage", NULL, 0, mask, _7$$3, _4$$3, _9$$3); zephir_check_call_status(); if (!ZEPHIR_IS_TRUE_IDENTICAL(ret)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_image_exception_ce, "Imagick::compositeImage failed", "phalcon/image/adapter/imagick.zep", 531); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_image_exception_ce, "Imagick::compositeImage failed", "phalcon/image/adapter/imagick.zep", 529); return; } _10$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); @@ -70810,24 +70979,30 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _background) { ZVAL_LONG(&_2, g); ZEPHIR_SINIT_VAR(_3); ZVAL_LONG(&_3, b); - ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 189, &_0, &_1, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 184, &_0, &_1, &_2, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(pixel1); object_init_ex(pixel1, zephir_get_internal_ce(SS("imagickpixel") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, pixel1, "__construct", NULL, 0, color); - zephir_check_call_status(); + if (zephir_has_constructor(pixel1 TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, pixel1, "__construct", NULL, 0, color); + zephir_check_call_status(); + } opacity = (long) (zephir_safe_div_long_long(opacity, 100 TSRMLS_CC)); ZEPHIR_INIT_VAR(pixel2); object_init_ex(pixel2, zephir_get_internal_ce(SS("imagickpixel") TSRMLS_CC)); - ZEPHIR_INIT_VAR(_4); - ZVAL_STRING(_4, "transparent", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, pixel2, "__construct", NULL, 0, _4); - zephir_check_temp_parameter(_4); - zephir_check_call_status(); + if (zephir_has_constructor(pixel2 TSRMLS_CC)) { + ZEPHIR_INIT_VAR(_4); + ZVAL_STRING(_4, "transparent", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(NULL, pixel2, "__construct", NULL, 0, _4); + zephir_check_temp_parameter(_4); + zephir_check_call_status(); + } ZEPHIR_INIT_VAR(background); object_init_ex(background, zephir_get_internal_ce(SS("imagick") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, background, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(background TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, background, "__construct", NULL, 0); + zephir_check_call_status(); + } _5 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_INIT_NVAR(_4); ZVAL_LONG(_4, 0); @@ -70843,7 +71018,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _background) { if (!(zephir_is_true(_9$$3))) { ZEPHIR_SINIT_NVAR(_11$$4); ZVAL_STRING(&_11$$4, "Imagick::ALPHACHANNEL_SET", 0); - ZEPHIR_CALL_FUNCTION(&_12$$4, "constant", &_13, 192, &_11$$4); + ZEPHIR_CALL_FUNCTION(&_12$$4, "constant", &_13, 187, &_11$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, background, "setimagealphachannel", &_14, 0, _12$$4); zephir_check_call_status(); @@ -70852,11 +71027,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _background) { zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_16$$3); ZVAL_STRING(&_16$$3, "Imagick::EVALUATE_MULTIPLY", 0); - ZEPHIR_CALL_FUNCTION(&_17$$3, "constant", &_13, 192, &_16$$3); + ZEPHIR_CALL_FUNCTION(&_17$$3, "constant", &_13, 187, &_16$$3); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_16$$3); ZVAL_STRING(&_16$$3, "Imagick::CHANNEL_ALPHA", 0); - ZEPHIR_CALL_FUNCTION(&_18$$3, "constant", &_13, 192, &_16$$3); + ZEPHIR_CALL_FUNCTION(&_18$$3, "constant", &_13, 187, &_16$$3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_19$$3); ZVAL_LONG(_19$$3, opacity); @@ -70870,7 +71045,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _background) { _24$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_NVAR(_16$$3); ZVAL_STRING(&_16$$3, "Imagick::COMPOSITE_DISSOLVE", 0); - ZEPHIR_CALL_FUNCTION(&_25$$3, "constant", &_13, 192, &_16$$3); + ZEPHIR_CALL_FUNCTION(&_25$$3, "constant", &_13, 187, &_16$$3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_19$$3); ZVAL_LONG(_19$$3, 0); @@ -70879,7 +71054,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _background) { ZEPHIR_CALL_METHOD(&ret, background, "compositeimage", &_27, 0, _24$$3, _25$$3, _19$$3, _26$$3); zephir_check_call_status(); if (!ZEPHIR_IS_TRUE_IDENTICAL(ret)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_image_exception_ce, "Imagick::compositeImage failed", "phalcon/image/adapter/imagick.zep", 570); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_image_exception_ce, "Imagick::compositeImage failed", "phalcon/image/adapter/imagick.zep", 568); return; } _28$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); @@ -71024,7 +71199,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _save) { zephir_check_call_status(); ZEPHIR_SINIT_VAR(_11$$3); ZVAL_STRING(&_11$$3, "w", 0); - ZEPHIR_CALL_FUNCTION(&fp, "fopen", NULL, 286, file, &_11$$3); + ZEPHIR_CALL_FUNCTION(&fp, "fopen", NULL, 281, file, &_11$$3); zephir_check_call_status(); _12$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_CALL_METHOD(NULL, _12$$3, "writeimagesfile", NULL, 0, fp); @@ -71048,7 +71223,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _save) { _17$$5 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_VAR(_18$$5); ZVAL_STRING(&_18$$5, "Imagick::COMPRESSION_JPEG", 0); - ZEPHIR_CALL_FUNCTION(&_19$$5, "constant", NULL, 192, &_18$$5); + ZEPHIR_CALL_FUNCTION(&_19$$5, "constant", NULL, 187, &_18$$5); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, _17$$5, "setimagecompression", NULL, 0, _19$$5); zephir_check_call_status(); @@ -71120,7 +71295,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _render) { if (_8$$4) { ZEPHIR_SINIT_VAR(_10$$5); ZVAL_STRING(&_10$$5, "Imagick::COMPRESSION_JPEG", 0); - ZEPHIR_CALL_FUNCTION(&_11$$5, "constant", NULL, 192, &_10$$5); + ZEPHIR_CALL_FUNCTION(&_11$$5, "constant", NULL, 187, &_10$$5); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, image, "setimagecompression", NULL, 0, _11$$5); zephir_check_call_status(); @@ -71813,6 +71988,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Formatter) { ZEPHIR_REGISTER_CLASS(Phalcon\\Logger, Formatter, phalcon, logger_formatter, phalcon_logger_formatter_method_entry, ZEND_ACC_EXPLICIT_ABSTRACT_CLASS); + zend_class_implements(phalcon_logger_formatter_ce TSRMLS_CC, 1, phalcon_logger_formatterinterface_ce); return SUCCESS; } @@ -72049,6 +72225,8 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Multiple) { zend_declare_property_null(phalcon_logger_multiple_ce, SL("_formatter"), ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_null(phalcon_logger_multiple_ce, SL("_logLevel"), ZEND_ACC_PROTECTED TSRMLS_CC); + return SUCCESS; } @@ -72069,6 +72247,14 @@ static PHP_METHOD(Phalcon_Logger_Multiple, getFormatter) { } +static PHP_METHOD(Phalcon_Logger_Multiple, getLogLevel) { + + + + RETURN_MEMBER(this_ptr, "_logLevel"); + +} + static PHP_METHOD(Phalcon_Logger_Multiple, push) { zval *logger; @@ -72096,7 +72282,7 @@ static PHP_METHOD(Phalcon_Logger_Multiple, setFormatter) { ZEPHIR_OBS_VAR(loggers); zephir_read_property_this(&loggers, this_ptr, SL("_loggers"), PH_NOISY_CC); if (Z_TYPE_P(loggers) == IS_ARRAY) { - zephir_is_iterable(loggers, &_1$$3, &_0$$3, 0, 0, "phalcon/logger/multiple.zep", 59); + zephir_is_iterable(loggers, &_1$$3, &_0$$3, 0, 0, "phalcon/logger/multiple.zep", 61); for ( ; zephir_hash_get_current_data_ex(_1$$3, (void**) &_2$$3, &_0$$3) == SUCCESS ; zephir_hash_move_forward_ex(_1$$3, &_0$$3) @@ -72111,6 +72297,41 @@ static PHP_METHOD(Phalcon_Logger_Multiple, setFormatter) { } +static PHP_METHOD(Phalcon_Logger_Multiple, setLogLevel) { + + HashTable *_1$$3; + HashPosition _0$$3; + zval *level_param = NULL, *loggers = NULL, *logger = NULL, *_4, **_2$$3, *_3$$4 = NULL; + int level, ZEPHIR_LAST_CALL_STATUS; + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &level_param); + + level = zephir_get_intval(level_param); + + + ZEPHIR_OBS_VAR(loggers); + zephir_read_property_this(&loggers, this_ptr, SL("_loggers"), PH_NOISY_CC); + if (Z_TYPE_P(loggers) == IS_ARRAY) { + zephir_is_iterable(loggers, &_1$$3, &_0$$3, 0, 0, "phalcon/logger/multiple.zep", 77); + for ( + ; zephir_hash_get_current_data_ex(_1$$3, (void**) &_2$$3, &_0$$3) == SUCCESS + ; zephir_hash_move_forward_ex(_1$$3, &_0$$3) + ) { + ZEPHIR_GET_HVALUE(logger, _2$$3); + ZEPHIR_INIT_NVAR(_3$$4); + ZVAL_LONG(_3$$4, level); + ZEPHIR_CALL_METHOD(NULL, logger, "setloglevel", NULL, 0, _3$$4); + zephir_check_call_status(); + } + } + ZEPHIR_INIT_ZVAL_NREF(_4); + ZVAL_LONG(_4, level); + zephir_update_property_this(this_ptr, SL("_logLevel"), _4 TSRMLS_CC); + ZEPHIR_MM_RESTORE(); + +} + static PHP_METHOD(Phalcon_Logger_Multiple, log) { HashTable *_1$$3; @@ -72136,7 +72357,7 @@ static PHP_METHOD(Phalcon_Logger_Multiple, log) { ZEPHIR_OBS_VAR(loggers); zephir_read_property_this(&loggers, this_ptr, SL("_loggers"), PH_NOISY_CC); if (Z_TYPE_P(loggers) == IS_ARRAY) { - zephir_is_iterable(loggers, &_1$$3, &_0$$3, 0, 0, "phalcon/logger/multiple.zep", 75); + zephir_is_iterable(loggers, &_1$$3, &_0$$3, 0, 0, "phalcon/logger/multiple.zep", 93); for ( ; zephir_hash_get_current_data_ex(_1$$3, (void**) &_2$$3, &_0$$3) == SUCCESS ; zephir_hash_move_forward_ex(_1$$3, &_0$$3) @@ -72514,7 +72735,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_File, __construct) { ZEPHIR_INIT_NVAR(mode); ZVAL_STRING(mode, "ab", 1); } - ZEPHIR_CALL_FUNCTION(&handler, "fopen", NULL, 286, name, mode); + ZEPHIR_CALL_FUNCTION(&handler, "fopen", NULL, 281, name, mode); zephir_check_call_status(); if (Z_TYPE_P(handler) != IS_RESOURCE) { ZEPHIR_INIT_VAR(_0$$7); @@ -72546,7 +72767,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_File, getFormatter) { if (Z_TYPE_P(_0) != IS_OBJECT) { ZEPHIR_INIT_VAR(_1$$3); object_init_ex(_1$$3, phalcon_logger_formatter_line_ce); - ZEPHIR_CALL_METHOD(NULL, _1$$3, "__construct", NULL, 290); + ZEPHIR_CALL_METHOD(NULL, _1$$3, "__construct", NULL, 285); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_formatter"), _1$$3 TSRMLS_CC); } @@ -72626,7 +72847,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_File, __wakeup) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_logger_exception_ce, "Logger must be opened in append or write mode", "phalcon/logger/adapter/file.zep", 152); return; } - ZEPHIR_CALL_FUNCTION(&_1, "fopen", NULL, 286, path, mode); + ZEPHIR_CALL_FUNCTION(&_1, "fopen", NULL, 281, path, mode); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_fileHandler"), _1 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -72711,15 +72932,15 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Firephp, logInternal) { if (!ZEPHIR_IS_TRUE_IDENTICAL(_2)) { ZEPHIR_SINIT_VAR(_3$$4); ZVAL_STRING(&_3$$4, "X-Wf-Protocol-1: http://meta.wildfirehq.org/Protocol/JsonStream/0.2", 0); - ZEPHIR_CALL_FUNCTION(NULL, "header", &_4, 238, &_3$$4); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_4, 233, &_3$$4); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_3$$4); ZVAL_STRING(&_3$$4, "X-Wf-1-Plugin-1: http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/0.3", 0); - ZEPHIR_CALL_FUNCTION(NULL, "header", &_4, 238, &_3$$4); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_4, 233, &_3$$4); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_3$$4); ZVAL_STRING(&_3$$4, "X-Wf-Structure-1: http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1", 0); - ZEPHIR_CALL_FUNCTION(NULL, "header", &_4, 238, &_3$$4); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_4, 233, &_3$$4); zephir_check_call_status(); zephir_update_static_property_ce(phalcon_logger_adapter_firephp_ce, SL("_initialized"), &ZEPHIR_GLOBAL(global_true) TSRMLS_CC); } @@ -72749,7 +72970,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Firephp, logInternal) { if (zephir_array_isset_long(chunk, (zephir_get_numberval(key) + 1))) { zephir_concat_self_str(&content, SL("|\\") TSRMLS_CC); } - ZEPHIR_CALL_FUNCTION(NULL, "header", &_4, 238, content); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_4, 233, content); zephir_check_call_status(); _13$$5 = zephir_fetch_static_property_ce(phalcon_logger_adapter_firephp_ce, SL("_index") TSRMLS_CC); ZEPHIR_INIT_ZVAL_NREF(_14$$5); @@ -72827,7 +73048,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Stream, __construct) { ZEPHIR_INIT_NVAR(mode); ZVAL_STRING(mode, "ab", 1); } - ZEPHIR_CALL_FUNCTION(&stream, "fopen", NULL, 286, name, mode); + ZEPHIR_CALL_FUNCTION(&stream, "fopen", NULL, 281, name, mode); zephir_check_call_status(); if (!(zephir_is_true(stream))) { ZEPHIR_INIT_VAR(_0$$6); @@ -72857,7 +73078,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Stream, getFormatter) { if (Z_TYPE_P(_0) != IS_OBJECT) { ZEPHIR_INIT_VAR(_1$$3); object_init_ex(_1$$3, phalcon_logger_formatter_line_ce); - ZEPHIR_CALL_METHOD(NULL, _1$$3, "__construct", NULL, 290); + ZEPHIR_CALL_METHOD(NULL, _1$$3, "__construct", NULL, 285); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_formatter"), _1$$3 TSRMLS_CC); } @@ -72959,7 +73180,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Syslog, __construct) { ZEPHIR_INIT_NVAR(facility); ZVAL_LONG(facility, 8); } - ZEPHIR_CALL_FUNCTION(NULL, "openlog", NULL, 291, name, option, facility); + ZEPHIR_CALL_FUNCTION(NULL, "openlog", NULL, 286, name, option, facility); zephir_check_call_status(); if (1) { zephir_update_property_this(this_ptr, SL("_opened"), ZEPHIR_GLOBAL(global_true) TSRMLS_CC); @@ -73023,7 +73244,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Syslog, logInternal) { } zephir_array_fetch_long(&_3, appliedFormat, 0, PH_NOISY | PH_READONLY, "phalcon/logger/adapter/syslog.zep", 102 TSRMLS_CC); zephir_array_fetch_long(&_4, appliedFormat, 1, PH_NOISY | PH_READONLY, "phalcon/logger/adapter/syslog.zep", 102 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(NULL, "syslog", NULL, 292, _3, _4); + ZEPHIR_CALL_FUNCTION(NULL, "syslog", NULL, 287, _3, _4); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -73038,7 +73259,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Syslog, close) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_opened"), PH_NOISY_CC); if (zephir_is_true(_0)) { - ZEPHIR_CALL_FUNCTION(NULL, "closelog", NULL, 293); + ZEPHIR_CALL_FUNCTION(NULL, "closelog", NULL, 288); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -73067,7 +73288,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Formatter_Firephp) { zend_declare_property_bool(phalcon_logger_formatter_firephp_ce, SL("_enableLabels"), 1, ZEND_ACC_PROTECTED TSRMLS_CC); - zend_class_implements(phalcon_logger_formatter_firephp_ce TSRMLS_CC, 1, phalcon_logger_formatterinterface_ce); return SUCCESS; } @@ -73205,28 +73425,28 @@ static PHP_METHOD(Phalcon_Logger_Formatter_Firephp, format) { ZVAL_STRING(&_5$$4, "5.3.6", 0); ZEPHIR_SINIT_VAR(_6$$4); ZVAL_STRING(&_6$$4, "<", 0); - ZEPHIR_CALL_FUNCTION(&_7$$4, "version_compare", NULL, 241, _4$$4, &_5$$4, &_6$$4); + ZEPHIR_CALL_FUNCTION(&_7$$4, "version_compare", NULL, 236, _4$$4, &_5$$4, &_6$$4); zephir_check_call_status(); if (!(zephir_is_true(_7$$4))) { param$$4 = (2) ? 1 : 0; } ZEPHIR_SINIT_NVAR(_5$$4); ZVAL_BOOL(&_5$$4, (param$$4 ? 1 : 0)); - ZEPHIR_CALL_FUNCTION(&backtrace, "debug_backtrace", NULL, 153, &_5$$4); + ZEPHIR_CALL_FUNCTION(&backtrace, "debug_backtrace", NULL, 148, &_5$$4); zephir_check_call_status(); ZEPHIR_MAKE_REF(backtrace); - ZEPHIR_CALL_FUNCTION(&lastTrace, "end", NULL, 172, backtrace); + ZEPHIR_CALL_FUNCTION(&lastTrace, "end", NULL, 167, backtrace); ZEPHIR_UNREF(backtrace); zephir_check_call_status(); if (zephir_array_isset_string(lastTrace, SS("file"))) { - zephir_array_fetch_string(&_8$$6, lastTrace, SL("file"), PH_NOISY | PH_READONLY, "phalcon/logger/formatter/firephp.zep", 133 TSRMLS_CC); + zephir_array_fetch_string(&_8$$6, lastTrace, SL("file"), PH_NOISY | PH_READONLY, "phalcon/logger/formatter/firephp.zep", 132 TSRMLS_CC); zephir_array_update_string(&meta, SL("File"), &_8$$6, PH_COPY | PH_SEPARATE); } if (zephir_array_isset_string(lastTrace, SS("line"))) { - zephir_array_fetch_string(&_9$$7, lastTrace, SL("line"), PH_NOISY | PH_READONLY, "phalcon/logger/formatter/firephp.zep", 137 TSRMLS_CC); + zephir_array_fetch_string(&_9$$7, lastTrace, SL("line"), PH_NOISY | PH_READONLY, "phalcon/logger/formatter/firephp.zep", 136 TSRMLS_CC); zephir_array_update_string(&meta, SL("Line"), &_9$$7, PH_COPY | PH_SEPARATE); } - zephir_is_iterable(backtrace, &_11$$4, &_10$$4, 1, 0, "phalcon/logger/formatter/firephp.zep", 146); + zephir_is_iterable(backtrace, &_11$$4, &_10$$4, 1, 0, "phalcon/logger/formatter/firephp.zep", 145); for ( ; zephir_hash_get_current_data_ex(_11$$4, (void**) &_12$$4, &_10$$4) == SUCCESS ; zephir_hash_move_forward_ex(_11$$4, &_10$$4) @@ -73304,7 +73524,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Formatter_Json) { ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Logger\\Formatter, Json, phalcon, logger_formatter_json, phalcon_logger_formatter_ce, phalcon_logger_formatter_json_method_entry, 0); - zend_class_implements(phalcon_logger_formatter_json_ce TSRMLS_CC, 1, phalcon_logger_formatterinterface_ce); return SUCCESS; } @@ -73374,7 +73593,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Formatter_Line) { zend_declare_property_string(phalcon_logger_formatter_line_ce, SL("_format"), "[%date%][%type%] %message%", ZEND_ACC_PROTECTED TSRMLS_CC); - zend_class_implements(phalcon_logger_formatter_line_ce TSRMLS_CC, 1, phalcon_logger_formatterinterface_ce); return SUCCESS; } @@ -73469,19 +73687,19 @@ static PHP_METHOD(Phalcon_Logger_Formatter_Line, format) { ZEPHIR_OBS_VAR(format); zephir_read_property_this(&format, this_ptr, SL("_format"), PH_NOISY_CC); - if (zephir_memnstr_str(format, SL("%date%"), "phalcon/logger/formatter/line.zep", 81)) { + if (zephir_memnstr_str(format, SL("%date%"), "phalcon/logger/formatter/line.zep", 80)) { ZEPHIR_INIT_VAR(_0$$3); _1$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_dateFormat"), PH_NOISY_CC); ZEPHIR_SINIT_VAR(_2$$3); ZVAL_LONG(&_2$$3, timestamp); - ZEPHIR_CALL_FUNCTION(&_3$$3, "date", NULL, 294, _1$$3, &_2$$3); + ZEPHIR_CALL_FUNCTION(&_3$$3, "date", NULL, 289, _1$$3, &_2$$3); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_2$$3); ZVAL_STRING(&_2$$3, "%date%", 0); zephir_fast_str_replace(&_0$$3, &_2$$3, _3$$3, format TSRMLS_CC); ZEPHIR_CPY_WRT(format, _0$$3); } - if (zephir_memnstr_str(format, SL("%type%"), "phalcon/logger/formatter/line.zep", 88)) { + if (zephir_memnstr_str(format, SL("%type%"), "phalcon/logger/formatter/line.zep", 87)) { ZEPHIR_INIT_VAR(_4$$4); ZEPHIR_INIT_VAR(_6$$4); ZVAL_LONG(_6$$4, type); @@ -73528,7 +73746,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Formatter_Syslog) { ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Logger\\Formatter, Syslog, phalcon, logger_formatter_syslog, phalcon_logger_formatter_ce, phalcon_logger_formatter_syslog_method_entry, 0); - zend_class_implements(phalcon_logger_formatter_syslog_ce TSRMLS_CC, 1, phalcon_logger_formatterinterface_ce); return SUCCESS; } @@ -74291,7 +74508,7 @@ static PHP_METHOD(Phalcon_Mvc_Collection, getSource) { ZEPHIR_INIT_VAR(_0$$3); zephir_get_class_ns(_0$$3, collection, 0 TSRMLS_CC); ZEPHIR_INIT_NVAR(source); - zephir_uncamelize(source, _0$$3); + zephir_uncamelize(source, _0$$3, NULL ); zephir_update_property_this(this_ptr, SL("_source"), source TSRMLS_CC); } RETURN_CCTOR(source); @@ -74555,7 +74772,7 @@ static PHP_METHOD(Phalcon_Mvc_Collection, _getResultset) { } ZEPHIR_INIT_VAR(collections); array_init(collections); - ZEPHIR_CALL_FUNCTION(&_5, "iterator_to_array", NULL, 295, documentsCursor); + ZEPHIR_CALL_FUNCTION(&_5, "iterator_to_array", NULL, 290, documentsCursor); zephir_check_call_status(); zephir_is_iterable(_5, &_7, &_6, 0, 0, "phalcon/mvc/collection.zep", 444); for ( @@ -75023,7 +75240,7 @@ static PHP_METHOD(Phalcon_Mvc_Collection, save) { zephir_update_property_this(this_ptr, SL("_errorMessages"), _2 TSRMLS_CC); ZEPHIR_OBS_VAR(disableEvents); zephir_read_static_property_ce(&disableEvents, phalcon_mvc_collection_ce, SL("_disableEvents") TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "_presave", NULL, 296, dependencyInjector, disableEvents, exists); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "_presave", NULL, 291, dependencyInjector, disableEvents, exists); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(_3)) { RETURN_MM_BOOL(0); @@ -75058,7 +75275,7 @@ static PHP_METHOD(Phalcon_Mvc_Collection, save) { } else { ZVAL_BOOL(_5, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_postsave", NULL, 297, disableEvents, _5, exists); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_postsave", NULL, 292, disableEvents, _5, exists); zephir_check_call_status(); RETURN_MM(); @@ -76382,7 +76599,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, mount) { if (zephir_is_true(_0$$5)) { ZEPHIR_INIT_VAR(lazyHandler); object_init_ex(lazyHandler, phalcon_mvc_micro_lazyloader_ce); - ZEPHIR_CALL_METHOD(NULL, lazyHandler, "__construct", NULL, 298, mainHandler); + ZEPHIR_CALL_METHOD(NULL, lazyHandler, "__construct", NULL, 293, mainHandler); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(lazyHandler, mainHandler); @@ -76530,7 +76747,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, setService) { if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { ZEPHIR_INIT_NVAR(dependencyInjector); object_init_ex(dependencyInjector, phalcon_di_factorydefault_ce); - ZEPHIR_CALL_METHOD(NULL, dependencyInjector, "__construct", NULL, 176); + ZEPHIR_CALL_METHOD(NULL, dependencyInjector, "__construct", NULL, 171); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_dependencyInjector"), dependencyInjector TSRMLS_CC); } @@ -76540,7 +76757,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, setService) { } else { ZVAL_BOOL(_0, 0); } - ZEPHIR_RETURN_CALL_METHOD(dependencyInjector, "set", NULL, 299, serviceName, definition, _0); + ZEPHIR_RETURN_CALL_METHOD(dependencyInjector, "set", NULL, 294, serviceName, definition, _0); zephir_check_call_status(); RETURN_MM(); @@ -76572,11 +76789,11 @@ static PHP_METHOD(Phalcon_Mvc_Micro, hasService) { if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { ZEPHIR_INIT_NVAR(dependencyInjector); object_init_ex(dependencyInjector, phalcon_di_factorydefault_ce); - ZEPHIR_CALL_METHOD(NULL, dependencyInjector, "__construct", NULL, 176); + ZEPHIR_CALL_METHOD(NULL, dependencyInjector, "__construct", NULL, 171); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_dependencyInjector"), dependencyInjector TSRMLS_CC); } - ZEPHIR_RETURN_CALL_METHOD(dependencyInjector, "has", NULL, 300, serviceName); + ZEPHIR_RETURN_CALL_METHOD(dependencyInjector, "has", NULL, 295, serviceName); zephir_check_call_status(); RETURN_MM(); @@ -76608,11 +76825,11 @@ static PHP_METHOD(Phalcon_Mvc_Micro, getService) { if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { ZEPHIR_INIT_NVAR(dependencyInjector); object_init_ex(dependencyInjector, phalcon_di_factorydefault_ce); - ZEPHIR_CALL_METHOD(NULL, dependencyInjector, "__construct", NULL, 176); + ZEPHIR_CALL_METHOD(NULL, dependencyInjector, "__construct", NULL, 171); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_dependencyInjector"), dependencyInjector TSRMLS_CC); } - ZEPHIR_RETURN_CALL_METHOD(dependencyInjector, "get", NULL, 301, serviceName); + ZEPHIR_RETURN_CALL_METHOD(dependencyInjector, "get", NULL, 296, serviceName); zephir_check_call_status(); RETURN_MM(); @@ -76633,11 +76850,11 @@ static PHP_METHOD(Phalcon_Mvc_Micro, getSharedService) { if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { ZEPHIR_INIT_NVAR(dependencyInjector); object_init_ex(dependencyInjector, phalcon_di_factorydefault_ce); - ZEPHIR_CALL_METHOD(NULL, dependencyInjector, "__construct", NULL, 176); + ZEPHIR_CALL_METHOD(NULL, dependencyInjector, "__construct", NULL, 171); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_dependencyInjector"), dependencyInjector TSRMLS_CC); } - ZEPHIR_RETURN_CALL_METHOD(dependencyInjector, "getshared", NULL, 302, serviceName); + ZEPHIR_RETURN_CALL_METHOD(dependencyInjector, "getshared", NULL, 297, serviceName); zephir_check_call_status(); RETURN_MM(); @@ -77311,10 +77528,6 @@ static PHP_METHOD(Phalcon_Mvc_Model, getModelsMetaData) { if (Z_TYPE_P(metaData) != IS_OBJECT) { _0$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_dependencyInjector"), PH_NOISY_CC); ZEPHIR_CPY_WRT(dependencyInjector, _0$$3); - if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injector container is required to obtain the services related to the ORM", "phalcon/mvc/model.zep", 214); - return; - } ZEPHIR_INIT_VAR(_2$$3); ZVAL_STRING(_2$$3, "modelsMetadata", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_CALL_METHOD(&_1$$3, dependencyInjector, "getshared", NULL, 0, _2$$3); @@ -77322,7 +77535,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, getModelsMetaData) { zephir_check_call_status(); ZEPHIR_CPY_WRT(metaData, _1$$3); if (Z_TYPE_P(metaData) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsMetadata' is not valid", "phalcon/mvc/model.zep", 222); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsMetadata' is not valid", "phalcon/mvc/model.zep", 216); return; } zephir_update_property_this(this_ptr, SL("_modelsMetaData"), metaData TSRMLS_CC); @@ -77619,9 +77832,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, assign) { HashTable *_5, *_1$$3; HashPosition _4, _0$$3; - zephir_fcall_cache_entry *_9 = NULL; + zephir_fcall_cache_entry *_9 = NULL, *_11 = NULL; int ZEPHIR_LAST_CALL_STATUS; - zval *data_param = NULL, *dataColumnMap = NULL, *whiteList = NULL, *key = NULL, *keyMapped = NULL, *value = NULL, *attribute = NULL, *attributeField = NULL, *possibleSetter = NULL, *metaData = NULL, *columnMap = NULL, *dataMapped = NULL, *_3 = NULL, **_6, **_2$$3, *_7$$13 = NULL, *_8$$13 = NULL, *_10$$16 = NULL; + zval *data_param = NULL, *dataColumnMap = NULL, *whiteList = NULL, *key = NULL, *keyMapped = NULL, *value = NULL, *attribute = NULL, *attributeField = NULL, *metaData = NULL, *columnMap = NULL, *dataMapped = NULL, *_3 = NULL, **_6, **_2$$3, *_7$$13 = NULL, *_8$$13 = NULL, *_10$$16 = NULL; zval *data = NULL; ZEPHIR_MM_GROW(); @@ -77639,7 +77852,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, assign) { if (Z_TYPE_P(dataColumnMap) == IS_ARRAY) { ZEPHIR_INIT_VAR(dataMapped); array_init(dataMapped); - zephir_is_iterable(data, &_1$$3, &_0$$3, 0, 0, "phalcon/mvc/model.zep", 443); + zephir_is_iterable(data, &_1$$3, &_0$$3, 0, 0, "phalcon/mvc/model.zep", 437); for ( ; zephir_hash_get_current_data_ex(_1$$3, (void**) &_2$$3, &_0$$3) == SUCCESS ; zephir_hash_move_forward_ex(_1$$3, &_0$$3) @@ -77668,7 +77881,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, assign) { } ZEPHIR_CALL_METHOD(&_3, metaData, "getattributes", NULL, 0, this_ptr); zephir_check_call_status(); - zephir_is_iterable(_3, &_5, &_4, 0, 0, "phalcon/mvc/model.zep", 495); + zephir_is_iterable(_3, &_5, &_4, 0, 0, "phalcon/mvc/model.zep", 486); for ( ; zephir_hash_get_current_data_ex(_5, (void**) &_6, &_4) == SUCCESS ; zephir_hash_move_forward_ex(_5, &_4) @@ -77684,7 +77897,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, assign) { ZEPHIR_CONCAT_SVS(_8$$13, "Column '", attribute, "' doesn\\'t make part of the column map"); ZEPHIR_CALL_METHOD(NULL, _7$$13, "__construct", &_9, 9, _8$$13); zephir_check_call_status(); - zephir_throw_exception_debug(_7$$13, "phalcon/mvc/model.zep", 465 TSRMLS_CC); + zephir_throw_exception_debug(_7$$13, "phalcon/mvc/model.zep", 459 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -77701,14 +77914,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, assign) { continue; } } - ZEPHIR_INIT_NVAR(_10$$16); - zephir_camelize(_10$$16, attributeField); - ZEPHIR_INIT_NVAR(possibleSetter); - ZEPHIR_CONCAT_SV(possibleSetter, "set", _10$$16); - if ((zephir_method_exists(this_ptr, possibleSetter TSRMLS_CC) == SUCCESS)) { - ZEPHIR_CALL_METHOD_ZVAL(NULL, this_ptr, possibleSetter, NULL, 0, value); - zephir_check_call_status(); - } else { + ZEPHIR_CALL_METHOD(&_10$$16, this_ptr, "_possiblesetter", &_11, 298, attributeField, value); + zephir_check_call_status(); + if (!(zephir_is_true(_10$$16))) { zephir_update_property_zval_zval(this_ptr, attributeField, value TSRMLS_CC); } } @@ -77751,7 +77959,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap) { ZVAL_LONG(_0, dirtyState); ZEPHIR_CALL_METHOD(NULL, instance, "setdirtystate", NULL, 0, _0); zephir_check_call_status(); - zephir_is_iterable(data, &_2, &_1, 0, 0, "phalcon/mvc/model.zep", 595); + zephir_is_iterable(data, &_2, &_1, 0, 0, "phalcon/mvc/model.zep", 586); for ( ; zephir_hash_get_current_data_ex(_2, (void**) &_3, &_1) == SUCCESS ; zephir_hash_move_forward_ex(_2, &_1) @@ -77772,7 +77980,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap) { ZEPHIR_CONCAT_SVS(_5$$7, "Column '", key, "' doesn't make part of the column map"); ZEPHIR_CALL_METHOD(NULL, _4$$7, "__construct", &_6, 9, _5$$7); zephir_check_call_status(); - zephir_throw_exception_debug(_4$$7, "phalcon/mvc/model.zep", 538 TSRMLS_CC); + zephir_throw_exception_debug(_4$$7, "phalcon/mvc/model.zep", 529 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -77788,7 +77996,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap) { _7$$4 = Z_TYPE_P(value) != IS_NULL; } if (_7$$4) { - zephir_array_fetch_long(&_8$$10, attribute, 1, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 550 TSRMLS_CC); + zephir_array_fetch_long(&_8$$10, attribute, 1, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 541 TSRMLS_CC); do { if (ZEPHIR_IS_LONG(_8$$10, 0)) { ZEPHIR_SINIT_NVAR(_9$$11); @@ -77812,7 +78020,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap) { } while(0); } else { - zephir_array_fetch_long(&_11$$15, attribute, 1, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 571 TSRMLS_CC); + zephir_array_fetch_long(&_11$$15, attribute, 1, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 562 TSRMLS_CC); do { if (ZEPHIR_IS_LONG(_11$$15, 0) || ZEPHIR_IS_LONG(_11$$15, 9) || ZEPHIR_IS_LONG(_11$$15, 3) || ZEPHIR_IS_LONG(_11$$15, 7) || ZEPHIR_IS_LONG(_11$$15, 8)) { ZEPHIR_INIT_NVAR(castValue); @@ -77825,7 +78033,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap) { } ZEPHIR_OBS_NVAR(attributeName); - zephir_array_fetch_long(&attributeName, attribute, 0, PH_NOISY, "phalcon/mvc/model.zep", 587 TSRMLS_CC); + zephir_array_fetch_long(&attributeName, attribute, 0, PH_NOISY, "phalcon/mvc/model.zep", 578 TSRMLS_CC); zephir_update_property_zval_zval(instance, attributeName, castValue TSRMLS_CC); } } @@ -77869,7 +78077,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate) { ZEPHIR_INIT_VAR(hydrateObject); object_init(hydrateObject); } - zephir_is_iterable(data, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 669); + zephir_is_iterable(data, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 660); for ( ; zephir_hash_get_current_data_ex(_1, (void**) &_2, &_0) == SUCCESS ; zephir_hash_move_forward_ex(_1, &_0) @@ -77887,7 +78095,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate) { ZEPHIR_CONCAT_SVS(_4$$11, "Column '", key, "' doesn't make part of the column map"); ZEPHIR_CALL_METHOD(NULL, _3$$11, "__construct", &_5, 9, _4$$11); zephir_check_call_status(); - zephir_throw_exception_debug(_3$$11, "phalcon/mvc/model.zep", 648 TSRMLS_CC); + zephir_throw_exception_debug(_3$$11, "phalcon/mvc/model.zep", 639 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -77942,7 +78150,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResult) { ZVAL_LONG(_0, dirtyState); ZEPHIR_CALL_METHOD(NULL, instance, "setdirtystate", NULL, 0, _0); zephir_check_call_status(); - zephir_is_iterable(data, &_2, &_1, 0, 0, "phalcon/mvc/model.zep", 716); + zephir_is_iterable(data, &_2, &_1, 0, 0, "phalcon/mvc/model.zep", 707); for ( ; zephir_hash_get_current_data_ex(_2, (void**) &_3, &_1) == SUCCESS ; zephir_hash_move_forward_ex(_2, &_1) @@ -77950,7 +78158,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResult) { ZEPHIR_GET_HMKEY(key, _2, _1); ZEPHIR_GET_HVALUE(value, _3); if (Z_TYPE_P(key) != IS_STRING) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid key in array data provided to dumpResult()", "phalcon/mvc/model.zep", 708); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid key in array data provided to dumpResult()", "phalcon/mvc/model.zep", 699); return; } zephir_update_property_zval_zval(instance, key, value TSRMLS_CC); @@ -77989,7 +78197,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, find) { ZEPHIR_INIT_VAR(params); array_init(params); if (Z_TYPE_P(parameters) != IS_NULL) { - zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/mvc/model.zep", 762); + zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/mvc/model.zep", 753); } } else { ZEPHIR_CPY_WRT(params, parameters); @@ -78064,7 +78272,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, findFirst) { ZEPHIR_INIT_VAR(params); array_init(params); if (Z_TYPE_P(parameters) != IS_NULL) { - zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/mvc/model.zep", 849); + zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/mvc/model.zep", 840); } } else { ZEPHIR_CPY_WRT(params, parameters); @@ -78148,12 +78356,12 @@ static PHP_METHOD(Phalcon_Mvc_Model, query) { ZEPHIR_CALL_METHOD(NULL, criteria, "__construct", NULL, 0); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, criteria, "setdi", NULL, 303, dependencyInjector); + ZEPHIR_CALL_METHOD(NULL, criteria, "setdi", NULL, 299, dependencyInjector); zephir_check_call_status(); } ZEPHIR_INIT_VAR(_3); zephir_get_called_class(_3 TSRMLS_CC); - ZEPHIR_CALL_METHOD(NULL, criteria, "setmodelname", NULL, 304, _3); + ZEPHIR_CALL_METHOD(NULL, criteria, "setmodelname", NULL, 300, _3); zephir_check_call_status(); RETURN_CCTOR(criteria); @@ -78207,7 +78415,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _exists) { array_init(uniqueParams); ZEPHIR_INIT_NVAR(uniqueTypes); array_init(uniqueTypes); - zephir_is_iterable(primaryKeys, &_1$$3, &_0$$3, 0, 0, "phalcon/mvc/model.zep", 1020); + zephir_is_iterable(primaryKeys, &_1$$3, &_0$$3, 0, 0, "phalcon/mvc/model.zep", 1011); for ( ; zephir_hash_get_current_data_ex(_1$$3, (void**) &_2$$3, &_0$$3) == SUCCESS ; zephir_hash_move_forward_ex(_1$$3, &_0$$3) @@ -78222,7 +78430,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _exists) { ZEPHIR_CONCAT_SVS(_4$$9, "Column '", field, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, _3$$9, "__construct", &_5, 9, _4$$9); zephir_check_call_status(); - zephir_throw_exception_debug(_3$$9, "phalcon/mvc/model.zep", 984 TSRMLS_CC); + zephir_throw_exception_debug(_3$$9, "phalcon/mvc/model.zep", 975 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -78240,9 +78448,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, _exists) { if (_6$$11) { numberEmpty++; } - zephir_array_append(&uniqueParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1002); + zephir_array_append(&uniqueParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 993); } else { - zephir_array_append(&uniqueParams, ZEPHIR_GLOBAL(global_null), PH_SEPARATE, "phalcon/mvc/model.zep", 1005); + zephir_array_append(&uniqueParams, ZEPHIR_GLOBAL(global_null), PH_SEPARATE, "phalcon/mvc/model.zep", 996); numberEmpty++; } ZEPHIR_OBS_NVAR(type); @@ -78253,16 +78461,16 @@ static PHP_METHOD(Phalcon_Mvc_Model, _exists) { ZEPHIR_CONCAT_SVS(_8$$14, "Column '", field, "' isn't part of the table columns"); ZEPHIR_CALL_METHOD(NULL, _7$$14, "__construct", &_5, 9, _8$$14); zephir_check_call_status(); - zephir_throw_exception_debug(_7$$14, "phalcon/mvc/model.zep", 1010 TSRMLS_CC); + zephir_throw_exception_debug(_7$$14, "phalcon/mvc/model.zep", 1001 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&uniqueTypes, type, PH_SEPARATE, "phalcon/mvc/model.zep", 1013); + zephir_array_append(&uniqueTypes, type, PH_SEPARATE, "phalcon/mvc/model.zep", 1004); ZEPHIR_CALL_METHOD(&_9$$7, connection, "escapeidentifier", &_10, 0, field); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_11$$7); ZEPHIR_CONCAT_VS(_11$$7, _9$$7, " = ?"); - zephir_array_append(&wherePk, _11$$7, PH_SEPARATE, "phalcon/mvc/model.zep", 1014); + zephir_array_append(&wherePk, _11$$7, PH_SEPARATE, "phalcon/mvc/model.zep", 1005); } if (numberPrimary == numberEmpty) { RETURN_MM_BOOL(0); @@ -78307,10 +78515,10 @@ static PHP_METHOD(Phalcon_Mvc_Model, _exists) { ZEPHIR_INIT_VAR(_14); ZEPHIR_CONCAT_SVSV(_14, "SELECT COUNT(*) \"rowcount\" FROM ", _13, " WHERE ", uniqueKey); ZEPHIR_INIT_VAR(_15); - ZVAL_NULL(_15); + ZVAL_LONG(_15, 2); ZEPHIR_CALL_METHOD(&num, connection, "fetchone", NULL, 0, _14, _15, uniqueParams, uniqueTypes); zephir_check_call_status(); - zephir_array_fetch_string(&_16, num, SL("rowcount"), PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1070 TSRMLS_CC); + zephir_array_fetch_string(&_16, num, SL("rowcount"), PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1061 TSRMLS_CC); if (zephir_is_true(_16)) { ZEPHIR_INIT_ZVAL_NREF(_17$$22); ZVAL_LONG(_17$$22, 0); @@ -78369,7 +78577,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _groupResult) { ZEPHIR_INIT_VAR(params); array_init(params); if (Z_TYPE_P(parameters) != IS_NULL) { - zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/mvc/model.zep", 1100); + zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/mvc/model.zep", 1091); } } else { ZEPHIR_CPY_WRT(params, parameters); @@ -78683,7 +78891,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, validate) { if (ZEPHIR_IS_FALSE_IDENTICAL(_0)) { ZEPHIR_CALL_METHOD(&_1$$3, validator, "getmessages", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(_1$$3, &_3$$3, &_2$$3, 0, 0, "phalcon/mvc/model.zep", 1400); + zephir_is_iterable(_1$$3, &_3$$3, &_2$$3, 0, 0, "phalcon/mvc/model.zep", 1391); for ( ; zephir_hash_get_current_data_ex(_3$$3, (void**) &_4$$3, &_2$$3) == SUCCESS ; zephir_hash_move_forward_ex(_3$$3, &_2$$3) @@ -78735,7 +78943,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, getMessages) { ZEPHIR_INIT_VAR(filtered); array_init(filtered); _1$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_errorMessages"), PH_NOISY_CC); - zephir_is_iterable(_1$$3, &_3$$3, &_2$$3, 0, 0, "phalcon/mvc/model.zep", 1466); + zephir_is_iterable(_1$$3, &_3$$3, &_2$$3, 0, 0, "phalcon/mvc/model.zep", 1457); for ( ; zephir_hash_get_current_data_ex(_3$$3, (void**) &_4$$3, &_2$$3) == SUCCESS ; zephir_hash_move_forward_ex(_3$$3, &_2$$3) @@ -78744,7 +78952,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, getMessages) { ZEPHIR_CALL_METHOD(&_5$$4, message, "getfield", NULL, 0); zephir_check_call_status(); if (ZEPHIR_IS_EQUAL(_5$$4, filter)) { - zephir_array_append(&filtered, message, PH_SEPARATE, "phalcon/mvc/model.zep", 1463); + zephir_array_append(&filtered, message, PH_SEPARATE, "phalcon/mvc/model.zep", 1454); } } RETURN_CCTOR(filtered); @@ -78772,7 +78980,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { zephir_check_call_status(); if (zephir_fast_count_int(belongsTo TSRMLS_CC)) { error = 0; - zephir_is_iterable(belongsTo, &_2$$3, &_1$$3, 0, 0, "phalcon/mvc/model.zep", 1609); + zephir_is_iterable(belongsTo, &_2$$3, &_1$$3, 0, 0, "phalcon/mvc/model.zep", 1600); for ( ; zephir_hash_get_current_data_ex(_2$$3, (void**) &_3$$3, &_1$$3) == SUCCESS ; zephir_hash_move_forward_ex(_2$$3, &_1$$3) @@ -78785,7 +78993,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { if (Z_TYPE_P(foreignKey) == IS_ARRAY) { if (zephir_array_isset_string(foreignKey, SS("action"))) { ZEPHIR_OBS_NVAR(_4$$7); - zephir_array_fetch_string(&_4$$7, foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 1510 TSRMLS_CC); + zephir_array_fetch_string(&_4$$7, foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 1501 TSRMLS_CC); action = zephir_get_intval(_4$$7); } } @@ -78804,7 +79012,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { ZEPHIR_CALL_METHOD(&referencedFields, relation, "getreferencedfields", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(fields) == IS_ARRAY) { - zephir_is_iterable(fields, &_8$$9, &_7$$9, 0, 0, "phalcon/mvc/model.zep", 1546); + zephir_is_iterable(fields, &_8$$9, &_7$$9, 0, 0, "phalcon/mvc/model.zep", 1537); for ( ; zephir_hash_get_current_data_ex(_8$$9, (void**) &_9$$9, &_7$$9) == SUCCESS ; zephir_hash_move_forward_ex(_8$$9, &_7$$9) @@ -78813,11 +79021,11 @@ static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { ZEPHIR_GET_HVALUE(field, _9$$9); ZEPHIR_OBS_NVAR(value); zephir_fetch_property_zval(&value, this_ptr, field, PH_SILENT_CC); - zephir_array_fetch(&_10$$10, referencedFields, position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1539 TSRMLS_CC); + zephir_array_fetch(&_10$$10, referencedFields, position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1530 TSRMLS_CC); ZEPHIR_INIT_LNVAR(_11$$10); ZEPHIR_CONCAT_SVSV(_11$$10, "[", _10$$10, "] = ?", position); - zephir_array_append(&conditions, _11$$10, PH_SEPARATE, "phalcon/mvc/model.zep", 1539); - zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1540); + zephir_array_append(&conditions, _11$$10, PH_SEPARATE, "phalcon/mvc/model.zep", 1530); + zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1531); if (Z_TYPE_P(value) == IS_NULL) { numberNull++; } @@ -78828,15 +79036,15 @@ static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { zephir_fetch_property_zval(&value, this_ptr, fields, PH_SILENT_CC); ZEPHIR_INIT_LNVAR(_12$$12); ZEPHIR_CONCAT_SVS(_12$$12, "[", referencedFields, "] = ?0"); - zephir_array_append(&conditions, _12$$12, PH_SEPARATE, "phalcon/mvc/model.zep", 1551); - zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1552); + zephir_array_append(&conditions, _12$$12, PH_SEPARATE, "phalcon/mvc/model.zep", 1542); + zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1543); if (Z_TYPE_P(value) == IS_NULL) { validateWithNulls = 1; } } ZEPHIR_OBS_NVAR(extraConditions); if (zephir_array_isset_string_fetch(&extraConditions, foreignKey, SS("conditions"), 0 TSRMLS_CC)) { - zephir_array_append(&conditions, extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 1563); + zephir_array_append(&conditions, extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 1554); } if (validateWithNulls) { ZEPHIR_OBS_NVAR(allowNulls); @@ -78904,10 +79112,10 @@ static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseCascade) { - zval *_13$$8 = NULL; - HashTable *_2$$3, *_8$$9; - HashPosition _1$$3, _7$$9; - zval *manager = NULL, *relations = NULL, *relation = NULL, *foreignKey = NULL, *resultset = NULL, *conditions = NULL, *bindParams = NULL, *referencedModel = NULL, *referencedFields = NULL, *fields = NULL, *field = NULL, *position = NULL, *value = NULL, *extraConditions = NULL, *_0, **_3$$3, *_4$$7 = NULL, *_5$$8 = NULL, *_14$$8 = NULL, *_15$$8 = NULL, **_9$$9, *_10$$10, *_11$$10 = NULL, *_12$$11 = NULL; + zval *_13$$7 = NULL; + HashTable *_2, *_8$$8; + HashPosition _1, _7$$8; + zval *manager = NULL, *relations = NULL, *relation = NULL, *foreignKey = NULL, *resultset = NULL, *conditions = NULL, *bindParams = NULL, *referencedModel = NULL, *referencedFields = NULL, *fields = NULL, *field = NULL, *position = NULL, *value = NULL, *extraConditions = NULL, *_0, **_3, *_4$$6 = NULL, *_5$$7 = NULL, *_14$$7 = NULL, *_15$$7 = NULL, **_9$$8, *_10$$9, *_11$$9 = NULL, *_12$$10 = NULL; zephir_fcall_cache_entry *_6 = NULL; int ZEPHIR_LAST_CALL_STATUS, action = 0; @@ -78917,78 +79125,76 @@ static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseCascade) { ZEPHIR_CPY_WRT(manager, _0); ZEPHIR_CALL_METHOD(&relations, manager, "gethasoneandhasmany", NULL, 0, this_ptr); zephir_check_call_status(); - if (zephir_fast_count_int(relations TSRMLS_CC)) { - zephir_is_iterable(relations, &_2$$3, &_1$$3, 0, 0, "phalcon/mvc/model.zep", 1723); - for ( - ; zephir_hash_get_current_data_ex(_2$$3, (void**) &_3$$3, &_1$$3) == SUCCESS - ; zephir_hash_move_forward_ex(_2$$3, &_1$$3) - ) { - ZEPHIR_GET_HVALUE(relation, _3$$3); - ZEPHIR_CALL_METHOD(&foreignKey, relation, "getforeignkey", NULL, 0); - zephir_check_call_status(); - if (!ZEPHIR_IS_FALSE_IDENTICAL(foreignKey)) { - action = 0; - if (Z_TYPE_P(foreignKey) == IS_ARRAY) { - if (zephir_array_isset_string(foreignKey, SS("action"))) { - ZEPHIR_OBS_NVAR(_4$$7); - zephir_array_fetch_string(&_4$$7, foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 1662 TSRMLS_CC); - action = zephir_get_intval(_4$$7); - } + zephir_is_iterable(relations, &_2, &_1, 0, 0, "phalcon/mvc/model.zep", 1713); + for ( + ; zephir_hash_get_current_data_ex(_2, (void**) &_3, &_1) == SUCCESS + ; zephir_hash_move_forward_ex(_2, &_1) + ) { + ZEPHIR_GET_HVALUE(relation, _3); + ZEPHIR_CALL_METHOD(&foreignKey, relation, "getforeignkey", NULL, 0); + zephir_check_call_status(); + if (!ZEPHIR_IS_FALSE_IDENTICAL(foreignKey)) { + action = 0; + if (Z_TYPE_P(foreignKey) == IS_ARRAY) { + if (zephir_array_isset_string(foreignKey, SS("action"))) { + ZEPHIR_OBS_NVAR(_4$$6); + zephir_array_fetch_string(&_4$$6, foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 1651 TSRMLS_CC); + action = zephir_get_intval(_4$$6); } - if (action == 2) { - ZEPHIR_CALL_METHOD(&_5$$8, relation, "getreferencedmodel", NULL, 0); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&referencedModel, manager, "load", &_6, 0, _5$$8); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&fields, relation, "getfields", NULL, 0); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&referencedFields, relation, "getreferencedfields", NULL, 0); - zephir_check_call_status(); - ZEPHIR_INIT_NVAR(conditions); - array_init(conditions); - ZEPHIR_INIT_NVAR(bindParams); - array_init(bindParams); - if (Z_TYPE_P(fields) == IS_ARRAY) { - zephir_is_iterable(fields, &_8$$9, &_7$$9, 0, 0, "phalcon/mvc/model.zep", 1690); - for ( - ; zephir_hash_get_current_data_ex(_8$$9, (void**) &_9$$9, &_7$$9) == SUCCESS - ; zephir_hash_move_forward_ex(_8$$9, &_7$$9) - ) { - ZEPHIR_GET_HMKEY(position, _8$$9, _7$$9); - ZEPHIR_GET_HVALUE(field, _9$$9); - ZEPHIR_OBS_NVAR(value); - zephir_fetch_property_zval(&value, this_ptr, field, PH_SILENT_CC); - zephir_array_fetch(&_10$$10, referencedFields, position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1687 TSRMLS_CC); - ZEPHIR_INIT_LNVAR(_11$$10); - ZEPHIR_CONCAT_SVSV(_11$$10, "[", _10$$10, "] = ?", position); - zephir_array_append(&conditions, _11$$10, PH_SEPARATE, "phalcon/mvc/model.zep", 1687); - zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1688); - } - } else { + } + if (action == 2) { + ZEPHIR_CALL_METHOD(&_5$$7, relation, "getreferencedmodel", NULL, 0); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&referencedModel, manager, "load", &_6, 0, _5$$7); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&fields, relation, "getfields", NULL, 0); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&referencedFields, relation, "getreferencedfields", NULL, 0); + zephir_check_call_status(); + ZEPHIR_INIT_NVAR(conditions); + array_init(conditions); + ZEPHIR_INIT_NVAR(bindParams); + array_init(bindParams); + if (Z_TYPE_P(fields) == IS_ARRAY) { + zephir_is_iterable(fields, &_8$$8, &_7$$8, 0, 0, "phalcon/mvc/model.zep", 1679); + for ( + ; zephir_hash_get_current_data_ex(_8$$8, (void**) &_9$$8, &_7$$8) == SUCCESS + ; zephir_hash_move_forward_ex(_8$$8, &_7$$8) + ) { + ZEPHIR_GET_HMKEY(position, _8$$8, _7$$8); + ZEPHIR_GET_HVALUE(field, _9$$8); ZEPHIR_OBS_NVAR(value); - zephir_fetch_property_zval(&value, this_ptr, fields, PH_SILENT_CC); - ZEPHIR_INIT_LNVAR(_12$$11); - ZEPHIR_CONCAT_SVS(_12$$11, "[", referencedFields, "] = ?0"); - zephir_array_append(&conditions, _12$$11, PH_SEPARATE, "phalcon/mvc/model.zep", 1692); - zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1693); - } - ZEPHIR_OBS_NVAR(extraConditions); - if (zephir_array_isset_string_fetch(&extraConditions, foreignKey, SS("conditions"), 0 TSRMLS_CC)) { - zephir_array_append(&conditions, extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 1700); - } - ZEPHIR_INIT_NVAR(_13$$8); - zephir_create_array(_13$$8, 2, 0 TSRMLS_CC); - ZEPHIR_INIT_NVAR(_14$$8); - zephir_fast_join_str(_14$$8, SL(" AND "), conditions TSRMLS_CC); - zephir_array_fast_append(_13$$8, _14$$8); - zephir_array_update_string(&_13$$8, SL("bind"), &bindParams, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&resultset, referencedModel, "find", NULL, 0, _13$$8); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_15$$8, resultset, "delete", NULL, 0); - zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(_15$$8)) { - RETURN_MM_BOOL(0); + zephir_fetch_property_zval(&value, this_ptr, field, PH_SILENT_CC); + zephir_array_fetch(&_10$$9, referencedFields, position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1676 TSRMLS_CC); + ZEPHIR_INIT_LNVAR(_11$$9); + ZEPHIR_CONCAT_SVSV(_11$$9, "[", _10$$9, "] = ?", position); + zephir_array_append(&conditions, _11$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 1676); + zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1677); } + } else { + ZEPHIR_OBS_NVAR(value); + zephir_fetch_property_zval(&value, this_ptr, fields, PH_SILENT_CC); + ZEPHIR_INIT_LNVAR(_12$$10); + ZEPHIR_CONCAT_SVS(_12$$10, "[", referencedFields, "] = ?0"); + zephir_array_append(&conditions, _12$$10, PH_SEPARATE, "phalcon/mvc/model.zep", 1681); + zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1682); + } + ZEPHIR_OBS_NVAR(extraConditions); + if (zephir_array_isset_string_fetch(&extraConditions, foreignKey, SS("conditions"), 0 TSRMLS_CC)) { + zephir_array_append(&conditions, extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 1689); + } + ZEPHIR_INIT_NVAR(_13$$7); + zephir_create_array(_13$$7, 2, 0 TSRMLS_CC); + ZEPHIR_INIT_NVAR(_14$$7); + zephir_fast_join_str(_14$$7, SL(" AND "), conditions TSRMLS_CC); + zephir_array_fast_append(_13$$7, _14$$7); + zephir_array_update_string(&_13$$7, SL("bind"), &bindParams, PH_COPY | PH_SEPARATE); + ZEPHIR_CALL_METHOD(&resultset, referencedModel, "find", NULL, 0, _13$$7); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&_15$$7, resultset, "delete", NULL, 0); + zephir_check_call_status(); + if (ZEPHIR_IS_FALSE_IDENTICAL(_15$$7)) { + RETURN_MM_BOOL(0); } } } @@ -78999,10 +79205,10 @@ static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseCascade) { static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseRestrict) { - zval *_13$$8 = NULL; - HashTable *_2$$3, *_7$$9; - HashPosition _1$$3, _6$$9; - zval *manager = NULL, *relations = NULL, *foreignKey = NULL, *relation = NULL, *relationClass = NULL, *referencedModel = NULL, *fields = NULL, *referencedFields = NULL, *conditions = NULL, *bindParams = NULL, *position = NULL, *field = NULL, *value = NULL, *extraConditions = NULL, *message = NULL, *_0, **_3$$3, *_4$$7 = NULL, **_8$$9, *_9$$10, *_10$$10 = NULL, *_11$$11 = NULL, *_12$$8 = NULL, *_14$$8 = NULL, *_15$$13 = NULL, *_16$$13 = NULL, *_19$$16; + zval *_13$$7 = NULL; + HashTable *_2, *_7$$8; + HashPosition _1, _6$$8; + zval *manager = NULL, *relations = NULL, *foreignKey = NULL, *relation = NULL, *relationClass = NULL, *referencedModel = NULL, *fields = NULL, *referencedFields = NULL, *conditions = NULL, *bindParams = NULL, *position = NULL, *field = NULL, *value = NULL, *extraConditions = NULL, *message = NULL, *_0, **_3, *_4$$6 = NULL, **_8$$8, *_9$$9, *_10$$9 = NULL, *_11$$10 = NULL, *_12$$7 = NULL, *_14$$7 = NULL, *_15$$12 = NULL, *_16$$12 = NULL, *_19$$15; zend_bool error = 0; zephir_fcall_cache_entry *_5 = NULL, *_17 = NULL, *_18 = NULL; int ZEPHIR_LAST_CALL_STATUS, action = 0; @@ -79013,107 +79219,105 @@ static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseRestrict) { ZEPHIR_CPY_WRT(manager, _0); ZEPHIR_CALL_METHOD(&relations, manager, "gethasoneandhasmany", NULL, 0, this_ptr); zephir_check_call_status(); - if (zephir_fast_count_int(relations TSRMLS_CC)) { - error = 0; - zephir_is_iterable(relations, &_2$$3, &_1$$3, 0, 0, "phalcon/mvc/model.zep", 1842); - for ( - ; zephir_hash_get_current_data_ex(_2$$3, (void**) &_3$$3, &_1$$3) == SUCCESS - ; zephir_hash_move_forward_ex(_2$$3, &_1$$3) - ) { - ZEPHIR_GET_HVALUE(relation, _3$$3); - ZEPHIR_CALL_METHOD(&foreignKey, relation, "getforeignkey", NULL, 0); - zephir_check_call_status(); - if (!ZEPHIR_IS_FALSE_IDENTICAL(foreignKey)) { - action = 1; - if (Z_TYPE_P(foreignKey) == IS_ARRAY) { - if (zephir_array_isset_string(foreignKey, SS("action"))) { - ZEPHIR_OBS_NVAR(_4$$7); - zephir_array_fetch_string(&_4$$7, foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 1770 TSRMLS_CC); - action = zephir_get_intval(_4$$7); - } + error = 0; + zephir_is_iterable(relations, &_2, &_1, 0, 0, "phalcon/mvc/model.zep", 1829); + for ( + ; zephir_hash_get_current_data_ex(_2, (void**) &_3, &_1) == SUCCESS + ; zephir_hash_move_forward_ex(_2, &_1) + ) { + ZEPHIR_GET_HVALUE(relation, _3); + ZEPHIR_CALL_METHOD(&foreignKey, relation, "getforeignkey", NULL, 0); + zephir_check_call_status(); + if (!ZEPHIR_IS_FALSE_IDENTICAL(foreignKey)) { + action = 1; + if (Z_TYPE_P(foreignKey) == IS_ARRAY) { + if (zephir_array_isset_string(foreignKey, SS("action"))) { + ZEPHIR_OBS_NVAR(_4$$6); + zephir_array_fetch_string(&_4$$6, foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 1757 TSRMLS_CC); + action = zephir_get_intval(_4$$6); } - if (action == 1) { - ZEPHIR_CALL_METHOD(&relationClass, relation, "getreferencedmodel", NULL, 0); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&referencedModel, manager, "load", &_5, 0, relationClass); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&fields, relation, "getfields", NULL, 0); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&referencedFields, relation, "getreferencedfields", NULL, 0); - zephir_check_call_status(); - ZEPHIR_INIT_NVAR(conditions); - array_init(conditions); - ZEPHIR_INIT_NVAR(bindParams); - array_init(bindParams); - if (Z_TYPE_P(fields) == IS_ARRAY) { - zephir_is_iterable(fields, &_7$$9, &_6$$9, 0, 0, "phalcon/mvc/model.zep", 1802); - for ( - ; zephir_hash_get_current_data_ex(_7$$9, (void**) &_8$$9, &_6$$9) == SUCCESS - ; zephir_hash_move_forward_ex(_7$$9, &_6$$9) - ) { - ZEPHIR_GET_HMKEY(position, _7$$9, _6$$9); - ZEPHIR_GET_HVALUE(field, _8$$9); - ZEPHIR_OBS_NVAR(value); - zephir_fetch_property_zval(&value, this_ptr, field, PH_SILENT_CC); - zephir_array_fetch(&_9$$10, referencedFields, position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1798 TSRMLS_CC); - ZEPHIR_INIT_LNVAR(_10$$10); - ZEPHIR_CONCAT_SVSV(_10$$10, "[", _9$$10, "] = ?", position); - zephir_array_append(&conditions, _10$$10, PH_SEPARATE, "phalcon/mvc/model.zep", 1798); - zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1799); - } - } else { + } + if (action == 1) { + ZEPHIR_CALL_METHOD(&relationClass, relation, "getreferencedmodel", NULL, 0); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&referencedModel, manager, "load", &_5, 0, relationClass); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&fields, relation, "getfields", NULL, 0); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&referencedFields, relation, "getreferencedfields", NULL, 0); + zephir_check_call_status(); + ZEPHIR_INIT_NVAR(conditions); + array_init(conditions); + ZEPHIR_INIT_NVAR(bindParams); + array_init(bindParams); + if (Z_TYPE_P(fields) == IS_ARRAY) { + zephir_is_iterable(fields, &_7$$8, &_6$$8, 0, 0, "phalcon/mvc/model.zep", 1789); + for ( + ; zephir_hash_get_current_data_ex(_7$$8, (void**) &_8$$8, &_6$$8) == SUCCESS + ; zephir_hash_move_forward_ex(_7$$8, &_6$$8) + ) { + ZEPHIR_GET_HMKEY(position, _7$$8, _6$$8); + ZEPHIR_GET_HVALUE(field, _8$$8); ZEPHIR_OBS_NVAR(value); - zephir_fetch_property_zval(&value, this_ptr, fields, PH_SILENT_CC); - ZEPHIR_INIT_LNVAR(_11$$11); - ZEPHIR_CONCAT_SVS(_11$$11, "[", referencedFields, "] = ?0"); - zephir_array_append(&conditions, _11$$11, PH_SEPARATE, "phalcon/mvc/model.zep", 1804); - zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1805); + zephir_fetch_property_zval(&value, this_ptr, field, PH_SILENT_CC); + zephir_array_fetch(&_9$$9, referencedFields, position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1785 TSRMLS_CC); + ZEPHIR_INIT_LNVAR(_10$$9); + ZEPHIR_CONCAT_SVSV(_10$$9, "[", _9$$9, "] = ?", position); + zephir_array_append(&conditions, _10$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 1785); + zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1786); } - ZEPHIR_OBS_NVAR(extraConditions); - if (zephir_array_isset_string_fetch(&extraConditions, foreignKey, SS("conditions"), 0 TSRMLS_CC)) { - zephir_array_append(&conditions, extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 1812); + } else { + ZEPHIR_OBS_NVAR(value); + zephir_fetch_property_zval(&value, this_ptr, fields, PH_SILENT_CC); + ZEPHIR_INIT_LNVAR(_11$$10); + ZEPHIR_CONCAT_SVS(_11$$10, "[", referencedFields, "] = ?0"); + zephir_array_append(&conditions, _11$$10, PH_SEPARATE, "phalcon/mvc/model.zep", 1791); + zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1792); + } + ZEPHIR_OBS_NVAR(extraConditions); + if (zephir_array_isset_string_fetch(&extraConditions, foreignKey, SS("conditions"), 0 TSRMLS_CC)) { + zephir_array_append(&conditions, extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 1799); + } + ZEPHIR_INIT_NVAR(_13$$7); + zephir_create_array(_13$$7, 2, 0 TSRMLS_CC); + ZEPHIR_INIT_NVAR(_14$$7); + zephir_fast_join_str(_14$$7, SL(" AND "), conditions TSRMLS_CC); + zephir_array_fast_append(_13$$7, _14$$7); + zephir_array_update_string(&_13$$7, SL("bind"), &bindParams, PH_COPY | PH_SEPARATE); + ZEPHIR_CALL_METHOD(&_12$$7, referencedModel, "count", NULL, 0, _13$$7); + zephir_check_call_status(); + if (zephir_is_true(_12$$7)) { + ZEPHIR_OBS_NVAR(message); + if (!(zephir_array_isset_string_fetch(&message, foreignKey, SS("message"), 0 TSRMLS_CC))) { + ZEPHIR_INIT_NVAR(message); + ZEPHIR_CONCAT_SV(message, "Record is referenced by model ", relationClass); } - ZEPHIR_INIT_NVAR(_13$$8); - zephir_create_array(_13$$8, 2, 0 TSRMLS_CC); - ZEPHIR_INIT_NVAR(_14$$8); - zephir_fast_join_str(_14$$8, SL(" AND "), conditions TSRMLS_CC); - zephir_array_fast_append(_13$$8, _14$$8); - zephir_array_update_string(&_13$$8, SL("bind"), &bindParams, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_12$$8, referencedModel, "count", NULL, 0, _13$$8); + ZEPHIR_INIT_NVAR(_15$$12); + object_init_ex(_15$$12, phalcon_mvc_model_message_ce); + ZEPHIR_INIT_NVAR(_16$$12); + ZVAL_STRING(_16$$12, "ConstraintViolation", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(NULL, _15$$12, "__construct", &_17, 8, message, fields, _16$$12); + zephir_check_temp_parameter(_16$$12); zephir_check_call_status(); - if (zephir_is_true(_12$$8)) { - ZEPHIR_OBS_NVAR(message); - if (!(zephir_array_isset_string_fetch(&message, foreignKey, SS("message"), 0 TSRMLS_CC))) { - ZEPHIR_INIT_NVAR(message); - ZEPHIR_CONCAT_SV(message, "Record is referenced by model ", relationClass); - } - ZEPHIR_INIT_NVAR(_15$$13); - object_init_ex(_15$$13, phalcon_mvc_model_message_ce); - ZEPHIR_INIT_NVAR(_16$$13); - ZVAL_STRING(_16$$13, "ConstraintViolation", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _15$$13, "__construct", &_17, 8, message, fields, _16$$13); - zephir_check_temp_parameter(_16$$13); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "appendmessage", &_18, 0, _15$$13); - zephir_check_call_status(); - error = 1; - break; - } + ZEPHIR_CALL_METHOD(NULL, this_ptr, "appendmessage", &_18, 0, _15$$12); + zephir_check_call_status(); + error = 1; + break; } } } - if (error == 1) { - if (ZEPHIR_GLOBAL(orm).events) { - ZEPHIR_INIT_VAR(_19$$16); - ZVAL_STRING(_19$$16, "onValidationFails", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "fireevent", NULL, 0, _19$$16); - zephir_check_temp_parameter(_19$$16); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "_canceloperation", NULL, 0); - zephir_check_call_status(); - } - RETURN_MM_BOOL(0); + } + if (error == 1) { + if (ZEPHIR_GLOBAL(orm).events) { + ZEPHIR_INIT_VAR(_19$$15); + ZVAL_STRING(_19$$15, "onValidationFails", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "fireevent", NULL, 0, _19$$15); + zephir_check_temp_parameter(_19$$15); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "_canceloperation", NULL, 0); + zephir_check_call_status(); } + RETURN_MM_BOOL(0); } RETURN_MM_BOOL(1); @@ -79195,7 +79399,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _preSave) { ZEPHIR_CALL_METHOD(&emptyStringValues, metaData, "getemptystringattributes", NULL, 0, this_ptr); zephir_check_call_status(); error = 0; - zephir_is_iterable(notNull, &_9$$12, &_8$$12, 0, 0, "phalcon/mvc/model.zep", 2008); + zephir_is_iterable(notNull, &_9$$12, &_8$$12, 0, 0, "phalcon/mvc/model.zep", 1994); for ( ; zephir_hash_get_current_data_ex(_9$$12, (void**) &_10$$12, &_8$$12) == SUCCESS ; zephir_hash_move_forward_ex(_9$$12, &_8$$12) @@ -79212,7 +79416,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _preSave) { ZEPHIR_CONCAT_SVS(_12$$20, "Column '", field, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, _11$$20, "__construct", &_13, 9, _12$$20); zephir_check_call_status(); - zephir_throw_exception_debug(_11$$20, "phalcon/mvc/model.zep", 1944 TSRMLS_CC); + zephir_throw_exception_debug(_11$$20, "phalcon/mvc/model.zep", 1930 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -79436,7 +79640,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { ZEPHIR_INIT_NVAR(columnMap); ZVAL_NULL(columnMap); } - zephir_is_iterable(attributes, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 2192); + zephir_is_iterable(attributes, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 2178); for ( ; zephir_hash_get_current_data_ex(_1, (void**) &_2, &_0) == SUCCESS ; zephir_hash_move_forward_ex(_1, &_0) @@ -79452,7 +79656,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { ZEPHIR_CONCAT_SVS(_4$$8, "Column '", field, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, _3$$8, "__construct", &_5, 9, _4$$8); zephir_check_call_status(); - zephir_throw_exception_debug(_3$$8, "phalcon/mvc/model.zep", 2146 TSRMLS_CC); + zephir_throw_exception_debug(_3$$8, "phalcon/mvc/model.zep", 2132 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -79478,23 +79682,23 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { ZEPHIR_CONCAT_SVS(_9$$13, "Column '", field, "' have not defined a bind data type"); ZEPHIR_CALL_METHOD(NULL, _8$$13, "__construct", &_5, 9, _9$$13); zephir_check_call_status(); - zephir_throw_exception_debug(_8$$13, "phalcon/mvc/model.zep", 2170 TSRMLS_CC); + zephir_throw_exception_debug(_8$$13, "phalcon/mvc/model.zep", 2156 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&fields, field, PH_SEPARATE, "phalcon/mvc/model.zep", 2173); - zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2173); - zephir_array_append(&bindTypes, bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 2173); + zephir_array_append(&fields, field, PH_SEPARATE, "phalcon/mvc/model.zep", 2159); + zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2159); + zephir_array_append(&bindTypes, bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 2159); } else { if (zephir_array_isset(defaultValues, field)) { ZEPHIR_CALL_METHOD(&_10$$15, connection, "getdefaultvalue", &_11, 0); zephir_check_call_status(); - zephir_array_append(&values, _10$$15, PH_SEPARATE, "phalcon/mvc/model.zep", 2178); + zephir_array_append(&values, _10$$15, PH_SEPARATE, "phalcon/mvc/model.zep", 2164); } else { - zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2180); + zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2166); } - zephir_array_append(&fields, field, PH_SEPARATE, "phalcon/mvc/model.zep", 2183); - zephir_array_append(&bindTypes, bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 2183); + zephir_array_append(&fields, field, PH_SEPARATE, "phalcon/mvc/model.zep", 2169); + zephir_array_append(&bindTypes, bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 2169); } } } @@ -79506,7 +79710,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { zephir_check_call_status(); useExplicitIdentity = zephir_get_boolval(_12$$17); if (useExplicitIdentity) { - zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/mvc/model.zep", 2201); + zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/mvc/model.zep", 2187); } if (Z_TYPE_P(columnMap) == IS_ARRAY) { ZEPHIR_OBS_NVAR(attributeField); @@ -79517,7 +79721,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { ZEPHIR_CONCAT_SVS(_14$$20, "Identity column '", identityField, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, _13$$20, "__construct", &_5, 9, _14$$20); zephir_check_call_status(); - zephir_throw_exception_debug(_13$$20, "phalcon/mvc/model.zep", 2209 TSRMLS_CC); + zephir_throw_exception_debug(_13$$20, "phalcon/mvc/model.zep", 2195 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -79532,12 +79736,12 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { } if (_15$$22) { if (useExplicitIdentity) { - zephir_array_append(&values, defaultValue, PH_SEPARATE, "phalcon/mvc/model.zep", 2222); - zephir_array_append(&bindTypes, bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 2222); + zephir_array_append(&values, defaultValue, PH_SEPARATE, "phalcon/mvc/model.zep", 2208); + zephir_array_append(&bindTypes, bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 2208); } } else { if (!(useExplicitIdentity)) { - zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/mvc/model.zep", 2230); + zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/mvc/model.zep", 2216); } ZEPHIR_OBS_NVAR(bindType); if (!(zephir_array_isset_fetch(&bindType, bindDataTypes, identityField, 0 TSRMLS_CC))) { @@ -79547,17 +79751,17 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { ZEPHIR_CONCAT_SVS(_17$$27, "Identity column '", identityField, "' isn\\'t part of the table columns"); ZEPHIR_CALL_METHOD(NULL, _16$$27, "__construct", &_5, 9, _17$$27); zephir_check_call_status(); - zephir_throw_exception_debug(_16$$27, "phalcon/mvc/model.zep", 2237 TSRMLS_CC); + zephir_throw_exception_debug(_16$$27, "phalcon/mvc/model.zep", 2223 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2240); - zephir_array_append(&bindTypes, bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 2240); + zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2226); + zephir_array_append(&bindTypes, bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 2226); } } else { if (useExplicitIdentity) { - zephir_array_append(&values, defaultValue, PH_SEPARATE, "phalcon/mvc/model.zep", 2244); - zephir_array_append(&bindTypes, bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 2244); + zephir_array_append(&values, defaultValue, PH_SEPARATE, "phalcon/mvc/model.zep", 2230); + zephir_array_append(&bindTypes, bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 2230); } } } @@ -79647,7 +79851,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_INIT_NVAR(columnMap); ZVAL_NULL(columnMap); } - zephir_is_iterable(nonPrimary, &_3, &_2, 0, 0, "phalcon/mvc/model.zep", 2444); + zephir_is_iterable(nonPrimary, &_3, &_2, 0, 0, "phalcon/mvc/model.zep", 2430); for ( ; zephir_hash_get_current_data_ex(_3, (void**) &_4, &_2) == SUCCESS ; zephir_hash_move_forward_ex(_3, &_2) @@ -79662,7 +79866,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_CONCAT_SVS(_6$$9, "Column '", field, "' have not defined a bind data type"); ZEPHIR_CALL_METHOD(NULL, _5$$9, "__construct", &_7, 9, _6$$9); zephir_check_call_status(); - zephir_throw_exception_debug(_5$$9, "phalcon/mvc/model.zep", 2343 TSRMLS_CC); + zephir_throw_exception_debug(_5$$9, "phalcon/mvc/model.zep", 2329 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -79675,7 +79879,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_CONCAT_SVS(_9$$11, "Column '", field, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, _8$$11, "__construct", &_7, 9, _9$$11); zephir_check_call_status(); - zephir_throw_exception_debug(_8$$11, "phalcon/mvc/model.zep", 2351 TSRMLS_CC); + zephir_throw_exception_debug(_8$$11, "phalcon/mvc/model.zep", 2337 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -79685,9 +79889,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_OBS_NVAR(value); if (zephir_fetch_property_zval(&value, this_ptr, attributeField, PH_SILENT_CC)) { if (!(useDynamicUpdate)) { - zephir_array_append(&fields, field, PH_SEPARATE, "phalcon/mvc/model.zep", 2367); - zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2367); - zephir_array_append(&bindTypes, bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 2368); + zephir_array_append(&fields, field, PH_SEPARATE, "phalcon/mvc/model.zep", 2353); + zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2353); + zephir_array_append(&bindTypes, bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 2354); } else { ZEPHIR_OBS_NVAR(snapshotValue); if (!(zephir_array_isset_fetch(&snapshotValue, snapshot, attributeField, 0 TSRMLS_CC))) { @@ -79709,9 +79913,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { break; } if (ZEPHIR_IS_LONG(bindType, 3) || ZEPHIR_IS_LONG(bindType, 7)) { - ZEPHIR_CALL_FUNCTION(&_10$$24, "floatval", &_11, 305, snapshotValue); + ZEPHIR_CALL_FUNCTION(&_10$$24, "floatval", &_11, 301, snapshotValue); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_12$$24, "floatval", &_11, 305, value); + ZEPHIR_CALL_FUNCTION(&_12$$24, "floatval", &_11, 301, value); zephir_check_call_status(); changed = !ZEPHIR_IS_IDENTICAL(_10$$24, _12$$24); break; @@ -79729,15 +79933,15 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { } } if (changed) { - zephir_array_append(&fields, field, PH_SEPARATE, "phalcon/mvc/model.zep", 2430); - zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2430); - zephir_array_append(&bindTypes, bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 2431); + zephir_array_append(&fields, field, PH_SEPARATE, "phalcon/mvc/model.zep", 2416); + zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2416); + zephir_array_append(&bindTypes, bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 2417); } } } else { - zephir_array_append(&fields, field, PH_SEPARATE, "phalcon/mvc/model.zep", 2436); - zephir_array_append(&values, ZEPHIR_GLOBAL(global_null), PH_SEPARATE, "phalcon/mvc/model.zep", 2436); - zephir_array_append(&bindTypes, bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 2436); + zephir_array_append(&fields, field, PH_SEPARATE, "phalcon/mvc/model.zep", 2422); + zephir_array_append(&values, ZEPHIR_GLOBAL(global_null), PH_SEPARATE, "phalcon/mvc/model.zep", 2422); + zephir_array_append(&bindTypes, bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 2422); } } } @@ -79754,12 +79958,12 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_CALL_METHOD(&primaryKeys, metaData, "getprimarykeyattributes", NULL, 0, this_ptr); zephir_check_call_status(); if (!(zephir_fast_count_int(primaryKeys TSRMLS_CC))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A primary key must be defined in the model in order to perform the operation", "phalcon/mvc/model.zep", 2463); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A primary key must be defined in the model in order to perform the operation", "phalcon/mvc/model.zep", 2449); return; } ZEPHIR_INIT_NVAR(uniqueParams); array_init(uniqueParams); - zephir_is_iterable(primaryKeys, &_16$$30, &_15$$30, 0, 0, "phalcon/mvc/model.zep", 2486); + zephir_is_iterable(primaryKeys, &_16$$30, &_15$$30, 0, 0, "phalcon/mvc/model.zep", 2472); for ( ; zephir_hash_get_current_data_ex(_16$$30, (void**) &_17$$30, &_15$$30) == SUCCESS ; zephir_hash_move_forward_ex(_16$$30, &_15$$30) @@ -79774,7 +79978,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_CONCAT_SVS(_19$$34, "Column '", field, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, _18$$34, "__construct", &_7, 9, _19$$34); zephir_check_call_status(); - zephir_throw_exception_debug(_18$$34, "phalcon/mvc/model.zep", 2474 TSRMLS_CC); + zephir_throw_exception_debug(_18$$34, "phalcon/mvc/model.zep", 2460 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -79783,9 +79987,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { } ZEPHIR_OBS_NVAR(value); if (zephir_fetch_property_zval(&value, this_ptr, attributeField, PH_SILENT_CC)) { - zephir_array_append(&uniqueParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2481); + zephir_array_append(&uniqueParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2467); } else { - zephir_array_append(&uniqueParams, ZEPHIR_GLOBAL(global_null), PH_SEPARATE, "phalcon/mvc/model.zep", 2483); + zephir_array_append(&uniqueParams, ZEPHIR_GLOBAL(global_null), PH_SEPARATE, "phalcon/mvc/model.zep", 2469); } } } @@ -79828,7 +80032,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _preSaveRelatedRecords) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "getmodelsmanager", NULL, 0); zephir_check_call_status(); ZEPHIR_CPY_WRT(manager, _1); - zephir_is_iterable(related, &_3, &_2, 0, 0, "phalcon/mvc/model.zep", 2592); + zephir_is_iterable(related, &_3, &_2, 0, 0, "phalcon/mvc/model.zep", 2578); for ( ; zephir_hash_get_current_data_ex(_3, (void**) &_4, &_2) == SUCCESS ; zephir_hash_move_forward_ex(_3, &_2) @@ -79851,7 +80055,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _preSaveRelatedRecords) { } ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_8, 0, _7$$6); zephir_check_call_status(); - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects can be stored as part of belongs-to relations", "phalcon/mvc/model.zep", 2541); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects can be stored as part of belongs-to relations", "phalcon/mvc/model.zep", 2527); return; } ZEPHIR_CALL_METHOD(&columns, relation, "getfields", NULL, 0); @@ -79869,7 +80073,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _preSaveRelatedRecords) { } ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_10, 0, _9$$7); zephir_check_call_status(); - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/mvc/model.zep", 2550); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/mvc/model.zep", 2536); return; } ZEPHIR_CALL_METHOD(&_11$$5, record, "save", NULL, 0); @@ -79877,7 +80081,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _preSaveRelatedRecords) { if (!(zephir_is_true(_11$$5))) { ZEPHIR_CALL_METHOD(&_12$$8, record, "getmessages", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(_12$$8, &_14$$8, &_13$$8, 0, 0, "phalcon/mvc/model.zep", 2579); + zephir_is_iterable(_12$$8, &_14$$8, &_13$$8, 0, 0, "phalcon/mvc/model.zep", 2565); for ( ; zephir_hash_get_current_data_ex(_14$$8, (void**) &_15$$8, &_13$$8) == SUCCESS ; zephir_hash_move_forward_ex(_14$$8, &_13$$8) @@ -79930,7 +80134,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmodelsmanager", NULL, 0); zephir_check_call_status(); ZEPHIR_CPY_WRT(manager, _0); - zephir_is_iterable(related, &_2, &_1, 0, 0, "phalcon/mvc/model.zep", 2780); + zephir_is_iterable(related, &_2, &_1, 0, 0, "phalcon/mvc/model.zep", 2766); for ( ; zephir_hash_get_current_data_ex(_2, (void**) &_3, &_1) == SUCCESS ; zephir_hash_move_forward_ex(_2, &_1) @@ -79959,7 +80163,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { } ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_9, 0, _8$$6); zephir_check_call_status(); - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects/arrays can be stored as part of has-many/has-one/has-many-to-many relations", "phalcon/mvc/model.zep", 2631); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects/arrays can be stored as part of has-many/has-one/has-many-to-many relations", "phalcon/mvc/model.zep", 2617); return; } ZEPHIR_CALL_METHOD(&columns, relation, "getfields", NULL, 0); @@ -79977,7 +80181,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { } ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_11, 0, _10$$7); zephir_check_call_status(); - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/mvc/model.zep", 2640); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/mvc/model.zep", 2626); return; } if (Z_TYPE_P(record) == IS_OBJECT) { @@ -80003,7 +80207,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { ZEPHIR_CONCAT_SVS(_15$$10, "The column '", columns, "' needs to be present in the model"); ZEPHIR_CALL_METHOD(NULL, _14$$10, "__construct", &_16, 9, _15$$10); zephir_check_call_status(); - zephir_throw_exception_debug(_14$$10, "phalcon/mvc/model.zep", 2654 TSRMLS_CC); + zephir_throw_exception_debug(_14$$10, "phalcon/mvc/model.zep", 2640 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -80018,7 +80222,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { ZEPHIR_CALL_METHOD(&intermediateReferencedFields, relation, "getintermediatereferencedfields", NULL, 0); zephir_check_call_status(); } - zephir_is_iterable(relatedRecords, &_19$$4, &_18$$4, 0, 0, "phalcon/mvc/model.zep", 2769); + zephir_is_iterable(relatedRecords, &_19$$4, &_18$$4, 0, 0, "phalcon/mvc/model.zep", 2755); for ( ; zephir_hash_get_current_data_ex(_19$$4, (void**) &_20$$4, &_18$$4) == SUCCESS ; zephir_hash_move_forward_ex(_19$$4, &_18$$4) @@ -80033,7 +80237,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { if (!(zephir_is_true(_21$$12))) { ZEPHIR_CALL_METHOD(&_22$$14, recordAfter, "getmessages", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(_22$$14, &_24$$14, &_23$$14, 0, 0, "phalcon/mvc/model.zep", 2711); + zephir_is_iterable(_22$$14, &_24$$14, &_23$$14, 0, 0, "phalcon/mvc/model.zep", 2697); for ( ; zephir_hash_get_current_data_ex(_24$$14, (void**) &_25$$14, &_23$$14) == SUCCESS ; zephir_hash_move_forward_ex(_24$$14, &_23$$14) @@ -80072,7 +80276,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { if (!(zephir_is_true(_31$$17))) { ZEPHIR_CALL_METHOD(&_32$$18, intermediateModel, "getmessages", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(_32$$18, &_34$$18, &_33$$18, 0, 0, "phalcon/mvc/model.zep", 2763); + zephir_is_iterable(_32$$18, &_34$$18, &_33$$18, 0, 0, "phalcon/mvc/model.zep", 2749); for ( ; zephir_hash_get_current_data_ex(_34$$18, (void**) &_35$$18, &_33$$18) == SUCCESS ; zephir_hash_move_forward_ex(_34$$18, &_33$$18) @@ -80113,7 +80317,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { ZEPHIR_CONCAT_SVSVS(_41$$22, "There are no defined relations for the model '", className, "' using alias '", name, "'"); ZEPHIR_CALL_METHOD(NULL, _40$$22, "__construct", &_16, 9, _41$$22); zephir_check_call_status(); - zephir_throw_exception_debug(_40$$22, "phalcon/mvc/model.zep", 2772 TSRMLS_CC); + zephir_throw_exception_debug(_40$$22, "phalcon/mvc/model.zep", 2758 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -80134,8 +80338,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { static PHP_METHOD(Phalcon_Mvc_Model, save) { zend_bool _0; + zephir_fcall_cache_entry *_3 = NULL; int ZEPHIR_LAST_CALL_STATUS; - zval *data = NULL, *whiteList = NULL, *metaData = NULL, *related = NULL, *schema = NULL, *writeConnection = NULL, *readConnection = NULL, *source = NULL, *table = NULL, *identityField = NULL, *exists = NULL, *success = NULL, *_5, *_6 = NULL, *_1$$3, *_2$$4 = NULL, *_3$$8, *_4$$9, *_7$$11, *_8$$12, *_9$$12 = NULL, *_10$$15, *_11$$17, *_12$$19 = NULL, *_13$$21; + zval *data = NULL, *whiteList = NULL, *metaData = NULL, *related = NULL, *schema = NULL, *writeConnection = NULL, *readConnection = NULL, *source = NULL, *table = NULL, *identityField = NULL, *exists = NULL, *success = NULL, *_2 = NULL, *_7 = NULL, *_1$$3, *_4$$4 = NULL, *_5$$8, *_6$$9, *_8$$11, *_9$$12, *_10$$12 = NULL, *_11$$15, *_12$$17, *_13$$19 = NULL, *_14$$21; ZEPHIR_MM_GROW(); zephir_fetch_params(1, 0, 2, &data, &whiteList); @@ -80162,12 +80367,17 @@ static PHP_METHOD(Phalcon_Mvc_Model, save) { } ZEPHIR_CALL_METHOD(&writeConnection, this_ptr, "getwriteconnection", NULL, 0); zephir_check_call_status(); + ZEPHIR_INIT_VAR(_2); + ZVAL_STRING(_2, "prepareSave", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "fireevent", &_3, 0, _2); + zephir_check_temp_parameter(_2); + zephir_check_call_status(); ZEPHIR_OBS_VAR(related); zephir_read_property_this(&related, this_ptr, SL("_related"), PH_NOISY_CC); if (Z_TYPE_P(related) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "_presaverelatedrecords", NULL, 0, writeConnection, related); + ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "_presaverelatedrecords", NULL, 0, writeConnection, related); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(_2$$4)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(_4$$4)) { RETURN_MM_BOOL(0); } } @@ -80188,36 +80398,36 @@ static PHP_METHOD(Phalcon_Mvc_Model, save) { ZEPHIR_CALL_METHOD(&exists, this_ptr, "_exists", NULL, 0, metaData, readConnection, table); zephir_check_call_status(); if (zephir_is_true(exists)) { - ZEPHIR_INIT_ZVAL_NREF(_3$$8); - ZVAL_LONG(_3$$8, 2); - zephir_update_property_this(this_ptr, SL("_operationMade"), _3$$8 TSRMLS_CC); + ZEPHIR_INIT_ZVAL_NREF(_5$$8); + ZVAL_LONG(_5$$8, 2); + zephir_update_property_this(this_ptr, SL("_operationMade"), _5$$8 TSRMLS_CC); } else { - ZEPHIR_INIT_ZVAL_NREF(_4$$9); - ZVAL_LONG(_4$$9, 1); - zephir_update_property_this(this_ptr, SL("_operationMade"), _4$$9 TSRMLS_CC); + ZEPHIR_INIT_ZVAL_NREF(_6$$9); + ZVAL_LONG(_6$$9, 1); + zephir_update_property_this(this_ptr, SL("_operationMade"), _6$$9 TSRMLS_CC); } - ZEPHIR_INIT_VAR(_5); - array_init(_5); - zephir_update_property_this(this_ptr, SL("_errorMessages"), _5 TSRMLS_CC); + ZEPHIR_INIT_NVAR(_2); + array_init(_2); + zephir_update_property_this(this_ptr, SL("_errorMessages"), _2 TSRMLS_CC); ZEPHIR_CALL_METHOD(&identityField, metaData, "getidentityfield", NULL, 0, this_ptr); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_6, this_ptr, "_presave", NULL, 0, metaData, exists, identityField); + ZEPHIR_CALL_METHOD(&_7, this_ptr, "_presave", NULL, 0, metaData, exists, identityField); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(_6)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(_7)) { if (Z_TYPE_P(related) == IS_ARRAY) { - ZEPHIR_INIT_VAR(_7$$11); - ZVAL_BOOL(_7$$11, 0); - ZEPHIR_CALL_METHOD(NULL, writeConnection, "rollback", NULL, 0, _7$$11); + ZEPHIR_INIT_VAR(_8$$11); + ZVAL_BOOL(_8$$11, 0); + ZEPHIR_CALL_METHOD(NULL, writeConnection, "rollback", NULL, 0, _8$$11); zephir_check_call_status(); } if (ZEPHIR_GLOBAL(orm).exception_on_failed_save) { - ZEPHIR_INIT_VAR(_8$$12); - object_init_ex(_8$$12, phalcon_mvc_model_validationfailed_ce); - ZEPHIR_CALL_METHOD(&_9$$12, this_ptr, "getmessages", NULL, 0); + ZEPHIR_INIT_VAR(_9$$12); + object_init_ex(_9$$12, phalcon_mvc_model_validationfailed_ce); + ZEPHIR_CALL_METHOD(&_10$$12, this_ptr, "getmessages", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, _8$$12, "__construct", NULL, 306, this_ptr, _9$$12); + ZEPHIR_CALL_METHOD(NULL, _9$$12, "__construct", NULL, 302, this_ptr, _10$$12); zephir_check_call_status(); - zephir_throw_exception_debug(_8$$12, "phalcon/mvc/model.zep", 2885 TSRMLS_CC); + zephir_throw_exception_debug(_9$$12, "phalcon/mvc/model.zep", 2876 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -80231,15 +80441,15 @@ static PHP_METHOD(Phalcon_Mvc_Model, save) { zephir_check_call_status(); } if (zephir_is_true(success)) { - ZEPHIR_INIT_ZVAL_NREF(_10$$15); - ZVAL_LONG(_10$$15, 0); - zephir_update_property_this(this_ptr, SL("_dirtyState"), _10$$15 TSRMLS_CC); + ZEPHIR_INIT_ZVAL_NREF(_11$$15); + ZVAL_LONG(_11$$15, 0); + zephir_update_property_this(this_ptr, SL("_dirtyState"), _11$$15 TSRMLS_CC); } if (Z_TYPE_P(related) == IS_ARRAY) { if (ZEPHIR_IS_FALSE_IDENTICAL(success)) { - ZEPHIR_INIT_VAR(_11$$17); - ZVAL_BOOL(_11$$17, 0); - ZEPHIR_CALL_METHOD(NULL, writeConnection, "rollback", NULL, 0, _11$$17); + ZEPHIR_INIT_VAR(_12$$17); + ZVAL_BOOL(_12$$17, 0); + ZEPHIR_CALL_METHOD(NULL, writeConnection, "rollback", NULL, 0, _12$$17); zephir_check_call_status(); } else { ZEPHIR_CALL_METHOD(&success, this_ptr, "_postsaverelatedrecords", NULL, 0, writeConnection, related); @@ -80247,18 +80457,18 @@ static PHP_METHOD(Phalcon_Mvc_Model, save) { } } if (ZEPHIR_GLOBAL(orm).events) { - ZEPHIR_CALL_METHOD(&_12$$19, this_ptr, "_postsave", NULL, 0, success, exists); + ZEPHIR_CALL_METHOD(&_13$$19, this_ptr, "_postsave", NULL, 0, success, exists); zephir_check_call_status(); - ZEPHIR_CPY_WRT(success, _12$$19); + ZEPHIR_CPY_WRT(success, _13$$19); } if (ZEPHIR_IS_FALSE_IDENTICAL(success)) { ZEPHIR_CALL_METHOD(NULL, this_ptr, "_canceloperation", NULL, 0); zephir_check_call_status(); } else { - ZEPHIR_INIT_VAR(_13$$21); - ZVAL_STRING(_13$$21, "afterSave", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "fireevent", NULL, 0, _13$$21); - zephir_check_temp_parameter(_13$$21); + ZEPHIR_INIT_VAR(_14$$21); + ZVAL_STRING(_14$$21, "afterSave", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "fireevent", &_3, 0, _14$$21); + zephir_check_temp_parameter(_14$$21); zephir_check_call_status(); } RETURN_CCTOR(success); @@ -80409,10 +80619,10 @@ static PHP_METHOD(Phalcon_Mvc_Model, delete) { ZVAL_NULL(columnMap); } if (!(zephir_fast_count_int(primaryKeys TSRMLS_CC))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A primary key must be defined in the model in order to perform the operation", "phalcon/mvc/model.zep", 3069); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A primary key must be defined in the model in order to perform the operation", "phalcon/mvc/model.zep", 3060); return; } - zephir_is_iterable(primaryKeys, &_4, &_3, 0, 0, "phalcon/mvc/model.zep", 3110); + zephir_is_iterable(primaryKeys, &_4, &_3, 0, 0, "phalcon/mvc/model.zep", 3101); for ( ; zephir_hash_get_current_data_ex(_4, (void**) &_5, &_3) == SUCCESS ; zephir_hash_move_forward_ex(_4, &_3) @@ -80426,7 +80636,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, delete) { ZEPHIR_CONCAT_SVS(_7$$9, "Column '", primaryKey, "' have not defined a bind data type"); ZEPHIR_CALL_METHOD(NULL, _6$$9, "__construct", &_8, 9, _7$$9); zephir_check_call_status(); - zephir_throw_exception_debug(_6$$9, "phalcon/mvc/model.zep", 3081 TSRMLS_CC); + zephir_throw_exception_debug(_6$$9, "phalcon/mvc/model.zep", 3072 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -80439,7 +80649,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, delete) { ZEPHIR_CONCAT_SVS(_10$$11, "Column '", primaryKey, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, _9$$11, "__construct", &_8, 9, _10$$11); zephir_check_call_status(); - zephir_throw_exception_debug(_9$$11, "phalcon/mvc/model.zep", 3089 TSRMLS_CC); + zephir_throw_exception_debug(_9$$11, "phalcon/mvc/model.zep", 3080 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -80454,17 +80664,17 @@ static PHP_METHOD(Phalcon_Mvc_Model, delete) { ZEPHIR_CONCAT_SVS(_12$$13, "Cannot delete the record because the primary key attribute: '", attributeField, "' wasn't set"); ZEPHIR_CALL_METHOD(NULL, _11$$13, "__construct", &_8, 9, _12$$13); zephir_check_call_status(); - zephir_throw_exception_debug(_11$$13, "phalcon/mvc/model.zep", 3099 TSRMLS_CC); + zephir_throw_exception_debug(_11$$13, "phalcon/mvc/model.zep", 3090 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 3105); + zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 3096); ZEPHIR_CALL_METHOD(&_13$$8, writeConnection, "escapeidentifier", &_14, 0, primaryKey); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_15$$8); ZEPHIR_CONCAT_VS(_15$$8, _13$$8, " = ?"); - zephir_array_append(&conditions, _15$$8, PH_SEPARATE, "phalcon/mvc/model.zep", 3106); - zephir_array_append(&bindTypes, bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 3107); + zephir_array_append(&conditions, _15$$8, PH_SEPARATE, "phalcon/mvc/model.zep", 3097); + zephir_array_append(&bindTypes, bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 3098); } if (ZEPHIR_GLOBAL(orm).events) { if (0) { @@ -80545,7 +80755,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, refresh) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_dirtyState"), PH_NOISY_CC); if (!ZEPHIR_IS_LONG(_0, 0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 3185); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 3176); return; } ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); @@ -80570,7 +80780,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, refresh) { ZEPHIR_CALL_METHOD(&_1$$6, this_ptr, "_exists", NULL, 0, metaData, readConnection, table); zephir_check_call_status(); if (!(zephir_is_true(_1$$6))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 3207); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 3198); return; } ZEPHIR_OBS_NVAR(uniqueKey); @@ -80579,14 +80789,14 @@ static PHP_METHOD(Phalcon_Mvc_Model, refresh) { ZEPHIR_OBS_VAR(uniqueParams); zephir_read_property_this(&uniqueParams, this_ptr, SL("_uniqueParams"), PH_NOISY_CC); if (Z_TYPE_P(uniqueParams) != IS_ARRAY) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 3215); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 3206); return; } ZEPHIR_INIT_VAR(fields); array_init(fields); ZEPHIR_CALL_METHOD(&_2, metaData, "getattributes", NULL, 0, this_ptr); zephir_check_call_status(); - zephir_is_iterable(_2, &_4, &_3, 0, 0, "phalcon/mvc/model.zep", 3229); + zephir_is_iterable(_2, &_4, &_3, 0, 0, "phalcon/mvc/model.zep", 3220); for ( ; zephir_hash_get_current_data_ex(_4, (void**) &_5, &_3) == SUCCESS ; zephir_hash_move_forward_ex(_4, &_3) @@ -80595,7 +80805,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, refresh) { ZEPHIR_INIT_NVAR(_6$$9); zephir_create_array(_6$$9, 1, 0 TSRMLS_CC); zephir_array_fast_append(_6$$9, attribute); - zephir_array_append(&fields, _6$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 3223); + zephir_array_append(&fields, _6$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 3214); } ZEPHIR_CALL_METHOD(&dialect, readConnection, "getdialect", NULL, 0); zephir_check_call_status(); @@ -80711,7 +80921,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, skipAttributes) { ZEPHIR_INIT_VAR(keysAttributes); array_init(keysAttributes); - zephir_is_iterable(attributes, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 3310); + zephir_is_iterable(attributes, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 3301); for ( ; zephir_hash_get_current_data_ex(_1, (void**) &_2, &_0) == SUCCESS ; zephir_hash_move_forward_ex(_1, &_0) @@ -80745,7 +80955,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, skipAttributesOnCreate) { ZEPHIR_INIT_VAR(keysAttributes); array_init(keysAttributes); - zephir_is_iterable(attributes, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 3341); + zephir_is_iterable(attributes, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 3332); for ( ; zephir_hash_get_current_data_ex(_1, (void**) &_2, &_0) == SUCCESS ; zephir_hash_move_forward_ex(_1, &_0) @@ -80777,7 +80987,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, skipAttributesOnUpdate) { ZEPHIR_INIT_VAR(keysAttributes); array_init(keysAttributes); - zephir_is_iterable(attributes, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 3370); + zephir_is_iterable(attributes, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 3361); for ( ; zephir_hash_get_current_data_ex(_1, (void**) &_2, &_0) == SUCCESS ; zephir_hash_move_forward_ex(_1, &_0) @@ -80809,7 +81019,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, allowEmptyStringValues) { ZEPHIR_INIT_VAR(keysAttributes); array_init(keysAttributes); - zephir_is_iterable(attributes, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 3399); + zephir_is_iterable(attributes, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 3390); for ( ; zephir_hash_get_current_data_ex(_1, (void**) &_2, &_0) == SUCCESS ; zephir_hash_move_forward_ex(_1, &_0) @@ -81022,7 +81232,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) { if (Z_TYPE_P(columnMap) == IS_ARRAY) { ZEPHIR_INIT_VAR(snapshot); array_init(snapshot); - zephir_is_iterable(data, &_1$$3, &_0$$3, 0, 0, "phalcon/mvc/model.zep", 3615); + zephir_is_iterable(data, &_1$$3, &_0$$3, 0, 0, "phalcon/mvc/model.zep", 3606); for ( ; zephir_hash_get_current_data_ex(_1$$3, (void**) &_2$$3, &_0$$3) == SUCCESS ; zephir_hash_move_forward_ex(_1$$3, &_0$$3) @@ -81041,7 +81251,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) { ZEPHIR_CONCAT_SVS(_4$$7, "Column '", key, "' doesn't make part of the column map"); ZEPHIR_CALL_METHOD(NULL, _3$$7, "__construct", &_5, 9, _4$$7); zephir_check_call_status(); - zephir_throw_exception_debug(_3$$7, "phalcon/mvc/model.zep", 3596 TSRMLS_CC); + zephir_throw_exception_debug(_3$$7, "phalcon/mvc/model.zep", 3587 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -81058,7 +81268,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) { ZEPHIR_CONCAT_SVS(_7$$11, "Column '", key, "' doesn't make part of the column map"); ZEPHIR_CALL_METHOD(NULL, _6$$11, "__construct", &_5, 9, _7$$11); zephir_check_call_status(); - zephir_throw_exception_debug(_6$$11, "phalcon/mvc/model.zep", 3605 TSRMLS_CC); + zephir_throw_exception_debug(_6$$11, "phalcon/mvc/model.zep", 3596 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -81112,12 +81322,12 @@ static PHP_METHOD(Phalcon_Mvc_Model, hasChanged) { ZEPHIR_OBS_VAR(snapshot); zephir_read_property_this(&snapshot, this_ptr, SL("_snapshot"), PH_NOISY_CC); if (Z_TYPE_P(snapshot) != IS_ARRAY) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record doesn't have a valid data snapshot", "phalcon/mvc/model.zep", 3654); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record doesn't have a valid data snapshot", "phalcon/mvc/model.zep", 3645); return; } _0 = zephir_fetch_nproperty_this(this_ptr, SL("_dirtyState"), PH_NOISY_CC); if (!ZEPHIR_IS_LONG(_0, 0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Change checking cannot be performed because the object has not been persisted or is deleted", "phalcon/mvc/model.zep", 3661); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Change checking cannot be performed because the object has not been persisted or is deleted", "phalcon/mvc/model.zep", 3652); return; } ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); @@ -81139,7 +81349,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, hasChanged) { ZEPHIR_CONCAT_SVS(_2$$9, "The field '", fieldName, "' is not part of the model"); ZEPHIR_CALL_METHOD(NULL, _1$$9, "__construct", NULL, 9, _2$$9); zephir_check_call_status(); - zephir_throw_exception_debug(_1$$9, "phalcon/mvc/model.zep", 3693 TSRMLS_CC); + zephir_throw_exception_debug(_1$$9, "phalcon/mvc/model.zep", 3684 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -81151,7 +81361,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, hasChanged) { ZEPHIR_CONCAT_SVS(_4$$11, "The field '", fieldName, "' is not part of the model"); ZEPHIR_CALL_METHOD(NULL, _3$$11, "__construct", NULL, 9, _4$$11); zephir_check_call_status(); - zephir_throw_exception_debug(_3$$11, "phalcon/mvc/model.zep", 3697 TSRMLS_CC); + zephir_throw_exception_debug(_3$$11, "phalcon/mvc/model.zep", 3688 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -81164,7 +81374,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, hasChanged) { ZEPHIR_CONCAT_SVS(_6$$12, "The field '", fieldName, "' is not defined on the model"); ZEPHIR_CALL_METHOD(NULL, _5$$12, "__construct", NULL, 9, _6$$12); zephir_check_call_status(); - zephir_throw_exception_debug(_5$$12, "phalcon/mvc/model.zep", 3705 TSRMLS_CC); + zephir_throw_exception_debug(_5$$12, "phalcon/mvc/model.zep", 3696 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -81176,14 +81386,14 @@ static PHP_METHOD(Phalcon_Mvc_Model, hasChanged) { ZEPHIR_CONCAT_SVS(_8$$13, "The field '", fieldName, "' was not found in the snapshot"); ZEPHIR_CALL_METHOD(NULL, _7$$13, "__construct", NULL, 9, _8$$13); zephir_check_call_status(); - zephir_throw_exception_debug(_7$$13, "phalcon/mvc/model.zep", 3712 TSRMLS_CC); + zephir_throw_exception_debug(_7$$13, "phalcon/mvc/model.zep", 3703 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } RETURN_MM_BOOL(!ZEPHIR_IS_EQUAL(value, originalValue)); } ZEPHIR_INIT_VAR(_9); - zephir_is_iterable(allAttributes, &_11, &_10, 0, 0, "phalcon/mvc/model.zep", 3748); + zephir_is_iterable(allAttributes, &_11, &_10, 0, 0, "phalcon/mvc/model.zep", 3739); for ( ; zephir_hash_get_current_data_ex(_11, (void**) &_12, &_10) == SUCCESS ; zephir_hash_move_forward_ex(_11, &_10) @@ -81218,12 +81428,12 @@ static PHP_METHOD(Phalcon_Mvc_Model, getChangedFields) { ZEPHIR_OBS_VAR(snapshot); zephir_read_property_this(&snapshot, this_ptr, SL("_snapshot"), PH_NOISY_CC); if (Z_TYPE_P(snapshot) != IS_ARRAY) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record doesn't have a valid data snapshot", "phalcon/mvc/model.zep", 3761); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record doesn't have a valid data snapshot", "phalcon/mvc/model.zep", 3752); return; } _0 = zephir_fetch_nproperty_this(this_ptr, SL("_dirtyState"), PH_NOISY_CC); if (!ZEPHIR_IS_LONG(_0, 0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Change checking cannot be performed because the object has not been persisted or is deleted", "phalcon/mvc/model.zep", 3768); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Change checking cannot be performed because the object has not been persisted or is deleted", "phalcon/mvc/model.zep", 3759); return; } ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); @@ -81239,7 +81449,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, getChangedFields) { ZEPHIR_INIT_VAR(changed); array_init(changed); ZEPHIR_INIT_VAR(_1); - zephir_is_iterable(allAttributes, &_3, &_2, 0, 0, "phalcon/mvc/model.zep", 3822); + zephir_is_iterable(allAttributes, &_3, &_2, 0, 0, "phalcon/mvc/model.zep", 3813); for ( ; zephir_hash_get_current_data_ex(_3, (void**) &_4, &_2) == SUCCESS ; zephir_hash_move_forward_ex(_3, &_2) @@ -81247,17 +81457,17 @@ static PHP_METHOD(Phalcon_Mvc_Model, getChangedFields) { ZEPHIR_GET_HMKEY(name, _3, _2); ZEPHIR_GET_HVALUE(_1, _4); if (!(zephir_array_isset(snapshot, name))) { - zephir_array_append(&changed, name, PH_SEPARATE, "phalcon/mvc/model.zep", 3801); + zephir_array_append(&changed, name, PH_SEPARATE, "phalcon/mvc/model.zep", 3792); continue; } ZEPHIR_OBS_NVAR(value); if (!(zephir_fetch_property_zval(&value, this_ptr, name, PH_SILENT_CC))) { - zephir_array_append(&changed, name, PH_SEPARATE, "phalcon/mvc/model.zep", 3809); + zephir_array_append(&changed, name, PH_SEPARATE, "phalcon/mvc/model.zep", 3800); continue; } - zephir_array_fetch(&_5$$7, snapshot, name, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 3816 TSRMLS_CC); + zephir_array_fetch(&_5$$7, snapshot, name, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 3807 TSRMLS_CC); if (!ZEPHIR_IS_EQUAL(value, _5$$7)) { - zephir_array_append(&changed, name, PH_SEPARATE, "phalcon/mvc/model.zep", 3817); + zephir_array_append(&changed, name, PH_SEPARATE, "phalcon/mvc/model.zep", 3808); continue; } } @@ -81320,7 +81530,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, getRelated) { ZEPHIR_CONCAT_SVSVS(_3$$3, "There is no defined relations for the model '", className, "' using alias '", alias, "'"); ZEPHIR_CALL_METHOD(NULL, _2$$3, "__construct", NULL, 9, _3$$3); zephir_check_call_status(); - zephir_throw_exception_debug(_2$$3, "phalcon/mvc/model.zep", 3865 TSRMLS_CC); + zephir_throw_exception_debug(_2$$3, "phalcon/mvc/model.zep", 3856 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -81480,7 +81690,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _invokeFinder) { ZEPHIR_CONCAT_SVS(_4$$9, "The static method '", method, "' requires one argument"); ZEPHIR_CALL_METHOD(NULL, _3$$9, "__construct", NULL, 9, _4$$9); zephir_check_call_status(); - zephir_throw_exception_debug(_3$$9, "phalcon/mvc/model.zep", 3977 TSRMLS_CC); + zephir_throw_exception_debug(_3$$9, "phalcon/mvc/model.zep", 3968 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -81509,7 +81719,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _invokeFinder) { ZEPHIR_CPY_WRT(field, extraMethodFirst); } else { ZEPHIR_INIT_NVAR(field); - zephir_uncamelize(field, extraMethod); + zephir_uncamelize(field, extraMethod, NULL ); if (!(zephir_array_isset(attributes, field))) { ZEPHIR_INIT_VAR(_7$$15); object_init_ex(_7$$15, phalcon_mvc_model_exception_ce); @@ -81517,7 +81727,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _invokeFinder) { ZEPHIR_CONCAT_SVS(_8$$15, "Cannot resolve attribute '", extraMethod, "' in the model"); ZEPHIR_CALL_METHOD(NULL, _7$$15, "__construct", NULL, 9, _8$$15); zephir_check_call_status(); - zephir_throw_exception_debug(_7$$15, "phalcon/mvc/model.zep", 4011 TSRMLS_CC); + zephir_throw_exception_debug(_7$$15, "phalcon/mvc/model.zep", 4002 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -81552,7 +81762,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __call) { zephir_get_strval(method, method_param); - ZEPHIR_CALL_SELF(&records, "_invokefinder", &_0, 307, method, arguments); + ZEPHIR_CALL_SELF(&records, "_invokefinder", &_0, 303, method, arguments); zephir_check_call_status(); if (Z_TYPE_P(records) != IS_NULL) { RETURN_CCTOR(records); @@ -81576,7 +81786,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __call) { ZEPHIR_CONCAT_SVSVS(_3, "The method '", method, "' doesn't exist on model '", modelName, "'"); ZEPHIR_CALL_METHOD(NULL, _2, "__construct", NULL, 9, _3); zephir_check_call_status(); - zephir_throw_exception_debug(_2, "phalcon/mvc/model.zep", 4062 TSRMLS_CC); + zephir_throw_exception_debug(_2, "phalcon/mvc/model.zep", 4053 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; @@ -81595,7 +81805,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __callStatic) { zephir_get_strval(method, method_param); - ZEPHIR_CALL_SELF(&records, "_invokefinder", &_0, 307, method, arguments); + ZEPHIR_CALL_SELF(&records, "_invokefinder", &_0, 303, method, arguments); zephir_check_call_status(); if (Z_TYPE_P(records) == IS_NULL) { ZEPHIR_INIT_VAR(_1$$3); @@ -81604,7 +81814,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __callStatic) { ZEPHIR_CONCAT_SVS(_2$$3, "The static method '", method, "' doesn't exist"); ZEPHIR_CALL_METHOD(NULL, _1$$3, "__construct", NULL, 9, _2$$3); zephir_check_call_status(); - zephir_throw_exception_debug(_1$$3, "phalcon/mvc/model.zep", 4078 TSRMLS_CC); + zephir_throw_exception_debug(_1$$3, "phalcon/mvc/model.zep", 4069 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -81618,8 +81828,8 @@ static PHP_METHOD(Phalcon_Mvc_Model, __set) { HashPosition _1$$6; zephir_fcall_cache_entry *_5 = NULL, *_7 = NULL; int ZEPHIR_LAST_CALL_STATUS; - zval *property_param = NULL, *value, *lowerProperty = NULL, *related = NULL, *modelName = NULL, *manager = NULL, *lowerKey = NULL, *relation = NULL, *referencedModel = NULL, *key = NULL, *item = NULL, *dirtyState = NULL, *_0$$4 = NULL, **_3$$6, *_4$$10 = NULL, *_6$$11 = NULL, *_8$$12; - zval *property = NULL; + zval *property_param = NULL, *value, *lowerProperty = NULL, *related = NULL, *modelName = NULL, *manager = NULL, *lowerKey = NULL, *relation = NULL, *referencedModel = NULL, *key = NULL, *item = NULL, *dirtyState = NULL, *_9 = NULL, *_10 = NULL, *_0$$4 = NULL, **_3$$6, *_4$$10 = NULL, *_6$$11 = NULL, *_8$$12, *_11$$14; + zval *property = NULL, *_12$$14; ZEPHIR_MM_GROW(); zephir_fetch_params(1, 2, 0, &property_param, &value); @@ -81655,7 +81865,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __set) { zephir_check_call_status(); ZEPHIR_INIT_VAR(related); array_init(related); - zephir_is_iterable(value, &_2$$6, &_1$$6, 0, 0, "phalcon/mvc/model.zep", 4138); + zephir_is_iterable(value, &_2$$6, &_1$$6, 0, 0, "phalcon/mvc/model.zep", 4129); for ( ; zephir_hash_get_current_data_ex(_2$$6, (void**) &_3$$6, &_1$$6) == SUCCESS ; zephir_hash_move_forward_ex(_2$$6, &_1$$6) @@ -81664,7 +81874,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __set) { ZEPHIR_GET_HVALUE(item, _3$$6); if (Z_TYPE_P(item) == IS_OBJECT) { if (zephir_instance_of_ev(item, phalcon_mvc_modelinterface_ce TSRMLS_CC)) { - zephir_array_append(&related, item, PH_SEPARATE, "phalcon/mvc/model.zep", 4125); + zephir_array_append(&related, item, PH_SEPARATE, "phalcon/mvc/model.zep", 4116); } } else { ZEPHIR_INIT_NVAR(lowerKey); @@ -81692,12 +81902,94 @@ static PHP_METHOD(Phalcon_Mvc_Model, __set) { RETVAL_ZVAL(value, 1, 0); RETURN_MM(); } + ZEPHIR_CALL_METHOD(&_9, this_ptr, "_possiblesetter", NULL, 298, property, value); + zephir_check_call_status(); + if (zephir_is_true(_9)) { + RETVAL_ZVAL(value, 1, 0); + RETURN_MM(); + } + ZEPHIR_CALL_METHOD(&_10, this_ptr, "_isvisible", NULL, 304, property); + zephir_check_call_status(); + if (!(zephir_is_true(_10))) { + ZEPHIR_INIT_VAR(_11$$14); + object_init_ex(_11$$14, phalcon_mvc_model_exception_ce); + ZEPHIR_INIT_VAR(_12$$14); + ZEPHIR_CONCAT_SVS(_12$$14, "Property '", property, "' does not have a setter."); + ZEPHIR_CALL_METHOD(NULL, _11$$14, "__construct", NULL, 9, _12$$14); + zephir_check_call_status(); + zephir_throw_exception_debug(_11$$14, "phalcon/mvc/model.zep", 4144 TSRMLS_CC); + ZEPHIR_MM_RESTORE(); + return; + } zephir_update_property_zval_zval(this_ptr, property, value TSRMLS_CC); RETVAL_ZVAL(value, 1, 0); RETURN_MM(); } +static PHP_METHOD(Phalcon_Mvc_Model, _possibleSetter) { + + int ZEPHIR_LAST_CALL_STATUS; + zval *property_param = NULL, *value, *possibleSetter = NULL, *_0; + zval *property = NULL; + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 2, 0, &property_param, &value); + + zephir_get_strval(property, property_param); + + + ZEPHIR_INIT_VAR(_0); + zephir_camelize(_0, property, NULL ); + ZEPHIR_INIT_VAR(possibleSetter); + ZEPHIR_CONCAT_SV(possibleSetter, "set", _0); + if ((zephir_method_exists(this_ptr, possibleSetter TSRMLS_CC) == SUCCESS)) { + ZEPHIR_CALL_METHOD_ZVAL(NULL, this_ptr, possibleSetter, NULL, 0, value); + zephir_check_call_status(); + RETURN_MM_BOOL(1); + } + RETURN_MM_BOOL(0); + +} + +static PHP_METHOD(Phalcon_Mvc_Model, _isVisible) { + + int ZEPHIR_LAST_CALL_STATUS; + zval *property, *reflectionClass = NULL, *reflectionProp = NULL, *e = NULL, *_0$$3 = NULL; + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &property); + + + + ZEPHIR_INIT_VAR(reflectionClass); + object_init_ex(reflectionClass, zephir_get_internal_ce(SS("reflectionclass") TSRMLS_CC)); + ZEPHIR_CALL_METHOD(NULL, reflectionClass, "__construct", NULL, 66, this_ptr); + zephir_check_call_status(); + + /* try_start_1: */ + + ZEPHIR_CALL_METHOD(&reflectionProp, reflectionClass, "getproperty", NULL, 305, property); + zephir_check_call_status_or_jump(try_end_1); + ZEPHIR_CALL_METHOD(&_0$$3, reflectionProp, "ispublic", NULL, 0); + zephir_check_call_status_or_jump(try_end_1); + if (!(zephir_is_true(_0$$3))) { + RETURN_MM_BOOL(0); + } + + try_end_1: + + if (EG(exception)) { + ZEPHIR_CPY_WRT(e, EG(exception)); + if (zephir_instance_of_ev(e, zend_exception_get_default(TSRMLS_C) TSRMLS_CC)) { + zend_clear_exception(TSRMLS_C); + RETURN_MM_BOOL(1); + } + } + RETURN_MM_BOOL(1); + +} + static PHP_METHOD(Phalcon_Mvc_Model, __get) { zval *_1$$3, *_3$$3; @@ -81754,7 +82046,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __get) { RETURN_CCTOR(result); } ZEPHIR_INIT_VAR(_4); - zephir_camelize(_4, property); + zephir_camelize(_4, property, NULL ); ZEPHIR_INIT_VAR(method); ZEPHIR_CONCAT_SV(method, "get", _4); if ((zephir_method_exists(this_ptr, method TSRMLS_CC) == SUCCESS)) { @@ -81848,7 +82140,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, unserialize) { ZEPHIR_CALL_CE_STATIC(&dependencyInjector, phalcon_di_ce, "getdefault", &_0, 1); zephir_check_call_status(); if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injector container is required to obtain the services related to the ORM", "phalcon/mvc/model.zep", 4262); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injector container is required to obtain the services related to the ORM", "phalcon/mvc/model.zep", 4304); return; } zephir_update_property_this(this_ptr, SL("_dependencyInjector"), dependencyInjector TSRMLS_CC); @@ -81859,13 +82151,13 @@ static PHP_METHOD(Phalcon_Mvc_Model, unserialize) { zephir_check_call_status(); ZEPHIR_CPY_WRT(manager, _1$$3); if (Z_TYPE_P(manager) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsManager' is not valid", "phalcon/mvc/model.zep", 4275); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsManager' is not valid", "phalcon/mvc/model.zep", 4317); return; } zephir_update_property_this(this_ptr, SL("_modelsManager"), manager TSRMLS_CC); ZEPHIR_CALL_METHOD(NULL, manager, "initialize", NULL, 0, this_ptr); zephir_check_call_status(); - zephir_is_iterable(attributes, &_4$$3, &_3$$3, 0, 0, "phalcon/mvc/model.zep", 4294); + zephir_is_iterable(attributes, &_4$$3, &_3$$3, 0, 0, "phalcon/mvc/model.zep", 4336); for ( ; zephir_hash_get_current_data_ex(_4$$3, (void**) &_5$$3, &_3$$3) == SUCCESS ; zephir_hash_move_forward_ex(_4$$3, &_3$$3) @@ -81915,7 +82207,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, toArray) { zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_0, metaData, "getattributes", NULL, 0, this_ptr); zephir_check_call_status(); - zephir_is_iterable(_0, &_2, &_1, 0, 0, "phalcon/mvc/model.zep", 4358); + zephir_is_iterable(_0, &_2, &_1, 0, 0, "phalcon/mvc/model.zep", 4400); for ( ; zephir_hash_get_current_data_ex(_2, (void**) &_3, &_1) == SUCCESS ; zephir_hash_move_forward_ex(_2, &_1) @@ -81931,7 +82223,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, toArray) { ZEPHIR_CONCAT_SVS(_5$$6, "Column '", attribute, "' doesn't make part of the column map"); ZEPHIR_CALL_METHOD(NULL, _4$$6, "__construct", &_6, 9, _5$$6); zephir_check_call_status(); - zephir_throw_exception_debug(_4$$6, "phalcon/mvc/model.zep", 4336 TSRMLS_CC); + zephir_throw_exception_debug(_4$$6, "phalcon/mvc/model.zep", 4378 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -82602,12 +82894,16 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle) { zephir_check_call_status(); } _4 = zephir_fetch_nproperty_this(this_ptr, SL("_routes"), PH_NOISY_CC); - zephir_is_iterable(_4, &_6, &_5, 0, 1, "phalcon/mvc/router.zep", 556); + zephir_is_iterable(_4, &_6, &_5, 0, 1, "phalcon/mvc/router.zep", 558); for ( ; zephir_hash_get_current_data_ex(_6, (void**) &_7, &_5) == SUCCESS ; zephir_hash_move_backwards_ex(_6, &_5) ) { ZEPHIR_GET_HVALUE(route, _7); + ZEPHIR_INIT_NVAR(params); + array_init(params); + ZEPHIR_INIT_NVAR(matches); + ZVAL_NULL(matches); ZEPHIR_CALL_METHOD(&methods, route, "gethttpmethods", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(methods) != IS_NULL) { @@ -82615,7 +82911,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle) { _8$$10 = zephir_fetch_nproperty_this(this_ptr, SL("_dependencyInjector"), PH_NOISY_CC); ZEPHIR_CPY_WRT(dependencyInjector, _8$$10); if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/mvc/router.zep", 382); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/mvc/router.zep", 384); return; } ZEPHIR_INIT_NVAR(_10$$10); @@ -82640,7 +82936,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle) { _13$$14 = zephir_fetch_nproperty_this(this_ptr, SL("_dependencyInjector"), PH_NOISY_CC); ZEPHIR_CPY_WRT(dependencyInjector, _13$$14); if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/mvc/router.zep", 409); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/mvc/router.zep", 411); return; } ZEPHIR_INIT_NVAR(_15$$14); @@ -82657,8 +82953,8 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle) { if (Z_TYPE_P(currentHostName) == IS_NULL) { continue; } - if (zephir_memnstr_str(hostname, SL("("), "phalcon/mvc/router.zep", 432)) { - if (!(zephir_memnstr_str(hostname, SL("#"), "phalcon/mvc/router.zep", 433))) { + if (zephir_memnstr_str(hostname, SL("("), "phalcon/mvc/router.zep", 434)) { + if (!(zephir_memnstr_str(hostname, SL("#"), "phalcon/mvc/router.zep", 435))) { ZEPHIR_INIT_NVAR(regexHostName); ZEPHIR_CONCAT_SVS(regexHostName, "#^", hostname, "$#"); } else { @@ -82684,7 +82980,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle) { } ZEPHIR_CALL_METHOD(&pattern, route, "getcompiledpattern", NULL, 0); zephir_check_call_status(); - if (zephir_memnstr_str(pattern, SL("^"), "phalcon/mvc/router.zep", 457)) { + if (zephir_memnstr_str(pattern, SL("^"), "phalcon/mvc/router.zep", 459)) { ZEPHIR_INIT_NVAR(routeFound); zephir_preg_match(routeFound, pattern, handledUri, matches, 0, 0 , 0 TSRMLS_CC); } else { @@ -82703,7 +82999,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle) { zephir_check_call_status(); if (Z_TYPE_P(beforeMatch) != IS_NULL) { if (!(zephir_is_callable(beforeMatch TSRMLS_CC))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "Before-Match callback is not callable in matched route", "phalcon/mvc/router.zep", 479); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "Before-Match callback is not callable in matched route", "phalcon/mvc/router.zep", 481); return; } ZEPHIR_INIT_NVAR(_21$$28); @@ -82731,7 +83027,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle) { if (Z_TYPE_P(matches) == IS_ARRAY) { ZEPHIR_CALL_METHOD(&converters, route, "getconverters", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(paths, &_25$$33, &_24$$33, 0, 0, "phalcon/mvc/router.zep", 545); + zephir_is_iterable(paths, &_25$$33, &_24$$33, 0, 0, "phalcon/mvc/router.zep", 547); for ( ; zephir_hash_get_current_data_ex(_25$$33, (void**) &_26$$33, &_24$$33) == SUCCESS ; zephir_hash_move_forward_ex(_25$$33, &_24$$33) @@ -82921,7 +83217,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, add) { zephir_update_property_this(this_ptr, SL("_routes"), _0$$4 TSRMLS_CC); break; } - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "Invalid route position", "phalcon/mvc/router.zep", 681); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "Invalid route position", "phalcon/mvc/router.zep", 683); return; } while(0); @@ -83203,13 +83499,13 @@ static PHP_METHOD(Phalcon_Mvc_Router, mount) { ZEPHIR_CALL_METHOD(&groupRoutes, group, "getroutes", NULL, 0); zephir_check_call_status(); if (!(zephir_fast_count_int(groupRoutes TSRMLS_CC))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "The group of routes does not contain any routes", "phalcon/mvc/router.zep", 752); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "The group of routes does not contain any routes", "phalcon/mvc/router.zep", 754); return; } ZEPHIR_CALL_METHOD(&beforeMatch, group, "getbeforematch", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(beforeMatch) != IS_NULL) { - zephir_is_iterable(groupRoutes, &_1$$4, &_0$$4, 0, 0, "phalcon/mvc/router.zep", 764); + zephir_is_iterable(groupRoutes, &_1$$4, &_0$$4, 0, 0, "phalcon/mvc/router.zep", 766); for ( ; zephir_hash_get_current_data_ex(_1$$4, (void**) &_2$$4, &_0$$4) == SUCCESS ; zephir_hash_move_forward_ex(_1$$4, &_0$$4) @@ -83222,7 +83518,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, mount) { ZEPHIR_CALL_METHOD(&hostname, group, "gethostname", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(hostname) != IS_NULL) { - zephir_is_iterable(groupRoutes, &_4$$6, &_3$$6, 0, 0, "phalcon/mvc/router.zep", 773); + zephir_is_iterable(groupRoutes, &_4$$6, &_3$$6, 0, 0, "phalcon/mvc/router.zep", 775); for ( ; zephir_hash_get_current_data_ex(_4$$6, (void**) &_5$$6, &_3$$6) == SUCCESS ; zephir_hash_move_forward_ex(_4$$6, &_3$$6) @@ -83259,7 +83555,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, notFound) { _0 = Z_TYPE_P(paths) != IS_STRING; } if (_0) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_router_exception_ce, "The not-found paths must be an array or string", "phalcon/mvc/router.zep", 792); + ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_router_exception_ce, "The not-found paths must be an array or string", "phalcon/mvc/router.zep", 794); return; } zephir_update_property_this(this_ptr, SL("_notFoundPaths"), paths TSRMLS_CC); @@ -83365,7 +83661,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, getRouteById) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_routes"), PH_NOISY_CC); - zephir_is_iterable(_0, &_2, &_1, 0, 0, "phalcon/mvc/router.zep", 891); + zephir_is_iterable(_0, &_2, &_1, 0, 0, "phalcon/mvc/router.zep", 893); for ( ; zephir_hash_get_current_data_ex(_2, (void**) &_3, &_1) == SUCCESS ; zephir_hash_move_forward_ex(_2, &_1) @@ -83405,7 +83701,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, getRouteByName) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_routes"), PH_NOISY_CC); - zephir_is_iterable(_0, &_2, &_1, 0, 0, "phalcon/mvc/router.zep", 906); + zephir_is_iterable(_0, &_2, &_1, 0, 0, "phalcon/mvc/router.zep", 908); for ( ; zephir_hash_get_current_data_ex(_2, (void**) &_3, &_1) == SUCCESS ; zephir_hash_move_forward_ex(_2, &_1) @@ -83839,7 +84135,7 @@ static PHP_METHOD(Phalcon_Mvc_Url, get) { } } if (zephir_is_true(args)) { - ZEPHIR_CALL_FUNCTION(&queryString, "http_build_query", NULL, 362, args); + ZEPHIR_CALL_FUNCTION(&queryString, "http_build_query", NULL, 360, args); zephir_check_call_status(); _25$$19 = Z_TYPE_P(queryString) == IS_STRING; if (_25$$19) { @@ -84501,7 +84797,7 @@ static PHP_METHOD(Phalcon_Mvc_View, _loadTemplateEngines) { if (Z_TYPE_P(registeredEngines) != IS_ARRAY) { ZEPHIR_INIT_VAR(_1$$4); object_init_ex(_1$$4, phalcon_mvc_view_engine_php_ce); - ZEPHIR_CALL_METHOD(NULL, _1$$4, "__construct", NULL, 363, this_ptr, dependencyInjector); + ZEPHIR_CALL_METHOD(NULL, _1$$4, "__construct", NULL, 361, this_ptr, dependencyInjector); zephir_check_call_status(); zephir_array_update_string(&engines, SL(".phtml"), &_1$$4, PH_COPY | PH_SEPARATE); } else { @@ -85113,7 +85409,7 @@ static PHP_METHOD(Phalcon_Mvc_View, getPartial) { zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "partial", NULL, 0, partialPath, params); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", NULL, 285); + ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", NULL, 280); zephir_check_call_status(); RETURN_MM(); @@ -86264,6 +86560,29 @@ static PHP_METHOD(Phalcon_Mvc_Collection_Manager, setConnectionService) { } +static PHP_METHOD(Phalcon_Mvc_Collection_Manager, getConnectionService) { + + zval *model, *service = NULL, *entityName = NULL, *_0, *_1$$3; + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &model); + + + + ZEPHIR_INIT_VAR(service); + ZVAL_STRING(service, "mongo", 1); + ZEPHIR_INIT_VAR(entityName); + zephir_get_class(entityName, model, 0 TSRMLS_CC); + _0 = zephir_fetch_nproperty_this(this_ptr, SL("_connectionServices"), PH_NOISY_CC); + if (zephir_array_isset(_0, entityName)) { + _1$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_connectionServices"), PH_NOISY_CC); + ZEPHIR_OBS_NVAR(service); + zephir_array_fetch(&service, _1$$3, entityName, PH_NOISY, "phalcon/mvc/collection/manager.zep", 194 TSRMLS_CC); + } + RETURN_CCTOR(service); + +} + static PHP_METHOD(Phalcon_Mvc_Collection_Manager, useImplicitObjectIds) { zend_bool useImplicitObjectIds; @@ -86322,19 +86641,19 @@ static PHP_METHOD(Phalcon_Mvc_Collection_Manager, getConnection) { zephir_get_class(entityName, model, 0 TSRMLS_CC); if (zephir_array_isset(connectionService, entityName)) { ZEPHIR_OBS_NVAR(service); - zephir_array_fetch(&service, connectionService, entityName, PH_NOISY, "phalcon/mvc/collection/manager.zep", 228 TSRMLS_CC); + zephir_array_fetch(&service, connectionService, entityName, PH_NOISY, "phalcon/mvc/collection/manager.zep", 244 TSRMLS_CC); } } ZEPHIR_OBS_VAR(dependencyInjector); zephir_read_property_this(&dependencyInjector, this_ptr, SL("_dependencyInjector"), PH_NOISY_CC); if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_collection_exception_ce, "A dependency injector container is required to obtain the services related to the ORM", "phalcon/mvc/collection/manager.zep", 234); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_collection_exception_ce, "A dependency injector container is required to obtain the services related to the ORM", "phalcon/mvc/collection/manager.zep", 250); return; } ZEPHIR_CALL_METHOD(&connection, dependencyInjector, "getshared", NULL, 0, service); zephir_check_call_status(); if (Z_TYPE_P(connection) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_collection_exception_ce, "Invalid injected connection service", "phalcon/mvc/collection/manager.zep", 242); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_collection_exception_ce, "Invalid injected connection service", "phalcon/mvc/collection/manager.zep", 258); return; } RETURN_CCTOR(connection); @@ -86373,7 +86692,7 @@ static PHP_METHOD(Phalcon_Mvc_Collection_Manager, notifyEvent) { ZEPHIR_INIT_VAR(_0$$3); zephir_get_class(_0$$3, model, 1 TSRMLS_CC); if (zephir_array_isset_fetch(&modelsBehaviors, behaviors, _0$$3, 0 TSRMLS_CC)) { - zephir_is_iterable(modelsBehaviors, &_2$$4, &_1$$4, 0, 0, "phalcon/mvc/collection/manager.zep", 269); + zephir_is_iterable(modelsBehaviors, &_2$$4, &_1$$4, 0, 0, "phalcon/mvc/collection/manager.zep", 285); for ( ; zephir_hash_get_current_data_ex(_2$$4, (void**) &_3$$4, &_1$$4) == SUCCESS ; zephir_hash_move_forward_ex(_2$$4, &_1$$4) @@ -86447,7 +86766,7 @@ static PHP_METHOD(Phalcon_Mvc_Collection_Manager, missingMethod) { ZEPHIR_INIT_VAR(_0$$3); zephir_get_class(_0$$3, model, 1 TSRMLS_CC); if (zephir_array_isset_fetch(&modelsBehaviors, behaviors, _0$$3, 0 TSRMLS_CC)) { - zephir_is_iterable(modelsBehaviors, &_2$$4, &_1$$4, 0, 0, "phalcon/mvc/collection/manager.zep", 325); + zephir_is_iterable(modelsBehaviors, &_2$$4, &_1$$4, 0, 0, "phalcon/mvc/collection/manager.zep", 341); for ( ; zephir_hash_get_current_data_ex(_2$$4, (void**) &_3$$4, &_1$$4) == SUCCESS ; zephir_hash_move_forward_ex(_2$$4, &_1$$4) @@ -86491,7 +86810,7 @@ static PHP_METHOD(Phalcon_Mvc_Collection_Manager, addBehavior) { ZEPHIR_INIT_NVAR(modelsBehaviors); array_init(modelsBehaviors); } - zephir_array_append(&modelsBehaviors, behavior, PH_SEPARATE, "phalcon/mvc/collection/manager.zep", 358); + zephir_array_append(&modelsBehaviors, behavior, PH_SEPARATE, "phalcon/mvc/collection/manager.zep", 374); zephir_update_property_array(this_ptr, SL("_behaviors"), entityName, modelsBehaviors TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -86700,7 +87019,7 @@ static PHP_METHOD(Phalcon_Mvc_Collection_Behavior_Timestampable, notify) { ZVAL_NULL(timestamp); ZEPHIR_OBS_VAR(format); if (zephir_array_isset_string_fetch(&format, options, SS("format"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_FUNCTION(×tamp, "date", NULL, 294, format); + ZEPHIR_CALL_FUNCTION(×tamp, "date", NULL, 289, format); zephir_check_call_status(); } else { ZEPHIR_OBS_VAR(generator); @@ -88760,12 +89079,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Criteria, fromInput) { ZEPHIR_INIT_VAR(_12$$10); ZEPHIR_CONCAT_SVS(_12$$10, " ", operator, " "); zephir_fast_join(_11$$10, _12$$10, conditions TSRMLS_CC); - ZEPHIR_CALL_METHOD(NULL, criteria, "where", NULL, 308, _11$$10); + ZEPHIR_CALL_METHOD(NULL, criteria, "where", NULL, 306, _11$$10); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, criteria, "bind", NULL, 309, bind); + ZEPHIR_CALL_METHOD(NULL, criteria, "bind", NULL, 307, bind); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, criteria, "setmodelname", NULL, 304, modelName); + ZEPHIR_CALL_METHOD(NULL, criteria, "setmodelname", NULL, 300, modelName); zephir_check_call_status(); RETURN_CCTOR(criteria); @@ -89221,7 +89540,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, getModelSource) { ZEPHIR_INIT_VAR(_0); zephir_get_class_ns(_0, model, 0 TSRMLS_CC); ZEPHIR_INIT_NVAR(source); - zephir_uncamelize(source, _0); + zephir_uncamelize(source, _0, NULL ); zephir_update_property_array(this_ptr, SL("_sources"), entityName, source TSRMLS_CC); RETURN_CCTOR(source); @@ -89778,7 +90097,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasOne) { object_init_ex(relation, phalcon_mvc_model_relation_ce); ZEPHIR_INIT_VAR(_1); ZVAL_LONG(_1, 1); - ZEPHIR_CALL_METHOD(NULL, relation, "__construct", NULL, 310, _1, referencedModel, fields, referencedFields, options); + ZEPHIR_CALL_METHOD(NULL, relation, "__construct", NULL, 308, _1, referencedModel, fields, referencedFields, options); zephir_check_call_status(); ZEPHIR_OBS_VAR(alias); if (zephir_array_isset_string_fetch(&alias, options, SS("alias"), 0 TSRMLS_CC)) { @@ -89854,7 +90173,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, addBelongsTo) { object_init_ex(relation, phalcon_mvc_model_relation_ce); ZEPHIR_INIT_VAR(_1); ZVAL_LONG(_1, 0); - ZEPHIR_CALL_METHOD(NULL, relation, "__construct", NULL, 310, _1, referencedModel, fields, referencedFields, options); + ZEPHIR_CALL_METHOD(NULL, relation, "__construct", NULL, 308, _1, referencedModel, fields, referencedFields, options); zephir_check_call_status(); ZEPHIR_OBS_VAR(alias); if (zephir_array_isset_string_fetch(&alias, options, SS("alias"), 0 TSRMLS_CC)) { @@ -89931,7 +90250,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasMany) { object_init_ex(relation, phalcon_mvc_model_relation_ce); ZEPHIR_INIT_VAR(_0); ZVAL_LONG(_0, 2); - ZEPHIR_CALL_METHOD(NULL, relation, "__construct", NULL, 310, _0, referencedModel, fields, referencedFields, options); + ZEPHIR_CALL_METHOD(NULL, relation, "__construct", NULL, 308, _0, referencedModel, fields, referencedFields, options); zephir_check_call_status(); ZEPHIR_OBS_VAR(alias); if (zephir_array_isset_string_fetch(&alias, options, SS("alias"), 0 TSRMLS_CC)) { @@ -90026,9 +90345,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasManyToMany) { object_init_ex(relation, phalcon_mvc_model_relation_ce); ZEPHIR_INIT_VAR(_0); ZVAL_LONG(_0, 4); - ZEPHIR_CALL_METHOD(NULL, relation, "__construct", NULL, 310, _0, referencedModel, fields, referencedFields, options); + ZEPHIR_CALL_METHOD(NULL, relation, "__construct", NULL, 308, _0, referencedModel, fields, referencedFields, options); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, relation, "setintermediaterelation", NULL, 311, intermediateFields, intermediateModel, intermediateReferencedFields); + ZEPHIR_CALL_METHOD(NULL, relation, "setintermediaterelation", NULL, 309, intermediateFields, intermediateModel, intermediateReferencedFields); zephir_check_call_status(); ZEPHIR_OBS_VAR(alias); if (zephir_array_isset_string_fetch(&alias, options, SS("alias"), 0 TSRMLS_CC)) { @@ -90478,7 +90797,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, getRelationRecords) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not supported", "phalcon/mvc/model/manager.zep", 1242); return; } - ZEPHIR_CALL_METHOD(&_5$$3, this_ptr, "_mergefindparameters", &_6, 312, extraParameters, parameters); + ZEPHIR_CALL_METHOD(&_5$$3, this_ptr, "_mergefindparameters", &_6, 310, extraParameters, parameters); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&builder, this_ptr, "createbuilder", NULL, 0, _5$$3); zephir_check_call_status(); @@ -90543,10 +90862,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, getRelationRecords) { ZEPHIR_CALL_METHOD(&_23, record, "getdi", NULL, 0); zephir_check_call_status(); zephir_array_update_string(&findParams, SL("di"), &_23, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&findArguments, this_ptr, "_mergefindparameters", &_6, 312, findParams, parameters); + ZEPHIR_CALL_METHOD(&findArguments, this_ptr, "_mergefindparameters", &_6, 310, findParams, parameters); zephir_check_call_status(); if (Z_TYPE_P(extraParameters) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&findParams, this_ptr, "_mergefindparameters", &_6, 312, findArguments, extraParameters); + ZEPHIR_CALL_METHOD(&findParams, this_ptr, "_mergefindparameters", &_6, 310, findArguments, extraParameters); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(findParams, findArguments); @@ -92989,7 +93308,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getCallArgument) { add_assoc_stringl_ex(return_value, SS("type"), SL("all"), 1); RETURN_MM(); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getexpression", NULL, 318, argument); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getexpression", NULL, 316, argument); zephir_check_call_status(); RETURN_MM(); @@ -93024,11 +93343,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getCaseExpression) { zephir_create_array(_4$$4, 3, 0 TSRMLS_CC); add_assoc_stringl_ex(_4$$4, SS("type"), SL("when"), 1); zephir_array_fetch_string(&_6$$4, whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/mvc/model/query.zep", 356 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "_getexpression", &_7, 318, _6$$4); + ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "_getexpression", &_7, 316, _6$$4); zephir_check_call_status(); zephir_array_update_string(&_4$$4, SL("expr"), &_5$$4, PH_COPY | PH_SEPARATE); zephir_array_fetch_string(&_8$$4, whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/mvc/model/query.zep", 357 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "_getexpression", &_7, 318, _8$$4); + ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "_getexpression", &_7, 316, _8$$4); zephir_check_call_status(); zephir_array_update_string(&_4$$4, SL("then"), &_5$$4, PH_COPY | PH_SEPARATE); zephir_array_append(&whenClauses, _4$$4, PH_SEPARATE, "phalcon/mvc/model/query.zep", 358); @@ -93037,7 +93356,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getCaseExpression) { zephir_create_array(_9$$5, 2, 0 TSRMLS_CC); add_assoc_stringl_ex(_9$$5, SS("type"), SL("else"), 1); zephir_array_fetch_string(&_11$$5, whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/mvc/model/query.zep", 362 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_10$$5, this_ptr, "_getexpression", &_7, 318, _11$$5); + ZEPHIR_CALL_METHOD(&_10$$5, this_ptr, "_getexpression", &_7, 316, _11$$5); zephir_check_call_status(); zephir_array_update_string(&_9$$5, SL("expr"), &_10$$5, PH_COPY | PH_SEPARATE); zephir_array_append(&whenClauses, _9$$5, PH_SEPARATE, "phalcon/mvc/model/query.zep", 363); @@ -93046,7 +93365,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getCaseExpression) { zephir_create_array(return_value, 3, 0 TSRMLS_CC); add_assoc_stringl_ex(return_value, SS("type"), SL("case"), 1); zephir_array_fetch_string(&_13, expr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/mvc/model/query.zep", 369 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_12, this_ptr, "_getexpression", &_7, 318, _13); + ZEPHIR_CALL_METHOD(&_12, this_ptr, "_getexpression", &_7, 316, _13); zephir_check_call_status(); zephir_array_update_string(&return_value, SL("expr"), &_12, PH_COPY | PH_SEPARATE); zephir_array_update_string(&return_value, SL("when-clauses"), &whenClauses, PH_COPY | PH_SEPARATE); @@ -93085,13 +93404,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getFunctionCall) { ; zephir_hash_move_forward_ex(_1$$6, &_0$$6) ) { ZEPHIR_GET_HVALUE(argument, _2$$6); - ZEPHIR_CALL_METHOD(&_3$$7, this_ptr, "_getcallargument", &_4, 319, argument); + ZEPHIR_CALL_METHOD(&_3$$7, this_ptr, "_getcallargument", &_4, 317, argument); zephir_check_call_status(); zephir_array_append(&functionArgs, _3$$7, PH_SEPARATE, "phalcon/mvc/model/query.zep", 393); } } else { zephir_create_array(functionArgs, 1, 0 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_5$$8, this_ptr, "_getcallargument", &_4, 319, arguments); + ZEPHIR_CALL_METHOD(&_5$$8, this_ptr, "_getcallargument", &_4, 317, arguments); zephir_check_call_status(); zephir_array_fast_append(functionArgs, _5$$8); } @@ -93160,7 +93479,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getExpression) { } else { ZVAL_BOOL(_0$$5, 0); } - ZEPHIR_CALL_METHOD(&left, this_ptr, "_getexpression", &_1, 318, exprLeft, _0$$5); + ZEPHIR_CALL_METHOD(&left, this_ptr, "_getexpression", &_1, 316, exprLeft, _0$$5); zephir_check_call_status(); } ZEPHIR_OBS_VAR(exprRight); @@ -93171,7 +93490,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getExpression) { } else { ZVAL_BOOL(_2$$6, 0); } - ZEPHIR_CALL_METHOD(&right, this_ptr, "_getexpression", &_1, 318, exprRight, _2$$6); + ZEPHIR_CALL_METHOD(&right, this_ptr, "_getexpression", &_1, 316, exprRight, _2$$6); zephir_check_call_status(); } } @@ -93249,7 +93568,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getExpression) { break; } if (ZEPHIR_IS_LONG(exprType, 355)) { - ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "_getqualified", &_3, 320, expr); + ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "_getqualified", &_3, 318, expr); zephir_check_call_status(); break; } @@ -93694,12 +94013,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getExpression) { break; } if (ZEPHIR_IS_LONG(exprType, 350)) { - ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "_getfunctioncall", NULL, 321, expr); + ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "_getfunctioncall", NULL, 319, expr); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(exprType, 409)) { - ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "_getcaseexpression", NULL, 322, expr); + ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "_getcaseexpression", NULL, 320, expr); zephir_check_call_status(); break; } @@ -93709,7 +94028,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getExpression) { add_assoc_stringl_ex(exprReturn, SS("type"), SL("select"), 1); ZEPHIR_INIT_VAR(_36$$68); ZVAL_BOOL(_36$$68, 1); - ZEPHIR_CALL_METHOD(&_35$$68, this_ptr, "_prepareselect", NULL, 323, expr, _36$$68); + ZEPHIR_CALL_METHOD(&_35$$68, this_ptr, "_prepareselect", NULL, 321, expr, _36$$68); zephir_check_call_status(); zephir_array_update_string(&exprReturn, SL("value"), &_35$$68, PH_COPY | PH_SEPARATE); break; @@ -93728,7 +94047,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getExpression) { RETURN_CCTOR(exprReturn); } if (zephir_array_isset_string(expr, SS("domain"))) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getqualified", &_3, 320, expr); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getqualified", &_3, 318, expr); zephir_check_call_status(); RETURN_MM(); } @@ -93741,7 +94060,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getExpression) { ; zephir_hash_move_forward_ex(_40$$71, &_39$$71) ) { ZEPHIR_GET_HVALUE(exprListItem, _41$$71); - ZEPHIR_CALL_METHOD(&_42$$72, this_ptr, "_getexpression", &_1, 318, exprListItem); + ZEPHIR_CALL_METHOD(&_42$$72, this_ptr, "_getexpression", &_1, 316, exprListItem); zephir_check_call_status(); zephir_array_append(&listItems, _42$$72, PH_SEPARATE, "phalcon/mvc/model/query.zep", 747); } @@ -93862,7 +94181,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getSelectColumn) { add_assoc_stringl_ex(sqlColumn, SS("type"), SL("scalar"), 1); ZEPHIR_OBS_VAR(columnData); zephir_array_fetch_string(&columnData, column, SL("column"), PH_NOISY, "phalcon/mvc/model/query.zep", 873 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&sqlExprColumn, this_ptr, "_getexpression", NULL, 318, columnData); + ZEPHIR_CALL_METHOD(&sqlExprColumn, this_ptr, "_getexpression", NULL, 316, columnData); zephir_check_call_status(); ZEPHIR_OBS_VAR(balias); if (zephir_array_isset_string_fetch(&balias, sqlExprColumn, SS("balias"), 0 TSRMLS_CC)) { @@ -94059,7 +94378,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getSingleJoin) { add_assoc_long_ex(_2$$3, SS("type"), 355); zephir_array_update_string(&_2$$3, SL("domain"), &modelAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_2$$3, SL("name"), &fields, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "_getqualified", &_3, 320, _2$$3); + ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "_getqualified", &_3, 318, _2$$3); zephir_check_call_status(); zephir_array_update_string(&_0$$3, SL("left"), &_1$$3, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_VAR(_4$$3); @@ -94067,7 +94386,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getSingleJoin) { add_assoc_stringl_ex(_4$$3, SS("type"), SL("qualified"), 1); zephir_array_update_string(&_4$$3, SL("domain"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_4$$3, SL("name"), &referencedFields, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "_getqualified", &_3, 320, _4$$3); + ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "_getqualified", &_3, 318, _4$$3); zephir_check_call_status(); zephir_array_update_string(&_0$$3, SL("right"), &_1$$3, PH_COPY | PH_SEPARATE); zephir_array_fast_append(sqlJoinConditions, _0$$3); @@ -94103,7 +94422,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getSingleJoin) { add_assoc_long_ex(_14$$5, SS("type"), 355); zephir_array_update_string(&_14$$5, SL("domain"), &modelAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_14$$5, SL("name"), &field, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_13$$5, this_ptr, "_getqualified", &_3, 320, _14$$5); + ZEPHIR_CALL_METHOD(&_13$$5, this_ptr, "_getqualified", &_3, 318, _14$$5); zephir_check_call_status(); zephir_array_update_string(&_12$$5, SL("left"), &_13$$5, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(_15$$5); @@ -94111,7 +94430,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getSingleJoin) { add_assoc_stringl_ex(_15$$5, SS("type"), SL("qualified"), 1); zephir_array_update_string(&_15$$5, SL("domain"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_15$$5, SL("name"), &referencedField, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_13$$5, this_ptr, "_getqualified", &_3, 320, _15$$5); + ZEPHIR_CALL_METHOD(&_13$$5, this_ptr, "_getqualified", &_3, 318, _15$$5); zephir_check_call_status(); zephir_array_update_string(&_12$$5, SL("right"), &_13$$5, PH_COPY | PH_SEPARATE); zephir_array_append(&sqlJoinPartialConditions, _12$$5, PH_SEPARATE, "phalcon/mvc/model/query.zep", 1078); @@ -94194,7 +94513,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getMultiJoin) { add_assoc_long_ex(_8$$4, SS("type"), 355); zephir_array_update_string(&_8$$4, SL("domain"), &modelAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_8$$4, SL("name"), &field, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "_getqualified", &_9, 320, _8$$4); + ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "_getqualified", &_9, 318, _8$$4); zephir_check_call_status(); zephir_array_update_string(&sqlEqualsJoinCondition, SL("left"), &_7$$4, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(_10$$4); @@ -94202,7 +94521,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getMultiJoin) { add_assoc_stringl_ex(_10$$4, SS("type"), SL("qualified"), 1); zephir_array_update_string(&_10$$4, SL("domain"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_10$$4, SL("name"), &referencedFields, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "_getqualified", &_9, 320, _10$$4); + ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "_getqualified", &_9, 318, _10$$4); zephir_check_call_status(); zephir_array_update_string(&sqlEqualsJoinCondition, SL("right"), &_7$$4, PH_COPY | PH_SEPARATE); } @@ -94224,7 +94543,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getMultiJoin) { add_assoc_long_ex(_15$$6, SS("type"), 355); zephir_array_update_string(&_15$$6, SL("domain"), &modelAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_15$$6, SL("name"), &fields, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_14$$6, this_ptr, "_getqualified", &_9, 320, _15$$6); + ZEPHIR_CALL_METHOD(&_14$$6, this_ptr, "_getqualified", &_9, 318, _15$$6); zephir_check_call_status(); zephir_array_update_string(&_13$$6, SL("left"), &_14$$6, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_VAR(_16$$6); @@ -94232,7 +94551,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getMultiJoin) { add_assoc_stringl_ex(_16$$6, SS("type"), SL("qualified"), 1); zephir_array_update_string(&_16$$6, SL("domain"), &intermediateModelName, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_16$$6, SL("name"), &intermediateFields, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_14$$6, this_ptr, "_getqualified", &_9, 320, _16$$6); + ZEPHIR_CALL_METHOD(&_14$$6, this_ptr, "_getqualified", &_9, 318, _16$$6); zephir_check_call_status(); zephir_array_update_string(&_13$$6, SL("right"), &_14$$6, PH_COPY | PH_SEPARATE); zephir_array_fast_append(_12$$6, _13$$6); @@ -94253,7 +94572,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getMultiJoin) { add_assoc_long_ex(_17$$6, SS("type"), 355); zephir_array_update_string(&_17$$6, SL("domain"), &intermediateModelName, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_17$$6, SL("name"), &intermediateReferencedFields, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_14$$6, this_ptr, "_getqualified", &_9, 320, _17$$6); + ZEPHIR_CALL_METHOD(&_14$$6, this_ptr, "_getqualified", &_9, 318, _17$$6); zephir_check_call_status(); zephir_array_update_string(&_13$$6, SL("left"), &_14$$6, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_VAR(_18$$6); @@ -94261,7 +94580,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getMultiJoin) { add_assoc_stringl_ex(_18$$6, SS("type"), SL("qualified"), 1); zephir_array_update_string(&_18$$6, SL("domain"), &referencedModelName, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_18$$6, SL("name"), &referencedFields, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_14$$6, this_ptr, "_getqualified", &_9, 320, _18$$6); + ZEPHIR_CALL_METHOD(&_14$$6, this_ptr, "_getqualified", &_9, 318, _18$$6); zephir_check_call_status(); zephir_array_update_string(&_13$$6, SL("right"), &_14$$6, PH_COPY | PH_SEPARATE); zephir_array_fast_append(_12$$6, _13$$6); @@ -94337,7 +94656,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getJoins) { ; zephir_hash_move_forward_ex(_1, &_0) ) { ZEPHIR_GET_HVALUE(joinItem, _2); - ZEPHIR_CALL_METHOD(&joinData, this_ptr, "_getjoin", &_3, 324, manager, joinItem); + ZEPHIR_CALL_METHOD(&joinData, this_ptr, "_getjoin", &_3, 322, manager, joinItem); zephir_check_call_status(); ZEPHIR_OBS_NVAR(source); zephir_array_fetch_string(&source, joinData, SL("source"), PH_NOISY, "phalcon/mvc/model/query.zep", 1317 TSRMLS_CC); @@ -94351,7 +94670,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getJoins) { zephir_create_array(completeSource, 2, 0 TSRMLS_CC); zephir_array_fast_append(completeSource, source); zephir_array_fast_append(completeSource, schema); - ZEPHIR_CALL_METHOD(&joinType, this_ptr, "_getjointype", &_4, 325, joinItem); + ZEPHIR_CALL_METHOD(&joinType, this_ptr, "_getjointype", &_4, 323, joinItem); zephir_check_call_status(); ZEPHIR_OBS_NVAR(aliasExpr); if (zephir_array_isset_string_fetch(&aliasExpr, joinItem, SS("alias"), 0 TSRMLS_CC)) { @@ -94419,7 +94738,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getJoins) { ZEPHIR_GET_HVALUE(joinItem, _14); ZEPHIR_OBS_NVAR(joinExpr); if (zephir_array_isset_string_fetch(&joinExpr, joinItem, SS("conditions"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_15$$13, this_ptr, "_getexpression", &_16, 318, joinExpr); + ZEPHIR_CALL_METHOD(&_15$$13, this_ptr, "_getexpression", &_16, 316, joinExpr); zephir_check_call_status(); zephir_array_update_zval(&joinPreCondition, joinAliasName, &_15$$13, PH_COPY | PH_SEPARATE); } @@ -94516,10 +94835,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getJoins) { ZEPHIR_CALL_METHOD(&_41$$23, relation, "isthrough", NULL, 0); zephir_check_call_status(); if (!(zephir_is_true(_41$$23))) { - ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "_getsinglejoin", &_42, 326, joinType, joinSource, modelAlias, joinAlias, relation); + ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "_getsinglejoin", &_42, 324, joinType, joinSource, modelAlias, joinAlias, relation); zephir_check_call_status(); } else { - ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "_getmultijoin", &_43, 327, joinType, joinSource, modelAlias, joinAlias, relation); + ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "_getmultijoin", &_43, 325, joinType, joinSource, modelAlias, joinAlias, relation); zephir_check_call_status(); } if (zephir_array_isset_long(sqlJoin, 0)) { @@ -94590,7 +94909,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getOrderClause) { ) { ZEPHIR_GET_HVALUE(orderItem, _2); zephir_array_fetch_string(&_3$$5, orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/mvc/model/query.zep", 1627 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "_getexpression", &_4, 318, _3$$5); + ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "_getexpression", &_4, 316, _3$$5); zephir_check_call_status(); if (zephir_array_isset_string_fetch(&orderSort, orderItem, SS("sort"), 1 TSRMLS_CC)) { ZEPHIR_INIT_NVAR(orderPartSort); @@ -94642,13 +94961,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getGroupClause) { ; zephir_hash_move_forward_ex(_1$$3, &_0$$3) ) { ZEPHIR_GET_HVALUE(groupItem, _2$$3); - ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "_getexpression", &_4, 318, groupItem); + ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "_getexpression", &_4, 316, groupItem); zephir_check_call_status(); zephir_array_append(&groupParts, _3$$4, PH_SEPARATE, "phalcon/mvc/model/query.zep", 1661); } } else { zephir_create_array(groupParts, 1, 0 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_5$$5, this_ptr, "_getexpression", &_4, 318, group); + ZEPHIR_CALL_METHOD(&_5$$5, this_ptr, "_getexpression", &_4, 316, group); zephir_check_call_status(); zephir_array_fast_append(groupParts, _5$$5); } @@ -94673,13 +94992,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getLimitClause) { array_init(limit); ZEPHIR_OBS_VAR(number); if (zephir_array_isset_string_fetch(&number, limitClause, SS("number"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "_getexpression", &_1, 318, number); + ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "_getexpression", &_1, 316, number); zephir_check_call_status(); zephir_array_update_string(&limit, SL("number"), &_0$$3, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_VAR(offset); if (zephir_array_isset_string_fetch(&offset, limitClause, SS("offset"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "_getexpression", &_1, 318, offset); + ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "_getexpression", &_1, 316, offset); zephir_check_call_status(); zephir_array_update_string(&limit, SL("offset"), &_2$$4, PH_COPY | PH_SEPARATE); } @@ -95002,12 +95321,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) { zephir_array_update_string(&select, SL("joins"), &automaticJoins, PH_COPY | PH_SEPARATE); } } - ZEPHIR_CALL_METHOD(&sqlJoins, this_ptr, "_getjoins", &_41, 328, select); + ZEPHIR_CALL_METHOD(&sqlJoins, this_ptr, "_getjoins", &_41, 326, select); zephir_check_call_status(); } else { if (zephir_fast_count_int(automaticJoins TSRMLS_CC)) { zephir_array_update_string(&select, SL("joins"), &automaticJoins, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&sqlJoins, this_ptr, "_getjoins", &_41, 328, select); + ZEPHIR_CALL_METHOD(&sqlJoins, this_ptr, "_getjoins", &_41, 326, select); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(sqlJoins); @@ -95023,7 +95342,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) { ; zephir_hash_move_forward_ex(_43, &_42) ) { ZEPHIR_GET_HVALUE(column, _44); - ZEPHIR_CALL_METHOD(&_45$$41, this_ptr, "_getselectcolumn", &_46, 329, column); + ZEPHIR_CALL_METHOD(&_45$$41, this_ptr, "_getselectcolumn", &_46, 327, column); zephir_check_call_status(); zephir_is_iterable(_45$$41, &_48$$41, &_47$$41, 0, 0, "phalcon/mvc/model/query.zep", 1999); for ( @@ -95072,31 +95391,31 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) { } ZEPHIR_OBS_VAR(where); if (zephir_array_isset_string_fetch(&where, ast, SS("where"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_53$$51, this_ptr, "_getexpression", &_54, 318, where); + ZEPHIR_CALL_METHOD(&_53$$51, this_ptr, "_getexpression", &_54, 316, where); zephir_check_call_status(); zephir_array_update_string(&sqlSelect, SL("where"), &_53$$51, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_VAR(groupBy); if (zephir_array_isset_string_fetch(&groupBy, ast, SS("groupBy"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_55$$52, this_ptr, "_getgroupclause", NULL, 330, groupBy); + ZEPHIR_CALL_METHOD(&_55$$52, this_ptr, "_getgroupclause", NULL, 328, groupBy); zephir_check_call_status(); zephir_array_update_string(&sqlSelect, SL("group"), &_55$$52, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_VAR(having); if (zephir_array_isset_string_fetch(&having, ast, SS("having"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_56$$53, this_ptr, "_getexpression", &_54, 318, having); + ZEPHIR_CALL_METHOD(&_56$$53, this_ptr, "_getexpression", &_54, 316, having); zephir_check_call_status(); zephir_array_update_string(&sqlSelect, SL("having"), &_56$$53, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_VAR(order); if (zephir_array_isset_string_fetch(&order, ast, SS("orderBy"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_57$$54, this_ptr, "_getorderclause", NULL, 331, order); + ZEPHIR_CALL_METHOD(&_57$$54, this_ptr, "_getorderclause", NULL, 329, order); zephir_check_call_status(); zephir_array_update_string(&sqlSelect, SL("order"), &_57$$54, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_VAR(limit); if (zephir_array_isset_string_fetch(&limit, ast, SS("limit"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_58$$55, this_ptr, "_getlimitclause", NULL, 332, limit); + ZEPHIR_CALL_METHOD(&_58$$55, this_ptr, "_getlimitclause", NULL, 330, limit); zephir_check_call_status(); zephir_array_update_string(&sqlSelect, SL("limit"), &_58$$55, PH_COPY | PH_SEPARATE); } @@ -95194,7 +95513,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) { } else { ZVAL_BOOL(_11$$9, 0); } - ZEPHIR_CALL_METHOD(&_10$$9, this_ptr, "_getexpression", &_12, 318, exprValue, _11$$9); + ZEPHIR_CALL_METHOD(&_10$$9, this_ptr, "_getexpression", &_12, 316, exprValue, _11$$9); zephir_check_call_status(); zephir_array_update_string(&_8$$9, SL("value"), &_10$$9, PH_COPY | PH_SEPARATE); zephir_array_append(&exprValues, _8$$9, PH_SEPARATE, "phalcon/mvc/model/query.zep", 2114); @@ -95375,7 +95694,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) { } else { ZVAL_BOOL(_14$$17, 0); } - ZEPHIR_CALL_METHOD(&_12$$17, this_ptr, "_getexpression", &_15, 318, _13$$17, _14$$17); + ZEPHIR_CALL_METHOD(&_12$$17, this_ptr, "_getexpression", &_15, 316, _13$$17, _14$$17); zephir_check_call_status(); zephir_array_append(&sqlFields, _12$$17, PH_SEPARATE, "phalcon/mvc/model/query.zep", 2262); ZEPHIR_OBS_NVAR(exprColumn); @@ -95391,7 +95710,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) { } else { ZVAL_BOOL(_19$$17, 0); } - ZEPHIR_CALL_METHOD(&_18$$17, this_ptr, "_getexpression", &_15, 318, exprColumn, _19$$17); + ZEPHIR_CALL_METHOD(&_18$$17, this_ptr, "_getexpression", &_15, 316, exprColumn, _19$$17); zephir_check_call_status(); zephir_array_update_string(&_16$$17, SL("value"), &_18$$17, PH_COPY | PH_SEPARATE); zephir_array_append(&sqlValues, _16$$17, PH_SEPARATE, "phalcon/mvc/model/query.zep", 2267); @@ -95406,13 +95725,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) { if (zephir_array_isset_string_fetch(&where, ast, SS("where"), 0 TSRMLS_CC)) { ZEPHIR_INIT_VAR(_21$$18); ZVAL_BOOL(_21$$18, 1); - ZEPHIR_CALL_METHOD(&_20$$18, this_ptr, "_getexpression", &_15, 318, where, _21$$18); + ZEPHIR_CALL_METHOD(&_20$$18, this_ptr, "_getexpression", &_15, 316, where, _21$$18); zephir_check_call_status(); zephir_array_update_string(&sqlUpdate, SL("where"), &_20$$18, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_VAR(limit); if (zephir_array_isset_string_fetch(&limit, ast, SS("limit"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_22$$19, this_ptr, "_getlimitclause", NULL, 332, limit); + ZEPHIR_CALL_METHOD(&_22$$19, this_ptr, "_getlimitclause", NULL, 330, limit); zephir_check_call_status(); zephir_array_update_string(&sqlUpdate, SL("limit"), &_22$$19, PH_COPY | PH_SEPARATE); } @@ -95531,13 +95850,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete) { if (zephir_array_isset_string_fetch(&where, ast, SS("where"), 0 TSRMLS_CC)) { ZEPHIR_INIT_VAR(_10$$14); ZVAL_BOOL(_10$$14, 1); - ZEPHIR_CALL_METHOD(&_9$$14, this_ptr, "_getexpression", NULL, 318, where, _10$$14); + ZEPHIR_CALL_METHOD(&_9$$14, this_ptr, "_getexpression", NULL, 316, where, _10$$14); zephir_check_call_status(); zephir_array_update_string(&sqlDelete, SL("where"), &_9$$14, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_VAR(limit); if (zephir_array_isset_string_fetch(&limit, ast, SS("limit"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_11$$15, this_ptr, "_getlimitclause", NULL, 332, limit); + ZEPHIR_CALL_METHOD(&_11$$15, this_ptr, "_getlimitclause", NULL, 330, limit); zephir_check_call_status(); zephir_array_update_string(&sqlDelete, SL("limit"), &_11$$15, PH_COPY | PH_SEPARATE); } @@ -95585,22 +95904,22 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, parse) { zephir_update_property_this(this_ptr, SL("_type"), type TSRMLS_CC); do { if (ZEPHIR_IS_LONG(type, 309)) { - ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareselect", NULL, 323); + ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareselect", NULL, 321); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(type, 306)) { - ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareinsert", NULL, 333); + ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareinsert", NULL, 331); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(type, 300)) { - ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareupdate", NULL, 334); + ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareupdate", NULL, 332); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(type, 303)) { - ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_preparedelete", NULL, 335); + ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_preparedelete", NULL, 333); zephir_check_call_status(); break; } @@ -96000,12 +96319,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _executeSelect) { } else { ZVAL_BOOL(_55$$53, 0); } - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 336, simpleColumnMap, resultObject, resultData, cache, _55$$53); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 334, simpleColumnMap, resultObject, resultData, cache, _55$$53); zephir_check_call_status(); RETURN_MM(); } object_init_ex(return_value, phalcon_mvc_model_resultset_complex_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 337, columns1, resultData, cache); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 335, columns1, resultData, cache); zephir_check_call_status(); RETURN_MM(); @@ -96165,7 +96484,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _executeInsert) { object_init_ex(return_value, phalcon_mvc_model_query_status_ce); ZEPHIR_CALL_METHOD(&_20, insertModel, "create", NULL, 0, insertValues); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 338, _20, insertModel); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 336, _20, insertModel); zephir_check_call_status(); RETURN_MM(); @@ -96296,13 +96615,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _executeUpdate) { zephir_array_update_zval(&updateValues, fieldName, &updateValue, PH_COPY | PH_SEPARATE); } - ZEPHIR_CALL_METHOD(&records, this_ptr, "_getrelatedrecords", NULL, 339, model, intermediate, selectBindParams, selectBindTypes); + ZEPHIR_CALL_METHOD(&records, this_ptr, "_getrelatedrecords", NULL, 337, model, intermediate, selectBindParams, selectBindTypes); zephir_check_call_status(); if (!(zephir_fast_count_int(records TSRMLS_CC))) { object_init_ex(return_value, phalcon_mvc_model_query_status_ce); ZEPHIR_INIT_VAR(_17$$19); ZVAL_BOOL(_17$$19, 1); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_18, 338, _17$$19); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_18, 336, _17$$19); zephir_check_call_status(); RETURN_MM(); } @@ -96335,7 +96654,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _executeUpdate) { object_init_ex(return_value, phalcon_mvc_model_query_status_ce); ZEPHIR_INIT_NVAR(_22$$24); ZVAL_BOOL(_22$$24, 0); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_18, 338, _22$$24, record); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_18, 336, _22$$24, record); zephir_check_call_status(); RETURN_MM(); } @@ -96346,7 +96665,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _executeUpdate) { object_init_ex(return_value, phalcon_mvc_model_query_status_ce); ZEPHIR_INIT_VAR(_23); ZVAL_BOOL(_23, 1); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_18, 338, _23); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_18, 336, _23); zephir_check_call_status(); RETURN_MM(); @@ -96379,13 +96698,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _executeDelete) { ZEPHIR_CALL_METHOD(&model, _1$$4, "load", NULL, 0, modelName); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&records, this_ptr, "_getrelatedrecords", NULL, 339, model, intermediate, bindParams, bindTypes); + ZEPHIR_CALL_METHOD(&records, this_ptr, "_getrelatedrecords", NULL, 337, model, intermediate, bindParams, bindTypes); zephir_check_call_status(); if (!(zephir_fast_count_int(records TSRMLS_CC))) { object_init_ex(return_value, phalcon_mvc_model_query_status_ce); ZEPHIR_INIT_VAR(_2$$5); ZVAL_BOOL(_2$$5, 1); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_3, 338, _2$$5); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_3, 336, _2$$5); zephir_check_call_status(); RETURN_MM(); } @@ -96418,7 +96737,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _executeDelete) { object_init_ex(return_value, phalcon_mvc_model_query_status_ce); ZEPHIR_INIT_NVAR(_7$$10); ZVAL_BOOL(_7$$10, 0); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_3, 338, _7$$10, record); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_3, 336, _7$$10, record); zephir_check_call_status(); RETURN_MM(); } @@ -96429,7 +96748,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _executeDelete) { object_init_ex(return_value, phalcon_mvc_model_query_status_ce); ZEPHIR_INIT_VAR(_8); ZVAL_BOOL(_8, 1); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_3, 338, _8); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_3, 336, _8); zephir_check_call_status(); RETURN_MM(); @@ -96477,18 +96796,18 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getRelatedRecords) { } ZEPHIR_INIT_VAR(query); object_init_ex(query, phalcon_mvc_model_query_ce); - ZEPHIR_CALL_METHOD(NULL, query, "__construct", NULL, 340); + ZEPHIR_CALL_METHOD(NULL, query, "__construct", NULL, 338); zephir_check_call_status(); _5 = zephir_fetch_nproperty_this(this_ptr, SL("_dependencyInjector"), PH_NOISY_CC); - ZEPHIR_CALL_METHOD(NULL, query, "setdi", NULL, 341, _5); + ZEPHIR_CALL_METHOD(NULL, query, "setdi", NULL, 339, _5); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_2); ZVAL_LONG(_2, 309); - ZEPHIR_CALL_METHOD(NULL, query, "settype", NULL, 342, _2); + ZEPHIR_CALL_METHOD(NULL, query, "settype", NULL, 340, _2); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, query, "setintermediate", NULL, 343, selectIr); + ZEPHIR_CALL_METHOD(NULL, query, "setintermediate", NULL, 341, selectIr); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(query, "execute", NULL, 344, bindParams, bindTypes); + ZEPHIR_RETURN_CALL_METHOD(query, "execute", NULL, 342, bindParams, bindTypes); zephir_check_call_status(); RETURN_MM(); @@ -96609,22 +96928,22 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, execute) { zephir_read_property_this(&type, this_ptr, SL("_type"), PH_NOISY_CC); do { if (ZEPHIR_IS_LONG(type, 309)) { - ZEPHIR_CALL_METHOD(&result, this_ptr, "_executeselect", NULL, 345, intermediate, mergedParams, mergedTypes); + ZEPHIR_CALL_METHOD(&result, this_ptr, "_executeselect", NULL, 343, intermediate, mergedParams, mergedTypes); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(type, 306)) { - ZEPHIR_CALL_METHOD(&result, this_ptr, "_executeinsert", NULL, 346, intermediate, mergedParams, mergedTypes); + ZEPHIR_CALL_METHOD(&result, this_ptr, "_executeinsert", NULL, 344, intermediate, mergedParams, mergedTypes); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(type, 300)) { - ZEPHIR_CALL_METHOD(&result, this_ptr, "_executeupdate", NULL, 347, intermediate, mergedParams, mergedTypes); + ZEPHIR_CALL_METHOD(&result, this_ptr, "_executeupdate", NULL, 345, intermediate, mergedParams, mergedTypes); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(type, 303)) { - ZEPHIR_CALL_METHOD(&result, this_ptr, "_executedelete", NULL, 348, intermediate, mergedParams, mergedTypes); + ZEPHIR_CALL_METHOD(&result, this_ptr, "_executedelete", NULL, 346, intermediate, mergedParams, mergedTypes); zephir_check_call_status(); break; } @@ -96679,7 +96998,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleResult) { zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&_1, this_ptr, "execute", NULL, 344, bindParams, bindTypes); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "execute", NULL, 342, bindParams, bindTypes); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(_1, "getfirst", NULL, 0); zephir_check_call_status(); @@ -96876,7 +97195,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSql) { _2$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_bindTypes"), PH_NOISY_CC); ZEPHIR_INIT_VAR(_3$$3); ZVAL_BOOL(_3$$3, 1); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_executeselect", NULL, 345, intermediate, _1$$3, _2$$3, _3$$3); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_executeselect", NULL, 343, intermediate, _1$$3, _2$$3, _3$$3); zephir_check_call_status(); RETURN_MM(); } @@ -98278,7 +98597,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Transaction, rollback) { ZEPHIR_INIT_VAR(_5$$4); object_init_ex(_5$$4, phalcon_mvc_model_transaction_failed_ce); _6$$4 = zephir_fetch_nproperty_this(this_ptr, SL("_rollbackRecord"), PH_NOISY_CC); - ZEPHIR_CALL_METHOD(NULL, _5$$4, "__construct", NULL, 353, rollbackMessage, _6$$4); + ZEPHIR_CALL_METHOD(NULL, _5$$4, "__construct", NULL, 351, rollbackMessage, _6$$4); zephir_check_call_status(); zephir_throw_exception_debug(_5$$4, "phalcon/mvc/model/transaction.zep", 160 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -98297,7 +98616,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Transaction, getConnection) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_rollbackOnAbort"), PH_NOISY_CC); if (zephir_is_true(_0)) { - ZEPHIR_CALL_FUNCTION(&_1$$3, "connection_aborted", NULL, 354); + ZEPHIR_CALL_FUNCTION(&_1$$3, "connection_aborted", NULL, 352); zephir_check_call_status(); if (zephir_is_true(_1$$3)) { ZEPHIR_INIT_VAR(_2$$4); @@ -98351,9 +98670,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Transaction, isManaged) { zval *_0; + ZEPHIR_MM_GROW(); - _0 = zephir_fetch_nproperty_this(this_ptr, SL("_manager"), PH_NOISY_CC); - RETURN_BOOL(!zephir_is_true(_0)); + ZEPHIR_OBS_VAR(_0); + zephir_read_property_this(&_0, this_ptr, SL("_manager"), PH_NOISY_CC); + RETURN_MM_BOOL(Z_TYPE_P(_0) == IS_OBJECT); } @@ -98667,7 +98988,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Validator, isSetOption) { } -static zend_object_value zephir_init_properties_Phalcon_Mvc_Model_Validator(zend_class_entry *class_type TSRMLS_DC) { +zend_object_value zephir_init_properties_Phalcon_Mvc_Model_Validator(zend_class_entry *class_type TSRMLS_DC) { zval *_0, *_1$$3; @@ -98873,7 +99194,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Behavior_Timestampable, notify) { ZVAL_NULL(timestamp); ZEPHIR_OBS_VAR(format); if (zephir_array_isset_string_fetch(&format, options, SS("format"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_FUNCTION(×tamp, "date", NULL, 294, format); + ZEPHIR_CALL_FUNCTION(×tamp, "date", NULL, 289, format); zephir_check_call_status(); } else { ZEPHIR_OBS_VAR(generator); @@ -99222,9 +99543,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData_Libmemcached, __construct) { ZEPHIR_OBS_VAR(_4); zephir_read_property_this(&_4, this_ptr, SL("_ttl"), PH_NOISY_CC); zephir_array_update_string(&_3, SL("lifetime"), &_4, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, _2, "__construct", NULL, 313, _3); + ZEPHIR_CALL_METHOD(NULL, _2, "__construct", NULL, 311, _3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, _1, "__construct", NULL, 314, _2, options); + ZEPHIR_CALL_METHOD(NULL, _1, "__construct", NULL, 312, _2, options); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_memcache"), _1 TSRMLS_CC); ZEPHIR_INIT_VAR(_5); @@ -99321,7 +99642,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData_Libmemcached, reset) { zephir_check_call_status(); } } - ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_model_metadata_libmemcached_ce, this_ptr, "reset", &_5, 315); + ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_model_metadata_libmemcached_ce, this_ptr, "reset", &_5, 313); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -99405,9 +99726,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData_Memcache, __construct) { ZEPHIR_OBS_VAR(_7); zephir_read_property_this(&_7, this_ptr, SL("_ttl"), PH_NOISY_CC); zephir_array_update_string(&_6, SL("lifetime"), &_7, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, _5, "__construct", NULL, 313, _6); + ZEPHIR_CALL_METHOD(NULL, _5, "__construct", NULL, 311, _6); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, _4, "__construct", NULL, 316, _5, options); + ZEPHIR_CALL_METHOD(NULL, _4, "__construct", NULL, 314, _5, options); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_memcache"), _4 TSRMLS_CC); ZEPHIR_INIT_VAR(_8); @@ -99504,7 +99825,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData_Memcache, reset) { zephir_check_call_status(); } } - ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_model_metadata_memcache_ce, this_ptr, "reset", &_5, 315); + ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_model_metadata_memcache_ce, this_ptr, "reset", &_5, 313); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -99677,9 +99998,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData_Redis, __construct) { ZEPHIR_OBS_VAR(_7); zephir_read_property_this(&_7, this_ptr, SL("_ttl"), PH_NOISY_CC); zephir_array_update_string(&_6, SL("lifetime"), &_7, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, _5, "__construct", NULL, 313, _6); + ZEPHIR_CALL_METHOD(NULL, _5, "__construct", NULL, 311, _6); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, _4, "__construct", NULL, 317, _5, options); + ZEPHIR_CALL_METHOD(NULL, _4, "__construct", NULL, 315, _5, options); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_redis"), _4 TSRMLS_CC); ZEPHIR_INIT_VAR(_8); @@ -99776,7 +100097,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData_Redis, reset) { zephir_check_call_status(); } } - ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_model_metadata_redis_ce, this_ptr, "reset", &_5, 315); + ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_model_metadata_redis_ce, this_ptr, "reset", &_5, 313); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -102103,7 +102424,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getQuery) { ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&phql, this_ptr, "getphql", NULL, 349); + ZEPHIR_CALL_METHOD(&phql, this_ptr, "getphql", NULL, 347); zephir_check_call_status(); _0 = zephir_fetch_nproperty_this(this_ptr, SL("_dependencyInjector"), PH_NOISY_CC); ZEPHIR_CPY_WRT(dependencyInjector, _0); @@ -112092,7 +112413,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, __construct) { zephir_update_property_this(this_ptr, SL("_columnTypes"), columnTypes TSRMLS_CC); - ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_model_resultset_complex_ce, this_ptr, "__construct", &_0, 350, result, cache); + ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_model_resultset_complex_ce, this_ptr, "__construct", &_0, 348, result, cache); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -112417,7 +112738,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, __construct) { zephir_update_property_this(this_ptr, SL("_model"), model TSRMLS_CC); zephir_update_property_this(this_ptr, SL("_columnMap"), columnMap TSRMLS_CC); zephir_update_property_this(this_ptr, SL("_keepSnapshots"), keepSnapshots TSRMLS_CC); - ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_model_resultset_simple_ce, this_ptr, "__construct", &_0, 350, result, cache); + ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_model_resultset_simple_ce, this_ptr, "__construct", &_0, 348, result, cache); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -112476,12 +112797,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, current) { _8$$9 = zephir_fetch_nproperty_this(this_ptr, SL("_keepSnapshots"), PH_NOISY_CC); ZEPHIR_INIT_VAR(_9$$9); ZVAL_LONG(_9$$9, 0); - ZEPHIR_CALL_CE_STATIC(&activeRow, phalcon_mvc_model_ce, "cloneresultmap", &_6, 351, _7$$9, row, columnMap, _9$$9, _8$$9); + ZEPHIR_CALL_CE_STATIC(&activeRow, phalcon_mvc_model_ce, "cloneresultmap", &_6, 349, _7$$9, row, columnMap, _9$$9, _8$$9); zephir_check_call_status(); } break; } - ZEPHIR_CALL_CE_STATIC(&activeRow, phalcon_mvc_model_ce, "cloneresultmaphydrate", &_10, 352, row, columnMap, hydrateMode); + ZEPHIR_CALL_CE_STATIC(&activeRow, phalcon_mvc_model_ce, "cloneresultmaphydrate", &_10, 350, row, columnMap, hydrateMode); zephir_check_call_status(); break; } while(0); @@ -112953,7 +113274,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Transaction_Manager, get) { ZEPHIR_INIT_VAR(_3$$4); ZVAL_STRING(_3$$4, "rollbackPendent", 1); zephir_array_fast_append(_2$$4, _3$$4); - ZEPHIR_CALL_FUNCTION(NULL, "register_shutdown_function", NULL, 355, _2$$4); + ZEPHIR_CALL_FUNCTION(NULL, "register_shutdown_function", NULL, 353, _2$$4); zephir_check_call_status(); } if (1) { @@ -113028,9 +113349,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Transaction_Manager, getOrCreateTransaction) } else { ZVAL_BOOL(_6, 0); } - ZEPHIR_CALL_METHOD(NULL, transaction, "__construct", NULL, 356, dependencyInjector, _6, _5); + ZEPHIR_CALL_METHOD(NULL, transaction, "__construct", NULL, 354, dependencyInjector, _6, _5); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, transaction, "settransactionmanager", NULL, 357, this_ptr); + ZEPHIR_CALL_METHOD(NULL, transaction, "settransactionmanager", NULL, 355, this_ptr); zephir_check_call_status(); zephir_update_property_array_append(this_ptr, SL("_transactions"), transaction TSRMLS_CC); RETURN_ON_FAILURE(zephir_property_incr(this_ptr, SL("_number") TSRMLS_CC)); @@ -113316,7 +113637,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Validator_Email, validate) { } ZEPHIR_SINIT_VAR(_3); ZVAL_LONG(&_3, 274); - ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 193, value, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 188, value, &_3); zephir_check_call_status(); if (!(zephir_is_true(_4))) { ZEPHIR_INIT_VAR(_5$$5); @@ -113543,7 +113864,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Validator_Inclusionin, validate) { zephir_check_temp_parameter(_5$$7); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_6, "in_array", NULL, 358, value, domain, strict); + ZEPHIR_CALL_FUNCTION(&_6, "in_array", NULL, 356, value, domain, strict); zephir_check_call_status(); if (!(zephir_is_true(_6))) { ZEPHIR_INIT_VAR(_7$$9); @@ -113682,7 +114003,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Validator_Ip, validate) { zephir_array_update_string(&options, SL("flags"), &_8, PH_COPY | PH_SEPARATE); ZEPHIR_SINIT_NVAR(_7); ZVAL_LONG(&_7, 275); - ZEPHIR_CALL_FUNCTION(&_9, "filter_var", NULL, 193, value, &_7, options); + ZEPHIR_CALL_FUNCTION(&_9, "filter_var", NULL, 188, value, &_7, options); zephir_check_call_status(); if (!(zephir_is_true(_9))) { ZEPHIR_INIT_VAR(_10$$5); @@ -114060,7 +114381,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Validator_StringLength, validate) { RETURN_MM_BOOL(1); } if ((zephir_function_exists_ex(SS("mb_strlen") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 359, value); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 357, value); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(length); @@ -114447,7 +114768,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Validator_Url, validate) { } ZEPHIR_SINIT_VAR(_3); ZVAL_LONG(&_3, 273); - ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 193, value, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 188, value, &_3); zephir_check_call_status(); if (!(zephir_is_true(_4))) { ZEPHIR_INIT_VAR(_5$$5); @@ -114495,8 +114816,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Router_Annotations) { zend_declare_property_null(phalcon_mvc_router_annotations_ce, SL("_handlers"), ZEND_ACC_PROTECTED TSRMLS_CC); - zend_declare_property_bool(phalcon_mvc_router_annotations_ce, SL("_processed"), 0, ZEND_ACC_PROTECTED TSRMLS_CC); - zend_declare_property_string(phalcon_mvc_router_annotations_ce, SL("_controllerSuffix"), "Controller", ZEND_ACC_PROTECTED TSRMLS_CC); zend_declare_property_string(phalcon_mvc_router_annotations_ce, SL("_actionSuffix"), "Action", ZEND_ACC_PROTECTED TSRMLS_CC); @@ -114548,11 +114867,6 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, addResource) { zephir_array_fast_append(_0, prefix); zephir_array_fast_append(_0, handler); zephir_update_property_array_append(this_ptr, SL("_handlers"), _0 TSRMLS_CC); - if (0) { - zephir_update_property_this(this_ptr, SL("_processed"), ZEPHIR_GLOBAL(global_true) TSRMLS_CC); - } else { - zephir_update_property_this(this_ptr, SL("_processed"), ZEPHIR_GLOBAL(global_false) TSRMLS_CC); - } RETURN_THIS(); } @@ -114609,22 +114923,17 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, addModuleResource) { zephir_array_fast_append(_0, handler); zephir_array_fast_append(_0, module); zephir_update_property_array_append(this_ptr, SL("_handlers"), _0 TSRMLS_CC); - if (0) { - zephir_update_property_this(this_ptr, SL("_processed"), ZEPHIR_GLOBAL(global_true) TSRMLS_CC); - } else { - zephir_update_property_this(this_ptr, SL("_processed"), ZEPHIR_GLOBAL(global_false) TSRMLS_CC); - } RETURN_THIS(); } static PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) { - HashTable *_2$$6, *_7$$17, *_11$$19, *_15$$21; - HashPosition _1$$6, _6$$17, _10$$19, _14$$21; - zephir_fcall_cache_entry *_9 = NULL, *_17 = NULL, *_18 = NULL; + HashTable *_1$$5, *_6$$16, *_10$$18, *_14$$20; + HashPosition _0$$5, _5$$16, _9$$18, _13$$20; + zephir_fcall_cache_entry *_8 = NULL, *_16 = NULL, *_17 = NULL; int ZEPHIR_LAST_CALL_STATUS; - zval *uri_param = NULL, *realUri = NULL, *annotationsService = NULL, *handlers = NULL, *controllerSuffix = NULL, *scope = NULL, *prefix = NULL, *dependencyInjector = NULL, *handler = NULL, *controllerName = NULL, *lowerControllerName = NULL, *namespaceName = NULL, *moduleName = NULL, *sufixed = NULL, *handlerAnnotations = NULL, *classAnnotations = NULL, *annotations = NULL, *annotation = NULL, *methodAnnotations = NULL, *lowercased = NULL, *method = NULL, *collection = NULL, *_0, **_3$$6, *_4$$11, *_5$$11 = NULL, **_8$$17, **_12$$19, *_13$$21 = NULL, **_16$$21; + zval *uri_param = NULL, *realUri = NULL, *annotationsService = NULL, *handlers = NULL, *controllerSuffix = NULL, *scope = NULL, *prefix = NULL, *dependencyInjector = NULL, *handler = NULL, *controllerName = NULL, *lowerControllerName = NULL, *namespaceName = NULL, *moduleName = NULL, *sufixed = NULL, *handlerAnnotations = NULL, *classAnnotations = NULL, *annotations = NULL, *annotation = NULL, *methodAnnotations = NULL, *lowercased = NULL, *method = NULL, *collection = NULL, **_2$$5, *_3$$10, *_4$$10 = NULL, **_7$$16, **_11$$18, *_12$$20 = NULL, **_15$$20; zval *uri = NULL; ZEPHIR_MM_GROW(); @@ -114653,107 +114962,104 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) { } else { ZEPHIR_CPY_WRT(realUri, uri); } - _0 = zephir_fetch_nproperty_this(this_ptr, SL("_processed"), PH_NOISY_CC); - if (!(zephir_is_true(_0))) { - ZEPHIR_INIT_VAR(annotationsService); - ZVAL_NULL(annotationsService); - ZEPHIR_OBS_VAR(handlers); - zephir_read_property_this(&handlers, this_ptr, SL("_handlers"), PH_NOISY_CC); - if (Z_TYPE_P(handlers) == IS_ARRAY) { - ZEPHIR_OBS_VAR(controllerSuffix); - zephir_read_property_this(&controllerSuffix, this_ptr, SL("_controllerSuffix"), PH_NOISY_CC); - zephir_is_iterable(handlers, &_2$$6, &_1$$6, 0, 0, "phalcon/mvc/router/annotations.zep", 208); - for ( - ; zephir_hash_get_current_data_ex(_2$$6, (void**) &_3$$6, &_1$$6) == SUCCESS - ; zephir_hash_move_forward_ex(_2$$6, &_1$$6) - ) { - ZEPHIR_GET_HVALUE(scope, _3$$6); - if (Z_TYPE_P(scope) == IS_ARRAY) { - ZEPHIR_OBS_NVAR(prefix); - zephir_array_fetch_long(&prefix, scope, 0, PH_NOISY, "phalcon/mvc/router/annotations.zep", 117 TSRMLS_CC); - if (!(ZEPHIR_IS_EMPTY(prefix))) { - if (!(zephir_start_with(realUri, prefix, NULL))) { - continue; - } - } - if (Z_TYPE_P(annotationsService) != IS_OBJECT) { - _4$$11 = zephir_fetch_nproperty_this(this_ptr, SL("_dependencyInjector"), PH_NOISY_CC); - ZEPHIR_CPY_WRT(dependencyInjector, _4$$11); - if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'annotations' service", "phalcon/mvc/router/annotations.zep", 129); - return; - } - ZEPHIR_INIT_NVAR(_5$$11); - ZVAL_STRING(_5$$11, "annotations", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(&annotationsService, dependencyInjector, "getshared", NULL, 0, _5$$11); - zephir_check_temp_parameter(_5$$11); - zephir_check_call_status(); + ZEPHIR_INIT_VAR(annotationsService); + ZVAL_NULL(annotationsService); + ZEPHIR_OBS_VAR(handlers); + zephir_read_property_this(&handlers, this_ptr, SL("_handlers"), PH_NOISY_CC); + if (Z_TYPE_P(handlers) == IS_ARRAY) { + ZEPHIR_OBS_VAR(controllerSuffix); + zephir_read_property_this(&controllerSuffix, this_ptr, SL("_controllerSuffix"), PH_NOISY_CC); + zephir_is_iterable(handlers, &_1$$5, &_0$$5, 0, 0, "phalcon/mvc/router/annotations.zep", 203); + for ( + ; zephir_hash_get_current_data_ex(_1$$5, (void**) &_2$$5, &_0$$5) == SUCCESS + ; zephir_hash_move_forward_ex(_1$$5, &_0$$5) + ) { + ZEPHIR_GET_HVALUE(scope, _2$$5); + if (Z_TYPE_P(scope) == IS_ARRAY) { + ZEPHIR_OBS_NVAR(prefix); + zephir_array_fetch_long(&prefix, scope, 0, PH_NOISY, "phalcon/mvc/router/annotations.zep", 112 TSRMLS_CC); + if (!(ZEPHIR_IS_EMPTY(prefix))) { + if (!(zephir_start_with(realUri, prefix, NULL))) { + continue; } - ZEPHIR_OBS_NVAR(handler); - zephir_array_fetch_long(&handler, scope, 1, PH_NOISY, "phalcon/mvc/router/annotations.zep", 138 TSRMLS_CC); - if (zephir_memnstr_str(handler, SL("\\"), "phalcon/mvc/router/annotations.zep", 140)) { - ZEPHIR_INIT_NVAR(controllerName); - zephir_get_class_ns(controllerName, handler, 0 TSRMLS_CC); - ZEPHIR_INIT_NVAR(lowerControllerName); - zephir_uncamelize(lowerControllerName, controllerName); - ZEPHIR_INIT_NVAR(namespaceName); - zephir_get_ns_class(namespaceName, handler, 0 TSRMLS_CC); - } else { - ZEPHIR_CPY_WRT(controllerName, handler); - ZEPHIR_INIT_NVAR(lowerControllerName); - zephir_uncamelize(lowerControllerName, controllerName); - ZEPHIR_INIT_NVAR(namespaceName); - ZVAL_NULL(namespaceName); + } + if (Z_TYPE_P(annotationsService) != IS_OBJECT) { + _3$$10 = zephir_fetch_nproperty_this(this_ptr, SL("_dependencyInjector"), PH_NOISY_CC); + ZEPHIR_CPY_WRT(dependencyInjector, _3$$10); + if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'annotations' service", "phalcon/mvc/router/annotations.zep", 124); + return; } - zephir_update_property_this(this_ptr, SL("_routePrefix"), ZEPHIR_GLOBAL(global_null) TSRMLS_CC); - ZEPHIR_OBS_NVAR(moduleName); - zephir_array_isset_long_fetch(&moduleName, scope, 2, 0 TSRMLS_CC); - ZEPHIR_INIT_NVAR(sufixed); - ZEPHIR_CONCAT_VV(sufixed, handler, controllerSuffix); - ZEPHIR_CALL_METHOD(&handlerAnnotations, annotationsService, "get", NULL, 0, sufixed); + ZEPHIR_INIT_NVAR(_4$$10); + ZVAL_STRING(_4$$10, "annotations", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(&annotationsService, dependencyInjector, "getshared", NULL, 0, _4$$10); + zephir_check_temp_parameter(_4$$10); zephir_check_call_status(); - if (Z_TYPE_P(handlerAnnotations) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(&classAnnotations, handlerAnnotations, "getclassannotations", NULL, 0); - zephir_check_call_status(); - if (Z_TYPE_P(classAnnotations) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(&annotations, classAnnotations, "getannotations", NULL, 0); - zephir_check_call_status(); - if (Z_TYPE_P(annotations) == IS_ARRAY) { - zephir_is_iterable(annotations, &_7$$17, &_6$$17, 0, 0, "phalcon/mvc/router/annotations.zep", 187); - for ( - ; zephir_hash_get_current_data_ex(_7$$17, (void**) &_8$$17, &_6$$17) == SUCCESS - ; zephir_hash_move_forward_ex(_7$$17, &_6$$17) - ) { - ZEPHIR_GET_HVALUE(annotation, _8$$17); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "processcontrollerannotation", &_9, 0, controllerName, annotation); - zephir_check_call_status(); - } - } - } - ZEPHIR_CALL_METHOD(&methodAnnotations, handlerAnnotations, "getmethodsannotations", NULL, 0); + } + ZEPHIR_OBS_NVAR(handler); + zephir_array_fetch_long(&handler, scope, 1, PH_NOISY, "phalcon/mvc/router/annotations.zep", 133 TSRMLS_CC); + if (zephir_memnstr_str(handler, SL("\\"), "phalcon/mvc/router/annotations.zep", 135)) { + ZEPHIR_INIT_NVAR(controllerName); + zephir_get_class_ns(controllerName, handler, 0 TSRMLS_CC); + ZEPHIR_INIT_NVAR(lowerControllerName); + zephir_uncamelize(lowerControllerName, controllerName, NULL ); + ZEPHIR_INIT_NVAR(namespaceName); + zephir_get_ns_class(namespaceName, handler, 0 TSRMLS_CC); + } else { + ZEPHIR_CPY_WRT(controllerName, handler); + ZEPHIR_INIT_NVAR(lowerControllerName); + zephir_uncamelize(lowerControllerName, controllerName, NULL ); + ZEPHIR_INIT_NVAR(namespaceName); + ZVAL_NULL(namespaceName); + } + zephir_update_property_this(this_ptr, SL("_routePrefix"), ZEPHIR_GLOBAL(global_null) TSRMLS_CC); + ZEPHIR_OBS_NVAR(moduleName); + zephir_array_isset_long_fetch(&moduleName, scope, 2, 0 TSRMLS_CC); + ZEPHIR_INIT_NVAR(sufixed); + ZEPHIR_CONCAT_VV(sufixed, handler, controllerSuffix); + ZEPHIR_CALL_METHOD(&handlerAnnotations, annotationsService, "get", NULL, 0, sufixed); + zephir_check_call_status(); + if (Z_TYPE_P(handlerAnnotations) == IS_OBJECT) { + ZEPHIR_CALL_METHOD(&classAnnotations, handlerAnnotations, "getclassannotations", NULL, 0); + zephir_check_call_status(); + if (Z_TYPE_P(classAnnotations) == IS_OBJECT) { + ZEPHIR_CALL_METHOD(&annotations, classAnnotations, "getannotations", NULL, 0); zephir_check_call_status(); - if (Z_TYPE_P(methodAnnotations) == IS_ARRAY) { - ZEPHIR_INIT_NVAR(lowercased); - zephir_uncamelize(lowercased, handler); - zephir_is_iterable(methodAnnotations, &_11$$19, &_10$$19, 0, 0, "phalcon/mvc/router/annotations.zep", 203); + if (Z_TYPE_P(annotations) == IS_ARRAY) { + zephir_is_iterable(annotations, &_6$$16, &_5$$16, 0, 0, "phalcon/mvc/router/annotations.zep", 182); for ( - ; zephir_hash_get_current_data_ex(_11$$19, (void**) &_12$$19, &_10$$19) == SUCCESS - ; zephir_hash_move_forward_ex(_11$$19, &_10$$19) + ; zephir_hash_get_current_data_ex(_6$$16, (void**) &_7$$16, &_5$$16) == SUCCESS + ; zephir_hash_move_forward_ex(_6$$16, &_5$$16) ) { - ZEPHIR_GET_HMKEY(method, _11$$19, _10$$19); - ZEPHIR_GET_HVALUE(collection, _12$$19); - if (Z_TYPE_P(collection) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(&_13$$21, collection, "getannotations", NULL, 0); + ZEPHIR_GET_HVALUE(annotation, _7$$16); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "processcontrollerannotation", &_8, 0, controllerName, annotation); + zephir_check_call_status(); + } + } + } + ZEPHIR_CALL_METHOD(&methodAnnotations, handlerAnnotations, "getmethodsannotations", NULL, 0); + zephir_check_call_status(); + if (Z_TYPE_P(methodAnnotations) == IS_ARRAY) { + ZEPHIR_INIT_NVAR(lowercased); + zephir_uncamelize(lowercased, handler, NULL ); + zephir_is_iterable(methodAnnotations, &_10$$18, &_9$$18, 0, 0, "phalcon/mvc/router/annotations.zep", 198); + for ( + ; zephir_hash_get_current_data_ex(_10$$18, (void**) &_11$$18, &_9$$18) == SUCCESS + ; zephir_hash_move_forward_ex(_10$$18, &_9$$18) + ) { + ZEPHIR_GET_HMKEY(method, _10$$18, _9$$18); + ZEPHIR_GET_HVALUE(collection, _11$$18); + if (Z_TYPE_P(collection) == IS_OBJECT) { + ZEPHIR_CALL_METHOD(&_12$$20, collection, "getannotations", NULL, 0); + zephir_check_call_status(); + zephir_is_iterable(_12$$20, &_14$$20, &_13$$20, 0, 0, "phalcon/mvc/router/annotations.zep", 196); + for ( + ; zephir_hash_get_current_data_ex(_14$$20, (void**) &_15$$20, &_13$$20) == SUCCESS + ; zephir_hash_move_forward_ex(_14$$20, &_13$$20) + ) { + ZEPHIR_GET_HVALUE(annotation, _15$$20); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "processactionannotation", &_16, 0, moduleName, namespaceName, lowerControllerName, method, annotation); zephir_check_call_status(); - zephir_is_iterable(_13$$21, &_15$$21, &_14$$21, 0, 0, "phalcon/mvc/router/annotations.zep", 201); - for ( - ; zephir_hash_get_current_data_ex(_15$$21, (void**) &_16$$21, &_14$$21) == SUCCESS - ; zephir_hash_move_forward_ex(_15$$21, &_14$$21) - ) { - ZEPHIR_GET_HVALUE(annotation, _16$$21); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "processactionannotation", &_17, 0, moduleName, namespaceName, lowerControllerName, method, annotation); - zephir_check_call_status(); - } } } } @@ -114761,13 +115067,8 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) { } } } - if (1) { - zephir_update_property_this(this_ptr, SL("_processed"), ZEPHIR_GLOBAL(global_true) TSRMLS_CC); - } else { - zephir_update_property_this(this_ptr, SL("_processed"), ZEPHIR_GLOBAL(global_false) TSRMLS_CC); - } } - ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_router_annotations_ce, this_ptr, "handle", &_18, 360, realUri); + ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_router_annotations_ce, this_ptr, "handle", &_17, 358, realUri); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -114977,7 +115278,7 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, processActionAnnotation) { zephir_check_temp_parameter(_3$$9); zephir_check_call_status(); if (Z_TYPE_P(converts) == IS_ARRAY) { - zephir_is_iterable(converts, &_6$$24, &_5$$24, 0, 0, "phalcon/mvc/router/annotations.zep", 354); + zephir_is_iterable(converts, &_6$$24, &_5$$24, 0, 0, "phalcon/mvc/router/annotations.zep", 346); for ( ; zephir_hash_get_current_data_ex(_6$$24, (void**) &_7$$24, &_5$$24) == SUCCESS ; zephir_hash_move_forward_ex(_6$$24, &_5$$24) @@ -114994,7 +115295,7 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, processActionAnnotation) { zephir_check_temp_parameter(_3$$9); zephir_check_call_status(); if (Z_TYPE_P(converts) == IS_ARRAY) { - zephir_is_iterable(converts, &_10$$26, &_9$$26, 0, 0, "phalcon/mvc/router/annotations.zep", 364); + zephir_is_iterable(converts, &_10$$26, &_9$$26, 0, 0, "phalcon/mvc/router/annotations.zep", 356); for ( ; zephir_hash_get_current_data_ex(_10$$26, (void**) &_11$$26, &_9$$26) == SUCCESS ; zephir_hash_move_forward_ex(_10$$26, &_9$$26) @@ -115610,7 +115911,7 @@ static PHP_METHOD(Phalcon_Mvc_Router_Group, _addRoute) { ZEPHIR_CALL_METHOD(NULL, route, "__construct", NULL, 78, _2, mergedPaths, httpMethods); zephir_check_call_status(); zephir_update_property_array_append(this_ptr, SL("_routes"), route TSRMLS_CC); - ZEPHIR_CALL_METHOD(NULL, route, "setgroup", NULL, 361, this_ptr); + ZEPHIR_CALL_METHOD(NULL, route, "setgroup", NULL, 359, this_ptr); zephir_check_call_status(); RETURN_CCTOR(route); @@ -116196,7 +116497,7 @@ static PHP_METHOD(Phalcon_Mvc_Router_Route, getRoutePaths) { ZEPHIR_CPY_WRT(realClassName, controllerName); } ZEPHIR_INIT_VAR(_1$$9); - zephir_uncamelize(_1$$9, realClassName); + zephir_uncamelize(_1$$9, realClassName, NULL ); zephir_array_update_string(&routePaths, SL("controller"), &_1$$9, PH_COPY | PH_SEPARATE); } if (Z_TYPE_P(actionName) != IS_NULL) { @@ -117133,7 +117434,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, _loadTemplateEngines) { if (Z_TYPE_P(registeredEngines) != IS_ARRAY) { ZEPHIR_INIT_VAR(_0$$4); object_init_ex(_0$$4, phalcon_mvc_view_engine_php_ce); - ZEPHIR_CALL_METHOD(NULL, _0$$4, "__construct", NULL, 363, this_ptr, dependencyInjector); + ZEPHIR_CALL_METHOD(NULL, _0$$4, "__construct", NULL, 361, this_ptr, dependencyInjector); zephir_check_call_status(); zephir_array_update_string(&engines, SL(".phtml"), &_0$$4, PH_COPY | PH_SEPARATE); } else { @@ -117390,7 +117691,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, render) { } else { ZEPHIR_CPY_WRT(mergedParams, viewParams); } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "_internalrender", NULL, 382, path, mergedParams); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "_internalrender", NULL, 379, path, mergedParams); zephir_check_call_status(); if (Z_TYPE_P(cache) == IS_OBJECT) { ZEPHIR_CALL_METHOD(&_2$$12, cache, "isstarted", NULL, 0); @@ -117457,7 +117758,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, partial) { } else { ZEPHIR_CPY_WRT(mergedParams, params); } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "_internalrender", NULL, 382, partialPath, mergedParams); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "_internalrender", NULL, 379, partialPath, mergedParams); zephir_check_call_status(); if (Z_TYPE_P(params) == IS_ARRAY) { zephir_update_property_this(this_ptr, SL("_viewParams"), viewParams TSRMLS_CC); @@ -117849,7 +118150,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Php, render) { if (mustClean == 1) { - ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 364); + ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 362); zephir_check_call_status(); } if (Z_TYPE_P(params) == IS_ARRAY) { @@ -117944,18 +118245,18 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, getCompiler) { ZEPHIR_INIT_NVAR(compiler); object_init_ex(compiler, phalcon_mvc_view_engine_volt_compiler_ce); _0$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_view"), PH_NOISY_CC); - ZEPHIR_CALL_METHOD(NULL, compiler, "__construct", NULL, 365, _0$$3); + ZEPHIR_CALL_METHOD(NULL, compiler, "__construct", NULL, 363, _0$$3); zephir_check_call_status(); _1$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_dependencyInjector"), PH_NOISY_CC); ZEPHIR_CPY_WRT(dependencyInjector, _1$$3); if (Z_TYPE_P(dependencyInjector) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(NULL, compiler, "setdi", NULL, 366, dependencyInjector); + ZEPHIR_CALL_METHOD(NULL, compiler, "setdi", NULL, 364, dependencyInjector); zephir_check_call_status(); } ZEPHIR_OBS_VAR(options); zephir_read_property_this(&options, this_ptr, SL("_options"), PH_NOISY_CC); if (Z_TYPE_P(options) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(NULL, compiler, "setoptions", NULL, 367, options); + ZEPHIR_CALL_METHOD(NULL, compiler, "setoptions", NULL, 365, options); zephir_check_call_status(); } zephir_update_property_this(this_ptr, SL("_compiler"), compiler TSRMLS_CC); @@ -117994,7 +118295,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, render) { if (mustClean) { - ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 364); + ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 362); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(&compiler, this_ptr, "getcompiler", NULL, 0); @@ -118053,7 +118354,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, length) { ZVAL_LONG(length, zephir_fast_count_int(item TSRMLS_CC)); } else { if ((zephir_function_exists_ex(SS("mb_strlen") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 359, item); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 357, item); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(length); @@ -118079,7 +118380,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, isIncluded) { } if (Z_TYPE_P(haystack) == IS_STRING) { if ((zephir_function_exists_ex(SS("mb_strpos") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&_0$$5, "mb_strpos", NULL, 368, haystack, needle); + ZEPHIR_CALL_FUNCTION(&_0$$5, "mb_strpos", NULL, 366, haystack, needle); zephir_check_call_status(); RETURN_MM_BOOL(!ZEPHIR_IS_FALSE_IDENTICAL(_0$$5)); } @@ -118130,7 +118431,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, convertEncoding) { _0 = ZEPHIR_IS_STRING(to, "utf8"); } if (_0) { - ZEPHIR_RETURN_CALL_FUNCTION("utf8_encode", NULL, 369, text); + ZEPHIR_RETURN_CALL_FUNCTION("utf8_encode", NULL, 367, text); zephir_check_call_status(); RETURN_MM(); } @@ -118139,17 +118440,17 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, convertEncoding) { _1 = ZEPHIR_IS_STRING(from, "utf8"); } if (_1) { - ZEPHIR_RETURN_CALL_FUNCTION("utf8_decode", NULL, 370, text); + ZEPHIR_RETURN_CALL_FUNCTION("utf8_decode", NULL, 368, text); zephir_check_call_status(); RETURN_MM(); } if ((zephir_function_exists_ex(SS("mb_convert_encoding") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 182, text, from, to); + ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 177, text, from, to); zephir_check_call_status(); RETURN_MM(); } if ((zephir_function_exists_ex(SS("iconv") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("iconv", NULL, 371, from, to, text); + ZEPHIR_RETURN_CALL_FUNCTION("iconv", NULL, 369, from, to, text); zephir_check_call_status(); RETURN_MM(); } @@ -118220,7 +118521,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, slice) { if (Z_TYPE_P(value) == IS_ARRAY) { ZEPHIR_SINIT_VAR(_5$$9); ZVAL_LONG(&_5$$9, start); - ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 372, value, &_5$$9, length); + ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 370, value, &_5$$9, length); zephir_check_call_status(); RETURN_MM(); } @@ -118228,13 +118529,13 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, slice) { if (Z_TYPE_P(length) != IS_NULL) { ZEPHIR_SINIT_VAR(_6$$11); ZVAL_LONG(&_6$$11, start); - ZEPHIR_RETURN_CALL_FUNCTION("mb_substr", &_7, 373, value, &_6$$11, length); + ZEPHIR_RETURN_CALL_FUNCTION("mb_substr", &_7, 371, value, &_6$$11, length); zephir_check_call_status(); RETURN_MM(); } ZEPHIR_SINIT_VAR(_8$$10); ZVAL_LONG(&_8$$10, start); - ZEPHIR_RETURN_CALL_FUNCTION("mb_substr", &_7, 373, value, &_8$$10); + ZEPHIR_RETURN_CALL_FUNCTION("mb_substr", &_7, 371, value, &_8$$10); zephir_check_call_status(); RETURN_MM(); } @@ -118264,7 +118565,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, sort) { ZEPHIR_MAKE_REF(value); - ZEPHIR_CALL_FUNCTION(NULL, "asort", NULL, 374, value); + ZEPHIR_CALL_FUNCTION(NULL, "asort", NULL, 372, value); ZEPHIR_UNREF(value); zephir_check_call_status(); RETURN_CTOR(value); @@ -118307,7 +118608,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, callMacro) { ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_RETURN_CALL_FUNCTION("call_user_func", NULL, 375, macro, arguments); + ZEPHIR_CALL_USER_FUNC_ARRAY(return_value, macro, arguments); zephir_check_call_status(); RETURN_MM(); @@ -118767,7 +119068,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, attributeReader) { } } } else { - ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", &_7, 376, left); + ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", &_7, 373, left); zephir_check_call_status(); ZEPHIR_OBS_VAR(leftType); zephir_array_fetch_string(&leftType, left, SL("type"), PH_NOISY, "phalcon/mvc/view/engine/volt/compiler.zep", 339 TSRMLS_CC); @@ -118789,7 +119090,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, attributeReader) { zephir_array_fetch_string(&_10$$13, right, SL("value"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 352 TSRMLS_CC); zephir_concat_self(&exprCode, _10$$13 TSRMLS_CC); } else { - ZEPHIR_CALL_METHOD(&_11$$14, this_ptr, "expression", &_7, 376, right); + ZEPHIR_CALL_METHOD(&_11$$14, this_ptr, "expression", &_7, 373, right); zephir_check_call_status(); zephir_concat_self(&exprCode, _11$$14 TSRMLS_CC); } @@ -118817,7 +119118,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) { ZVAL_NULL(funcArguments); ZEPHIR_OBS_NVAR(funcArguments); if (zephir_array_isset_string_fetch(&funcArguments, expr, SS("arguments"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", &_0, 376, funcArguments); + ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", &_0, 373, funcArguments); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(arguments); @@ -118840,7 +119141,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) { zephir_array_fast_append(_1$$6, funcArguments); ZEPHIR_INIT_VAR(_2$$6); ZVAL_STRING(_2$$6, "compileFunction", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 377, _2$$6, _1$$6); + ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 374, _2$$6, _1$$6); zephir_check_temp_parameter(_2$$6); zephir_check_call_status(); if (Z_TYPE_P(code) == IS_STRING) { @@ -118902,7 +119203,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) { ZEPHIR_OBS_VAR(exprLevel); zephir_read_property_this(&exprLevel, this_ptr, SL("_exprLevel"), PH_NOISY_CC); if (Z_TYPE_P(block) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&code, this_ptr, "_statementlistorextends", NULL, 378, block); + ZEPHIR_CALL_METHOD(&code, this_ptr, "_statementlistorextends", NULL, 375, block); zephir_check_call_status(); if (ZEPHIR_IS_LONG(exprLevel, 1)) { ZEPHIR_CPY_WRT(escapedCode, code); @@ -118928,7 +119229,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) { RETURN_MM_STRING("''", 1); } ZEPHIR_INIT_VAR(_9$$5); - zephir_camelize(_9$$5, name); + zephir_camelize(_9$$5, name, NULL ); ZEPHIR_CALL_FUNCTION(&method, "lcfirst", NULL, 69, _9$$5); zephir_check_call_status(); ZEPHIR_INIT_VAR(className); @@ -118998,7 +119299,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) { ZEPHIR_CONCAT_SVSVS(return_value, "$this->callMacro('", name, "', array(", arguments, "))"); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&_10, this_ptr, "expression", &_0, 376, nameExpr); + ZEPHIR_CALL_METHOD(&_10, this_ptr, "expression", &_0, 373, nameExpr); zephir_check_call_status(); ZEPHIR_CONCAT_VSVS(return_value, _10, "(", arguments, ")"); RETURN_MM(); @@ -119057,28 +119358,28 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveTest) { if (zephir_array_isset_string_fetch(&name, testName, SS("value"), 0 TSRMLS_CC)) { if (ZEPHIR_IS_STRING(name, "divisibleby")) { zephir_array_fetch_string(&_1$$12, test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 641 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_0$$12, this_ptr, "expression", &_2, 376, _1$$12); + ZEPHIR_CALL_METHOD(&_0$$12, this_ptr, "expression", &_2, 373, _1$$12); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "(((", left, ") % (", _0$$12, ")) == 0)"); RETURN_MM(); } if (ZEPHIR_IS_STRING(name, "sameas")) { zephir_array_fetch_string(&_4$$13, test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 648 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_3$$13, this_ptr, "expression", &_2, 376, _4$$13); + ZEPHIR_CALL_METHOD(&_3$$13, this_ptr, "expression", &_2, 373, _4$$13); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "(", left, ") === (", _3$$13, ")"); RETURN_MM(); } if (ZEPHIR_IS_STRING(name, "type")) { zephir_array_fetch_string(&_6$$14, test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 655 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_5$$14, this_ptr, "expression", &_2, 376, _6$$14); + ZEPHIR_CALL_METHOD(&_5$$14, this_ptr, "expression", &_2, 373, _6$$14); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "gettype(", left, ") === (", _5$$14, ")"); RETURN_MM(); } } } - ZEPHIR_CALL_METHOD(&_7, this_ptr, "expression", &_2, 376, test); + ZEPHIR_CALL_METHOD(&_7, this_ptr, "expression", &_2, 373, test); zephir_check_call_status(); ZEPHIR_CONCAT_VSV(return_value, left, " == ", _7); RETURN_MM(); @@ -119149,11 +119450,11 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) { zephir_array_update_string(&_4$$7, SL("file"), &file, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_4$$7, SL("line"), &line, PH_COPY | PH_SEPARATE); ZEPHIR_MAKE_REF(funcArguments); - ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 379, funcArguments, _4$$7); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 376, funcArguments, _4$$7); ZEPHIR_UNREF(funcArguments); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 376, funcArguments); + ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 373, funcArguments); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(arguments, left); @@ -119168,7 +119469,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) { zephir_array_fast_append(_6$$9, funcArguments); ZEPHIR_INIT_VAR(_7$$9); ZVAL_STRING(_7$$9, "compileFilter", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 377, _7$$9, _6$$9); + ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 374, _7$$9, _6$$9); zephir_check_temp_parameter(_7$$9); zephir_check_call_status(); if (Z_TYPE_P(code) == IS_STRING) { @@ -119365,7 +119666,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { zephir_array_fast_append(_0$$4, expr); ZEPHIR_INIT_NVAR(_1$$4); ZVAL_STRING(_1$$4, "resolveExpression", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "fireextensionevent", &_2, 377, _1$$4, _0$$4); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "fireextensionevent", &_2, 374, _1$$4, _0$$4); zephir_check_temp_parameter(_1$$4); zephir_check_call_status(); if (Z_TYPE_P(exprCode) == IS_STRING) { @@ -119383,7 +119684,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { ) { ZEPHIR_GET_HVALUE(singleExpr, _5$$6); zephir_array_fetch_string(&_6$$7, singleExpr, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 993 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_7, 376, _6$$7); + ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_7, 373, _6$$7); zephir_check_call_status(); ZEPHIR_OBS_NVAR(name); if (zephir_array_isset_string_fetch(&name, singleExpr, SS("name"), 0 TSRMLS_CC)) { @@ -119405,7 +119706,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { } ZEPHIR_OBS_NVAR(left); if (zephir_array_isset_string_fetch(&left, expr, SS("left"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", &_7, 376, left); + ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", &_7, 373, left); zephir_check_call_status(); } if (ZEPHIR_IS_LONG(type, 311)) { @@ -119416,13 +119717,13 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { } if (ZEPHIR_IS_LONG(type, 124)) { zephir_array_fetch_string(&_12$$13, expr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1031 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "resolvefilter", &_13, 380, _12$$13, leftCode); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "resolvefilter", &_13, 377, _12$$13, leftCode); zephir_check_call_status(); break; } ZEPHIR_OBS_NVAR(right); if (zephir_array_isset_string_fetch(&right, expr, SS("right"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&rightCode, this_ptr, "expression", &_7, 376, right); + ZEPHIR_CALL_METHOD(&rightCode, this_ptr, "expression", &_7, 373, right); zephir_check_call_status(); } ZEPHIR_INIT_NVAR(exprCode); @@ -119598,7 +119899,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { if (ZEPHIR_IS_LONG(type, 365)) { ZEPHIR_OBS_NVAR(start); if (zephir_array_isset_string_fetch(&start, expr, SS("start"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&startCode, this_ptr, "expression", &_7, 376, start); + ZEPHIR_CALL_METHOD(&startCode, this_ptr, "expression", &_7, 373, start); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(startCode); @@ -119606,7 +119907,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { } ZEPHIR_OBS_NVAR(end); if (zephir_array_isset_string_fetch(&end, expr, SS("end"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&endCode, this_ptr, "expression", &_7, 376, end); + ZEPHIR_CALL_METHOD(&endCode, this_ptr, "expression", &_7, 373, end); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(endCode); @@ -119698,7 +119999,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { } if (ZEPHIR_IS_LONG(type, 366)) { zephir_array_fetch_string(&_21$$69, expr, SL("ternary"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1261 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_20$$69, this_ptr, "expression", &_7, 376, _21$$69); + ZEPHIR_CALL_METHOD(&_20$$69, this_ptr, "expression", &_7, 373, _21$$69); zephir_check_call_status(); ZEPHIR_INIT_NVAR(exprCode); ZEPHIR_CONCAT_SVSVSVS(exprCode, "(", _20$$69, " ? ", leftCode, " : ", rightCode, ")"); @@ -119771,7 +120072,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, _statementListOrExtends } } if (isStatementList == 1) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_statementlist", NULL, 381, statements); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_statementlist", NULL, 378, statements); zephir_check_call_status(); RETURN_MM(); } @@ -119818,7 +120119,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach) { ZEPHIR_CONCAT_VV(prefixLevel, prefix, level); ZEPHIR_OBS_VAR(expr); zephir_array_fetch_string(&expr, statement, SL("expr"), PH_NOISY, "phalcon/mvc/view/engine/volt/compiler.zep", 1363 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_0, 376, expr); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_0, 373, expr); zephir_check_call_status(); ZEPHIR_OBS_VAR(blockStatements); zephir_array_fetch_string(&blockStatements, statement, SL("block_statements"), PH_NOISY, "phalcon/mvc/view/engine/volt/compiler.zep", 1369 TSRMLS_CC); @@ -119854,7 +120155,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach) { } else { ZVAL_BOOL(_5, 0); } - ZEPHIR_CALL_METHOD(&code, this_ptr, "_statementlist", NULL, 381, blockStatements, _5); + ZEPHIR_CALL_METHOD(&code, this_ptr, "_statementlist", NULL, 378, blockStatements, _5); zephir_check_call_status(); ZEPHIR_OBS_VAR(loopContext); zephir_read_property_this(&loopContext, this_ptr, SL("_loopPointers"), PH_NOISY_CC); @@ -119902,7 +120203,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach) { } ZEPHIR_OBS_VAR(ifExpr); if (zephir_array_isset_string_fetch(&ifExpr, statement, SS("if_expr"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_16$$13, this_ptr, "expression", &_0, 376, ifExpr); + ZEPHIR_CALL_METHOD(&_16$$13, this_ptr, "expression", &_0, 373, ifExpr); zephir_check_call_status(); ZEPHIR_INIT_VAR(_17$$13); ZEPHIR_CONCAT_SVS(_17$$13, "if (", _16$$13, ") { ?>"); @@ -119999,7 +120300,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileIf) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupt statement", "phalcon/mvc/view/engine/volt/compiler.zep", 1515); return; } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 376, expr); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 373, expr); zephir_check_call_status(); zephir_array_fetch_string(&_2, statement, SL("true_statements"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1521 TSRMLS_CC); ZEPHIR_INIT_VAR(_3); @@ -120008,7 +120309,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileIf) { } else { ZVAL_BOOL(_3, 0); } - ZEPHIR_CALL_METHOD(&_1, this_ptr, "_statementlist", &_4, 381, _2, _3); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "_statementlist", &_4, 378, _2, _3); zephir_check_call_status(); ZEPHIR_INIT_VAR(compilation); ZEPHIR_CONCAT_SVSV(compilation, "", _1); @@ -120020,7 +120321,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileIf) { } else { ZVAL_BOOL(_6$$4, 0); } - ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "_statementlist", &_4, 381, blockStatements, _6$$4); + ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "_statementlist", &_4, 378, blockStatements, _6$$4); zephir_check_call_status(); ZEPHIR_INIT_VAR(_7$$4); ZEPHIR_CONCAT_SV(_7$$4, "", _5$$4); @@ -120048,7 +120349,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileElseIf) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupt statement", "phalcon/mvc/view/engine/volt/compiler.zep", 1550); return; } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 376, expr); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 373, expr); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, ""); RETURN_MM(); @@ -120079,9 +120380,9 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileCache) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupt statement", "phalcon/mvc/view/engine/volt/compiler.zep", 1570); return; } - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_0, 376, expr); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_0, 373, expr); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "expression", &_0, 376, expr); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "expression", &_0, 373, expr); zephir_check_call_status(); ZEPHIR_INIT_VAR(compilation); ZEPHIR_CONCAT_SVS(compilation, "di->get('viewCache'); "); @@ -120117,7 +120418,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileCache) { } else { ZVAL_BOOL(_12, 0); } - ZEPHIR_CALL_METHOD(&_10, this_ptr, "_statementlist", NULL, 381, _11, _12); + ZEPHIR_CALL_METHOD(&_10, this_ptr, "_statementlist", NULL, 378, _11, _12); zephir_check_call_status(); zephir_concat_self(&compilation, _10 TSRMLS_CC); ZEPHIR_OBS_NVAR(lifetime); @@ -120175,10 +120476,10 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSet) { ) { ZEPHIR_GET_HVALUE(assignment, _2); zephir_array_fetch_string(&_3$$4, assignment, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1633 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_4, 376, _3$$4); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_4, 373, _3$$4); zephir_check_call_status(); zephir_array_fetch_string(&_5$$4, assignment, SL("variable"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1638 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_4, 376, _5$$4); + ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_4, 373, _5$$4); zephir_check_call_status(); zephir_array_fetch_string(&_6$$4, assignment, SL("op"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1644 TSRMLS_CC); do { @@ -120235,7 +120536,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileDo) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/mvc/view/engine/volt/compiler.zep", 1684); return; } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 376, expr); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 373, expr); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, ""); RETURN_MM(); @@ -120259,7 +120560,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileReturn) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/mvc/view/engine/volt/compiler.zep", 1704); return; } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 376, expr); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 373, expr); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, ""); RETURN_MM(); @@ -120295,7 +120596,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileAutoEscape) { } else { ZVAL_BOOL(_1, 0); } - ZEPHIR_CALL_METHOD(&compilation, this_ptr, "_statementlist", NULL, 381, _0, _1); + ZEPHIR_CALL_METHOD(&compilation, this_ptr, "_statementlist", NULL, 378, _0, _1); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_autoescape"), oldAutoescape TSRMLS_CC); RETURN_CCTOR(compilation); @@ -120319,7 +120620,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileEcho) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupt statement", "phalcon/mvc/view/engine/volt/compiler.zep", 1754); return; } - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 376, expr); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 373, expr); zephir_check_call_status(); zephir_array_fetch_string(&_0, expr, SL("type"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1762 TSRMLS_CC); if (ZEPHIR_IS_LONG(_0, 350)) { @@ -120392,14 +120693,14 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileInclude) { RETURN_CCTOR(compilation); } } - ZEPHIR_CALL_METHOD(&path, this_ptr, "expression", &_4, 376, pathExpr); + ZEPHIR_CALL_METHOD(&path, this_ptr, "expression", &_4, 373, pathExpr); zephir_check_call_status(); ZEPHIR_OBS_VAR(params); if (!(zephir_array_isset_string_fetch(¶ms, statement, SS("params"), 0 TSRMLS_CC))) { ZEPHIR_CONCAT_SVS(return_value, "partial(", path, "); ?>"); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&_5, this_ptr, "expression", &_4, 376, params); + ZEPHIR_CALL_METHOD(&_5, this_ptr, "expression", &_4, 373, params); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "partial(", path, ", ", _5, "); ?>"); RETURN_MM(); @@ -120479,7 +120780,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro) { zephir_concat_self_str(&code, SL(" } else { ") TSRMLS_CC); ZEPHIR_OBS_NVAR(defaultValue); if (zephir_array_isset_string_fetch(&defaultValue, parameter, SS("default"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_12$$8, this_ptr, "expression", &_13, 376, defaultValue); + ZEPHIR_CALL_METHOD(&_12$$8, this_ptr, "expression", &_13, 373, defaultValue); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_14$$8); ZEPHIR_CONCAT_SVSVS(_14$$8, "$", variableName, " = ", _12$$8, ";"); @@ -120501,7 +120802,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro) { } else { ZVAL_BOOL(_17$$10, 0); } - ZEPHIR_CALL_METHOD(&_16$$10, this_ptr, "_statementlist", NULL, 381, blockStatements, _17$$10); + ZEPHIR_CALL_METHOD(&_16$$10, this_ptr, "_statementlist", NULL, 378, blockStatements, _17$$10); zephir_check_call_status(); ZEPHIR_INIT_VAR(_18$$10); ZEPHIR_CONCAT_VS(_18$$10, _16$$10, " 1) { ZEPHIR_OBS_VAR(numberOfBytes); - zephir_array_fetch_long(&numberOfBytes, response, 1, PH_NOISY, "phalcon/queue/beanstalk.zep", 335 TSRMLS_CC); + zephir_array_fetch_long(&numberOfBytes, response, 1, PH_NOISY, "phalcon/queue/beanstalk.zep", 332 TSRMLS_CC); ZEPHIR_CALL_METHOD(&response, this_ptr, "read", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&data, "yaml_parse", NULL, 387, response); + ZEPHIR_CALL_FUNCTION(&data, "yaml_parse", NULL, 384, response); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(numberOfBytes); @@ -131983,13 +132292,13 @@ static PHP_METHOD(Phalcon_Queue_Beanstalk, read) { } ZEPHIR_SINIT_VAR(_0$$5); ZVAL_LONG(&_0$$5, (length + 2)); - ZEPHIR_CALL_FUNCTION(&data, "stream_get_line", &_1, 388, connection, &_0$$5); + ZEPHIR_CALL_FUNCTION(&data, "stream_get_line", &_1, 385, connection, &_0$$5); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_2$$5, "stream_get_meta_data", NULL, 389, connection); + ZEPHIR_CALL_FUNCTION(&_2$$5, "stream_get_meta_data", NULL, 386, connection); zephir_check_call_status(); - zephir_array_fetch_string(&_3$$5, _2$$5, SL("timed_out"), PH_NOISY | PH_READONLY, "phalcon/queue/beanstalk.zep", 376 TSRMLS_CC); + zephir_array_fetch_string(&_3$$5, _2$$5, SL("timed_out"), PH_NOISY | PH_READONLY, "phalcon/queue/beanstalk.zep", 373 TSRMLS_CC); if (zephir_is_true(_3$$5)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_queue_beanstalk_exception_ce, "Connection timed out", "phalcon/queue/beanstalk.zep", 377); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_queue_beanstalk_exception_ce, "Connection timed out", "phalcon/queue/beanstalk.zep", 374); return; } ZEPHIR_SINIT_NVAR(_0$$5); @@ -132001,7 +132310,7 @@ static PHP_METHOD(Phalcon_Queue_Beanstalk, read) { ZVAL_LONG(&_4, 16384); ZEPHIR_SINIT_VAR(_5); ZVAL_STRING(&_5, "\r\n", 0); - ZEPHIR_RETURN_CALL_FUNCTION("stream_get_line", &_1, 388, connection, &_4, &_5); + ZEPHIR_RETURN_CALL_FUNCTION("stream_get_line", &_1, 385, connection, &_4, &_5); zephir_check_call_status(); RETURN_MM(); @@ -132033,7 +132342,7 @@ static PHP_METHOD(Phalcon_Queue_Beanstalk, write) { ZEPHIR_CPY_WRT(packet, _0); ZEPHIR_SINIT_VAR(_1); ZVAL_LONG(&_1, zephir_fast_strlen_ev(packet)); - ZEPHIR_RETURN_CALL_FUNCTION("fwrite", NULL, 390, connection, packet, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("fwrite", NULL, 387, connection, packet, &_1); zephir_check_call_status(); RETURN_MM(); @@ -132396,7 +132705,7 @@ static PHP_METHOD(Phalcon_Security_Random, bytes) { if ((zephir_function_exists_ex(SS("openssl_random_pseudo_bytes") TSRMLS_CC) == SUCCESS)) { ZEPHIR_INIT_VAR(_1$$5); ZVAL_LONG(_1$$5, len); - ZEPHIR_RETURN_CALL_FUNCTION("openssl_random_pseudo_bytes", NULL, 399, _1$$5); + ZEPHIR_RETURN_CALL_FUNCTION("openssl_random_pseudo_bytes", NULL, 396, _1$$5); zephir_check_call_status(); RETURN_MM(); } @@ -132407,16 +132716,16 @@ static PHP_METHOD(Phalcon_Security_Random, bytes) { ZVAL_STRING(&_3$$6, "/dev/urandom", 0); ZEPHIR_SINIT_VAR(_4$$6); ZVAL_STRING(&_4$$6, "rb", 0); - ZEPHIR_CALL_FUNCTION(&handle, "fopen", NULL, 286, &_3$$6, &_4$$6); + ZEPHIR_CALL_FUNCTION(&handle, "fopen", NULL, 281, &_3$$6, &_4$$6); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(handle)) { ZEPHIR_SINIT_VAR(_5$$7); ZVAL_LONG(&_5$$7, 0); - ZEPHIR_CALL_FUNCTION(NULL, "stream_set_read_buffer", NULL, 402, handle, &_5$$7); + ZEPHIR_CALL_FUNCTION(NULL, "stream_set_read_buffer", NULL, 399, handle, &_5$$7); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_5$$7); ZVAL_LONG(&_5$$7, len); - ZEPHIR_CALL_FUNCTION(&ret, "fread", NULL, 403, handle, &_5$$7); + ZEPHIR_CALL_FUNCTION(&ret, "fread", NULL, 400, handle, &_5$$7); zephir_check_call_status(); zephir_fclose(handle TSRMLS_CC); if (zephir_fast_strlen_ev(ret) != len) { @@ -132452,7 +132761,7 @@ static PHP_METHOD(Phalcon_Security_Random, hex) { zephir_check_call_status(); ZEPHIR_SINIT_VAR(_2); ZVAL_STRING(&_2, "H*", 0); - ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 404, &_2, _0); + ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 401, &_2, _0); zephir_check_call_status(); ZEPHIR_MAKE_REF(_3); ZEPHIR_RETURN_CALL_FUNCTION("array_shift", NULL, 123, _3); @@ -132489,7 +132798,7 @@ static PHP_METHOD(Phalcon_Security_Random, base58) { zephir_check_call_status(); ZEPHIR_SINIT_VAR(_1); ZVAL_STRING(&_1, "C*", 0); - ZEPHIR_CALL_FUNCTION(&bytes, "unpack", NULL, 404, &_1, _0); + ZEPHIR_CALL_FUNCTION(&bytes, "unpack", NULL, 401, &_1, _0); zephir_check_call_status(); zephir_is_iterable(bytes, &_3, &_2, 0, 0, "phalcon/security/random.zep", 199); for ( @@ -132594,9 +132903,9 @@ static PHP_METHOD(Phalcon_Security_Random, uuid) { zephir_check_call_status(); ZEPHIR_SINIT_VAR(_2); ZVAL_STRING(&_2, "N1a/n1b/n1c/n1d/n1e/N1f", 0); - ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 404, &_2, _0); + ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 401, &_2, _0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&ary, "array_values", NULL, 216, _3); + ZEPHIR_CALL_FUNCTION(&ary, "array_values", NULL, 211, _3); zephir_check_call_status(); zephir_array_fetch_long(&_4, ary, 2, PH_NOISY | PH_READONLY, "phalcon/security/random.zep", 279 TSRMLS_CC); ZEPHIR_INIT_NVAR(_1); @@ -132609,7 +132918,7 @@ static PHP_METHOD(Phalcon_Security_Random, uuid) { ZEPHIR_INIT_VAR(_7); ZVAL_STRING(_7, "%08x-%04x-%04x-%04x-%04x%08x", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_MAKE_REF(ary); - ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 379, ary, _7); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 376, ary, _7); zephir_check_temp_parameter(_7); ZEPHIR_UNREF(ary); zephir_check_call_status(); @@ -132650,7 +132959,7 @@ static PHP_METHOD(Phalcon_Security_Random, number) { } ZEPHIR_SINIT_VAR(_1); ZVAL_LONG(&_1, len); - ZEPHIR_CALL_FUNCTION(&hex, "dechex", NULL, 405, &_1); + ZEPHIR_CALL_FUNCTION(&hex, "dechex", NULL, 402, &_1); zephir_check_call_status(); if (((zephir_fast_strlen_ev(hex) & 1)) == 1) { ZEPHIR_INIT_VAR(_2$$5); @@ -132659,7 +132968,7 @@ static PHP_METHOD(Phalcon_Security_Random, number) { } ZEPHIR_SINIT_NVAR(_1); ZVAL_STRING(&_1, "H*", 0); - ZEPHIR_CALL_FUNCTION(&_3, "pack", NULL, 406, &_1, hex); + ZEPHIR_CALL_FUNCTION(&_3, "pack", NULL, 403, &_1, hex); zephir_check_call_status(); zephir_concat_self(&bin, _3 TSRMLS_CC); _4 = ZEPHIR_STRING_OFFSET(bin, 0); @@ -132697,19 +133006,19 @@ static PHP_METHOD(Phalcon_Security_Random, number) { ZVAL_LONG(&_16$$6, 0); ZEPHIR_SINIT_NVAR(_17$$6); ZVAL_LONG(&_17$$6, 1); - ZEPHIR_CALL_FUNCTION(&_18$$6, "substr_replace", &_19, 407, rnd, _13$$6, &_16$$6, &_17$$6); + ZEPHIR_CALL_FUNCTION(&_18$$6, "substr_replace", &_19, 404, rnd, _13$$6, &_16$$6, &_17$$6); zephir_check_call_status(); ZEPHIR_CPY_WRT(rnd, _18$$6); } while (ZEPHIR_LT(bin, rnd)); ZEPHIR_SINIT_NVAR(_1); ZVAL_STRING(&_1, "H*", 0); - ZEPHIR_CALL_FUNCTION(&ret, "unpack", NULL, 404, &_1, rnd); + ZEPHIR_CALL_FUNCTION(&ret, "unpack", NULL, 401, &_1, rnd); zephir_check_call_status(); ZEPHIR_MAKE_REF(ret); ZEPHIR_CALL_FUNCTION(&_20, "array_shift", NULL, 123, ret); ZEPHIR_UNREF(ret); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("hexdec", NULL, 408, _20); + ZEPHIR_RETURN_CALL_FUNCTION("hexdec", NULL, 405, _20); zephir_check_call_status(); RETURN_MM(); @@ -133687,7 +133996,7 @@ static PHP_METHOD(Phalcon_Session_Bag, getIterator) { } object_init_ex(return_value, zephir_get_internal_ce(SS("arrayiterator") TSRMLS_CC)); _1 = zephir_fetch_nproperty_this(this_ptr, SL("_data"), PH_NOISY_CC); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 412, _1); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 409, _1); zephir_check_call_status(); RETURN_MM(); @@ -133955,7 +134264,7 @@ static PHP_METHOD(Phalcon_Session_Adapter_Libmemcached, __construct) { } ZEPHIR_INIT_VAR(_0); ZVAL_LONG(_0, 2592000); - ZEPHIR_CALL_FUNCTION(&_1, "min", NULL, 409, lifetime, _0); + ZEPHIR_CALL_FUNCTION(&_1, "min", NULL, 406, lifetime, _0); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_lifetime"), _1 TSRMLS_CC); ZEPHIR_OBS_VAR(prefix); @@ -133977,7 +134286,7 @@ static PHP_METHOD(Phalcon_Session_Adapter_Libmemcached, __construct) { ZEPHIR_OBS_VAR(_4); zephir_read_property_this(&_4, this_ptr, SL("_lifetime"), PH_NOISY_CC); zephir_array_update_string(&_3, SL("lifetime"), &_4, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, _2, "__construct", NULL, 313, _3); + ZEPHIR_CALL_METHOD(NULL, _2, "__construct", NULL, 311, _3); zephir_check_call_status(); ZEPHIR_INIT_VAR(_5); zephir_create_array(_5, 4, 0 TSRMLS_CC); @@ -133985,7 +134294,7 @@ static PHP_METHOD(Phalcon_Session_Adapter_Libmemcached, __construct) { zephir_array_update_string(&_5, SL("client"), &client, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_5, SL("prefix"), &prefix, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_5, SL("statsKey"), &statsKey, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, _0, "__construct", NULL, 314, _2, _5); + ZEPHIR_CALL_METHOD(NULL, _0, "__construct", NULL, 312, _2, _5); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_libmemcached"), _0 TSRMLS_CC); ZEPHIR_INIT_VAR(_6); @@ -134024,9 +134333,9 @@ static PHP_METHOD(Phalcon_Session_Adapter_Libmemcached, __construct) { ZEPHIR_INIT_NVAR(_7); ZVAL_STRING(_7, "gc", 1); zephir_array_fast_append(_12, _7); - ZEPHIR_CALL_FUNCTION(NULL, "session_set_save_handler", NULL, 410, _6, _8, _9, _10, _11, _12); + ZEPHIR_CALL_FUNCTION(NULL, "session_set_save_handler", NULL, 407, _6, _8, _9, _10, _11, _12); zephir_check_call_status(); - ZEPHIR_CALL_PARENT(NULL, phalcon_session_adapter_libmemcached_ce, this_ptr, "__construct", &_13, 411, options); + ZEPHIR_CALL_PARENT(NULL, phalcon_session_adapter_libmemcached_ce, this_ptr, "__construct", &_13, 408, options); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -134216,9 +134525,9 @@ static PHP_METHOD(Phalcon_Session_Adapter_Memcache, __construct) { ZEPHIR_OBS_VAR(_6); zephir_read_property_this(&_6, this_ptr, SL("_lifetime"), PH_NOISY_CC); zephir_array_update_string(&_5, SL("lifetime"), &_6, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, _4, "__construct", NULL, 313, _5); + ZEPHIR_CALL_METHOD(NULL, _4, "__construct", NULL, 311, _5); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, _3, "__construct", NULL, 316, _4, options); + ZEPHIR_CALL_METHOD(NULL, _3, "__construct", NULL, 314, _4, options); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_memcache"), _3 TSRMLS_CC); ZEPHIR_INIT_VAR(_7); @@ -134257,9 +134566,9 @@ static PHP_METHOD(Phalcon_Session_Adapter_Memcache, __construct) { ZEPHIR_INIT_NVAR(_8); ZVAL_STRING(_8, "gc", 1); zephir_array_fast_append(_13, _8); - ZEPHIR_CALL_FUNCTION(NULL, "session_set_save_handler", NULL, 410, _7, _9, _10, _11, _12, _13); + ZEPHIR_CALL_FUNCTION(NULL, "session_set_save_handler", NULL, 407, _7, _9, _10, _11, _12, _13); zephir_check_call_status(); - ZEPHIR_CALL_PARENT(NULL, phalcon_session_adapter_memcache_ce, this_ptr, "__construct", &_14, 411, options); + ZEPHIR_CALL_PARENT(NULL, phalcon_session_adapter_memcache_ce, this_ptr, "__construct", &_14, 408, options); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -134451,7 +134760,7 @@ static PHP_METHOD(Phalcon_Session_Adapter_Redis, __construct) { ZEPHIR_CALL_METHOD(NULL, _3, "__construct", NULL, 0, _4); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, _2, "__construct", NULL, 317, _3, options); + ZEPHIR_CALL_METHOD(NULL, _2, "__construct", NULL, 315, _3, options); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_redis"), _2 TSRMLS_CC); ZEPHIR_INIT_VAR(_6); @@ -134490,9 +134799,9 @@ static PHP_METHOD(Phalcon_Session_Adapter_Redis, __construct) { ZEPHIR_INIT_NVAR(_7); ZVAL_STRING(_7, "gc", 1); zephir_array_fast_append(_12, _7); - ZEPHIR_CALL_FUNCTION(NULL, "session_set_save_handler", NULL, 410, _6, _8, _9, _10, _11, _12); + ZEPHIR_CALL_FUNCTION(NULL, "session_set_save_handler", NULL, 407, _6, _8, _9, _10, _11, _12); zephir_check_call_status(); - ZEPHIR_CALL_PARENT(NULL, phalcon_session_adapter_redis_ce, this_ptr, "__construct", &_13, 411, options); + ZEPHIR_CALL_PARENT(NULL, phalcon_session_adapter_redis_ce, this_ptr, "__construct", &_13, 408, options); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -134743,7 +135052,7 @@ static PHP_METHOD(Phalcon_Tag_Select, selectField) { ZEPHIR_GET_CONSTANT(_10$$24, "PHP_EOL"); ZEPHIR_INIT_VAR(_11$$24); ZEPHIR_CONCAT_SV(_11$$24, "", _10$$24); - ZEPHIR_CALL_SELF(&_8$$24, "_optionsfromresultset", &_9, 416, options, using, value, _11$$24); + ZEPHIR_CALL_SELF(&_8$$24, "_optionsfromresultset", &_9, 413, options, using, value, _11$$24); zephir_check_call_status(); zephir_concat_self(&code, _8$$24 TSRMLS_CC); } else { @@ -134752,7 +135061,7 @@ static PHP_METHOD(Phalcon_Tag_Select, selectField) { ZEPHIR_GET_CONSTANT(_14$$26, "PHP_EOL"); ZEPHIR_INIT_VAR(_15$$26); ZEPHIR_CONCAT_SV(_15$$26, "", _14$$26); - ZEPHIR_CALL_SELF(&_12$$26, "_optionsfromarray", &_13, 417, options, value, _15$$26); + ZEPHIR_CALL_SELF(&_12$$26, "_optionsfromarray", &_13, 414, options, value, _15$$26); zephir_check_call_status(); zephir_concat_self(&code, _12$$26 TSRMLS_CC); } else { @@ -134890,12 +135199,12 @@ static PHP_METHOD(Phalcon_Tag_Select, _optionsFromArray) { ) { ZEPHIR_GET_HMKEY(optionValue, _1, _0); ZEPHIR_GET_HVALUE(optionText, _2); - ZEPHIR_CALL_FUNCTION(&escaped, "htmlspecialchars", &_3, 183, optionValue); + ZEPHIR_CALL_FUNCTION(&escaped, "htmlspecialchars", &_3, 178, optionValue); zephir_check_call_status(); if (Z_TYPE_P(optionText) == IS_ARRAY) { ZEPHIR_INIT_NVAR(_4$$4); ZEPHIR_GET_CONSTANT(_4$$4, "PHP_EOL"); - ZEPHIR_CALL_SELF(&_5$$4, "_optionsfromarray", &_6, 417, optionText, value, closeOption); + ZEPHIR_CALL_SELF(&_5$$4, "_optionsfromarray", &_6, 414, optionText, value, closeOption); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_7$$4); ZEPHIR_GET_CONSTANT(_7$$4, "PHP_EOL"); @@ -135282,7 +135591,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Csv, __construct) { options = options_param; - ZEPHIR_CALL_PARENT(NULL, phalcon_translate_adapter_csv_ce, this_ptr, "__construct", &_0, 426, options); + ZEPHIR_CALL_PARENT(NULL, phalcon_translate_adapter_csv_ce, this_ptr, "__construct", &_0, 423, options); zephir_check_call_status(); if (!(zephir_array_isset_string(options, SS("content")))) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_translate_exception_ce, "Parameter 'content' is required", "phalcon/translate/adapter/csv.zep", 43); @@ -135295,7 +135604,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Csv, __construct) { ZVAL_STRING(_3, ";", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_INIT_VAR(_4); ZVAL_STRING(_4, "\"", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "_load", NULL, 427, _1, _2, _3, _4); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "_load", NULL, 424, _1, _2, _3, _4); zephir_check_temp_parameter(_3); zephir_check_temp_parameter(_4); zephir_check_call_status(); @@ -135317,7 +135626,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Csv, _load) { ZEPHIR_SINIT_VAR(_0); ZVAL_STRING(&_0, "rb", 0); - ZEPHIR_CALL_FUNCTION(&fileHandler, "fopen", NULL, 286, file, &_0); + ZEPHIR_CALL_FUNCTION(&fileHandler, "fopen", NULL, 281, file, &_0); zephir_check_call_status(); if (Z_TYPE_P(fileHandler) != IS_RESOURCE) { ZEPHIR_INIT_VAR(_1$$3); @@ -135331,7 +135640,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Csv, _load) { return; } while (1) { - ZEPHIR_CALL_FUNCTION(&data, "fgetcsv", &_3, 428, fileHandler, length, delimiter, enclosure); + ZEPHIR_CALL_FUNCTION(&data, "fgetcsv", &_3, 425, fileHandler, length, delimiter, enclosure); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(data)) { break; @@ -135420,7 +135729,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Csv, exists) { } -static zend_object_value zephir_init_properties_Phalcon_Translate_Adapter_Csv(zend_class_entry *class_type TSRMLS_DC) { +zend_object_value zephir_init_properties_Phalcon_Translate_Adapter_Csv(zend_class_entry *class_type TSRMLS_DC) { zval *_0, *_1$$3; @@ -135522,9 +135831,9 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, __construct) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_translate_exception_ce, "This class requires the gettext extension for PHP", "phalcon/translate/adapter/gettext.zep", 60); return; } - ZEPHIR_CALL_PARENT(NULL, phalcon_translate_adapter_gettext_ce, this_ptr, "__construct", &_0, 426, options); + ZEPHIR_CALL_PARENT(NULL, phalcon_translate_adapter_gettext_ce, this_ptr, "__construct", &_0, 423, options); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "prepareoptions", NULL, 429, options); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "prepareoptions", NULL, 0, options); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -135556,19 +135865,19 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, query) { ZEPHIR_INIT_VAR(domain); ZVAL_NULL(domain); - ZEPHIR_CALL_FUNCTION(&_0, "func_num_args", NULL, 421); + ZEPHIR_CALL_FUNCTION(&_0, "func_num_args", NULL, 418); zephir_check_call_status(); if (ZEPHIR_GT_LONG(_0, 2)) { ZEPHIR_SINIT_VAR(_1$$3); ZVAL_LONG(&_1$$3, 2); - ZEPHIR_CALL_FUNCTION(&domain, "func_get_arg", NULL, 420, &_1$$3); + ZEPHIR_CALL_FUNCTION(&domain, "func_get_arg", NULL, 417, &_1$$3); zephir_check_call_status(); } if (!(zephir_is_true(domain))) { - ZEPHIR_CALL_FUNCTION(&translation, "gettext", NULL, 430, index); + ZEPHIR_CALL_FUNCTION(&translation, "gettext", NULL, 426, index); zephir_check_call_status(); } else { - ZEPHIR_CALL_FUNCTION(&translation, "dgettext", NULL, 431, domain, index); + ZEPHIR_CALL_FUNCTION(&translation, "dgettext", NULL, 427, domain, index); zephir_check_call_status(); } ZEPHIR_RETURN_CALL_METHOD(this_ptr, "replaceplaceholders", NULL, 0, translation, placeholders); @@ -135661,12 +135970,12 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, nquery) { if (!(!(!domain) && Z_STRLEN_P(domain))) { ZEPHIR_SINIT_VAR(_0$$3); ZVAL_LONG(&_0$$3, count); - ZEPHIR_CALL_FUNCTION(&translation, "ngettext", NULL, 432, msgid1, msgid2, &_0$$3); + ZEPHIR_CALL_FUNCTION(&translation, "ngettext", NULL, 428, msgid1, msgid2, &_0$$3); zephir_check_call_status(); } else { ZEPHIR_SINIT_VAR(_1$$4); ZVAL_LONG(&_1$$4, count); - ZEPHIR_CALL_FUNCTION(&translation, "dngettext", NULL, 433, domain, msgid1, msgid2, &_1$$4); + ZEPHIR_CALL_FUNCTION(&translation, "dngettext", NULL, 429, domain, msgid1, msgid2, &_1$$4); zephir_check_call_status(); } ZEPHIR_RETURN_CALL_METHOD(this_ptr, "replaceplaceholders", NULL, 0, translation, placeholders); @@ -135685,7 +135994,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, setDomain) { - ZEPHIR_RETURN_CALL_FUNCTION("textdomain", NULL, 434, domain); + ZEPHIR_RETURN_CALL_FUNCTION("textdomain", NULL, 430, domain); zephir_check_call_status(); RETURN_MM(); @@ -135700,7 +136009,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, resetDomain) { ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdefaultdomain", NULL, 0); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("textdomain", NULL, 434, _0); + ZEPHIR_RETURN_CALL_FUNCTION("textdomain", NULL, 430, _0); zephir_check_call_status(); RETURN_MM(); @@ -135756,13 +136065,13 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, setDirectory) { ) { ZEPHIR_GET_HMKEY(key, _1$$4, _0$$4); ZEPHIR_GET_HVALUE(value, _2$$4); - ZEPHIR_CALL_FUNCTION(NULL, "bindtextdomain", &_3, 435, key, value); + ZEPHIR_CALL_FUNCTION(NULL, "bindtextdomain", &_3, 431, key, value); zephir_check_call_status(); } } else { ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "getdefaultdomain", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "bindtextdomain", &_3, 435, _4$$6, directory); + ZEPHIR_CALL_FUNCTION(NULL, "bindtextdomain", &_3, 431, _4$$6, directory); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -135797,7 +136106,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, setLocale) { ZEPHIR_INIT_VAR(_0); - ZEPHIR_CALL_FUNCTION(&_1, "func_get_args", NULL, 168); + ZEPHIR_CALL_FUNCTION(&_1, "func_get_args", NULL, 163); zephir_check_call_status(); ZEPHIR_SINIT_VAR(_2); ZVAL_STRING(&_2, "setlocale", 0); @@ -135810,22 +136119,22 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, setLocale) { _3 = zephir_fetch_nproperty_this(this_ptr, SL("_locale"), PH_NOISY_CC); ZEPHIR_INIT_VAR(_4); ZEPHIR_CONCAT_SV(_4, "LC_ALL=", _3); - ZEPHIR_CALL_FUNCTION(NULL, "putenv", &_5, 436, _4); + ZEPHIR_CALL_FUNCTION(NULL, "putenv", &_5, 432, _4); zephir_check_call_status(); _6 = zephir_fetch_nproperty_this(this_ptr, SL("_locale"), PH_NOISY_CC); ZEPHIR_INIT_VAR(_7); ZEPHIR_CONCAT_SV(_7, "LANG=", _6); - ZEPHIR_CALL_FUNCTION(NULL, "putenv", &_5, 436, _7); + ZEPHIR_CALL_FUNCTION(NULL, "putenv", &_5, 432, _7); zephir_check_call_status(); _8 = zephir_fetch_nproperty_this(this_ptr, SL("_locale"), PH_NOISY_CC); ZEPHIR_INIT_VAR(_9); ZEPHIR_CONCAT_SV(_9, "LANGUAGE=", _8); - ZEPHIR_CALL_FUNCTION(NULL, "putenv", &_5, 436, _9); + ZEPHIR_CALL_FUNCTION(NULL, "putenv", &_5, 432, _9); zephir_check_call_status(); _10 = zephir_fetch_nproperty_this(this_ptr, SL("_locale"), PH_NOISY_CC); ZEPHIR_SINIT_VAR(_11); ZVAL_LONG(&_11, 0); - ZEPHIR_CALL_FUNCTION(NULL, "setlocale", NULL, 415, &_11, _10); + ZEPHIR_CALL_FUNCTION(NULL, "setlocale", NULL, 412, &_11, _10); zephir_check_call_status(); RETURN_MM_MEMBER(this_ptr, "_locale"); @@ -135852,7 +136161,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, prepareOptions) { return; } ZEPHIR_INIT_VAR(_0); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "getoptionsdefault", NULL, 437); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "getoptionsdefault", NULL, 433); zephir_check_call_status(); zephir_fast_array_merge(_0, &(_1), &(options) TSRMLS_CC); ZEPHIR_CPY_WRT(options, _0); @@ -135923,7 +136232,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_NativeArray, __construct) { options = options_param; - ZEPHIR_CALL_PARENT(NULL, phalcon_translate_adapter_nativearray_ce, this_ptr, "__construct", &_0, 426, options); + ZEPHIR_CALL_PARENT(NULL, phalcon_translate_adapter_nativearray_ce, this_ptr, "__construct", &_0, 423, options); zephir_check_call_status(); ZEPHIR_OBS_VAR(data); if (!(zephir_array_isset_string_fetch(&data, options, SS("content"), 0 TSRMLS_CC))) { @@ -136125,7 +136434,7 @@ static PHP_METHOD(Phalcon_Translate_Interpolator_IndexedArray, replacePlaceholde } if (_0) { ZEPHIR_MAKE_REF(placeholders); - ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 379, placeholders, translation); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 376, placeholders, translation); ZEPHIR_UNREF(placeholders); zephir_check_call_status(); ZEPHIR_SINIT_VAR(_1$$3); @@ -136387,7 +136696,7 @@ static PHP_METHOD(Phalcon_Validation_Message, __set_state) { zephir_array_fetch_string(&_0, message, SL("_message"), PH_NOISY | PH_READONLY, "phalcon/validation/message.zep", 134 TSRMLS_CC); zephir_array_fetch_string(&_1, message, SL("_field"), PH_NOISY | PH_READONLY, "phalcon/validation/message.zep", 134 TSRMLS_CC); zephir_array_fetch_string(&_2, message, SL("_type"), PH_NOISY | PH_READONLY, "phalcon/validation/message.zep", 134 TSRMLS_CC); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 438, _0, _1, _2); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 434, _0, _1, _2); zephir_check_call_status(); RETURN_MM(); @@ -136781,7 +137090,7 @@ static PHP_METHOD(Phalcon_Validation_Message_Group, appendMessages) { ZEPHIR_OBS_VAR(currentMessages); zephir_read_property_this(¤tMessages, this_ptr, SL("_messages"), PH_NOISY_CC); if (Z_TYPE_P(messages) == IS_ARRAY) { - if (ZEPHIR_IS_STRING(currentMessages, "array")) { + if (Z_TYPE_P(currentMessages) == IS_ARRAY) { ZEPHIR_INIT_VAR(finalMessages); zephir_fast_array_merge(finalMessages, &(currentMessages), &(messages) TSRMLS_CC); } else { @@ -136991,7 +137300,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Alnum, validate) { if (_2) { RETURN_MM_BOOL(1); } - ZEPHIR_CALL_FUNCTION(&_3, "ctype_alnum", NULL, 439, value); + ZEPHIR_CALL_FUNCTION(&_3, "ctype_alnum", NULL, 435, value); zephir_check_call_status(); if (!(zephir_is_true(_3))) { ZEPHIR_INIT_VAR(_4$$4); @@ -137024,7 +137333,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Alnum, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_7$$4); ZVAL_STRING(_7$$4, "Alnum", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _4$$4, "__construct", NULL, 438, _6$$4, field, _7$$4); + ZEPHIR_CALL_METHOD(NULL, _4$$4, "__construct", NULL, 434, _6$$4, field, _7$$4); zephir_check_temp_parameter(_7$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _4$$4); @@ -137093,7 +137402,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Alpha, validate) { if (_2) { RETURN_MM_BOOL(1); } - ZEPHIR_CALL_FUNCTION(&_3, "ctype_alpha", NULL, 440, value); + ZEPHIR_CALL_FUNCTION(&_3, "ctype_alpha", NULL, 436, value); zephir_check_call_status(); if (!(zephir_is_true(_3))) { ZEPHIR_INIT_VAR(_4$$4); @@ -137126,7 +137435,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Alpha, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_7$$4); ZVAL_STRING(_7$$4, "Alpha", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _4$$4, "__construct", NULL, 438, _6$$4, field, _7$$4); + ZEPHIR_CALL_METHOD(NULL, _4$$4, "__construct", NULL, 434, _6$$4, field, _7$$4); zephir_check_temp_parameter(_7$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _4$$4); @@ -137242,7 +137551,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Between, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_7$$4); ZVAL_STRING(_7$$4, "Between", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _4$$4, "__construct", NULL, 438, _6$$4, field, _7$$4); + ZEPHIR_CALL_METHOD(NULL, _4$$4, "__construct", NULL, 434, _6$$4, field, _7$$4); zephir_check_temp_parameter(_7$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _4$$4); @@ -137305,7 +137614,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Confirmation, validate) { zephir_check_call_status(); ZEPHIR_CALL_METHOD(&valueWith, validation, "getvalue", NULL, 0, fieldWith); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "compare", NULL, 441, value, valueWith); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "compare", NULL, 437, value, valueWith); zephir_check_call_status(); if (!(zephir_is_true(_1))) { ZEPHIR_INIT_VAR(_2$$3); @@ -137348,7 +137657,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Confirmation, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_5$$3); ZVAL_STRING(_5$$3, "Confirmation", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _2$$3, "__construct", NULL, 438, _4$$3, field, _5$$3); + ZEPHIR_CALL_METHOD(NULL, _2$$3, "__construct", NULL, 434, _4$$3, field, _5$$3); zephir_check_temp_parameter(_5$$3); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _2$$3); @@ -137387,12 +137696,12 @@ static PHP_METHOD(Phalcon_Validation_Validator_Confirmation, compare) { } ZEPHIR_SINIT_VAR(_3$$3); ZVAL_STRING(&_3$$3, "utf-8", 0); - ZEPHIR_CALL_FUNCTION(&_4$$3, "mb_strtolower", &_5, 196, a, &_3$$3); + ZEPHIR_CALL_FUNCTION(&_4$$3, "mb_strtolower", &_5, 191, a, &_3$$3); zephir_check_call_status(); zephir_get_strval(a, _4$$3); ZEPHIR_SINIT_NVAR(_3$$3); ZVAL_STRING(&_3$$3, "utf-8", 0); - ZEPHIR_CALL_FUNCTION(&_6$$3, "mb_strtolower", &_5, 196, b, &_3$$3); + ZEPHIR_CALL_FUNCTION(&_6$$3, "mb_strtolower", &_5, 191, b, &_3$$3); zephir_check_call_status(); zephir_get_strval(b, _6$$3); } @@ -137445,7 +137754,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_CreditCard, validate) { ZEPHIR_CALL_METHOD(&value, validation, "getvalue", NULL, 0, field); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&valid, this_ptr, "verifybyluhnalgorithm", NULL, 442, value); + ZEPHIR_CALL_METHOD(&valid, this_ptr, "verifybyluhnalgorithm", NULL, 438, value); zephir_check_call_status(); if (!(zephir_is_true(valid))) { ZEPHIR_INIT_VAR(_0$$3); @@ -137478,7 +137787,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_CreditCard, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_3$$3); ZVAL_STRING(_3$$3, "CreditCard", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _0$$3, "__construct", NULL, 438, _2$$3, field, _3$$3); + ZEPHIR_CALL_METHOD(NULL, _0$$3, "__construct", NULL, 434, _2$$3, field, _3$$3); zephir_check_temp_parameter(_3$$3); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _0$$3); @@ -137509,7 +137818,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_CreditCard, verifyByLuhnAlgorithm ZEPHIR_CPY_WRT(digits, _2); ZEPHIR_INIT_VAR(hash); ZVAL_STRING(hash, "", 1); - ZEPHIR_CALL_FUNCTION(&_4, "array_reverse", NULL, 443, digits); + ZEPHIR_CALL_FUNCTION(&_4, "array_reverse", NULL, 439, digits); zephir_check_call_status(); zephir_is_iterable(_4, &_6, &_5, 0, 0, "phalcon/validation/validator/creditcard.zep", 87); for ( @@ -137529,7 +137838,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_CreditCard, verifyByLuhnAlgorithm } ZEPHIR_CALL_FUNCTION(&_9, "str_split", &_1, 71, hash); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&result, "array_sum", NULL, 444, _9); + ZEPHIR_CALL_FUNCTION(&result, "array_sum", NULL, 440, _9); zephir_check_call_status(); RETURN_MM_BOOL((zephir_safe_mod_zval_long(result, 10 TSRMLS_CC) == 0)); @@ -137538,6 +137847,140 @@ static PHP_METHOD(Phalcon_Validation_Validator_CreditCard, verifyByLuhnAlgorithm +#ifdef HAVE_CONFIG_H +#endif + +#include + +#include +#include +#include + + + +ZEPHIR_INIT_CLASS(Phalcon_Validation_Validator_Date) { + + ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Validation\\Validator, Date, phalcon, validation_validator_date, phalcon_validation_validator_ce, phalcon_validation_validator_date_method_entry, 0); + + zend_declare_class_constant_string(phalcon_validation_validator_date_ce, SL("DEFAULT_DATE_FORMAT"), "Y-m-d" TSRMLS_CC); + + return SUCCESS; + +} + +static PHP_METHOD(Phalcon_Validation_Validator_Date, validate) { + + int ZEPHIR_LAST_CALL_STATUS; + zval *field = NULL; + zval *validation, *field_param = NULL, *value = NULL, *format = NULL, *label = NULL, *message = NULL, *replacePairs = NULL, *_0, *_1 = NULL, *_2$$4 = NULL, *_4$$4 = NULL, *_5$$4, *_3$$6; + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 2, 0, &validation, &field_param); + + if (unlikely(Z_TYPE_P(field_param) != IS_STRING && Z_TYPE_P(field_param) != IS_NULL)) { + zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'field' must be a string") TSRMLS_CC); + RETURN_MM_NULL(); + } + if (likely(Z_TYPE_P(field_param) == IS_STRING)) { + zephir_get_strval(field, field_param); + } else { + ZEPHIR_INIT_VAR(field); + ZVAL_EMPTY_STRING(field); + } + + + ZEPHIR_CALL_METHOD(&value, validation, "getvalue", NULL, 0, field); + zephir_check_call_status(); + ZEPHIR_INIT_VAR(_0); + ZVAL_STRING(_0, "format", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(&format, this_ptr, "getoption", NULL, 0, _0); + zephir_check_temp_parameter(_0); + zephir_check_call_status(); + if (ZEPHIR_IS_EMPTY(format)) { + ZEPHIR_INIT_NVAR(format); + ZVAL_STRING(format, "Y-m-d", 1); + } + ZEPHIR_CALL_METHOD(&_1, this_ptr, "checkdate", NULL, 441, value, format); + zephir_check_call_status(); + if (!(zephir_is_true(_1))) { + ZEPHIR_INIT_VAR(_2$$4); + ZVAL_STRING(_2$$4, "label", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(&label, this_ptr, "getoption", NULL, 0, _2$$4); + zephir_check_temp_parameter(_2$$4); + zephir_check_call_status(); + if (ZEPHIR_IS_EMPTY(label)) { + ZEPHIR_CALL_METHOD(&label, validation, "getlabel", NULL, 0, field); + zephir_check_call_status(); + } + ZEPHIR_INIT_NVAR(_2$$4); + ZVAL_STRING(_2$$4, "message", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(&message, this_ptr, "getoption", NULL, 0, _2$$4); + zephir_check_temp_parameter(_2$$4); + zephir_check_call_status(); + ZEPHIR_INIT_VAR(replacePairs); + zephir_create_array(replacePairs, 1, 0 TSRMLS_CC); + zephir_array_update_string(&replacePairs, SL(":field"), &label, PH_COPY | PH_SEPARATE); + if (ZEPHIR_IS_EMPTY(message)) { + ZEPHIR_INIT_VAR(_3$$6); + ZVAL_STRING(_3$$6, "Date", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(&message, validation, "getdefaultmessage", NULL, 0, _3$$6); + zephir_check_temp_parameter(_3$$6); + zephir_check_call_status(); + } + ZEPHIR_INIT_NVAR(_2$$4); + object_init_ex(_2$$4, phalcon_validation_message_ce); + ZEPHIR_CALL_FUNCTION(&_4$$4, "strtr", NULL, 55, message, replacePairs); + zephir_check_call_status(); + ZEPHIR_INIT_VAR(_5$$4); + ZVAL_STRING(_5$$4, "Date", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(NULL, _2$$4, "__construct", NULL, 434, _4$$4, field, _5$$4); + zephir_check_temp_parameter(_5$$4); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _2$$4); + zephir_check_call_status(); + RETURN_MM_BOOL(0); + } + RETURN_MM_BOOL(1); + +} + +static PHP_METHOD(Phalcon_Validation_Validator_Date, checkDate) { + + zend_bool _3; + zend_class_entry *_0, *_1; + int ZEPHIR_LAST_CALL_STATUS; + zval *value, *format, *date = NULL, *errors = NULL, *_2, *_4; + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 2, 0, &value, &format); + + + + if (!(Z_TYPE_P(value) == IS_STRING)) { + RETURN_MM_BOOL(0); + } + _0 = zend_fetch_class(SL("DateTime"), ZEND_FETCH_CLASS_AUTO TSRMLS_CC); + ZEPHIR_CALL_CE_STATIC(&date, _0, "createfromformat", NULL, 0, format, value); + zephir_check_call_status(); + _1 = zend_fetch_class(SL("DateTime"), ZEND_FETCH_CLASS_AUTO TSRMLS_CC); + ZEPHIR_CALL_CE_STATIC(&errors, _1, "getlasterrors", NULL, 0); + zephir_check_call_status(); + zephir_array_fetch_string(&_2, errors, SL("warning_count"), PH_NOISY | PH_READONLY, "phalcon/validation/validator/date.zep", 90 TSRMLS_CC); + _3 = ZEPHIR_GT_LONG(_2, 0); + if (!(_3)) { + zephir_array_fetch_string(&_4, errors, SL("error_count"), PH_NOISY | PH_READONLY, "phalcon/validation/validator/date.zep", 90 TSRMLS_CC); + _3 = ZEPHIR_GT_LONG(_4, 0); + } + if (_3) { + RETURN_MM_BOOL(0); + } + RETURN_MM_BOOL(1); + +} + + + + #ifdef HAVE_CONFIG_H #endif @@ -137593,7 +138036,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Digit, validate) { if (_2) { RETURN_MM_BOOL(1); } - ZEPHIR_CALL_FUNCTION(&_3, "ctype_digit", NULL, 445, value); + ZEPHIR_CALL_FUNCTION(&_3, "ctype_digit", NULL, 442, value); zephir_check_call_status(); if (!(zephir_is_true(_3))) { ZEPHIR_INIT_VAR(_4$$4); @@ -137626,7 +138069,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Digit, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_7$$4); ZVAL_STRING(_7$$4, "Digit", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _4$$4, "__construct", NULL, 438, _6$$4, field, _7$$4); + ZEPHIR_CALL_METHOD(NULL, _4$$4, "__construct", NULL, 434, _6$$4, field, _7$$4); zephir_check_temp_parameter(_7$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _4$$4); @@ -137697,7 +138140,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Email, validate) { } ZEPHIR_SINIT_VAR(_3); ZVAL_LONG(&_3, 274); - ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 193, value, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 188, value, &_3); zephir_check_call_status(); if (!(zephir_is_true(_4))) { ZEPHIR_INIT_VAR(_5$$4); @@ -137730,7 +138173,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Email, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_8$$4); ZVAL_STRING(_8$$4, "Email", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _5$$4, "__construct", NULL, 438, _7$$4, field, _8$$4); + ZEPHIR_CALL_METHOD(NULL, _5$$4, "__construct", NULL, 434, _7$$4, field, _8$$4); zephir_check_temp_parameter(_8$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _5$$4); @@ -137826,7 +138269,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_ExclusionIn, validate) { zephir_check_temp_parameter(_4$$5); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 358, value, domain, strict); + ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 356, value, domain, strict); zephir_check_call_status(); if (zephir_is_true(_5)) { ZEPHIR_INIT_VAR(_6$$7); @@ -137862,7 +138305,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_ExclusionIn, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_9$$7); ZVAL_STRING(_9$$7, "ExclusionIn", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _6$$7, "__construct", NULL, 438, _8$$7, field, _9$$7); + ZEPHIR_CALL_METHOD(NULL, _6$$7, "__construct", NULL, 434, _8$$7, field, _9$$7); zephir_check_temp_parameter(_9$$7); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _6$$7); @@ -137977,7 +138420,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_13$$4); ZVAL_STRING(_13$$4, "FileIniSize", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _9$$4, "__construct", &_14, 438, _11$$4, field, _13$$4); + ZEPHIR_CALL_METHOD(NULL, _9$$4, "__construct", &_14, 434, _11$$4, field, _13$$4); zephir_check_temp_parameter(_13$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _9$$4); @@ -138017,7 +138460,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { _23 = _21; if (!(_23)) { zephir_array_fetch_string(&_24, value, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/validation/validator/file.zep", 79 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_25, "is_uploaded_file", NULL, 234, _24); + ZEPHIR_CALL_FUNCTION(&_25, "is_uploaded_file", NULL, 229, _24); zephir_check_call_status(); _23 = !zephir_is_true(_25); } @@ -138043,7 +138486,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_29$$7); ZVAL_STRING(_29$$7, "FileEmpty", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _26$$7, "__construct", &_14, 438, _28$$7, field, _29$$7); + ZEPHIR_CALL_METHOD(NULL, _26$$7, "__construct", &_14, 434, _28$$7, field, _29$$7); zephir_check_temp_parameter(_29$$7); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _26$$7); @@ -138080,7 +138523,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_35$$9); ZVAL_STRING(_35$$9, "FileValid", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _32$$9, "__construct", &_14, 438, _34$$9, field, _35$$9); + ZEPHIR_CALL_METHOD(NULL, _32$$9, "__construct", &_14, 434, _34$$9, field, _35$$9); zephir_check_temp_parameter(_35$$9); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _32$$9); @@ -138126,7 +138569,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { zephir_array_fetch_long(&unit, matches, 2, PH_NOISY, "phalcon/validation/validator/file.zep", 115 TSRMLS_CC); } zephir_array_fetch_long(&_41$$11, matches, 1, PH_NOISY | PH_READONLY, "phalcon/validation/validator/file.zep", 118 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_42$$11, "floatval", &_43, 305, _41$$11); + ZEPHIR_CALL_FUNCTION(&_42$$11, "floatval", &_43, 301, _41$$11); zephir_check_call_status(); ZEPHIR_INIT_VAR(_44$$11); zephir_array_fetch(&_45$$11, byteUnits, unit, PH_NOISY | PH_READONLY, "phalcon/validation/validator/file.zep", 118 TSRMLS_CC); @@ -138136,9 +138579,9 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { ZEPHIR_INIT_VAR(bytes); mul_function(bytes, _42$$11, _44$$11 TSRMLS_CC); zephir_array_fetch_string(&_47$$11, value, SL("size"), PH_NOISY | PH_READONLY, "phalcon/validation/validator/file.zep", 120 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_42$$11, "floatval", &_43, 305, _47$$11); + ZEPHIR_CALL_FUNCTION(&_42$$11, "floatval", &_43, 301, _47$$11); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_48$$11, "floatval", &_43, 305, bytes); + ZEPHIR_CALL_FUNCTION(&_48$$11, "floatval", &_43, 301, bytes); zephir_check_call_status(); if (ZEPHIR_GT(_42$$11, _48$$11)) { ZEPHIR_INIT_VAR(_49$$13); @@ -138163,7 +138606,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_52$$13); ZVAL_STRING(_52$$13, "FileSize", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _49$$13, "__construct", &_14, 438, _51$$13, field, _52$$13); + ZEPHIR_CALL_METHOD(NULL, _49$$13, "__construct", &_14, 434, _51$$13, field, _52$$13); zephir_check_temp_parameter(_52$$13); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _49$$13); @@ -138189,12 +138632,12 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { if ((zephir_function_exists_ex(SS("finfo_open") TSRMLS_CC) == SUCCESS)) { ZEPHIR_SINIT_VAR(_55$$17); ZVAL_LONG(&_55$$17, 16); - ZEPHIR_CALL_FUNCTION(&tmp, "finfo_open", NULL, 231, &_55$$17); + ZEPHIR_CALL_FUNCTION(&tmp, "finfo_open", NULL, 226, &_55$$17); zephir_check_call_status(); zephir_array_fetch_string(&_56$$17, value, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/validation/validator/file.zep", 143 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 232, tmp, _56$$17); + ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 227, tmp, _56$$17); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 233, tmp); + ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 228, tmp); zephir_check_call_status(); } else { ZEPHIR_OBS_NVAR(mime); @@ -138225,7 +138668,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_60$$19); ZVAL_STRING(_60$$19, "FileType", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _57$$19, "__construct", &_14, 438, _59$$19, field, _60$$19); + ZEPHIR_CALL_METHOD(NULL, _57$$19, "__construct", &_14, 434, _59$$19, field, _60$$19); zephir_check_temp_parameter(_60$$19); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _57$$19); @@ -138249,7 +138692,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { } if (_62) { zephir_array_fetch_string(&_64$$21, value, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/validation/validator/file.zep", 164 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 242, _64$$21); + ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 237, _64$$21); zephir_check_call_status(); ZEPHIR_OBS_VAR(width); zephir_array_fetch_long(&width, tmp, 0, PH_NOISY, "phalcon/validation/validator/file.zep", 165 TSRMLS_CC); @@ -138310,7 +138753,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_73$$24); ZVAL_STRING(_73$$24, "FileMinResolution", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _70$$24, "__construct", &_14, 438, _71$$24, field, _73$$24); + ZEPHIR_CALL_METHOD(NULL, _70$$24, "__construct", &_14, 434, _71$$24, field, _73$$24); zephir_check_temp_parameter(_73$$24); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _70$$24); @@ -138366,7 +138809,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_81$$27); ZVAL_STRING(_81$$27, "FileMaxResolution", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _78$$27, "__construct", &_14, 438, _79$$27, field, _81$$27); + ZEPHIR_CALL_METHOD(NULL, _78$$27, "__construct", &_14, 434, _79$$27, field, _81$$27); zephir_check_temp_parameter(_81$$27); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _78$$27); @@ -138483,7 +138926,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Identical, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_11$$6); ZVAL_STRING(_11$$6, "Identical", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _8$$6, "__construct", NULL, 438, _10$$6, field, _11$$6); + ZEPHIR_CALL_METHOD(NULL, _8$$6, "__construct", NULL, 434, _10$$6, field, _11$$6); zephir_check_temp_parameter(_11$$6); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _8$$6); @@ -138579,7 +139022,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_InclusionIn, validate) { zephir_check_temp_parameter(_4$$5); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 358, value, domain, strict); + ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 356, value, domain, strict); zephir_check_call_status(); if (!(zephir_is_true(_5))) { ZEPHIR_INIT_VAR(_6$$7); @@ -138615,7 +139058,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_InclusionIn, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_9$$7); ZVAL_STRING(_9$$7, "InclusionIn", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _6$$7, "__construct", NULL, 438, _8$$7, field, _9$$7); + ZEPHIR_CALL_METHOD(NULL, _6$$7, "__construct", NULL, 434, _8$$7, field, _9$$7); zephir_check_temp_parameter(_9$$7); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _6$$7); @@ -138720,7 +139163,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Numericality, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_8$$4); ZVAL_STRING(_8$$4, "Numericality", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _5$$4, "__construct", NULL, 438, _7$$4, field, _8$$4); + ZEPHIR_CALL_METHOD(NULL, _5$$4, "__construct", NULL, 434, _7$$4, field, _8$$4); zephir_check_temp_parameter(_8$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _5$$4); @@ -138812,7 +139255,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_PresenceOf, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_4$$3); ZVAL_STRING(_4$$3, "PresenceOf", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _1$$3, "__construct", NULL, 438, _3$$3, field, _4$$3); + ZEPHIR_CALL_METHOD(NULL, _1$$3, "__construct", NULL, 434, _3$$3, field, _4$$3); zephir_check_temp_parameter(_4$$3); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _1$$3); @@ -138927,7 +139370,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Regex, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_9$$6); ZVAL_STRING(_9$$6, "Regex", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _6$$6, "__construct", NULL, 438, _8$$6, field, _9$$6); + ZEPHIR_CALL_METHOD(NULL, _6$$6, "__construct", NULL, 434, _8$$6, field, _9$$6); zephir_check_temp_parameter(_9$$6); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _6$$6); @@ -139025,7 +139468,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_StringLength, validate) { zephir_check_call_status(); } if ((zephir_function_exists_ex(SS("mb_strlen") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 359, value); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 357, value); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(length); @@ -139060,7 +139503,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_StringLength, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_9$$9); ZVAL_STRING(_9$$9, "TooLong", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _5$$9, "__construct", &_10, 438, _7$$9, field, _9$$9); + ZEPHIR_CALL_METHOD(NULL, _5$$9, "__construct", &_10, 434, _7$$9, field, _9$$9); zephir_check_temp_parameter(_9$$9); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _5$$9); @@ -139097,7 +139540,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_StringLength, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_15$$12); ZVAL_STRING(_15$$12, "TooShort", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _12$$12, "__construct", &_10, 438, _14$$12, field, _15$$12); + ZEPHIR_CALL_METHOD(NULL, _12$$12, "__construct", &_10, 434, _14$$12, field, _15$$12); zephir_check_temp_parameter(_15$$12); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _12$$12); @@ -139237,7 +139680,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Uniqueness, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_12$$7); ZVAL_STRING(_12$$7, "Uniqueness", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _9$$7, "__construct", NULL, 438, _11$$7, field, _12$$7); + ZEPHIR_CALL_METHOD(NULL, _9$$7, "__construct", NULL, 434, _11$$7, field, _12$$7); zephir_check_temp_parameter(_12$$7); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _9$$7); @@ -139308,7 +139751,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Url, validate) { } ZEPHIR_SINIT_VAR(_3); ZVAL_LONG(&_3, 273); - ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 193, value, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 188, value, &_3); zephir_check_call_status(); if (!(zephir_is_true(_4))) { ZEPHIR_INIT_VAR(_5$$4); @@ -139341,7 +139784,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Url, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_8$$4); ZVAL_STRING(_8$$4, "Url", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _5$$4, "__construct", NULL, 438, _7$$4, field, _8$$4); + ZEPHIR_CALL_METHOD(NULL, _5$$4, "__construct", NULL, 434, _7$$4, field, _8$$4); zephir_check_temp_parameter(_8$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _5$$4); @@ -139386,9 +139829,9 @@ zend_class_entry *phalcon_cache_frontendinterface_ce; zend_class_entry *phalcon_annotations_adapterinterface_ce; zend_class_entry *phalcon_db_dialectinterface_ce; zend_class_entry *phalcon_dispatcherinterface_ce; +zend_class_entry *phalcon_logger_formatterinterface_ce; zend_class_entry *phalcon_db_adapterinterface_ce; zend_class_entry *phalcon_logger_adapterinterface_ce; -zend_class_entry *phalcon_logger_formatterinterface_ce; zend_class_entry *phalcon_mvc_entityinterface_ce; zend_class_entry *phalcon_mvc_model_resultsetinterface_ce; zend_class_entry *phalcon_session_adapterinterface_ce; @@ -139721,6 +140164,7 @@ zend_class_entry *phalcon_validation_validator_alpha_ce; zend_class_entry *phalcon_validation_validator_between_ce; zend_class_entry *phalcon_validation_validator_confirmation_ce; zend_class_entry *phalcon_validation_validator_creditcard_ce; +zend_class_entry *phalcon_validation_validator_date_ce; zend_class_entry *phalcon_validation_validator_digit_ce; zend_class_entry *phalcon_validation_validator_email_ce; zend_class_entry *phalcon_validation_validator_exclusionin_ce; @@ -139785,9 +140229,9 @@ static PHP_MINIT_FUNCTION(phalcon) ZEPHIR_INIT(Phalcon_Annotations_AdapterInterface); ZEPHIR_INIT(Phalcon_Db_DialectInterface); ZEPHIR_INIT(Phalcon_DispatcherInterface); + ZEPHIR_INIT(Phalcon_Logger_FormatterInterface); ZEPHIR_INIT(Phalcon_Db_AdapterInterface); ZEPHIR_INIT(Phalcon_Logger_AdapterInterface); - ZEPHIR_INIT(Phalcon_Logger_FormatterInterface); ZEPHIR_INIT(Phalcon_Mvc_EntityInterface); ZEPHIR_INIT(Phalcon_Mvc_Model_ResultsetInterface); ZEPHIR_INIT(Phalcon_Session_AdapterInterface); @@ -140119,6 +140563,7 @@ static PHP_MINIT_FUNCTION(phalcon) ZEPHIR_INIT(Phalcon_Validation_Validator_Between); ZEPHIR_INIT(Phalcon_Validation_Validator_Confirmation); ZEPHIR_INIT(Phalcon_Validation_Validator_CreditCard); + ZEPHIR_INIT(Phalcon_Validation_Validator_Date); ZEPHIR_INIT(Phalcon_Validation_Validator_Digit); ZEPHIR_INIT(Phalcon_Validation_Validator_Email); ZEPHIR_INIT(Phalcon_Validation_Validator_ExclusionIn); diff --git a/build/64bits/phalcon.zep.h b/build/64bits/phalcon.zep.h index 537f2625846..c85d23ded2a 100644 --- a/build/64bits/phalcon.zep.h +++ b/build/64bits/phalcon.zep.h @@ -430,7 +430,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Validator, getMessages); static PHP_METHOD(Phalcon_Mvc_Model_Validator, getOptions); static PHP_METHOD(Phalcon_Mvc_Model_Validator, getOption); static PHP_METHOD(Phalcon_Mvc_Model_Validator, isSetOption); -static zend_object_value zephir_init_properties_Phalcon_Mvc_Model_Validator(zend_class_entry *class_type TSRMLS_DC); +zend_object_value zephir_init_properties_Phalcon_Mvc_Model_Validator(zend_class_entry *class_type TSRMLS_DC); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_validator___construct, 0, 0, 1) ZEND_ARG_ARRAY_INFO(0, options, 0) @@ -1579,6 +1579,22 @@ ZEPHIR_INIT_FUNCS(phalcon_dispatcherinterface_method_entry) { PHP_FE_END }; +zend_class_entry *phalcon_logger_formatterinterface_ce; + +ZEPHIR_INIT_CLASS(Phalcon_Logger_FormatterInterface); + +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_formatterinterface_format, 0, 0, 3) + ZEND_ARG_INFO(0, message) + ZEND_ARG_INFO(0, type) + ZEND_ARG_INFO(0, timestamp) + ZEND_ARG_INFO(0, context) +ZEND_END_ARG_INFO() + +ZEPHIR_INIT_FUNCS(phalcon_logger_formatterinterface_method_entry) { + PHP_ABSTRACT_ME(Phalcon_Logger_FormatterInterface, format, arginfo_phalcon_logger_formatterinterface_format) + PHP_FE_END +}; + zend_class_entry *phalcon_annotations_adapter_ce; ZEPHIR_INIT_CLASS(Phalcon_Annotations_Adapter); @@ -2572,22 +2588,6 @@ ZEPHIR_INIT_FUNCS(phalcon_logger_formatter_method_entry) { PHP_FE_END }; -zend_class_entry *phalcon_logger_formatterinterface_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Logger_FormatterInterface); - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_formatterinterface_format, 0, 0, 3) - ZEND_ARG_INFO(0, message) - ZEND_ARG_INFO(0, type) - ZEND_ARG_INFO(0, timestamp) - ZEND_ARG_INFO(0, context) -ZEND_END_ARG_INFO() - -ZEPHIR_INIT_FUNCS(phalcon_logger_formatterinterface_method_entry) { - PHP_ABSTRACT_ME(Phalcon_Logger_FormatterInterface, format, arginfo_phalcon_logger_formatterinterface_format) - PHP_FE_END -}; - zend_class_entry *phalcon_mvc_entityinterface_ce; ZEPHIR_INIT_CLASS(Phalcon_Mvc_EntityInterface); @@ -7100,7 +7100,7 @@ static PHP_METHOD(Phalcon_Assets_Collection, setTargetLocal); static PHP_METHOD(Phalcon_Assets_Collection, join); static PHP_METHOD(Phalcon_Assets_Collection, getRealTargetPath); static PHP_METHOD(Phalcon_Assets_Collection, addFilter); -static zend_object_value zephir_init_properties_Phalcon_Assets_Collection(zend_class_entry *class_type TSRMLS_DC); +zend_object_value zephir_init_properties_Phalcon_Assets_Collection(zend_class_entry *class_type TSRMLS_DC); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_assets_collection_add, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, resource, Phalcon\\Assets\\Resource, 0) @@ -8787,6 +8787,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Db_Adapter_Pdo_Mysql); static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, escapeIdentifier); static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns); static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeIndexes); +static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeReferences); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_adapter_pdo_mysql_escapeidentifier, 0, 0, 1) ZEND_ARG_INFO(0, identifier) @@ -8802,10 +8803,16 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_adapter_pdo_mysql_describeindexes, 0, ZEND_ARG_INFO(0, schema) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_adapter_pdo_mysql_describereferences, 0, 0, 1) + ZEND_ARG_INFO(0, table) + ZEND_ARG_INFO(0, schema) +ZEND_END_ARG_INFO() + ZEPHIR_INIT_FUNCS(phalcon_db_adapter_pdo_mysql_method_entry) { PHP_ME(Phalcon_Db_Adapter_Pdo_Mysql, escapeIdentifier, arginfo_phalcon_db_adapter_pdo_mysql_escapeidentifier, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns, arginfo_phalcon_db_adapter_pdo_mysql_describecolumns, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Db_Adapter_Pdo_Mysql, describeIndexes, arginfo_phalcon_db_adapter_pdo_mysql_describeindexes, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Db_Adapter_Pdo_Mysql, describeReferences, arginfo_phalcon_db_adapter_pdo_mysql_describereferences, ZEND_ACC_PUBLIC) PHP_FE_END }; @@ -11590,7 +11597,7 @@ static PHP_METHOD(Phalcon_Http_Response_Headers, send); static PHP_METHOD(Phalcon_Http_Response_Headers, reset); static PHP_METHOD(Phalcon_Http_Response_Headers, toArray); static PHP_METHOD(Phalcon_Http_Response_Headers, __set_state); -static zend_object_value zephir_init_properties_Phalcon_Http_Response_Headers(zend_class_entry *class_type TSRMLS_DC); +zend_object_value zephir_init_properties_Phalcon_Http_Response_Headers(zend_class_entry *class_type TSRMLS_DC); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_response_headers_set, 0, 0, 2) ZEND_ARG_INFO(0, name) @@ -12283,8 +12290,10 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Multiple); static PHP_METHOD(Phalcon_Logger_Multiple, getLoggers); static PHP_METHOD(Phalcon_Logger_Multiple, getFormatter); +static PHP_METHOD(Phalcon_Logger_Multiple, getLogLevel); static PHP_METHOD(Phalcon_Logger_Multiple, push); static PHP_METHOD(Phalcon_Logger_Multiple, setFormatter); +static PHP_METHOD(Phalcon_Logger_Multiple, setLogLevel); static PHP_METHOD(Phalcon_Logger_Multiple, log); static PHP_METHOD(Phalcon_Logger_Multiple, critical); static PHP_METHOD(Phalcon_Logger_Multiple, emergency); @@ -12303,6 +12312,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_multiple_setformatter, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, formatter, Phalcon\\Logger\\FormatterInterface, 0) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_multiple_setloglevel, 0, 0, 1) + ZEND_ARG_INFO(0, level) +ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_multiple_log, 0, 0, 1) ZEND_ARG_INFO(0, type) ZEND_ARG_INFO(0, message) @@ -12352,8 +12365,10 @@ ZEND_END_ARG_INFO() ZEPHIR_INIT_FUNCS(phalcon_logger_multiple_method_entry) { PHP_ME(Phalcon_Logger_Multiple, getLoggers, NULL, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Logger_Multiple, getFormatter, NULL, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Logger_Multiple, getLogLevel, NULL, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Logger_Multiple, push, arginfo_phalcon_logger_multiple_push, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Logger_Multiple, setFormatter, arginfo_phalcon_logger_multiple_setformatter, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Logger_Multiple, setLogLevel, arginfo_phalcon_logger_multiple_setloglevel, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Logger_Multiple, log, arginfo_phalcon_logger_multiple_log, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Logger_Multiple, critical, arginfo_phalcon_logger_multiple_critical, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Logger_Multiple, emergency, arginfo_phalcon_logger_multiple_emergency, ZEND_ACC_PUBLIC) @@ -12746,6 +12761,7 @@ static PHP_METHOD(Phalcon_Mvc_Collection_Manager, initialize); static PHP_METHOD(Phalcon_Mvc_Collection_Manager, isInitialized); static PHP_METHOD(Phalcon_Mvc_Collection_Manager, getLastInitialized); static PHP_METHOD(Phalcon_Mvc_Collection_Manager, setConnectionService); +static PHP_METHOD(Phalcon_Mvc_Collection_Manager, getConnectionService); static PHP_METHOD(Phalcon_Mvc_Collection_Manager, useImplicitObjectIds); static PHP_METHOD(Phalcon_Mvc_Collection_Manager, isUsingImplicitObjectIds); static PHP_METHOD(Phalcon_Mvc_Collection_Manager, getConnection); @@ -12783,6 +12799,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_collection_manager_setconnectionservi ZEND_ARG_INFO(0, connectionService) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_collection_manager_getconnectionservice, 0, 0, 1) + ZEND_ARG_OBJ_INFO(0, model, Phalcon\\Mvc\\CollectionInterface, 0) +ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_collection_manager_useimplicitobjectids, 0, 0, 2) ZEND_ARG_OBJ_INFO(0, model, Phalcon\\Mvc\\CollectionInterface, 0) ZEND_ARG_INFO(0, useImplicitObjectIds) @@ -12823,6 +12843,7 @@ ZEPHIR_INIT_FUNCS(phalcon_mvc_collection_manager_method_entry) { PHP_ME(Phalcon_Mvc_Collection_Manager, isInitialized, arginfo_phalcon_mvc_collection_manager_isinitialized, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Collection_Manager, getLastInitialized, NULL, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Collection_Manager, setConnectionService, arginfo_phalcon_mvc_collection_manager_setconnectionservice, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Mvc_Collection_Manager, getConnectionService, arginfo_phalcon_mvc_collection_manager_getconnectionservice, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Collection_Manager, useImplicitObjectIds, arginfo_phalcon_mvc_collection_manager_useimplicitobjectids, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Collection_Manager, isUsingImplicitObjectIds, arginfo_phalcon_mvc_collection_manager_isusingimplicitobjectids, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Collection_Manager, getConnection, arginfo_phalcon_mvc_collection_manager_getconnection, ZEND_ACC_PUBLIC) @@ -13385,6 +13406,8 @@ static PHP_METHOD(Phalcon_Mvc_Model, _invokeFinder); static PHP_METHOD(Phalcon_Mvc_Model, __call); static PHP_METHOD(Phalcon_Mvc_Model, __callStatic); static PHP_METHOD(Phalcon_Mvc_Model, __set); +static PHP_METHOD(Phalcon_Mvc_Model, _possibleSetter); +static PHP_METHOD(Phalcon_Mvc_Model, _isVisible); static PHP_METHOD(Phalcon_Mvc_Model, __get); static PHP_METHOD(Phalcon_Mvc_Model, __isset); static PHP_METHOD(Phalcon_Mvc_Model, serialize); @@ -13686,6 +13709,15 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model___set, 0, 0, 2) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model__possiblesetter, 0, 0, 2) + ZEND_ARG_INFO(0, property) + ZEND_ARG_INFO(0, value) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model__isvisible, 0, 0, 1) + ZEND_ARG_INFO(0, property) +ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model___get, 0, 0, 1) ZEND_ARG_INFO(0, property) ZEND_END_ARG_INFO() @@ -13789,6 +13821,8 @@ ZEPHIR_INIT_FUNCS(phalcon_mvc_model_method_entry) { PHP_ME(Phalcon_Mvc_Model, __call, arginfo_phalcon_mvc_model___call, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model, __callStatic, arginfo_phalcon_mvc_model___callstatic, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) PHP_ME(Phalcon_Mvc_Model, __set, arginfo_phalcon_mvc_model___set, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Mvc_Model, _possibleSetter, arginfo_phalcon_mvc_model__possiblesetter, ZEND_ACC_PROTECTED|ZEND_ACC_FINAL) + PHP_ME(Phalcon_Mvc_Model, _isVisible, arginfo_phalcon_mvc_model__isvisible, ZEND_ACC_PROTECTED|ZEND_ACC_FINAL) PHP_ME(Phalcon_Mvc_Model, __get, arginfo_phalcon_mvc_model___get, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model, __isset, arginfo_phalcon_mvc_model___isset, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model, serialize, NULL, ZEND_ACC_PUBLIC) @@ -17001,7 +17035,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_queue_beanstalk_put, 0, 0, 1) ZEND_ARG_INFO(0, data) - ZEND_ARG_INFO(0, options) + ZEND_ARG_ARRAY_INFO(0, options, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_queue_beanstalk_reserve, 0, 0, 0) @@ -18063,7 +18097,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Csv, __construct); static PHP_METHOD(Phalcon_Translate_Adapter_Csv, _load); static PHP_METHOD(Phalcon_Translate_Adapter_Csv, query); static PHP_METHOD(Phalcon_Translate_Adapter_Csv, exists); -static zend_object_value zephir_init_properties_Phalcon_Translate_Adapter_Csv(zend_class_entry *class_type TSRMLS_DC); +zend_object_value zephir_init_properties_Phalcon_Translate_Adapter_Csv(zend_class_entry *class_type TSRMLS_DC); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_translate_adapter_csv___construct, 0, 0, 1) ZEND_ARG_ARRAY_INFO(0, options, 0) @@ -18169,7 +18203,7 @@ ZEPHIR_INIT_FUNCS(phalcon_translate_adapter_gettext_method_entry) { PHP_ME(Phalcon_Translate_Adapter_Gettext, setDefaultDomain, arginfo_phalcon_translate_adapter_gettext_setdefaultdomain, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Translate_Adapter_Gettext, setDirectory, arginfo_phalcon_translate_adapter_gettext_setdirectory, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Translate_Adapter_Gettext, setLocale, arginfo_phalcon_translate_adapter_gettext_setlocale, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Translate_Adapter_Gettext, prepareOptions, arginfo_phalcon_translate_adapter_gettext_prepareoptions, ZEND_ACC_PRIVATE) + PHP_ME(Phalcon_Translate_Adapter_Gettext, prepareOptions, arginfo_phalcon_translate_adapter_gettext_prepareoptions, ZEND_ACC_PROTECTED) PHP_ME(Phalcon_Translate_Adapter_Gettext, getOptionsDefault, NULL, ZEND_ACC_PRIVATE) PHP_FE_END }; @@ -18582,6 +18616,29 @@ ZEPHIR_INIT_FUNCS(phalcon_validation_validator_creditcard_method_entry) { PHP_FE_END }; +zend_class_entry *phalcon_validation_validator_date_ce; + +ZEPHIR_INIT_CLASS(Phalcon_Validation_Validator_Date); + +static PHP_METHOD(Phalcon_Validation_Validator_Date, validate); +static PHP_METHOD(Phalcon_Validation_Validator_Date, checkDate); + +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_validation_validator_date_validate, 0, 0, 2) + ZEND_ARG_OBJ_INFO(0, validation, Phalcon\\Validation, 0) + ZEND_ARG_INFO(0, field) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_validation_validator_date_checkdate, 0, 0, 2) + ZEND_ARG_INFO(0, value) + ZEND_ARG_INFO(0, format) +ZEND_END_ARG_INFO() + +ZEPHIR_INIT_FUNCS(phalcon_validation_validator_date_method_entry) { + PHP_ME(Phalcon_Validation_Validator_Date, validate, arginfo_phalcon_validation_validator_date_validate, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Validation_Validator_Date, checkDate, arginfo_phalcon_validation_validator_date_checkdate, ZEND_ACC_PRIVATE) + PHP_FE_END +}; + zend_class_entry *phalcon_validation_validator_digit_ce; ZEPHIR_INIT_CLASS(Phalcon_Validation_Validator_Digit); diff --git a/build/64bits/php_phalcon.h b/build/64bits/php_phalcon.h index 687d79bba0b..3b1a8c8d703 100644 --- a/build/64bits/php_phalcon.h +++ b/build/64bits/php_phalcon.h @@ -182,10 +182,10 @@ typedef zend_function zephir_fcall_cache_entry; #define PHP_PHALCON_NAME "phalcon" -#define PHP_PHALCON_VERSION "2.0.10" +#define PHP_PHALCON_VERSION "2.0.11" #define PHP_PHALCON_EXTNAME "phalcon" #define PHP_PHALCON_AUTHOR "Phalcon Team and contributors" -#define PHP_PHALCON_ZEPVERSION "0.9.2a-dev" +#define PHP_PHALCON_ZEPVERSION "0.9.3a-dev" #define PHP_PHALCON_DESCRIPTION "Web framework delivered as a C-extension for PHP" typedef struct _zephir_struct_db { diff --git a/build/safe/phalcon.zep.c b/build/safe/phalcon.zep.c index f26ad3f593b..20fc73e6041 100644 --- a/build/safe/phalcon.zep.c +++ b/build/safe/phalcon.zep.c @@ -2219,8 +2219,8 @@ static void zephir_fast_strip_tags(zval *return_value, zval *str); static void zephir_fast_strtoupper(zval *return_value, zval *str); /** Camelize/Uncamelize */ -static void zephir_camelize(zval *return_value, const zval *str); -static void zephir_uncamelize(zval *return_value, const zval *str); +static void zephir_camelize(zval *return_value, const zval *str, const zval *delimiter); +static void zephir_uncamelize(zval *return_value, const zval *str, const zval *delimiter); /** Starts/Ends with */ static int zephir_start_with(const zval *str, const zval *compared, zval *case_sensitive); @@ -9671,17 +9671,26 @@ static void zephir_fast_join_str(zval *return_value, char *glue, unsigned int gl } } -static void zephir_camelize(zval *return_value, const zval *str) { +static void zephir_camelize(zval *return_value, const zval *str, const zval *delimiter) { int i, len, first = 0; smart_str camelize_str = {0}; - char *marker, ch; + char *marker, ch, delim; if (unlikely(Z_TYPE_P(str) != IS_STRING)) { zend_error(E_WARNING, "Invalid arguments supplied for camelize()"); RETURN_EMPTY_STRING(); } + if (delimiter == NULL || Z_TYPE_P(delimiter) == IS_NULL) { + delim = '_'; + } else if (Z_TYPE_P(delimiter) == IS_STRING && Z_STRLEN_P(delimiter) == 1) { + delim = *(Z_STRVAL_P(delimiter)); + } else { + zend_error(E_WARNING, "Second argument passed to the camelize() must be a string of one character"); + RETURN_EMPTY_STRING(); + } + marker = Z_STRVAL_P(str); len = Z_STRLEN_P(str); @@ -9691,7 +9700,7 @@ static void zephir_camelize(zval *return_value, const zval *str) { if (first == 0) { - if (ch == '-' || ch == '_') { + if (ch == delim) { continue; } @@ -9700,7 +9709,7 @@ static void zephir_camelize(zval *return_value, const zval *str) { continue; } - if (ch == '-' || ch == '_') { + if (ch == delim) { if (i != (len - 1)) { i++; ch = marker[i]; @@ -9721,15 +9730,24 @@ static void zephir_camelize(zval *return_value, const zval *str) { RETURN_EMPTY_STRING(); } -static void zephir_uncamelize(zval *return_value, const zval *str) { +static void zephir_uncamelize(zval *return_value, const zval *str, const zval *delimiter) { unsigned int i; smart_str uncamelize_str = {0}; - char *marker, ch; + char *marker, ch, delim; if (Z_TYPE_P(str) != IS_STRING) { zend_error(E_WARNING, "Invalid arguments supplied for uncamelize()"); - return; + RETURN_EMPTY_STRING(); + } + + if (delimiter == NULL || Z_TYPE_P(delimiter) == IS_NULL) { + delim = '_'; + } else if (Z_TYPE_P(delimiter) == IS_STRING && Z_STRLEN_P(delimiter) == 1) { + delim = *(Z_STRVAL_P(delimiter)); + } else { + zend_error(E_WARNING, "Second argument passed to the uncamelize() must be a string of one character"); + RETURN_EMPTY_STRING(); } marker = Z_STRVAL_P(str); @@ -9743,7 +9761,7 @@ static void zephir_uncamelize(zval *return_value, const zval *str) { if (ch >= 'A' && ch <= 'Z') { if (i > 0) { - smart_str_appendc(&uncamelize_str, '_'); + smart_str_appendc(&uncamelize_str, delim); } smart_str_appendc(&uncamelize_str, (*marker) + 32); } else { @@ -16996,7 +17014,7 @@ static PHP_METHOD(phalcon_0__closure, __invoke) { zephir_array_fetch_long(&_0, matches, 1, PH_NOISY | PH_READONLY, "phalcon/text.zep", 272 TSRMLS_CC); ZEPHIR_INIT_VAR(words); zephir_fast_explode_str(words, SL("|"), _0, LONG_MAX TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_2, "array_rand", NULL, 447, words); + ZEPHIR_CALL_FUNCTION(&_2, "array_rand", NULL, 444, words); zephir_check_call_status(); zephir_array_fetch(&_1, words, _2, PH_NOISY | PH_READONLY, "phalcon/text.zep", 273 TSRMLS_CC); RETURN_CTOR(_1); @@ -17902,7 +17920,7 @@ static PHP_METHOD(Phalcon_Crypt, encrypt) { zend_bool _3, _4; int ZEPHIR_LAST_CALL_STATUS, _2$$9; - zval *text_param = NULL, *key_param = NULL, *encryptKey = NULL, *ivSize = NULL, *iv = NULL, *cipher = NULL, *mode = NULL, *blockSize = NULL, *paddingType = NULL, *padded = NULL, _0, *_5 = NULL, *_1$$8 = NULL; + zval *text_param = NULL, *key_param = NULL, *encryptKey = NULL, *ivSize = NULL, *iv = NULL, *cipher = NULL, *mode = NULL, *blockSize = NULL, *paddingType = NULL, *padded = NULL, *_0, *_5 = NULL, *_1$$8 = NULL; zval *text = NULL, *key = NULL; ZEPHIR_MM_GROW(); @@ -17953,22 +17971,22 @@ static PHP_METHOD(Phalcon_Crypt, encrypt) { zephir_read_property_this(&cipher, this_ptr, SL("_cipher"), PH_NOISY_CC); ZEPHIR_OBS_VAR(mode); zephir_read_property_this(&mode, this_ptr, SL("_mode"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&ivSize, "mcrypt_get_iv_size", NULL, 135, cipher, mode); + ZEPHIR_CALL_FUNCTION(&ivSize, "mcrypt_get_iv_size", NULL, 0, cipher, mode); zephir_check_call_status(); if (ZEPHIR_LT_LONG(ivSize, zephir_fast_strlen_ev(encryptKey))) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_crypt_exception_ce, "Size of key is too large for this algorithm", "phalcon/crypt.zep", 319); return; } - ZEPHIR_SINIT_VAR(_0); - ZVAL_LONG(&_0, 2); - ZEPHIR_CALL_FUNCTION(&iv, "mcrypt_create_iv", NULL, 136, ivSize, &_0); + ZEPHIR_INIT_VAR(_0); + ZEPHIR_GET_CONSTANT(_0, "MCRYPT_RAND"); + ZEPHIR_CALL_FUNCTION(&iv, "mcrypt_create_iv", NULL, 0, ivSize, _0); zephir_check_call_status(); if (Z_TYPE_P(iv) != IS_STRING) { ZEPHIR_CALL_FUNCTION(&_1$$8, "strval", NULL, 21, iv); zephir_check_call_status(); ZEPHIR_CPY_WRT(iv, _1$$8); } - ZEPHIR_CALL_FUNCTION(&blockSize, "mcrypt_get_block_size", NULL, 137, cipher, mode); + ZEPHIR_CALL_FUNCTION(&blockSize, "mcrypt_get_block_size", NULL, 0, cipher, mode); zephir_check_call_status(); if (Z_TYPE_P(blockSize) != IS_LONG) { _2$$9 = zephir_get_intval(blockSize); @@ -17991,7 +18009,7 @@ static PHP_METHOD(Phalcon_Crypt, encrypt) { } else { ZEPHIR_CPY_WRT(padded, text); } - ZEPHIR_CALL_FUNCTION(&_5, "mcrypt_encrypt", NULL, 138, cipher, encryptKey, padded, mode, iv); + ZEPHIR_CALL_FUNCTION(&_5, "mcrypt_encrypt", NULL, 0, cipher, encryptKey, padded, mode, iv); zephir_check_call_status(); ZEPHIR_CONCAT_VV(return_value, iv, _5); RETURN_MM(); @@ -18041,7 +18059,7 @@ static PHP_METHOD(Phalcon_Crypt, decrypt) { zephir_read_property_this(&cipher, this_ptr, SL("_cipher"), PH_NOISY_CC); ZEPHIR_OBS_VAR(mode); zephir_read_property_this(&mode, this_ptr, SL("_mode"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&ivSize, "mcrypt_get_iv_size", NULL, 135, cipher, mode); + ZEPHIR_CALL_FUNCTION(&ivSize, "mcrypt_get_iv_size", NULL, 0, cipher, mode); zephir_check_call_status(); ZEPHIR_INIT_VAR(keySize); ZVAL_LONG(keySize, zephir_fast_strlen_ev(decryptKey)); @@ -18061,9 +18079,9 @@ static PHP_METHOD(Phalcon_Crypt, decrypt) { ZVAL_LONG(&_1, 0); ZEPHIR_INIT_VAR(_2); zephir_substr(_2, text, 0 , zephir_get_intval(ivSize), 0); - ZEPHIR_CALL_FUNCTION(&decrypted, "mcrypt_decrypt", NULL, 139, cipher, decryptKey, _0, mode, _2); + ZEPHIR_CALL_FUNCTION(&decrypted, "mcrypt_decrypt", NULL, 0, cipher, decryptKey, _0, mode, _2); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&blockSize, "mcrypt_get_block_size", NULL, 137, cipher, mode); + ZEPHIR_CALL_FUNCTION(&blockSize, "mcrypt_get_block_size", NULL, 0, cipher, mode); zephir_check_call_status(); ZEPHIR_OBS_VAR(paddingType); zephir_read_property_this(&paddingType, this_ptr, SL("_padding"), PH_NOISY_CC); @@ -18198,7 +18216,7 @@ static PHP_METHOD(Phalcon_Crypt, getAvailableCiphers) { ZEPHIR_MM_GROW(); - ZEPHIR_RETURN_CALL_FUNCTION("mcrypt_list_algorithms", NULL, 140); + ZEPHIR_RETURN_CALL_FUNCTION("mcrypt_list_algorithms", NULL, 135); zephir_check_call_status(); RETURN_MM(); @@ -18210,7 +18228,7 @@ static PHP_METHOD(Phalcon_Crypt, getAvailableModes) { ZEPHIR_MM_GROW(); - ZEPHIR_RETURN_CALL_FUNCTION("mcrypt_list_modes", NULL, 141); + ZEPHIR_RETURN_CALL_FUNCTION("mcrypt_list_modes", NULL, 136); zephir_check_call_status(); RETURN_MM(); @@ -18506,7 +18524,7 @@ static PHP_METHOD(Phalcon_Debug, listenExceptions) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "onUncaughtException", 1); zephir_array_fast_append(_0, _1); - ZEPHIR_CALL_FUNCTION(NULL, "set_exception_handler", NULL, 151, _0); + ZEPHIR_CALL_FUNCTION(NULL, "set_exception_handler", NULL, 146, _0); zephir_check_call_status(); RETURN_THIS(); @@ -18526,7 +18544,7 @@ static PHP_METHOD(Phalcon_Debug, listenLowSeverity) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "onUncaughtLowSeverity", 1); zephir_array_fast_append(_0, _1); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 152, _0); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 147, _0); zephir_check_call_status(); ZEPHIR_INIT_VAR(_2); zephir_create_array(_2, 2, 0 TSRMLS_CC); @@ -18534,7 +18552,7 @@ static PHP_METHOD(Phalcon_Debug, listenLowSeverity) { ZEPHIR_INIT_NVAR(_1); ZVAL_STRING(_1, "onUncaughtException", 1); zephir_array_fast_append(_2, _1); - ZEPHIR_CALL_FUNCTION(NULL, "set_exception_handler", NULL, 151, _2); + ZEPHIR_CALL_FUNCTION(NULL, "set_exception_handler", NULL, 146, _2); zephir_check_call_status(); RETURN_THIS(); @@ -18570,7 +18588,7 @@ static PHP_METHOD(Phalcon_Debug, debugVar) { ZEPHIR_INIT_VAR(_0); zephir_create_array(_0, 3, 0 TSRMLS_CC); zephir_array_fast_append(_0, varz); - ZEPHIR_CALL_FUNCTION(&_1, "debug_backtrace", NULL, 153); + ZEPHIR_CALL_FUNCTION(&_1, "debug_backtrace", NULL, 148); zephir_check_call_status(); zephir_array_fast_append(_0, _1); ZEPHIR_INIT_VAR(_2); @@ -18611,7 +18629,7 @@ static PHP_METHOD(Phalcon_Debug, _escapeString) { ZVAL_LONG(&_3$$3, 2); ZEPHIR_SINIT_VAR(_4$$3); ZVAL_STRING(&_4$$3, "utf-8", 0); - ZEPHIR_RETURN_CALL_FUNCTION("htmlentities", NULL, 154, _0$$3, &_3$$3, &_4$$3); + ZEPHIR_RETURN_CALL_FUNCTION("htmlentities", NULL, 149, _0$$3, &_3$$3, &_4$$3); zephir_check_call_status(); RETURN_MM(); } @@ -18676,7 +18694,7 @@ static PHP_METHOD(Phalcon_Debug, _getArrayDump) { if (Z_TYPE_P(v) == IS_ARRAY) { ZEPHIR_INIT_NVAR(_7$$9); ZVAL_LONG(_7$$9, (zephir_get_numberval(n) + 1)); - ZEPHIR_CALL_METHOD(&_6$$9, this_ptr, "_getarraydump", &_8, 155, v, _7$$9); + ZEPHIR_CALL_METHOD(&_6$$9, this_ptr, "_getarraydump", &_8, 150, v, _7$$9); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_9$$9); ZEPHIR_CONCAT_SVSVS(_9$$9, "[", k, "] => Array(", _6$$9, ")"); @@ -18749,7 +18767,7 @@ static PHP_METHOD(Phalcon_Debug, _getVarDump) { } } if (Z_TYPE_P(variable) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&_2$$11, this_ptr, "_getarraydump", &_1, 155, variable); + ZEPHIR_CALL_METHOD(&_2$$11, this_ptr, "_getarraydump", &_1, 150, variable); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, "Array(", _2$$11, ")"); RETURN_MM(); @@ -18770,7 +18788,7 @@ static PHP_METHOD(Phalcon_Debug, getMajorVersion) { ZEPHIR_MM_GROW(); - ZEPHIR_CALL_CE_STATIC(&_0, phalcon_version_ce, "get", &_1, 156); + ZEPHIR_CALL_CE_STATIC(&_0, phalcon_version_ce, "get", &_1, 151); zephir_check_call_status(); ZEPHIR_INIT_VAR(parts); zephir_fast_explode_str(parts, SL(" "), _0, LONG_MAX TSRMLS_CC); @@ -18789,7 +18807,7 @@ static PHP_METHOD(Phalcon_Debug, getVersion) { ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmajorversion", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_CE_STATIC(&_1, phalcon_version_ce, "get", &_2, 156); + ZEPHIR_CALL_CE_STATIC(&_1, phalcon_version_ce, "get", &_2, 151); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "
Phalcon Framework ", _1, "
"); RETURN_MM(); @@ -18882,7 +18900,7 @@ static PHP_METHOD(Phalcon_Debug, showTraceItem) { object_init_ex(classReflection, zephir_get_internal_ce(SS("reflectionclass") TSRMLS_CC)); ZEPHIR_CALL_METHOD(NULL, classReflection, "__construct", NULL, 66, className); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_8$$5, classReflection, "isinternal", NULL, 157); + ZEPHIR_CALL_METHOD(&_8$$5, classReflection, "isinternal", NULL, 152); zephir_check_call_status(); if (zephir_is_true(_8$$5)) { ZEPHIR_INIT_VAR(_9$$6); @@ -18915,9 +18933,9 @@ static PHP_METHOD(Phalcon_Debug, showTraceItem) { if ((zephir_function_exists(functionName TSRMLS_CC) == SUCCESS)) { ZEPHIR_INIT_VAR(functionReflection); object_init_ex(functionReflection, zephir_get_internal_ce(SS("reflectionfunction") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, functionReflection, "__construct", NULL, 158, functionName); + ZEPHIR_CALL_METHOD(NULL, functionReflection, "__construct", NULL, 153, functionName); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_16$$10, functionReflection, "isinternal", NULL, 159); + ZEPHIR_CALL_METHOD(&_16$$10, functionReflection, "isinternal", NULL, 154); zephir_check_call_status(); if (zephir_is_true(_16$$10)) { ZEPHIR_SINIT_VAR(_17$$11); @@ -18978,7 +18996,7 @@ static PHP_METHOD(Phalcon_Debug, showTraceItem) { ZEPHIR_OBS_VAR(showFiles); zephir_read_property_this(&showFiles, this_ptr, SL("_showFiles"), PH_NOISY_CC); if (zephir_is_true(showFiles)) { - ZEPHIR_CALL_FUNCTION(&lines, "file", NULL, 160, filez); + ZEPHIR_CALL_FUNCTION(&lines, "file", NULL, 155, filez); zephir_check_call_status(); ZEPHIR_INIT_VAR(numberLines); ZVAL_LONG(numberLines, zephir_fast_count_int(lines TSRMLS_CC)); @@ -19061,7 +19079,7 @@ static PHP_METHOD(Phalcon_Debug, showTraceItem) { ZVAL_LONG(&_49$$31, 2); ZEPHIR_SINIT_NVAR(_50$$31); ZVAL_STRING(&_50$$31, "UTF-8", 0); - ZEPHIR_CALL_FUNCTION(&_51$$31, "htmlentities", &_52, 154, _46$$31, &_49$$31, &_50$$31); + ZEPHIR_CALL_FUNCTION(&_51$$31, "htmlentities", &_52, 149, _46$$31, &_49$$31, &_50$$31); zephir_check_call_status(); zephir_concat_self(&html, _51$$31 TSRMLS_CC); } @@ -19085,7 +19103,7 @@ static PHP_METHOD(Phalcon_Debug, onUncaughtLowSeverity) { - ZEPHIR_CALL_FUNCTION(&_0, "error_reporting", NULL, 161); + ZEPHIR_CALL_FUNCTION(&_0, "error_reporting", NULL, 156); zephir_check_call_status(); ZEPHIR_SINIT_VAR(_1); zephir_bitwise_and_function(&_1, _0, severity TSRMLS_CC); @@ -19094,7 +19112,7 @@ static PHP_METHOD(Phalcon_Debug, onUncaughtLowSeverity) { object_init_ex(_2$$3, zephir_get_internal_ce(SS("errorexception") TSRMLS_CC)); ZEPHIR_INIT_VAR(_3$$3); ZVAL_LONG(_3$$3, 0); - ZEPHIR_CALL_METHOD(NULL, _2$$3, "__construct", NULL, 162, message, _3$$3, severity, file, line); + ZEPHIR_CALL_METHOD(NULL, _2$$3, "__construct", NULL, 157, message, _3$$3, severity, file, line); zephir_check_call_status(); zephir_throw_exception_debug(_2$$3, "phalcon/debug.zep", 566 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -19119,7 +19137,7 @@ static PHP_METHOD(Phalcon_Debug, onUncaughtException) { - ZEPHIR_CALL_FUNCTION(&obLevel, "ob_get_level", NULL, 163); + ZEPHIR_CALL_FUNCTION(&obLevel, "ob_get_level", NULL, 158); zephir_check_call_status(); if (ZEPHIR_GT_LONG(obLevel, 0)) { ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 122); @@ -19186,7 +19204,7 @@ static PHP_METHOD(Phalcon_Debug, onUncaughtException) { ) { ZEPHIR_GET_HMKEY(n, _12$$5, _11$$5); ZEPHIR_GET_HVALUE(traceItem, _13$$5); - ZEPHIR_CALL_METHOD(&_14$$7, this_ptr, "showtraceitem", &_15, 164, n, traceItem); + ZEPHIR_CALL_METHOD(&_14$$7, this_ptr, "showtraceitem", &_15, 159, n, traceItem); zephir_check_call_status(); zephir_concat_self(&html, _14$$7 TSRMLS_CC); } @@ -19205,7 +19223,7 @@ static PHP_METHOD(Phalcon_Debug, onUncaughtException) { ZEPHIR_CONCAT_SVSVS(_19$$9, ""); zephir_concat_self(&html, _19$$9 TSRMLS_CC); } else { - ZEPHIR_CALL_FUNCTION(&_20$$10, "print_r", &_21, 165, value, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(&_20$$10, "print_r", &_21, 160, value, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_22$$10); ZEPHIR_CONCAT_SVSVS(_22$$10, ""); @@ -19231,7 +19249,7 @@ static PHP_METHOD(Phalcon_Debug, onUncaughtException) { zephir_concat_self_str(&html, SL("
Memory
Usage", _34$$5, "
", keyRequest, "", value, "
", keyRequest, "", _20$$10, "
") TSRMLS_CC); zephir_concat_self_str(&html, SL("
") TSRMLS_CC); zephir_concat_self_str(&html, SL("") TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_29$$5, "get_included_files", NULL, 166); + ZEPHIR_CALL_FUNCTION(&_29$$5, "get_included_files", NULL, 161); zephir_check_call_status(); zephir_is_iterable(_29$$5, &_31$$5, &_30$$5, 0, 0, "phalcon/debug.zep", 694); for ( @@ -19246,7 +19264,7 @@ static PHP_METHOD(Phalcon_Debug, onUncaughtException) { } zephir_concat_self_str(&html, SL("
#Path
") TSRMLS_CC); zephir_concat_self_str(&html, SL("
") TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_34$$5, "memory_get_usage", NULL, 167, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(&_34$$5, "memory_get_usage", NULL, 162, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); ZEPHIR_INIT_VAR(_35$$5); ZEPHIR_CONCAT_SVS(_35$$5, ""); @@ -20458,10 +20476,10 @@ static PHP_METHOD(Phalcon_Dispatcher, getReturnedValue) { static PHP_METHOD(Phalcon_Dispatcher, dispatch) { - zval *_49$$39 = NULL; - zval *value = NULL, *handler = NULL, *dependencyInjector = NULL, *namespaceName = NULL, *handlerName = NULL, *actionName = NULL, *params = NULL, *eventsManager = NULL, *actionSuffix = NULL, *handlerClass = NULL, *status = NULL, *actionMethod = NULL, *e = NULL, *_0, *_1$$3, *_2$$3, *_3$$4 = NULL, *_4$$4, *_5$$7 = NULL, *_6$$7 = NULL, *_10$$8 = NULL, *_11$$8 = NULL, *_13$$8, *_14$$6 = NULL, *_16$$12 = NULL, *_17$$12 = NULL, *_19$$13, *_22$$16 = NULL, *_23$$16 = NULL, *_25$$17, *_26$$19 = NULL, *_27$$19 = NULL, *_29$$20, *_30$$23 = NULL, *_31$$23 = NULL, *_33$$23, *_34$$22 = NULL, *_35$$22 = NULL, *_37$$26, *_38$$28 = NULL, *_39$$28 = NULL, *_41$$28, *_42$$31 = NULL, *_43$$31, *_44$$36 = NULL, *_45$$36 = NULL, *_47$$36, *_48$$39 = NULL, *_50$$40 = NULL, *_52$$41, *_53$$44 = NULL, *_54$$44 = NULL, *_56$$44, *_58$$47 = NULL, *_59$$47, *_60$$50; + zval *_30$$6 = NULL, *_50$$39 = NULL; + zval *value = NULL, *handler = NULL, *dependencyInjector = NULL, *namespaceName = NULL, *handlerName = NULL, *actionName = NULL, *params = NULL, *eventsManager = NULL, *actionSuffix = NULL, *handlerClass = NULL, *status = NULL, *actionMethod = NULL, *e = NULL, *_0, *_1$$3, *_2$$3, *_3$$4 = NULL, *_4$$4, *_5$$7 = NULL, *_6$$7 = NULL, *_10$$8 = NULL, *_11$$8 = NULL, *_13$$8, *_14$$6 = NULL, *_16$$12 = NULL, *_17$$12 = NULL, *_19$$13, *_22$$16 = NULL, *_23$$16 = NULL, *_25$$17, *_26$$19 = NULL, *_27$$19 = NULL, *_29$$20, *_31$$23 = NULL, *_32$$23 = NULL, *_34$$23, *_35$$22 = NULL, *_36$$22 = NULL, *_38$$26, *_39$$28 = NULL, *_40$$28 = NULL, *_42$$28, *_43$$31 = NULL, *_44$$31, *_45$$36 = NULL, *_46$$36 = NULL, *_48$$36, *_49$$39 = NULL, *_51$$40 = NULL, *_53$$41, *_54$$44 = NULL, *_55$$44 = NULL, *_57$$44, *_59$$47 = NULL, *_60$$47, *_61$$50; zend_bool hasService = 0, wasFresh; - zephir_fcall_cache_entry *_7 = NULL, *_8 = NULL, *_9 = NULL, *_12 = NULL, *_15 = NULL, *_18 = NULL, *_20 = NULL, *_21 = NULL, *_24 = NULL, *_28 = NULL, *_32 = NULL, *_36 = NULL, *_40 = NULL, *_46 = NULL, *_51 = NULL, *_55 = NULL, *_57 = NULL; + zephir_fcall_cache_entry *_7 = NULL, *_8 = NULL, *_9 = NULL, *_12 = NULL, *_15 = NULL, *_18 = NULL, *_20 = NULL, *_21 = NULL, *_24 = NULL, *_28 = NULL, *_33 = NULL, *_37 = NULL, *_41 = NULL, *_47 = NULL, *_52 = NULL, *_56 = NULL, *_58 = NULL; int ZEPHIR_LAST_CALL_STATUS, numberDispatches = 0; ZEPHIR_MM_GROW(); @@ -20613,57 +20631,61 @@ static PHP_METHOD(Phalcon_Dispatcher, dispatch) { } ZEPHIR_INIT_NVAR(actionMethod); ZEPHIR_CONCAT_VV(actionMethod, actionName, actionSuffix); - if (!((zephir_method_exists(handler, actionMethod TSRMLS_CC) == SUCCESS))) { + ZEPHIR_INIT_NVAR(_30$$6); + zephir_create_array(_30$$6, 2, 0 TSRMLS_CC); + zephir_array_fast_append(_30$$6, handler); + zephir_array_fast_append(_30$$6, actionMethod); + if (!(zephir_is_callable(_30$$6 TSRMLS_CC))) { if (Z_TYPE_P(eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_NVAR(_31$$23); - ZVAL_STRING(_31$$23, "dispatch:beforeNotFoundAction", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(&_30$$23, eventsManager, "fire", &_32, 0, _31$$23, this_ptr); - zephir_check_temp_parameter(_31$$23); + ZEPHIR_INIT_NVAR(_32$$23); + ZVAL_STRING(_32$$23, "dispatch:beforeNotFoundAction", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(&_31$$23, eventsManager, "fire", &_33, 0, _32$$23, this_ptr); + zephir_check_temp_parameter(_32$$23); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(_30$$23)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(_31$$23)) { continue; } - _33$$23 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); - if (ZEPHIR_IS_FALSE_IDENTICAL(_33$$23)) { + _34$$23 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); + if (ZEPHIR_IS_FALSE_IDENTICAL(_34$$23)) { continue; } } - ZEPHIR_INIT_LNVAR(_34$$22); - ZEPHIR_CONCAT_SVSVS(_34$$22, "Action '", actionName, "' was not found on handler '", handlerName, "'"); - ZEPHIR_INIT_NVAR(_35$$22); - ZVAL_LONG(_35$$22, 5); - ZEPHIR_CALL_METHOD(&status, this_ptr, "_throwdispatchexception", &_36, 0, _34$$22, _35$$22); + ZEPHIR_INIT_LNVAR(_35$$22); + ZEPHIR_CONCAT_SVSVS(_35$$22, "Action '", actionName, "' was not found on handler '", handlerName, "'"); + ZEPHIR_INIT_NVAR(_36$$22); + ZVAL_LONG(_36$$22, 5); + ZEPHIR_CALL_METHOD(&status, this_ptr, "_throwdispatchexception", &_37, 0, _35$$22, _36$$22); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(status)) { - _37$$26 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); - if (ZEPHIR_IS_FALSE_IDENTICAL(_37$$26)) { + _38$$26 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); + if (ZEPHIR_IS_FALSE_IDENTICAL(_38$$26)) { continue; } } break; } if (Z_TYPE_P(eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_NVAR(_39$$28); - ZVAL_STRING(_39$$28, "dispatch:beforeExecuteRoute", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(&_38$$28, eventsManager, "fire", &_40, 0, _39$$28, this_ptr); - zephir_check_temp_parameter(_39$$28); + ZEPHIR_INIT_NVAR(_40$$28); + ZVAL_STRING(_40$$28, "dispatch:beforeExecuteRoute", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(&_39$$28, eventsManager, "fire", &_41, 0, _40$$28, this_ptr); + zephir_check_temp_parameter(_40$$28); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(_38$$28)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(_39$$28)) { continue; } - _41$$28 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); - if (ZEPHIR_IS_FALSE_IDENTICAL(_41$$28)) { + _42$$28 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); + if (ZEPHIR_IS_FALSE_IDENTICAL(_42$$28)) { continue; } } if ((zephir_method_exists_ex(handler, SS("beforeexecuteroute") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_CALL_METHOD(&_42$$31, handler, "beforeexecuteroute", NULL, 0, this_ptr); + ZEPHIR_CALL_METHOD(&_43$$31, handler, "beforeexecuteroute", NULL, 0, this_ptr); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(_42$$31)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(_43$$31)) { continue; } - _43$$31 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); - if (ZEPHIR_IS_FALSE_IDENTICAL(_43$$31)) { + _44$$31 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); + if (ZEPHIR_IS_FALSE_IDENTICAL(_44$$31)) { continue; } } @@ -20673,32 +20695,32 @@ static PHP_METHOD(Phalcon_Dispatcher, dispatch) { zephir_check_call_status(); } if (zephir_is_true(eventsManager)) { - ZEPHIR_INIT_NVAR(_45$$36); - ZVAL_STRING(_45$$36, "dispatch:afterInitialize", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(&_44$$36, eventsManager, "fire", &_46, 0, _45$$36, this_ptr); - zephir_check_temp_parameter(_45$$36); + ZEPHIR_INIT_NVAR(_46$$36); + ZVAL_STRING(_46$$36, "dispatch:afterInitialize", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(&_45$$36, eventsManager, "fire", &_47, 0, _46$$36, this_ptr); + zephir_check_temp_parameter(_46$$36); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(_44$$36)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(_45$$36)) { continue; } - _47$$36 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); - if (ZEPHIR_IS_FALSE_IDENTICAL(_47$$36)) { + _48$$36 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); + if (ZEPHIR_IS_FALSE_IDENTICAL(_48$$36)) { continue; } } } + zephir_update_property_this(this_ptr, SL("_lastHandler"), handler TSRMLS_CC); /* try_start_1: */ - ZEPHIR_INIT_NVAR(_48$$39); ZEPHIR_INIT_NVAR(_49$$39); - zephir_create_array(_49$$39, 2, 0 TSRMLS_CC); - zephir_array_fast_append(_49$$39, handler); - zephir_array_fast_append(_49$$39, actionMethod); - ZEPHIR_CALL_USER_FUNC_ARRAY(_48$$39, _49$$39, params); + ZEPHIR_INIT_NVAR(_50$$39); + zephir_create_array(_50$$39, 2, 0 TSRMLS_CC); + zephir_array_fast_append(_50$$39, handler); + zephir_array_fast_append(_50$$39, actionMethod); + ZEPHIR_CALL_USER_FUNC_ARRAY(_49$$39, _50$$39, params); zephir_check_call_status_or_jump(try_end_1); - zephir_update_property_this(this_ptr, SL("_returnedValue"), _48$$39 TSRMLS_CC); - zephir_update_property_this(this_ptr, SL("_lastHandler"), handler TSRMLS_CC); + zephir_update_property_this(this_ptr, SL("_returnedValue"), _49$$39 TSRMLS_CC); try_end_1: @@ -20706,56 +20728,57 @@ static PHP_METHOD(Phalcon_Dispatcher, dispatch) { ZEPHIR_CPY_WRT(e, EG(exception)); if (zephir_instance_of_ev(e, zend_exception_get_default(TSRMLS_C) TSRMLS_CC)) { zend_clear_exception(TSRMLS_C); - ZEPHIR_CALL_METHOD(&_50$$40, this_ptr, "_handleexception", &_51, 0, e); + zephir_update_property_this(this_ptr, SL("_lastHandler"), handler TSRMLS_CC); + ZEPHIR_CALL_METHOD(&_51$$40, this_ptr, "_handleexception", &_52, 0, e); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(_50$$40)) { - _52$$41 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); - if (ZEPHIR_IS_FALSE_IDENTICAL(_52$$41)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(_51$$40)) { + _53$$41 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); + if (ZEPHIR_IS_FALSE_IDENTICAL(_53$$41)) { continue; } } else { - zephir_throw_exception_debug(e, "phalcon/dispatcher.zep", 518 TSRMLS_CC); + zephir_throw_exception_debug(e, "phalcon/dispatcher.zep", 522 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } } } if (Z_TYPE_P(eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_NVAR(_54$$44); - ZVAL_STRING(_54$$44, "dispatch:afterExecuteRoute", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(&_53$$44, eventsManager, "fire", &_55, 0, _54$$44, this_ptr, value); - zephir_check_temp_parameter(_54$$44); + ZEPHIR_INIT_NVAR(_55$$44); + ZVAL_STRING(_55$$44, "dispatch:afterExecuteRoute", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(&_54$$44, eventsManager, "fire", &_56, 0, _55$$44, this_ptr, value); + zephir_check_temp_parameter(_55$$44); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(_53$$44)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(_54$$44)) { continue; } - _56$$44 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); - if (ZEPHIR_IS_FALSE_IDENTICAL(_56$$44)) { + _57$$44 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); + if (ZEPHIR_IS_FALSE_IDENTICAL(_57$$44)) { continue; } - ZEPHIR_INIT_NVAR(_54$$44); - ZVAL_STRING(_54$$44, "dispatch:afterDispatch", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, eventsManager, "fire", &_57, 0, _54$$44, this_ptr); - zephir_check_temp_parameter(_54$$44); + ZEPHIR_INIT_NVAR(_55$$44); + ZVAL_STRING(_55$$44, "dispatch:afterDispatch", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(NULL, eventsManager, "fire", &_58, 0, _55$$44, this_ptr); + zephir_check_temp_parameter(_55$$44); zephir_check_call_status(); } if ((zephir_method_exists_ex(handler, SS("afterexecuteroute") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_CALL_METHOD(&_58$$47, handler, "afterexecuteroute", NULL, 0, this_ptr, value); + ZEPHIR_CALL_METHOD(&_59$$47, handler, "afterexecuteroute", NULL, 0, this_ptr, value); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(_58$$47)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(_59$$47)) { continue; } - _59$$47 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); - if (ZEPHIR_IS_FALSE_IDENTICAL(_59$$47)) { + _60$$47 = zephir_fetch_nproperty_this(this_ptr, SL("_finished"), PH_NOISY_CC); + if (ZEPHIR_IS_FALSE_IDENTICAL(_60$$47)) { continue; } } } if (Z_TYPE_P(eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_VAR(_60$$50); - ZVAL_STRING(_60$$50, "dispatch:afterDispatchLoop", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, eventsManager, "fire", NULL, 0, _60$$50, this_ptr); - zephir_check_temp_parameter(_60$$50); + ZEPHIR_INIT_VAR(_61$$50); + ZVAL_STRING(_61$$50, "dispatch:afterDispatchLoop", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(NULL, eventsManager, "fire", NULL, 0, _61$$50, this_ptr); + zephir_check_temp_parameter(_61$$50); zephir_check_call_status(); } RETURN_CCTOR(handler); @@ -20839,9 +20862,9 @@ static PHP_METHOD(Phalcon_Dispatcher, getHandlerClass) { zephir_read_property_this(&handlerName, this_ptr, SL("_handlerName"), PH_NOISY_CC); ZEPHIR_OBS_VAR(namespaceName); zephir_read_property_this(&namespaceName, this_ptr, SL("_namespaceName"), PH_NOISY_CC); - if (!(zephir_memnstr_str(handlerName, SL("\\"), "phalcon/dispatcher.zep", 631))) { + if (!(zephir_memnstr_str(handlerName, SL("\\"), "phalcon/dispatcher.zep", 635))) { ZEPHIR_INIT_VAR(camelizedClass); - zephir_camelize(camelizedClass, handlerName); + zephir_camelize(camelizedClass, handlerName, NULL ); } else { ZEPHIR_CPY_WRT(camelizedClass, handlerName); } @@ -21046,13 +21069,13 @@ static PHP_METHOD(Phalcon_Escaper, detectEncoding) { ; zephir_hash_move_forward_ex(_3, &_2) ) { ZEPHIR_GET_HVALUE(charset, _4); - ZEPHIR_CALL_FUNCTION(&_5$$5, "mb_detect_encoding", &_6, 180, str, charset, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(&_5$$5, "mb_detect_encoding", &_6, 175, str, charset, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); if (zephir_is_true(_5$$5)) { RETURN_CCTOR(charset); } } - ZEPHIR_RETURN_CALL_FUNCTION("mb_detect_encoding", &_6, 180, str); + ZEPHIR_RETURN_CALL_FUNCTION("mb_detect_encoding", &_6, 175, str); zephir_check_call_status(); RETURN_MM(); @@ -21074,11 +21097,11 @@ static PHP_METHOD(Phalcon_Escaper, normalizeEncoding) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_escaper_exception_ce, "Extension 'mbstring' is required", "phalcon/escaper.zep", 128); return; } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "detectencoding", NULL, 181, str); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "detectencoding", NULL, 176, str); zephir_check_call_status(); ZEPHIR_SINIT_VAR(_1); ZVAL_STRING(&_1, "UTF-32", 0); - ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 182, str, &_1, _0); + ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 177, str, &_1, _0); zephir_check_call_status(); RETURN_MM(); @@ -21098,7 +21121,7 @@ static PHP_METHOD(Phalcon_Escaper, escapeHtml) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_htmlQuoteType"), PH_NOISY_CC); _1 = zephir_fetch_nproperty_this(this_ptr, SL("_encoding"), PH_NOISY_CC); - ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 183, text, _0, _1); + ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 178, text, _0, _1); zephir_check_call_status(); RETURN_MM(); @@ -21119,7 +21142,7 @@ static PHP_METHOD(Phalcon_Escaper, escapeHtmlAttr) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_encoding"), PH_NOISY_CC); ZEPHIR_SINIT_VAR(_1); ZVAL_LONG(&_1, 3); - ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 183, attribute, &_1, _0); + ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 178, attribute, &_1, _0); zephir_check_call_status(); RETURN_MM(); @@ -21137,7 +21160,7 @@ static PHP_METHOD(Phalcon_Escaper, escapeCss) { zephir_get_strval(css, css_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 184, css); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 179, css); zephir_check_call_status(); zephir_escape_css(return_value, _0); RETURN_MM(); @@ -21156,7 +21179,7 @@ static PHP_METHOD(Phalcon_Escaper, escapeJs) { zephir_get_strval(js, js_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 184, js); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 179, js); zephir_check_call_status(); zephir_escape_js(return_value, _0); RETURN_MM(); @@ -21175,7 +21198,7 @@ static PHP_METHOD(Phalcon_Escaper, escapeUrl) { zephir_get_strval(url, url_param); - ZEPHIR_RETURN_CALL_FUNCTION("rawurlencode", NULL, 185, url); + ZEPHIR_RETURN_CALL_FUNCTION("rawurlencode", NULL, 180, url); zephir_check_call_status(); RETURN_MM(); @@ -21452,16 +21475,16 @@ static PHP_METHOD(Phalcon_Filter, _sanitize) { if (ZEPHIR_IS_STRING(filter, "email")) { ZEPHIR_SINIT_VAR(_3$$5); ZVAL_STRING(&_3$$5, "FILTER_SANITIZE_EMAIL", 0); - ZEPHIR_CALL_FUNCTION(&_4$$5, "constant", NULL, 192, &_3$$5); + ZEPHIR_CALL_FUNCTION(&_4$$5, "constant", NULL, 187, &_3$$5); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", &_5, 193, value, _4$$5); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", &_5, 188, value, _4$$5); zephir_check_call_status(); RETURN_MM(); } if (ZEPHIR_IS_STRING(filter, "int")) { ZEPHIR_SINIT_VAR(_6$$6); ZVAL_LONG(&_6$$6, 519); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", &_5, 193, value, &_6$$6); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", &_5, 188, value, &_6$$6); zephir_check_call_status(); RETURN_MM(); } @@ -21471,14 +21494,14 @@ static PHP_METHOD(Phalcon_Filter, _sanitize) { if (ZEPHIR_IS_STRING(filter, "absint")) { ZEPHIR_SINIT_VAR(_7$$8); ZVAL_LONG(&_7$$8, zephir_get_intval(value)); - ZEPHIR_RETURN_CALL_FUNCTION("abs", NULL, 194, &_7$$8); + ZEPHIR_RETURN_CALL_FUNCTION("abs", NULL, 189, &_7$$8); zephir_check_call_status(); RETURN_MM(); } if (ZEPHIR_IS_STRING(filter, "string")) { ZEPHIR_SINIT_VAR(_8$$9); ZVAL_LONG(&_8$$9, 513); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", &_5, 193, value, &_8$$9); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", &_5, 188, value, &_8$$9); zephir_check_call_status(); RETURN_MM(); } @@ -21488,7 +21511,7 @@ static PHP_METHOD(Phalcon_Filter, _sanitize) { add_assoc_long_ex(_9$$10, SS("flags"), 4096); ZEPHIR_SINIT_VAR(_10$$10); ZVAL_LONG(&_10$$10, 520); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", &_5, 193, value, &_10$$10, _9$$10); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", &_5, 188, value, &_10$$10, _9$$10); zephir_check_call_status(); RETURN_MM(); } @@ -21511,13 +21534,13 @@ static PHP_METHOD(Phalcon_Filter, _sanitize) { RETURN_MM(); } if (ZEPHIR_IS_STRING(filter, "striptags")) { - ZEPHIR_RETURN_CALL_FUNCTION("strip_tags", NULL, 195, value); + ZEPHIR_RETURN_CALL_FUNCTION("strip_tags", NULL, 190, value); zephir_check_call_status(); RETURN_MM(); } if (ZEPHIR_IS_STRING(filter, "lower")) { if ((zephir_function_exists_ex(SS("mb_strtolower") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("mb_strtolower", NULL, 196, value); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strtolower", NULL, 191, value); zephir_check_call_status(); RETURN_MM(); } @@ -21526,7 +21549,7 @@ static PHP_METHOD(Phalcon_Filter, _sanitize) { } if (ZEPHIR_IS_STRING(filter, "upper")) { if ((zephir_function_exists_ex(SS("mb_strtoupper") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("mb_strtoupper", NULL, 197, value); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strtoupper", NULL, 192, value); zephir_check_call_status(); RETURN_MM(); } @@ -22315,7 +22338,7 @@ static PHP_METHOD(Phalcon_Loader, register) { ZEPHIR_INIT_VAR(_2$$3); ZVAL_STRING(_2$$3, "autoLoad", 1); zephir_array_fast_append(_1$$3, _2$$3); - ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_register", NULL, 287, _1$$3); + ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_register", NULL, 282, _1$$3); zephir_check_call_status(); if (1) { zephir_update_property_this(this_ptr, SL("_registered"), ZEPHIR_GLOBAL(global_true) TSRMLS_CC); @@ -22343,7 +22366,7 @@ static PHP_METHOD(Phalcon_Loader, unregister) { ZEPHIR_INIT_VAR(_2$$3); ZVAL_STRING(_2$$3, "autoLoad", 1); zephir_array_fast_append(_1$$3, _2$$3); - ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_unregister", NULL, 288, _1$$3); + ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_unregister", NULL, 283, _1$$3); zephir_check_call_status(); if (0) { zephir_update_property_this(this_ptr, SL("_registered"), ZEPHIR_GLOBAL(global_true) TSRMLS_CC); @@ -22454,7 +22477,7 @@ static PHP_METHOD(Phalcon_Loader, autoLoad) { zephir_check_temp_parameter(_12$$12); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_14$$11, "is_file", &_15, 289, filePath); + ZEPHIR_CALL_FUNCTION(&_14$$11, "is_file", &_15, 284, filePath); zephir_check_call_status(); if (zephir_is_true(_14$$11)) { if (Z_TYPE_P(eventsManager) == IS_OBJECT) { @@ -22525,7 +22548,7 @@ static PHP_METHOD(Phalcon_Loader, autoLoad) { zephir_check_temp_parameter(_31$$20); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_33$$19, "is_file", &_15, 289, filePath); + ZEPHIR_CALL_FUNCTION(&_33$$19, "is_file", &_15, 284, filePath); zephir_check_call_status(); if (zephir_is_true(_33$$19)) { if (Z_TYPE_P(eventsManager) == IS_OBJECT) { @@ -22583,7 +22606,7 @@ static PHP_METHOD(Phalcon_Loader, autoLoad) { zephir_check_temp_parameter(_45$$26); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_47$$25, "is_file", &_15, 289, filePath); + ZEPHIR_CALL_FUNCTION(&_47$$25, "is_file", &_15, 284, filePath); zephir_check_call_status(); if (zephir_is_true(_47$$25)) { if (Z_TYPE_P(eventsManager) == IS_OBJECT) { @@ -22834,7 +22857,7 @@ static PHP_METHOD(Phalcon_Registry, next) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_data"), PH_NOISY_CC); ZEPHIR_MAKE_REF(_0); - ZEPHIR_CALL_FUNCTION(NULL, "next", NULL, 391, _0); + ZEPHIR_CALL_FUNCTION(NULL, "next", NULL, 388, _0); ZEPHIR_UNREF(_0); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -22850,7 +22873,7 @@ static PHP_METHOD(Phalcon_Registry, key) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_data"), PH_NOISY_CC); ZEPHIR_MAKE_REF(_0); - ZEPHIR_RETURN_CALL_FUNCTION("key", NULL, 392, _0); + ZEPHIR_RETURN_CALL_FUNCTION("key", NULL, 389, _0); ZEPHIR_UNREF(_0); zephir_check_call_status(); RETURN_MM(); @@ -22866,7 +22889,7 @@ static PHP_METHOD(Phalcon_Registry, rewind) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_data"), PH_NOISY_CC); ZEPHIR_MAKE_REF(_0); - ZEPHIR_CALL_FUNCTION(NULL, "reset", NULL, 393, _0); + ZEPHIR_CALL_FUNCTION(NULL, "reset", NULL, 390, _0); ZEPHIR_UNREF(_0); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -22882,7 +22905,7 @@ static PHP_METHOD(Phalcon_Registry, valid) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_data"), PH_NOISY_CC); ZEPHIR_MAKE_REF(_0); - ZEPHIR_CALL_FUNCTION(&_1, "key", NULL, 392, _0); + ZEPHIR_CALL_FUNCTION(&_1, "key", NULL, 389, _0); ZEPHIR_UNREF(_0); zephir_check_call_status(); RETURN_MM_BOOL(Z_TYPE_P(_1) != IS_NULL); @@ -22898,7 +22921,7 @@ static PHP_METHOD(Phalcon_Registry, current) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_data"), PH_NOISY_CC); ZEPHIR_MAKE_REF(_0); - ZEPHIR_RETURN_CALL_FUNCTION("current", NULL, 394, _0); + ZEPHIR_RETURN_CALL_FUNCTION("current", NULL, 391, _0); ZEPHIR_UNREF(_0); zephir_check_call_status(); RETURN_MM(); @@ -22926,7 +22949,7 @@ static PHP_METHOD(Phalcon_Registry, __set) { } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "offsetset", NULL, 395, key, value); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "offsetset", NULL, 392, key, value); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -22953,7 +22976,7 @@ static PHP_METHOD(Phalcon_Registry, __get) { } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "offsetget", NULL, 396, key); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "offsetget", NULL, 393, key); zephir_check_call_status(); RETURN_MM(); @@ -22980,7 +23003,7 @@ static PHP_METHOD(Phalcon_Registry, __isset) { } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "offsetexists", NULL, 397, key); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "offsetexists", NULL, 394, key); zephir_check_call_status(); RETURN_MM(); @@ -23007,7 +23030,7 @@ static PHP_METHOD(Phalcon_Registry, __unset) { } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "offsetunset", NULL, 398, key); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "offsetunset", NULL, 395, key); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -23165,7 +23188,7 @@ static PHP_METHOD(Phalcon_Security, getSaltBytes) { ZEPHIR_INIT_NVAR(safeBytes); ZEPHIR_INIT_NVAR(_1$$5); ZVAL_LONG(_1$$5, numberBytes); - ZEPHIR_CALL_FUNCTION(&_2$$5, "openssl_random_pseudo_bytes", &_3, 399, _1$$5); + ZEPHIR_CALL_FUNCTION(&_2$$5, "openssl_random_pseudo_bytes", &_3, 396, _1$$5); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&_4$$5, "base64_encode", &_5, 116, _2$$5); zephir_check_call_status(); @@ -23257,7 +23280,7 @@ static PHP_METHOD(Phalcon_Security, hash) { } ZEPHIR_INIT_VAR(_5$$11); ZEPHIR_CONCAT_SVSV(_5$$11, "$", variant, "$", saltBytes); - ZEPHIR_RETURN_CALL_FUNCTION("crypt", &_6, 400, password, _5$$11); + ZEPHIR_RETURN_CALL_FUNCTION("crypt", &_6, 397, password, _5$$11); zephir_check_call_status(); RETURN_MM(); } @@ -23280,11 +23303,11 @@ static PHP_METHOD(Phalcon_Security, hash) { ZVAL_STRING(&_8$$13, "%02s", 0); ZEPHIR_SINIT_VAR(_9$$13); ZVAL_LONG(&_9$$13, workFactor); - ZEPHIR_CALL_FUNCTION(&_10$$13, "sprintf", NULL, 189, &_8$$13, &_9$$13); + ZEPHIR_CALL_FUNCTION(&_10$$13, "sprintf", NULL, 184, &_8$$13, &_9$$13); zephir_check_call_status(); ZEPHIR_INIT_VAR(_11$$13); ZEPHIR_CONCAT_SVSVSV(_11$$13, "$2", variant, "$", _10$$13, "$", saltBytes); - ZEPHIR_RETURN_CALL_FUNCTION("crypt", &_6, 400, password, _11$$13); + ZEPHIR_RETURN_CALL_FUNCTION("crypt", &_6, 397, password, _11$$13); zephir_check_call_status(); RETURN_MM(); } while(0); @@ -23324,7 +23347,7 @@ static PHP_METHOD(Phalcon_Security, checkHash) { RETURN_MM_BOOL(0); } } - ZEPHIR_CALL_FUNCTION(&_1, "crypt", NULL, 400, password, passwordHash); + ZEPHIR_CALL_FUNCTION(&_1, "crypt", NULL, 397, password, passwordHash); zephir_check_call_status(); zephir_get_strval(_2, _1); ZEPHIR_CPY_WRT(cryptedHash, _2); @@ -23388,7 +23411,7 @@ static PHP_METHOD(Phalcon_Security, getTokenKey) { ZEPHIR_INIT_VAR(safeBytes); ZEPHIR_INIT_VAR(_1); ZVAL_LONG(_1, numberBytes); - ZEPHIR_CALL_FUNCTION(&_2, "openssl_random_pseudo_bytes", NULL, 399, _1); + ZEPHIR_CALL_FUNCTION(&_2, "openssl_random_pseudo_bytes", NULL, 396, _1); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&_3, "base64_encode", NULL, 116, _2); zephir_check_call_status(); @@ -23430,7 +23453,7 @@ static PHP_METHOD(Phalcon_Security, getToken) { } ZEPHIR_INIT_VAR(_0); ZVAL_LONG(_0, numberBytes); - ZEPHIR_CALL_FUNCTION(&token, "openssl_random_pseudo_bytes", NULL, 399, _0); + ZEPHIR_CALL_FUNCTION(&token, "openssl_random_pseudo_bytes", NULL, 396, _0); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&_1, "base64_encode", NULL, 116, token); zephir_check_call_status(); @@ -23605,7 +23628,7 @@ static PHP_METHOD(Phalcon_Security, computeHmac) { ZEPHIR_SINIT_VAR(_0); ZVAL_BOOL(&_0, (raw ? 1 : 0)); - ZEPHIR_CALL_FUNCTION(&hmac, "hash_hmac", NULL, 401, algo, data, key, &_0); + ZEPHIR_CALL_FUNCTION(&hmac, "hash_hmac", NULL, 398, algo, data, key, &_0); zephir_check_call_status(); if (!(zephir_is_true(hmac))) { ZEPHIR_INIT_VAR(_1$$3); @@ -24393,7 +24416,7 @@ static PHP_METHOD(Phalcon_Tag, colorField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "color", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24413,7 +24436,7 @@ static PHP_METHOD(Phalcon_Tag, textField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "text", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24433,7 +24456,7 @@ static PHP_METHOD(Phalcon_Tag, numericField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "number", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24453,7 +24476,7 @@ static PHP_METHOD(Phalcon_Tag, rangeField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "range", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24473,7 +24496,7 @@ static PHP_METHOD(Phalcon_Tag, emailField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "email", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24493,7 +24516,7 @@ static PHP_METHOD(Phalcon_Tag, dateField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "date", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24513,7 +24536,7 @@ static PHP_METHOD(Phalcon_Tag, dateTimeField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "datetime", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24533,7 +24556,7 @@ static PHP_METHOD(Phalcon_Tag, dateTimeLocalField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "datetime-local", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24553,7 +24576,7 @@ static PHP_METHOD(Phalcon_Tag, monthField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "month", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24573,7 +24596,7 @@ static PHP_METHOD(Phalcon_Tag, timeField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "time", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24593,7 +24616,7 @@ static PHP_METHOD(Phalcon_Tag, weekField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "week", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24613,7 +24636,7 @@ static PHP_METHOD(Phalcon_Tag, passwordField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "password", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24633,7 +24656,7 @@ static PHP_METHOD(Phalcon_Tag, hiddenField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "hidden", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24653,7 +24676,7 @@ static PHP_METHOD(Phalcon_Tag, fileField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "file", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24673,7 +24696,7 @@ static PHP_METHOD(Phalcon_Tag, searchField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "search", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24693,7 +24716,7 @@ static PHP_METHOD(Phalcon_Tag, telField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "tel", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24713,7 +24736,7 @@ static PHP_METHOD(Phalcon_Tag, urlField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "url", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24733,7 +24756,7 @@ static PHP_METHOD(Phalcon_Tag, checkField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "checkbox", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfieldchecked", &_0, 414, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfieldchecked", &_0, 411, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24753,7 +24776,7 @@ static PHP_METHOD(Phalcon_Tag, radioField) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "radio", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_SELF("_inputfieldchecked", &_0, 414, _1, parameters); + ZEPHIR_RETURN_CALL_SELF("_inputfieldchecked", &_0, 411, _1, parameters); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24775,7 +24798,7 @@ static PHP_METHOD(Phalcon_Tag, imageInput) { ZVAL_STRING(_1, "image", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_INIT_VAR(_2); ZVAL_BOOL(_2, 1); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters, _2); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters, _2); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24797,7 +24820,7 @@ static PHP_METHOD(Phalcon_Tag, submitButton) { ZVAL_STRING(_1, "submit", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_INIT_VAR(_2); ZVAL_BOOL(_2, 1); - ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 413, _1, parameters, _2); + ZEPHIR_RETURN_CALL_SELF("_inputfield", &_0, 410, _1, parameters, _2); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -24818,7 +24841,7 @@ static PHP_METHOD(Phalcon_Tag, selectStatic) { } - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_select_ce, "selectfield", &_0, 208, parameters, data); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_select_ce, "selectfield", &_0, 203, parameters, data); zephir_check_call_status(); RETURN_MM(); @@ -24838,7 +24861,7 @@ static PHP_METHOD(Phalcon_Tag, select) { } - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_select_ce, "selectfield", &_0, 208, parameters, data); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_select_ce, "selectfield", &_0, 203, parameters, data); zephir_check_call_status(); RETURN_MM(); @@ -25359,13 +25382,13 @@ static PHP_METHOD(Phalcon_Tag, friendlyTitle) { ZVAL_LONG(&_3$$3, 0); ZEPHIR_SINIT_VAR(_4$$3); ZVAL_STRING(&_4$$3, "en_US.UTF-8", 0); - ZEPHIR_CALL_FUNCTION(&locale, "setlocale", &_5, 415, &_3$$3, &_4$$3); + ZEPHIR_CALL_FUNCTION(&locale, "setlocale", &_5, 412, &_3$$3, &_4$$3); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_3$$3); ZVAL_STRING(&_3$$3, "UTF-8", 0); ZEPHIR_SINIT_NVAR(_4$$3); ZVAL_STRING(&_4$$3, "ASCII//TRANSLIT", 0); - ZEPHIR_CALL_FUNCTION(&_6$$3, "iconv", NULL, 371, &_3$$3, &_4$$3, text); + ZEPHIR_CALL_FUNCTION(&_6$$3, "iconv", NULL, 369, &_3$$3, &_4$$3, text); zephir_check_call_status(); zephir_get_strval(text, _6$$3); } @@ -25428,7 +25451,7 @@ static PHP_METHOD(Phalcon_Tag, friendlyTitle) { if (zephir_is_true(_19)) { ZEPHIR_SINIT_VAR(_20$$10); ZVAL_LONG(&_20$$10, 0); - ZEPHIR_CALL_FUNCTION(NULL, "setlocale", &_5, 415, &_20$$10, locale); + ZEPHIR_CALL_FUNCTION(NULL, "setlocale", &_5, 412, &_20$$10, locale); zephir_check_call_status(); } RETURN_CCTOR(friendly); @@ -25700,7 +25723,7 @@ static PHP_METHOD(Phalcon_Text, camelize) { ZEPHIR_INIT_VAR(_0); - zephir_camelize(_0, str); + zephir_camelize(_0, str, NULL ); RETURN_CCTOR(_0); } @@ -25726,7 +25749,7 @@ static PHP_METHOD(Phalcon_Text, uncamelize) { ZEPHIR_INIT_VAR(_0); - zephir_uncamelize(_0, str); + zephir_uncamelize(_0, str, NULL ); RETURN_CCTOR(_0); } @@ -25794,13 +25817,13 @@ static PHP_METHOD(Phalcon_Text, random) { ZVAL_STRING(&_0$$3, "a", 0); ZEPHIR_SINIT_VAR(_1$$3); ZVAL_STRING(&_1$$3, "z", 0); - ZEPHIR_CALL_FUNCTION(&_2$$3, "range", &_3, 418, &_0$$3, &_1$$3); + ZEPHIR_CALL_FUNCTION(&_2$$3, "range", &_3, 415, &_0$$3, &_1$$3); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_0$$3); ZVAL_STRING(&_0$$3, "A", 0); ZEPHIR_SINIT_NVAR(_1$$3); ZVAL_STRING(&_1$$3, "Z", 0); - ZEPHIR_CALL_FUNCTION(&_4$$3, "range", &_3, 418, &_0$$3, &_1$$3); + ZEPHIR_CALL_FUNCTION(&_4$$3, "range", &_3, 415, &_0$$3, &_1$$3); zephir_check_call_status(); ZEPHIR_INIT_VAR(pool); zephir_fast_array_merge(pool, &(_2$$3), &(_4$$3) TSRMLS_CC); @@ -25811,13 +25834,13 @@ static PHP_METHOD(Phalcon_Text, random) { ZVAL_LONG(&_5$$4, 0); ZEPHIR_SINIT_VAR(_6$$4); ZVAL_LONG(&_6$$4, 9); - ZEPHIR_CALL_FUNCTION(&_7$$4, "range", &_3, 418, &_5$$4, &_6$$4); + ZEPHIR_CALL_FUNCTION(&_7$$4, "range", &_3, 415, &_5$$4, &_6$$4); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_5$$4); ZVAL_STRING(&_5$$4, "a", 0); ZEPHIR_SINIT_NVAR(_6$$4); ZVAL_STRING(&_6$$4, "f", 0); - ZEPHIR_CALL_FUNCTION(&_8$$4, "range", &_3, 418, &_5$$4, &_6$$4); + ZEPHIR_CALL_FUNCTION(&_8$$4, "range", &_3, 415, &_5$$4, &_6$$4); zephir_check_call_status(); ZEPHIR_INIT_NVAR(pool); zephir_fast_array_merge(pool, &(_7$$4), &(_8$$4) TSRMLS_CC); @@ -25828,7 +25851,7 @@ static PHP_METHOD(Phalcon_Text, random) { ZVAL_LONG(&_9$$5, 0); ZEPHIR_SINIT_VAR(_10$$5); ZVAL_LONG(&_10$$5, 9); - ZEPHIR_CALL_FUNCTION(&pool, "range", &_3, 418, &_9$$5, &_10$$5); + ZEPHIR_CALL_FUNCTION(&pool, "range", &_3, 415, &_9$$5, &_10$$5); zephir_check_call_status(); break; } @@ -25837,7 +25860,7 @@ static PHP_METHOD(Phalcon_Text, random) { ZVAL_LONG(&_11$$6, 1); ZEPHIR_SINIT_VAR(_12$$6); ZVAL_LONG(&_12$$6, 9); - ZEPHIR_CALL_FUNCTION(&pool, "range", &_3, 418, &_11$$6, &_12$$6); + ZEPHIR_CALL_FUNCTION(&pool, "range", &_3, 415, &_11$$6, &_12$$6); zephir_check_call_status(); break; } @@ -25845,21 +25868,21 @@ static PHP_METHOD(Phalcon_Text, random) { ZVAL_LONG(&_13$$7, 0); ZEPHIR_SINIT_VAR(_14$$7); ZVAL_LONG(&_14$$7, 9); - ZEPHIR_CALL_FUNCTION(&_15$$7, "range", &_3, 418, &_13$$7, &_14$$7); + ZEPHIR_CALL_FUNCTION(&_15$$7, "range", &_3, 415, &_13$$7, &_14$$7); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_13$$7); ZVAL_STRING(&_13$$7, "a", 0); ZEPHIR_SINIT_NVAR(_14$$7); ZVAL_STRING(&_14$$7, "z", 0); - ZEPHIR_CALL_FUNCTION(&_16$$7, "range", &_3, 418, &_13$$7, &_14$$7); + ZEPHIR_CALL_FUNCTION(&_16$$7, "range", &_3, 415, &_13$$7, &_14$$7); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_13$$7); ZVAL_STRING(&_13$$7, "A", 0); ZEPHIR_SINIT_NVAR(_14$$7); ZVAL_STRING(&_14$$7, "Z", 0); - ZEPHIR_CALL_FUNCTION(&_17$$7, "range", &_3, 418, &_13$$7, &_14$$7); + ZEPHIR_CALL_FUNCTION(&_17$$7, "range", &_3, 415, &_13$$7, &_14$$7); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&pool, "array_merge", &_18, 419, _15$$7, _16$$7, _17$$7); + ZEPHIR_CALL_FUNCTION(&pool, "array_merge", &_18, 416, _15$$7, _16$$7, _17$$7); zephir_check_call_status(); break; } while(0); @@ -25965,7 +25988,7 @@ static PHP_METHOD(Phalcon_Text, lower) { if ((zephir_function_exists_ex(SS("mb_strtolower") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("mb_strtolower", NULL, 196, str, encoding); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strtolower", NULL, 191, str, encoding); zephir_check_call_status(); RETURN_MM(); } @@ -26011,7 +26034,7 @@ static PHP_METHOD(Phalcon_Text, upper) { if ((zephir_function_exists_ex(SS("mb_strtoupper") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("mb_strtoupper", NULL, 197, str, encoding); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strtoupper", NULL, 192, str, encoding); zephir_check_call_status(); RETURN_MM(); } @@ -26056,24 +26079,24 @@ static PHP_METHOD(Phalcon_Text, concat) { ZEPHIR_SINIT_VAR(_0); ZVAL_LONG(&_0, 0); - ZEPHIR_CALL_FUNCTION(&separator, "func_get_arg", &_1, 420, &_0); + ZEPHIR_CALL_FUNCTION(&separator, "func_get_arg", &_1, 417, &_0); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_0); ZVAL_LONG(&_0, 1); - ZEPHIR_CALL_FUNCTION(&a, "func_get_arg", &_1, 420, &_0); + ZEPHIR_CALL_FUNCTION(&a, "func_get_arg", &_1, 417, &_0); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_0); ZVAL_LONG(&_0, 2); - ZEPHIR_CALL_FUNCTION(&b, "func_get_arg", &_1, 420, &_0); + ZEPHIR_CALL_FUNCTION(&b, "func_get_arg", &_1, 417, &_0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_2, "func_num_args", NULL, 421); + ZEPHIR_CALL_FUNCTION(&_2, "func_num_args", NULL, 418); zephir_check_call_status(); if (ZEPHIR_GT_LONG(_2, 3)) { - ZEPHIR_CALL_FUNCTION(&_3$$3, "func_get_args", NULL, 168); + ZEPHIR_CALL_FUNCTION(&_3$$3, "func_get_args", NULL, 163); zephir_check_call_status(); ZEPHIR_SINIT_VAR(_4$$3); ZVAL_LONG(&_4$$3, 3); - ZEPHIR_CALL_FUNCTION(&_5$$3, "array_slice", NULL, 372, _3$$3, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "array_slice", NULL, 370, _3$$3, &_4$$3); zephir_check_call_status(); zephir_is_iterable(_5$$3, &_7$$3, &_6$$3, 0, 0, "phalcon/text.zep", 242); for ( @@ -26166,24 +26189,24 @@ static PHP_METHOD(Phalcon_Text, dynamic) { } - ZEPHIR_CALL_FUNCTION(&_0, "substr_count", &_1, 422, text, leftDelimiter); + ZEPHIR_CALL_FUNCTION(&_0, "substr_count", &_1, 419, text, leftDelimiter); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_2, "substr_count", &_1, 422, text, rightDelimiter); + ZEPHIR_CALL_FUNCTION(&_2, "substr_count", &_1, 419, text, rightDelimiter); zephir_check_call_status(); if (!ZEPHIR_IS_IDENTICAL(_0, _2)) { ZEPHIR_INIT_VAR(_3$$3); object_init_ex(_3$$3, spl_ce_RuntimeException); ZEPHIR_INIT_VAR(_4$$3); ZEPHIR_CONCAT_SVS(_4$$3, "Syntax error in string \"", text, "\""); - ZEPHIR_CALL_METHOD(NULL, _3$$3, "__construct", NULL, 423, _4$$3); + ZEPHIR_CALL_METHOD(NULL, _3$$3, "__construct", NULL, 420, _4$$3); zephir_check_call_status(); zephir_throw_exception_debug(_3$$3, "phalcon/text.zep", 261 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_FUNCTION(&ldS, "preg_quote", &_5, 424, leftDelimiter); + ZEPHIR_CALL_FUNCTION(&ldS, "preg_quote", &_5, 421, leftDelimiter); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&rdS, "preg_quote", &_5, 424, rightDelimiter); + ZEPHIR_CALL_FUNCTION(&rdS, "preg_quote", &_5, 421, rightDelimiter); zephir_check_call_status(); ZEPHIR_INIT_VAR(pattern); ZEPHIR_CONCAT_SVSVVSVS(pattern, "/", ldS, "([^", ldS, rdS, "]+)", rdS, "/"); @@ -26195,7 +26218,7 @@ static PHP_METHOD(Phalcon_Text, dynamic) { ZEPHIR_INIT_NVAR(_6$$4); ZEPHIR_INIT_NVAR(_6$$4); zephir_create_closure_ex(_6$$4, NULL, phalcon_0__closure_ce, SS("__invoke") TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_7$$4, "preg_replace_callback", &_8, 425, pattern, _6$$4, result); + ZEPHIR_CALL_FUNCTION(&_7$$4, "preg_replace_callback", &_8, 422, pattern, _6$$4, result); zephir_check_call_status(); ZEPHIR_CPY_WRT(result, _7$$4); } @@ -26618,7 +26641,7 @@ static PHP_METHOD(Phalcon_Validation, setDefaultMessages) { ZEPHIR_INIT_VAR(defaultMessages); - zephir_create_array(defaultMessages, 24, 0 TSRMLS_CC); + zephir_create_array(defaultMessages, 25, 0 TSRMLS_CC); add_assoc_stringl_ex(defaultMessages, SS("Alnum"), SL("Field :field must contain only letters and numbers"), 1); add_assoc_stringl_ex(defaultMessages, SS("Alpha"), SL("Field :field must contain only letters"), 1); add_assoc_stringl_ex(defaultMessages, SS("Between"), SL("Field :field must be within the range of :min to :max"), 1); @@ -26643,6 +26666,7 @@ static PHP_METHOD(Phalcon_Validation, setDefaultMessages) { add_assoc_stringl_ex(defaultMessages, SS("Uniqueness"), SL("Field :field must be unique"), 1); add_assoc_stringl_ex(defaultMessages, SS("Url"), SL("Field :field must be a url"), 1); add_assoc_stringl_ex(defaultMessages, SS("CreditCard"), SL("Field :field is not valid for a credit card number"), 1); + add_assoc_stringl_ex(defaultMessages, SS("Date"), SL("Field :field is not a valid date"), 1); ZEPHIR_INIT_VAR(_0); zephir_fast_array_merge(_0, &(defaultMessages), &(messages) TSRMLS_CC); zephir_update_property_this(this_ptr, SL("_defaultMessages"), _0 TSRMLS_CC); @@ -26675,7 +26699,7 @@ static PHP_METHOD(Phalcon_Validation, getDefaultMessage) { RETURN_MM_STRING("", 1); } _1 = zephir_fetch_nproperty_this(this_ptr, SL("_defaultMessages"), PH_NOISY_CC); - zephir_array_fetch(&_2, _1, type, PH_NOISY | PH_READONLY, "phalcon/validation.zep", 279 TSRMLS_CC); + zephir_array_fetch(&_2, _1, type, PH_NOISY | PH_READONLY, "phalcon/validation.zep", 280 TSRMLS_CC); RETURN_CTOR(_2); } @@ -26759,7 +26783,7 @@ static PHP_METHOD(Phalcon_Validation, bind) { if (Z_TYPE_P(entity) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_validation_exception_ce, "Entity must be an object", "phalcon/validation.zep", 336); + ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_validation_exception_ce, "Entity must be an object", "phalcon/validation.zep", 337); return; } _0 = Z_TYPE_P(data) != IS_ARRAY; @@ -26767,7 +26791,7 @@ static PHP_METHOD(Phalcon_Validation, bind) { _0 = Z_TYPE_P(data) != IS_OBJECT; } if (_0) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_validation_exception_ce, "Data to validate must be an array or object", "phalcon/validation.zep", 340); + ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_validation_exception_ce, "Data to validate must be an array or object", "phalcon/validation.zep", 341); return; } zephir_update_property_this(this_ptr, SL("_entity"), entity TSRMLS_CC); @@ -26821,7 +26845,7 @@ static PHP_METHOD(Phalcon_Validation, getValue) { _1 = Z_TYPE_P(data) != IS_OBJECT; } if (_1) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_validation_exception_ce, "There is no data to validate", "phalcon/validation.zep", 387); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_validation_exception_ce, "There is no data to validate", "phalcon/validation.zep", 388); return; } ZEPHIR_OBS_VAR(values); @@ -26835,7 +26859,7 @@ static PHP_METHOD(Phalcon_Validation, getValue) { if (Z_TYPE_P(data) == IS_ARRAY) { if (zephir_array_isset(data, field)) { ZEPHIR_OBS_NVAR(value); - zephir_array_fetch(&value, data, field, PH_NOISY, "phalcon/validation.zep", 401 TSRMLS_CC); + zephir_array_fetch(&value, data, field, PH_NOISY, "phalcon/validation.zep", 402 TSRMLS_CC); } } else if (Z_TYPE_P(data) == IS_OBJECT) { if (zephir_isset_property_zval(data, field TSRMLS_CC)) { @@ -26858,7 +26882,7 @@ static PHP_METHOD(Phalcon_Validation, getValue) { ZEPHIR_CALL_CE_STATIC(&dependencyInjector, phalcon_di_ce, "getdefault", &_2, 1); zephir_check_call_status(); if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_validation_exception_ce, "A dependency injector is required to obtain the 'filter' service", "phalcon/validation.zep", 424); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_validation_exception_ce, "A dependency injector is required to obtain the 'filter' service", "phalcon/validation.zep", 425); return; } } @@ -26868,7 +26892,7 @@ static PHP_METHOD(Phalcon_Validation, getValue) { zephir_check_temp_parameter(_3$$19); zephir_check_call_status(); if (Z_TYPE_P(filterService) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_validation_exception_ce, "Returned 'filter' service is invalid", "phalcon/validation.zep", 430); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_validation_exception_ce, "Returned 'filter' service is invalid", "phalcon/validation.zep", 431); return; } ZEPHIR_RETURN_CALL_METHOD(filterService, "sanitize", NULL, 0, value, fieldFilters); @@ -26928,7 +26952,7 @@ static PHP_METHOD(Phalcon_Version, _getVersion) { ZVAL_LONG(_0, 0); zephir_array_fast_append(return_value, _0); ZEPHIR_INIT_NVAR(_0); - ZVAL_LONG(_0, 10); + ZVAL_LONG(_0, 11); zephir_array_fast_append(return_value, _0); ZEPHIR_INIT_NVAR(_0); ZVAL_LONG(_0, 4); @@ -26997,7 +27021,7 @@ static PHP_METHOD(Phalcon_Version, get) { zephir_array_fetch_long(&specialNumber, version, 4, PH_NOISY, "phalcon/version.zep", 128 TSRMLS_CC); ZEPHIR_INIT_VAR(result); ZEPHIR_CONCAT_VSVSVS(result, major, ".", medium, ".", minor, " "); - ZEPHIR_CALL_STATIC(&suffix, "_getspecial", &_0, 446, special); + ZEPHIR_CALL_STATIC(&suffix, "_getspecial", &_0, 443, special); zephir_check_call_status(); if (!ZEPHIR_IS_STRING(suffix, "")) { ZEPHIR_INIT_VAR(_1$$3); @@ -27031,11 +27055,11 @@ static PHP_METHOD(Phalcon_Version, getId) { zephir_array_fetch_long(&specialNumber, version, 4, PH_NOISY, "phalcon/version.zep", 158 TSRMLS_CC); ZEPHIR_SINIT_VAR(_0); ZVAL_STRING(&_0, "%02s", 0); - ZEPHIR_CALL_FUNCTION(&_1, "sprintf", &_2, 189, &_0, medium); + ZEPHIR_CALL_FUNCTION(&_1, "sprintf", &_2, 184, &_0, medium); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_0); ZVAL_STRING(&_0, "%02s", 0); - ZEPHIR_CALL_FUNCTION(&_3, "sprintf", &_2, 189, &_0, minor); + ZEPHIR_CALL_FUNCTION(&_3, "sprintf", &_2, 184, &_0, minor); zephir_check_call_status(); ZEPHIR_CONCAT_VVVVV(return_value, major, _1, _3, special, specialNumber); RETURN_MM(); @@ -27064,7 +27088,7 @@ static PHP_METHOD(Phalcon_Version, getPart) { } if (part == 3) { zephir_array_fetch_long(&_1$$4, version, 3, PH_NOISY | PH_READONLY, "phalcon/version.zep", 187 TSRMLS_CC); - ZEPHIR_CALL_STATIC(&result, "_getspecial", &_0, 446, _1$$4); + ZEPHIR_CALL_STATIC(&result, "_getspecial", &_0, 443, _1$$4); zephir_check_call_status(); break; } @@ -32929,7 +32953,7 @@ static PHP_METHOD(Phalcon_Assets_Collection, addFilter) { } -static zend_object_value zephir_init_properties_Phalcon_Assets_Collection(zend_class_entry *class_type TSRMLS_DC) { +zend_object_value zephir_init_properties_Phalcon_Assets_Collection(zend_class_entry *class_type TSRMLS_DC) { zval *_0, *_2, *_4, *_6, *_1$$3, *_3$$4, *_5$$5, *_7$$6; @@ -38626,7 +38650,7 @@ static PHP_METHOD(Phalcon_Cache_Backend_Mongo, decrement) { static PHP_METHOD(Phalcon_Cache_Backend_Mongo, flush) { - zval *_0 = NULL, *_1 = NULL; + zval *_0 = NULL; int ZEPHIR_LAST_CALL_STATUS; ZEPHIR_MM_GROW(); @@ -38635,12 +38659,6 @@ static PHP_METHOD(Phalcon_Cache_Backend_Mongo, flush) { zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, _0, "remove", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "rand", NULL, 111); - zephir_check_call_status(); - if (zephir_safe_mod_long_long(zephir_get_intval(_1), 100 TSRMLS_CC) == 0) { - ZEPHIR_CALL_METHOD(NULL, this_ptr, "gc", NULL, 0); - zephir_check_call_status(); - } RETURN_MM_BOOL(1); } @@ -38737,8 +38755,10 @@ static PHP_METHOD(Phalcon_Cache_Backend_Redis, _connect) { zephir_read_property_this(&options, this_ptr, SL("_options"), PH_NOISY_CC); ZEPHIR_INIT_VAR(redis); object_init_ex(redis, zephir_get_internal_ce(SS("redis") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, redis, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(redis TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, redis, "__construct", NULL, 0); + zephir_check_call_status(); + } ZEPHIR_OBS_VAR(host); _0 = !(zephir_array_isset_string_fetch(&host, options, SS("host"), 0 TSRMLS_CC)); if (!(_0)) { @@ -42220,7 +42240,7 @@ static PHP_METHOD(Phalcon_Cli_Router_Route, reConfigure) { ZEPHIR_CPY_WRT(realClassName, taskName); } ZEPHIR_INIT_VAR(_1$$9); - zephir_uncamelize(_1$$9, realClassName); + zephir_uncamelize(_1$$9, realClassName, NULL ); zephir_array_update_string(&routePaths, SL("task"), &_1$$9, PH_COPY | PH_SEPARATE); } if (Z_TYPE_P(actionName) != IS_NULL) { @@ -45456,7 +45476,7 @@ static PHP_METHOD(Phalcon_Db_Column, __set_state) { zephir_array_update_string(&definition, SL("bindType"), &bindType, PH_COPY | PH_SEPARATE); } object_init_ex(return_value, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 142, columnName, definition); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 137, columnName, definition); zephir_check_call_status(); RETURN_MM(); @@ -47668,19 +47688,19 @@ static PHP_METHOD(Phalcon_Db_Profiler, startProfile) { ZEPHIR_CALL_METHOD(NULL, activeProfile, "__construct", NULL, 0); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, activeProfile, "setsqlstatement", NULL, 147, sqlStatement); + ZEPHIR_CALL_METHOD(NULL, activeProfile, "setsqlstatement", NULL, 142, sqlStatement); zephir_check_call_status(); if (Z_TYPE_P(sqlVariables) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(NULL, activeProfile, "setsqlvariables", NULL, 148, sqlVariables); + ZEPHIR_CALL_METHOD(NULL, activeProfile, "setsqlvariables", NULL, 143, sqlVariables); zephir_check_call_status(); } if (Z_TYPE_P(sqlBindTypes) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(NULL, activeProfile, "setsqlbindtypes", NULL, 149, sqlBindTypes); + ZEPHIR_CALL_METHOD(NULL, activeProfile, "setsqlbindtypes", NULL, 144, sqlBindTypes); zephir_check_call_status(); } ZEPHIR_INIT_VAR(_0); zephir_microtime(_0, ZEPHIR_GLOBAL(global_true) TSRMLS_CC); - ZEPHIR_CALL_METHOD(NULL, activeProfile, "setinitialtime", NULL, 150, _0); + ZEPHIR_CALL_METHOD(NULL, activeProfile, "setinitialtime", NULL, 145, _0); zephir_check_call_status(); if ((zephir_method_exists_ex(this_ptr, SS("beforestartprofile") TSRMLS_CC) == SUCCESS)) { ZEPHIR_CALL_METHOD(NULL, this_ptr, "beforestartprofile", NULL, 0, activeProfile); @@ -49063,9 +49083,9 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, escapeIdentifier) { if (Z_TYPE_P(identifier) == IS_ARRAY) { ZEPHIR_OBS_VAR(domain); - zephir_array_fetch_long(&domain, identifier, 0, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 71 TSRMLS_CC); + zephir_array_fetch_long(&domain, identifier, 0, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 72 TSRMLS_CC); ZEPHIR_OBS_VAR(name); - zephir_array_fetch_long(&name, identifier, 1, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 72 TSRMLS_CC); + zephir_array_fetch_long(&name, identifier, 1, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 73 TSRMLS_CC); if (ZEPHIR_GLOBAL(db).escape_identifiers) { ZEPHIR_CONCAT_SVSVS(return_value, "`", domain, "`.`", name, "`"); RETURN_MM(); @@ -49088,7 +49108,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { HashPosition _4; zephir_fcall_cache_entry *_41 = NULL; int ZEPHIR_LAST_CALL_STATUS; - zval *table_param = NULL, *schema_param = NULL, *columns = NULL, *columnType = NULL, *field = NULL, *definition = NULL, *oldColumn = NULL, *sizePattern = NULL, *matches = NULL, *matchOne = NULL, *matchTwo = NULL, *columnName = NULL, *_0 = NULL, *_1, *_2 = NULL, *_3, **_6, *_7$$5 = NULL, *_8$$5 = NULL, *_9$$6 = NULL, *_10$$6 = NULL, *_11$$7 = NULL, *_12$$8 = NULL, *_13$$9 = NULL, *_14$$10 = NULL, *_15$$11 = NULL, *_16$$12 = NULL, *_17$$13 = NULL, *_18$$14 = NULL, *_19$$14 = NULL, *_20$$15 = NULL, *_21$$15 = NULL, *_22$$16 = NULL, *_23$$16 = NULL, *_24$$17 = NULL, *_25$$17 = NULL, *_26$$18 = NULL, *_27$$18 = NULL, *_28$$19 = NULL, *_29$$20 = NULL, *_30$$21 = NULL, *_31$$4 = NULL, *_32$$22 = NULL, *_33$$24 = NULL, *_34$$25 = NULL, *_35$$3, *_36$$3, *_37$$3, *_38$$3 = NULL, *_40$$3 = NULL, *_39$$32; + zval *table_param = NULL, *schema_param = NULL, *columns = NULL, *columnType = NULL, *field = NULL, *definition = NULL, *oldColumn = NULL, *sizePattern = NULL, *matches = NULL, *matchOne = NULL, *matchTwo = NULL, *columnName = NULL, *_0 = NULL, *_1, *_2 = NULL, *_3, **_6, *_7$$5 = NULL, *_8$$6 = NULL, *_9$$6 = NULL, *_10$$7 = NULL, *_11$$7 = NULL, *_12$$8 = NULL, *_13$$9 = NULL, *_14$$10 = NULL, *_15$$11 = NULL, *_16$$12 = NULL, *_17$$13 = NULL, *_18$$14 = NULL, *_19$$14 = NULL, *_20$$15 = NULL, *_21$$15 = NULL, *_22$$16 = NULL, *_23$$16 = NULL, *_24$$17 = NULL, *_25$$17 = NULL, *_26$$18 = NULL, *_27$$18 = NULL, *_28$$19 = NULL, *_29$$20 = NULL, *_30$$21 = NULL, *_31$$4 = NULL, *_32$$22 = NULL, *_33$$24 = NULL, *_34$$25 = NULL, *_35$$3, *_36$$3, *_37$$3, *_38$$3 = NULL, *_40$$3 = NULL, *_39$$32; zval *table = NULL, *schema = NULL; ZEPHIR_MM_GROW(); @@ -49116,7 +49136,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { ZVAL_LONG(_3, 3); ZEPHIR_CALL_METHOD(&_0, this_ptr, "fetchall", NULL, 0, _2, _3); zephir_check_call_status(); - zephir_is_iterable(_0, &_5, &_4, 0, 0, "phalcon/db/adapter/pdo/mysql.zep", 345); + zephir_is_iterable(_0, &_5, &_4, 0, 0, "phalcon/db/adapter/pdo/mysql.zep", 346); for ( ; zephir_hash_get_current_data_ex(_5, (void**) &_6, &_4) == SUCCESS ; zephir_hash_move_forward_ex(_5, &_4) @@ -49126,71 +49146,71 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { zephir_create_array(definition, 1, 0 TSRMLS_CC); add_assoc_long_ex(definition, SS("bindType"), 2); ZEPHIR_OBS_NVAR(columnType); - zephir_array_fetch_long(&columnType, field, 1, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 119 TSRMLS_CC); + zephir_array_fetch_long(&columnType, field, 1, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 120 TSRMLS_CC); while (1) { - if (zephir_memnstr_str(columnType, SL("bigint"), "phalcon/db/adapter/pdo/mysql.zep", 126)) { + if (zephir_memnstr_str(columnType, SL("enum"), "phalcon/db/adapter/pdo/mysql.zep", 127)) { ZEPHIR_INIT_NVAR(_7$$5); - ZVAL_LONG(_7$$5, 14); + ZVAL_LONG(_7$$5, 5); zephir_array_update_string(&definition, SL("type"), &_7$$5, PH_COPY | PH_SEPARATE); - zephir_array_update_string(&definition, SL("isNumeric"), &ZEPHIR_GLOBAL(global_true), PH_COPY | PH_SEPARATE); - ZEPHIR_INIT_NVAR(_8$$5); - ZVAL_LONG(_8$$5, 1); - zephir_array_update_string(&definition, SL("bindType"), &_8$$5, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("int"), "phalcon/db/adapter/pdo/mysql.zep", 136)) { - ZEPHIR_INIT_NVAR(_9$$6); - ZVAL_LONG(_9$$6, 0); - zephir_array_update_string(&definition, SL("type"), &_9$$6, PH_COPY | PH_SEPARATE); + if (zephir_memnstr_str(columnType, SL("bigint"), "phalcon/db/adapter/pdo/mysql.zep", 135)) { + ZEPHIR_INIT_NVAR(_8$$6); + ZVAL_LONG(_8$$6, 14); + zephir_array_update_string(&definition, SL("type"), &_8$$6, PH_COPY | PH_SEPARATE); zephir_array_update_string(&definition, SL("isNumeric"), &ZEPHIR_GLOBAL(global_true), PH_COPY | PH_SEPARATE); - ZEPHIR_INIT_NVAR(_10$$6); - ZVAL_LONG(_10$$6, 1); - zephir_array_update_string(&definition, SL("bindType"), &_10$$6, PH_COPY | PH_SEPARATE); + ZEPHIR_INIT_NVAR(_9$$6); + ZVAL_LONG(_9$$6, 1); + zephir_array_update_string(&definition, SL("bindType"), &_9$$6, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("varchar"), "phalcon/db/adapter/pdo/mysql.zep", 146)) { + if (zephir_memnstr_str(columnType, SL("int"), "phalcon/db/adapter/pdo/mysql.zep", 145)) { + ZEPHIR_INIT_NVAR(_10$$7); + ZVAL_LONG(_10$$7, 0); + zephir_array_update_string(&definition, SL("type"), &_10$$7, PH_COPY | PH_SEPARATE); + zephir_array_update_string(&definition, SL("isNumeric"), &ZEPHIR_GLOBAL(global_true), PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(_11$$7); - ZVAL_LONG(_11$$7, 2); - zephir_array_update_string(&definition, SL("type"), &_11$$7, PH_COPY | PH_SEPARATE); + ZVAL_LONG(_11$$7, 1); + zephir_array_update_string(&definition, SL("bindType"), &_11$$7, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("datetime"), "phalcon/db/adapter/pdo/mysql.zep", 154)) { + if (zephir_memnstr_str(columnType, SL("varchar"), "phalcon/db/adapter/pdo/mysql.zep", 155)) { ZEPHIR_INIT_NVAR(_12$$8); - ZVAL_LONG(_12$$8, 4); + ZVAL_LONG(_12$$8, 2); zephir_array_update_string(&definition, SL("type"), &_12$$8, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("enum"), "phalcon/db/adapter/pdo/mysql.zep", 162)) { + if (zephir_memnstr_str(columnType, SL("datetime"), "phalcon/db/adapter/pdo/mysql.zep", 163)) { ZEPHIR_INIT_NVAR(_13$$9); - ZVAL_LONG(_13$$9, 5); + ZVAL_LONG(_13$$9, 4); zephir_array_update_string(&definition, SL("type"), &_13$$9, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("char"), "phalcon/db/adapter/pdo/mysql.zep", 170)) { + if (zephir_memnstr_str(columnType, SL("char"), "phalcon/db/adapter/pdo/mysql.zep", 171)) { ZEPHIR_INIT_NVAR(_14$$10); ZVAL_LONG(_14$$10, 5); zephir_array_update_string(&definition, SL("type"), &_14$$10, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("date"), "phalcon/db/adapter/pdo/mysql.zep", 178)) { + if (zephir_memnstr_str(columnType, SL("date"), "phalcon/db/adapter/pdo/mysql.zep", 179)) { ZEPHIR_INIT_NVAR(_15$$11); ZVAL_LONG(_15$$11, 1); zephir_array_update_string(&definition, SL("type"), &_15$$11, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("timestamp"), "phalcon/db/adapter/pdo/mysql.zep", 186)) { + if (zephir_memnstr_str(columnType, SL("timestamp"), "phalcon/db/adapter/pdo/mysql.zep", 187)) { ZEPHIR_INIT_NVAR(_16$$12); ZVAL_LONG(_16$$12, 17); zephir_array_update_string(&definition, SL("type"), &_16$$12, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("text"), "phalcon/db/adapter/pdo/mysql.zep", 194)) { + if (zephir_memnstr_str(columnType, SL("text"), "phalcon/db/adapter/pdo/mysql.zep", 195)) { ZEPHIR_INIT_NVAR(_17$$13); ZVAL_LONG(_17$$13, 6); zephir_array_update_string(&definition, SL("type"), &_17$$13, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("decimal"), "phalcon/db/adapter/pdo/mysql.zep", 202)) { + if (zephir_memnstr_str(columnType, SL("decimal"), "phalcon/db/adapter/pdo/mysql.zep", 203)) { ZEPHIR_INIT_NVAR(_18$$14); ZVAL_LONG(_18$$14, 3); zephir_array_update_string(&definition, SL("type"), &_18$$14, PH_COPY | PH_SEPARATE); @@ -49200,7 +49220,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { zephir_array_update_string(&definition, SL("bindType"), &_19$$14, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("double"), "phalcon/db/adapter/pdo/mysql.zep", 212)) { + if (zephir_memnstr_str(columnType, SL("double"), "phalcon/db/adapter/pdo/mysql.zep", 213)) { ZEPHIR_INIT_NVAR(_20$$15); ZVAL_LONG(_20$$15, 9); zephir_array_update_string(&definition, SL("type"), &_20$$15, PH_COPY | PH_SEPARATE); @@ -49210,7 +49230,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { zephir_array_update_string(&definition, SL("bindType"), &_21$$15, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("float"), "phalcon/db/adapter/pdo/mysql.zep", 222)) { + if (zephir_memnstr_str(columnType, SL("float"), "phalcon/db/adapter/pdo/mysql.zep", 223)) { ZEPHIR_INIT_NVAR(_22$$16); ZVAL_LONG(_22$$16, 7); zephir_array_update_string(&definition, SL("type"), &_22$$16, PH_COPY | PH_SEPARATE); @@ -49220,7 +49240,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { zephir_array_update_string(&definition, SL("bindType"), &_23$$16, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("bit"), "phalcon/db/adapter/pdo/mysql.zep", 232)) { + if (zephir_memnstr_str(columnType, SL("bit"), "phalcon/db/adapter/pdo/mysql.zep", 233)) { ZEPHIR_INIT_NVAR(_24$$17); ZVAL_LONG(_24$$17, 8); zephir_array_update_string(&definition, SL("type"), &_24$$17, PH_COPY | PH_SEPARATE); @@ -49229,7 +49249,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { zephir_array_update_string(&definition, SL("bindType"), &_25$$17, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("tinyblob"), "phalcon/db/adapter/pdo/mysql.zep", 241)) { + if (zephir_memnstr_str(columnType, SL("tinyblob"), "phalcon/db/adapter/pdo/mysql.zep", 242)) { ZEPHIR_INIT_NVAR(_26$$18); ZVAL_LONG(_26$$18, 10); zephir_array_update_string(&definition, SL("type"), &_26$$18, PH_COPY | PH_SEPARATE); @@ -49238,19 +49258,19 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { zephir_array_update_string(&definition, SL("bindType"), &_27$$18, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("mediumblob"), "phalcon/db/adapter/pdo/mysql.zep", 250)) { + if (zephir_memnstr_str(columnType, SL("mediumblob"), "phalcon/db/adapter/pdo/mysql.zep", 251)) { ZEPHIR_INIT_NVAR(_28$$19); ZVAL_LONG(_28$$19, 12); zephir_array_update_string(&definition, SL("type"), &_28$$19, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("longblob"), "phalcon/db/adapter/pdo/mysql.zep", 258)) { + if (zephir_memnstr_str(columnType, SL("longblob"), "phalcon/db/adapter/pdo/mysql.zep", 259)) { ZEPHIR_INIT_NVAR(_29$$20); ZVAL_LONG(_29$$20, 13); zephir_array_update_string(&definition, SL("type"), &_29$$20, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("blob"), "phalcon/db/adapter/pdo/mysql.zep", 266)) { + if (zephir_memnstr_str(columnType, SL("blob"), "phalcon/db/adapter/pdo/mysql.zep", 267)) { ZEPHIR_INIT_NVAR(_30$$21); ZVAL_LONG(_30$$21, 11); zephir_array_update_string(&definition, SL("type"), &_30$$21, PH_COPY | PH_SEPARATE); @@ -49261,7 +49281,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { zephir_array_update_string(&definition, SL("type"), &_31$$4, PH_COPY | PH_SEPARATE); break; } - if (zephir_memnstr_str(columnType, SL("("), "phalcon/db/adapter/pdo/mysql.zep", 281)) { + if (zephir_memnstr_str(columnType, SL("("), "phalcon/db/adapter/pdo/mysql.zep", 282)) { ZEPHIR_INIT_NVAR(matches); ZVAL_NULL(matches); ZEPHIR_INIT_NVAR(_32$$22); @@ -49281,7 +49301,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { } } } - if (zephir_memnstr_str(columnType, SL("unsigned"), "phalcon/db/adapter/pdo/mysql.zep", 296)) { + if (zephir_memnstr_str(columnType, SL("unsigned"), "phalcon/db/adapter/pdo/mysql.zep", 297)) { zephir_array_update_string(&definition, SL("unsigned"), &ZEPHIR_GLOBAL(global_true), PH_COPY | PH_SEPARATE); } if (Z_TYPE_P(oldColumn) == IS_NULL) { @@ -49289,30 +49309,30 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) { } else { zephir_array_update_string(&definition, SL("after"), &oldColumn, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_35$$3, field, 3, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 312 TSRMLS_CC); + zephir_array_fetch_long(&_35$$3, field, 3, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 313 TSRMLS_CC); if (ZEPHIR_IS_STRING(_35$$3, "PRI")) { zephir_array_update_string(&definition, SL("primary"), &ZEPHIR_GLOBAL(global_true), PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_36$$3, field, 2, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 319 TSRMLS_CC); + zephir_array_fetch_long(&_36$$3, field, 2, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 320 TSRMLS_CC); if (ZEPHIR_IS_STRING(_36$$3, "NO")) { zephir_array_update_string(&definition, SL("notNull"), &ZEPHIR_GLOBAL(global_true), PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_37$$3, field, 5, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 326 TSRMLS_CC); + zephir_array_fetch_long(&_37$$3, field, 5, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 327 TSRMLS_CC); if (ZEPHIR_IS_STRING(_37$$3, "auto_increment")) { zephir_array_update_string(&definition, SL("autoIncrement"), &ZEPHIR_GLOBAL(global_true), PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_NVAR(_38$$3); - zephir_array_fetch_long(&_38$$3, field, 4, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 333 TSRMLS_CC); + zephir_array_fetch_long(&_38$$3, field, 4, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 334 TSRMLS_CC); if (Z_TYPE_P(_38$$3) != IS_NULL) { - zephir_array_fetch_long(&_39$$32, field, 4, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 334 TSRMLS_CC); + zephir_array_fetch_long(&_39$$32, field, 4, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 335 TSRMLS_CC); zephir_array_update_string(&definition, SL("default"), &_39$$32, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&columnName, field, 0, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 340 TSRMLS_CC); + zephir_array_fetch_long(&columnName, field, 0, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 341 TSRMLS_CC); ZEPHIR_INIT_NVAR(_40$$3); object_init_ex(_40$$3, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, _40$$3, "__construct", &_41, 142, columnName, definition); + ZEPHIR_CALL_METHOD(NULL, _40$$3, "__construct", &_41, 137, columnName, definition); zephir_check_call_status(); - zephir_array_append(&columns, _40$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/mysql.zep", 341); + zephir_array_append(&columns, _40$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/mysql.zep", 342); ZEPHIR_CPY_WRT(oldColumn, columnName); } RETURN_CCTOR(columns); @@ -49355,31 +49375,31 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeIndexes) { ZVAL_LONG(_3, 2); ZEPHIR_CALL_METHOD(&_0, this_ptr, "fetchall", NULL, 0, _2, _3); zephir_check_call_status(); - zephir_is_iterable(_0, &_5, &_4, 0, 0, "phalcon/db/adapter/pdo/mysql.zep", 389); + zephir_is_iterable(_0, &_5, &_4, 0, 0, "phalcon/db/adapter/pdo/mysql.zep", 390); for ( ; zephir_hash_get_current_data_ex(_5, (void**) &_6, &_4) == SUCCESS ; zephir_hash_move_forward_ex(_5, &_4) ) { ZEPHIR_GET_HVALUE(index, _6); - zephir_array_fetch_string(&keyName, index, SL("Key_name"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 365 TSRMLS_CC); + zephir_array_fetch_string(&keyName, index, SL("Key_name"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 366 TSRMLS_CC); if (!(zephir_array_isset(indexes, keyName))) { ZEPHIR_INIT_NVAR(_7$$4); array_init(_7$$4); zephir_array_update_zval(&indexes, keyName, &_7$$4, PH_COPY | PH_SEPARATE); } - zephir_array_fetch(&_8$$3, indexes, keyName, PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 371 TSRMLS_CC); + zephir_array_fetch(&_8$$3, indexes, keyName, PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 372 TSRMLS_CC); if (!(zephir_array_isset_string(_8$$3, SS("columns")))) { ZEPHIR_INIT_NVAR(columns); array_init(columns); } else { - zephir_array_fetch(&_9$$6, indexes, keyName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 374 TSRMLS_CC); + zephir_array_fetch(&_9$$6, indexes, keyName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 375 TSRMLS_CC); ZEPHIR_OBS_NVAR(columns); - zephir_array_fetch_string(&columns, _9$$6, SL("columns"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 374 TSRMLS_CC); + zephir_array_fetch_string(&columns, _9$$6, SL("columns"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 375 TSRMLS_CC); } - zephir_array_fetch_string(&_10$$3, index, SL("Column_name"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 377 TSRMLS_CC); - zephir_array_append(&columns, _10$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/mysql.zep", 377); + zephir_array_fetch_string(&_10$$3, index, SL("Column_name"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 378 TSRMLS_CC); + zephir_array_append(&columns, _10$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/mysql.zep", 378); zephir_array_update_multi(&indexes, &columns TSRMLS_CC, SL("zs"), 3, keyName, SL("columns")); - zephir_array_fetch_string(&_11$$3, index, SL("Non_unique"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 382 TSRMLS_CC); + zephir_array_fetch_string(&_11$$3, index, SL("Non_unique"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 383 TSRMLS_CC); if (ZEPHIR_IS_STRING(keyName, "PRIMARY")) { ZEPHIR_INIT_NVAR(_12$$7); ZVAL_STRING(_12$$7, "PRIMARY", 1); @@ -49394,7 +49414,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeIndexes) { } ZEPHIR_INIT_VAR(indexObjects); array_init(indexObjects); - zephir_is_iterable(indexes, &_15, &_14, 0, 0, "phalcon/db/adapter/pdo/mysql.zep", 394); + zephir_is_iterable(indexes, &_15, &_14, 0, 0, "phalcon/db/adapter/pdo/mysql.zep", 395); for ( ; zephir_hash_get_current_data_ex(_15, (void**) &_16, &_14) == SUCCESS ; zephir_hash_move_forward_ex(_15, &_14) @@ -49403,8 +49423,8 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeIndexes) { ZEPHIR_GET_HVALUE(index, _16); ZEPHIR_INIT_NVAR(_17$$10); object_init_ex(_17$$10, phalcon_db_index_ce); - zephir_array_fetch_string(&_18$$10, index, SL("columns"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 391 TSRMLS_CC); - zephir_array_fetch_string(&_19$$10, index, SL("type"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 391 TSRMLS_CC); + zephir_array_fetch_string(&_18$$10, index, SL("columns"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 392 TSRMLS_CC); + zephir_array_fetch_string(&_19$$10, index, SL("type"), PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 392 TSRMLS_CC); ZEPHIR_CALL_METHOD(NULL, _17$$10, "__construct", &_20, 15, name, _18$$10, _19$$10); zephir_check_call_status(); zephir_array_update_zval(&indexObjects, name, &_17$$10, PH_COPY | PH_SEPARATE); @@ -49413,6 +49433,148 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeIndexes) { } +static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeReferences) { + + zval *_15$$3 = NULL, *_20$$6 = NULL; + HashTable *_5, *_17; + HashPosition _4, _16; + zephir_fcall_cache_entry *_22 = NULL; + int ZEPHIR_LAST_CALL_STATUS; + zval *table_param = NULL, *schema_param = NULL, *references = NULL, *reference = NULL, *arrayReference = NULL, *constraintName = NULL, *referenceObjects = NULL, *name = NULL, *referencedSchema = NULL, *referencedTable = NULL, *columns = NULL, *referencedColumns = NULL, *referenceUpdate = NULL, *referenceDelete = NULL, *_0 = NULL, *_1, *_2 = NULL, *_3, **_6, **_18, *_7$$5, *_8$$5, *_9$$5, *_10$$5, *_11$$5, *_12$$5, *_13$$3, *_14$$3, *_19$$6 = NULL, *_21$$6 = NULL; + zval *table = NULL, *schema = NULL; + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 1, &table_param, &schema_param); + + if (unlikely(Z_TYPE_P(table_param) != IS_STRING && Z_TYPE_P(table_param) != IS_NULL)) { + zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'table' must be a string") TSRMLS_CC); + RETURN_MM_NULL(); + } + if (likely(Z_TYPE_P(table_param) == IS_STRING)) { + zephir_get_strval(table, table_param); + } else { + ZEPHIR_INIT_VAR(table); + ZVAL_EMPTY_STRING(table); + } + if (!schema_param) { + ZEPHIR_INIT_VAR(schema); + ZVAL_EMPTY_STRING(schema); + } else { + if (unlikely(Z_TYPE_P(schema_param) != IS_STRING && Z_TYPE_P(schema_param) != IS_NULL)) { + zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'schema' must be a string") TSRMLS_CC); + RETURN_MM_NULL(); + } + if (likely(Z_TYPE_P(schema_param) == IS_STRING)) { + zephir_get_strval(schema, schema_param); + } else { + ZEPHIR_INIT_VAR(schema); + ZVAL_EMPTY_STRING(schema); + } + } + + + ZEPHIR_INIT_VAR(references); + array_init(references); + _1 = zephir_fetch_nproperty_this(this_ptr, SL("_dialect"), PH_NOISY_CC); + ZEPHIR_CALL_METHOD(&_2, _1, "describereferences", NULL, 0, table, schema); + zephir_check_call_status(); + ZEPHIR_INIT_VAR(_3); + ZVAL_LONG(_3, 3); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "fetchall", NULL, 0, _2, _3); + zephir_check_call_status(); + zephir_is_iterable(_0, &_5, &_4, 0, 0, "phalcon/db/adapter/pdo/mysql.zep", 447); + for ( + ; zephir_hash_get_current_data_ex(_5, (void**) &_6, &_4) == SUCCESS + ; zephir_hash_move_forward_ex(_5, &_4) + ) { + ZEPHIR_GET_HVALUE(reference, _6); + zephir_array_fetch_long(&constraintName, reference, 2, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 416 TSRMLS_CC); + if (!(zephir_array_isset(references, constraintName))) { + ZEPHIR_OBS_NVAR(referencedSchema); + zephir_array_fetch_long(&referencedSchema, reference, 3, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 418 TSRMLS_CC); + ZEPHIR_OBS_NVAR(referencedTable); + zephir_array_fetch_long(&referencedTable, reference, 4, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 419 TSRMLS_CC); + ZEPHIR_OBS_NVAR(referenceUpdate); + zephir_array_fetch_long(&referenceUpdate, reference, 6, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 420 TSRMLS_CC); + ZEPHIR_OBS_NVAR(referenceDelete); + zephir_array_fetch_long(&referenceDelete, reference, 7, PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 421 TSRMLS_CC); + ZEPHIR_INIT_NVAR(columns); + array_init(columns); + ZEPHIR_INIT_NVAR(referencedColumns); + array_init(referencedColumns); + } else { + zephir_array_fetch(&_7$$5, references, constraintName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 426 TSRMLS_CC); + ZEPHIR_OBS_NVAR(referencedSchema); + zephir_array_fetch_string(&referencedSchema, _7$$5, SL("referencedSchema"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 426 TSRMLS_CC); + zephir_array_fetch(&_8$$5, references, constraintName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 427 TSRMLS_CC); + ZEPHIR_OBS_NVAR(referencedTable); + zephir_array_fetch_string(&referencedTable, _8$$5, SL("referencedTable"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 427 TSRMLS_CC); + zephir_array_fetch(&_9$$5, references, constraintName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 428 TSRMLS_CC); + ZEPHIR_OBS_NVAR(columns); + zephir_array_fetch_string(&columns, _9$$5, SL("columns"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 428 TSRMLS_CC); + zephir_array_fetch(&_10$$5, references, constraintName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 429 TSRMLS_CC); + ZEPHIR_OBS_NVAR(referencedColumns); + zephir_array_fetch_string(&referencedColumns, _10$$5, SL("referencedColumns"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 429 TSRMLS_CC); + zephir_array_fetch(&_11$$5, references, constraintName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 430 TSRMLS_CC); + ZEPHIR_OBS_NVAR(referenceUpdate); + zephir_array_fetch_string(&referenceUpdate, _11$$5, SL("onUpdate"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 430 TSRMLS_CC); + zephir_array_fetch(&_12$$5, references, constraintName, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 431 TSRMLS_CC); + ZEPHIR_OBS_NVAR(referenceDelete); + zephir_array_fetch_string(&referenceDelete, _12$$5, SL("onDelete"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 431 TSRMLS_CC); + } + zephir_array_fetch_long(&_13$$3, reference, 1, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 434 TSRMLS_CC); + zephir_array_append(&columns, _13$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/mysql.zep", 434); + zephir_array_fetch_long(&_14$$3, reference, 5, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/mysql.zep", 435 TSRMLS_CC); + zephir_array_append(&referencedColumns, _14$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/mysql.zep", 435); + ZEPHIR_INIT_NVAR(_15$$3); + zephir_create_array(_15$$3, 6, 0 TSRMLS_CC); + zephir_array_update_string(&_15$$3, SL("referencedSchema"), &referencedSchema, PH_COPY | PH_SEPARATE); + zephir_array_update_string(&_15$$3, SL("referencedTable"), &referencedTable, PH_COPY | PH_SEPARATE); + zephir_array_update_string(&_15$$3, SL("columns"), &columns, PH_COPY | PH_SEPARATE); + zephir_array_update_string(&_15$$3, SL("referencedColumns"), &referencedColumns, PH_COPY | PH_SEPARATE); + zephir_array_update_string(&_15$$3, SL("onUpdate"), &referenceUpdate, PH_COPY | PH_SEPARATE); + zephir_array_update_string(&_15$$3, SL("onDelete"), &referenceDelete, PH_COPY | PH_SEPARATE); + zephir_array_update_zval(&references, constraintName, &_15$$3, PH_COPY | PH_SEPARATE); + } + ZEPHIR_INIT_VAR(referenceObjects); + array_init(referenceObjects); + zephir_is_iterable(references, &_17, &_16, 0, 0, "phalcon/db/adapter/pdo/mysql.zep", 459); + for ( + ; zephir_hash_get_current_data_ex(_17, (void**) &_18, &_16) == SUCCESS + ; zephir_hash_move_forward_ex(_17, &_16) + ) { + ZEPHIR_GET_HMKEY(name, _17, _16); + ZEPHIR_GET_HVALUE(arrayReference, _18); + ZEPHIR_INIT_NVAR(_19$$6); + object_init_ex(_19$$6, phalcon_db_reference_ce); + ZEPHIR_INIT_NVAR(_20$$6); + zephir_create_array(_20$$6, 6, 0 TSRMLS_CC); + ZEPHIR_OBS_NVAR(_21$$6); + zephir_array_fetch_string(&_21$$6, arrayReference, SL("referencedSchema"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 450 TSRMLS_CC); + zephir_array_update_string(&_20$$6, SL("referencedSchema"), &_21$$6, PH_COPY | PH_SEPARATE); + ZEPHIR_OBS_NVAR(_21$$6); + zephir_array_fetch_string(&_21$$6, arrayReference, SL("referencedTable"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 451 TSRMLS_CC); + zephir_array_update_string(&_20$$6, SL("referencedTable"), &_21$$6, PH_COPY | PH_SEPARATE); + ZEPHIR_OBS_NVAR(_21$$6); + zephir_array_fetch_string(&_21$$6, arrayReference, SL("columns"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 452 TSRMLS_CC); + zephir_array_update_string(&_20$$6, SL("columns"), &_21$$6, PH_COPY | PH_SEPARATE); + ZEPHIR_OBS_NVAR(_21$$6); + zephir_array_fetch_string(&_21$$6, arrayReference, SL("referencedColumns"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 453 TSRMLS_CC); + zephir_array_update_string(&_20$$6, SL("referencedColumns"), &_21$$6, PH_COPY | PH_SEPARATE); + ZEPHIR_OBS_NVAR(_21$$6); + zephir_array_fetch_string(&_21$$6, arrayReference, SL("onUpdate"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 454 TSRMLS_CC); + zephir_array_update_string(&_20$$6, SL("onUpdate"), &_21$$6, PH_COPY | PH_SEPARATE); + ZEPHIR_OBS_NVAR(_21$$6); + zephir_array_fetch_string(&_21$$6, arrayReference, SL("onDelete"), PH_NOISY, "phalcon/db/adapter/pdo/mysql.zep", 456 TSRMLS_CC); + zephir_array_update_string(&_20$$6, SL("onDelete"), &_21$$6, PH_COPY | PH_SEPARATE); + ZEPHIR_CALL_METHOD(NULL, _19$$6, "__construct", &_22, 16, name, _20$$6); + zephir_check_call_status(); + zephir_array_update_zval(&referenceObjects, name, &_19$$6, PH_COPY | PH_SEPARATE); + } + RETURN_CCTOR(referenceObjects); + +} + @@ -49462,7 +49624,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Oracle, connect) { ZEPHIR_OBS_NVAR(descriptor); zephir_read_property_this(&descriptor, this_ptr, SL("_descriptor"), PH_NOISY_CC); } - ZEPHIR_CALL_PARENT(&status, phalcon_db_adapter_pdo_oracle_ce, this_ptr, "connect", &_0, 143, descriptor); + ZEPHIR_CALL_PARENT(&status, phalcon_db_adapter_pdo_oracle_ce, this_ptr, "connect", &_0, 138, descriptor); zephir_check_call_status(); ZEPHIR_OBS_VAR(startup); if (zephir_array_isset_string_fetch(&startup, descriptor, SS("startup"), 0 TSRMLS_CC)) { @@ -49641,7 +49803,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Oracle, describeColumns) { zephir_array_fetch_long(&columnName, field, 0, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/oracle.zep", 199 TSRMLS_CC); ZEPHIR_INIT_NVAR(_23$$3); object_init_ex(_23$$3, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, _23$$3, "__construct", &_24, 142, columnName, definition); + ZEPHIR_CALL_METHOD(NULL, _23$$3, "__construct", &_24, 137, columnName, definition); zephir_check_call_status(); zephir_array_append(&columns, _23$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/oracle.zep", 204); ZEPHIR_CPY_WRT(oldColumn, columnName); @@ -49778,7 +49940,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Postgresql, connect) { zephir_array_update_string(&descriptor, SL("password"), &ZEPHIR_GLOBAL(global_null), PH_COPY | PH_SEPARATE); } } - ZEPHIR_CALL_PARENT(NULL, phalcon_db_adapter_pdo_postgresql_ce, this_ptr, "connect", &_3, 143, descriptor); + ZEPHIR_CALL_PARENT(NULL, phalcon_db_adapter_pdo_postgresql_ce, this_ptr, "connect", &_3, 138, descriptor); zephir_check_call_status(); if (!(ZEPHIR_IS_EMPTY(schema))) { ZEPHIR_INIT_VAR(sql); @@ -50021,7 +50183,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Postgresql, describeColumns) { zephir_array_fetch_long(&columnName, field, 0, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/postgresql.zep", 321 TSRMLS_CC); ZEPHIR_INIT_NVAR(_46$$3); object_init_ex(_46$$3, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, _46$$3, "__construct", &_47, 142, columnName, definition); + ZEPHIR_CALL_METHOD(NULL, _46$$3, "__construct", &_47, 137, columnName, definition); zephir_check_call_status(); zephir_array_append(&columns, _46$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/postgresql.zep", 322); ZEPHIR_CPY_WRT(oldColumn, columnName); @@ -50311,7 +50473,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, connect) { return; } zephir_array_update_string(&descriptor, SL("dsn"), &dbname, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_PARENT(NULL, phalcon_db_adapter_pdo_sqlite_ce, this_ptr, "connect", &_0, 143, descriptor); + ZEPHIR_CALL_PARENT(NULL, phalcon_db_adapter_pdo_sqlite_ce, this_ptr, "connect", &_0, 138, descriptor); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -50531,7 +50693,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) { zephir_array_fetch_long(&columnName, field, 1, PH_NOISY | PH_READONLY, "phalcon/db/adapter/pdo/sqlite.zep", 286 TSRMLS_CC); ZEPHIR_INIT_NVAR(_43$$3); object_init_ex(_43$$3, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, _43$$3, "__construct", &_44, 142, columnName, definition); + ZEPHIR_CALL_METHOD(NULL, _43$$3, "__construct", &_44, 137, columnName, definition); zephir_check_call_status(); zephir_array_append(&columns, _43$$3, PH_SEPARATE, "phalcon/db/adapter/pdo/sqlite.zep", 287); ZEPHIR_CPY_WRT(oldColumn, columnName); @@ -51035,7 +51197,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_MySQL, getColumnDefinition) { ZEPHIR_GET_HVALUE(value$$51, _25$$51); ZEPHIR_SINIT_NVAR(_26$$52); ZVAL_STRING(&_26$$52, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_27$$52, "addcslashes", &_28, 144, value$$51, &_26$$52); + ZEPHIR_CALL_FUNCTION(&_27$$52, "addcslashes", &_28, 139, value$$51, &_26$$52); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_29$$52); ZEPHIR_CONCAT_SVS(_29$$52, "\"", _27$$52, "\", "); @@ -51053,7 +51215,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_MySQL, getColumnDefinition) { } else { ZEPHIR_SINIT_VAR(_34$$53); ZVAL_STRING(&_34$$53, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_35$$53, "addcslashes", &_28, 144, typeValues, &_34$$53); + ZEPHIR_CALL_FUNCTION(&_35$$53, "addcslashes", &_28, 139, typeValues, &_34$$53); zephir_check_call_status(); ZEPHIR_INIT_VAR(_36$$53); ZEPHIR_CONCAT_SVS(_36$$53, "(\"", _35$$53, "\")"); @@ -51117,7 +51279,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_MySQL, addColumn) { } else { ZEPHIR_SINIT_VAR(_5$$5); ZVAL_STRING(&_5$$5, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_6$$5, "addcslashes", NULL, 144, defaultValue, &_5$$5); + ZEPHIR_CALL_FUNCTION(&_6$$5, "addcslashes", NULL, 139, defaultValue, &_5$$5); zephir_check_call_status(); ZEPHIR_INIT_VAR(_7$$5); ZEPHIR_CONCAT_SVS(_7$$5, " DEFAULT \"", _6$$5, "\""); @@ -51205,7 +51367,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_MySQL, modifyColumn) { } else { ZEPHIR_SINIT_VAR(_5$$5); ZVAL_STRING(&_5$$5, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_6$$5, "addcslashes", NULL, 144, defaultValue, &_5$$5); + ZEPHIR_CALL_FUNCTION(&_6$$5, "addcslashes", NULL, 139, defaultValue, &_5$$5); zephir_check_call_status(); ZEPHIR_INIT_VAR(_7$$5); ZEPHIR_CONCAT_SVS(_7$$5, " DEFAULT \"", _6$$5, "\""); @@ -51671,7 +51833,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_MySQL, createTable) { } else { ZEPHIR_SINIT_NVAR(_8$$10); ZVAL_STRING(&_8$$10, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_9$$10, "addcslashes", &_10, 144, defaultValue, &_8$$10); + ZEPHIR_CALL_FUNCTION(&_9$$10, "addcslashes", &_10, 139, defaultValue, &_8$$10); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_11$$10); ZEPHIR_CONCAT_SVS(_11$$10, " DEFAULT \"", _9$$10, "\""); @@ -52149,14 +52311,14 @@ static PHP_METHOD(Phalcon_Db_Dialect_MySQL, describeReferences) { ZEPHIR_INIT_VAR(sql); - ZVAL_STRING(sql, "SELECT TABLE_NAME,COLUMN_NAME,CONSTRAINT_NAME,REFERENCED_TABLE_SCHEMA,REFERENCED_TABLE_NAME,REFERENCED_COLUMN_NAME FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE REFERENCED_TABLE_NAME IS NOT NULL AND ", 1); + ZVAL_STRING(sql, "SELECT KCU.TABLE_NAME, KCU.COLUMN_NAME, KCU.CONSTRAINT_NAME, KCU.REFERENCED_TABLE_SCHEMA, KCU.REFERENCED_TABLE_NAME, KCU.REFERENCED_COLUMN_NAME, RC.UPDATE_RULE, RC.DELETE_RULE FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE AS KCU LEFT JOIN INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS AS RC ON RC.CONSTRAINT_NAME = KCU.CONSTRAINT_NAME WHERE KCU.REFERENCED_TABLE_NAME IS NOT NULL AND ", 1); if (!(!schema) && Z_STRLEN_P(schema)) { ZEPHIR_INIT_VAR(_0$$3); - ZEPHIR_CONCAT_SVSVS(_0$$3, "CONSTRAINT_SCHEMA = '", schema, "' AND TABLE_NAME = '", table, "'"); + ZEPHIR_CONCAT_SVSVS(_0$$3, "KCU.CONSTRAINT_SCHEMA = '", schema, "' AND KCU.TABLE_NAME = '", table, "'"); zephir_concat_self(&sql, _0$$3 TSRMLS_CC); } else { ZEPHIR_INIT_VAR(_1$$4); - ZEPHIR_CONCAT_SVS(_1$$4, "TABLE_NAME = '", table, "'"); + ZEPHIR_CONCAT_SVS(_1$$4, "KCU.TABLE_NAME = '", table, "'"); zephir_concat_self(&sql, _1$$4 TSRMLS_CC); } RETURN_CCTOR(sql); @@ -52959,14 +53121,14 @@ static PHP_METHOD(Phalcon_Db_Dialect_Oracle, viewExists) { if (!ZEPHIR_IS_STRING(schemaName, "")) { - ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 145, viewName); + ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 140, viewName); zephir_check_call_status(); - ZEPHIR_CALL_CE_STATIC(&_2$$3, phalcon_text_ce, "upper", &_1, 145, schemaName); + ZEPHIR_CALL_CE_STATIC(&_2$$3, phalcon_text_ce, "upper", &_1, 140, schemaName); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "SELECT CASE WHEN COUNT(*) > 0 THEN 1 ELSE 0 END RET FROM ALL_VIEWS WHERE VIEW_NAME='", _0$$3, "' AND OWNER='", _2$$3, "'"); RETURN_MM(); } - ZEPHIR_CALL_CE_STATIC(&_3, phalcon_text_ce, "upper", &_1, 145, viewName); + ZEPHIR_CALL_CE_STATIC(&_3, phalcon_text_ce, "upper", &_1, 140, viewName); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, "SELECT CASE WHEN COUNT(*) > 0 THEN 1 ELSE 0 END RET FROM ALL_VIEWS WHERE VIEW_NAME='", _3, "'"); RETURN_MM(); @@ -52992,7 +53154,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Oracle, listViews) { if (!ZEPHIR_IS_STRING(schemaName, "")) { - ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 145, schemaName); + ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 140, schemaName); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, "SELECT VIEW_NAME FROM ALL_VIEWS WHERE OWNER='", _0$$3, "' ORDER BY VIEW_NAME"); RETURN_MM(); @@ -53030,14 +53192,14 @@ static PHP_METHOD(Phalcon_Db_Dialect_Oracle, tableExists) { if (!ZEPHIR_IS_STRING(schemaName, "")) { - ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 145, tableName); + ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 140, tableName); zephir_check_call_status(); - ZEPHIR_CALL_CE_STATIC(&_2$$3, phalcon_text_ce, "upper", &_1, 145, schemaName); + ZEPHIR_CALL_CE_STATIC(&_2$$3, phalcon_text_ce, "upper", &_1, 140, schemaName); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "SELECT CASE WHEN COUNT(*) > 0 THEN 1 ELSE 0 END RET FROM ALL_TABLES WHERE TABLE_NAME='", _0$$3, "' AND OWNER = '", _2$$3, "'"); RETURN_MM(); } - ZEPHIR_CALL_CE_STATIC(&_3, phalcon_text_ce, "upper", &_1, 145, tableName); + ZEPHIR_CALL_CE_STATIC(&_3, phalcon_text_ce, "upper", &_1, 140, tableName); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, "SELECT CASE WHEN COUNT(*) > 0 THEN 1 ELSE 0 END RET FROM ALL_TABLES WHERE TABLE_NAME='", _3, "'"); RETURN_MM(); @@ -53073,14 +53235,14 @@ static PHP_METHOD(Phalcon_Db_Dialect_Oracle, describeColumns) { if (!ZEPHIR_IS_STRING(schema, "")) { - ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 145, table); + ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 140, table); zephir_check_call_status(); - ZEPHIR_CALL_CE_STATIC(&_2$$3, phalcon_text_ce, "upper", &_1, 145, schema); + ZEPHIR_CALL_CE_STATIC(&_2$$3, phalcon_text_ce, "upper", &_1, 140, schema); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "SELECT TC.COLUMN_NAME, TC.DATA_TYPE, TC.DATA_LENGTH, TC.DATA_PRECISION, TC.DATA_SCALE, TC.NULLABLE, C.CONSTRAINT_TYPE, TC.DATA_DEFAULT, CC.POSITION FROM ALL_TAB_COLUMNS TC LEFT JOIN (ALL_CONS_COLUMNS CC JOIN ALL_CONSTRAINTS C ON (CC.CONSTRAINT_NAME = C.CONSTRAINT_NAME AND CC.TABLE_NAME = C.TABLE_NAME AND CC.OWNER = C.OWNER AND C.CONSTRAINT_TYPE = 'P')) ON TC.TABLE_NAME = CC.TABLE_NAME AND TC.COLUMN_NAME = CC.COLUMN_NAME WHERE TC.TABLE_NAME = '", _0$$3, "' AND TC.OWNER = '", _2$$3, "' ORDER BY TC.COLUMN_ID"); RETURN_MM(); } - ZEPHIR_CALL_CE_STATIC(&_3, phalcon_text_ce, "upper", &_1, 145, table); + ZEPHIR_CALL_CE_STATIC(&_3, phalcon_text_ce, "upper", &_1, 140, table); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, "SELECT TC.COLUMN_NAME, TC.DATA_TYPE, TC.DATA_LENGTH, TC.DATA_PRECISION, TC.DATA_SCALE, TC.NULLABLE, C.CONSTRAINT_TYPE, TC.DATA_DEFAULT, CC.POSITION FROM ALL_TAB_COLUMNS TC LEFT JOIN (ALL_CONS_COLUMNS CC JOIN ALL_CONSTRAINTS C ON (CC.CONSTRAINT_NAME = C.CONSTRAINT_NAME AND CC.TABLE_NAME = C.TABLE_NAME AND CC.OWNER = C.OWNER AND C.CONSTRAINT_TYPE = 'P')) ON TC.TABLE_NAME = CC.TABLE_NAME AND TC.COLUMN_NAME = CC.COLUMN_NAME WHERE TC.TABLE_NAME = '", _3, "' ORDER BY TC.COLUMN_ID"); RETURN_MM(); @@ -53106,7 +53268,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Oracle, listTables) { if (!ZEPHIR_IS_STRING(schemaName, "")) { - ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 145, schemaName); + ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 140, schemaName); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, "SELECT TABLE_NAME, OWNER FROM ALL_TABLES WHERE OWNER='", _0$$3, "' ORDER BY OWNER, TABLE_NAME"); RETURN_MM(); @@ -53144,14 +53306,14 @@ static PHP_METHOD(Phalcon_Db_Dialect_Oracle, describeIndexes) { if (!ZEPHIR_IS_STRING(schema, "")) { - ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 145, table); + ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 140, table); zephir_check_call_status(); - ZEPHIR_CALL_CE_STATIC(&_2$$3, phalcon_text_ce, "upper", &_1, 145, schema); + ZEPHIR_CALL_CE_STATIC(&_2$$3, phalcon_text_ce, "upper", &_1, 140, schema); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "SELECT I.TABLE_NAME, 0 AS C0, I.INDEX_NAME, IC.COLUMN_POSITION, IC.COLUMN_NAME FROM ALL_INDEXES I JOIN ALL_IND_COLUMNS IC ON I.INDEX_NAME = IC.INDEX_NAME WHERE I.TABLE_NAME = '", _0$$3, "' AND IC.INDEX_OWNER = '", _2$$3, "'"); RETURN_MM(); } - ZEPHIR_CALL_CE_STATIC(&_3, phalcon_text_ce, "upper", &_1, 145, table); + ZEPHIR_CALL_CE_STATIC(&_3, phalcon_text_ce, "upper", &_1, 140, table); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, "SELECT I.TABLE_NAME, 0 AS C0, I.INDEX_NAME, IC.COLUMN_POSITION, IC.COLUMN_NAME FROM ALL_INDEXES I JOIN ALL_IND_COLUMNS IC ON I.INDEX_NAME = IC.INDEX_NAME WHERE I.TABLE_NAME = '", _3, "'"); RETURN_MM(); @@ -53189,15 +53351,15 @@ static PHP_METHOD(Phalcon_Db_Dialect_Oracle, describeReferences) { ZEPHIR_INIT_VAR(sql); ZVAL_STRING(sql, "SELECT AC.TABLE_NAME, CC.COLUMN_NAME, AC.CONSTRAINT_NAME, AC.R_OWNER, RCC.TABLE_NAME R_TABLE_NAME, RCC.COLUMN_NAME R_COLUMN_NAME FROM ALL_CONSTRAINTS AC JOIN ALL_CONS_COLUMNS CC ON AC.CONSTRAINT_NAME = CC.CONSTRAINT_NAME JOIN ALL_CONS_COLUMNS RCC ON AC.R_OWNER = RCC.OWNER AND AC.R_CONSTRAINT_NAME = RCC.CONSTRAINT_NAME WHERE AC.CONSTRAINT_TYPE='R' ", 1); if (!ZEPHIR_IS_STRING(schema, "")) { - ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 145, schema); + ZEPHIR_CALL_CE_STATIC(&_0$$3, phalcon_text_ce, "upper", &_1, 140, schema); zephir_check_call_status(); - ZEPHIR_CALL_CE_STATIC(&_2$$3, phalcon_text_ce, "upper", &_1, 145, table); + ZEPHIR_CALL_CE_STATIC(&_2$$3, phalcon_text_ce, "upper", &_1, 140, table); zephir_check_call_status(); ZEPHIR_INIT_VAR(_3$$3); ZEPHIR_CONCAT_SVSVS(_3$$3, "AND AC.OWNER='", _0$$3, "' AND AC.TABLE_NAME = '", _2$$3, "'"); zephir_concat_self(&sql, _3$$3 TSRMLS_CC); } else { - ZEPHIR_CALL_CE_STATIC(&_4$$4, phalcon_text_ce, "upper", &_1, 145, table); + ZEPHIR_CALL_CE_STATIC(&_4$$4, phalcon_text_ce, "upper", &_1, 140, table); zephir_check_call_status(); ZEPHIR_INIT_VAR(_5$$4); ZEPHIR_CONCAT_SVS(_5$$4, "AND AC.TABLE_NAME = '", _4$$4, "'"); @@ -53293,11 +53455,11 @@ static PHP_METHOD(Phalcon_Db_Dialect_Oracle, prepareTable) { } - ZEPHIR_CALL_CE_STATIC(&_1, phalcon_text_ce, "upper", &_2, 145, table); + ZEPHIR_CALL_CE_STATIC(&_1, phalcon_text_ce, "upper", &_2, 140, table); zephir_check_call_status(); - ZEPHIR_CALL_CE_STATIC(&_3, phalcon_text_ce, "upper", &_2, 145, schema); + ZEPHIR_CALL_CE_STATIC(&_3, phalcon_text_ce, "upper", &_2, 140, schema); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_PARENT(phalcon_db_dialect_oracle_ce, this_ptr, "preparetable", &_0, 146, _1, _3, alias, escapeChar); + ZEPHIR_RETURN_CALL_PARENT(phalcon_db_dialect_oracle_ce, this_ptr, "preparetable", &_0, 141, _1, _3, alias, escapeChar); zephir_check_call_status(); RETURN_MM(); @@ -53480,7 +53642,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, getColumnDefinition) { ZEPHIR_GET_HVALUE(value$$37, _11$$37); ZEPHIR_SINIT_NVAR(_12$$38); ZVAL_STRING(&_12$$38, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_13$$38, "addcslashes", &_14, 144, value$$37, &_12$$38); + ZEPHIR_CALL_FUNCTION(&_13$$38, "addcslashes", &_14, 139, value$$37, &_12$$38); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_15$$38); ZEPHIR_CONCAT_SVS(_15$$38, "\"", _13$$38, "\", "); @@ -53498,7 +53660,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, getColumnDefinition) { } else { ZEPHIR_SINIT_VAR(_20$$39); ZVAL_STRING(&_20$$39, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_21$$39, "addcslashes", &_14, 144, typeValues, &_20$$39); + ZEPHIR_CALL_FUNCTION(&_21$$39, "addcslashes", &_14, 139, typeValues, &_20$$39); zephir_check_call_status(); ZEPHIR_INIT_VAR(_22$$39); ZEPHIR_CONCAT_SVS(_22$$39, "(\"", _21$$39, "\")"); @@ -53579,7 +53741,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, addColumn) { } else { ZEPHIR_SINIT_VAR(_8$$6); ZVAL_STRING(&_8$$6, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_9$$6, "addcslashes", NULL, 144, defaultValue, &_8$$6); + ZEPHIR_CALL_FUNCTION(&_9$$6, "addcslashes", NULL, 139, defaultValue, &_8$$6); zephir_check_call_status(); ZEPHIR_INIT_VAR(_10$$6); ZEPHIR_CONCAT_SVS(_10$$6, " DEFAULT \"", _9$$6, "\""); @@ -53597,9 +53759,9 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, addColumn) { static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, modifyColumn) { - zend_bool _20$$8; + zend_bool _21$$8; int ZEPHIR_LAST_CALL_STATUS; - zval *tableName_param = NULL, *schemaName_param = NULL, *column, *currentColumn = NULL, *sql = NULL, *sqlAlterTable = NULL, *defaultValue = NULL, *columnDefinition = NULL, *_0 = NULL, *_1 = NULL, *_2 = NULL, *_6 = NULL, *_7 = NULL, *_10 = NULL, *_11 = NULL, *_17 = NULL, *_18 = NULL, *_3$$3 = NULL, *_4$$3 = NULL, *_5$$3, *_8$$4 = NULL, *_9$$4, *_12$$5 = NULL, *_13$$6 = NULL, *_14$$6, *_15$$7 = NULL, *_16$$7, *_19$$8 = NULL, *_21$$8 = NULL, *_24$$8 = NULL, *_22$$9 = NULL, *_23$$9, *_25$$10, *_26$$10, *_27$$11 = NULL, *_28$$11 = NULL, *_29$$11, *_30$$12 = NULL, *_31$$12, *_32$$13 = NULL, _33$$13, *_34$$13 = NULL, *_35$$13; + zval *tableName_param = NULL, *schemaName_param = NULL, *column, *currentColumn = NULL, *sql = NULL, *sqlAlterTable = NULL, *defaultValue = NULL, *columnDefinition = NULL, *_0 = NULL, *_1 = NULL, *_2 = NULL, *_3 = NULL, *_7 = NULL, *_8 = NULL, *_11 = NULL, *_12 = NULL, *_18 = NULL, *_19 = NULL, *_4$$3 = NULL, *_5$$3 = NULL, *_6$$3, *_9$$4 = NULL, *_10$$4, *_13$$5 = NULL, *_14$$6 = NULL, *_15$$6, *_16$$7 = NULL, *_17$$7, *_20$$8 = NULL, *_22$$8 = NULL, *_25$$8 = NULL, *_23$$9 = NULL, *_24$$9, *_26$$10, *_27$$10, *_28$$11 = NULL, *_29$$11 = NULL, *_30$$11, *_31$$12 = NULL, *_32$$12, *_33$$13 = NULL, _34$$13, *_35$$13 = NULL, *_36$$13; zval *tableName = NULL, *schemaName = NULL; ZEPHIR_MM_GROW(); @@ -53626,7 +53788,9 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, modifyColumn) { ZVAL_EMPTY_STRING(schemaName); } if (!currentColumn) { - currentColumn = ZEPHIR_GLOBAL(global_null); + ZEPHIR_CPY_WRT(currentColumn, ZEPHIR_GLOBAL(global_null)); + } else { + ZEPHIR_SEPARATE_PARAM(currentColumn); } @@ -53638,110 +53802,117 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, modifyColumn) { zephir_check_call_status(); ZEPHIR_INIT_VAR(sqlAlterTable); ZEPHIR_CONCAT_SV(sqlAlterTable, "ALTER TABLE ", _0); - ZEPHIR_CALL_METHOD(&_1, column, "getname", NULL, 0); + ZEPHIR_INIT_VAR(_1); + if (Z_TYPE_P(currentColumn) == IS_NULL) { + ZEPHIR_CPY_WRT(_1, column); + } else { + ZEPHIR_CPY_WRT(_1, currentColumn); + } + ZEPHIR_CPY_WRT(currentColumn, _1); + ZEPHIR_CALL_METHOD(&_2, column, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_2, currentColumn, "getname", NULL, 0); + ZEPHIR_CALL_METHOD(&_3, currentColumn, "getname", NULL, 0); zephir_check_call_status(); - if (!ZEPHIR_IS_EQUAL(_1, _2)) { - ZEPHIR_CALL_METHOD(&_3$$3, currentColumn, "getname", NULL, 0); + if (!ZEPHIR_IS_EQUAL(_2, _3)) { + ZEPHIR_CALL_METHOD(&_4$$3, currentColumn, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_4$$3, column, "getname", NULL, 0); + ZEPHIR_CALL_METHOD(&_5$$3, column, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_INIT_VAR(_5$$3); - ZEPHIR_CONCAT_VSVSVS(_5$$3, sqlAlterTable, " RENAME COLUMN \"", _3$$3, "\" TO \"", _4$$3, "\";"); - zephir_concat_self(&sql, _5$$3 TSRMLS_CC); + ZEPHIR_INIT_VAR(_6$$3); + ZEPHIR_CONCAT_VSVSVS(_6$$3, sqlAlterTable, " RENAME COLUMN \"", _4$$3, "\" TO \"", _5$$3, "\";"); + zephir_concat_self(&sql, _6$$3 TSRMLS_CC); } - ZEPHIR_CALL_METHOD(&_6, column, "gettype", NULL, 0); + ZEPHIR_CALL_METHOD(&_7, column, "gettype", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_7, currentColumn, "gettype", NULL, 0); + ZEPHIR_CALL_METHOD(&_8, currentColumn, "gettype", NULL, 0); zephir_check_call_status(); - if (!ZEPHIR_IS_EQUAL(_6, _7)) { - ZEPHIR_CALL_METHOD(&_8$$4, column, "getname", NULL, 0); + if (!ZEPHIR_IS_EQUAL(_7, _8)) { + ZEPHIR_CALL_METHOD(&_9$$4, column, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_INIT_VAR(_9$$4); - ZEPHIR_CONCAT_VSVSVS(_9$$4, sqlAlterTable, " ALTER COLUMN \"", _8$$4, "\" TYPE ", columnDefinition, ";"); - zephir_concat_self(&sql, _9$$4 TSRMLS_CC); + ZEPHIR_INIT_VAR(_10$$4); + ZEPHIR_CONCAT_VSVSVS(_10$$4, sqlAlterTable, " ALTER COLUMN \"", _9$$4, "\" TYPE ", columnDefinition, ";"); + zephir_concat_self(&sql, _10$$4 TSRMLS_CC); } - ZEPHIR_CALL_METHOD(&_10, column, "isnotnull", NULL, 0); + ZEPHIR_CALL_METHOD(&_11, column, "isnotnull", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_11, currentColumn, "isnotnull", NULL, 0); + ZEPHIR_CALL_METHOD(&_12, currentColumn, "isnotnull", NULL, 0); zephir_check_call_status(); - if (!ZEPHIR_IS_EQUAL(_10, _11)) { - ZEPHIR_CALL_METHOD(&_12$$5, column, "isnotnull", NULL, 0); + if (!ZEPHIR_IS_EQUAL(_11, _12)) { + ZEPHIR_CALL_METHOD(&_13$$5, column, "isnotnull", NULL, 0); zephir_check_call_status(); - if (zephir_is_true(_12$$5)) { - ZEPHIR_CALL_METHOD(&_13$$6, column, "getname", NULL, 0); + if (zephir_is_true(_13$$5)) { + ZEPHIR_CALL_METHOD(&_14$$6, column, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_INIT_VAR(_14$$6); - ZEPHIR_CONCAT_VSVS(_14$$6, sqlAlterTable, " ALTER COLUMN \"", _13$$6, "\" SET NOT NULL;"); - zephir_concat_self(&sql, _14$$6 TSRMLS_CC); + ZEPHIR_INIT_VAR(_15$$6); + ZEPHIR_CONCAT_VSVS(_15$$6, sqlAlterTable, " ALTER COLUMN \"", _14$$6, "\" SET NOT NULL;"); + zephir_concat_self(&sql, _15$$6 TSRMLS_CC); } else { - ZEPHIR_CALL_METHOD(&_15$$7, column, "getname", NULL, 0); + ZEPHIR_CALL_METHOD(&_16$$7, column, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_INIT_VAR(_16$$7); - ZEPHIR_CONCAT_VSVS(_16$$7, sqlAlterTable, " ALTER COLUMN \"", _15$$7, "\" DROP NOT NULL;"); - zephir_concat_self(&sql, _16$$7 TSRMLS_CC); + ZEPHIR_INIT_VAR(_17$$7); + ZEPHIR_CONCAT_VSVS(_17$$7, sqlAlterTable, " ALTER COLUMN \"", _16$$7, "\" DROP NOT NULL;"); + zephir_concat_self(&sql, _17$$7 TSRMLS_CC); } } - ZEPHIR_CALL_METHOD(&_17, column, "getdefault", NULL, 0); + ZEPHIR_CALL_METHOD(&_18, column, "getdefault", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_18, currentColumn, "getdefault", NULL, 0); + ZEPHIR_CALL_METHOD(&_19, currentColumn, "getdefault", NULL, 0); zephir_check_call_status(); - if (!ZEPHIR_IS_EQUAL(_17, _18)) { - ZEPHIR_CALL_METHOD(&_19$$8, column, "hasdefault", NULL, 0); + if (!ZEPHIR_IS_EQUAL(_18, _19)) { + ZEPHIR_CALL_METHOD(&_20$$8, column, "hasdefault", NULL, 0); zephir_check_call_status(); - _20$$8 = !zephir_is_true(_19$$8); - if (_20$$8) { - ZEPHIR_CALL_METHOD(&_21$$8, currentColumn, "getdefault", NULL, 0); + _21$$8 = !zephir_is_true(_20$$8); + if (_21$$8) { + ZEPHIR_CALL_METHOD(&_22$$8, currentColumn, "getdefault", NULL, 0); zephir_check_call_status(); - _20$$8 = !(ZEPHIR_IS_EMPTY(_21$$8)); + _21$$8 = !(ZEPHIR_IS_EMPTY(_22$$8)); } - if (_20$$8) { - ZEPHIR_CALL_METHOD(&_22$$9, column, "getname", NULL, 0); + if (_21$$8) { + ZEPHIR_CALL_METHOD(&_23$$9, column, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_INIT_VAR(_23$$9); - ZEPHIR_CONCAT_VSVS(_23$$9, sqlAlterTable, " ALTER COLUMN \"", _22$$9, "\" DROP DEFAULT;"); - zephir_concat_self(&sql, _23$$9 TSRMLS_CC); + ZEPHIR_INIT_VAR(_24$$9); + ZEPHIR_CONCAT_VSVS(_24$$9, sqlAlterTable, " ALTER COLUMN \"", _23$$9, "\" DROP DEFAULT;"); + zephir_concat_self(&sql, _24$$9 TSRMLS_CC); } - ZEPHIR_CALL_METHOD(&_24$$8, column, "hasdefault", NULL, 0); + ZEPHIR_CALL_METHOD(&_25$$8, column, "hasdefault", NULL, 0); zephir_check_call_status(); - if (zephir_is_true(_24$$8)) { + if (zephir_is_true(_25$$8)) { ZEPHIR_CALL_METHOD(&defaultValue, column, "getdefault", NULL, 0); zephir_check_call_status(); - ZEPHIR_INIT_VAR(_25$$10); - zephir_fast_strtoupper(_25$$10, columnDefinition); ZEPHIR_INIT_VAR(_26$$10); - zephir_fast_strtoupper(_26$$10, defaultValue); - if (zephir_memnstr_str(_25$$10, SL("BOOLEAN"), "phalcon/db/dialect/postgresql.zep", 238)) { - ZEPHIR_CALL_METHOD(&_27$$11, column, "getname", NULL, 0); + zephir_fast_strtoupper(_26$$10, columnDefinition); + ZEPHIR_INIT_VAR(_27$$10); + zephir_fast_strtoupper(_27$$10, defaultValue); + if (zephir_memnstr_str(_26$$10, SL("BOOLEAN"), "phalcon/db/dialect/postgresql.zep", 239)) { + ZEPHIR_CALL_METHOD(&_28$$11, column, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_INIT_VAR(_28$$11); + ZEPHIR_INIT_VAR(_29$$11); if (zephir_is_true(defaultValue)) { - ZEPHIR_INIT_NVAR(_28$$11); - ZVAL_STRING(_28$$11, "true", 1); + ZEPHIR_INIT_NVAR(_29$$11); + ZVAL_STRING(_29$$11, "true", 1); } else { - ZEPHIR_INIT_NVAR(_28$$11); - ZVAL_STRING(_28$$11, "false", 1); + ZEPHIR_INIT_NVAR(_29$$11); + ZVAL_STRING(_29$$11, "false", 1); } - ZEPHIR_INIT_VAR(_29$$11); - ZEPHIR_CONCAT_SVSV(_29$$11, " ALTER COLUMN \"", _27$$11, "\" SET DEFAULT ", _28$$11); - zephir_concat_self(&sql, _29$$11 TSRMLS_CC); - } else if (zephir_memnstr_str(_26$$10, SL("CURRENT_TIMESTAMP"), "phalcon/db/dialect/postgresql.zep", 240)) { - ZEPHIR_CALL_METHOD(&_30$$12, column, "getname", NULL, 0); + ZEPHIR_INIT_VAR(_30$$11); + ZEPHIR_CONCAT_SVSV(_30$$11, " ALTER COLUMN \"", _28$$11, "\" SET DEFAULT ", _29$$11); + zephir_concat_self(&sql, _30$$11 TSRMLS_CC); + } else if (zephir_memnstr_str(_27$$10, SL("CURRENT_TIMESTAMP"), "phalcon/db/dialect/postgresql.zep", 241)) { + ZEPHIR_CALL_METHOD(&_31$$12, column, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_INIT_VAR(_31$$12); - ZEPHIR_CONCAT_VSVS(_31$$12, sqlAlterTable, " ALTER COLUMN \"", _30$$12, "\" SET DEFAULT CURRENT_TIMESTAMP"); - zephir_concat_self(&sql, _31$$12 TSRMLS_CC); + ZEPHIR_INIT_VAR(_32$$12); + ZEPHIR_CONCAT_VSVS(_32$$12, sqlAlterTable, " ALTER COLUMN \"", _31$$12, "\" SET DEFAULT CURRENT_TIMESTAMP"); + zephir_concat_self(&sql, _32$$12 TSRMLS_CC); } else { - ZEPHIR_CALL_METHOD(&_32$$13, column, "getname", NULL, 0); + ZEPHIR_CALL_METHOD(&_33$$13, column, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_SINIT_VAR(_33$$13); - ZVAL_STRING(&_33$$13, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_34$$13, "addcslashes", NULL, 144, defaultValue, &_33$$13); + ZEPHIR_SINIT_VAR(_34$$13); + ZVAL_STRING(&_34$$13, "\"", 0); + ZEPHIR_CALL_FUNCTION(&_35$$13, "addcslashes", NULL, 139, defaultValue, &_34$$13); zephir_check_call_status(); - ZEPHIR_INIT_VAR(_35$$13); - ZEPHIR_CONCAT_VSVSVS(_35$$13, sqlAlterTable, " ALTER COLUMN \"", _32$$13, "\" SET DEFAULT \"", _34$$13, "\""); - zephir_concat_self(&sql, _35$$13 TSRMLS_CC); + ZEPHIR_INIT_VAR(_36$$13); + ZEPHIR_CONCAT_VSVSVS(_36$$13, sqlAlterTable, " ALTER COLUMN \"", _33$$13, "\" SET DEFAULT \"", _35$$13, "\""); + zephir_concat_self(&sql, _36$$13 TSRMLS_CC); } } } @@ -54138,7 +54309,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) { ZEPHIR_OBS_VAR(columns); if (!(zephir_array_isset_string_fetch(&columns, definition, SS("columns"), 0 TSRMLS_CC))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "The index 'columns' is required in the definition array", "phalcon/db/dialect/postgresql.zep", 350); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "The index 'columns' is required in the definition array", "phalcon/db/dialect/postgresql.zep", 351); return; } ZEPHIR_CALL_METHOD(&table, this_ptr, "preparetable", NULL, 0, tableName, schemaName); @@ -54160,7 +54331,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) { array_init(createLines); ZEPHIR_INIT_VAR(primaryColumns); array_init(primaryColumns); - zephir_is_iterable(columns, &_1, &_0, 0, 0, "phalcon/db/dialect/postgresql.zep", 406); + zephir_is_iterable(columns, &_1, &_0, 0, 0, "phalcon/db/dialect/postgresql.zep", 407); for ( ; zephir_hash_get_current_data_ex(_1, (void**) &_2, &_0) == SUCCESS ; zephir_hash_move_forward_ex(_1, &_0) @@ -54181,7 +54352,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) { zephir_fast_strtoupper(_6$$8, columnDefinition); ZEPHIR_INIT_NVAR(_7$$8); zephir_fast_strtoupper(_7$$8, defaultValue); - if (zephir_memnstr_str(_6$$8, SL("BOOLEAN"), "phalcon/db/dialect/postgresql.zep", 381)) { + if (zephir_memnstr_str(_6$$8, SL("BOOLEAN"), "phalcon/db/dialect/postgresql.zep", 382)) { ZEPHIR_INIT_LNVAR(_8$$9); if (zephir_is_true(defaultValue)) { ZEPHIR_INIT_NVAR(_8$$9); @@ -54193,12 +54364,12 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) { ZEPHIR_INIT_LNVAR(_9$$9); ZEPHIR_CONCAT_SV(_9$$9, " DEFAULT ", _8$$9); zephir_concat_self(&sql, _9$$9 TSRMLS_CC); - } else if (zephir_memnstr_str(_7$$8, SL("CURRENT_TIMESTAMP"), "phalcon/db/dialect/postgresql.zep", 383)) { + } else if (zephir_memnstr_str(_7$$8, SL("CURRENT_TIMESTAMP"), "phalcon/db/dialect/postgresql.zep", 384)) { zephir_concat_self_str(&columnLine, SL(" DEFAULT CURRENT_TIMESTAMP") TSRMLS_CC); } else { ZEPHIR_SINIT_NVAR(_10$$11); ZVAL_STRING(&_10$$11, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_11$$11, "addcslashes", &_12, 144, defaultValue, &_10$$11); + ZEPHIR_CALL_FUNCTION(&_11$$11, "addcslashes", &_12, 139, defaultValue, &_10$$11); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_13$$11); ZEPHIR_CONCAT_SVS(_13$$11, " DEFAULT \"", _11$$11, "\""); @@ -54215,22 +54386,22 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) { if (zephir_is_true(_15$$7)) { ZEPHIR_CALL_METHOD(&_16$$13, column, "getname", NULL, 0); zephir_check_call_status(); - zephir_array_append(&primaryColumns, _16$$13, PH_SEPARATE, "phalcon/db/dialect/postgresql.zep", 401); + zephir_array_append(&primaryColumns, _16$$13, PH_SEPARATE, "phalcon/db/dialect/postgresql.zep", 402); } - zephir_array_append(&createLines, columnLine, PH_SEPARATE, "phalcon/db/dialect/postgresql.zep", 404); + zephir_array_append(&createLines, columnLine, PH_SEPARATE, "phalcon/db/dialect/postgresql.zep", 405); } if (!(ZEPHIR_IS_EMPTY(primaryColumns))) { ZEPHIR_CALL_METHOD(&_17$$14, this_ptr, "getcolumnlist", NULL, 44, primaryColumns); zephir_check_call_status(); ZEPHIR_INIT_VAR(_18$$14); ZEPHIR_CONCAT_SVS(_18$$14, "PRIMARY KEY (", _17$$14, ")"); - zephir_array_append(&createLines, _18$$14, PH_SEPARATE, "phalcon/db/dialect/postgresql.zep", 407); + zephir_array_append(&createLines, _18$$14, PH_SEPARATE, "phalcon/db/dialect/postgresql.zep", 408); } ZEPHIR_INIT_VAR(indexSqlAfterCreate); ZVAL_STRING(indexSqlAfterCreate, "", 1); ZEPHIR_OBS_VAR(indexes); if (zephir_array_isset_string_fetch(&indexes, definition, SS("indexes"), 0 TSRMLS_CC)) { - zephir_is_iterable(indexes, &_20$$15, &_19$$15, 0, 0, "phalcon/db/dialect/postgresql.zep", 441); + zephir_is_iterable(indexes, &_20$$15, &_19$$15, 0, 0, "phalcon/db/dialect/postgresql.zep", 442); for ( ; zephir_hash_get_current_data_ex(_20$$15, (void**) &_21$$15, &_19$$15) == SUCCESS ; zephir_hash_move_forward_ex(_20$$15, &_19$$15) @@ -54260,7 +54431,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) { } else { ZEPHIR_CALL_METHOD(&_26$$20, index, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_27$$20, this_ptr, "preparetable", NULL, 146, tableName, schemaName); + ZEPHIR_CALL_METHOD(&_27$$20, this_ptr, "preparetable", NULL, 141, tableName, schemaName); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_28$$20); ZEPHIR_CONCAT_SVSV(_28$$20, "CREATE INDEX \"", _26$$20, "\" ON ", _27$$20); @@ -54275,13 +54446,13 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) { } } if (!(ZEPHIR_IS_EMPTY(indexSql))) { - zephir_array_append(&createLines, indexSql, PH_SEPARATE, "phalcon/db/dialect/postgresql.zep", 438); + zephir_array_append(&createLines, indexSql, PH_SEPARATE, "phalcon/db/dialect/postgresql.zep", 439); } } } ZEPHIR_OBS_VAR(references); if (zephir_array_isset_string_fetch(&references, definition, SS("references"), 0 TSRMLS_CC)) { - zephir_is_iterable(references, &_33$$22, &_32$$22, 0, 0, "phalcon/db/dialect/postgresql.zep", 466); + zephir_is_iterable(references, &_33$$22, &_32$$22, 0, 0, "phalcon/db/dialect/postgresql.zep", 467); for ( ; zephir_hash_get_current_data_ex(_33$$22, (void**) &_34$$22, &_32$$22) == SUCCESS ; zephir_hash_move_forward_ex(_33$$22, &_32$$22) @@ -54297,7 +54468,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) { ZEPHIR_CONCAT_SVSVS(referenceSql, "CONSTRAINT \"", _35$$23, "\" FOREIGN KEY (", _36$$23, ") REFERENCES "); ZEPHIR_CALL_METHOD(&_39$$23, reference, "getreferencedtable", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_38$$23, this_ptr, "preparetable", NULL, 146, _39$$23, schemaName); + ZEPHIR_CALL_METHOD(&_38$$23, this_ptr, "preparetable", NULL, 141, _39$$23, schemaName); zephir_check_call_status(); zephir_concat_self(&referenceSql, _38$$23 TSRMLS_CC); ZEPHIR_CALL_METHOD(&_41$$23, reference, "getreferencedcolumns", NULL, 0); @@ -54321,7 +54492,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createTable) { ZEPHIR_CONCAT_SV(_44$$25, " ON UPDATE ", onUpdate); zephir_concat_self(&referenceSql, _44$$25 TSRMLS_CC); } - zephir_array_append(&createLines, referenceSql, PH_SEPARATE, "phalcon/db/dialect/postgresql.zep", 464); + zephir_array_append(&createLines, referenceSql, PH_SEPARATE, "phalcon/db/dialect/postgresql.zep", 465); } } ZEPHIR_INIT_VAR(_45); @@ -54423,7 +54594,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, createView) { ZEPHIR_OBS_VAR(viewSql); if (!(zephir_array_isset_string_fetch(&viewSql, definition, SS("sql"), 0 TSRMLS_CC))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "The index 'sql' is required in the definition array", "phalcon/db/dialect/postgresql.zep", 503); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_db_exception_ce, "The index 'sql' is required in the definition array", "phalcon/db/dialect/postgresql.zep", 504); return; } ZEPHIR_CALL_METHOD(&_0, this_ptr, "preparetable", NULL, 0, viewName, schemaName); @@ -54891,7 +55062,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, getColumnDefinition) { ZEPHIR_GET_HVALUE(value$$25, _12$$25); ZEPHIR_SINIT_NVAR(_13$$26); ZVAL_STRING(&_13$$26, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_14$$26, "addcslashes", &_15, 144, value$$25, &_13$$26); + ZEPHIR_CALL_FUNCTION(&_14$$26, "addcslashes", &_15, 139, value$$25, &_13$$26); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_16$$26); ZEPHIR_CONCAT_SVS(_16$$26, "\"", _14$$26, "\", "); @@ -54909,7 +55080,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, getColumnDefinition) { } else { ZEPHIR_SINIT_VAR(_21$$27); ZVAL_STRING(&_21$$27, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_22$$27, "addcslashes", &_15, 144, typeValues, &_21$$27); + ZEPHIR_CALL_FUNCTION(&_22$$27, "addcslashes", &_15, 139, typeValues, &_21$$27); zephir_check_call_status(); ZEPHIR_INIT_VAR(_23$$27); ZEPHIR_CONCAT_SVS(_23$$27, "(\"", _22$$27, "\")"); @@ -54976,7 +55147,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, addColumn) { } else { ZEPHIR_SINIT_VAR(_6$$5); ZVAL_STRING(&_6$$5, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_7$$5, "addcslashes", NULL, 144, defaultValue, &_6$$5); + ZEPHIR_CALL_FUNCTION(&_7$$5, "addcslashes", NULL, 139, defaultValue, &_6$$5); zephir_check_call_status(); ZEPHIR_INIT_VAR(_8$$5); ZEPHIR_CONCAT_SVS(_8$$5, " DEFAULT \"", _7$$5, "\""); @@ -55445,7 +55616,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, createTable) { } else { ZEPHIR_SINIT_NVAR(_12$$12); ZVAL_STRING(&_12$$12, "\"", 0); - ZEPHIR_CALL_FUNCTION(&_13$$12, "addcslashes", &_14, 144, defaultValue, &_12$$12); + ZEPHIR_CALL_FUNCTION(&_13$$12, "addcslashes", &_14, 139, defaultValue, &_12$$12); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_15$$12); ZEPHIR_CONCAT_SVS(_15$$12, " DEFAULT \"", _13$$12, "\""); @@ -56640,7 +56811,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, all) { ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "variables", 1); zephir_array_fast_append(_0, _1); - ZEPHIR_CALL_FUNCTION(&_2, "func_get_args", NULL, 168); + ZEPHIR_CALL_FUNCTION(&_2, "func_get_args", NULL, 163); zephir_check_call_status(); ZEPHIR_CALL_USER_FUNC_ARRAY(return_value, _0, _2); zephir_check_call_status(); @@ -56839,7 +57010,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, output) { ZVAL_STRING(_21$$7, "", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_INIT_NVAR(_22$$7); ZVAL_LONG(_22$$7, (tab + 1)); - ZEPHIR_CALL_METHOD(&_20$$7, this_ptr, "output", &_23, 169, value, _21$$7, _22$$7); + ZEPHIR_CALL_METHOD(&_20$$7, this_ptr, "output", &_23, 164, value, _21$$7, _22$$7); zephir_check_temp_parameter(_21$$7); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_24$$7); @@ -56871,7 +57042,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, output) { ZEPHIR_CALL_FUNCTION(&_27$$8, "strtr", &_6, 55, &_29$$8, _26$$8); zephir_check_call_status(); zephir_concat_self(&output, _27$$8 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_30$$8, "get_parent_class", &_31, 170, variable); + ZEPHIR_CALL_FUNCTION(&_30$$8, "get_parent_class", &_31, 165, variable); zephir_check_call_status(); if (zephir_is_true(_30$$8)) { ZEPHIR_INIT_VAR(_32$$9); @@ -56882,7 +57053,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, output) { zephir_check_temp_parameter(_34$$9); zephir_check_call_status(); zephir_array_update_string(&_32$$9, SL(":style"), &_33$$9, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_FUNCTION(&_33$$9, "get_parent_class", &_31, 170, variable); + ZEPHIR_CALL_FUNCTION(&_33$$9, "get_parent_class", &_31, 165, variable); zephir_check_call_status(); zephir_array_update_string(&_32$$9, SL(":parent"), &_33$$9, PH_COPY | PH_SEPARATE); ZEPHIR_SINIT_VAR(_35$$9); @@ -56928,7 +57099,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, output) { ZVAL_STRING(_45$$11, "", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_INIT_NVAR(_48$$11); ZVAL_LONG(_48$$11, (tab + 1)); - ZEPHIR_CALL_METHOD(&_47$$11, this_ptr, "output", &_23, 169, value, _45$$11, _48$$11); + ZEPHIR_CALL_METHOD(&_47$$11, this_ptr, "output", &_23, 164, value, _45$$11, _48$$11); zephir_check_temp_parameter(_45$$11); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_49$$11); @@ -56938,7 +57109,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, output) { } else { do { ZEPHIR_MAKE_REF(variable); - ZEPHIR_CALL_FUNCTION(&attr, "each", &_50, 171, variable); + ZEPHIR_CALL_FUNCTION(&attr, "each", &_50, 166, variable); ZEPHIR_UNREF(variable); zephir_check_call_status(); if (!(zephir_is_true(attr))) { @@ -56984,7 +57155,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, output) { zephir_check_call_status(); zephir_array_update_string(&_59$$13, SL(":style"), &_60$$13, PH_COPY | PH_SEPARATE); ZEPHIR_MAKE_REF(key); - ZEPHIR_CALL_FUNCTION(&_60$$13, "end", &_61, 172, key); + ZEPHIR_CALL_FUNCTION(&_60$$13, "end", &_61, 167, key); ZEPHIR_UNREF(key); zephir_check_call_status(); zephir_array_update_string(&_59$$13, SL(":key"), &_60$$13, PH_COPY | PH_SEPARATE); @@ -57000,7 +57171,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, output) { ZVAL_STRING(_51$$13, "", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_INIT_NVAR(_64$$13); ZVAL_LONG(_64$$13, (tab + 1)); - ZEPHIR_CALL_METHOD(&_63$$13, this_ptr, "output", &_23, 169, value, _51$$13, _64$$13); + ZEPHIR_CALL_METHOD(&_63$$13, this_ptr, "output", &_23, 164, value, _51$$13, _64$$13); zephir_check_temp_parameter(_51$$13); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_65$$13); @@ -57008,7 +57179,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, output) { zephir_concat_self(&output, _65$$13 TSRMLS_CC); } while (zephir_is_true(attr)); } - ZEPHIR_CALL_FUNCTION(&attr, "get_class_methods", NULL, 173, variable); + ZEPHIR_CALL_FUNCTION(&attr, "get_class_methods", NULL, 168, variable); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_29$$8); ZVAL_LONG(&_29$$8, tab); @@ -57130,7 +57301,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, output) { ZEPHIR_CONCAT_VV(return_value, output, _95$$23); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_98, "is_float", NULL, 174, variable); + ZEPHIR_CALL_FUNCTION(&_98, "is_float", NULL, 169, variable); zephir_check_call_status(); if (zephir_is_true(_98)) { ZEPHIR_INIT_VAR(_99$$24); @@ -57181,9 +57352,9 @@ static PHP_METHOD(Phalcon_Debug_Dump, output) { ZVAL_LONG(&_110$$26, 4); ZEPHIR_SINIT_VAR(_111$$26); ZVAL_STRING(&_111$$26, "utf-8", 0); - ZEPHIR_CALL_FUNCTION(&_108$$26, "htmlentities", NULL, 154, variable, &_110$$26, &_111$$26); + ZEPHIR_CALL_FUNCTION(&_108$$26, "htmlentities", NULL, 149, variable, &_110$$26, &_111$$26); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_112$$26, "nl2br", NULL, 175, _108$$26); + ZEPHIR_CALL_FUNCTION(&_112$$26, "nl2br", NULL, 170, _108$$26); zephir_check_call_status(); zephir_array_update_string(&_107$$26, SL(":var"), &_112$$26, PH_COPY | PH_SEPARATE); ZEPHIR_SINIT_NVAR(_110$$26); @@ -57301,7 +57472,7 @@ static PHP_METHOD(Phalcon_Debug_Dump, variables) { ZEPHIR_INIT_VAR(output); ZVAL_STRING(output, "", 1); - ZEPHIR_CALL_FUNCTION(&_0, "func_get_args", NULL, 168); + ZEPHIR_CALL_FUNCTION(&_0, "func_get_args", NULL, 163); zephir_check_call_status(); zephir_is_iterable(_0, &_2, &_1, 0, 0, "phalcon/debug/dump.zep", 290); for ( @@ -58070,7 +58241,7 @@ static PHP_METHOD(Phalcon_Di_Service, resolve) { ZEPHIR_CALL_METHOD(NULL, builder, "__construct", NULL, 0); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&instance, builder, "build", NULL, 177, dependencyInjector, definition, parameters); + ZEPHIR_CALL_METHOD(&instance, builder, "build", NULL, 172, dependencyInjector, definition, parameters); zephir_check_call_status(); } else { found = 0; @@ -58271,7 +58442,7 @@ static PHP_METHOD(Phalcon_Di_FactoryDefault_Cli, __construct) { ZEPHIR_MM_GROW(); - ZEPHIR_CALL_PARENT(NULL, phalcon_di_factorydefault_cli_ce, this_ptr, "__construct", &_0, 176); + ZEPHIR_CALL_PARENT(NULL, phalcon_di_factorydefault_cli_ce, this_ptr, "__construct", &_0, 171); zephir_check_call_status(); ZEPHIR_INIT_VAR(_1); zephir_create_array(_1, 10, 0 TSRMLS_CC); @@ -58571,7 +58742,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, _buildParameters) { ) { ZEPHIR_GET_HMKEY(position, _1, _0); ZEPHIR_GET_HVALUE(argument, _2); - ZEPHIR_CALL_METHOD(&_3$$3, this_ptr, "_buildparameter", &_4, 178, dependencyInjector, position, argument); + ZEPHIR_CALL_METHOD(&_3$$3, this_ptr, "_buildparameter", &_4, 173, dependencyInjector, position, argument); zephir_check_call_status(); zephir_array_append(&buildArguments, _3$$3, PH_SEPARATE, "phalcon/di/service/builder.zep", 117); } @@ -58615,7 +58786,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build) { } else { ZEPHIR_OBS_VAR(arguments); if (zephir_array_isset_string_fetch(&arguments, definition, SS("arguments"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_0$$8, this_ptr, "_buildparameters", &_1, 179, dependencyInjector, arguments); + ZEPHIR_CALL_METHOD(&_0$$8, this_ptr, "_buildparameters", &_1, 174, dependencyInjector, arguments); zephir_check_call_status(); ZEPHIR_INIT_NVAR(instance); ZEPHIR_LAST_CALL_STATUS = zephir_create_instance_params(instance, className, _0$$8 TSRMLS_CC); @@ -58685,7 +58856,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build) { } if (zephir_fast_count_int(arguments TSRMLS_CC)) { ZEPHIR_INIT_NVAR(_12$$18); - ZEPHIR_CALL_METHOD(&_13$$18, this_ptr, "_buildparameters", &_1, 179, dependencyInjector, arguments); + ZEPHIR_CALL_METHOD(&_13$$18, this_ptr, "_buildparameters", &_1, 174, dependencyInjector, arguments); zephir_check_call_status(); ZEPHIR_CALL_USER_FUNC_ARRAY(_12$$18, methodCall, _13$$18); zephir_check_call_status(); @@ -58749,7 +58920,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build) { ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_24$$22, this_ptr, "_buildparameter", &_25, 178, dependencyInjector, propertyPosition, propertyValue); + ZEPHIR_CALL_METHOD(&_24$$22, this_ptr, "_buildparameter", &_25, 173, dependencyInjector, propertyPosition, propertyValue); zephir_check_call_status(); zephir_update_property_zval_zval(instance, propertyName, _24$$22 TSRMLS_CC); } @@ -59067,7 +59238,7 @@ static PHP_METHOD(Phalcon_Events_Manager, attach) { } ZEPHIR_INIT_VAR(_2$$5); ZVAL_LONG(_2$$5, 1); - ZEPHIR_CALL_METHOD(NULL, priorityQueue, "setextractflags", NULL, 186, _2$$5); + ZEPHIR_CALL_METHOD(NULL, priorityQueue, "setextractflags", NULL, 181, _2$$5); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("_events"), eventType, priorityQueue TSRMLS_CC); } else { @@ -59077,7 +59248,7 @@ static PHP_METHOD(Phalcon_Events_Manager, attach) { if (Z_TYPE_P(priorityQueue) == IS_OBJECT) { ZEPHIR_INIT_VAR(_3$$7); ZVAL_LONG(_3$$7, priority); - ZEPHIR_CALL_METHOD(NULL, priorityQueue, "insert", NULL, 187, handler, _3$$7); + ZEPHIR_CALL_METHOD(NULL, priorityQueue, "insert", NULL, 182, handler, _3$$7); zephir_check_call_status(); } else { zephir_array_append(&priorityQueue, handler, PH_SEPARATE, "phalcon/events/manager.zep", 82); @@ -59125,7 +59296,7 @@ static PHP_METHOD(Phalcon_Events_Manager, detach) { } ZEPHIR_INIT_VAR(_1$$5); ZVAL_LONG(_1$$5, 1); - ZEPHIR_CALL_METHOD(NULL, newPriorityQueue, "setextractflags", NULL, 186, _1$$5); + ZEPHIR_CALL_METHOD(NULL, newPriorityQueue, "setextractflags", NULL, 181, _1$$5); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_1$$5); ZVAL_LONG(_1$$5, 3); @@ -59147,13 +59318,13 @@ static PHP_METHOD(Phalcon_Events_Manager, detach) { if (!ZEPHIR_IS_IDENTICAL(_5$$6, handler)) { zephir_array_fetch_string(&_6$$7, data, SL("data"), PH_NOISY | PH_READONLY, "phalcon/events/manager.zep", 117 TSRMLS_CC); zephir_array_fetch_string(&_7$$7, data, SL("priority"), PH_NOISY | PH_READONLY, "phalcon/events/manager.zep", 117 TSRMLS_CC); - ZEPHIR_CALL_METHOD(NULL, newPriorityQueue, "insert", &_8, 187, _6$$7, _7$$7); + ZEPHIR_CALL_METHOD(NULL, newPriorityQueue, "insert", &_8, 182, _6$$7, _7$$7); zephir_check_call_status(); } } zephir_update_property_array(this_ptr, SL("_events"), eventType, newPriorityQueue TSRMLS_CC); } else { - ZEPHIR_CALL_FUNCTION(&key, "array_search", NULL, 188, handler, priorityQueue, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(&key, "array_search", NULL, 183, handler, priorityQueue, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(key)) { zephir_array_unset(&priorityQueue, key, PH_SEPARATE); @@ -59318,7 +59489,7 @@ static PHP_METHOD(Phalcon_Events_Manager, fireQueue) { zephir_get_class(_1$$5, queue, 0 TSRMLS_CC); ZEPHIR_SINIT_VAR(_2$$5); ZVAL_STRING(&_2$$5, "Unexpected value type: expected object of type SplPriorityQueue, %s given", 0); - ZEPHIR_CALL_FUNCTION(&_3$$5, "sprintf", NULL, 189, &_2$$5, _1$$5); + ZEPHIR_CALL_FUNCTION(&_3$$5, "sprintf", NULL, 184, &_2$$5, _1$$5); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, _0$$5, "__construct", NULL, 9, _3$$5); zephir_check_call_status(); @@ -59536,9 +59707,9 @@ static PHP_METHOD(Phalcon_Events_Manager, fire) { } else { ZVAL_BOOL(_4$$7, 0); } - ZEPHIR_CALL_METHOD(NULL, event, "__construct", &_5, 190, eventName, source, data, _4$$7); + ZEPHIR_CALL_METHOD(NULL, event, "__construct", &_5, 185, eventName, source, data, _4$$7); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", &_6, 191, fireEvents, event); + ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", &_6, 186, fireEvents, event); zephir_check_call_status(); } } @@ -59558,10 +59729,10 @@ static PHP_METHOD(Phalcon_Events_Manager, fire) { } else { ZVAL_BOOL(_8$$10, 0); } - ZEPHIR_CALL_METHOD(NULL, event, "__construct", &_5, 190, eventName, source, data, _8$$10); + ZEPHIR_CALL_METHOD(NULL, event, "__construct", &_5, 185, eventName, source, data, _8$$10); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", &_6, 191, fireEvents, event); + ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", &_6, 186, fireEvents, event); zephir_check_call_status(); } } @@ -59772,7 +59943,7 @@ static PHP_METHOD(Phalcon_Flash_Direct, output) { } } if (remove) { - ZEPHIR_CALL_PARENT(NULL, phalcon_flash_direct_ce, this_ptr, "clear", &_3, 198); + ZEPHIR_CALL_PARENT(NULL, phalcon_flash_direct_ce, this_ptr, "clear", &_3, 193); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -60073,7 +60244,7 @@ static PHP_METHOD(Phalcon_Flash_Session, output) { zephir_check_call_status(); } } - ZEPHIR_CALL_PARENT(NULL, phalcon_flash_session_ce, this_ptr, "clear", &_5, 198); + ZEPHIR_CALL_PARENT(NULL, phalcon_flash_session_ce, this_ptr, "clear", &_5, 193); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -60091,7 +60262,7 @@ static PHP_METHOD(Phalcon_Flash_Session, clear) { ZVAL_BOOL(_0, 1); ZEPHIR_CALL_METHOD(NULL, this_ptr, "_getsessionmessages", NULL, 0, _0); zephir_check_call_status(); - ZEPHIR_CALL_PARENT(NULL, phalcon_flash_session_ce, this_ptr, "clear", &_1, 198); + ZEPHIR_CALL_PARENT(NULL, phalcon_flash_session_ce, this_ptr, "clear", &_1, 193); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -61101,7 +61272,7 @@ static PHP_METHOD(Phalcon_Forms_Form, bind) { ZEPHIR_CPY_WRT(filteredValue, value); } ZEPHIR_INIT_NVAR(_6$$4); - zephir_camelize(_6$$4, key); + zephir_camelize(_6$$4, key, NULL ); ZEPHIR_INIT_NVAR(method); ZEPHIR_CONCAT_SV(method, "set", _6$$4); if ((zephir_method_exists(entity, method TSRMLS_CC) == SUCCESS)) { @@ -61204,7 +61375,7 @@ static PHP_METHOD(Phalcon_Forms_Form, isValid) { } else { ZEPHIR_INIT_NVAR(validation); object_init_ex(validation, phalcon_validation_ce); - ZEPHIR_CALL_METHOD(NULL, validation, "__construct", &_11, 212, preparedValidators); + ZEPHIR_CALL_METHOD(NULL, validation, "__construct", &_11, 207, preparedValidators); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(&filters, element, "getfilters", NULL, 0); @@ -61212,10 +61383,10 @@ static PHP_METHOD(Phalcon_Forms_Form, isValid) { if (Z_TYPE_P(filters) == IS_ARRAY) { ZEPHIR_CALL_METHOD(&_12$$16, element, "getname", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, validation, "setfilters", &_13, 213, _12$$16, filters); + ZEPHIR_CALL_METHOD(NULL, validation, "setfilters", &_13, 208, _12$$16, filters); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&elementMessages, validation, "validate", &_14, 214, data, entity); + ZEPHIR_CALL_METHOD(&elementMessages, validation, "validate", &_14, 209, data, entity); zephir_check_call_status(); if (zephir_fast_count_int(elementMessages TSRMLS_CC)) { ZEPHIR_CALL_METHOD(&_15$$17, element, "getname", NULL, 0); @@ -61278,7 +61449,7 @@ static PHP_METHOD(Phalcon_Forms_Form, getMessages) { ; zephir_hash_move_forward_ex(_2$$5, &_1$$5) ) { ZEPHIR_GET_HVALUE(elementMessages, _3$$5); - ZEPHIR_CALL_METHOD(NULL, group, "appendmessages", &_4, 215, elementMessages); + ZEPHIR_CALL_METHOD(NULL, group, "appendmessages", &_4, 210, elementMessages); zephir_check_call_status(); } } @@ -61591,7 +61762,7 @@ static PHP_METHOD(Phalcon_Forms_Form, getValue) { } if (Z_TYPE_P(entity) == IS_OBJECT) { ZEPHIR_INIT_VAR(_0$$4); - zephir_camelize(_0$$4, name); + zephir_camelize(_0$$4, name, NULL ); ZEPHIR_INIT_VAR(method); ZEPHIR_CONCAT_SV(method, "get", _0$$4); if ((zephir_method_exists(entity, method TSRMLS_CC) == SUCCESS)) { @@ -61611,7 +61782,7 @@ static PHP_METHOD(Phalcon_Forms_Form, getValue) { } } ZEPHIR_INIT_VAR(_1); - zephir_camelize(_1, name); + zephir_camelize(_1, name, NULL ); ZEPHIR_INIT_NVAR(method); ZEPHIR_CONCAT_SV(method, "get", _1); if ((zephir_method_exists(this_ptr, method TSRMLS_CC) == SUCCESS)) { @@ -61741,7 +61912,7 @@ static PHP_METHOD(Phalcon_Forms_Form, rewind) { ZVAL_LONG(_0, 0); zephir_update_property_this(this_ptr, SL("_position"), _0 TSRMLS_CC); _0 = zephir_fetch_nproperty_this(this_ptr, SL("_elements"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_1, "array_values", NULL, 216, _0); + ZEPHIR_CALL_FUNCTION(&_1, "array_values", NULL, 211, _0); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_elementsIndexed"), _1 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -61835,7 +62006,7 @@ static PHP_METHOD(Phalcon_Forms_Manager, create) { } ZEPHIR_INIT_VAR(form); object_init_ex(form, phalcon_forms_form_ce); - ZEPHIR_CALL_METHOD(NULL, form, "__construct", NULL, 217, entity); + ZEPHIR_CALL_METHOD(NULL, form, "__construct", NULL, 212, entity); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("_forms"), name, form TSRMLS_CC); RETURN_CCTOR(form); @@ -61944,7 +62115,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Check, render) { ZVAL_BOOL(_2, 1); ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes, _2); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "checkfield", &_0, 199, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "checkfield", &_0, 194, _1); zephir_check_call_status(); RETURN_MM(); @@ -61989,7 +62160,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Date, render) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "datefield", &_0, 200, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "datefield", &_0, 195, _1); zephir_check_call_status(); RETURN_MM(); @@ -62034,7 +62205,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Email, render) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "emailfield", &_0, 201, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "emailfield", &_0, 196, _1); zephir_check_call_status(); RETURN_MM(); @@ -62079,7 +62250,7 @@ static PHP_METHOD(Phalcon_Forms_Element_File, render) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "filefield", &_0, 202, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "filefield", &_0, 197, _1); zephir_check_call_status(); RETURN_MM(); @@ -62124,7 +62295,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Hidden, render) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "hiddenfield", &_0, 203, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "hiddenfield", &_0, 198, _1); zephir_check_call_status(); RETURN_MM(); @@ -62169,7 +62340,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Numeric, render) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "numericfield", &_0, 204, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "numericfield", &_0, 199, _1); zephir_check_call_status(); RETURN_MM(); @@ -62214,7 +62385,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Password, render) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "passwordfield", &_0, 205, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "passwordfield", &_0, 200, _1); zephir_check_call_status(); RETURN_MM(); @@ -62261,7 +62432,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Radio, render) { ZVAL_BOOL(_2, 1); ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes, _2); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "radiofield", &_0, 206, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "radiofield", &_0, 201, _1); zephir_check_call_status(); RETURN_MM(); @@ -62312,7 +62483,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Select, __construct) { zephir_update_property_this(this_ptr, SL("_optionsValues"), options TSRMLS_CC); - ZEPHIR_CALL_PARENT(NULL, phalcon_forms_element_select_ce, this_ptr, "__construct", &_0, 207, name, attributes); + ZEPHIR_CALL_PARENT(NULL, phalcon_forms_element_select_ce, this_ptr, "__construct", &_0, 202, name, attributes); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -62384,7 +62555,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Select, render) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes); zephir_check_call_status(); _2 = zephir_fetch_nproperty_this(this_ptr, SL("_optionsValues"), PH_NOISY_CC); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_select_ce, "selectfield", &_0, 208, _1, _2); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_select_ce, "selectfield", &_0, 203, _1, _2); zephir_check_call_status(); RETURN_MM(); @@ -62429,7 +62600,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Submit, render) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "submitbutton", &_0, 209, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "submitbutton", &_0, 204, _1); zephir_check_call_status(); RETURN_MM(); @@ -62474,7 +62645,7 @@ static PHP_METHOD(Phalcon_Forms_Element_Text, render) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "textfield", &_0, 210, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "textfield", &_0, 205, _1); zephir_check_call_status(); RETURN_MM(); @@ -62519,7 +62690,7 @@ static PHP_METHOD(Phalcon_Forms_Element_TextArea, render) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "prepareattributes", NULL, 0, attributes); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "textarea", &_0, 211, _1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_tag_ce, "textarea", &_0, 206, _1); zephir_check_call_status(); RETURN_MM(); @@ -62837,7 +63008,7 @@ static PHP_METHOD(Phalcon_Http_Cookie, send) { } else { ZEPHIR_CPY_WRT(encryptValue, value); } - ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 218, name, encryptValue, expire, path, domain, secure, httpOnly); + ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 213, name, encryptValue, expire, path, domain, secure, httpOnly); zephir_check_call_status(); RETURN_THIS(); @@ -62937,7 +63108,7 @@ static PHP_METHOD(Phalcon_Http_Cookie, delete) { zephir_time(_4); ZEPHIR_SINIT_VAR(_5); ZVAL_LONG(&_5, (zephir_get_numberval(_4) - 691200)); - ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 218, name, ZEPHIR_GLOBAL(global_null), &_5, path, domain, secure, httpOnly); + ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 213, name, ZEPHIR_GLOBAL(global_null), &_5, path, domain, secure, httpOnly); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -63372,7 +63543,7 @@ static PHP_METHOD(Phalcon_Http_Request, get) { } else { ZVAL_BOOL(_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 219, _REQUEST, name, filters, defaultValue, _0, _1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 214, _REQUEST, name, filters, defaultValue, _0, _1); zephir_check_call_status(); RETURN_MM(); @@ -63434,7 +63605,7 @@ static PHP_METHOD(Phalcon_Http_Request, getPost) { } else { ZVAL_BOOL(_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 219, _POST, name, filters, defaultValue, _0, _1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 214, _POST, name, filters, defaultValue, _0, _1); zephir_check_call_status(); RETURN_MM(); @@ -63491,7 +63662,7 @@ static PHP_METHOD(Phalcon_Http_Request, getPut) { ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "getrawbody", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(put); - ZEPHIR_CALL_FUNCTION(NULL, "parse_str", NULL, 220, _0$$3, put); + ZEPHIR_CALL_FUNCTION(NULL, "parse_str", NULL, 215, _0$$3, put); ZEPHIR_UNREF(put); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_putCache"), put TSRMLS_CC); @@ -63508,7 +63679,7 @@ static PHP_METHOD(Phalcon_Http_Request, getPut) { } else { ZVAL_BOOL(_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 219, put, name, filters, defaultValue, _1, _2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 214, put, name, filters, defaultValue, _1, _2); zephir_check_call_status(); RETURN_MM(); @@ -63570,7 +63741,7 @@ static PHP_METHOD(Phalcon_Http_Request, getQuery) { } else { ZVAL_BOOL(_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 219, _GET, name, filters, defaultValue, _0, _1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 214, _GET, name, filters, defaultValue, _0, _1); zephir_check_call_status(); RETURN_MM(); @@ -64008,7 +64179,7 @@ static PHP_METHOD(Phalcon_Http_Request, getServerAddress) { } ZEPHIR_SINIT_VAR(_0); ZVAL_STRING(&_0, "localhost", 0); - ZEPHIR_RETURN_CALL_FUNCTION("gethostbyname", NULL, 221, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("gethostbyname", NULL, 216, &_0); zephir_check_call_status(); RETURN_MM(); @@ -64203,7 +64374,7 @@ static PHP_METHOD(Phalcon_Http_Request, isMethod) { } - ZEPHIR_CALL_METHOD(&httpMethod, this_ptr, "getmethod", NULL, 222); + ZEPHIR_CALL_METHOD(&httpMethod, this_ptr, "getmethod", NULL, 217); zephir_check_call_status(); if (Z_TYPE_P(methods) == IS_STRING) { _0$$3 = strict; @@ -64275,7 +64446,7 @@ static PHP_METHOD(Phalcon_Http_Request, isPost) { ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 222); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 217); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(_0, "POST")); @@ -64288,7 +64459,7 @@ static PHP_METHOD(Phalcon_Http_Request, isGet) { ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 222); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 217); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(_0, "GET")); @@ -64301,7 +64472,7 @@ static PHP_METHOD(Phalcon_Http_Request, isPut) { ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 222); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 217); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(_0, "PUT")); @@ -64314,7 +64485,7 @@ static PHP_METHOD(Phalcon_Http_Request, isPatch) { ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 222); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 217); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(_0, "PATCH")); @@ -64327,7 +64498,7 @@ static PHP_METHOD(Phalcon_Http_Request, isHead) { ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 222); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 217); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(_0, "HEAD")); @@ -64340,7 +64511,7 @@ static PHP_METHOD(Phalcon_Http_Request, isDelete) { ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 222); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 217); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(_0, "DELETE")); @@ -64353,7 +64524,7 @@ static PHP_METHOD(Phalcon_Http_Request, isOptions) { ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 222); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 217); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(_0, "OPTIONS")); @@ -64408,7 +64579,7 @@ static PHP_METHOD(Phalcon_Http_Request, hasFiles) { } else { ZVAL_BOOL(_5$$8, 0); } - ZEPHIR_CALL_METHOD(&_4$$8, this_ptr, "hasfilehelper", &_6, 223, error, _5$$8); + ZEPHIR_CALL_METHOD(&_4$$8, this_ptr, "hasfilehelper", &_6, 218, error, _5$$8); zephir_check_call_status(); numberFiles += zephir_get_numberval(_4$$8); } @@ -64459,7 +64630,7 @@ static PHP_METHOD(Phalcon_Http_Request, hasFileHelper) { } else { ZVAL_BOOL(_5$$7, 0); } - ZEPHIR_CALL_METHOD(&_4$$7, this_ptr, "hasfilehelper", &_6, 223, value, _5$$7); + ZEPHIR_CALL_METHOD(&_4$$7, this_ptr, "hasfilehelper", &_6, 218, value, _5$$7); zephir_check_call_status(); numberFiles += zephir_get_numberval(_4$$7); } @@ -64508,7 +64679,7 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) { zephir_array_fetch_string(&_6$$5, input, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/http/request.zep", 699 TSRMLS_CC); zephir_array_fetch_string(&_7$$5, input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/http/request.zep", 699 TSRMLS_CC); zephir_array_fetch_string(&_8$$5, input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/http/request.zep", 699 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_9, 224, _4$$5, _5$$5, _6$$5, _7$$5, _8$$5, prefix); + ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_9, 219, _4$$5, _5$$5, _6$$5, _7$$5, _8$$5, prefix); zephir_check_call_status(); zephir_is_iterable(smoothInput, &_11$$5, &_10$$5, 0, 0, "phalcon/http/request.zep", 714); for ( @@ -64542,7 +64713,7 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) { ZEPHIR_INIT_NVAR(_16$$7); object_init_ex(_16$$7, phalcon_http_request_file_ce); zephir_array_fetch_string(&_17$$7, file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/http/request.zep", 711 TSRMLS_CC); - ZEPHIR_CALL_METHOD(NULL, _16$$7, "__construct", &_18, 225, dataFile, _17$$7); + ZEPHIR_CALL_METHOD(NULL, _16$$7, "__construct", &_18, 220, dataFile, _17$$7); zephir_check_call_status(); zephir_array_append(&files, _16$$7, PH_SEPARATE, "phalcon/http/request.zep", 711); } @@ -64556,7 +64727,7 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) { if (_19$$8) { ZEPHIR_INIT_NVAR(_21$$9); object_init_ex(_21$$9, phalcon_http_request_file_ce); - ZEPHIR_CALL_METHOD(NULL, _21$$9, "__construct", &_18, 225, input, prefix); + ZEPHIR_CALL_METHOD(NULL, _21$$9, "__construct", &_18, 220, input, prefix); zephir_check_call_status(); zephir_array_append(&files, _21$$9, PH_SEPARATE, "phalcon/http/request.zep", 716); } @@ -64624,7 +64795,7 @@ static PHP_METHOD(Phalcon_Http_Request, smoothFiles) { zephir_array_fetch(&_7$$5, tmp_names, idx, PH_NOISY | PH_READONLY, "phalcon/http/request.zep", 750 TSRMLS_CC); zephir_array_fetch(&_8$$5, sizes, idx, PH_NOISY | PH_READONLY, "phalcon/http/request.zep", 750 TSRMLS_CC); zephir_array_fetch(&_9$$5, errors, idx, PH_NOISY | PH_READONLY, "phalcon/http/request.zep", 750 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_10, 224, _5$$5, _6$$5, _7$$5, _8$$5, _9$$5, p); + ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_10, 219, _5$$5, _6$$5, _7$$5, _8$$5, _9$$5, p); zephir_check_call_status(); zephir_is_iterable(parentFiles, &_12$$5, &_11$$5, 0, 0, "phalcon/http/request.zep", 755); for ( @@ -64678,7 +64849,7 @@ static PHP_METHOD(Phalcon_Http_Request, getHeaders) { ZVAL_STRING(&_8$$4, " ", 0); zephir_fast_str_replace(&_4$$4, &_7$$4, &_8$$4, _6$$4 TSRMLS_CC); zephir_fast_strtolower(_3$$4, _4$$4); - ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_9, 226, _3$$4); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_9, 221, _3$$4); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_10$$4); ZEPHIR_SINIT_NVAR(_11$$4); @@ -64697,7 +64868,7 @@ static PHP_METHOD(Phalcon_Http_Request, getHeaders) { ZVAL_STRING(&_16$$5, " ", 0); zephir_fast_str_replace(&_14$$5, &_15$$5, &_16$$5, name TSRMLS_CC); zephir_fast_strtolower(_13$$5, _14$$5); - ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_9, 226, _13$$5); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_9, 221, _13$$5); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_17$$5); ZEPHIR_SINIT_NVAR(_18$$5); @@ -64771,7 +64942,7 @@ static PHP_METHOD(Phalcon_Http_Request, _getQualityHeader) { ZVAL_LONG(&_2, -1); ZEPHIR_SINIT_VAR(_3); ZVAL_LONG(&_3, 1); - ZEPHIR_CALL_FUNCTION(&_4, "preg_split", &_5, 227, &_1, _0, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "preg_split", &_5, 222, &_1, _0, &_2, &_3); zephir_check_call_status(); zephir_is_iterable(_4, &_7, &_6, 0, 0, "phalcon/http/request.zep", 827); for ( @@ -64789,7 +64960,7 @@ static PHP_METHOD(Phalcon_Http_Request, _getQualityHeader) { ZVAL_LONG(&_11$$3, -1); ZEPHIR_SINIT_NVAR(_12$$3); ZVAL_LONG(&_12$$3, 1); - ZEPHIR_CALL_FUNCTION(&_13$$3, "preg_split", &_5, 227, &_10$$3, _9$$3, &_11$$3, &_12$$3); + ZEPHIR_CALL_FUNCTION(&_13$$3, "preg_split", &_5, 222, &_10$$3, _9$$3, &_11$$3, &_12$$3); zephir_check_call_status(); zephir_is_iterable(_13$$3, &_15$$3, &_14$$3, 0, 0, "phalcon/http/request.zep", 824); for ( @@ -64919,7 +65090,7 @@ static PHP_METHOD(Phalcon_Http_Request, getAcceptableContent) { ZVAL_STRING(_0, "HTTP_ACCEPT", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "accept", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getqualityheader", NULL, 228, _0, _1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getqualityheader", NULL, 223, _0, _1); zephir_check_temp_parameter(_0); zephir_check_temp_parameter(_1); zephir_check_call_status(); @@ -64938,7 +65109,7 @@ static PHP_METHOD(Phalcon_Http_Request, getBestAccept) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "accept", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getbestquality", NULL, 229, _0, _1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getbestquality", NULL, 224, _0, _1); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -64956,7 +65127,7 @@ static PHP_METHOD(Phalcon_Http_Request, getClientCharsets) { ZVAL_STRING(_0, "HTTP_ACCEPT_CHARSET", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "charset", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getqualityheader", NULL, 228, _0, _1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getqualityheader", NULL, 223, _0, _1); zephir_check_temp_parameter(_0); zephir_check_temp_parameter(_1); zephir_check_call_status(); @@ -64975,7 +65146,7 @@ static PHP_METHOD(Phalcon_Http_Request, getBestCharset) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "charset", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getbestquality", NULL, 229, _0, _1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getbestquality", NULL, 224, _0, _1); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -64993,7 +65164,7 @@ static PHP_METHOD(Phalcon_Http_Request, getLanguages) { ZVAL_STRING(_0, "HTTP_ACCEPT_LANGUAGE", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "language", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getqualityheader", NULL, 228, _0, _1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getqualityheader", NULL, 223, _0, _1); zephir_check_temp_parameter(_0); zephir_check_temp_parameter(_1); zephir_check_call_status(); @@ -65012,7 +65183,7 @@ static PHP_METHOD(Phalcon_Http_Request, getBestLanguage) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_1); ZVAL_STRING(_1, "language", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getbestquality", NULL, 229, _0, _1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getbestquality", NULL, 224, _0, _1); zephir_check_temp_parameter(_1); zephir_check_call_status(); RETURN_MM(); @@ -65228,7 +65399,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Response) { static PHP_METHOD(Phalcon_Http_Response, __construct) { int ZEPHIR_LAST_CALL_STATUS; - zval *content = NULL, *code = NULL, *status = NULL; + zval *content = NULL, *code = NULL, *status = NULL, *_0; ZEPHIR_MM_GROW(); zephir_fetch_params(1, 0, 3, &content, &code, &status); @@ -65244,6 +65415,13 @@ static PHP_METHOD(Phalcon_Http_Response, __construct) { } + ZEPHIR_INIT_VAR(_0); + object_init_ex(_0, phalcon_http_response_headers_ce); + if (zephir_has_constructor(_0 TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, _0, "__construct", NULL, 0); + zephir_check_call_status(); + } + zephir_update_property_this(this_ptr, SL("_headers"), _0 TSRMLS_CC); if (Z_TYPE_P(content) != IS_NULL) { zephir_update_property_this(this_ptr, SL("_content"), content TSRMLS_CC); } @@ -65281,7 +65459,7 @@ static PHP_METHOD(Phalcon_Http_Response, getDI) { ZEPHIR_CALL_CE_STATIC(&dependencyInjector, phalcon_di_ce, "getdefault", &_1, 1); zephir_check_call_status(); if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_response_exception_ce, "A dependency injection object is required to access the 'url' service", "phalcon/http/response.zep", 95); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_response_exception_ce, "A dependency injection object is required to access the 'url' service", "phalcon/http/response.zep", 101); return; } zephir_update_property_this(this_ptr, SL("_dependencyInjector"), dependencyInjector TSRMLS_CC); @@ -65318,7 +65496,7 @@ static PHP_METHOD(Phalcon_Http_Response, setStatusCode) { zephir_check_call_status(); if (Z_TYPE_P(currentHeadersRaw) == IS_ARRAY) { ZEPHIR_INIT_VAR(_0$$3); - zephir_is_iterable(currentHeadersRaw, &_2$$3, &_1$$3, 0, 0, "phalcon/http/response.zep", 127); + zephir_is_iterable(currentHeadersRaw, &_2$$3, &_1$$3, 0, 0, "phalcon/http/response.zep", 133); for ( ; zephir_hash_get_current_data_ex(_2$$3, (void**) &_3$$3, &_1$$3) == SUCCESS ; zephir_hash_move_forward_ex(_2$$3, &_1$$3) @@ -65329,7 +65507,7 @@ static PHP_METHOD(Phalcon_Http_Response, setStatusCode) { if (_4$$4) { ZEPHIR_SINIT_NVAR(_5$$4); ZVAL_STRING(&_5$$4, "HTTP/", 0); - ZEPHIR_CALL_FUNCTION(&_6$$4, "strstr", &_7, 236, key, &_5$$4); + ZEPHIR_CALL_FUNCTION(&_6$$4, "strstr", &_7, 231, key, &_5$$4); zephir_check_call_status(); _4$$4 = zephir_is_true(_6$$4); } @@ -65341,7 +65519,7 @@ static PHP_METHOD(Phalcon_Http_Response, setStatusCode) { } if (ZEPHIR_IS_STRING_IDENTICAL(message, "")) { ZEPHIR_INIT_VAR(statusCodes); - zephir_create_array(statusCodes, 67, 0 TSRMLS_CC); + zephir_create_array(statusCodes, 62, 0 TSRMLS_CC); add_index_stringl(statusCodes, 100, SL("Continue"), 1); add_index_stringl(statusCodes, 101, SL("Switching Protocols"), 1); add_index_stringl(statusCodes, 102, SL("Processing"), 1); @@ -65405,11 +65583,11 @@ static PHP_METHOD(Phalcon_Http_Response, setStatusCode) { add_index_stringl(statusCodes, 508, SL("Loop Detected"), 1); add_index_stringl(statusCodes, 511, SL("Network Authentication Required"), 1); if (!(zephir_array_isset_long(statusCodes, code))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_response_exception_ce, "Non-standard statuscode given without a message", "phalcon/http/response.zep", 204); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_response_exception_ce, "Non-standard statuscode given without a message", "phalcon/http/response.zep", 210); return; } ZEPHIR_OBS_VAR(defaultMessage); - zephir_array_fetch_long(&defaultMessage, statusCodes, code, PH_NOISY, "phalcon/http/response.zep", 207 TSRMLS_CC); + zephir_array_fetch_long(&defaultMessage, statusCodes, code, PH_NOISY, "phalcon/http/response.zep", 213 TSRMLS_CC); zephir_get_strval(message, defaultMessage); } ZEPHIR_SINIT_VAR(_9); @@ -65464,23 +65642,9 @@ static PHP_METHOD(Phalcon_Http_Response, setHeaders) { static PHP_METHOD(Phalcon_Http_Response, getHeaders) { - zval *headers = NULL; - int ZEPHIR_LAST_CALL_STATUS; - - ZEPHIR_MM_GROW(); + - ZEPHIR_OBS_VAR(headers); - zephir_read_property_this(&headers, this_ptr, SL("_headers"), PH_NOISY_CC); - if (Z_TYPE_P(headers) == IS_NULL) { - ZEPHIR_INIT_NVAR(headers); - object_init_ex(headers, phalcon_http_response_headers_ce); - if (zephir_has_constructor(headers TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(NULL, headers, "__construct", NULL, 0); - zephir_check_call_status(); - } - zephir_update_property_this(this_ptr, SL("_headers"), headers TSRMLS_CC); - } - RETURN_CCTOR(headers); + RETURN_MEMBER(this_ptr, "_headers"); } @@ -65660,8 +65824,9 @@ static PHP_METHOD(Phalcon_Http_Response, setNotModified) { static PHP_METHOD(Phalcon_Http_Response, setContentType) { + zephir_fcall_cache_entry *_1 = NULL; int ZEPHIR_LAST_CALL_STATUS; - zval *contentType_param = NULL, *charset = NULL, *headers = NULL, *_0$$3, *_1$$4, *_2$$4; + zval *contentType_param = NULL, *charset = NULL, *_0$$3, *_2$$4, *_3$$4; zval *contentType = NULL; ZEPHIR_MM_GROW(); @@ -65673,21 +65838,19 @@ static PHP_METHOD(Phalcon_Http_Response, setContentType) { } - ZEPHIR_CALL_METHOD(&headers, this_ptr, "getheaders", NULL, 0); - zephir_check_call_status(); if (Z_TYPE_P(charset) == IS_NULL) { ZEPHIR_INIT_VAR(_0$$3); ZVAL_STRING(_0$$3, "Content-Type", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, headers, "set", NULL, 0, _0$$3, contentType); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setheader", &_1, 0, _0$$3, contentType); zephir_check_temp_parameter(_0$$3); zephir_check_call_status(); } else { - ZEPHIR_INIT_VAR(_1$$4); - ZEPHIR_CONCAT_VSV(_1$$4, contentType, "; charset=", charset); ZEPHIR_INIT_VAR(_2$$4); - ZVAL_STRING(_2$$4, "Content-Type", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, headers, "set", NULL, 0, _2$$4, _1$$4); - zephir_check_temp_parameter(_2$$4); + ZEPHIR_CONCAT_VSV(_2$$4, contentType, "; charset=", charset); + ZEPHIR_INIT_VAR(_3$$4); + ZVAL_STRING(_3$$4, "Content-Type", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setheader", &_1, 0, _3$$4, _2$$4); + zephir_check_temp_parameter(_3$$4); zephir_check_call_status(); } RETURN_THIS(); @@ -65697,7 +65860,7 @@ static PHP_METHOD(Phalcon_Http_Response, setContentType) { static PHP_METHOD(Phalcon_Http_Response, setEtag) { int ZEPHIR_LAST_CALL_STATUS; - zval *etag_param = NULL, *headers = NULL, *_0; + zval *etag_param = NULL, *_0; zval *etag = NULL; ZEPHIR_MM_GROW(); @@ -65706,11 +65869,9 @@ static PHP_METHOD(Phalcon_Http_Response, setEtag) { zephir_get_strval(etag, etag_param); - ZEPHIR_CALL_METHOD(&headers, this_ptr, "getheaders", NULL, 0); - zephir_check_call_status(); ZEPHIR_INIT_VAR(_0); ZVAL_STRING(_0, "Etag", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, headers, "set", NULL, 0, _0, etag); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setheader", NULL, 0, _0, etag); zephir_check_temp_parameter(_0); zephir_check_call_status(); RETURN_THIS(); @@ -65754,7 +65915,7 @@ static PHP_METHOD(Phalcon_Http_Response, redirect) { if (_0$$5) { ZEPHIR_SINIT_VAR(_1$$5); ZVAL_STRING(&_1$$5, "://", 0); - ZEPHIR_CALL_FUNCTION(&_2$$5, "strstr", NULL, 236, location, &_1$$5); + ZEPHIR_CALL_FUNCTION(&_2$$5, "strstr", NULL, 231, location, &_1$$5); zephir_check_call_status(); _0$$5 = zephir_is_true(_2$$5); } @@ -65900,17 +66061,14 @@ static PHP_METHOD(Phalcon_Http_Response, isSent) { static PHP_METHOD(Phalcon_Http_Response, sendHeaders) { - zval *headers = NULL; + zval *_0; int ZEPHIR_LAST_CALL_STATUS; ZEPHIR_MM_GROW(); - ZEPHIR_OBS_VAR(headers); - zephir_read_property_this(&headers, this_ptr, SL("_headers"), PH_NOISY_CC); - if (Z_TYPE_P(headers) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(NULL, headers, "send", NULL, 0); - zephir_check_call_status(); - } + _0 = zephir_fetch_nproperty_this(this_ptr, SL("_headers"), PH_NOISY_CC); + ZEPHIR_CALL_METHOD(NULL, _0, "send", NULL, 0); + zephir_check_call_status(); RETURN_THIS(); } @@ -65934,29 +66092,21 @@ static PHP_METHOD(Phalcon_Http_Response, sendCookies) { static PHP_METHOD(Phalcon_Http_Response, send) { - zend_bool _1$$7; - zval *headers = NULL, *cookies = NULL, *content = NULL, *file = NULL, *_0; + zend_bool _1$$5; + zval *content = NULL, *file = NULL, *_0; int ZEPHIR_LAST_CALL_STATUS; ZEPHIR_MM_GROW(); _0 = zephir_fetch_nproperty_this(this_ptr, SL("_sent"), PH_NOISY_CC); if (zephir_is_true(_0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_response_exception_ce, "Response was already sent", "phalcon/http/response.zep", 585); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_response_exception_ce, "Response was already sent", "phalcon/http/response.zep", 577); return; } - ZEPHIR_OBS_VAR(headers); - zephir_read_property_this(&headers, this_ptr, SL("_headers"), PH_NOISY_CC); - if (Z_TYPE_P(headers) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(NULL, headers, "send", NULL, 0); - zephir_check_call_status(); - } - ZEPHIR_OBS_VAR(cookies); - zephir_read_property_this(&cookies, this_ptr, SL("_cookies"), PH_NOISY_CC); - if (Z_TYPE_P(cookies) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(NULL, cookies, "send", NULL, 0); - zephir_check_call_status(); - } + ZEPHIR_CALL_METHOD(NULL, this_ptr, "sendheaders", NULL, 0); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "sendcookies", NULL, 0); + zephir_check_call_status(); ZEPHIR_OBS_VAR(content); zephir_read_property_this(&content, this_ptr, SL("_content"), PH_NOISY_CC); if (Z_TYPE_P(content) != IS_NULL) { @@ -65964,12 +66114,12 @@ static PHP_METHOD(Phalcon_Http_Response, send) { } else { ZEPHIR_OBS_VAR(file); zephir_read_property_this(&file, this_ptr, SL("_file"), PH_NOISY_CC); - _1$$7 = Z_TYPE_P(file) == IS_STRING; - if (_1$$7) { - _1$$7 = (zephir_fast_strlen_ev(file)) ? 1 : 0; + _1$$5 = Z_TYPE_P(file) == IS_STRING; + if (_1$$5) { + _1$$5 = (zephir_fast_strlen_ev(file)) ? 1 : 0; } - if (_1$$7) { - ZEPHIR_CALL_FUNCTION(NULL, "readfile", NULL, 237, file); + if (_1$$5) { + ZEPHIR_CALL_FUNCTION(NULL, "readfile", NULL, 232, file); zephir_check_call_status(); } } @@ -65984,8 +66134,9 @@ static PHP_METHOD(Phalcon_Http_Response, send) { static PHP_METHOD(Phalcon_Http_Response, setFileToSend) { + zephir_fcall_cache_entry *_1 = NULL; int ZEPHIR_LAST_CALL_STATUS; - zval *filePath_param = NULL, *attachmentName = NULL, *attachment = NULL, *basePath = NULL, *headers = NULL, *_0$$5 = NULL, *_1$$5; + zval *filePath_param = NULL, *attachmentName = NULL, *attachment = NULL, *basePath = NULL, *_0$$5 = NULL, *_2$$5; zval *filePath = NULL; ZEPHIR_MM_GROW(); @@ -66007,25 +66158,23 @@ static PHP_METHOD(Phalcon_Http_Response, setFileToSend) { ZEPHIR_CPY_WRT(basePath, attachmentName); } if (zephir_is_true(attachment)) { - ZEPHIR_CALL_METHOD(&headers, this_ptr, "getheaders", NULL, 0); - zephir_check_call_status(); ZEPHIR_INIT_VAR(_0$$5); ZVAL_STRING(_0$$5, "Content-Description: File Transfer", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, headers, "setraw", NULL, 0, _0$$5); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setrawheader", &_1, 0, _0$$5); zephir_check_temp_parameter(_0$$5); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_0$$5); ZVAL_STRING(_0$$5, "Content-Type: application/octet-stream", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, headers, "setraw", NULL, 0, _0$$5); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setrawheader", &_1, 0, _0$$5); zephir_check_temp_parameter(_0$$5); zephir_check_call_status(); - ZEPHIR_INIT_VAR(_1$$5); - ZEPHIR_CONCAT_SV(_1$$5, "Content-Disposition: attachment; filename=", basePath); - ZEPHIR_CALL_METHOD(NULL, headers, "setraw", NULL, 0, _1$$5); + ZEPHIR_INIT_VAR(_2$$5); + ZEPHIR_CONCAT_SV(_2$$5, "Content-Disposition: attachment; filename=", basePath); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setrawheader", &_1, 0, _2$$5); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_0$$5); ZVAL_STRING(_0$$5, "Content-Transfer-Encoding: binary", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, headers, "setraw", NULL, 0, _0$$5); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setrawheader", &_1, 0, _0$$5); zephir_check_temp_parameter(_0$$5); zephir_check_call_status(); } @@ -66215,7 +66364,7 @@ static PHP_METHOD(Phalcon_Http_Request_File, __construct) { zephir_update_property_this(this_ptr, SL("_name"), name TSRMLS_CC); ZEPHIR_SINIT_VAR(_0$$3); ZVAL_STRING(&_0$$3, "PATHINFO_EXTENSION", 0); - ZEPHIR_CALL_FUNCTION(&_1$$3, "defined", NULL, 230, &_0$$3); + ZEPHIR_CALL_FUNCTION(&_1$$3, "defined", NULL, 225, &_0$$3); zephir_check_call_status(); if (zephir_is_true(_1$$3)) { ZEPHIR_SINIT_VAR(_2$$4); @@ -66285,15 +66434,15 @@ static PHP_METHOD(Phalcon_Http_Request_File, getRealType) { ZEPHIR_SINIT_VAR(_0); ZVAL_LONG(&_0, 16); - ZEPHIR_CALL_FUNCTION(&finfo, "finfo_open", NULL, 231, &_0); + ZEPHIR_CALL_FUNCTION(&finfo, "finfo_open", NULL, 226, &_0); zephir_check_call_status(); if (Z_TYPE_P(finfo) != IS_RESOURCE) { RETURN_MM_STRING("", 1); } _1 = zephir_fetch_nproperty_this(this_ptr, SL("_tmp"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 232, finfo, _1); + ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 227, finfo, _1); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 233, finfo); + ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 228, finfo); zephir_check_call_status(); RETURN_CCTOR(mime); @@ -66311,7 +66460,7 @@ static PHP_METHOD(Phalcon_Http_Request_File, isUploadedFile) { zephir_check_call_status(); _0 = Z_TYPE_P(tmp) == IS_STRING; if (_0) { - ZEPHIR_CALL_FUNCTION(&_1, "is_uploaded_file", NULL, 234, tmp); + ZEPHIR_CALL_FUNCTION(&_1, "is_uploaded_file", NULL, 229, tmp); zephir_check_call_status(); _0 = zephir_is_true(_1); } @@ -66341,7 +66490,7 @@ static PHP_METHOD(Phalcon_Http_Request_File, moveTo) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_tmp"), PH_NOISY_CC); - ZEPHIR_RETURN_CALL_FUNCTION("move_uploaded_file", NULL, 235, _0, destination); + ZEPHIR_RETURN_CALL_FUNCTION("move_uploaded_file", NULL, 230, _0, destination); zephir_check_call_status(); RETURN_MM(); @@ -66948,10 +67097,10 @@ static PHP_METHOD(Phalcon_Http_Response_Headers, send) { if (!(ZEPHIR_IS_EMPTY(value))) { ZEPHIR_INIT_LNVAR(_5$$5); ZEPHIR_CONCAT_VSV(_5$$5, header, ": ", value); - ZEPHIR_CALL_FUNCTION(NULL, "header", &_6, 238, _5$$5, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_6, 233, _5$$5, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); } else { - ZEPHIR_CALL_FUNCTION(NULL, "header", &_6, 238, header, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_6, 233, header, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); } } @@ -67012,7 +67161,7 @@ static PHP_METHOD(Phalcon_Http_Response_Headers, __set_state) { ) { ZEPHIR_GET_HMKEY(key, _1$$3, _0$$3); ZEPHIR_GET_HVALUE(value, _2$$3); - ZEPHIR_CALL_METHOD(NULL, headers, "set", &_3, 239, key, value); + ZEPHIR_CALL_METHOD(NULL, headers, "set", &_3, 234, key, value); zephir_check_call_status(); } } @@ -67020,7 +67169,7 @@ static PHP_METHOD(Phalcon_Http_Response_Headers, __set_state) { } -static zend_object_value zephir_init_properties_Phalcon_Http_Response_Headers(zend_class_entry *class_type TSRMLS_DC) { +zend_object_value zephir_init_properties_Phalcon_Http_Response_Headers(zend_class_entry *class_type TSRMLS_DC) { zval *_0, *_1$$3; @@ -68072,13 +68221,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, check) { ZVAL_NULL(version); ZEPHIR_SINIT_VAR(_1); ZVAL_STRING(&_1, "GD_VERSION", 0); - ZEPHIR_CALL_FUNCTION(&_2, "defined", NULL, 230, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "defined", NULL, 225, &_1); zephir_check_call_status(); if (zephir_is_true(_2)) { ZEPHIR_INIT_NVAR(version); ZEPHIR_GET_CONSTANT(version, "GD_VERSION"); } else { - ZEPHIR_CALL_FUNCTION(&info, "gd_info", NULL, 240); + ZEPHIR_CALL_FUNCTION(&info, "gd_info", NULL, 235); zephir_check_call_status(); ZEPHIR_INIT_VAR(matches); ZVAL_NULL(matches); @@ -68096,7 +68245,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, check) { ZVAL_STRING(&_1, "2.0.1", 0); ZEPHIR_SINIT_VAR(_6); ZVAL_STRING(&_6, ">=", 0); - ZEPHIR_CALL_FUNCTION(&_7, "version_compare", NULL, 241, version, &_1, &_6); + ZEPHIR_CALL_FUNCTION(&_7, "version_compare", NULL, 236, version, &_1, &_6); zephir_check_call_status(); if (!(zephir_is_true(_7))) { ZEPHIR_INIT_VAR(_8$$8); @@ -68161,7 +68310,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) { zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_realpath"), _3$$4 TSRMLS_CC); _4$$4 = zephir_fetch_nproperty_this(this_ptr, SL("_file"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&imageinfo, "getimagesize", NULL, 242, _4$$4); + ZEPHIR_CALL_FUNCTION(&imageinfo, "getimagesize", NULL, 237, _4$$4); zephir_check_call_status(); if (zephir_is_true(imageinfo)) { zephir_array_fetch_long(&_5$$5, imageinfo, 0, PH_NOISY | PH_READONLY, "phalcon/image/adapter/gd.zep", 77 TSRMLS_CC); @@ -68177,35 +68326,35 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) { do { if (ZEPHIR_IS_LONG(_9$$4, 1)) { _10$$6 = zephir_fetch_nproperty_this(this_ptr, SL("_file"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_11$$6, "imagecreatefromgif", NULL, 243, _10$$6); + ZEPHIR_CALL_FUNCTION(&_11$$6, "imagecreatefromgif", NULL, 238, _10$$6); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), _11$$6 TSRMLS_CC); break; } if (ZEPHIR_IS_LONG(_9$$4, 2)) { _12$$7 = zephir_fetch_nproperty_this(this_ptr, SL("_file"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_13$$7, "imagecreatefromjpeg", NULL, 244, _12$$7); + ZEPHIR_CALL_FUNCTION(&_13$$7, "imagecreatefromjpeg", NULL, 239, _12$$7); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), _13$$7 TSRMLS_CC); break; } if (ZEPHIR_IS_LONG(_9$$4, 3)) { _14$$8 = zephir_fetch_nproperty_this(this_ptr, SL("_file"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_15$$8, "imagecreatefrompng", NULL, 245, _14$$8); + ZEPHIR_CALL_FUNCTION(&_15$$8, "imagecreatefrompng", NULL, 240, _14$$8); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), _15$$8 TSRMLS_CC); break; } if (ZEPHIR_IS_LONG(_9$$4, 15)) { _16$$9 = zephir_fetch_nproperty_this(this_ptr, SL("_file"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_17$$9, "imagecreatefromwbmp", NULL, 246, _16$$9); + ZEPHIR_CALL_FUNCTION(&_17$$9, "imagecreatefromwbmp", NULL, 241, _16$$9); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), _17$$9 TSRMLS_CC); break; } if (ZEPHIR_IS_LONG(_9$$4, 16)) { _18$$10 = zephir_fetch_nproperty_this(this_ptr, SL("_file"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_19$$10, "imagecreatefromxbm", NULL, 247, _18$$10); + ZEPHIR_CALL_FUNCTION(&_19$$10, "imagecreatefromxbm", NULL, 242, _18$$10); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), _19$$10 TSRMLS_CC); break; @@ -68230,7 +68379,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) { } while(0); _24$$4 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", &_25, 248, _24$$4, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", &_25, 243, _24$$4, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); } else { _26$$14 = !width; @@ -68253,14 +68402,14 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) { ZVAL_LONG(&_30$$14, width); ZEPHIR_SINIT_VAR(_31$$14); ZVAL_LONG(&_31$$14, height); - ZEPHIR_CALL_FUNCTION(&_32$$14, "imagecreatetruecolor", NULL, 249, &_30$$14, &_31$$14); + ZEPHIR_CALL_FUNCTION(&_32$$14, "imagecreatetruecolor", NULL, 244, &_30$$14, &_31$$14); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), _32$$14 TSRMLS_CC); _33$$14 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 250, _33$$14, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 245, _33$$14, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); _34$$14 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", &_25, 248, _34$$14, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", &_25, 243, _34$$14, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); _35$$14 = zephir_fetch_nproperty_this(this_ptr, SL("_file"), PH_NOISY_CC); zephir_update_property_this(this_ptr, SL("_realpath"), _35$$14 TSRMLS_CC); @@ -68299,7 +68448,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _resize) { ZEPHIR_GET_CONSTANT(_0, "PHP_VERSION"); ZEPHIR_SINIT_VAR(_1); ZVAL_STRING(&_1, "5.5.0", 0); - ZEPHIR_CALL_FUNCTION(&_2, "version_compare", NULL, 241, _0, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "version_compare", NULL, 236, _0, &_1); zephir_check_call_status(); if (ZEPHIR_LT_LONG(_2, 0)) { ZEPHIR_OBS_VAR(pre_width); @@ -68347,11 +68496,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _resize) { ZVAL_LONG(&_15$$4, 0); ZEPHIR_SINIT_VAR(_16$$4); ZVAL_LONG(&_16$$4, 0); - ZEPHIR_CALL_FUNCTION(&_17$$4, "imagecopyresized", NULL, 251, image, _10$$4, &_13$$4, &_14$$4, &_15$$4, &_16$$4, pre_width, pre_height, _11$$4, _12$$4); + ZEPHIR_CALL_FUNCTION(&_17$$4, "imagecopyresized", NULL, 246, image, _10$$4, &_13$$4, &_14$$4, &_15$$4, &_16$$4, pre_width, pre_height, _11$$4, _12$$4); zephir_check_call_status(); if (zephir_is_true(_17$$4)) { _18$$6 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_19, 252, _18$$6); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_19, 247, _18$$6); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), image TSRMLS_CC); } @@ -68375,17 +68524,17 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _resize) { ZVAL_LONG(&_27$$3, width); ZEPHIR_SINIT_VAR(_28$$3); ZVAL_LONG(&_28$$3, height); - ZEPHIR_CALL_FUNCTION(&_29$$3, "imagecopyresampled", NULL, 253, image, _22$$3, &_23$$3, &_24$$3, &_25$$3, &_26$$3, &_27$$3, &_28$$3, pre_width, pre_height); + ZEPHIR_CALL_FUNCTION(&_29$$3, "imagecopyresampled", NULL, 248, image, _22$$3, &_23$$3, &_24$$3, &_25$$3, &_26$$3, &_27$$3, &_28$$3, pre_width, pre_height); zephir_check_call_status(); if (zephir_is_true(_29$$3)) { _30$$7 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_19, 252, _30$$7); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_19, 247, _30$$7); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), image TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_31$$7, "imagesx", &_32, 254, image); + ZEPHIR_CALL_FUNCTION(&_31$$7, "imagesx", &_32, 249, image); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_width"), _31$$7 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_33$$7, "imagesy", &_34, 255, image); + ZEPHIR_CALL_FUNCTION(&_33$$7, "imagesy", &_34, 250, image); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_height"), _33$$7 TSRMLS_CC); } @@ -68395,16 +68544,16 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _resize) { ZVAL_LONG(&_36$$8, width); ZEPHIR_SINIT_VAR(_37$$8); ZVAL_LONG(&_37$$8, height); - ZEPHIR_CALL_FUNCTION(&image, "imagescale", NULL, 256, _35$$8, &_36$$8, &_37$$8); + ZEPHIR_CALL_FUNCTION(&image, "imagescale", NULL, 251, _35$$8, &_36$$8, &_37$$8); zephir_check_call_status(); _38$$8 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_19, 252, _38$$8); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_19, 247, _38$$8); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), image TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_39$$8, "imagesx", &_32, 254, image); + ZEPHIR_CALL_FUNCTION(&_39$$8, "imagesx", &_32, 249, image); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_width"), _39$$8 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_40$$8, "imagesy", &_34, 255, image); + ZEPHIR_CALL_FUNCTION(&_40$$8, "imagesy", &_34, 250, image); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_height"), _40$$8 TSRMLS_CC); } @@ -68431,7 +68580,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _crop) { ZEPHIR_GET_CONSTANT(_0, "PHP_VERSION"); ZEPHIR_SINIT_VAR(_1); ZVAL_STRING(&_1, "5.5.0", 0); - ZEPHIR_CALL_FUNCTION(&_2, "version_compare", NULL, 241, _0, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "version_compare", NULL, 236, _0, &_1); zephir_check_call_status(); if (ZEPHIR_LT_LONG(_2, 0)) { ZEPHIR_INIT_VAR(_3$$3); @@ -68457,17 +68606,17 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _crop) { ZVAL_LONG(&_12$$3, width); ZEPHIR_SINIT_VAR(_13$$3); ZVAL_LONG(&_13$$3, height); - ZEPHIR_CALL_FUNCTION(&_14$$3, "imagecopyresampled", NULL, 253, image, _5$$3, &_6$$3, &_7$$3, &_8$$3, &_9$$3, &_10$$3, &_11$$3, &_12$$3, &_13$$3); + ZEPHIR_CALL_FUNCTION(&_14$$3, "imagecopyresampled", NULL, 248, image, _5$$3, &_6$$3, &_7$$3, &_8$$3, &_9$$3, &_10$$3, &_11$$3, &_12$$3, &_13$$3); zephir_check_call_status(); if (zephir_is_true(_14$$3)) { _15$$4 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_16, 252, _15$$4); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_16, 247, _15$$4); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), image TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_17$$4, "imagesx", &_18, 254, image); + ZEPHIR_CALL_FUNCTION(&_17$$4, "imagesx", &_18, 249, image); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_width"), _17$$4 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_19$$4, "imagesy", &_20, 255, image); + ZEPHIR_CALL_FUNCTION(&_19$$4, "imagesy", &_20, 250, image); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_height"), _19$$4 TSRMLS_CC); } @@ -68487,16 +68636,16 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _crop) { ZVAL_LONG(_21$$5, height); zephir_array_update_string(&rect, SL("height"), &_21$$5, PH_COPY | PH_SEPARATE); _22$$5 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&image, "imagecrop", NULL, 257, _22$$5, rect); + ZEPHIR_CALL_FUNCTION(&image, "imagecrop", NULL, 252, _22$$5, rect); zephir_check_call_status(); _23$$5 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_16, 252, _23$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_16, 247, _23$$5); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), image TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_24$$5, "imagesx", &_18, 254, image); + ZEPHIR_CALL_FUNCTION(&_24$$5, "imagesx", &_18, 249, image); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_width"), _24$$5 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_25$$5, "imagesy", &_20, 255, image); + ZEPHIR_CALL_FUNCTION(&_25$$5, "imagesy", &_20, 250, image); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_height"), _25$$5 TSRMLS_CC); } @@ -68524,20 +68673,20 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _rotate) { ZVAL_LONG(&_3, 0); ZEPHIR_SINIT_VAR(_4); ZVAL_LONG(&_4, 127); - ZEPHIR_CALL_FUNCTION(&transparent, "imagecolorallocatealpha", NULL, 258, _0, &_1, &_2, &_3, &_4); + ZEPHIR_CALL_FUNCTION(&transparent, "imagecolorallocatealpha", NULL, 253, _0, &_1, &_2, &_3, &_4); zephir_check_call_status(); _5 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_NVAR(_1); ZVAL_LONG(&_1, (360 - degrees)); ZEPHIR_SINIT_NVAR(_2); ZVAL_LONG(&_2, 1); - ZEPHIR_CALL_FUNCTION(&image, "imagerotate", NULL, 259, _5, &_1, transparent, &_2); + ZEPHIR_CALL_FUNCTION(&image, "imagerotate", NULL, 254, _5, &_1, transparent, &_2); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 248, image, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 243, image, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&width, "imagesx", NULL, 254, image); + ZEPHIR_CALL_FUNCTION(&width, "imagesx", NULL, 249, image); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&height, "imagesy", NULL, 255, image); + ZEPHIR_CALL_FUNCTION(&height, "imagesy", NULL, 250, image); zephir_check_call_status(); _6 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_NVAR(_1); @@ -68550,11 +68699,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _rotate) { ZVAL_LONG(&_4, 0); ZEPHIR_SINIT_VAR(_7); ZVAL_LONG(&_7, 100); - ZEPHIR_CALL_FUNCTION(&_8, "imagecopymerge", NULL, 260, _6, image, &_1, &_2, &_3, &_4, width, height, &_7); + ZEPHIR_CALL_FUNCTION(&_8, "imagecopymerge", NULL, 255, _6, image, &_1, &_2, &_3, &_4, width, height, &_7); zephir_check_call_status(); if (zephir_is_true(_8)) { _9$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 252, _9$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 247, _9$$3); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), image TSRMLS_CC); zephir_update_property_this(this_ptr, SL("_width"), width TSRMLS_CC); @@ -68580,7 +68729,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _flip) { ZEPHIR_GET_CONSTANT(_0, "PHP_VERSION"); ZEPHIR_SINIT_VAR(_1); ZVAL_STRING(&_1, "5.5.0", 0); - ZEPHIR_CALL_FUNCTION(&_2, "version_compare", NULL, 241, _0, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "version_compare", NULL, 236, _0, &_1); zephir_check_call_status(); if (ZEPHIR_LT_LONG(_2, 0)) { _3$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_width"), PH_NOISY_CC); @@ -68608,7 +68757,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _flip) { ZVAL_LONG(&_12$$5, 0); ZEPHIR_SINIT_NVAR(_13$$5); ZVAL_LONG(&_13$$5, 1); - ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", &_14, 261, image, _6$$5, &_9$$5, &_10$$5, &_11$$5, &_12$$5, &_13$$5, _8$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", &_14, 256, image, _6$$5, &_9$$5, &_10$$5, &_11$$5, &_12$$5, &_13$$5, _8$$5); zephir_check_call_status(); } } else { @@ -68632,18 +68781,18 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _flip) { ZVAL_LONG(&_22$$7, ((zephir_get_numberval(_17$$7) - x) - 1)); ZEPHIR_SINIT_NVAR(_23$$7); ZVAL_LONG(&_23$$7, 1); - ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", &_14, 261, image, _16$$7, &_19$$7, &_20$$7, &_21$$7, &_22$$7, _18$$7, &_23$$7); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", &_14, 256, image, _16$$7, &_19$$7, &_20$$7, &_21$$7, &_22$$7, _18$$7, &_23$$7); zephir_check_call_status(); } } _24$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 252, _24$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 247, _24$$3); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), image TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_25$$3, "imagesx", NULL, 254, image); + ZEPHIR_CALL_FUNCTION(&_25$$3, "imagesx", NULL, 249, image); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_width"), _25$$3 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_26$$3, "imagesy", NULL, 255, image); + ZEPHIR_CALL_FUNCTION(&_26$$3, "imagesy", NULL, 250, image); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_height"), _26$$3 TSRMLS_CC); } else { @@ -68651,13 +68800,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _flip) { _27$$9 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_VAR(_28$$9); ZVAL_LONG(&_28$$9, 1); - ZEPHIR_CALL_FUNCTION(NULL, "imageflip", &_29, 262, _27$$9, &_28$$9); + ZEPHIR_CALL_FUNCTION(NULL, "imageflip", &_29, 257, _27$$9, &_28$$9); zephir_check_call_status(); } else { _30$$10 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_VAR(_31$$10); ZVAL_LONG(&_31$$10, 2); - ZEPHIR_CALL_FUNCTION(NULL, "imageflip", &_29, 262, _30$$10, &_31$$10); + ZEPHIR_CALL_FUNCTION(NULL, "imageflip", &_29, 257, _30$$10, &_31$$10); zephir_check_call_status(); } } @@ -68680,7 +68829,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _sharpen) { ZEPHIR_INIT_VAR(_0); ZEPHIR_SINIT_VAR(_1); ZVAL_LONG(&_1, (-18 + ((amount * 0.08)))); - ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 194, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 189, &_1); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_1); ZVAL_LONG(&_1, 2); @@ -68729,15 +68878,15 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _sharpen) { ZVAL_LONG(&_6, (amount - 8)); ZEPHIR_SINIT_VAR(_7); ZVAL_LONG(&_7, 0); - ZEPHIR_CALL_FUNCTION(&_8, "imageconvolution", NULL, 263, _5, matrix, &_6, &_7); + ZEPHIR_CALL_FUNCTION(&_8, "imageconvolution", NULL, 258, _5, matrix, &_6, &_7); zephir_check_call_status(); if (zephir_is_true(_8)) { _9$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_10$$3, "imagesx", NULL, 254, _9$$3); + ZEPHIR_CALL_FUNCTION(&_10$$3, "imagesx", NULL, 249, _9$$3); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_width"), _10$$3 TSRMLS_CC); _11$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_12$$3, "imagesy", NULL, 255, _11$$3); + ZEPHIR_CALL_FUNCTION(&_12$$3, "imagesy", NULL, 250, _11$$3); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_height"), _12$$3 TSRMLS_CC); } @@ -68763,7 +68912,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _reflection) { ZEPHIR_INIT_VAR(_0); ZEPHIR_SINIT_VAR(_1); ZVAL_DOUBLE(&_1, ((zephir_safe_div_long_long((opacity * 127), 100 TSRMLS_CC)) - (double) (127))); - ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 194, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 189, &_1); zephir_check_call_status(); zephir_round(_0, _2, NULL, NULL TSRMLS_CC); opacity = zephir_get_intval(_0); @@ -68789,7 +68938,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _reflection) { ZVAL_LONG(&_11, 0); ZEPHIR_SINIT_VAR(_12); ZVAL_LONG(&_12, 0); - ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", &_13, 261, reflection, _7, &_1, &_10, &_11, &_12, _8, _9); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", &_13, 256, reflection, _7, &_1, &_10, &_11, &_12, _8, _9); zephir_check_call_status(); offset = 0; while (1) { @@ -68830,7 +68979,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _reflection) { ZVAL_LONG(&_27$$5, src_y); ZEPHIR_SINIT_NVAR(_28$$5); ZVAL_LONG(&_28$$5, 1); - ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", &_13, 261, line, _22$$5, &_24$$5, &_25$$5, &_26$$5, &_27$$5, _23$$5, &_28$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", &_13, 256, line, _22$$5, &_24$$5, &_25$$5, &_26$$5, &_27$$5, _23$$5, &_28$$5); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_24$$5); ZVAL_LONG(&_24$$5, 4); @@ -68842,7 +68991,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _reflection) { ZVAL_LONG(&_27$$5, 0); ZEPHIR_SINIT_NVAR(_28$$5); ZVAL_LONG(&_28$$5, dst_opacity); - ZEPHIR_CALL_FUNCTION(NULL, "imagefilter", &_29, 264, line, &_24$$5, &_25$$5, &_26$$5, &_27$$5, &_28$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagefilter", &_29, 259, line, &_24$$5, &_25$$5, &_26$$5, &_27$$5, &_28$$5); zephir_check_call_status(); _30$$5 = zephir_fetch_nproperty_this(this_ptr, SL("_width"), PH_NOISY_CC); ZEPHIR_SINIT_NVAR(_24$$5); @@ -68855,18 +69004,18 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _reflection) { ZVAL_LONG(&_27$$5, 0); ZEPHIR_SINIT_NVAR(_28$$5); ZVAL_LONG(&_28$$5, 1); - ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", &_13, 261, reflection, line, &_24$$5, &_25$$5, &_26$$5, &_27$$5, _30$$5, &_28$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", &_13, 256, reflection, line, &_24$$5, &_25$$5, &_26$$5, &_27$$5, _30$$5, &_28$$5); zephir_check_call_status(); offset++; } _31 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 252, _31); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 247, _31); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), reflection TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_32, "imagesx", NULL, 254, reflection); + ZEPHIR_CALL_FUNCTION(&_32, "imagesx", NULL, 249, reflection); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_width"), _32 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_33, "imagesy", NULL, 255, reflection); + ZEPHIR_CALL_FUNCTION(&_33, "imagesy", NULL, 250, reflection); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_height"), _33 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -68888,21 +69037,21 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _watermark) { ZEPHIR_CALL_METHOD(&_0, watermark, "render", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&overlay, "imagecreatefromstring", NULL, 265, _0); + ZEPHIR_CALL_FUNCTION(&overlay, "imagecreatefromstring", NULL, 260, _0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 248, overlay, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 243, overlay, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "imagesx", NULL, 254, overlay); + ZEPHIR_CALL_FUNCTION(&_1, "imagesx", NULL, 249, overlay); zephir_check_call_status(); width = zephir_get_intval(_1); - ZEPHIR_CALL_FUNCTION(&_2, "imagesy", NULL, 255, overlay); + ZEPHIR_CALL_FUNCTION(&_2, "imagesy", NULL, 250, overlay); zephir_check_call_status(); height = zephir_get_intval(_2); if (opacity < 100) { ZEPHIR_INIT_VAR(_3$$3); ZEPHIR_SINIT_VAR(_4$$3); ZVAL_DOUBLE(&_4$$3, ((zephir_safe_div_long_long((opacity * 127), 100 TSRMLS_CC)) - (double) (127))); - ZEPHIR_CALL_FUNCTION(&_5$$3, "abs", NULL, 194, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "abs", NULL, 189, &_4$$3); zephir_check_call_status(); zephir_round(_3$$3, _5$$3, NULL, NULL TSRMLS_CC); opacity = zephir_get_intval(_3$$3); @@ -68914,11 +69063,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _watermark) { ZVAL_LONG(&_7$$3, 127); ZEPHIR_SINIT_VAR(_8$$3); ZVAL_LONG(&_8$$3, opacity); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 258, overlay, &_4$$3, &_6$$3, &_7$$3, &_8$$3); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 253, overlay, &_4$$3, &_6$$3, &_7$$3, &_8$$3); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_4$$3); ZVAL_LONG(&_4$$3, 3); - ZEPHIR_CALL_FUNCTION(NULL, "imagelayereffect", NULL, 266, overlay, &_4$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagelayereffect", NULL, 261, overlay, &_4$$3); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_4$$3); ZVAL_LONG(&_4$$3, 0); @@ -68928,11 +69077,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _watermark) { ZVAL_LONG(&_7$$3, width); ZEPHIR_SINIT_NVAR(_8$$3); ZVAL_LONG(&_8$$3, height); - ZEPHIR_CALL_FUNCTION(NULL, "imagefilledrectangle", NULL, 267, overlay, &_4$$3, &_6$$3, &_7$$3, &_8$$3, color); + ZEPHIR_CALL_FUNCTION(NULL, "imagefilledrectangle", NULL, 262, overlay, &_4$$3, &_6$$3, &_7$$3, &_8$$3, color); zephir_check_call_status(); } _9 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 250, _9, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 245, _9, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); _10 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_VAR(_11); @@ -68947,10 +69096,10 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _watermark) { ZVAL_LONG(&_15, width); ZEPHIR_SINIT_VAR(_16); ZVAL_LONG(&_16, height); - ZEPHIR_CALL_FUNCTION(&_17, "imagecopy", NULL, 261, _10, overlay, &_11, &_12, &_13, &_14, &_15, &_16); + ZEPHIR_CALL_FUNCTION(&_17, "imagecopy", NULL, 256, _10, overlay, &_11, &_12, &_13, &_14, &_15, &_16); zephir_check_call_status(); if (zephir_is_true(_17)) { - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 252, overlay); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 247, overlay); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -68986,7 +69135,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _text) { ZEPHIR_INIT_VAR(_0); ZEPHIR_SINIT_VAR(_1); ZVAL_DOUBLE(&_1, ((zephir_safe_div_long_long((opacity * 127), 100 TSRMLS_CC)) - (double) (127))); - ZEPHIR_CALL_FUNCTION(&_2, "abs", &_3, 194, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", &_3, 189, &_1); zephir_check_call_status(); zephir_round(_0, _2, NULL, NULL TSRMLS_CC); opacity = zephir_get_intval(_0); @@ -68995,7 +69144,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _text) { ZVAL_LONG(&_4$$3, size); ZEPHIR_SINIT_VAR(_5$$3); ZVAL_LONG(&_5$$3, 0); - ZEPHIR_CALL_FUNCTION(&space, "imagettfbbox", NULL, 268, &_4$$3, &_5$$3, fontfile, text); + ZEPHIR_CALL_FUNCTION(&space, "imagettfbbox", NULL, 263, &_4$$3, &_5$$3, fontfile, text); zephir_check_call_status(); if (zephir_array_isset_long(space, 0)) { ZEPHIR_OBS_VAR(_6$$4); @@ -69029,12 +69178,12 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _text) { } ZEPHIR_SINIT_NVAR(_4$$3); ZVAL_LONG(&_4$$3, (s4 - s0)); - ZEPHIR_CALL_FUNCTION(&_13$$3, "abs", &_3, 194, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_13$$3, "abs", &_3, 189, &_4$$3); zephir_check_call_status(); width = (zephir_get_numberval(_13$$3) + 10); ZEPHIR_SINIT_NVAR(_4$$3); ZVAL_LONG(&_4$$3, (s5 - s1)); - ZEPHIR_CALL_FUNCTION(&_14$$3, "abs", &_3, 194, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_14$$3, "abs", &_3, 189, &_4$$3); zephir_check_call_status(); height = (zephir_get_numberval(_14$$3) + 10); if (offsetX < 0) { @@ -69054,7 +69203,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _text) { ZVAL_LONG(&_18$$3, b); ZEPHIR_SINIT_VAR(_19$$3); ZVAL_LONG(&_19$$3, opacity); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", &_20, 258, _17$$3, &_4$$3, &_5$$3, &_18$$3, &_19$$3); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", &_20, 253, _17$$3, &_4$$3, &_5$$3, &_18$$3, &_19$$3); zephir_check_call_status(); angle = 0; _21$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); @@ -69066,17 +69215,17 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _text) { ZVAL_LONG(&_18$$3, offsetX); ZEPHIR_SINIT_NVAR(_19$$3); ZVAL_LONG(&_19$$3, offsetY); - ZEPHIR_CALL_FUNCTION(NULL, "imagettftext", NULL, 269, _21$$3, &_4$$3, &_5$$3, &_18$$3, &_19$$3, color, fontfile, text); + ZEPHIR_CALL_FUNCTION(NULL, "imagettftext", NULL, 264, _21$$3, &_4$$3, &_5$$3, &_18$$3, &_19$$3, color, fontfile, text); zephir_check_call_status(); } else { ZEPHIR_SINIT_VAR(_22$$8); ZVAL_LONG(&_22$$8, size); - ZEPHIR_CALL_FUNCTION(&_23$$8, "imagefontwidth", NULL, 270, &_22$$8); + ZEPHIR_CALL_FUNCTION(&_23$$8, "imagefontwidth", NULL, 265, &_22$$8); zephir_check_call_status(); width = (zephir_get_intval(_23$$8) * zephir_fast_strlen_ev(text)); ZEPHIR_SINIT_NVAR(_22$$8); ZVAL_LONG(&_22$$8, size); - ZEPHIR_CALL_FUNCTION(&_24$$8, "imagefontheight", NULL, 271, &_22$$8); + ZEPHIR_CALL_FUNCTION(&_24$$8, "imagefontheight", NULL, 266, &_22$$8); zephir_check_call_status(); height = zephir_get_intval(_24$$8); if (offsetX < 0) { @@ -69096,7 +69245,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _text) { ZVAL_LONG(&_29$$8, b); ZEPHIR_SINIT_VAR(_30$$8); ZVAL_LONG(&_30$$8, opacity); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", &_20, 258, _27$$8, &_22$$8, &_28$$8, &_29$$8, &_30$$8); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", &_20, 253, _27$$8, &_22$$8, &_28$$8, &_29$$8, &_30$$8); zephir_check_call_status(); _31$$8 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_NVAR(_22$$8); @@ -69105,7 +69254,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _text) { ZVAL_LONG(&_28$$8, offsetX); ZEPHIR_SINIT_NVAR(_29$$8); ZVAL_LONG(&_29$$8, offsetY); - ZEPHIR_CALL_FUNCTION(NULL, "imagestring", NULL, 272, _31$$8, &_22$$8, &_28$$8, &_29$$8, text, color); + ZEPHIR_CALL_FUNCTION(NULL, "imagestring", NULL, 267, _31$$8, &_22$$8, &_28$$8, &_29$$8, text, color); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -69126,22 +69275,22 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _mask) { ZEPHIR_CALL_METHOD(&_0, mask, "render", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&maskImage, "imagecreatefromstring", NULL, 265, _0); + ZEPHIR_CALL_FUNCTION(&maskImage, "imagecreatefromstring", NULL, 260, _0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "imagesx", NULL, 254, maskImage); + ZEPHIR_CALL_FUNCTION(&_1, "imagesx", NULL, 249, maskImage); zephir_check_call_status(); mask_width = zephir_get_intval(_1); - ZEPHIR_CALL_FUNCTION(&_2, "imagesy", NULL, 255, maskImage); + ZEPHIR_CALL_FUNCTION(&_2, "imagesy", NULL, 250, maskImage); zephir_check_call_status(); mask_height = zephir_get_intval(_2); alpha = 127; - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", &_3, 248, maskImage, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", &_3, 243, maskImage, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); _4 = zephir_fetch_nproperty_this(this_ptr, SL("_width"), PH_NOISY_CC); _5 = zephir_fetch_nproperty_this(this_ptr, SL("_height"), PH_NOISY_CC); ZEPHIR_CALL_METHOD(&newimage, this_ptr, "_create", NULL, 0, _4, _5); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", &_3, 248, newimage, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", &_3, 243, newimage, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); ZEPHIR_SINIT_VAR(_6); ZVAL_LONG(&_6, 0); @@ -69151,13 +69300,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _mask) { ZVAL_LONG(&_8, 0); ZEPHIR_SINIT_VAR(_9); ZVAL_LONG(&_9, alpha); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", &_10, 258, newimage, &_6, &_7, &_8, &_9); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", &_10, 253, newimage, &_6, &_7, &_8, &_9); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_6); ZVAL_LONG(&_6, 0); ZEPHIR_SINIT_NVAR(_7); ZVAL_LONG(&_7, 0); - ZEPHIR_CALL_FUNCTION(NULL, "imagefill", NULL, 273, newimage, &_6, &_7, color); + ZEPHIR_CALL_FUNCTION(NULL, "imagefill", NULL, 268, newimage, &_6, &_7, color); zephir_check_call_status(); _11 = zephir_fetch_nproperty_this(this_ptr, SL("_width"), PH_NOISY_CC); _12 = !ZEPHIR_IS_LONG(_11, mask_width); @@ -69168,7 +69317,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _mask) { if (_12) { _14$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_width"), PH_NOISY_CC); _15$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_height"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&tempImage, "imagecreatetruecolor", NULL, 249, _14$$3, _15$$3); + ZEPHIR_CALL_FUNCTION(&tempImage, "imagecreatetruecolor", NULL, 244, _14$$3, _15$$3); zephir_check_call_status(); _16$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_width"), PH_NOISY_CC); _17$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_height"), PH_NOISY_CC); @@ -69184,9 +69333,9 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _mask) { ZVAL_LONG(&_22$$3, mask_width); ZEPHIR_SINIT_VAR(_23$$3); ZVAL_LONG(&_23$$3, mask_height); - ZEPHIR_CALL_FUNCTION(NULL, "imagecopyresampled", NULL, 253, tempImage, maskImage, &_18$$3, &_19$$3, &_20$$3, &_21$$3, _16$$3, _17$$3, &_22$$3, &_23$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopyresampled", NULL, 248, tempImage, maskImage, &_18$$3, &_19$$3, &_20$$3, &_21$$3, _16$$3, _17$$3, &_22$$3, &_23$$3); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_24, 252, maskImage); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_24, 247, maskImage); zephir_check_call_status(); ZEPHIR_CPY_WRT(maskImage, tempImage); } @@ -69206,9 +69355,9 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _mask) { ZVAL_LONG(&_27$$5, x); ZEPHIR_SINIT_NVAR(_28$$5); ZVAL_LONG(&_28$$5, y); - ZEPHIR_CALL_FUNCTION(&index, "imagecolorat", &_29, 274, maskImage, &_27$$5, &_28$$5); + ZEPHIR_CALL_FUNCTION(&index, "imagecolorat", &_29, 269, maskImage, &_27$$5, &_28$$5); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorsforindex", &_30, 275, maskImage, index); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorsforindex", &_30, 270, maskImage, index); zephir_check_call_status(); if (zephir_array_isset_string(color, SS("red"))) { zephir_array_fetch_string(&_31$$6, color, SL("red"), PH_NOISY | PH_READONLY, "phalcon/image/adapter/gd.zep", 431 TSRMLS_CC); @@ -69221,10 +69370,10 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _mask) { ZVAL_LONG(&_27$$5, x); ZEPHIR_SINIT_NVAR(_28$$5); ZVAL_LONG(&_28$$5, y); - ZEPHIR_CALL_FUNCTION(&index, "imagecolorat", &_29, 274, _33$$5, &_27$$5, &_28$$5); + ZEPHIR_CALL_FUNCTION(&index, "imagecolorat", &_29, 269, _33$$5, &_27$$5, &_28$$5); zephir_check_call_status(); _34$$5 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorsforindex", &_30, 275, _34$$5, index); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorsforindex", &_30, 270, _34$$5, index); zephir_check_call_status(); ZEPHIR_OBS_NVAR(r); zephir_array_fetch_string(&r, color, SL("red"), PH_NOISY, "phalcon/image/adapter/gd.zep", 436 TSRMLS_CC); @@ -69234,22 +69383,22 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _mask) { zephir_array_fetch_string(&b, color, SL("blue"), PH_NOISY, "phalcon/image/adapter/gd.zep", 436 TSRMLS_CC); ZEPHIR_SINIT_NVAR(_27$$5); ZVAL_LONG(&_27$$5, alpha); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", &_10, 258, newimage, r, g, b, &_27$$5); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", &_10, 253, newimage, r, g, b, &_27$$5); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_27$$5); ZVAL_LONG(&_27$$5, x); ZEPHIR_SINIT_NVAR(_28$$5); ZVAL_LONG(&_28$$5, y); - ZEPHIR_CALL_FUNCTION(NULL, "imagesetpixel", &_35, 276, newimage, &_27$$5, &_28$$5, color); + ZEPHIR_CALL_FUNCTION(NULL, "imagesetpixel", &_35, 271, newimage, &_27$$5, &_28$$5, color); zephir_check_call_status(); y++; } x++; } _36 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_24, 252, _36); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_24, 247, _36); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_24, 252, maskImage); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", &_24, 247, maskImage); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), newimage TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -69283,9 +69432,9 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _background) { ZVAL_LONG(&_4, b); ZEPHIR_SINIT_VAR(_5); ZVAL_LONG(&_5, opacity); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 258, background, &_2, &_3, &_4, &_5); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 253, background, &_2, &_3, &_4, &_5); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 250, background, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 245, background, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); _6 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); _7 = zephir_fetch_nproperty_this(this_ptr, SL("_width"), PH_NOISY_CC); @@ -69298,11 +69447,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _background) { ZVAL_LONG(&_4, 0); ZEPHIR_SINIT_NVAR(_5); ZVAL_LONG(&_5, 0); - ZEPHIR_CALL_FUNCTION(&_9, "imagecopy", NULL, 261, background, _6, &_2, &_3, &_4, &_5, _7, _8); + ZEPHIR_CALL_FUNCTION(&_9, "imagecopy", NULL, 256, background, _6, &_2, &_3, &_4, &_5, _7, _8); zephir_check_call_status(); if (zephir_is_true(_9)) { _10$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 252, _10$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 247, _10$$3); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_image"), background TSRMLS_CC); } @@ -69330,7 +69479,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _blur) { _0$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_NVAR(_1$$3); ZVAL_LONG(&_1$$3, 7); - ZEPHIR_CALL_FUNCTION(NULL, "imagefilter", &_2, 264, _0$$3, &_1$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagefilter", &_2, 259, _0$$3, &_1$$3); zephir_check_call_status(); i++; } @@ -69369,7 +69518,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _pixelate) { ZVAL_LONG(&_3$$4, x1); ZEPHIR_SINIT_NVAR(_4$$4); ZVAL_LONG(&_4$$4, y1); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorat", &_5, 274, _2$$4, &_3$$4, &_4$$4); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorat", &_5, 269, _2$$4, &_3$$4, &_4$$4); zephir_check_call_status(); x2 = (x + amount); y2 = (y + amount); @@ -69382,7 +69531,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _pixelate) { ZVAL_LONG(&_7$$4, x2); ZEPHIR_SINIT_NVAR(_8$$4); ZVAL_LONG(&_8$$4, y2); - ZEPHIR_CALL_FUNCTION(NULL, "imagefilledrectangle", &_9, 267, _6$$4, &_3$$4, &_4$$4, &_7$$4, &_8$$4, color); + ZEPHIR_CALL_FUNCTION(NULL, "imagefilledrectangle", &_9, 262, _6$$4, &_3$$4, &_4$$4, &_7$$4, &_8$$4, color); zephir_check_call_status(); y += amount; } @@ -69413,7 +69562,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _save) { zephir_check_call_status(); if (!(zephir_is_true(ext))) { _1$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_type"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&ext, "image_type_to_extension", NULL, 277, _1$$3, ZEPHIR_GLOBAL(global_false)); + ZEPHIR_CALL_FUNCTION(&ext, "image_type_to_extension", NULL, 272, _1$$3, ZEPHIR_GLOBAL(global_false)); zephir_check_call_status(); } ZEPHIR_INIT_VAR(_2); @@ -69421,30 +69570,30 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _save) { ZEPHIR_CPY_WRT(ext, _2); ZEPHIR_SINIT_NVAR(_0); ZVAL_STRING(&_0, "gif", 0); - ZEPHIR_CALL_FUNCTION(&_3, "strcmp", &_4, 278, ext, &_0); + ZEPHIR_CALL_FUNCTION(&_3, "strcmp", &_4, 273, ext, &_0); zephir_check_call_status(); if (ZEPHIR_IS_LONG(_3, 0)) { ZEPHIR_INIT_ZVAL_NREF(_5$$4); ZVAL_LONG(_5$$4, 1); zephir_update_property_this(this_ptr, SL("_type"), _5$$4 TSRMLS_CC); _5$$4 = zephir_fetch_nproperty_this(this_ptr, SL("_type"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_6$$4, "image_type_to_mime_type", &_7, 279, _5$$4); + ZEPHIR_CALL_FUNCTION(&_6$$4, "image_type_to_mime_type", &_7, 274, _5$$4); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_mime"), _6$$4 TSRMLS_CC); _8$$4 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagegif", NULL, 280, _8$$4, file); + ZEPHIR_CALL_FUNCTION(NULL, "imagegif", NULL, 275, _8$$4, file); zephir_check_call_status(); RETURN_MM_BOOL(1); } ZEPHIR_SINIT_NVAR(_0); ZVAL_STRING(&_0, "jpg", 0); - ZEPHIR_CALL_FUNCTION(&_9, "strcmp", &_4, 278, ext, &_0); + ZEPHIR_CALL_FUNCTION(&_9, "strcmp", &_4, 273, ext, &_0); zephir_check_call_status(); _10 = ZEPHIR_IS_LONG(_9, 0); if (!(_10)) { ZEPHIR_SINIT_NVAR(_0); ZVAL_STRING(&_0, "jpeg", 0); - ZEPHIR_CALL_FUNCTION(&_11, "strcmp", &_4, 278, ext, &_0); + ZEPHIR_CALL_FUNCTION(&_11, "strcmp", &_4, 273, ext, &_0); zephir_check_call_status(); _10 = ZEPHIR_IS_LONG(_11, 0); } @@ -69453,64 +69602,64 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _save) { ZVAL_LONG(_12$$5, 2); zephir_update_property_this(this_ptr, SL("_type"), _12$$5 TSRMLS_CC); _12$$5 = zephir_fetch_nproperty_this(this_ptr, SL("_type"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_13$$5, "image_type_to_mime_type", &_7, 279, _12$$5); + ZEPHIR_CALL_FUNCTION(&_13$$5, "image_type_to_mime_type", &_7, 274, _12$$5); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_mime"), _13$$5 TSRMLS_CC); _14$$5 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_VAR(_15$$5); ZVAL_LONG(&_15$$5, quality); - ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 281, _14$$5, file, &_15$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 276, _14$$5, file, &_15$$5); zephir_check_call_status(); RETURN_MM_BOOL(1); } ZEPHIR_SINIT_NVAR(_0); ZVAL_STRING(&_0, "png", 0); - ZEPHIR_CALL_FUNCTION(&_16, "strcmp", &_4, 278, ext, &_0); + ZEPHIR_CALL_FUNCTION(&_16, "strcmp", &_4, 273, ext, &_0); zephir_check_call_status(); if (ZEPHIR_IS_LONG(_16, 0)) { ZEPHIR_INIT_ZVAL_NREF(_17$$6); ZVAL_LONG(_17$$6, 3); zephir_update_property_this(this_ptr, SL("_type"), _17$$6 TSRMLS_CC); _17$$6 = zephir_fetch_nproperty_this(this_ptr, SL("_type"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_18$$6, "image_type_to_mime_type", &_7, 279, _17$$6); + ZEPHIR_CALL_FUNCTION(&_18$$6, "image_type_to_mime_type", &_7, 274, _17$$6); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_mime"), _18$$6 TSRMLS_CC); _19$$6 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagepng", NULL, 282, _19$$6, file); + ZEPHIR_CALL_FUNCTION(NULL, "imagepng", NULL, 277, _19$$6, file); zephir_check_call_status(); RETURN_MM_BOOL(1); } ZEPHIR_SINIT_NVAR(_0); ZVAL_STRING(&_0, "wbmp", 0); - ZEPHIR_CALL_FUNCTION(&_20, "strcmp", &_4, 278, ext, &_0); + ZEPHIR_CALL_FUNCTION(&_20, "strcmp", &_4, 273, ext, &_0); zephir_check_call_status(); if (ZEPHIR_IS_LONG(_20, 0)) { ZEPHIR_INIT_ZVAL_NREF(_21$$7); ZVAL_LONG(_21$$7, 15); zephir_update_property_this(this_ptr, SL("_type"), _21$$7 TSRMLS_CC); _21$$7 = zephir_fetch_nproperty_this(this_ptr, SL("_type"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_22$$7, "image_type_to_mime_type", &_7, 279, _21$$7); + ZEPHIR_CALL_FUNCTION(&_22$$7, "image_type_to_mime_type", &_7, 274, _21$$7); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_mime"), _22$$7 TSRMLS_CC); _23$$7 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagewbmp", NULL, 283, _23$$7, file); + ZEPHIR_CALL_FUNCTION(NULL, "imagewbmp", NULL, 278, _23$$7, file); zephir_check_call_status(); RETURN_MM_BOOL(1); } ZEPHIR_SINIT_NVAR(_0); ZVAL_STRING(&_0, "xbm", 0); - ZEPHIR_CALL_FUNCTION(&_24, "strcmp", &_4, 278, ext, &_0); + ZEPHIR_CALL_FUNCTION(&_24, "strcmp", &_4, 273, ext, &_0); zephir_check_call_status(); if (ZEPHIR_IS_LONG(_24, 0)) { ZEPHIR_INIT_ZVAL_NREF(_25$$8); ZVAL_LONG(_25$$8, 16); zephir_update_property_this(this_ptr, SL("_type"), _25$$8 TSRMLS_CC); _25$$8 = zephir_fetch_nproperty_this(this_ptr, SL("_type"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(&_26$$8, "image_type_to_mime_type", &_7, 279, _25$$8); + ZEPHIR_CALL_FUNCTION(&_26$$8, "image_type_to_mime_type", &_7, 274, _25$$8); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_mime"), _26$$8 TSRMLS_CC); _27$$8 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagexbm", NULL, 284, _27$$8, file); + ZEPHIR_CALL_FUNCTION(NULL, "imagexbm", NULL, 279, _27$$8, file); zephir_check_call_status(); RETURN_MM_BOOL(1); } @@ -69548,25 +69697,25 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _render) { zephir_check_call_status(); ZEPHIR_SINIT_VAR(_1); ZVAL_STRING(&_1, "gif", 0); - ZEPHIR_CALL_FUNCTION(&_2, "strcmp", &_3, 278, ext, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "strcmp", &_3, 273, ext, &_1); zephir_check_call_status(); if (ZEPHIR_IS_LONG(_2, 0)) { _4$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagegif", NULL, 280, _4$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagegif", NULL, 275, _4$$3); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", &_5, 285); + ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", &_5, 280); zephir_check_call_status(); RETURN_MM(); } ZEPHIR_SINIT_NVAR(_1); ZVAL_STRING(&_1, "jpg", 0); - ZEPHIR_CALL_FUNCTION(&_6, "strcmp", &_3, 278, ext, &_1); + ZEPHIR_CALL_FUNCTION(&_6, "strcmp", &_3, 273, ext, &_1); zephir_check_call_status(); _7 = ZEPHIR_IS_LONG(_6, 0); if (!(_7)) { ZEPHIR_SINIT_NVAR(_1); ZVAL_STRING(&_1, "jpeg", 0); - ZEPHIR_CALL_FUNCTION(&_8, "strcmp", &_3, 278, ext, &_1); + ZEPHIR_CALL_FUNCTION(&_8, "strcmp", &_3, 273, ext, &_1); zephir_check_call_status(); _7 = ZEPHIR_IS_LONG(_8, 0); } @@ -69574,45 +69723,45 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _render) { _9$$4 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_VAR(_10$$4); ZVAL_LONG(&_10$$4, quality); - ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 281, _9$$4, ZEPHIR_GLOBAL(global_null), &_10$$4); + ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 276, _9$$4, ZEPHIR_GLOBAL(global_null), &_10$$4); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", &_5, 285); + ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", &_5, 280); zephir_check_call_status(); RETURN_MM(); } ZEPHIR_SINIT_NVAR(_1); ZVAL_STRING(&_1, "png", 0); - ZEPHIR_CALL_FUNCTION(&_11, "strcmp", &_3, 278, ext, &_1); + ZEPHIR_CALL_FUNCTION(&_11, "strcmp", &_3, 273, ext, &_1); zephir_check_call_status(); if (ZEPHIR_IS_LONG(_11, 0)) { _12$$5 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagepng", NULL, 282, _12$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagepng", NULL, 277, _12$$5); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", &_5, 285); + ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", &_5, 280); zephir_check_call_status(); RETURN_MM(); } ZEPHIR_SINIT_NVAR(_1); ZVAL_STRING(&_1, "wbmp", 0); - ZEPHIR_CALL_FUNCTION(&_13, "strcmp", &_3, 278, ext, &_1); + ZEPHIR_CALL_FUNCTION(&_13, "strcmp", &_3, 273, ext, &_1); zephir_check_call_status(); if (ZEPHIR_IS_LONG(_13, 0)) { _14$$6 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagewbmp", NULL, 283, _14$$6); + ZEPHIR_CALL_FUNCTION(NULL, "imagewbmp", NULL, 278, _14$$6); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", &_5, 285); + ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", &_5, 280); zephir_check_call_status(); RETURN_MM(); } ZEPHIR_SINIT_NVAR(_1); ZVAL_STRING(&_1, "xbm", 0); - ZEPHIR_CALL_FUNCTION(&_15, "strcmp", &_3, 278, ext, &_1); + ZEPHIR_CALL_FUNCTION(&_15, "strcmp", &_3, 273, ext, &_1); zephir_check_call_status(); if (ZEPHIR_IS_LONG(_15, 0)) { _16$$7 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); - ZEPHIR_CALL_FUNCTION(NULL, "imagexbm", NULL, 284, _16$$7, ZEPHIR_GLOBAL(global_null)); + ZEPHIR_CALL_FUNCTION(NULL, "imagexbm", NULL, 279, _16$$7, ZEPHIR_GLOBAL(global_null)); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", &_5, 285); + ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", &_5, 280); zephir_check_call_status(); RETURN_MM(); } @@ -69644,11 +69793,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, _create) { ZVAL_LONG(&_0, width); ZEPHIR_SINIT_VAR(_1); ZVAL_LONG(&_1, height); - ZEPHIR_CALL_FUNCTION(&image, "imagecreatetruecolor", NULL, 249, &_0, &_1); + ZEPHIR_CALL_FUNCTION(&image, "imagecreatetruecolor", NULL, 244, &_0, &_1); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 250, image, ZEPHIR_GLOBAL(global_false)); + ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 245, image, ZEPHIR_GLOBAL(global_false)); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 248, image, ZEPHIR_GLOBAL(global_true)); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 243, image, ZEPHIR_GLOBAL(global_true)); zephir_check_call_status(); RETURN_CCTOR(image); @@ -69664,7 +69813,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, __destruct) { ZEPHIR_OBS_VAR(image); zephir_read_property_this(&image, this_ptr, SL("_image"), PH_NOISY_CC); if (Z_TYPE_P(image) == IS_RESOURCE) { - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 252, image); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 247, image); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -69717,12 +69866,12 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, check) { } ZEPHIR_SINIT_VAR(_2); ZVAL_STRING(&_2, "Imagick::IMAGICK_EXTNUM", 0); - ZEPHIR_CALL_FUNCTION(&_3, "defined", NULL, 230, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "defined", NULL, 225, &_2); zephir_check_call_status(); if (zephir_is_true(_3)) { ZEPHIR_SINIT_VAR(_4$$5); ZVAL_STRING(&_4$$5, "Imagick::IMAGICK_EXTNUM", 0); - ZEPHIR_CALL_FUNCTION(&_5$$5, "constant", NULL, 192, &_4$$5); + ZEPHIR_CALL_FUNCTION(&_5$$5, "constant", NULL, 187, &_4$$5); zephir_check_call_status(); zephir_update_static_property_ce(phalcon_image_adapter_imagick_ce, SL("_version"), &_5$$5 TSRMLS_CC); } @@ -69772,8 +69921,10 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, __construct) { zephir_update_property_this(this_ptr, SL("_file"), file TSRMLS_CC); ZEPHIR_INIT_VAR(_1); object_init_ex(_1, zephir_get_internal_ce(SS("imagick") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, _1, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(_1 TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, _1, "__construct", NULL, 0); + zephir_check_call_status(); + } zephir_update_property_this(this_ptr, SL("_image"), _1 TSRMLS_CC); _2 = zephir_fetch_nproperty_this(this_ptr, SL("_file"), PH_NOISY_CC); if ((zephir_file_exists(_2 TSRMLS_CC) == SUCCESS)) { @@ -69804,7 +69955,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, __construct) { _13$$6 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_VAR(_14$$6); ZVAL_STRING(&_14$$6, "Imagick::ALPHACHANNEL_SET", 0); - ZEPHIR_CALL_FUNCTION(&_15$$6, "constant", NULL, 192, &_14$$6); + ZEPHIR_CALL_FUNCTION(&_15$$6, "constant", NULL, 187, &_14$$6); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, _13$$6, "setimagealphachannel", NULL, 0, _15$$6); zephir_check_call_status(); @@ -69842,11 +69993,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, __construct) { _24$$8 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_INIT_VAR(_25$$8); object_init_ex(_25$$8, zephir_get_internal_ce(SS("imagickpixel") TSRMLS_CC)); - ZEPHIR_INIT_VAR(_26$$8); - ZVAL_STRING(_26$$8, "transparent", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _25$$8, "__construct", NULL, 0, _26$$8); - zephir_check_temp_parameter(_26$$8); - zephir_check_call_status(); + if (zephir_has_constructor(_25$$8 TSRMLS_CC)) { + ZEPHIR_INIT_VAR(_26$$8); + ZVAL_STRING(_26$$8, "transparent", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(NULL, _25$$8, "__construct", NULL, 0, _26$$8); + zephir_check_temp_parameter(_26$$8); + zephir_check_call_status(); + } ZEPHIR_INIT_NVAR(_26$$8); ZVAL_LONG(_26$$8, width); ZEPHIR_INIT_VAR(_27$$8); @@ -70064,8 +70217,10 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _rotate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(pixel); object_init_ex(pixel, zephir_get_internal_ce(SS("imagickpixel") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, pixel, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(pixel TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, pixel, "__construct", NULL, 0); + zephir_check_call_status(); + } while (1) { _2$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_INIT_NVAR(_3$$3); @@ -70254,8 +70409,10 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _reflection) { } ZEPHIR_INIT_VAR(fade); object_init_ex(fade, zephir_get_internal_ce(SS("imagick") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, fade, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(fade TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, fade, "__construct", NULL, 0); + zephir_check_call_status(); + } ZEPHIR_CALL_METHOD(&_17, reflection, "getimagewidth", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_18, reflection, "getimageheight", NULL, 0); @@ -70270,7 +70427,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _reflection) { while (1) { ZEPHIR_SINIT_NVAR(_19$$7); ZVAL_STRING(&_19$$7, "Imagick::COMPOSITE_DSTOUT", 0); - ZEPHIR_CALL_FUNCTION(&_20$$7, "constant", &_21, 192, &_19$$7); + ZEPHIR_CALL_FUNCTION(&_20$$7, "constant", &_21, 187, &_19$$7); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_22$$7); ZVAL_LONG(_22$$7, 0); @@ -70284,11 +70441,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _reflection) { } ZEPHIR_SINIT_NVAR(_19$$7); ZVAL_STRING(&_19$$7, "Imagick::EVALUATE_MULTIPLY", 0); - ZEPHIR_CALL_FUNCTION(&_25$$7, "constant", &_21, 192, &_19$$7); + ZEPHIR_CALL_FUNCTION(&_25$$7, "constant", &_21, 187, &_19$$7); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_19$$7); ZVAL_STRING(&_19$$7, "Imagick::CHANNEL_ALPHA", 0); - ZEPHIR_CALL_FUNCTION(&_26$$7, "constant", &_21, 192, &_19$$7); + ZEPHIR_CALL_FUNCTION(&_26$$7, "constant", &_21, 187, &_19$$7); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_22$$7); ZVAL_LONG(_22$$7, opacity); @@ -70304,12 +70461,16 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _reflection) { zephir_check_call_status(); ZEPHIR_INIT_VAR(image); object_init_ex(image, zephir_get_internal_ce(SS("imagick") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, image, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(image TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, image, "__construct", NULL, 0); + zephir_check_call_status(); + } ZEPHIR_INIT_VAR(pixel); object_init_ex(pixel, zephir_get_internal_ce(SS("imagickpixel") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, pixel, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(pixel TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, pixel, "__construct", NULL, 0); + zephir_check_call_status(); + } _30 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_CALL_METHOD(&_31, _30, "getimageheight", NULL, 0); zephir_check_call_status(); @@ -70327,7 +70488,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _reflection) { zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_36$$10); ZVAL_STRING(&_36$$10, "Imagick::ALPHACHANNEL_SET", 0); - ZEPHIR_CALL_FUNCTION(&_37$$10, "constant", &_21, 192, &_36$$10); + ZEPHIR_CALL_FUNCTION(&_37$$10, "constant", &_21, 187, &_36$$10); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, image, "setimagealphachannel", &_38, 0, _37$$10); zephir_check_call_status(); @@ -70344,7 +70505,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _reflection) { _45$$10 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_NVAR(_36$$10); ZVAL_STRING(&_36$$10, "Imagick::COMPOSITE_SRC", 0); - ZEPHIR_CALL_FUNCTION(&_46$$10, "constant", &_21, 192, &_36$$10); + ZEPHIR_CALL_FUNCTION(&_46$$10, "constant", &_21, 187, &_36$$10); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_34$$10); ZVAL_LONG(_34$$10, 0); @@ -70374,7 +70535,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _reflection) { while (1) { ZEPHIR_SINIT_NVAR(_51$$13); ZVAL_STRING(&_51$$13, "Imagick::COMPOSITE_OVER", 0); - ZEPHIR_CALL_FUNCTION(&_52$$13, "constant", &_21, 192, &_51$$13); + ZEPHIR_CALL_FUNCTION(&_52$$13, "constant", &_21, 187, &_51$$13); zephir_check_call_status(); _53$$13 = zephir_fetch_nproperty_this(this_ptr, SL("_height"), PH_NOISY_CC); ZEPHIR_INIT_NVAR(_54$$13); @@ -70435,8 +70596,10 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _watermark) { opacity = (long) (zephir_safe_div_long_long(opacity, 100 TSRMLS_CC)); ZEPHIR_INIT_VAR(watermark); object_init_ex(watermark, zephir_get_internal_ce(SS("imagick") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, watermark, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(watermark TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, watermark, "__construct", NULL, 0); + zephir_check_call_status(); + } ZEPHIR_CALL_METHOD(&_0, image, "render", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, watermark, "readimageblob", NULL, 0, _0); @@ -70454,7 +70617,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _watermark) { _3$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_NVAR(_4$$3); ZVAL_STRING(&_4$$3, "Imagick::COMPOSITE_OVER", 0); - ZEPHIR_CALL_FUNCTION(&_5$$3, "constant", &_6, 192, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "constant", &_6, 187, &_4$$3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_7$$3); ZVAL_LONG(_7$$3, offsetX); @@ -70506,8 +70669,10 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _text) { opacity = (long) (zephir_safe_div_long_long(opacity, 100 TSRMLS_CC)); ZEPHIR_INIT_VAR(draw); object_init_ex(draw, zephir_get_internal_ce(SS("imagickdraw") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, draw, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(draw TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, draw, "__construct", NULL, 0); + zephir_check_call_status(); + } ZEPHIR_SINIT_VAR(_0); ZVAL_STRING(&_0, "rgb(%d, %d, %d)", 0); ZEPHIR_SINIT_VAR(_1); @@ -70516,12 +70681,14 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _text) { ZVAL_LONG(&_2, g); ZEPHIR_SINIT_VAR(_3); ZVAL_LONG(&_3, b); - ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 189, &_0, &_1, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 184, &_0, &_1, &_2, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(_4); object_init_ex(_4, zephir_get_internal_ce(SS("imagickpixel") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, _4, "__construct", NULL, 0, color); - zephir_check_call_status(); + if (zephir_has_constructor(_4 TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, _4, "__construct", NULL, 0, color); + zephir_check_call_status(); + } ZEPHIR_CALL_METHOD(NULL, draw, "setfillcolor", NULL, 0, _4); zephir_check_call_status(); if (!(!fontfile) && Z_STRLEN_P(fontfile)) { @@ -70555,24 +70722,24 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _text) { if (_7$$7) { ZEPHIR_SINIT_VAR(_8$$8); ZVAL_STRING(&_8$$8, "Imagick::GRAVITY_SOUTHEAST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_8$$8); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_8$$8); zephir_check_call_status(); } else { if (zephir_is_true(offsetX)) { ZEPHIR_SINIT_VAR(_10$$10); ZVAL_STRING(&_10$$10, "Imagick::GRAVITY_EAST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_10$$10); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_10$$10); zephir_check_call_status(); } else { if (zephir_is_true(offsetY)) { ZEPHIR_SINIT_VAR(_11$$12); ZVAL_STRING(&_11$$12, "Imagick::GRAVITY_SOUTH", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_11$$12); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_11$$12); zephir_check_call_status(); } else { ZEPHIR_SINIT_VAR(_12$$13); ZVAL_STRING(&_12$$13, "Imagick::GRAVITY_CENTER", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_12$$13); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_12$$13); zephir_check_call_status(); } } @@ -70588,13 +70755,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _text) { ZVAL_LONG(offsetY, (y * -1)); ZEPHIR_SINIT_VAR(_13$$17); ZVAL_STRING(&_13$$17, "Imagick::GRAVITY_SOUTHEAST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_13$$17); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_13$$17); zephir_check_call_status(); } else { ZVAL_LONG(offsetX, 0); ZEPHIR_SINIT_VAR(_14$$18); ZVAL_STRING(&_14$$18, "Imagick::GRAVITY_NORTHEAST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_14$$18); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_14$$18); zephir_check_call_status(); } } else { @@ -70605,13 +70772,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _text) { ZVAL_LONG(offsetY, (y * -1)); ZEPHIR_SINIT_VAR(_15$$20); ZVAL_STRING(&_15$$20, "Imagick::GRAVITY_SOUTH", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_15$$20); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_15$$20); zephir_check_call_status(); } else { ZVAL_LONG(offsetX, 0); ZEPHIR_SINIT_VAR(_16$$21); ZVAL_STRING(&_16$$21, "Imagick::GRAVITY_NORTH", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_16$$21); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_16$$21); zephir_check_call_status(); } } @@ -70630,13 +70797,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _text) { ZVAL_LONG(offsetY, 0); ZEPHIR_SINIT_VAR(_17$$27); ZVAL_STRING(&_17$$27, "Imagick::GRAVITY_SOUTHEAST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_17$$27); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_17$$27); zephir_check_call_status(); } else { ZVAL_LONG(offsetY, 0); ZEPHIR_SINIT_VAR(_18$$28); ZVAL_STRING(&_18$$28, "Imagick::GRAVITY_SOUTH", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_18$$28); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_18$$28); zephir_check_call_status(); } } else { @@ -70647,13 +70814,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _text) { ZVAL_LONG(offsetY, 0); ZEPHIR_SINIT_VAR(_19$$30); ZVAL_STRING(&_19$$30, "Imagick::GRAVITY_EAST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_19$$30); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_19$$30); zephir_check_call_status(); } else { ZVAL_LONG(offsetY, 0); ZEPHIR_SINIT_VAR(_20$$31); ZVAL_STRING(&_20$$31, "Imagick::GRAVITY_WEST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_20$$31); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_20$$31); zephir_check_call_status(); } } @@ -70669,13 +70836,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _text) { ZVAL_LONG(offsetY, (y * -1)); ZEPHIR_SINIT_VAR(_21$$35); ZVAL_STRING(&_21$$35, "Imagick::GRAVITY_SOUTHEAST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_21$$35); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_21$$35); zephir_check_call_status(); } else { ZVAL_LONG(offsetX, (x * -1)); ZEPHIR_SINIT_VAR(_22$$36); ZVAL_STRING(&_22$$36, "Imagick::GRAVITY_NORTHEAST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_22$$36); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_22$$36); zephir_check_call_status(); } } else { @@ -70686,13 +70853,13 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _text) { ZVAL_LONG(offsetY, (y * -1)); ZEPHIR_SINIT_VAR(_23$$38); ZVAL_STRING(&_23$$38, "Imagick::GRAVITY_SOUTHWEST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_23$$38); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_23$$38); zephir_check_call_status(); } else { ZVAL_LONG(offsetX, 0); ZEPHIR_SINIT_VAR(_24$$39); ZVAL_STRING(&_24$$39, "Imagick::GRAVITY_NORTHWEST", 0); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 192, &_24$$39); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", &_9, 187, &_24$$39); zephir_check_call_status(); } } @@ -70740,8 +70907,10 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _mask) { ZEPHIR_INIT_VAR(mask); object_init_ex(mask, zephir_get_internal_ce(SS("imagick") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, mask, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(mask TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, mask, "__construct", NULL, 0); + zephir_check_call_status(); + } ZEPHIR_CALL_METHOD(&_0, image, "render", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, mask, "readimageblob", NULL, 0, _0); @@ -70760,7 +70929,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _mask) { _5$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_NVAR(_6$$3); ZVAL_STRING(&_6$$3, "Imagick::COMPOSITE_DSTIN", 0); - ZEPHIR_CALL_FUNCTION(&_7$$3, "constant", &_8, 192, &_6$$3); + ZEPHIR_CALL_FUNCTION(&_7$$3, "constant", &_8, 187, &_6$$3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_4$$3); ZVAL_LONG(_4$$3, 0); @@ -70769,7 +70938,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _mask) { ZEPHIR_CALL_METHOD(&ret, _5$$3, "compositeimage", NULL, 0, mask, _7$$3, _4$$3, _9$$3); zephir_check_call_status(); if (!ZEPHIR_IS_TRUE_IDENTICAL(ret)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_image_exception_ce, "Imagick::compositeImage failed", "phalcon/image/adapter/imagick.zep", 531); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_image_exception_ce, "Imagick::compositeImage failed", "phalcon/image/adapter/imagick.zep", 529); return; } _10$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); @@ -70810,24 +70979,30 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _background) { ZVAL_LONG(&_2, g); ZEPHIR_SINIT_VAR(_3); ZVAL_LONG(&_3, b); - ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 189, &_0, &_1, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 184, &_0, &_1, &_2, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(pixel1); object_init_ex(pixel1, zephir_get_internal_ce(SS("imagickpixel") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, pixel1, "__construct", NULL, 0, color); - zephir_check_call_status(); + if (zephir_has_constructor(pixel1 TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, pixel1, "__construct", NULL, 0, color); + zephir_check_call_status(); + } opacity = (long) (zephir_safe_div_long_long(opacity, 100 TSRMLS_CC)); ZEPHIR_INIT_VAR(pixel2); object_init_ex(pixel2, zephir_get_internal_ce(SS("imagickpixel") TSRMLS_CC)); - ZEPHIR_INIT_VAR(_4); - ZVAL_STRING(_4, "transparent", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, pixel2, "__construct", NULL, 0, _4); - zephir_check_temp_parameter(_4); - zephir_check_call_status(); + if (zephir_has_constructor(pixel2 TSRMLS_CC)) { + ZEPHIR_INIT_VAR(_4); + ZVAL_STRING(_4, "transparent", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(NULL, pixel2, "__construct", NULL, 0, _4); + zephir_check_temp_parameter(_4); + zephir_check_call_status(); + } ZEPHIR_INIT_VAR(background); object_init_ex(background, zephir_get_internal_ce(SS("imagick") TSRMLS_CC)); - ZEPHIR_CALL_METHOD(NULL, background, "__construct", NULL, 0); - zephir_check_call_status(); + if (zephir_has_constructor(background TSRMLS_CC)) { + ZEPHIR_CALL_METHOD(NULL, background, "__construct", NULL, 0); + zephir_check_call_status(); + } _5 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_INIT_NVAR(_4); ZVAL_LONG(_4, 0); @@ -70843,7 +71018,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _background) { if (!(zephir_is_true(_9$$3))) { ZEPHIR_SINIT_NVAR(_11$$4); ZVAL_STRING(&_11$$4, "Imagick::ALPHACHANNEL_SET", 0); - ZEPHIR_CALL_FUNCTION(&_12$$4, "constant", &_13, 192, &_11$$4); + ZEPHIR_CALL_FUNCTION(&_12$$4, "constant", &_13, 187, &_11$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, background, "setimagealphachannel", &_14, 0, _12$$4); zephir_check_call_status(); @@ -70852,11 +71027,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _background) { zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_16$$3); ZVAL_STRING(&_16$$3, "Imagick::EVALUATE_MULTIPLY", 0); - ZEPHIR_CALL_FUNCTION(&_17$$3, "constant", &_13, 192, &_16$$3); + ZEPHIR_CALL_FUNCTION(&_17$$3, "constant", &_13, 187, &_16$$3); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_16$$3); ZVAL_STRING(&_16$$3, "Imagick::CHANNEL_ALPHA", 0); - ZEPHIR_CALL_FUNCTION(&_18$$3, "constant", &_13, 192, &_16$$3); + ZEPHIR_CALL_FUNCTION(&_18$$3, "constant", &_13, 187, &_16$$3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_19$$3); ZVAL_LONG(_19$$3, opacity); @@ -70870,7 +71045,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _background) { _24$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_NVAR(_16$$3); ZVAL_STRING(&_16$$3, "Imagick::COMPOSITE_DISSOLVE", 0); - ZEPHIR_CALL_FUNCTION(&_25$$3, "constant", &_13, 192, &_16$$3); + ZEPHIR_CALL_FUNCTION(&_25$$3, "constant", &_13, 187, &_16$$3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_19$$3); ZVAL_LONG(_19$$3, 0); @@ -70879,7 +71054,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _background) { ZEPHIR_CALL_METHOD(&ret, background, "compositeimage", &_27, 0, _24$$3, _25$$3, _19$$3, _26$$3); zephir_check_call_status(); if (!ZEPHIR_IS_TRUE_IDENTICAL(ret)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_image_exception_ce, "Imagick::compositeImage failed", "phalcon/image/adapter/imagick.zep", 570); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_image_exception_ce, "Imagick::compositeImage failed", "phalcon/image/adapter/imagick.zep", 568); return; } _28$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); @@ -71024,7 +71199,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _save) { zephir_check_call_status(); ZEPHIR_SINIT_VAR(_11$$3); ZVAL_STRING(&_11$$3, "w", 0); - ZEPHIR_CALL_FUNCTION(&fp, "fopen", NULL, 286, file, &_11$$3); + ZEPHIR_CALL_FUNCTION(&fp, "fopen", NULL, 281, file, &_11$$3); zephir_check_call_status(); _12$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_CALL_METHOD(NULL, _12$$3, "writeimagesfile", NULL, 0, fp); @@ -71048,7 +71223,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _save) { _17$$5 = zephir_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC); ZEPHIR_SINIT_VAR(_18$$5); ZVAL_STRING(&_18$$5, "Imagick::COMPRESSION_JPEG", 0); - ZEPHIR_CALL_FUNCTION(&_19$$5, "constant", NULL, 192, &_18$$5); + ZEPHIR_CALL_FUNCTION(&_19$$5, "constant", NULL, 187, &_18$$5); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, _17$$5, "setimagecompression", NULL, 0, _19$$5); zephir_check_call_status(); @@ -71120,7 +71295,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, _render) { if (_8$$4) { ZEPHIR_SINIT_VAR(_10$$5); ZVAL_STRING(&_10$$5, "Imagick::COMPRESSION_JPEG", 0); - ZEPHIR_CALL_FUNCTION(&_11$$5, "constant", NULL, 192, &_10$$5); + ZEPHIR_CALL_FUNCTION(&_11$$5, "constant", NULL, 187, &_10$$5); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, image, "setimagecompression", NULL, 0, _11$$5); zephir_check_call_status(); @@ -71813,6 +71988,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Formatter) { ZEPHIR_REGISTER_CLASS(Phalcon\\Logger, Formatter, phalcon, logger_formatter, phalcon_logger_formatter_method_entry, ZEND_ACC_EXPLICIT_ABSTRACT_CLASS); + zend_class_implements(phalcon_logger_formatter_ce TSRMLS_CC, 1, phalcon_logger_formatterinterface_ce); return SUCCESS; } @@ -72049,6 +72225,8 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Multiple) { zend_declare_property_null(phalcon_logger_multiple_ce, SL("_formatter"), ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_null(phalcon_logger_multiple_ce, SL("_logLevel"), ZEND_ACC_PROTECTED TSRMLS_CC); + return SUCCESS; } @@ -72069,6 +72247,14 @@ static PHP_METHOD(Phalcon_Logger_Multiple, getFormatter) { } +static PHP_METHOD(Phalcon_Logger_Multiple, getLogLevel) { + + + + RETURN_MEMBER(this_ptr, "_logLevel"); + +} + static PHP_METHOD(Phalcon_Logger_Multiple, push) { zval *logger; @@ -72096,7 +72282,7 @@ static PHP_METHOD(Phalcon_Logger_Multiple, setFormatter) { ZEPHIR_OBS_VAR(loggers); zephir_read_property_this(&loggers, this_ptr, SL("_loggers"), PH_NOISY_CC); if (Z_TYPE_P(loggers) == IS_ARRAY) { - zephir_is_iterable(loggers, &_1$$3, &_0$$3, 0, 0, "phalcon/logger/multiple.zep", 59); + zephir_is_iterable(loggers, &_1$$3, &_0$$3, 0, 0, "phalcon/logger/multiple.zep", 61); for ( ; zephir_hash_get_current_data_ex(_1$$3, (void**) &_2$$3, &_0$$3) == SUCCESS ; zephir_hash_move_forward_ex(_1$$3, &_0$$3) @@ -72111,6 +72297,41 @@ static PHP_METHOD(Phalcon_Logger_Multiple, setFormatter) { } +static PHP_METHOD(Phalcon_Logger_Multiple, setLogLevel) { + + HashTable *_1$$3; + HashPosition _0$$3; + zval *level_param = NULL, *loggers = NULL, *logger = NULL, *_4, **_2$$3, *_3$$4 = NULL; + int level, ZEPHIR_LAST_CALL_STATUS; + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &level_param); + + level = zephir_get_intval(level_param); + + + ZEPHIR_OBS_VAR(loggers); + zephir_read_property_this(&loggers, this_ptr, SL("_loggers"), PH_NOISY_CC); + if (Z_TYPE_P(loggers) == IS_ARRAY) { + zephir_is_iterable(loggers, &_1$$3, &_0$$3, 0, 0, "phalcon/logger/multiple.zep", 77); + for ( + ; zephir_hash_get_current_data_ex(_1$$3, (void**) &_2$$3, &_0$$3) == SUCCESS + ; zephir_hash_move_forward_ex(_1$$3, &_0$$3) + ) { + ZEPHIR_GET_HVALUE(logger, _2$$3); + ZEPHIR_INIT_NVAR(_3$$4); + ZVAL_LONG(_3$$4, level); + ZEPHIR_CALL_METHOD(NULL, logger, "setloglevel", NULL, 0, _3$$4); + zephir_check_call_status(); + } + } + ZEPHIR_INIT_ZVAL_NREF(_4); + ZVAL_LONG(_4, level); + zephir_update_property_this(this_ptr, SL("_logLevel"), _4 TSRMLS_CC); + ZEPHIR_MM_RESTORE(); + +} + static PHP_METHOD(Phalcon_Logger_Multiple, log) { HashTable *_1$$3; @@ -72136,7 +72357,7 @@ static PHP_METHOD(Phalcon_Logger_Multiple, log) { ZEPHIR_OBS_VAR(loggers); zephir_read_property_this(&loggers, this_ptr, SL("_loggers"), PH_NOISY_CC); if (Z_TYPE_P(loggers) == IS_ARRAY) { - zephir_is_iterable(loggers, &_1$$3, &_0$$3, 0, 0, "phalcon/logger/multiple.zep", 75); + zephir_is_iterable(loggers, &_1$$3, &_0$$3, 0, 0, "phalcon/logger/multiple.zep", 93); for ( ; zephir_hash_get_current_data_ex(_1$$3, (void**) &_2$$3, &_0$$3) == SUCCESS ; zephir_hash_move_forward_ex(_1$$3, &_0$$3) @@ -72514,7 +72735,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_File, __construct) { ZEPHIR_INIT_NVAR(mode); ZVAL_STRING(mode, "ab", 1); } - ZEPHIR_CALL_FUNCTION(&handler, "fopen", NULL, 286, name, mode); + ZEPHIR_CALL_FUNCTION(&handler, "fopen", NULL, 281, name, mode); zephir_check_call_status(); if (Z_TYPE_P(handler) != IS_RESOURCE) { ZEPHIR_INIT_VAR(_0$$7); @@ -72546,7 +72767,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_File, getFormatter) { if (Z_TYPE_P(_0) != IS_OBJECT) { ZEPHIR_INIT_VAR(_1$$3); object_init_ex(_1$$3, phalcon_logger_formatter_line_ce); - ZEPHIR_CALL_METHOD(NULL, _1$$3, "__construct", NULL, 290); + ZEPHIR_CALL_METHOD(NULL, _1$$3, "__construct", NULL, 285); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_formatter"), _1$$3 TSRMLS_CC); } @@ -72626,7 +72847,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_File, __wakeup) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_logger_exception_ce, "Logger must be opened in append or write mode", "phalcon/logger/adapter/file.zep", 152); return; } - ZEPHIR_CALL_FUNCTION(&_1, "fopen", NULL, 286, path, mode); + ZEPHIR_CALL_FUNCTION(&_1, "fopen", NULL, 281, path, mode); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_fileHandler"), _1 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -72711,15 +72932,15 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Firephp, logInternal) { if (!ZEPHIR_IS_TRUE_IDENTICAL(_2)) { ZEPHIR_SINIT_VAR(_3$$4); ZVAL_STRING(&_3$$4, "X-Wf-Protocol-1: http://meta.wildfirehq.org/Protocol/JsonStream/0.2", 0); - ZEPHIR_CALL_FUNCTION(NULL, "header", &_4, 238, &_3$$4); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_4, 233, &_3$$4); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_3$$4); ZVAL_STRING(&_3$$4, "X-Wf-1-Plugin-1: http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/0.3", 0); - ZEPHIR_CALL_FUNCTION(NULL, "header", &_4, 238, &_3$$4); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_4, 233, &_3$$4); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_3$$4); ZVAL_STRING(&_3$$4, "X-Wf-Structure-1: http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1", 0); - ZEPHIR_CALL_FUNCTION(NULL, "header", &_4, 238, &_3$$4); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_4, 233, &_3$$4); zephir_check_call_status(); zephir_update_static_property_ce(phalcon_logger_adapter_firephp_ce, SL("_initialized"), &ZEPHIR_GLOBAL(global_true) TSRMLS_CC); } @@ -72749,7 +72970,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Firephp, logInternal) { if (zephir_array_isset_long(chunk, (zephir_get_numberval(key) + 1))) { zephir_concat_self_str(&content, SL("|\\") TSRMLS_CC); } - ZEPHIR_CALL_FUNCTION(NULL, "header", &_4, 238, content); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_4, 233, content); zephir_check_call_status(); _13$$5 = zephir_fetch_static_property_ce(phalcon_logger_adapter_firephp_ce, SL("_index") TSRMLS_CC); ZEPHIR_INIT_ZVAL_NREF(_14$$5); @@ -72827,7 +73048,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Stream, __construct) { ZEPHIR_INIT_NVAR(mode); ZVAL_STRING(mode, "ab", 1); } - ZEPHIR_CALL_FUNCTION(&stream, "fopen", NULL, 286, name, mode); + ZEPHIR_CALL_FUNCTION(&stream, "fopen", NULL, 281, name, mode); zephir_check_call_status(); if (!(zephir_is_true(stream))) { ZEPHIR_INIT_VAR(_0$$6); @@ -72857,7 +73078,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Stream, getFormatter) { if (Z_TYPE_P(_0) != IS_OBJECT) { ZEPHIR_INIT_VAR(_1$$3); object_init_ex(_1$$3, phalcon_logger_formatter_line_ce); - ZEPHIR_CALL_METHOD(NULL, _1$$3, "__construct", NULL, 290); + ZEPHIR_CALL_METHOD(NULL, _1$$3, "__construct", NULL, 285); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_formatter"), _1$$3 TSRMLS_CC); } @@ -72959,7 +73180,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Syslog, __construct) { ZEPHIR_INIT_NVAR(facility); ZVAL_LONG(facility, 8); } - ZEPHIR_CALL_FUNCTION(NULL, "openlog", NULL, 291, name, option, facility); + ZEPHIR_CALL_FUNCTION(NULL, "openlog", NULL, 286, name, option, facility); zephir_check_call_status(); if (1) { zephir_update_property_this(this_ptr, SL("_opened"), ZEPHIR_GLOBAL(global_true) TSRMLS_CC); @@ -73023,7 +73244,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Syslog, logInternal) { } zephir_array_fetch_long(&_3, appliedFormat, 0, PH_NOISY | PH_READONLY, "phalcon/logger/adapter/syslog.zep", 102 TSRMLS_CC); zephir_array_fetch_long(&_4, appliedFormat, 1, PH_NOISY | PH_READONLY, "phalcon/logger/adapter/syslog.zep", 102 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(NULL, "syslog", NULL, 292, _3, _4); + ZEPHIR_CALL_FUNCTION(NULL, "syslog", NULL, 287, _3, _4); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -73038,7 +73259,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Syslog, close) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_opened"), PH_NOISY_CC); if (zephir_is_true(_0)) { - ZEPHIR_CALL_FUNCTION(NULL, "closelog", NULL, 293); + ZEPHIR_CALL_FUNCTION(NULL, "closelog", NULL, 288); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -73067,7 +73288,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Formatter_Firephp) { zend_declare_property_bool(phalcon_logger_formatter_firephp_ce, SL("_enableLabels"), 1, ZEND_ACC_PROTECTED TSRMLS_CC); - zend_class_implements(phalcon_logger_formatter_firephp_ce TSRMLS_CC, 1, phalcon_logger_formatterinterface_ce); return SUCCESS; } @@ -73205,28 +73425,28 @@ static PHP_METHOD(Phalcon_Logger_Formatter_Firephp, format) { ZVAL_STRING(&_5$$4, "5.3.6", 0); ZEPHIR_SINIT_VAR(_6$$4); ZVAL_STRING(&_6$$4, "<", 0); - ZEPHIR_CALL_FUNCTION(&_7$$4, "version_compare", NULL, 241, _4$$4, &_5$$4, &_6$$4); + ZEPHIR_CALL_FUNCTION(&_7$$4, "version_compare", NULL, 236, _4$$4, &_5$$4, &_6$$4); zephir_check_call_status(); if (!(zephir_is_true(_7$$4))) { param$$4 = (2) ? 1 : 0; } ZEPHIR_SINIT_NVAR(_5$$4); ZVAL_BOOL(&_5$$4, (param$$4 ? 1 : 0)); - ZEPHIR_CALL_FUNCTION(&backtrace, "debug_backtrace", NULL, 153, &_5$$4); + ZEPHIR_CALL_FUNCTION(&backtrace, "debug_backtrace", NULL, 148, &_5$$4); zephir_check_call_status(); ZEPHIR_MAKE_REF(backtrace); - ZEPHIR_CALL_FUNCTION(&lastTrace, "end", NULL, 172, backtrace); + ZEPHIR_CALL_FUNCTION(&lastTrace, "end", NULL, 167, backtrace); ZEPHIR_UNREF(backtrace); zephir_check_call_status(); if (zephir_array_isset_string(lastTrace, SS("file"))) { - zephir_array_fetch_string(&_8$$6, lastTrace, SL("file"), PH_NOISY | PH_READONLY, "phalcon/logger/formatter/firephp.zep", 133 TSRMLS_CC); + zephir_array_fetch_string(&_8$$6, lastTrace, SL("file"), PH_NOISY | PH_READONLY, "phalcon/logger/formatter/firephp.zep", 132 TSRMLS_CC); zephir_array_update_string(&meta, SL("File"), &_8$$6, PH_COPY | PH_SEPARATE); } if (zephir_array_isset_string(lastTrace, SS("line"))) { - zephir_array_fetch_string(&_9$$7, lastTrace, SL("line"), PH_NOISY | PH_READONLY, "phalcon/logger/formatter/firephp.zep", 137 TSRMLS_CC); + zephir_array_fetch_string(&_9$$7, lastTrace, SL("line"), PH_NOISY | PH_READONLY, "phalcon/logger/formatter/firephp.zep", 136 TSRMLS_CC); zephir_array_update_string(&meta, SL("Line"), &_9$$7, PH_COPY | PH_SEPARATE); } - zephir_is_iterable(backtrace, &_11$$4, &_10$$4, 1, 0, "phalcon/logger/formatter/firephp.zep", 146); + zephir_is_iterable(backtrace, &_11$$4, &_10$$4, 1, 0, "phalcon/logger/formatter/firephp.zep", 145); for ( ; zephir_hash_get_current_data_ex(_11$$4, (void**) &_12$$4, &_10$$4) == SUCCESS ; zephir_hash_move_forward_ex(_11$$4, &_10$$4) @@ -73304,7 +73524,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Formatter_Json) { ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Logger\\Formatter, Json, phalcon, logger_formatter_json, phalcon_logger_formatter_ce, phalcon_logger_formatter_json_method_entry, 0); - zend_class_implements(phalcon_logger_formatter_json_ce TSRMLS_CC, 1, phalcon_logger_formatterinterface_ce); return SUCCESS; } @@ -73374,7 +73593,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Formatter_Line) { zend_declare_property_string(phalcon_logger_formatter_line_ce, SL("_format"), "[%date%][%type%] %message%", ZEND_ACC_PROTECTED TSRMLS_CC); - zend_class_implements(phalcon_logger_formatter_line_ce TSRMLS_CC, 1, phalcon_logger_formatterinterface_ce); return SUCCESS; } @@ -73469,19 +73687,19 @@ static PHP_METHOD(Phalcon_Logger_Formatter_Line, format) { ZEPHIR_OBS_VAR(format); zephir_read_property_this(&format, this_ptr, SL("_format"), PH_NOISY_CC); - if (zephir_memnstr_str(format, SL("%date%"), "phalcon/logger/formatter/line.zep", 81)) { + if (zephir_memnstr_str(format, SL("%date%"), "phalcon/logger/formatter/line.zep", 80)) { ZEPHIR_INIT_VAR(_0$$3); _1$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_dateFormat"), PH_NOISY_CC); ZEPHIR_SINIT_VAR(_2$$3); ZVAL_LONG(&_2$$3, timestamp); - ZEPHIR_CALL_FUNCTION(&_3$$3, "date", NULL, 294, _1$$3, &_2$$3); + ZEPHIR_CALL_FUNCTION(&_3$$3, "date", NULL, 289, _1$$3, &_2$$3); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_2$$3); ZVAL_STRING(&_2$$3, "%date%", 0); zephir_fast_str_replace(&_0$$3, &_2$$3, _3$$3, format TSRMLS_CC); ZEPHIR_CPY_WRT(format, _0$$3); } - if (zephir_memnstr_str(format, SL("%type%"), "phalcon/logger/formatter/line.zep", 88)) { + if (zephir_memnstr_str(format, SL("%type%"), "phalcon/logger/formatter/line.zep", 87)) { ZEPHIR_INIT_VAR(_4$$4); ZEPHIR_INIT_VAR(_6$$4); ZVAL_LONG(_6$$4, type); @@ -73528,7 +73746,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Formatter_Syslog) { ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Logger\\Formatter, Syslog, phalcon, logger_formatter_syslog, phalcon_logger_formatter_ce, phalcon_logger_formatter_syslog_method_entry, 0); - zend_class_implements(phalcon_logger_formatter_syslog_ce TSRMLS_CC, 1, phalcon_logger_formatterinterface_ce); return SUCCESS; } @@ -74291,7 +74508,7 @@ static PHP_METHOD(Phalcon_Mvc_Collection, getSource) { ZEPHIR_INIT_VAR(_0$$3); zephir_get_class_ns(_0$$3, collection, 0 TSRMLS_CC); ZEPHIR_INIT_NVAR(source); - zephir_uncamelize(source, _0$$3); + zephir_uncamelize(source, _0$$3, NULL ); zephir_update_property_this(this_ptr, SL("_source"), source TSRMLS_CC); } RETURN_CCTOR(source); @@ -74555,7 +74772,7 @@ static PHP_METHOD(Phalcon_Mvc_Collection, _getResultset) { } ZEPHIR_INIT_VAR(collections); array_init(collections); - ZEPHIR_CALL_FUNCTION(&_5, "iterator_to_array", NULL, 295, documentsCursor); + ZEPHIR_CALL_FUNCTION(&_5, "iterator_to_array", NULL, 290, documentsCursor); zephir_check_call_status(); zephir_is_iterable(_5, &_7, &_6, 0, 0, "phalcon/mvc/collection.zep", 444); for ( @@ -75023,7 +75240,7 @@ static PHP_METHOD(Phalcon_Mvc_Collection, save) { zephir_update_property_this(this_ptr, SL("_errorMessages"), _2 TSRMLS_CC); ZEPHIR_OBS_VAR(disableEvents); zephir_read_static_property_ce(&disableEvents, phalcon_mvc_collection_ce, SL("_disableEvents") TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "_presave", NULL, 296, dependencyInjector, disableEvents, exists); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "_presave", NULL, 291, dependencyInjector, disableEvents, exists); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(_3)) { RETURN_MM_BOOL(0); @@ -75058,7 +75275,7 @@ static PHP_METHOD(Phalcon_Mvc_Collection, save) { } else { ZVAL_BOOL(_5, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_postsave", NULL, 297, disableEvents, _5, exists); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_postsave", NULL, 292, disableEvents, _5, exists); zephir_check_call_status(); RETURN_MM(); @@ -76382,7 +76599,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, mount) { if (zephir_is_true(_0$$5)) { ZEPHIR_INIT_VAR(lazyHandler); object_init_ex(lazyHandler, phalcon_mvc_micro_lazyloader_ce); - ZEPHIR_CALL_METHOD(NULL, lazyHandler, "__construct", NULL, 298, mainHandler); + ZEPHIR_CALL_METHOD(NULL, lazyHandler, "__construct", NULL, 293, mainHandler); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(lazyHandler, mainHandler); @@ -76530,7 +76747,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, setService) { if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { ZEPHIR_INIT_NVAR(dependencyInjector); object_init_ex(dependencyInjector, phalcon_di_factorydefault_ce); - ZEPHIR_CALL_METHOD(NULL, dependencyInjector, "__construct", NULL, 176); + ZEPHIR_CALL_METHOD(NULL, dependencyInjector, "__construct", NULL, 171); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_dependencyInjector"), dependencyInjector TSRMLS_CC); } @@ -76540,7 +76757,7 @@ static PHP_METHOD(Phalcon_Mvc_Micro, setService) { } else { ZVAL_BOOL(_0, 0); } - ZEPHIR_RETURN_CALL_METHOD(dependencyInjector, "set", NULL, 299, serviceName, definition, _0); + ZEPHIR_RETURN_CALL_METHOD(dependencyInjector, "set", NULL, 294, serviceName, definition, _0); zephir_check_call_status(); RETURN_MM(); @@ -76572,11 +76789,11 @@ static PHP_METHOD(Phalcon_Mvc_Micro, hasService) { if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { ZEPHIR_INIT_NVAR(dependencyInjector); object_init_ex(dependencyInjector, phalcon_di_factorydefault_ce); - ZEPHIR_CALL_METHOD(NULL, dependencyInjector, "__construct", NULL, 176); + ZEPHIR_CALL_METHOD(NULL, dependencyInjector, "__construct", NULL, 171); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_dependencyInjector"), dependencyInjector TSRMLS_CC); } - ZEPHIR_RETURN_CALL_METHOD(dependencyInjector, "has", NULL, 300, serviceName); + ZEPHIR_RETURN_CALL_METHOD(dependencyInjector, "has", NULL, 295, serviceName); zephir_check_call_status(); RETURN_MM(); @@ -76608,11 +76825,11 @@ static PHP_METHOD(Phalcon_Mvc_Micro, getService) { if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { ZEPHIR_INIT_NVAR(dependencyInjector); object_init_ex(dependencyInjector, phalcon_di_factorydefault_ce); - ZEPHIR_CALL_METHOD(NULL, dependencyInjector, "__construct", NULL, 176); + ZEPHIR_CALL_METHOD(NULL, dependencyInjector, "__construct", NULL, 171); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_dependencyInjector"), dependencyInjector TSRMLS_CC); } - ZEPHIR_RETURN_CALL_METHOD(dependencyInjector, "get", NULL, 301, serviceName); + ZEPHIR_RETURN_CALL_METHOD(dependencyInjector, "get", NULL, 296, serviceName); zephir_check_call_status(); RETURN_MM(); @@ -76633,11 +76850,11 @@ static PHP_METHOD(Phalcon_Mvc_Micro, getSharedService) { if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { ZEPHIR_INIT_NVAR(dependencyInjector); object_init_ex(dependencyInjector, phalcon_di_factorydefault_ce); - ZEPHIR_CALL_METHOD(NULL, dependencyInjector, "__construct", NULL, 176); + ZEPHIR_CALL_METHOD(NULL, dependencyInjector, "__construct", NULL, 171); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_dependencyInjector"), dependencyInjector TSRMLS_CC); } - ZEPHIR_RETURN_CALL_METHOD(dependencyInjector, "getshared", NULL, 302, serviceName); + ZEPHIR_RETURN_CALL_METHOD(dependencyInjector, "getshared", NULL, 297, serviceName); zephir_check_call_status(); RETURN_MM(); @@ -77311,10 +77528,6 @@ static PHP_METHOD(Phalcon_Mvc_Model, getModelsMetaData) { if (Z_TYPE_P(metaData) != IS_OBJECT) { _0$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_dependencyInjector"), PH_NOISY_CC); ZEPHIR_CPY_WRT(dependencyInjector, _0$$3); - if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injector container is required to obtain the services related to the ORM", "phalcon/mvc/model.zep", 214); - return; - } ZEPHIR_INIT_VAR(_2$$3); ZVAL_STRING(_2$$3, "modelsMetadata", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_CALL_METHOD(&_1$$3, dependencyInjector, "getshared", NULL, 0, _2$$3); @@ -77322,7 +77535,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, getModelsMetaData) { zephir_check_call_status(); ZEPHIR_CPY_WRT(metaData, _1$$3); if (Z_TYPE_P(metaData) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsMetadata' is not valid", "phalcon/mvc/model.zep", 222); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsMetadata' is not valid", "phalcon/mvc/model.zep", 216); return; } zephir_update_property_this(this_ptr, SL("_modelsMetaData"), metaData TSRMLS_CC); @@ -77619,9 +77832,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, assign) { HashTable *_5, *_1$$3; HashPosition _4, _0$$3; - zephir_fcall_cache_entry *_9 = NULL; + zephir_fcall_cache_entry *_9 = NULL, *_11 = NULL; int ZEPHIR_LAST_CALL_STATUS; - zval *data_param = NULL, *dataColumnMap = NULL, *whiteList = NULL, *key = NULL, *keyMapped = NULL, *value = NULL, *attribute = NULL, *attributeField = NULL, *possibleSetter = NULL, *metaData = NULL, *columnMap = NULL, *dataMapped = NULL, *_3 = NULL, **_6, **_2$$3, *_7$$13 = NULL, *_8$$13 = NULL, *_10$$16 = NULL; + zval *data_param = NULL, *dataColumnMap = NULL, *whiteList = NULL, *key = NULL, *keyMapped = NULL, *value = NULL, *attribute = NULL, *attributeField = NULL, *metaData = NULL, *columnMap = NULL, *dataMapped = NULL, *_3 = NULL, **_6, **_2$$3, *_7$$13 = NULL, *_8$$13 = NULL, *_10$$16 = NULL; zval *data = NULL; ZEPHIR_MM_GROW(); @@ -77639,7 +77852,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, assign) { if (Z_TYPE_P(dataColumnMap) == IS_ARRAY) { ZEPHIR_INIT_VAR(dataMapped); array_init(dataMapped); - zephir_is_iterable(data, &_1$$3, &_0$$3, 0, 0, "phalcon/mvc/model.zep", 443); + zephir_is_iterable(data, &_1$$3, &_0$$3, 0, 0, "phalcon/mvc/model.zep", 437); for ( ; zephir_hash_get_current_data_ex(_1$$3, (void**) &_2$$3, &_0$$3) == SUCCESS ; zephir_hash_move_forward_ex(_1$$3, &_0$$3) @@ -77668,7 +77881,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, assign) { } ZEPHIR_CALL_METHOD(&_3, metaData, "getattributes", NULL, 0, this_ptr); zephir_check_call_status(); - zephir_is_iterable(_3, &_5, &_4, 0, 0, "phalcon/mvc/model.zep", 495); + zephir_is_iterable(_3, &_5, &_4, 0, 0, "phalcon/mvc/model.zep", 486); for ( ; zephir_hash_get_current_data_ex(_5, (void**) &_6, &_4) == SUCCESS ; zephir_hash_move_forward_ex(_5, &_4) @@ -77684,7 +77897,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, assign) { ZEPHIR_CONCAT_SVS(_8$$13, "Column '", attribute, "' doesn\\'t make part of the column map"); ZEPHIR_CALL_METHOD(NULL, _7$$13, "__construct", &_9, 9, _8$$13); zephir_check_call_status(); - zephir_throw_exception_debug(_7$$13, "phalcon/mvc/model.zep", 465 TSRMLS_CC); + zephir_throw_exception_debug(_7$$13, "phalcon/mvc/model.zep", 459 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -77701,14 +77914,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, assign) { continue; } } - ZEPHIR_INIT_NVAR(_10$$16); - zephir_camelize(_10$$16, attributeField); - ZEPHIR_INIT_NVAR(possibleSetter); - ZEPHIR_CONCAT_SV(possibleSetter, "set", _10$$16); - if ((zephir_method_exists(this_ptr, possibleSetter TSRMLS_CC) == SUCCESS)) { - ZEPHIR_CALL_METHOD_ZVAL(NULL, this_ptr, possibleSetter, NULL, 0, value); - zephir_check_call_status(); - } else { + ZEPHIR_CALL_METHOD(&_10$$16, this_ptr, "_possiblesetter", &_11, 298, attributeField, value); + zephir_check_call_status(); + if (!(zephir_is_true(_10$$16))) { zephir_update_property_zval_zval(this_ptr, attributeField, value TSRMLS_CC); } } @@ -77751,7 +77959,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap) { ZVAL_LONG(_0, dirtyState); ZEPHIR_CALL_METHOD(NULL, instance, "setdirtystate", NULL, 0, _0); zephir_check_call_status(); - zephir_is_iterable(data, &_2, &_1, 0, 0, "phalcon/mvc/model.zep", 595); + zephir_is_iterable(data, &_2, &_1, 0, 0, "phalcon/mvc/model.zep", 586); for ( ; zephir_hash_get_current_data_ex(_2, (void**) &_3, &_1) == SUCCESS ; zephir_hash_move_forward_ex(_2, &_1) @@ -77772,7 +77980,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap) { ZEPHIR_CONCAT_SVS(_5$$7, "Column '", key, "' doesn't make part of the column map"); ZEPHIR_CALL_METHOD(NULL, _4$$7, "__construct", &_6, 9, _5$$7); zephir_check_call_status(); - zephir_throw_exception_debug(_4$$7, "phalcon/mvc/model.zep", 538 TSRMLS_CC); + zephir_throw_exception_debug(_4$$7, "phalcon/mvc/model.zep", 529 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -77788,7 +77996,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap) { _7$$4 = Z_TYPE_P(value) != IS_NULL; } if (_7$$4) { - zephir_array_fetch_long(&_8$$10, attribute, 1, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 550 TSRMLS_CC); + zephir_array_fetch_long(&_8$$10, attribute, 1, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 541 TSRMLS_CC); do { if (ZEPHIR_IS_LONG(_8$$10, 0)) { ZEPHIR_SINIT_NVAR(_9$$11); @@ -77812,7 +78020,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap) { } while(0); } else { - zephir_array_fetch_long(&_11$$15, attribute, 1, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 571 TSRMLS_CC); + zephir_array_fetch_long(&_11$$15, attribute, 1, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 562 TSRMLS_CC); do { if (ZEPHIR_IS_LONG(_11$$15, 0) || ZEPHIR_IS_LONG(_11$$15, 9) || ZEPHIR_IS_LONG(_11$$15, 3) || ZEPHIR_IS_LONG(_11$$15, 7) || ZEPHIR_IS_LONG(_11$$15, 8)) { ZEPHIR_INIT_NVAR(castValue); @@ -77825,7 +78033,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap) { } ZEPHIR_OBS_NVAR(attributeName); - zephir_array_fetch_long(&attributeName, attribute, 0, PH_NOISY, "phalcon/mvc/model.zep", 587 TSRMLS_CC); + zephir_array_fetch_long(&attributeName, attribute, 0, PH_NOISY, "phalcon/mvc/model.zep", 578 TSRMLS_CC); zephir_update_property_zval_zval(instance, attributeName, castValue TSRMLS_CC); } } @@ -77869,7 +78077,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate) { ZEPHIR_INIT_VAR(hydrateObject); object_init(hydrateObject); } - zephir_is_iterable(data, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 669); + zephir_is_iterable(data, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 660); for ( ; zephir_hash_get_current_data_ex(_1, (void**) &_2, &_0) == SUCCESS ; zephir_hash_move_forward_ex(_1, &_0) @@ -77887,7 +78095,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate) { ZEPHIR_CONCAT_SVS(_4$$11, "Column '", key, "' doesn't make part of the column map"); ZEPHIR_CALL_METHOD(NULL, _3$$11, "__construct", &_5, 9, _4$$11); zephir_check_call_status(); - zephir_throw_exception_debug(_3$$11, "phalcon/mvc/model.zep", 648 TSRMLS_CC); + zephir_throw_exception_debug(_3$$11, "phalcon/mvc/model.zep", 639 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -77942,7 +78150,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResult) { ZVAL_LONG(_0, dirtyState); ZEPHIR_CALL_METHOD(NULL, instance, "setdirtystate", NULL, 0, _0); zephir_check_call_status(); - zephir_is_iterable(data, &_2, &_1, 0, 0, "phalcon/mvc/model.zep", 716); + zephir_is_iterable(data, &_2, &_1, 0, 0, "phalcon/mvc/model.zep", 707); for ( ; zephir_hash_get_current_data_ex(_2, (void**) &_3, &_1) == SUCCESS ; zephir_hash_move_forward_ex(_2, &_1) @@ -77950,7 +78158,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, cloneResult) { ZEPHIR_GET_HMKEY(key, _2, _1); ZEPHIR_GET_HVALUE(value, _3); if (Z_TYPE_P(key) != IS_STRING) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid key in array data provided to dumpResult()", "phalcon/mvc/model.zep", 708); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid key in array data provided to dumpResult()", "phalcon/mvc/model.zep", 699); return; } zephir_update_property_zval_zval(instance, key, value TSRMLS_CC); @@ -77989,7 +78197,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, find) { ZEPHIR_INIT_VAR(params); array_init(params); if (Z_TYPE_P(parameters) != IS_NULL) { - zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/mvc/model.zep", 762); + zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/mvc/model.zep", 753); } } else { ZEPHIR_CPY_WRT(params, parameters); @@ -78064,7 +78272,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, findFirst) { ZEPHIR_INIT_VAR(params); array_init(params); if (Z_TYPE_P(parameters) != IS_NULL) { - zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/mvc/model.zep", 849); + zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/mvc/model.zep", 840); } } else { ZEPHIR_CPY_WRT(params, parameters); @@ -78148,12 +78356,12 @@ static PHP_METHOD(Phalcon_Mvc_Model, query) { ZEPHIR_CALL_METHOD(NULL, criteria, "__construct", NULL, 0); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, criteria, "setdi", NULL, 303, dependencyInjector); + ZEPHIR_CALL_METHOD(NULL, criteria, "setdi", NULL, 299, dependencyInjector); zephir_check_call_status(); } ZEPHIR_INIT_VAR(_3); zephir_get_called_class(_3 TSRMLS_CC); - ZEPHIR_CALL_METHOD(NULL, criteria, "setmodelname", NULL, 304, _3); + ZEPHIR_CALL_METHOD(NULL, criteria, "setmodelname", NULL, 300, _3); zephir_check_call_status(); RETURN_CCTOR(criteria); @@ -78207,7 +78415,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _exists) { array_init(uniqueParams); ZEPHIR_INIT_NVAR(uniqueTypes); array_init(uniqueTypes); - zephir_is_iterable(primaryKeys, &_1$$3, &_0$$3, 0, 0, "phalcon/mvc/model.zep", 1020); + zephir_is_iterable(primaryKeys, &_1$$3, &_0$$3, 0, 0, "phalcon/mvc/model.zep", 1011); for ( ; zephir_hash_get_current_data_ex(_1$$3, (void**) &_2$$3, &_0$$3) == SUCCESS ; zephir_hash_move_forward_ex(_1$$3, &_0$$3) @@ -78222,7 +78430,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _exists) { ZEPHIR_CONCAT_SVS(_4$$9, "Column '", field, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, _3$$9, "__construct", &_5, 9, _4$$9); zephir_check_call_status(); - zephir_throw_exception_debug(_3$$9, "phalcon/mvc/model.zep", 984 TSRMLS_CC); + zephir_throw_exception_debug(_3$$9, "phalcon/mvc/model.zep", 975 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -78240,9 +78448,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, _exists) { if (_6$$11) { numberEmpty++; } - zephir_array_append(&uniqueParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1002); + zephir_array_append(&uniqueParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 993); } else { - zephir_array_append(&uniqueParams, ZEPHIR_GLOBAL(global_null), PH_SEPARATE, "phalcon/mvc/model.zep", 1005); + zephir_array_append(&uniqueParams, ZEPHIR_GLOBAL(global_null), PH_SEPARATE, "phalcon/mvc/model.zep", 996); numberEmpty++; } ZEPHIR_OBS_NVAR(type); @@ -78253,16 +78461,16 @@ static PHP_METHOD(Phalcon_Mvc_Model, _exists) { ZEPHIR_CONCAT_SVS(_8$$14, "Column '", field, "' isn't part of the table columns"); ZEPHIR_CALL_METHOD(NULL, _7$$14, "__construct", &_5, 9, _8$$14); zephir_check_call_status(); - zephir_throw_exception_debug(_7$$14, "phalcon/mvc/model.zep", 1010 TSRMLS_CC); + zephir_throw_exception_debug(_7$$14, "phalcon/mvc/model.zep", 1001 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&uniqueTypes, type, PH_SEPARATE, "phalcon/mvc/model.zep", 1013); + zephir_array_append(&uniqueTypes, type, PH_SEPARATE, "phalcon/mvc/model.zep", 1004); ZEPHIR_CALL_METHOD(&_9$$7, connection, "escapeidentifier", &_10, 0, field); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_11$$7); ZEPHIR_CONCAT_VS(_11$$7, _9$$7, " = ?"); - zephir_array_append(&wherePk, _11$$7, PH_SEPARATE, "phalcon/mvc/model.zep", 1014); + zephir_array_append(&wherePk, _11$$7, PH_SEPARATE, "phalcon/mvc/model.zep", 1005); } if (numberPrimary == numberEmpty) { RETURN_MM_BOOL(0); @@ -78307,10 +78515,10 @@ static PHP_METHOD(Phalcon_Mvc_Model, _exists) { ZEPHIR_INIT_VAR(_14); ZEPHIR_CONCAT_SVSV(_14, "SELECT COUNT(*) \"rowcount\" FROM ", _13, " WHERE ", uniqueKey); ZEPHIR_INIT_VAR(_15); - ZVAL_NULL(_15); + ZVAL_LONG(_15, 2); ZEPHIR_CALL_METHOD(&num, connection, "fetchone", NULL, 0, _14, _15, uniqueParams, uniqueTypes); zephir_check_call_status(); - zephir_array_fetch_string(&_16, num, SL("rowcount"), PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1070 TSRMLS_CC); + zephir_array_fetch_string(&_16, num, SL("rowcount"), PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1061 TSRMLS_CC); if (zephir_is_true(_16)) { ZEPHIR_INIT_ZVAL_NREF(_17$$22); ZVAL_LONG(_17$$22, 0); @@ -78369,7 +78577,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _groupResult) { ZEPHIR_INIT_VAR(params); array_init(params); if (Z_TYPE_P(parameters) != IS_NULL) { - zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/mvc/model.zep", 1100); + zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/mvc/model.zep", 1091); } } else { ZEPHIR_CPY_WRT(params, parameters); @@ -78683,7 +78891,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, validate) { if (ZEPHIR_IS_FALSE_IDENTICAL(_0)) { ZEPHIR_CALL_METHOD(&_1$$3, validator, "getmessages", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(_1$$3, &_3$$3, &_2$$3, 0, 0, "phalcon/mvc/model.zep", 1400); + zephir_is_iterable(_1$$3, &_3$$3, &_2$$3, 0, 0, "phalcon/mvc/model.zep", 1391); for ( ; zephir_hash_get_current_data_ex(_3$$3, (void**) &_4$$3, &_2$$3) == SUCCESS ; zephir_hash_move_forward_ex(_3$$3, &_2$$3) @@ -78735,7 +78943,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, getMessages) { ZEPHIR_INIT_VAR(filtered); array_init(filtered); _1$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_errorMessages"), PH_NOISY_CC); - zephir_is_iterable(_1$$3, &_3$$3, &_2$$3, 0, 0, "phalcon/mvc/model.zep", 1466); + zephir_is_iterable(_1$$3, &_3$$3, &_2$$3, 0, 0, "phalcon/mvc/model.zep", 1457); for ( ; zephir_hash_get_current_data_ex(_3$$3, (void**) &_4$$3, &_2$$3) == SUCCESS ; zephir_hash_move_forward_ex(_3$$3, &_2$$3) @@ -78744,7 +78952,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, getMessages) { ZEPHIR_CALL_METHOD(&_5$$4, message, "getfield", NULL, 0); zephir_check_call_status(); if (ZEPHIR_IS_EQUAL(_5$$4, filter)) { - zephir_array_append(&filtered, message, PH_SEPARATE, "phalcon/mvc/model.zep", 1463); + zephir_array_append(&filtered, message, PH_SEPARATE, "phalcon/mvc/model.zep", 1454); } } RETURN_CCTOR(filtered); @@ -78772,7 +78980,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { zephir_check_call_status(); if (zephir_fast_count_int(belongsTo TSRMLS_CC)) { error = 0; - zephir_is_iterable(belongsTo, &_2$$3, &_1$$3, 0, 0, "phalcon/mvc/model.zep", 1609); + zephir_is_iterable(belongsTo, &_2$$3, &_1$$3, 0, 0, "phalcon/mvc/model.zep", 1600); for ( ; zephir_hash_get_current_data_ex(_2$$3, (void**) &_3$$3, &_1$$3) == SUCCESS ; zephir_hash_move_forward_ex(_2$$3, &_1$$3) @@ -78785,7 +78993,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { if (Z_TYPE_P(foreignKey) == IS_ARRAY) { if (zephir_array_isset_string(foreignKey, SS("action"))) { ZEPHIR_OBS_NVAR(_4$$7); - zephir_array_fetch_string(&_4$$7, foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 1510 TSRMLS_CC); + zephir_array_fetch_string(&_4$$7, foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 1501 TSRMLS_CC); action = zephir_get_intval(_4$$7); } } @@ -78804,7 +79012,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { ZEPHIR_CALL_METHOD(&referencedFields, relation, "getreferencedfields", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(fields) == IS_ARRAY) { - zephir_is_iterable(fields, &_8$$9, &_7$$9, 0, 0, "phalcon/mvc/model.zep", 1546); + zephir_is_iterable(fields, &_8$$9, &_7$$9, 0, 0, "phalcon/mvc/model.zep", 1537); for ( ; zephir_hash_get_current_data_ex(_8$$9, (void**) &_9$$9, &_7$$9) == SUCCESS ; zephir_hash_move_forward_ex(_8$$9, &_7$$9) @@ -78813,11 +79021,11 @@ static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { ZEPHIR_GET_HVALUE(field, _9$$9); ZEPHIR_OBS_NVAR(value); zephir_fetch_property_zval(&value, this_ptr, field, PH_SILENT_CC); - zephir_array_fetch(&_10$$10, referencedFields, position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1539 TSRMLS_CC); + zephir_array_fetch(&_10$$10, referencedFields, position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1530 TSRMLS_CC); ZEPHIR_INIT_LNVAR(_11$$10); ZEPHIR_CONCAT_SVSV(_11$$10, "[", _10$$10, "] = ?", position); - zephir_array_append(&conditions, _11$$10, PH_SEPARATE, "phalcon/mvc/model.zep", 1539); - zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1540); + zephir_array_append(&conditions, _11$$10, PH_SEPARATE, "phalcon/mvc/model.zep", 1530); + zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1531); if (Z_TYPE_P(value) == IS_NULL) { numberNull++; } @@ -78828,15 +79036,15 @@ static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { zephir_fetch_property_zval(&value, this_ptr, fields, PH_SILENT_CC); ZEPHIR_INIT_LNVAR(_12$$12); ZEPHIR_CONCAT_SVS(_12$$12, "[", referencedFields, "] = ?0"); - zephir_array_append(&conditions, _12$$12, PH_SEPARATE, "phalcon/mvc/model.zep", 1551); - zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1552); + zephir_array_append(&conditions, _12$$12, PH_SEPARATE, "phalcon/mvc/model.zep", 1542); + zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1543); if (Z_TYPE_P(value) == IS_NULL) { validateWithNulls = 1; } } ZEPHIR_OBS_NVAR(extraConditions); if (zephir_array_isset_string_fetch(&extraConditions, foreignKey, SS("conditions"), 0 TSRMLS_CC)) { - zephir_array_append(&conditions, extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 1563); + zephir_array_append(&conditions, extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 1554); } if (validateWithNulls) { ZEPHIR_OBS_NVAR(allowNulls); @@ -78904,10 +79112,10 @@ static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseCascade) { - zval *_13$$8 = NULL; - HashTable *_2$$3, *_8$$9; - HashPosition _1$$3, _7$$9; - zval *manager = NULL, *relations = NULL, *relation = NULL, *foreignKey = NULL, *resultset = NULL, *conditions = NULL, *bindParams = NULL, *referencedModel = NULL, *referencedFields = NULL, *fields = NULL, *field = NULL, *position = NULL, *value = NULL, *extraConditions = NULL, *_0, **_3$$3, *_4$$7 = NULL, *_5$$8 = NULL, *_14$$8 = NULL, *_15$$8 = NULL, **_9$$9, *_10$$10, *_11$$10 = NULL, *_12$$11 = NULL; + zval *_13$$7 = NULL; + HashTable *_2, *_8$$8; + HashPosition _1, _7$$8; + zval *manager = NULL, *relations = NULL, *relation = NULL, *foreignKey = NULL, *resultset = NULL, *conditions = NULL, *bindParams = NULL, *referencedModel = NULL, *referencedFields = NULL, *fields = NULL, *field = NULL, *position = NULL, *value = NULL, *extraConditions = NULL, *_0, **_3, *_4$$6 = NULL, *_5$$7 = NULL, *_14$$7 = NULL, *_15$$7 = NULL, **_9$$8, *_10$$9, *_11$$9 = NULL, *_12$$10 = NULL; zephir_fcall_cache_entry *_6 = NULL; int ZEPHIR_LAST_CALL_STATUS, action = 0; @@ -78917,78 +79125,76 @@ static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseCascade) { ZEPHIR_CPY_WRT(manager, _0); ZEPHIR_CALL_METHOD(&relations, manager, "gethasoneandhasmany", NULL, 0, this_ptr); zephir_check_call_status(); - if (zephir_fast_count_int(relations TSRMLS_CC)) { - zephir_is_iterable(relations, &_2$$3, &_1$$3, 0, 0, "phalcon/mvc/model.zep", 1723); - for ( - ; zephir_hash_get_current_data_ex(_2$$3, (void**) &_3$$3, &_1$$3) == SUCCESS - ; zephir_hash_move_forward_ex(_2$$3, &_1$$3) - ) { - ZEPHIR_GET_HVALUE(relation, _3$$3); - ZEPHIR_CALL_METHOD(&foreignKey, relation, "getforeignkey", NULL, 0); - zephir_check_call_status(); - if (!ZEPHIR_IS_FALSE_IDENTICAL(foreignKey)) { - action = 0; - if (Z_TYPE_P(foreignKey) == IS_ARRAY) { - if (zephir_array_isset_string(foreignKey, SS("action"))) { - ZEPHIR_OBS_NVAR(_4$$7); - zephir_array_fetch_string(&_4$$7, foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 1662 TSRMLS_CC); - action = zephir_get_intval(_4$$7); - } + zephir_is_iterable(relations, &_2, &_1, 0, 0, "phalcon/mvc/model.zep", 1713); + for ( + ; zephir_hash_get_current_data_ex(_2, (void**) &_3, &_1) == SUCCESS + ; zephir_hash_move_forward_ex(_2, &_1) + ) { + ZEPHIR_GET_HVALUE(relation, _3); + ZEPHIR_CALL_METHOD(&foreignKey, relation, "getforeignkey", NULL, 0); + zephir_check_call_status(); + if (!ZEPHIR_IS_FALSE_IDENTICAL(foreignKey)) { + action = 0; + if (Z_TYPE_P(foreignKey) == IS_ARRAY) { + if (zephir_array_isset_string(foreignKey, SS("action"))) { + ZEPHIR_OBS_NVAR(_4$$6); + zephir_array_fetch_string(&_4$$6, foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 1651 TSRMLS_CC); + action = zephir_get_intval(_4$$6); } - if (action == 2) { - ZEPHIR_CALL_METHOD(&_5$$8, relation, "getreferencedmodel", NULL, 0); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&referencedModel, manager, "load", &_6, 0, _5$$8); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&fields, relation, "getfields", NULL, 0); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&referencedFields, relation, "getreferencedfields", NULL, 0); - zephir_check_call_status(); - ZEPHIR_INIT_NVAR(conditions); - array_init(conditions); - ZEPHIR_INIT_NVAR(bindParams); - array_init(bindParams); - if (Z_TYPE_P(fields) == IS_ARRAY) { - zephir_is_iterable(fields, &_8$$9, &_7$$9, 0, 0, "phalcon/mvc/model.zep", 1690); - for ( - ; zephir_hash_get_current_data_ex(_8$$9, (void**) &_9$$9, &_7$$9) == SUCCESS - ; zephir_hash_move_forward_ex(_8$$9, &_7$$9) - ) { - ZEPHIR_GET_HMKEY(position, _8$$9, _7$$9); - ZEPHIR_GET_HVALUE(field, _9$$9); - ZEPHIR_OBS_NVAR(value); - zephir_fetch_property_zval(&value, this_ptr, field, PH_SILENT_CC); - zephir_array_fetch(&_10$$10, referencedFields, position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1687 TSRMLS_CC); - ZEPHIR_INIT_LNVAR(_11$$10); - ZEPHIR_CONCAT_SVSV(_11$$10, "[", _10$$10, "] = ?", position); - zephir_array_append(&conditions, _11$$10, PH_SEPARATE, "phalcon/mvc/model.zep", 1687); - zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1688); - } - } else { + } + if (action == 2) { + ZEPHIR_CALL_METHOD(&_5$$7, relation, "getreferencedmodel", NULL, 0); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&referencedModel, manager, "load", &_6, 0, _5$$7); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&fields, relation, "getfields", NULL, 0); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&referencedFields, relation, "getreferencedfields", NULL, 0); + zephir_check_call_status(); + ZEPHIR_INIT_NVAR(conditions); + array_init(conditions); + ZEPHIR_INIT_NVAR(bindParams); + array_init(bindParams); + if (Z_TYPE_P(fields) == IS_ARRAY) { + zephir_is_iterable(fields, &_8$$8, &_7$$8, 0, 0, "phalcon/mvc/model.zep", 1679); + for ( + ; zephir_hash_get_current_data_ex(_8$$8, (void**) &_9$$8, &_7$$8) == SUCCESS + ; zephir_hash_move_forward_ex(_8$$8, &_7$$8) + ) { + ZEPHIR_GET_HMKEY(position, _8$$8, _7$$8); + ZEPHIR_GET_HVALUE(field, _9$$8); ZEPHIR_OBS_NVAR(value); - zephir_fetch_property_zval(&value, this_ptr, fields, PH_SILENT_CC); - ZEPHIR_INIT_LNVAR(_12$$11); - ZEPHIR_CONCAT_SVS(_12$$11, "[", referencedFields, "] = ?0"); - zephir_array_append(&conditions, _12$$11, PH_SEPARATE, "phalcon/mvc/model.zep", 1692); - zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1693); - } - ZEPHIR_OBS_NVAR(extraConditions); - if (zephir_array_isset_string_fetch(&extraConditions, foreignKey, SS("conditions"), 0 TSRMLS_CC)) { - zephir_array_append(&conditions, extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 1700); - } - ZEPHIR_INIT_NVAR(_13$$8); - zephir_create_array(_13$$8, 2, 0 TSRMLS_CC); - ZEPHIR_INIT_NVAR(_14$$8); - zephir_fast_join_str(_14$$8, SL(" AND "), conditions TSRMLS_CC); - zephir_array_fast_append(_13$$8, _14$$8); - zephir_array_update_string(&_13$$8, SL("bind"), &bindParams, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&resultset, referencedModel, "find", NULL, 0, _13$$8); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_15$$8, resultset, "delete", NULL, 0); - zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(_15$$8)) { - RETURN_MM_BOOL(0); + zephir_fetch_property_zval(&value, this_ptr, field, PH_SILENT_CC); + zephir_array_fetch(&_10$$9, referencedFields, position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1676 TSRMLS_CC); + ZEPHIR_INIT_LNVAR(_11$$9); + ZEPHIR_CONCAT_SVSV(_11$$9, "[", _10$$9, "] = ?", position); + zephir_array_append(&conditions, _11$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 1676); + zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1677); } + } else { + ZEPHIR_OBS_NVAR(value); + zephir_fetch_property_zval(&value, this_ptr, fields, PH_SILENT_CC); + ZEPHIR_INIT_LNVAR(_12$$10); + ZEPHIR_CONCAT_SVS(_12$$10, "[", referencedFields, "] = ?0"); + zephir_array_append(&conditions, _12$$10, PH_SEPARATE, "phalcon/mvc/model.zep", 1681); + zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1682); + } + ZEPHIR_OBS_NVAR(extraConditions); + if (zephir_array_isset_string_fetch(&extraConditions, foreignKey, SS("conditions"), 0 TSRMLS_CC)) { + zephir_array_append(&conditions, extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 1689); + } + ZEPHIR_INIT_NVAR(_13$$7); + zephir_create_array(_13$$7, 2, 0 TSRMLS_CC); + ZEPHIR_INIT_NVAR(_14$$7); + zephir_fast_join_str(_14$$7, SL(" AND "), conditions TSRMLS_CC); + zephir_array_fast_append(_13$$7, _14$$7); + zephir_array_update_string(&_13$$7, SL("bind"), &bindParams, PH_COPY | PH_SEPARATE); + ZEPHIR_CALL_METHOD(&resultset, referencedModel, "find", NULL, 0, _13$$7); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&_15$$7, resultset, "delete", NULL, 0); + zephir_check_call_status(); + if (ZEPHIR_IS_FALSE_IDENTICAL(_15$$7)) { + RETURN_MM_BOOL(0); } } } @@ -78999,10 +79205,10 @@ static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseCascade) { static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseRestrict) { - zval *_13$$8 = NULL; - HashTable *_2$$3, *_7$$9; - HashPosition _1$$3, _6$$9; - zval *manager = NULL, *relations = NULL, *foreignKey = NULL, *relation = NULL, *relationClass = NULL, *referencedModel = NULL, *fields = NULL, *referencedFields = NULL, *conditions = NULL, *bindParams = NULL, *position = NULL, *field = NULL, *value = NULL, *extraConditions = NULL, *message = NULL, *_0, **_3$$3, *_4$$7 = NULL, **_8$$9, *_9$$10, *_10$$10 = NULL, *_11$$11 = NULL, *_12$$8 = NULL, *_14$$8 = NULL, *_15$$13 = NULL, *_16$$13 = NULL, *_19$$16; + zval *_13$$7 = NULL; + HashTable *_2, *_7$$8; + HashPosition _1, _6$$8; + zval *manager = NULL, *relations = NULL, *foreignKey = NULL, *relation = NULL, *relationClass = NULL, *referencedModel = NULL, *fields = NULL, *referencedFields = NULL, *conditions = NULL, *bindParams = NULL, *position = NULL, *field = NULL, *value = NULL, *extraConditions = NULL, *message = NULL, *_0, **_3, *_4$$6 = NULL, **_8$$8, *_9$$9, *_10$$9 = NULL, *_11$$10 = NULL, *_12$$7 = NULL, *_14$$7 = NULL, *_15$$12 = NULL, *_16$$12 = NULL, *_19$$15; zend_bool error = 0; zephir_fcall_cache_entry *_5 = NULL, *_17 = NULL, *_18 = NULL; int ZEPHIR_LAST_CALL_STATUS, action = 0; @@ -79013,107 +79219,105 @@ static PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseRestrict) { ZEPHIR_CPY_WRT(manager, _0); ZEPHIR_CALL_METHOD(&relations, manager, "gethasoneandhasmany", NULL, 0, this_ptr); zephir_check_call_status(); - if (zephir_fast_count_int(relations TSRMLS_CC)) { - error = 0; - zephir_is_iterable(relations, &_2$$3, &_1$$3, 0, 0, "phalcon/mvc/model.zep", 1842); - for ( - ; zephir_hash_get_current_data_ex(_2$$3, (void**) &_3$$3, &_1$$3) == SUCCESS - ; zephir_hash_move_forward_ex(_2$$3, &_1$$3) - ) { - ZEPHIR_GET_HVALUE(relation, _3$$3); - ZEPHIR_CALL_METHOD(&foreignKey, relation, "getforeignkey", NULL, 0); - zephir_check_call_status(); - if (!ZEPHIR_IS_FALSE_IDENTICAL(foreignKey)) { - action = 1; - if (Z_TYPE_P(foreignKey) == IS_ARRAY) { - if (zephir_array_isset_string(foreignKey, SS("action"))) { - ZEPHIR_OBS_NVAR(_4$$7); - zephir_array_fetch_string(&_4$$7, foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 1770 TSRMLS_CC); - action = zephir_get_intval(_4$$7); - } + error = 0; + zephir_is_iterable(relations, &_2, &_1, 0, 0, "phalcon/mvc/model.zep", 1829); + for ( + ; zephir_hash_get_current_data_ex(_2, (void**) &_3, &_1) == SUCCESS + ; zephir_hash_move_forward_ex(_2, &_1) + ) { + ZEPHIR_GET_HVALUE(relation, _3); + ZEPHIR_CALL_METHOD(&foreignKey, relation, "getforeignkey", NULL, 0); + zephir_check_call_status(); + if (!ZEPHIR_IS_FALSE_IDENTICAL(foreignKey)) { + action = 1; + if (Z_TYPE_P(foreignKey) == IS_ARRAY) { + if (zephir_array_isset_string(foreignKey, SS("action"))) { + ZEPHIR_OBS_NVAR(_4$$6); + zephir_array_fetch_string(&_4$$6, foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 1757 TSRMLS_CC); + action = zephir_get_intval(_4$$6); } - if (action == 1) { - ZEPHIR_CALL_METHOD(&relationClass, relation, "getreferencedmodel", NULL, 0); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&referencedModel, manager, "load", &_5, 0, relationClass); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&fields, relation, "getfields", NULL, 0); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&referencedFields, relation, "getreferencedfields", NULL, 0); - zephir_check_call_status(); - ZEPHIR_INIT_NVAR(conditions); - array_init(conditions); - ZEPHIR_INIT_NVAR(bindParams); - array_init(bindParams); - if (Z_TYPE_P(fields) == IS_ARRAY) { - zephir_is_iterable(fields, &_7$$9, &_6$$9, 0, 0, "phalcon/mvc/model.zep", 1802); - for ( - ; zephir_hash_get_current_data_ex(_7$$9, (void**) &_8$$9, &_6$$9) == SUCCESS - ; zephir_hash_move_forward_ex(_7$$9, &_6$$9) - ) { - ZEPHIR_GET_HMKEY(position, _7$$9, _6$$9); - ZEPHIR_GET_HVALUE(field, _8$$9); - ZEPHIR_OBS_NVAR(value); - zephir_fetch_property_zval(&value, this_ptr, field, PH_SILENT_CC); - zephir_array_fetch(&_9$$10, referencedFields, position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1798 TSRMLS_CC); - ZEPHIR_INIT_LNVAR(_10$$10); - ZEPHIR_CONCAT_SVSV(_10$$10, "[", _9$$10, "] = ?", position); - zephir_array_append(&conditions, _10$$10, PH_SEPARATE, "phalcon/mvc/model.zep", 1798); - zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1799); - } - } else { + } + if (action == 1) { + ZEPHIR_CALL_METHOD(&relationClass, relation, "getreferencedmodel", NULL, 0); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&referencedModel, manager, "load", &_5, 0, relationClass); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&fields, relation, "getfields", NULL, 0); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&referencedFields, relation, "getreferencedfields", NULL, 0); + zephir_check_call_status(); + ZEPHIR_INIT_NVAR(conditions); + array_init(conditions); + ZEPHIR_INIT_NVAR(bindParams); + array_init(bindParams); + if (Z_TYPE_P(fields) == IS_ARRAY) { + zephir_is_iterable(fields, &_7$$8, &_6$$8, 0, 0, "phalcon/mvc/model.zep", 1789); + for ( + ; zephir_hash_get_current_data_ex(_7$$8, (void**) &_8$$8, &_6$$8) == SUCCESS + ; zephir_hash_move_forward_ex(_7$$8, &_6$$8) + ) { + ZEPHIR_GET_HMKEY(position, _7$$8, _6$$8); + ZEPHIR_GET_HVALUE(field, _8$$8); ZEPHIR_OBS_NVAR(value); - zephir_fetch_property_zval(&value, this_ptr, fields, PH_SILENT_CC); - ZEPHIR_INIT_LNVAR(_11$$11); - ZEPHIR_CONCAT_SVS(_11$$11, "[", referencedFields, "] = ?0"); - zephir_array_append(&conditions, _11$$11, PH_SEPARATE, "phalcon/mvc/model.zep", 1804); - zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1805); + zephir_fetch_property_zval(&value, this_ptr, field, PH_SILENT_CC); + zephir_array_fetch(&_9$$9, referencedFields, position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1785 TSRMLS_CC); + ZEPHIR_INIT_LNVAR(_10$$9); + ZEPHIR_CONCAT_SVSV(_10$$9, "[", _9$$9, "] = ?", position); + zephir_array_append(&conditions, _10$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 1785); + zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1786); } - ZEPHIR_OBS_NVAR(extraConditions); - if (zephir_array_isset_string_fetch(&extraConditions, foreignKey, SS("conditions"), 0 TSRMLS_CC)) { - zephir_array_append(&conditions, extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 1812); + } else { + ZEPHIR_OBS_NVAR(value); + zephir_fetch_property_zval(&value, this_ptr, fields, PH_SILENT_CC); + ZEPHIR_INIT_LNVAR(_11$$10); + ZEPHIR_CONCAT_SVS(_11$$10, "[", referencedFields, "] = ?0"); + zephir_array_append(&conditions, _11$$10, PH_SEPARATE, "phalcon/mvc/model.zep", 1791); + zephir_array_append(&bindParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 1792); + } + ZEPHIR_OBS_NVAR(extraConditions); + if (zephir_array_isset_string_fetch(&extraConditions, foreignKey, SS("conditions"), 0 TSRMLS_CC)) { + zephir_array_append(&conditions, extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 1799); + } + ZEPHIR_INIT_NVAR(_13$$7); + zephir_create_array(_13$$7, 2, 0 TSRMLS_CC); + ZEPHIR_INIT_NVAR(_14$$7); + zephir_fast_join_str(_14$$7, SL(" AND "), conditions TSRMLS_CC); + zephir_array_fast_append(_13$$7, _14$$7); + zephir_array_update_string(&_13$$7, SL("bind"), &bindParams, PH_COPY | PH_SEPARATE); + ZEPHIR_CALL_METHOD(&_12$$7, referencedModel, "count", NULL, 0, _13$$7); + zephir_check_call_status(); + if (zephir_is_true(_12$$7)) { + ZEPHIR_OBS_NVAR(message); + if (!(zephir_array_isset_string_fetch(&message, foreignKey, SS("message"), 0 TSRMLS_CC))) { + ZEPHIR_INIT_NVAR(message); + ZEPHIR_CONCAT_SV(message, "Record is referenced by model ", relationClass); } - ZEPHIR_INIT_NVAR(_13$$8); - zephir_create_array(_13$$8, 2, 0 TSRMLS_CC); - ZEPHIR_INIT_NVAR(_14$$8); - zephir_fast_join_str(_14$$8, SL(" AND "), conditions TSRMLS_CC); - zephir_array_fast_append(_13$$8, _14$$8); - zephir_array_update_string(&_13$$8, SL("bind"), &bindParams, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_12$$8, referencedModel, "count", NULL, 0, _13$$8); + ZEPHIR_INIT_NVAR(_15$$12); + object_init_ex(_15$$12, phalcon_mvc_model_message_ce); + ZEPHIR_INIT_NVAR(_16$$12); + ZVAL_STRING(_16$$12, "ConstraintViolation", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(NULL, _15$$12, "__construct", &_17, 8, message, fields, _16$$12); + zephir_check_temp_parameter(_16$$12); zephir_check_call_status(); - if (zephir_is_true(_12$$8)) { - ZEPHIR_OBS_NVAR(message); - if (!(zephir_array_isset_string_fetch(&message, foreignKey, SS("message"), 0 TSRMLS_CC))) { - ZEPHIR_INIT_NVAR(message); - ZEPHIR_CONCAT_SV(message, "Record is referenced by model ", relationClass); - } - ZEPHIR_INIT_NVAR(_15$$13); - object_init_ex(_15$$13, phalcon_mvc_model_message_ce); - ZEPHIR_INIT_NVAR(_16$$13); - ZVAL_STRING(_16$$13, "ConstraintViolation", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _15$$13, "__construct", &_17, 8, message, fields, _16$$13); - zephir_check_temp_parameter(_16$$13); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "appendmessage", &_18, 0, _15$$13); - zephir_check_call_status(); - error = 1; - break; - } + ZEPHIR_CALL_METHOD(NULL, this_ptr, "appendmessage", &_18, 0, _15$$12); + zephir_check_call_status(); + error = 1; + break; } } } - if (error == 1) { - if (ZEPHIR_GLOBAL(orm).events) { - ZEPHIR_INIT_VAR(_19$$16); - ZVAL_STRING(_19$$16, "onValidationFails", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "fireevent", NULL, 0, _19$$16); - zephir_check_temp_parameter(_19$$16); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "_canceloperation", NULL, 0); - zephir_check_call_status(); - } - RETURN_MM_BOOL(0); + } + if (error == 1) { + if (ZEPHIR_GLOBAL(orm).events) { + ZEPHIR_INIT_VAR(_19$$15); + ZVAL_STRING(_19$$15, "onValidationFails", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "fireevent", NULL, 0, _19$$15); + zephir_check_temp_parameter(_19$$15); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "_canceloperation", NULL, 0); + zephir_check_call_status(); } + RETURN_MM_BOOL(0); } RETURN_MM_BOOL(1); @@ -79195,7 +79399,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _preSave) { ZEPHIR_CALL_METHOD(&emptyStringValues, metaData, "getemptystringattributes", NULL, 0, this_ptr); zephir_check_call_status(); error = 0; - zephir_is_iterable(notNull, &_9$$12, &_8$$12, 0, 0, "phalcon/mvc/model.zep", 2008); + zephir_is_iterable(notNull, &_9$$12, &_8$$12, 0, 0, "phalcon/mvc/model.zep", 1994); for ( ; zephir_hash_get_current_data_ex(_9$$12, (void**) &_10$$12, &_8$$12) == SUCCESS ; zephir_hash_move_forward_ex(_9$$12, &_8$$12) @@ -79212,7 +79416,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _preSave) { ZEPHIR_CONCAT_SVS(_12$$20, "Column '", field, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, _11$$20, "__construct", &_13, 9, _12$$20); zephir_check_call_status(); - zephir_throw_exception_debug(_11$$20, "phalcon/mvc/model.zep", 1944 TSRMLS_CC); + zephir_throw_exception_debug(_11$$20, "phalcon/mvc/model.zep", 1930 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -79436,7 +79640,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { ZEPHIR_INIT_NVAR(columnMap); ZVAL_NULL(columnMap); } - zephir_is_iterable(attributes, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 2192); + zephir_is_iterable(attributes, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 2178); for ( ; zephir_hash_get_current_data_ex(_1, (void**) &_2, &_0) == SUCCESS ; zephir_hash_move_forward_ex(_1, &_0) @@ -79452,7 +79656,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { ZEPHIR_CONCAT_SVS(_4$$8, "Column '", field, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, _3$$8, "__construct", &_5, 9, _4$$8); zephir_check_call_status(); - zephir_throw_exception_debug(_3$$8, "phalcon/mvc/model.zep", 2146 TSRMLS_CC); + zephir_throw_exception_debug(_3$$8, "phalcon/mvc/model.zep", 2132 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -79478,23 +79682,23 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { ZEPHIR_CONCAT_SVS(_9$$13, "Column '", field, "' have not defined a bind data type"); ZEPHIR_CALL_METHOD(NULL, _8$$13, "__construct", &_5, 9, _9$$13); zephir_check_call_status(); - zephir_throw_exception_debug(_8$$13, "phalcon/mvc/model.zep", 2170 TSRMLS_CC); + zephir_throw_exception_debug(_8$$13, "phalcon/mvc/model.zep", 2156 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&fields, field, PH_SEPARATE, "phalcon/mvc/model.zep", 2173); - zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2173); - zephir_array_append(&bindTypes, bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 2173); + zephir_array_append(&fields, field, PH_SEPARATE, "phalcon/mvc/model.zep", 2159); + zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2159); + zephir_array_append(&bindTypes, bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 2159); } else { if (zephir_array_isset(defaultValues, field)) { ZEPHIR_CALL_METHOD(&_10$$15, connection, "getdefaultvalue", &_11, 0); zephir_check_call_status(); - zephir_array_append(&values, _10$$15, PH_SEPARATE, "phalcon/mvc/model.zep", 2178); + zephir_array_append(&values, _10$$15, PH_SEPARATE, "phalcon/mvc/model.zep", 2164); } else { - zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2180); + zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2166); } - zephir_array_append(&fields, field, PH_SEPARATE, "phalcon/mvc/model.zep", 2183); - zephir_array_append(&bindTypes, bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 2183); + zephir_array_append(&fields, field, PH_SEPARATE, "phalcon/mvc/model.zep", 2169); + zephir_array_append(&bindTypes, bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 2169); } } } @@ -79506,7 +79710,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { zephir_check_call_status(); useExplicitIdentity = zephir_get_boolval(_12$$17); if (useExplicitIdentity) { - zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/mvc/model.zep", 2201); + zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/mvc/model.zep", 2187); } if (Z_TYPE_P(columnMap) == IS_ARRAY) { ZEPHIR_OBS_NVAR(attributeField); @@ -79517,7 +79721,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { ZEPHIR_CONCAT_SVS(_14$$20, "Identity column '", identityField, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, _13$$20, "__construct", &_5, 9, _14$$20); zephir_check_call_status(); - zephir_throw_exception_debug(_13$$20, "phalcon/mvc/model.zep", 2209 TSRMLS_CC); + zephir_throw_exception_debug(_13$$20, "phalcon/mvc/model.zep", 2195 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -79532,12 +79736,12 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { } if (_15$$22) { if (useExplicitIdentity) { - zephir_array_append(&values, defaultValue, PH_SEPARATE, "phalcon/mvc/model.zep", 2222); - zephir_array_append(&bindTypes, bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 2222); + zephir_array_append(&values, defaultValue, PH_SEPARATE, "phalcon/mvc/model.zep", 2208); + zephir_array_append(&bindTypes, bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 2208); } } else { if (!(useExplicitIdentity)) { - zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/mvc/model.zep", 2230); + zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/mvc/model.zep", 2216); } ZEPHIR_OBS_NVAR(bindType); if (!(zephir_array_isset_fetch(&bindType, bindDataTypes, identityField, 0 TSRMLS_CC))) { @@ -79547,17 +79751,17 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { ZEPHIR_CONCAT_SVS(_17$$27, "Identity column '", identityField, "' isn\\'t part of the table columns"); ZEPHIR_CALL_METHOD(NULL, _16$$27, "__construct", &_5, 9, _17$$27); zephir_check_call_status(); - zephir_throw_exception_debug(_16$$27, "phalcon/mvc/model.zep", 2237 TSRMLS_CC); + zephir_throw_exception_debug(_16$$27, "phalcon/mvc/model.zep", 2223 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2240); - zephir_array_append(&bindTypes, bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 2240); + zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2226); + zephir_array_append(&bindTypes, bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 2226); } } else { if (useExplicitIdentity) { - zephir_array_append(&values, defaultValue, PH_SEPARATE, "phalcon/mvc/model.zep", 2244); - zephir_array_append(&bindTypes, bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 2244); + zephir_array_append(&values, defaultValue, PH_SEPARATE, "phalcon/mvc/model.zep", 2230); + zephir_array_append(&bindTypes, bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 2230); } } } @@ -79647,7 +79851,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_INIT_NVAR(columnMap); ZVAL_NULL(columnMap); } - zephir_is_iterable(nonPrimary, &_3, &_2, 0, 0, "phalcon/mvc/model.zep", 2444); + zephir_is_iterable(nonPrimary, &_3, &_2, 0, 0, "phalcon/mvc/model.zep", 2430); for ( ; zephir_hash_get_current_data_ex(_3, (void**) &_4, &_2) == SUCCESS ; zephir_hash_move_forward_ex(_3, &_2) @@ -79662,7 +79866,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_CONCAT_SVS(_6$$9, "Column '", field, "' have not defined a bind data type"); ZEPHIR_CALL_METHOD(NULL, _5$$9, "__construct", &_7, 9, _6$$9); zephir_check_call_status(); - zephir_throw_exception_debug(_5$$9, "phalcon/mvc/model.zep", 2343 TSRMLS_CC); + zephir_throw_exception_debug(_5$$9, "phalcon/mvc/model.zep", 2329 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -79675,7 +79879,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_CONCAT_SVS(_9$$11, "Column '", field, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, _8$$11, "__construct", &_7, 9, _9$$11); zephir_check_call_status(); - zephir_throw_exception_debug(_8$$11, "phalcon/mvc/model.zep", 2351 TSRMLS_CC); + zephir_throw_exception_debug(_8$$11, "phalcon/mvc/model.zep", 2337 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -79685,9 +79889,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_OBS_NVAR(value); if (zephir_fetch_property_zval(&value, this_ptr, attributeField, PH_SILENT_CC)) { if (!(useDynamicUpdate)) { - zephir_array_append(&fields, field, PH_SEPARATE, "phalcon/mvc/model.zep", 2367); - zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2367); - zephir_array_append(&bindTypes, bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 2368); + zephir_array_append(&fields, field, PH_SEPARATE, "phalcon/mvc/model.zep", 2353); + zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2353); + zephir_array_append(&bindTypes, bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 2354); } else { ZEPHIR_OBS_NVAR(snapshotValue); if (!(zephir_array_isset_fetch(&snapshotValue, snapshot, attributeField, 0 TSRMLS_CC))) { @@ -79709,9 +79913,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { break; } if (ZEPHIR_IS_LONG(bindType, 3) || ZEPHIR_IS_LONG(bindType, 7)) { - ZEPHIR_CALL_FUNCTION(&_10$$24, "floatval", &_11, 305, snapshotValue); + ZEPHIR_CALL_FUNCTION(&_10$$24, "floatval", &_11, 301, snapshotValue); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_12$$24, "floatval", &_11, 305, value); + ZEPHIR_CALL_FUNCTION(&_12$$24, "floatval", &_11, 301, value); zephir_check_call_status(); changed = !ZEPHIR_IS_IDENTICAL(_10$$24, _12$$24); break; @@ -79729,15 +79933,15 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { } } if (changed) { - zephir_array_append(&fields, field, PH_SEPARATE, "phalcon/mvc/model.zep", 2430); - zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2430); - zephir_array_append(&bindTypes, bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 2431); + zephir_array_append(&fields, field, PH_SEPARATE, "phalcon/mvc/model.zep", 2416); + zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2416); + zephir_array_append(&bindTypes, bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 2417); } } } else { - zephir_array_append(&fields, field, PH_SEPARATE, "phalcon/mvc/model.zep", 2436); - zephir_array_append(&values, ZEPHIR_GLOBAL(global_null), PH_SEPARATE, "phalcon/mvc/model.zep", 2436); - zephir_array_append(&bindTypes, bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 2436); + zephir_array_append(&fields, field, PH_SEPARATE, "phalcon/mvc/model.zep", 2422); + zephir_array_append(&values, ZEPHIR_GLOBAL(global_null), PH_SEPARATE, "phalcon/mvc/model.zep", 2422); + zephir_array_append(&bindTypes, bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 2422); } } } @@ -79754,12 +79958,12 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_CALL_METHOD(&primaryKeys, metaData, "getprimarykeyattributes", NULL, 0, this_ptr); zephir_check_call_status(); if (!(zephir_fast_count_int(primaryKeys TSRMLS_CC))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A primary key must be defined in the model in order to perform the operation", "phalcon/mvc/model.zep", 2463); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A primary key must be defined in the model in order to perform the operation", "phalcon/mvc/model.zep", 2449); return; } ZEPHIR_INIT_NVAR(uniqueParams); array_init(uniqueParams); - zephir_is_iterable(primaryKeys, &_16$$30, &_15$$30, 0, 0, "phalcon/mvc/model.zep", 2486); + zephir_is_iterable(primaryKeys, &_16$$30, &_15$$30, 0, 0, "phalcon/mvc/model.zep", 2472); for ( ; zephir_hash_get_current_data_ex(_16$$30, (void**) &_17$$30, &_15$$30) == SUCCESS ; zephir_hash_move_forward_ex(_16$$30, &_15$$30) @@ -79774,7 +79978,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_CONCAT_SVS(_19$$34, "Column '", field, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, _18$$34, "__construct", &_7, 9, _19$$34); zephir_check_call_status(); - zephir_throw_exception_debug(_18$$34, "phalcon/mvc/model.zep", 2474 TSRMLS_CC); + zephir_throw_exception_debug(_18$$34, "phalcon/mvc/model.zep", 2460 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -79783,9 +79987,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { } ZEPHIR_OBS_NVAR(value); if (zephir_fetch_property_zval(&value, this_ptr, attributeField, PH_SILENT_CC)) { - zephir_array_append(&uniqueParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2481); + zephir_array_append(&uniqueParams, value, PH_SEPARATE, "phalcon/mvc/model.zep", 2467); } else { - zephir_array_append(&uniqueParams, ZEPHIR_GLOBAL(global_null), PH_SEPARATE, "phalcon/mvc/model.zep", 2483); + zephir_array_append(&uniqueParams, ZEPHIR_GLOBAL(global_null), PH_SEPARATE, "phalcon/mvc/model.zep", 2469); } } } @@ -79828,7 +80032,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _preSaveRelatedRecords) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "getmodelsmanager", NULL, 0); zephir_check_call_status(); ZEPHIR_CPY_WRT(manager, _1); - zephir_is_iterable(related, &_3, &_2, 0, 0, "phalcon/mvc/model.zep", 2592); + zephir_is_iterable(related, &_3, &_2, 0, 0, "phalcon/mvc/model.zep", 2578); for ( ; zephir_hash_get_current_data_ex(_3, (void**) &_4, &_2) == SUCCESS ; zephir_hash_move_forward_ex(_3, &_2) @@ -79851,7 +80055,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _preSaveRelatedRecords) { } ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_8, 0, _7$$6); zephir_check_call_status(); - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects can be stored as part of belongs-to relations", "phalcon/mvc/model.zep", 2541); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects can be stored as part of belongs-to relations", "phalcon/mvc/model.zep", 2527); return; } ZEPHIR_CALL_METHOD(&columns, relation, "getfields", NULL, 0); @@ -79869,7 +80073,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _preSaveRelatedRecords) { } ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_10, 0, _9$$7); zephir_check_call_status(); - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/mvc/model.zep", 2550); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/mvc/model.zep", 2536); return; } ZEPHIR_CALL_METHOD(&_11$$5, record, "save", NULL, 0); @@ -79877,7 +80081,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _preSaveRelatedRecords) { if (!(zephir_is_true(_11$$5))) { ZEPHIR_CALL_METHOD(&_12$$8, record, "getmessages", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(_12$$8, &_14$$8, &_13$$8, 0, 0, "phalcon/mvc/model.zep", 2579); + zephir_is_iterable(_12$$8, &_14$$8, &_13$$8, 0, 0, "phalcon/mvc/model.zep", 2565); for ( ; zephir_hash_get_current_data_ex(_14$$8, (void**) &_15$$8, &_13$$8) == SUCCESS ; zephir_hash_move_forward_ex(_14$$8, &_13$$8) @@ -79930,7 +80134,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmodelsmanager", NULL, 0); zephir_check_call_status(); ZEPHIR_CPY_WRT(manager, _0); - zephir_is_iterable(related, &_2, &_1, 0, 0, "phalcon/mvc/model.zep", 2780); + zephir_is_iterable(related, &_2, &_1, 0, 0, "phalcon/mvc/model.zep", 2766); for ( ; zephir_hash_get_current_data_ex(_2, (void**) &_3, &_1) == SUCCESS ; zephir_hash_move_forward_ex(_2, &_1) @@ -79959,7 +80163,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { } ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_9, 0, _8$$6); zephir_check_call_status(); - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects/arrays can be stored as part of has-many/has-one/has-many-to-many relations", "phalcon/mvc/model.zep", 2631); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects/arrays can be stored as part of has-many/has-one/has-many-to-many relations", "phalcon/mvc/model.zep", 2617); return; } ZEPHIR_CALL_METHOD(&columns, relation, "getfields", NULL, 0); @@ -79977,7 +80181,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { } ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_11, 0, _10$$7); zephir_check_call_status(); - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/mvc/model.zep", 2640); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/mvc/model.zep", 2626); return; } if (Z_TYPE_P(record) == IS_OBJECT) { @@ -80003,7 +80207,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { ZEPHIR_CONCAT_SVS(_15$$10, "The column '", columns, "' needs to be present in the model"); ZEPHIR_CALL_METHOD(NULL, _14$$10, "__construct", &_16, 9, _15$$10); zephir_check_call_status(); - zephir_throw_exception_debug(_14$$10, "phalcon/mvc/model.zep", 2654 TSRMLS_CC); + zephir_throw_exception_debug(_14$$10, "phalcon/mvc/model.zep", 2640 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -80018,7 +80222,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { ZEPHIR_CALL_METHOD(&intermediateReferencedFields, relation, "getintermediatereferencedfields", NULL, 0); zephir_check_call_status(); } - zephir_is_iterable(relatedRecords, &_19$$4, &_18$$4, 0, 0, "phalcon/mvc/model.zep", 2769); + zephir_is_iterable(relatedRecords, &_19$$4, &_18$$4, 0, 0, "phalcon/mvc/model.zep", 2755); for ( ; zephir_hash_get_current_data_ex(_19$$4, (void**) &_20$$4, &_18$$4) == SUCCESS ; zephir_hash_move_forward_ex(_19$$4, &_18$$4) @@ -80033,7 +80237,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { if (!(zephir_is_true(_21$$12))) { ZEPHIR_CALL_METHOD(&_22$$14, recordAfter, "getmessages", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(_22$$14, &_24$$14, &_23$$14, 0, 0, "phalcon/mvc/model.zep", 2711); + zephir_is_iterable(_22$$14, &_24$$14, &_23$$14, 0, 0, "phalcon/mvc/model.zep", 2697); for ( ; zephir_hash_get_current_data_ex(_24$$14, (void**) &_25$$14, &_23$$14) == SUCCESS ; zephir_hash_move_forward_ex(_24$$14, &_23$$14) @@ -80072,7 +80276,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { if (!(zephir_is_true(_31$$17))) { ZEPHIR_CALL_METHOD(&_32$$18, intermediateModel, "getmessages", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(_32$$18, &_34$$18, &_33$$18, 0, 0, "phalcon/mvc/model.zep", 2763); + zephir_is_iterable(_32$$18, &_34$$18, &_33$$18, 0, 0, "phalcon/mvc/model.zep", 2749); for ( ; zephir_hash_get_current_data_ex(_34$$18, (void**) &_35$$18, &_33$$18) == SUCCESS ; zephir_hash_move_forward_ex(_34$$18, &_33$$18) @@ -80113,7 +80317,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { ZEPHIR_CONCAT_SVSVS(_41$$22, "There are no defined relations for the model '", className, "' using alias '", name, "'"); ZEPHIR_CALL_METHOD(NULL, _40$$22, "__construct", &_16, 9, _41$$22); zephir_check_call_status(); - zephir_throw_exception_debug(_40$$22, "phalcon/mvc/model.zep", 2772 TSRMLS_CC); + zephir_throw_exception_debug(_40$$22, "phalcon/mvc/model.zep", 2758 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -80134,8 +80338,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { static PHP_METHOD(Phalcon_Mvc_Model, save) { zend_bool _0; + zephir_fcall_cache_entry *_3 = NULL; int ZEPHIR_LAST_CALL_STATUS; - zval *data = NULL, *whiteList = NULL, *metaData = NULL, *related = NULL, *schema = NULL, *writeConnection = NULL, *readConnection = NULL, *source = NULL, *table = NULL, *identityField = NULL, *exists = NULL, *success = NULL, *_5, *_6 = NULL, *_1$$3, *_2$$4 = NULL, *_3$$8, *_4$$9, *_7$$11, *_8$$12, *_9$$12 = NULL, *_10$$15, *_11$$17, *_12$$19 = NULL, *_13$$21; + zval *data = NULL, *whiteList = NULL, *metaData = NULL, *related = NULL, *schema = NULL, *writeConnection = NULL, *readConnection = NULL, *source = NULL, *table = NULL, *identityField = NULL, *exists = NULL, *success = NULL, *_2 = NULL, *_7 = NULL, *_1$$3, *_4$$4 = NULL, *_5$$8, *_6$$9, *_8$$11, *_9$$12, *_10$$12 = NULL, *_11$$15, *_12$$17, *_13$$19 = NULL, *_14$$21; ZEPHIR_MM_GROW(); zephir_fetch_params(1, 0, 2, &data, &whiteList); @@ -80162,12 +80367,17 @@ static PHP_METHOD(Phalcon_Mvc_Model, save) { } ZEPHIR_CALL_METHOD(&writeConnection, this_ptr, "getwriteconnection", NULL, 0); zephir_check_call_status(); + ZEPHIR_INIT_VAR(_2); + ZVAL_STRING(_2, "prepareSave", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "fireevent", &_3, 0, _2); + zephir_check_temp_parameter(_2); + zephir_check_call_status(); ZEPHIR_OBS_VAR(related); zephir_read_property_this(&related, this_ptr, SL("_related"), PH_NOISY_CC); if (Z_TYPE_P(related) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "_presaverelatedrecords", NULL, 0, writeConnection, related); + ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "_presaverelatedrecords", NULL, 0, writeConnection, related); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(_2$$4)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(_4$$4)) { RETURN_MM_BOOL(0); } } @@ -80188,36 +80398,36 @@ static PHP_METHOD(Phalcon_Mvc_Model, save) { ZEPHIR_CALL_METHOD(&exists, this_ptr, "_exists", NULL, 0, metaData, readConnection, table); zephir_check_call_status(); if (zephir_is_true(exists)) { - ZEPHIR_INIT_ZVAL_NREF(_3$$8); - ZVAL_LONG(_3$$8, 2); - zephir_update_property_this(this_ptr, SL("_operationMade"), _3$$8 TSRMLS_CC); + ZEPHIR_INIT_ZVAL_NREF(_5$$8); + ZVAL_LONG(_5$$8, 2); + zephir_update_property_this(this_ptr, SL("_operationMade"), _5$$8 TSRMLS_CC); } else { - ZEPHIR_INIT_ZVAL_NREF(_4$$9); - ZVAL_LONG(_4$$9, 1); - zephir_update_property_this(this_ptr, SL("_operationMade"), _4$$9 TSRMLS_CC); + ZEPHIR_INIT_ZVAL_NREF(_6$$9); + ZVAL_LONG(_6$$9, 1); + zephir_update_property_this(this_ptr, SL("_operationMade"), _6$$9 TSRMLS_CC); } - ZEPHIR_INIT_VAR(_5); - array_init(_5); - zephir_update_property_this(this_ptr, SL("_errorMessages"), _5 TSRMLS_CC); + ZEPHIR_INIT_NVAR(_2); + array_init(_2); + zephir_update_property_this(this_ptr, SL("_errorMessages"), _2 TSRMLS_CC); ZEPHIR_CALL_METHOD(&identityField, metaData, "getidentityfield", NULL, 0, this_ptr); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_6, this_ptr, "_presave", NULL, 0, metaData, exists, identityField); + ZEPHIR_CALL_METHOD(&_7, this_ptr, "_presave", NULL, 0, metaData, exists, identityField); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(_6)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(_7)) { if (Z_TYPE_P(related) == IS_ARRAY) { - ZEPHIR_INIT_VAR(_7$$11); - ZVAL_BOOL(_7$$11, 0); - ZEPHIR_CALL_METHOD(NULL, writeConnection, "rollback", NULL, 0, _7$$11); + ZEPHIR_INIT_VAR(_8$$11); + ZVAL_BOOL(_8$$11, 0); + ZEPHIR_CALL_METHOD(NULL, writeConnection, "rollback", NULL, 0, _8$$11); zephir_check_call_status(); } if (ZEPHIR_GLOBAL(orm).exception_on_failed_save) { - ZEPHIR_INIT_VAR(_8$$12); - object_init_ex(_8$$12, phalcon_mvc_model_validationfailed_ce); - ZEPHIR_CALL_METHOD(&_9$$12, this_ptr, "getmessages", NULL, 0); + ZEPHIR_INIT_VAR(_9$$12); + object_init_ex(_9$$12, phalcon_mvc_model_validationfailed_ce); + ZEPHIR_CALL_METHOD(&_10$$12, this_ptr, "getmessages", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, _8$$12, "__construct", NULL, 306, this_ptr, _9$$12); + ZEPHIR_CALL_METHOD(NULL, _9$$12, "__construct", NULL, 302, this_ptr, _10$$12); zephir_check_call_status(); - zephir_throw_exception_debug(_8$$12, "phalcon/mvc/model.zep", 2885 TSRMLS_CC); + zephir_throw_exception_debug(_9$$12, "phalcon/mvc/model.zep", 2876 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -80231,15 +80441,15 @@ static PHP_METHOD(Phalcon_Mvc_Model, save) { zephir_check_call_status(); } if (zephir_is_true(success)) { - ZEPHIR_INIT_ZVAL_NREF(_10$$15); - ZVAL_LONG(_10$$15, 0); - zephir_update_property_this(this_ptr, SL("_dirtyState"), _10$$15 TSRMLS_CC); + ZEPHIR_INIT_ZVAL_NREF(_11$$15); + ZVAL_LONG(_11$$15, 0); + zephir_update_property_this(this_ptr, SL("_dirtyState"), _11$$15 TSRMLS_CC); } if (Z_TYPE_P(related) == IS_ARRAY) { if (ZEPHIR_IS_FALSE_IDENTICAL(success)) { - ZEPHIR_INIT_VAR(_11$$17); - ZVAL_BOOL(_11$$17, 0); - ZEPHIR_CALL_METHOD(NULL, writeConnection, "rollback", NULL, 0, _11$$17); + ZEPHIR_INIT_VAR(_12$$17); + ZVAL_BOOL(_12$$17, 0); + ZEPHIR_CALL_METHOD(NULL, writeConnection, "rollback", NULL, 0, _12$$17); zephir_check_call_status(); } else { ZEPHIR_CALL_METHOD(&success, this_ptr, "_postsaverelatedrecords", NULL, 0, writeConnection, related); @@ -80247,18 +80457,18 @@ static PHP_METHOD(Phalcon_Mvc_Model, save) { } } if (ZEPHIR_GLOBAL(orm).events) { - ZEPHIR_CALL_METHOD(&_12$$19, this_ptr, "_postsave", NULL, 0, success, exists); + ZEPHIR_CALL_METHOD(&_13$$19, this_ptr, "_postsave", NULL, 0, success, exists); zephir_check_call_status(); - ZEPHIR_CPY_WRT(success, _12$$19); + ZEPHIR_CPY_WRT(success, _13$$19); } if (ZEPHIR_IS_FALSE_IDENTICAL(success)) { ZEPHIR_CALL_METHOD(NULL, this_ptr, "_canceloperation", NULL, 0); zephir_check_call_status(); } else { - ZEPHIR_INIT_VAR(_13$$21); - ZVAL_STRING(_13$$21, "afterSave", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "fireevent", NULL, 0, _13$$21); - zephir_check_temp_parameter(_13$$21); + ZEPHIR_INIT_VAR(_14$$21); + ZVAL_STRING(_14$$21, "afterSave", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "fireevent", &_3, 0, _14$$21); + zephir_check_temp_parameter(_14$$21); zephir_check_call_status(); } RETURN_CCTOR(success); @@ -80409,10 +80619,10 @@ static PHP_METHOD(Phalcon_Mvc_Model, delete) { ZVAL_NULL(columnMap); } if (!(zephir_fast_count_int(primaryKeys TSRMLS_CC))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A primary key must be defined in the model in order to perform the operation", "phalcon/mvc/model.zep", 3069); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A primary key must be defined in the model in order to perform the operation", "phalcon/mvc/model.zep", 3060); return; } - zephir_is_iterable(primaryKeys, &_4, &_3, 0, 0, "phalcon/mvc/model.zep", 3110); + zephir_is_iterable(primaryKeys, &_4, &_3, 0, 0, "phalcon/mvc/model.zep", 3101); for ( ; zephir_hash_get_current_data_ex(_4, (void**) &_5, &_3) == SUCCESS ; zephir_hash_move_forward_ex(_4, &_3) @@ -80426,7 +80636,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, delete) { ZEPHIR_CONCAT_SVS(_7$$9, "Column '", primaryKey, "' have not defined a bind data type"); ZEPHIR_CALL_METHOD(NULL, _6$$9, "__construct", &_8, 9, _7$$9); zephir_check_call_status(); - zephir_throw_exception_debug(_6$$9, "phalcon/mvc/model.zep", 3081 TSRMLS_CC); + zephir_throw_exception_debug(_6$$9, "phalcon/mvc/model.zep", 3072 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -80439,7 +80649,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, delete) { ZEPHIR_CONCAT_SVS(_10$$11, "Column '", primaryKey, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, _9$$11, "__construct", &_8, 9, _10$$11); zephir_check_call_status(); - zephir_throw_exception_debug(_9$$11, "phalcon/mvc/model.zep", 3089 TSRMLS_CC); + zephir_throw_exception_debug(_9$$11, "phalcon/mvc/model.zep", 3080 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -80454,17 +80664,17 @@ static PHP_METHOD(Phalcon_Mvc_Model, delete) { ZEPHIR_CONCAT_SVS(_12$$13, "Cannot delete the record because the primary key attribute: '", attributeField, "' wasn't set"); ZEPHIR_CALL_METHOD(NULL, _11$$13, "__construct", &_8, 9, _12$$13); zephir_check_call_status(); - zephir_throw_exception_debug(_11$$13, "phalcon/mvc/model.zep", 3099 TSRMLS_CC); + zephir_throw_exception_debug(_11$$13, "phalcon/mvc/model.zep", 3090 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 3105); + zephir_array_append(&values, value, PH_SEPARATE, "phalcon/mvc/model.zep", 3096); ZEPHIR_CALL_METHOD(&_13$$8, writeConnection, "escapeidentifier", &_14, 0, primaryKey); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_15$$8); ZEPHIR_CONCAT_VS(_15$$8, _13$$8, " = ?"); - zephir_array_append(&conditions, _15$$8, PH_SEPARATE, "phalcon/mvc/model.zep", 3106); - zephir_array_append(&bindTypes, bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 3107); + zephir_array_append(&conditions, _15$$8, PH_SEPARATE, "phalcon/mvc/model.zep", 3097); + zephir_array_append(&bindTypes, bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 3098); } if (ZEPHIR_GLOBAL(orm).events) { if (0) { @@ -80545,7 +80755,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, refresh) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_dirtyState"), PH_NOISY_CC); if (!ZEPHIR_IS_LONG(_0, 0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 3185); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 3176); return; } ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); @@ -80570,7 +80780,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, refresh) { ZEPHIR_CALL_METHOD(&_1$$6, this_ptr, "_exists", NULL, 0, metaData, readConnection, table); zephir_check_call_status(); if (!(zephir_is_true(_1$$6))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 3207); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 3198); return; } ZEPHIR_OBS_NVAR(uniqueKey); @@ -80579,14 +80789,14 @@ static PHP_METHOD(Phalcon_Mvc_Model, refresh) { ZEPHIR_OBS_VAR(uniqueParams); zephir_read_property_this(&uniqueParams, this_ptr, SL("_uniqueParams"), PH_NOISY_CC); if (Z_TYPE_P(uniqueParams) != IS_ARRAY) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 3215); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 3206); return; } ZEPHIR_INIT_VAR(fields); array_init(fields); ZEPHIR_CALL_METHOD(&_2, metaData, "getattributes", NULL, 0, this_ptr); zephir_check_call_status(); - zephir_is_iterable(_2, &_4, &_3, 0, 0, "phalcon/mvc/model.zep", 3229); + zephir_is_iterable(_2, &_4, &_3, 0, 0, "phalcon/mvc/model.zep", 3220); for ( ; zephir_hash_get_current_data_ex(_4, (void**) &_5, &_3) == SUCCESS ; zephir_hash_move_forward_ex(_4, &_3) @@ -80595,7 +80805,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, refresh) { ZEPHIR_INIT_NVAR(_6$$9); zephir_create_array(_6$$9, 1, 0 TSRMLS_CC); zephir_array_fast_append(_6$$9, attribute); - zephir_array_append(&fields, _6$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 3223); + zephir_array_append(&fields, _6$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 3214); } ZEPHIR_CALL_METHOD(&dialect, readConnection, "getdialect", NULL, 0); zephir_check_call_status(); @@ -80711,7 +80921,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, skipAttributes) { ZEPHIR_INIT_VAR(keysAttributes); array_init(keysAttributes); - zephir_is_iterable(attributes, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 3310); + zephir_is_iterable(attributes, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 3301); for ( ; zephir_hash_get_current_data_ex(_1, (void**) &_2, &_0) == SUCCESS ; zephir_hash_move_forward_ex(_1, &_0) @@ -80745,7 +80955,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, skipAttributesOnCreate) { ZEPHIR_INIT_VAR(keysAttributes); array_init(keysAttributes); - zephir_is_iterable(attributes, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 3341); + zephir_is_iterable(attributes, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 3332); for ( ; zephir_hash_get_current_data_ex(_1, (void**) &_2, &_0) == SUCCESS ; zephir_hash_move_forward_ex(_1, &_0) @@ -80777,7 +80987,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, skipAttributesOnUpdate) { ZEPHIR_INIT_VAR(keysAttributes); array_init(keysAttributes); - zephir_is_iterable(attributes, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 3370); + zephir_is_iterable(attributes, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 3361); for ( ; zephir_hash_get_current_data_ex(_1, (void**) &_2, &_0) == SUCCESS ; zephir_hash_move_forward_ex(_1, &_0) @@ -80809,7 +81019,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, allowEmptyStringValues) { ZEPHIR_INIT_VAR(keysAttributes); array_init(keysAttributes); - zephir_is_iterable(attributes, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 3399); + zephir_is_iterable(attributes, &_1, &_0, 0, 0, "phalcon/mvc/model.zep", 3390); for ( ; zephir_hash_get_current_data_ex(_1, (void**) &_2, &_0) == SUCCESS ; zephir_hash_move_forward_ex(_1, &_0) @@ -81022,7 +81232,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) { if (Z_TYPE_P(columnMap) == IS_ARRAY) { ZEPHIR_INIT_VAR(snapshot); array_init(snapshot); - zephir_is_iterable(data, &_1$$3, &_0$$3, 0, 0, "phalcon/mvc/model.zep", 3615); + zephir_is_iterable(data, &_1$$3, &_0$$3, 0, 0, "phalcon/mvc/model.zep", 3606); for ( ; zephir_hash_get_current_data_ex(_1$$3, (void**) &_2$$3, &_0$$3) == SUCCESS ; zephir_hash_move_forward_ex(_1$$3, &_0$$3) @@ -81041,7 +81251,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) { ZEPHIR_CONCAT_SVS(_4$$7, "Column '", key, "' doesn't make part of the column map"); ZEPHIR_CALL_METHOD(NULL, _3$$7, "__construct", &_5, 9, _4$$7); zephir_check_call_status(); - zephir_throw_exception_debug(_3$$7, "phalcon/mvc/model.zep", 3596 TSRMLS_CC); + zephir_throw_exception_debug(_3$$7, "phalcon/mvc/model.zep", 3587 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -81058,7 +81268,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) { ZEPHIR_CONCAT_SVS(_7$$11, "Column '", key, "' doesn't make part of the column map"); ZEPHIR_CALL_METHOD(NULL, _6$$11, "__construct", &_5, 9, _7$$11); zephir_check_call_status(); - zephir_throw_exception_debug(_6$$11, "phalcon/mvc/model.zep", 3605 TSRMLS_CC); + zephir_throw_exception_debug(_6$$11, "phalcon/mvc/model.zep", 3596 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -81112,12 +81322,12 @@ static PHP_METHOD(Phalcon_Mvc_Model, hasChanged) { ZEPHIR_OBS_VAR(snapshot); zephir_read_property_this(&snapshot, this_ptr, SL("_snapshot"), PH_NOISY_CC); if (Z_TYPE_P(snapshot) != IS_ARRAY) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record doesn't have a valid data snapshot", "phalcon/mvc/model.zep", 3654); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record doesn't have a valid data snapshot", "phalcon/mvc/model.zep", 3645); return; } _0 = zephir_fetch_nproperty_this(this_ptr, SL("_dirtyState"), PH_NOISY_CC); if (!ZEPHIR_IS_LONG(_0, 0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Change checking cannot be performed because the object has not been persisted or is deleted", "phalcon/mvc/model.zep", 3661); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Change checking cannot be performed because the object has not been persisted or is deleted", "phalcon/mvc/model.zep", 3652); return; } ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); @@ -81139,7 +81349,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, hasChanged) { ZEPHIR_CONCAT_SVS(_2$$9, "The field '", fieldName, "' is not part of the model"); ZEPHIR_CALL_METHOD(NULL, _1$$9, "__construct", NULL, 9, _2$$9); zephir_check_call_status(); - zephir_throw_exception_debug(_1$$9, "phalcon/mvc/model.zep", 3693 TSRMLS_CC); + zephir_throw_exception_debug(_1$$9, "phalcon/mvc/model.zep", 3684 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -81151,7 +81361,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, hasChanged) { ZEPHIR_CONCAT_SVS(_4$$11, "The field '", fieldName, "' is not part of the model"); ZEPHIR_CALL_METHOD(NULL, _3$$11, "__construct", NULL, 9, _4$$11); zephir_check_call_status(); - zephir_throw_exception_debug(_3$$11, "phalcon/mvc/model.zep", 3697 TSRMLS_CC); + zephir_throw_exception_debug(_3$$11, "phalcon/mvc/model.zep", 3688 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -81164,7 +81374,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, hasChanged) { ZEPHIR_CONCAT_SVS(_6$$12, "The field '", fieldName, "' is not defined on the model"); ZEPHIR_CALL_METHOD(NULL, _5$$12, "__construct", NULL, 9, _6$$12); zephir_check_call_status(); - zephir_throw_exception_debug(_5$$12, "phalcon/mvc/model.zep", 3705 TSRMLS_CC); + zephir_throw_exception_debug(_5$$12, "phalcon/mvc/model.zep", 3696 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -81176,14 +81386,14 @@ static PHP_METHOD(Phalcon_Mvc_Model, hasChanged) { ZEPHIR_CONCAT_SVS(_8$$13, "The field '", fieldName, "' was not found in the snapshot"); ZEPHIR_CALL_METHOD(NULL, _7$$13, "__construct", NULL, 9, _8$$13); zephir_check_call_status(); - zephir_throw_exception_debug(_7$$13, "phalcon/mvc/model.zep", 3712 TSRMLS_CC); + zephir_throw_exception_debug(_7$$13, "phalcon/mvc/model.zep", 3703 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } RETURN_MM_BOOL(!ZEPHIR_IS_EQUAL(value, originalValue)); } ZEPHIR_INIT_VAR(_9); - zephir_is_iterable(allAttributes, &_11, &_10, 0, 0, "phalcon/mvc/model.zep", 3748); + zephir_is_iterable(allAttributes, &_11, &_10, 0, 0, "phalcon/mvc/model.zep", 3739); for ( ; zephir_hash_get_current_data_ex(_11, (void**) &_12, &_10) == SUCCESS ; zephir_hash_move_forward_ex(_11, &_10) @@ -81218,12 +81428,12 @@ static PHP_METHOD(Phalcon_Mvc_Model, getChangedFields) { ZEPHIR_OBS_VAR(snapshot); zephir_read_property_this(&snapshot, this_ptr, SL("_snapshot"), PH_NOISY_CC); if (Z_TYPE_P(snapshot) != IS_ARRAY) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record doesn't have a valid data snapshot", "phalcon/mvc/model.zep", 3761); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record doesn't have a valid data snapshot", "phalcon/mvc/model.zep", 3752); return; } _0 = zephir_fetch_nproperty_this(this_ptr, SL("_dirtyState"), PH_NOISY_CC); if (!ZEPHIR_IS_LONG(_0, 0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Change checking cannot be performed because the object has not been persisted or is deleted", "phalcon/mvc/model.zep", 3768); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Change checking cannot be performed because the object has not been persisted or is deleted", "phalcon/mvc/model.zep", 3759); return; } ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); @@ -81239,7 +81449,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, getChangedFields) { ZEPHIR_INIT_VAR(changed); array_init(changed); ZEPHIR_INIT_VAR(_1); - zephir_is_iterable(allAttributes, &_3, &_2, 0, 0, "phalcon/mvc/model.zep", 3822); + zephir_is_iterable(allAttributes, &_3, &_2, 0, 0, "phalcon/mvc/model.zep", 3813); for ( ; zephir_hash_get_current_data_ex(_3, (void**) &_4, &_2) == SUCCESS ; zephir_hash_move_forward_ex(_3, &_2) @@ -81247,17 +81457,17 @@ static PHP_METHOD(Phalcon_Mvc_Model, getChangedFields) { ZEPHIR_GET_HMKEY(name, _3, _2); ZEPHIR_GET_HVALUE(_1, _4); if (!(zephir_array_isset(snapshot, name))) { - zephir_array_append(&changed, name, PH_SEPARATE, "phalcon/mvc/model.zep", 3801); + zephir_array_append(&changed, name, PH_SEPARATE, "phalcon/mvc/model.zep", 3792); continue; } ZEPHIR_OBS_NVAR(value); if (!(zephir_fetch_property_zval(&value, this_ptr, name, PH_SILENT_CC))) { - zephir_array_append(&changed, name, PH_SEPARATE, "phalcon/mvc/model.zep", 3809); + zephir_array_append(&changed, name, PH_SEPARATE, "phalcon/mvc/model.zep", 3800); continue; } - zephir_array_fetch(&_5$$7, snapshot, name, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 3816 TSRMLS_CC); + zephir_array_fetch(&_5$$7, snapshot, name, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 3807 TSRMLS_CC); if (!ZEPHIR_IS_EQUAL(value, _5$$7)) { - zephir_array_append(&changed, name, PH_SEPARATE, "phalcon/mvc/model.zep", 3817); + zephir_array_append(&changed, name, PH_SEPARATE, "phalcon/mvc/model.zep", 3808); continue; } } @@ -81320,7 +81530,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, getRelated) { ZEPHIR_CONCAT_SVSVS(_3$$3, "There is no defined relations for the model '", className, "' using alias '", alias, "'"); ZEPHIR_CALL_METHOD(NULL, _2$$3, "__construct", NULL, 9, _3$$3); zephir_check_call_status(); - zephir_throw_exception_debug(_2$$3, "phalcon/mvc/model.zep", 3865 TSRMLS_CC); + zephir_throw_exception_debug(_2$$3, "phalcon/mvc/model.zep", 3856 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -81480,7 +81690,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _invokeFinder) { ZEPHIR_CONCAT_SVS(_4$$9, "The static method '", method, "' requires one argument"); ZEPHIR_CALL_METHOD(NULL, _3$$9, "__construct", NULL, 9, _4$$9); zephir_check_call_status(); - zephir_throw_exception_debug(_3$$9, "phalcon/mvc/model.zep", 3977 TSRMLS_CC); + zephir_throw_exception_debug(_3$$9, "phalcon/mvc/model.zep", 3968 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -81509,7 +81719,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _invokeFinder) { ZEPHIR_CPY_WRT(field, extraMethodFirst); } else { ZEPHIR_INIT_NVAR(field); - zephir_uncamelize(field, extraMethod); + zephir_uncamelize(field, extraMethod, NULL ); if (!(zephir_array_isset(attributes, field))) { ZEPHIR_INIT_VAR(_7$$15); object_init_ex(_7$$15, phalcon_mvc_model_exception_ce); @@ -81517,7 +81727,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, _invokeFinder) { ZEPHIR_CONCAT_SVS(_8$$15, "Cannot resolve attribute '", extraMethod, "' in the model"); ZEPHIR_CALL_METHOD(NULL, _7$$15, "__construct", NULL, 9, _8$$15); zephir_check_call_status(); - zephir_throw_exception_debug(_7$$15, "phalcon/mvc/model.zep", 4011 TSRMLS_CC); + zephir_throw_exception_debug(_7$$15, "phalcon/mvc/model.zep", 4002 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -81552,7 +81762,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __call) { zephir_get_strval(method, method_param); - ZEPHIR_CALL_SELF(&records, "_invokefinder", &_0, 307, method, arguments); + ZEPHIR_CALL_SELF(&records, "_invokefinder", &_0, 303, method, arguments); zephir_check_call_status(); if (Z_TYPE_P(records) != IS_NULL) { RETURN_CCTOR(records); @@ -81576,7 +81786,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __call) { ZEPHIR_CONCAT_SVSVS(_3, "The method '", method, "' doesn't exist on model '", modelName, "'"); ZEPHIR_CALL_METHOD(NULL, _2, "__construct", NULL, 9, _3); zephir_check_call_status(); - zephir_throw_exception_debug(_2, "phalcon/mvc/model.zep", 4062 TSRMLS_CC); + zephir_throw_exception_debug(_2, "phalcon/mvc/model.zep", 4053 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; @@ -81595,7 +81805,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __callStatic) { zephir_get_strval(method, method_param); - ZEPHIR_CALL_SELF(&records, "_invokefinder", &_0, 307, method, arguments); + ZEPHIR_CALL_SELF(&records, "_invokefinder", &_0, 303, method, arguments); zephir_check_call_status(); if (Z_TYPE_P(records) == IS_NULL) { ZEPHIR_INIT_VAR(_1$$3); @@ -81604,7 +81814,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __callStatic) { ZEPHIR_CONCAT_SVS(_2$$3, "The static method '", method, "' doesn't exist"); ZEPHIR_CALL_METHOD(NULL, _1$$3, "__construct", NULL, 9, _2$$3); zephir_check_call_status(); - zephir_throw_exception_debug(_1$$3, "phalcon/mvc/model.zep", 4078 TSRMLS_CC); + zephir_throw_exception_debug(_1$$3, "phalcon/mvc/model.zep", 4069 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -81618,8 +81828,8 @@ static PHP_METHOD(Phalcon_Mvc_Model, __set) { HashPosition _1$$6; zephir_fcall_cache_entry *_5 = NULL, *_7 = NULL; int ZEPHIR_LAST_CALL_STATUS; - zval *property_param = NULL, *value, *lowerProperty = NULL, *related = NULL, *modelName = NULL, *manager = NULL, *lowerKey = NULL, *relation = NULL, *referencedModel = NULL, *key = NULL, *item = NULL, *dirtyState = NULL, *_0$$4 = NULL, **_3$$6, *_4$$10 = NULL, *_6$$11 = NULL, *_8$$12; - zval *property = NULL; + zval *property_param = NULL, *value, *lowerProperty = NULL, *related = NULL, *modelName = NULL, *manager = NULL, *lowerKey = NULL, *relation = NULL, *referencedModel = NULL, *key = NULL, *item = NULL, *dirtyState = NULL, *_9 = NULL, *_10 = NULL, *_0$$4 = NULL, **_3$$6, *_4$$10 = NULL, *_6$$11 = NULL, *_8$$12, *_11$$14; + zval *property = NULL, *_12$$14; ZEPHIR_MM_GROW(); zephir_fetch_params(1, 2, 0, &property_param, &value); @@ -81655,7 +81865,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __set) { zephir_check_call_status(); ZEPHIR_INIT_VAR(related); array_init(related); - zephir_is_iterable(value, &_2$$6, &_1$$6, 0, 0, "phalcon/mvc/model.zep", 4138); + zephir_is_iterable(value, &_2$$6, &_1$$6, 0, 0, "phalcon/mvc/model.zep", 4129); for ( ; zephir_hash_get_current_data_ex(_2$$6, (void**) &_3$$6, &_1$$6) == SUCCESS ; zephir_hash_move_forward_ex(_2$$6, &_1$$6) @@ -81664,7 +81874,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __set) { ZEPHIR_GET_HVALUE(item, _3$$6); if (Z_TYPE_P(item) == IS_OBJECT) { if (zephir_instance_of_ev(item, phalcon_mvc_modelinterface_ce TSRMLS_CC)) { - zephir_array_append(&related, item, PH_SEPARATE, "phalcon/mvc/model.zep", 4125); + zephir_array_append(&related, item, PH_SEPARATE, "phalcon/mvc/model.zep", 4116); } } else { ZEPHIR_INIT_NVAR(lowerKey); @@ -81692,12 +81902,94 @@ static PHP_METHOD(Phalcon_Mvc_Model, __set) { RETVAL_ZVAL(value, 1, 0); RETURN_MM(); } + ZEPHIR_CALL_METHOD(&_9, this_ptr, "_possiblesetter", NULL, 298, property, value); + zephir_check_call_status(); + if (zephir_is_true(_9)) { + RETVAL_ZVAL(value, 1, 0); + RETURN_MM(); + } + ZEPHIR_CALL_METHOD(&_10, this_ptr, "_isvisible", NULL, 304, property); + zephir_check_call_status(); + if (!(zephir_is_true(_10))) { + ZEPHIR_INIT_VAR(_11$$14); + object_init_ex(_11$$14, phalcon_mvc_model_exception_ce); + ZEPHIR_INIT_VAR(_12$$14); + ZEPHIR_CONCAT_SVS(_12$$14, "Property '", property, "' does not have a setter."); + ZEPHIR_CALL_METHOD(NULL, _11$$14, "__construct", NULL, 9, _12$$14); + zephir_check_call_status(); + zephir_throw_exception_debug(_11$$14, "phalcon/mvc/model.zep", 4144 TSRMLS_CC); + ZEPHIR_MM_RESTORE(); + return; + } zephir_update_property_zval_zval(this_ptr, property, value TSRMLS_CC); RETVAL_ZVAL(value, 1, 0); RETURN_MM(); } +static PHP_METHOD(Phalcon_Mvc_Model, _possibleSetter) { + + int ZEPHIR_LAST_CALL_STATUS; + zval *property_param = NULL, *value, *possibleSetter = NULL, *_0; + zval *property = NULL; + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 2, 0, &property_param, &value); + + zephir_get_strval(property, property_param); + + + ZEPHIR_INIT_VAR(_0); + zephir_camelize(_0, property, NULL ); + ZEPHIR_INIT_VAR(possibleSetter); + ZEPHIR_CONCAT_SV(possibleSetter, "set", _0); + if ((zephir_method_exists(this_ptr, possibleSetter TSRMLS_CC) == SUCCESS)) { + ZEPHIR_CALL_METHOD_ZVAL(NULL, this_ptr, possibleSetter, NULL, 0, value); + zephir_check_call_status(); + RETURN_MM_BOOL(1); + } + RETURN_MM_BOOL(0); + +} + +static PHP_METHOD(Phalcon_Mvc_Model, _isVisible) { + + int ZEPHIR_LAST_CALL_STATUS; + zval *property, *reflectionClass = NULL, *reflectionProp = NULL, *e = NULL, *_0$$3 = NULL; + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &property); + + + + ZEPHIR_INIT_VAR(reflectionClass); + object_init_ex(reflectionClass, zephir_get_internal_ce(SS("reflectionclass") TSRMLS_CC)); + ZEPHIR_CALL_METHOD(NULL, reflectionClass, "__construct", NULL, 66, this_ptr); + zephir_check_call_status(); + + /* try_start_1: */ + + ZEPHIR_CALL_METHOD(&reflectionProp, reflectionClass, "getproperty", NULL, 305, property); + zephir_check_call_status_or_jump(try_end_1); + ZEPHIR_CALL_METHOD(&_0$$3, reflectionProp, "ispublic", NULL, 0); + zephir_check_call_status_or_jump(try_end_1); + if (!(zephir_is_true(_0$$3))) { + RETURN_MM_BOOL(0); + } + + try_end_1: + + if (EG(exception)) { + ZEPHIR_CPY_WRT(e, EG(exception)); + if (zephir_instance_of_ev(e, zend_exception_get_default(TSRMLS_C) TSRMLS_CC)) { + zend_clear_exception(TSRMLS_C); + RETURN_MM_BOOL(1); + } + } + RETURN_MM_BOOL(1); + +} + static PHP_METHOD(Phalcon_Mvc_Model, __get) { zval *_1$$3, *_3$$3; @@ -81754,7 +82046,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __get) { RETURN_CCTOR(result); } ZEPHIR_INIT_VAR(_4); - zephir_camelize(_4, property); + zephir_camelize(_4, property, NULL ); ZEPHIR_INIT_VAR(method); ZEPHIR_CONCAT_SV(method, "get", _4); if ((zephir_method_exists(this_ptr, method TSRMLS_CC) == SUCCESS)) { @@ -81848,7 +82140,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, unserialize) { ZEPHIR_CALL_CE_STATIC(&dependencyInjector, phalcon_di_ce, "getdefault", &_0, 1); zephir_check_call_status(); if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injector container is required to obtain the services related to the ORM", "phalcon/mvc/model.zep", 4262); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injector container is required to obtain the services related to the ORM", "phalcon/mvc/model.zep", 4304); return; } zephir_update_property_this(this_ptr, SL("_dependencyInjector"), dependencyInjector TSRMLS_CC); @@ -81859,13 +82151,13 @@ static PHP_METHOD(Phalcon_Mvc_Model, unserialize) { zephir_check_call_status(); ZEPHIR_CPY_WRT(manager, _1$$3); if (Z_TYPE_P(manager) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsManager' is not valid", "phalcon/mvc/model.zep", 4275); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsManager' is not valid", "phalcon/mvc/model.zep", 4317); return; } zephir_update_property_this(this_ptr, SL("_modelsManager"), manager TSRMLS_CC); ZEPHIR_CALL_METHOD(NULL, manager, "initialize", NULL, 0, this_ptr); zephir_check_call_status(); - zephir_is_iterable(attributes, &_4$$3, &_3$$3, 0, 0, "phalcon/mvc/model.zep", 4294); + zephir_is_iterable(attributes, &_4$$3, &_3$$3, 0, 0, "phalcon/mvc/model.zep", 4336); for ( ; zephir_hash_get_current_data_ex(_4$$3, (void**) &_5$$3, &_3$$3) == SUCCESS ; zephir_hash_move_forward_ex(_4$$3, &_3$$3) @@ -81915,7 +82207,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, toArray) { zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_0, metaData, "getattributes", NULL, 0, this_ptr); zephir_check_call_status(); - zephir_is_iterable(_0, &_2, &_1, 0, 0, "phalcon/mvc/model.zep", 4358); + zephir_is_iterable(_0, &_2, &_1, 0, 0, "phalcon/mvc/model.zep", 4400); for ( ; zephir_hash_get_current_data_ex(_2, (void**) &_3, &_1) == SUCCESS ; zephir_hash_move_forward_ex(_2, &_1) @@ -81931,7 +82223,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, toArray) { ZEPHIR_CONCAT_SVS(_5$$6, "Column '", attribute, "' doesn't make part of the column map"); ZEPHIR_CALL_METHOD(NULL, _4$$6, "__construct", &_6, 9, _5$$6); zephir_check_call_status(); - zephir_throw_exception_debug(_4$$6, "phalcon/mvc/model.zep", 4336 TSRMLS_CC); + zephir_throw_exception_debug(_4$$6, "phalcon/mvc/model.zep", 4378 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -82602,12 +82894,16 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle) { zephir_check_call_status(); } _4 = zephir_fetch_nproperty_this(this_ptr, SL("_routes"), PH_NOISY_CC); - zephir_is_iterable(_4, &_6, &_5, 0, 1, "phalcon/mvc/router.zep", 556); + zephir_is_iterable(_4, &_6, &_5, 0, 1, "phalcon/mvc/router.zep", 558); for ( ; zephir_hash_get_current_data_ex(_6, (void**) &_7, &_5) == SUCCESS ; zephir_hash_move_backwards_ex(_6, &_5) ) { ZEPHIR_GET_HVALUE(route, _7); + ZEPHIR_INIT_NVAR(params); + array_init(params); + ZEPHIR_INIT_NVAR(matches); + ZVAL_NULL(matches); ZEPHIR_CALL_METHOD(&methods, route, "gethttpmethods", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(methods) != IS_NULL) { @@ -82615,7 +82911,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle) { _8$$10 = zephir_fetch_nproperty_this(this_ptr, SL("_dependencyInjector"), PH_NOISY_CC); ZEPHIR_CPY_WRT(dependencyInjector, _8$$10); if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/mvc/router.zep", 382); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/mvc/router.zep", 384); return; } ZEPHIR_INIT_NVAR(_10$$10); @@ -82640,7 +82936,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle) { _13$$14 = zephir_fetch_nproperty_this(this_ptr, SL("_dependencyInjector"), PH_NOISY_CC); ZEPHIR_CPY_WRT(dependencyInjector, _13$$14); if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/mvc/router.zep", 409); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/mvc/router.zep", 411); return; } ZEPHIR_INIT_NVAR(_15$$14); @@ -82657,8 +82953,8 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle) { if (Z_TYPE_P(currentHostName) == IS_NULL) { continue; } - if (zephir_memnstr_str(hostname, SL("("), "phalcon/mvc/router.zep", 432)) { - if (!(zephir_memnstr_str(hostname, SL("#"), "phalcon/mvc/router.zep", 433))) { + if (zephir_memnstr_str(hostname, SL("("), "phalcon/mvc/router.zep", 434)) { + if (!(zephir_memnstr_str(hostname, SL("#"), "phalcon/mvc/router.zep", 435))) { ZEPHIR_INIT_NVAR(regexHostName); ZEPHIR_CONCAT_SVS(regexHostName, "#^", hostname, "$#"); } else { @@ -82684,7 +82980,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle) { } ZEPHIR_CALL_METHOD(&pattern, route, "getcompiledpattern", NULL, 0); zephir_check_call_status(); - if (zephir_memnstr_str(pattern, SL("^"), "phalcon/mvc/router.zep", 457)) { + if (zephir_memnstr_str(pattern, SL("^"), "phalcon/mvc/router.zep", 459)) { ZEPHIR_INIT_NVAR(routeFound); zephir_preg_match(routeFound, pattern, handledUri, matches, 0, 0 , 0 TSRMLS_CC); } else { @@ -82703,7 +82999,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle) { zephir_check_call_status(); if (Z_TYPE_P(beforeMatch) != IS_NULL) { if (!(zephir_is_callable(beforeMatch TSRMLS_CC))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "Before-Match callback is not callable in matched route", "phalcon/mvc/router.zep", 479); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "Before-Match callback is not callable in matched route", "phalcon/mvc/router.zep", 481); return; } ZEPHIR_INIT_NVAR(_21$$28); @@ -82731,7 +83027,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, handle) { if (Z_TYPE_P(matches) == IS_ARRAY) { ZEPHIR_CALL_METHOD(&converters, route, "getconverters", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(paths, &_25$$33, &_24$$33, 0, 0, "phalcon/mvc/router.zep", 545); + zephir_is_iterable(paths, &_25$$33, &_24$$33, 0, 0, "phalcon/mvc/router.zep", 547); for ( ; zephir_hash_get_current_data_ex(_25$$33, (void**) &_26$$33, &_24$$33) == SUCCESS ; zephir_hash_move_forward_ex(_25$$33, &_24$$33) @@ -82921,7 +83217,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, add) { zephir_update_property_this(this_ptr, SL("_routes"), _0$$4 TSRMLS_CC); break; } - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "Invalid route position", "phalcon/mvc/router.zep", 681); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "Invalid route position", "phalcon/mvc/router.zep", 683); return; } while(0); @@ -83203,13 +83499,13 @@ static PHP_METHOD(Phalcon_Mvc_Router, mount) { ZEPHIR_CALL_METHOD(&groupRoutes, group, "getroutes", NULL, 0); zephir_check_call_status(); if (!(zephir_fast_count_int(groupRoutes TSRMLS_CC))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "The group of routes does not contain any routes", "phalcon/mvc/router.zep", 752); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "The group of routes does not contain any routes", "phalcon/mvc/router.zep", 754); return; } ZEPHIR_CALL_METHOD(&beforeMatch, group, "getbeforematch", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(beforeMatch) != IS_NULL) { - zephir_is_iterable(groupRoutes, &_1$$4, &_0$$4, 0, 0, "phalcon/mvc/router.zep", 764); + zephir_is_iterable(groupRoutes, &_1$$4, &_0$$4, 0, 0, "phalcon/mvc/router.zep", 766); for ( ; zephir_hash_get_current_data_ex(_1$$4, (void**) &_2$$4, &_0$$4) == SUCCESS ; zephir_hash_move_forward_ex(_1$$4, &_0$$4) @@ -83222,7 +83518,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, mount) { ZEPHIR_CALL_METHOD(&hostname, group, "gethostname", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(hostname) != IS_NULL) { - zephir_is_iterable(groupRoutes, &_4$$6, &_3$$6, 0, 0, "phalcon/mvc/router.zep", 773); + zephir_is_iterable(groupRoutes, &_4$$6, &_3$$6, 0, 0, "phalcon/mvc/router.zep", 775); for ( ; zephir_hash_get_current_data_ex(_4$$6, (void**) &_5$$6, &_3$$6) == SUCCESS ; zephir_hash_move_forward_ex(_4$$6, &_3$$6) @@ -83259,7 +83555,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, notFound) { _0 = Z_TYPE_P(paths) != IS_STRING; } if (_0) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_router_exception_ce, "The not-found paths must be an array or string", "phalcon/mvc/router.zep", 792); + ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_router_exception_ce, "The not-found paths must be an array or string", "phalcon/mvc/router.zep", 794); return; } zephir_update_property_this(this_ptr, SL("_notFoundPaths"), paths TSRMLS_CC); @@ -83365,7 +83661,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, getRouteById) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_routes"), PH_NOISY_CC); - zephir_is_iterable(_0, &_2, &_1, 0, 0, "phalcon/mvc/router.zep", 891); + zephir_is_iterable(_0, &_2, &_1, 0, 0, "phalcon/mvc/router.zep", 893); for ( ; zephir_hash_get_current_data_ex(_2, (void**) &_3, &_1) == SUCCESS ; zephir_hash_move_forward_ex(_2, &_1) @@ -83405,7 +83701,7 @@ static PHP_METHOD(Phalcon_Mvc_Router, getRouteByName) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_routes"), PH_NOISY_CC); - zephir_is_iterable(_0, &_2, &_1, 0, 0, "phalcon/mvc/router.zep", 906); + zephir_is_iterable(_0, &_2, &_1, 0, 0, "phalcon/mvc/router.zep", 908); for ( ; zephir_hash_get_current_data_ex(_2, (void**) &_3, &_1) == SUCCESS ; zephir_hash_move_forward_ex(_2, &_1) @@ -83839,7 +84135,7 @@ static PHP_METHOD(Phalcon_Mvc_Url, get) { } } if (zephir_is_true(args)) { - ZEPHIR_CALL_FUNCTION(&queryString, "http_build_query", NULL, 362, args); + ZEPHIR_CALL_FUNCTION(&queryString, "http_build_query", NULL, 360, args); zephir_check_call_status(); _25$$19 = Z_TYPE_P(queryString) == IS_STRING; if (_25$$19) { @@ -84501,7 +84797,7 @@ static PHP_METHOD(Phalcon_Mvc_View, _loadTemplateEngines) { if (Z_TYPE_P(registeredEngines) != IS_ARRAY) { ZEPHIR_INIT_VAR(_1$$4); object_init_ex(_1$$4, phalcon_mvc_view_engine_php_ce); - ZEPHIR_CALL_METHOD(NULL, _1$$4, "__construct", NULL, 363, this_ptr, dependencyInjector); + ZEPHIR_CALL_METHOD(NULL, _1$$4, "__construct", NULL, 361, this_ptr, dependencyInjector); zephir_check_call_status(); zephir_array_update_string(&engines, SL(".phtml"), &_1$$4, PH_COPY | PH_SEPARATE); } else { @@ -85113,7 +85409,7 @@ static PHP_METHOD(Phalcon_Mvc_View, getPartial) { zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "partial", NULL, 0, partialPath, params); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", NULL, 285); + ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", NULL, 280); zephir_check_call_status(); RETURN_MM(); @@ -86264,6 +86560,29 @@ static PHP_METHOD(Phalcon_Mvc_Collection_Manager, setConnectionService) { } +static PHP_METHOD(Phalcon_Mvc_Collection_Manager, getConnectionService) { + + zval *model, *service = NULL, *entityName = NULL, *_0, *_1$$3; + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &model); + + + + ZEPHIR_INIT_VAR(service); + ZVAL_STRING(service, "mongo", 1); + ZEPHIR_INIT_VAR(entityName); + zephir_get_class(entityName, model, 0 TSRMLS_CC); + _0 = zephir_fetch_nproperty_this(this_ptr, SL("_connectionServices"), PH_NOISY_CC); + if (zephir_array_isset(_0, entityName)) { + _1$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_connectionServices"), PH_NOISY_CC); + ZEPHIR_OBS_NVAR(service); + zephir_array_fetch(&service, _1$$3, entityName, PH_NOISY, "phalcon/mvc/collection/manager.zep", 194 TSRMLS_CC); + } + RETURN_CCTOR(service); + +} + static PHP_METHOD(Phalcon_Mvc_Collection_Manager, useImplicitObjectIds) { zend_bool useImplicitObjectIds; @@ -86322,19 +86641,19 @@ static PHP_METHOD(Phalcon_Mvc_Collection_Manager, getConnection) { zephir_get_class(entityName, model, 0 TSRMLS_CC); if (zephir_array_isset(connectionService, entityName)) { ZEPHIR_OBS_NVAR(service); - zephir_array_fetch(&service, connectionService, entityName, PH_NOISY, "phalcon/mvc/collection/manager.zep", 228 TSRMLS_CC); + zephir_array_fetch(&service, connectionService, entityName, PH_NOISY, "phalcon/mvc/collection/manager.zep", 244 TSRMLS_CC); } } ZEPHIR_OBS_VAR(dependencyInjector); zephir_read_property_this(&dependencyInjector, this_ptr, SL("_dependencyInjector"), PH_NOISY_CC); if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_collection_exception_ce, "A dependency injector container is required to obtain the services related to the ORM", "phalcon/mvc/collection/manager.zep", 234); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_collection_exception_ce, "A dependency injector container is required to obtain the services related to the ORM", "phalcon/mvc/collection/manager.zep", 250); return; } ZEPHIR_CALL_METHOD(&connection, dependencyInjector, "getshared", NULL, 0, service); zephir_check_call_status(); if (Z_TYPE_P(connection) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_collection_exception_ce, "Invalid injected connection service", "phalcon/mvc/collection/manager.zep", 242); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_collection_exception_ce, "Invalid injected connection service", "phalcon/mvc/collection/manager.zep", 258); return; } RETURN_CCTOR(connection); @@ -86373,7 +86692,7 @@ static PHP_METHOD(Phalcon_Mvc_Collection_Manager, notifyEvent) { ZEPHIR_INIT_VAR(_0$$3); zephir_get_class(_0$$3, model, 1 TSRMLS_CC); if (zephir_array_isset_fetch(&modelsBehaviors, behaviors, _0$$3, 0 TSRMLS_CC)) { - zephir_is_iterable(modelsBehaviors, &_2$$4, &_1$$4, 0, 0, "phalcon/mvc/collection/manager.zep", 269); + zephir_is_iterable(modelsBehaviors, &_2$$4, &_1$$4, 0, 0, "phalcon/mvc/collection/manager.zep", 285); for ( ; zephir_hash_get_current_data_ex(_2$$4, (void**) &_3$$4, &_1$$4) == SUCCESS ; zephir_hash_move_forward_ex(_2$$4, &_1$$4) @@ -86447,7 +86766,7 @@ static PHP_METHOD(Phalcon_Mvc_Collection_Manager, missingMethod) { ZEPHIR_INIT_VAR(_0$$3); zephir_get_class(_0$$3, model, 1 TSRMLS_CC); if (zephir_array_isset_fetch(&modelsBehaviors, behaviors, _0$$3, 0 TSRMLS_CC)) { - zephir_is_iterable(modelsBehaviors, &_2$$4, &_1$$4, 0, 0, "phalcon/mvc/collection/manager.zep", 325); + zephir_is_iterable(modelsBehaviors, &_2$$4, &_1$$4, 0, 0, "phalcon/mvc/collection/manager.zep", 341); for ( ; zephir_hash_get_current_data_ex(_2$$4, (void**) &_3$$4, &_1$$4) == SUCCESS ; zephir_hash_move_forward_ex(_2$$4, &_1$$4) @@ -86491,7 +86810,7 @@ static PHP_METHOD(Phalcon_Mvc_Collection_Manager, addBehavior) { ZEPHIR_INIT_NVAR(modelsBehaviors); array_init(modelsBehaviors); } - zephir_array_append(&modelsBehaviors, behavior, PH_SEPARATE, "phalcon/mvc/collection/manager.zep", 358); + zephir_array_append(&modelsBehaviors, behavior, PH_SEPARATE, "phalcon/mvc/collection/manager.zep", 374); zephir_update_property_array(this_ptr, SL("_behaviors"), entityName, modelsBehaviors TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -86700,7 +87019,7 @@ static PHP_METHOD(Phalcon_Mvc_Collection_Behavior_Timestampable, notify) { ZVAL_NULL(timestamp); ZEPHIR_OBS_VAR(format); if (zephir_array_isset_string_fetch(&format, options, SS("format"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_FUNCTION(×tamp, "date", NULL, 294, format); + ZEPHIR_CALL_FUNCTION(×tamp, "date", NULL, 289, format); zephir_check_call_status(); } else { ZEPHIR_OBS_VAR(generator); @@ -88760,12 +89079,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Criteria, fromInput) { ZEPHIR_INIT_VAR(_12$$10); ZEPHIR_CONCAT_SVS(_12$$10, " ", operator, " "); zephir_fast_join(_11$$10, _12$$10, conditions TSRMLS_CC); - ZEPHIR_CALL_METHOD(NULL, criteria, "where", NULL, 308, _11$$10); + ZEPHIR_CALL_METHOD(NULL, criteria, "where", NULL, 306, _11$$10); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, criteria, "bind", NULL, 309, bind); + ZEPHIR_CALL_METHOD(NULL, criteria, "bind", NULL, 307, bind); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, criteria, "setmodelname", NULL, 304, modelName); + ZEPHIR_CALL_METHOD(NULL, criteria, "setmodelname", NULL, 300, modelName); zephir_check_call_status(); RETURN_CCTOR(criteria); @@ -89221,7 +89540,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, getModelSource) { ZEPHIR_INIT_VAR(_0); zephir_get_class_ns(_0, model, 0 TSRMLS_CC); ZEPHIR_INIT_NVAR(source); - zephir_uncamelize(source, _0); + zephir_uncamelize(source, _0, NULL ); zephir_update_property_array(this_ptr, SL("_sources"), entityName, source TSRMLS_CC); RETURN_CCTOR(source); @@ -89778,7 +90097,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasOne) { object_init_ex(relation, phalcon_mvc_model_relation_ce); ZEPHIR_INIT_VAR(_1); ZVAL_LONG(_1, 1); - ZEPHIR_CALL_METHOD(NULL, relation, "__construct", NULL, 310, _1, referencedModel, fields, referencedFields, options); + ZEPHIR_CALL_METHOD(NULL, relation, "__construct", NULL, 308, _1, referencedModel, fields, referencedFields, options); zephir_check_call_status(); ZEPHIR_OBS_VAR(alias); if (zephir_array_isset_string_fetch(&alias, options, SS("alias"), 0 TSRMLS_CC)) { @@ -89854,7 +90173,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, addBelongsTo) { object_init_ex(relation, phalcon_mvc_model_relation_ce); ZEPHIR_INIT_VAR(_1); ZVAL_LONG(_1, 0); - ZEPHIR_CALL_METHOD(NULL, relation, "__construct", NULL, 310, _1, referencedModel, fields, referencedFields, options); + ZEPHIR_CALL_METHOD(NULL, relation, "__construct", NULL, 308, _1, referencedModel, fields, referencedFields, options); zephir_check_call_status(); ZEPHIR_OBS_VAR(alias); if (zephir_array_isset_string_fetch(&alias, options, SS("alias"), 0 TSRMLS_CC)) { @@ -89931,7 +90250,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasMany) { object_init_ex(relation, phalcon_mvc_model_relation_ce); ZEPHIR_INIT_VAR(_0); ZVAL_LONG(_0, 2); - ZEPHIR_CALL_METHOD(NULL, relation, "__construct", NULL, 310, _0, referencedModel, fields, referencedFields, options); + ZEPHIR_CALL_METHOD(NULL, relation, "__construct", NULL, 308, _0, referencedModel, fields, referencedFields, options); zephir_check_call_status(); ZEPHIR_OBS_VAR(alias); if (zephir_array_isset_string_fetch(&alias, options, SS("alias"), 0 TSRMLS_CC)) { @@ -90026,9 +90345,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasManyToMany) { object_init_ex(relation, phalcon_mvc_model_relation_ce); ZEPHIR_INIT_VAR(_0); ZVAL_LONG(_0, 4); - ZEPHIR_CALL_METHOD(NULL, relation, "__construct", NULL, 310, _0, referencedModel, fields, referencedFields, options); + ZEPHIR_CALL_METHOD(NULL, relation, "__construct", NULL, 308, _0, referencedModel, fields, referencedFields, options); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, relation, "setintermediaterelation", NULL, 311, intermediateFields, intermediateModel, intermediateReferencedFields); + ZEPHIR_CALL_METHOD(NULL, relation, "setintermediaterelation", NULL, 309, intermediateFields, intermediateModel, intermediateReferencedFields); zephir_check_call_status(); ZEPHIR_OBS_VAR(alias); if (zephir_array_isset_string_fetch(&alias, options, SS("alias"), 0 TSRMLS_CC)) { @@ -90478,7 +90797,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, getRelationRecords) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not supported", "phalcon/mvc/model/manager.zep", 1242); return; } - ZEPHIR_CALL_METHOD(&_5$$3, this_ptr, "_mergefindparameters", &_6, 312, extraParameters, parameters); + ZEPHIR_CALL_METHOD(&_5$$3, this_ptr, "_mergefindparameters", &_6, 310, extraParameters, parameters); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&builder, this_ptr, "createbuilder", NULL, 0, _5$$3); zephir_check_call_status(); @@ -90543,10 +90862,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, getRelationRecords) { ZEPHIR_CALL_METHOD(&_23, record, "getdi", NULL, 0); zephir_check_call_status(); zephir_array_update_string(&findParams, SL("di"), &_23, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&findArguments, this_ptr, "_mergefindparameters", &_6, 312, findParams, parameters); + ZEPHIR_CALL_METHOD(&findArguments, this_ptr, "_mergefindparameters", &_6, 310, findParams, parameters); zephir_check_call_status(); if (Z_TYPE_P(extraParameters) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&findParams, this_ptr, "_mergefindparameters", &_6, 312, findArguments, extraParameters); + ZEPHIR_CALL_METHOD(&findParams, this_ptr, "_mergefindparameters", &_6, 310, findArguments, extraParameters); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(findParams, findArguments); @@ -92989,7 +93308,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getCallArgument) { add_assoc_stringl_ex(return_value, SS("type"), SL("all"), 1); RETURN_MM(); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getexpression", NULL, 318, argument); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getexpression", NULL, 316, argument); zephir_check_call_status(); RETURN_MM(); @@ -93024,11 +93343,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getCaseExpression) { zephir_create_array(_4$$4, 3, 0 TSRMLS_CC); add_assoc_stringl_ex(_4$$4, SS("type"), SL("when"), 1); zephir_array_fetch_string(&_6$$4, whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/mvc/model/query.zep", 356 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "_getexpression", &_7, 318, _6$$4); + ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "_getexpression", &_7, 316, _6$$4); zephir_check_call_status(); zephir_array_update_string(&_4$$4, SL("expr"), &_5$$4, PH_COPY | PH_SEPARATE); zephir_array_fetch_string(&_8$$4, whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/mvc/model/query.zep", 357 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "_getexpression", &_7, 318, _8$$4); + ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "_getexpression", &_7, 316, _8$$4); zephir_check_call_status(); zephir_array_update_string(&_4$$4, SL("then"), &_5$$4, PH_COPY | PH_SEPARATE); zephir_array_append(&whenClauses, _4$$4, PH_SEPARATE, "phalcon/mvc/model/query.zep", 358); @@ -93037,7 +93356,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getCaseExpression) { zephir_create_array(_9$$5, 2, 0 TSRMLS_CC); add_assoc_stringl_ex(_9$$5, SS("type"), SL("else"), 1); zephir_array_fetch_string(&_11$$5, whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/mvc/model/query.zep", 362 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_10$$5, this_ptr, "_getexpression", &_7, 318, _11$$5); + ZEPHIR_CALL_METHOD(&_10$$5, this_ptr, "_getexpression", &_7, 316, _11$$5); zephir_check_call_status(); zephir_array_update_string(&_9$$5, SL("expr"), &_10$$5, PH_COPY | PH_SEPARATE); zephir_array_append(&whenClauses, _9$$5, PH_SEPARATE, "phalcon/mvc/model/query.zep", 363); @@ -93046,7 +93365,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getCaseExpression) { zephir_create_array(return_value, 3, 0 TSRMLS_CC); add_assoc_stringl_ex(return_value, SS("type"), SL("case"), 1); zephir_array_fetch_string(&_13, expr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/mvc/model/query.zep", 369 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_12, this_ptr, "_getexpression", &_7, 318, _13); + ZEPHIR_CALL_METHOD(&_12, this_ptr, "_getexpression", &_7, 316, _13); zephir_check_call_status(); zephir_array_update_string(&return_value, SL("expr"), &_12, PH_COPY | PH_SEPARATE); zephir_array_update_string(&return_value, SL("when-clauses"), &whenClauses, PH_COPY | PH_SEPARATE); @@ -93085,13 +93404,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getFunctionCall) { ; zephir_hash_move_forward_ex(_1$$6, &_0$$6) ) { ZEPHIR_GET_HVALUE(argument, _2$$6); - ZEPHIR_CALL_METHOD(&_3$$7, this_ptr, "_getcallargument", &_4, 319, argument); + ZEPHIR_CALL_METHOD(&_3$$7, this_ptr, "_getcallargument", &_4, 317, argument); zephir_check_call_status(); zephir_array_append(&functionArgs, _3$$7, PH_SEPARATE, "phalcon/mvc/model/query.zep", 393); } } else { zephir_create_array(functionArgs, 1, 0 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_5$$8, this_ptr, "_getcallargument", &_4, 319, arguments); + ZEPHIR_CALL_METHOD(&_5$$8, this_ptr, "_getcallargument", &_4, 317, arguments); zephir_check_call_status(); zephir_array_fast_append(functionArgs, _5$$8); } @@ -93160,7 +93479,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getExpression) { } else { ZVAL_BOOL(_0$$5, 0); } - ZEPHIR_CALL_METHOD(&left, this_ptr, "_getexpression", &_1, 318, exprLeft, _0$$5); + ZEPHIR_CALL_METHOD(&left, this_ptr, "_getexpression", &_1, 316, exprLeft, _0$$5); zephir_check_call_status(); } ZEPHIR_OBS_VAR(exprRight); @@ -93171,7 +93490,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getExpression) { } else { ZVAL_BOOL(_2$$6, 0); } - ZEPHIR_CALL_METHOD(&right, this_ptr, "_getexpression", &_1, 318, exprRight, _2$$6); + ZEPHIR_CALL_METHOD(&right, this_ptr, "_getexpression", &_1, 316, exprRight, _2$$6); zephir_check_call_status(); } } @@ -93249,7 +93568,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getExpression) { break; } if (ZEPHIR_IS_LONG(exprType, 355)) { - ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "_getqualified", &_3, 320, expr); + ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "_getqualified", &_3, 318, expr); zephir_check_call_status(); break; } @@ -93694,12 +94013,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getExpression) { break; } if (ZEPHIR_IS_LONG(exprType, 350)) { - ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "_getfunctioncall", NULL, 321, expr); + ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "_getfunctioncall", NULL, 319, expr); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(exprType, 409)) { - ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "_getcaseexpression", NULL, 322, expr); + ZEPHIR_CALL_METHOD(&exprReturn, this_ptr, "_getcaseexpression", NULL, 320, expr); zephir_check_call_status(); break; } @@ -93709,7 +94028,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getExpression) { add_assoc_stringl_ex(exprReturn, SS("type"), SL("select"), 1); ZEPHIR_INIT_VAR(_36$$68); ZVAL_BOOL(_36$$68, 1); - ZEPHIR_CALL_METHOD(&_35$$68, this_ptr, "_prepareselect", NULL, 323, expr, _36$$68); + ZEPHIR_CALL_METHOD(&_35$$68, this_ptr, "_prepareselect", NULL, 321, expr, _36$$68); zephir_check_call_status(); zephir_array_update_string(&exprReturn, SL("value"), &_35$$68, PH_COPY | PH_SEPARATE); break; @@ -93728,7 +94047,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getExpression) { RETURN_CCTOR(exprReturn); } if (zephir_array_isset_string(expr, SS("domain"))) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getqualified", &_3, 320, expr); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_getqualified", &_3, 318, expr); zephir_check_call_status(); RETURN_MM(); } @@ -93741,7 +94060,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getExpression) { ; zephir_hash_move_forward_ex(_40$$71, &_39$$71) ) { ZEPHIR_GET_HVALUE(exprListItem, _41$$71); - ZEPHIR_CALL_METHOD(&_42$$72, this_ptr, "_getexpression", &_1, 318, exprListItem); + ZEPHIR_CALL_METHOD(&_42$$72, this_ptr, "_getexpression", &_1, 316, exprListItem); zephir_check_call_status(); zephir_array_append(&listItems, _42$$72, PH_SEPARATE, "phalcon/mvc/model/query.zep", 747); } @@ -93862,7 +94181,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getSelectColumn) { add_assoc_stringl_ex(sqlColumn, SS("type"), SL("scalar"), 1); ZEPHIR_OBS_VAR(columnData); zephir_array_fetch_string(&columnData, column, SL("column"), PH_NOISY, "phalcon/mvc/model/query.zep", 873 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&sqlExprColumn, this_ptr, "_getexpression", NULL, 318, columnData); + ZEPHIR_CALL_METHOD(&sqlExprColumn, this_ptr, "_getexpression", NULL, 316, columnData); zephir_check_call_status(); ZEPHIR_OBS_VAR(balias); if (zephir_array_isset_string_fetch(&balias, sqlExprColumn, SS("balias"), 0 TSRMLS_CC)) { @@ -94059,7 +94378,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getSingleJoin) { add_assoc_long_ex(_2$$3, SS("type"), 355); zephir_array_update_string(&_2$$3, SL("domain"), &modelAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_2$$3, SL("name"), &fields, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "_getqualified", &_3, 320, _2$$3); + ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "_getqualified", &_3, 318, _2$$3); zephir_check_call_status(); zephir_array_update_string(&_0$$3, SL("left"), &_1$$3, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_VAR(_4$$3); @@ -94067,7 +94386,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getSingleJoin) { add_assoc_stringl_ex(_4$$3, SS("type"), SL("qualified"), 1); zephir_array_update_string(&_4$$3, SL("domain"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_4$$3, SL("name"), &referencedFields, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "_getqualified", &_3, 320, _4$$3); + ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "_getqualified", &_3, 318, _4$$3); zephir_check_call_status(); zephir_array_update_string(&_0$$3, SL("right"), &_1$$3, PH_COPY | PH_SEPARATE); zephir_array_fast_append(sqlJoinConditions, _0$$3); @@ -94103,7 +94422,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getSingleJoin) { add_assoc_long_ex(_14$$5, SS("type"), 355); zephir_array_update_string(&_14$$5, SL("domain"), &modelAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_14$$5, SL("name"), &field, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_13$$5, this_ptr, "_getqualified", &_3, 320, _14$$5); + ZEPHIR_CALL_METHOD(&_13$$5, this_ptr, "_getqualified", &_3, 318, _14$$5); zephir_check_call_status(); zephir_array_update_string(&_12$$5, SL("left"), &_13$$5, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(_15$$5); @@ -94111,7 +94430,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getSingleJoin) { add_assoc_stringl_ex(_15$$5, SS("type"), SL("qualified"), 1); zephir_array_update_string(&_15$$5, SL("domain"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_15$$5, SL("name"), &referencedField, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_13$$5, this_ptr, "_getqualified", &_3, 320, _15$$5); + ZEPHIR_CALL_METHOD(&_13$$5, this_ptr, "_getqualified", &_3, 318, _15$$5); zephir_check_call_status(); zephir_array_update_string(&_12$$5, SL("right"), &_13$$5, PH_COPY | PH_SEPARATE); zephir_array_append(&sqlJoinPartialConditions, _12$$5, PH_SEPARATE, "phalcon/mvc/model/query.zep", 1078); @@ -94194,7 +94513,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getMultiJoin) { add_assoc_long_ex(_8$$4, SS("type"), 355); zephir_array_update_string(&_8$$4, SL("domain"), &modelAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_8$$4, SL("name"), &field, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "_getqualified", &_9, 320, _8$$4); + ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "_getqualified", &_9, 318, _8$$4); zephir_check_call_status(); zephir_array_update_string(&sqlEqualsJoinCondition, SL("left"), &_7$$4, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(_10$$4); @@ -94202,7 +94521,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getMultiJoin) { add_assoc_stringl_ex(_10$$4, SS("type"), SL("qualified"), 1); zephir_array_update_string(&_10$$4, SL("domain"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_10$$4, SL("name"), &referencedFields, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "_getqualified", &_9, 320, _10$$4); + ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "_getqualified", &_9, 318, _10$$4); zephir_check_call_status(); zephir_array_update_string(&sqlEqualsJoinCondition, SL("right"), &_7$$4, PH_COPY | PH_SEPARATE); } @@ -94224,7 +94543,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getMultiJoin) { add_assoc_long_ex(_15$$6, SS("type"), 355); zephir_array_update_string(&_15$$6, SL("domain"), &modelAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_15$$6, SL("name"), &fields, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_14$$6, this_ptr, "_getqualified", &_9, 320, _15$$6); + ZEPHIR_CALL_METHOD(&_14$$6, this_ptr, "_getqualified", &_9, 318, _15$$6); zephir_check_call_status(); zephir_array_update_string(&_13$$6, SL("left"), &_14$$6, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_VAR(_16$$6); @@ -94232,7 +94551,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getMultiJoin) { add_assoc_stringl_ex(_16$$6, SS("type"), SL("qualified"), 1); zephir_array_update_string(&_16$$6, SL("domain"), &intermediateModelName, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_16$$6, SL("name"), &intermediateFields, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_14$$6, this_ptr, "_getqualified", &_9, 320, _16$$6); + ZEPHIR_CALL_METHOD(&_14$$6, this_ptr, "_getqualified", &_9, 318, _16$$6); zephir_check_call_status(); zephir_array_update_string(&_13$$6, SL("right"), &_14$$6, PH_COPY | PH_SEPARATE); zephir_array_fast_append(_12$$6, _13$$6); @@ -94253,7 +94572,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getMultiJoin) { add_assoc_long_ex(_17$$6, SS("type"), 355); zephir_array_update_string(&_17$$6, SL("domain"), &intermediateModelName, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_17$$6, SL("name"), &intermediateReferencedFields, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_14$$6, this_ptr, "_getqualified", &_9, 320, _17$$6); + ZEPHIR_CALL_METHOD(&_14$$6, this_ptr, "_getqualified", &_9, 318, _17$$6); zephir_check_call_status(); zephir_array_update_string(&_13$$6, SL("left"), &_14$$6, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_VAR(_18$$6); @@ -94261,7 +94580,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getMultiJoin) { add_assoc_stringl_ex(_18$$6, SS("type"), SL("qualified"), 1); zephir_array_update_string(&_18$$6, SL("domain"), &referencedModelName, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_18$$6, SL("name"), &referencedFields, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_14$$6, this_ptr, "_getqualified", &_9, 320, _18$$6); + ZEPHIR_CALL_METHOD(&_14$$6, this_ptr, "_getqualified", &_9, 318, _18$$6); zephir_check_call_status(); zephir_array_update_string(&_13$$6, SL("right"), &_14$$6, PH_COPY | PH_SEPARATE); zephir_array_fast_append(_12$$6, _13$$6); @@ -94337,7 +94656,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getJoins) { ; zephir_hash_move_forward_ex(_1, &_0) ) { ZEPHIR_GET_HVALUE(joinItem, _2); - ZEPHIR_CALL_METHOD(&joinData, this_ptr, "_getjoin", &_3, 324, manager, joinItem); + ZEPHIR_CALL_METHOD(&joinData, this_ptr, "_getjoin", &_3, 322, manager, joinItem); zephir_check_call_status(); ZEPHIR_OBS_NVAR(source); zephir_array_fetch_string(&source, joinData, SL("source"), PH_NOISY, "phalcon/mvc/model/query.zep", 1317 TSRMLS_CC); @@ -94351,7 +94670,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getJoins) { zephir_create_array(completeSource, 2, 0 TSRMLS_CC); zephir_array_fast_append(completeSource, source); zephir_array_fast_append(completeSource, schema); - ZEPHIR_CALL_METHOD(&joinType, this_ptr, "_getjointype", &_4, 325, joinItem); + ZEPHIR_CALL_METHOD(&joinType, this_ptr, "_getjointype", &_4, 323, joinItem); zephir_check_call_status(); ZEPHIR_OBS_NVAR(aliasExpr); if (zephir_array_isset_string_fetch(&aliasExpr, joinItem, SS("alias"), 0 TSRMLS_CC)) { @@ -94419,7 +94738,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getJoins) { ZEPHIR_GET_HVALUE(joinItem, _14); ZEPHIR_OBS_NVAR(joinExpr); if (zephir_array_isset_string_fetch(&joinExpr, joinItem, SS("conditions"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_15$$13, this_ptr, "_getexpression", &_16, 318, joinExpr); + ZEPHIR_CALL_METHOD(&_15$$13, this_ptr, "_getexpression", &_16, 316, joinExpr); zephir_check_call_status(); zephir_array_update_zval(&joinPreCondition, joinAliasName, &_15$$13, PH_COPY | PH_SEPARATE); } @@ -94516,10 +94835,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getJoins) { ZEPHIR_CALL_METHOD(&_41$$23, relation, "isthrough", NULL, 0); zephir_check_call_status(); if (!(zephir_is_true(_41$$23))) { - ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "_getsinglejoin", &_42, 326, joinType, joinSource, modelAlias, joinAlias, relation); + ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "_getsinglejoin", &_42, 324, joinType, joinSource, modelAlias, joinAlias, relation); zephir_check_call_status(); } else { - ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "_getmultijoin", &_43, 327, joinType, joinSource, modelAlias, joinAlias, relation); + ZEPHIR_CALL_METHOD(&sqlJoin, this_ptr, "_getmultijoin", &_43, 325, joinType, joinSource, modelAlias, joinAlias, relation); zephir_check_call_status(); } if (zephir_array_isset_long(sqlJoin, 0)) { @@ -94590,7 +94909,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getOrderClause) { ) { ZEPHIR_GET_HVALUE(orderItem, _2); zephir_array_fetch_string(&_3$$5, orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/mvc/model/query.zep", 1627 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "_getexpression", &_4, 318, _3$$5); + ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "_getexpression", &_4, 316, _3$$5); zephir_check_call_status(); if (zephir_array_isset_string_fetch(&orderSort, orderItem, SS("sort"), 1 TSRMLS_CC)) { ZEPHIR_INIT_NVAR(orderPartSort); @@ -94642,13 +94961,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getGroupClause) { ; zephir_hash_move_forward_ex(_1$$3, &_0$$3) ) { ZEPHIR_GET_HVALUE(groupItem, _2$$3); - ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "_getexpression", &_4, 318, groupItem); + ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "_getexpression", &_4, 316, groupItem); zephir_check_call_status(); zephir_array_append(&groupParts, _3$$4, PH_SEPARATE, "phalcon/mvc/model/query.zep", 1661); } } else { zephir_create_array(groupParts, 1, 0 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_5$$5, this_ptr, "_getexpression", &_4, 318, group); + ZEPHIR_CALL_METHOD(&_5$$5, this_ptr, "_getexpression", &_4, 316, group); zephir_check_call_status(); zephir_array_fast_append(groupParts, _5$$5); } @@ -94673,13 +94992,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getLimitClause) { array_init(limit); ZEPHIR_OBS_VAR(number); if (zephir_array_isset_string_fetch(&number, limitClause, SS("number"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "_getexpression", &_1, 318, number); + ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "_getexpression", &_1, 316, number); zephir_check_call_status(); zephir_array_update_string(&limit, SL("number"), &_0$$3, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_VAR(offset); if (zephir_array_isset_string_fetch(&offset, limitClause, SS("offset"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "_getexpression", &_1, 318, offset); + ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "_getexpression", &_1, 316, offset); zephir_check_call_status(); zephir_array_update_string(&limit, SL("offset"), &_2$$4, PH_COPY | PH_SEPARATE); } @@ -95002,12 +95321,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) { zephir_array_update_string(&select, SL("joins"), &automaticJoins, PH_COPY | PH_SEPARATE); } } - ZEPHIR_CALL_METHOD(&sqlJoins, this_ptr, "_getjoins", &_41, 328, select); + ZEPHIR_CALL_METHOD(&sqlJoins, this_ptr, "_getjoins", &_41, 326, select); zephir_check_call_status(); } else { if (zephir_fast_count_int(automaticJoins TSRMLS_CC)) { zephir_array_update_string(&select, SL("joins"), &automaticJoins, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&sqlJoins, this_ptr, "_getjoins", &_41, 328, select); + ZEPHIR_CALL_METHOD(&sqlJoins, this_ptr, "_getjoins", &_41, 326, select); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(sqlJoins); @@ -95023,7 +95342,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) { ; zephir_hash_move_forward_ex(_43, &_42) ) { ZEPHIR_GET_HVALUE(column, _44); - ZEPHIR_CALL_METHOD(&_45$$41, this_ptr, "_getselectcolumn", &_46, 329, column); + ZEPHIR_CALL_METHOD(&_45$$41, this_ptr, "_getselectcolumn", &_46, 327, column); zephir_check_call_status(); zephir_is_iterable(_45$$41, &_48$$41, &_47$$41, 0, 0, "phalcon/mvc/model/query.zep", 1999); for ( @@ -95072,31 +95391,31 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) { } ZEPHIR_OBS_VAR(where); if (zephir_array_isset_string_fetch(&where, ast, SS("where"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_53$$51, this_ptr, "_getexpression", &_54, 318, where); + ZEPHIR_CALL_METHOD(&_53$$51, this_ptr, "_getexpression", &_54, 316, where); zephir_check_call_status(); zephir_array_update_string(&sqlSelect, SL("where"), &_53$$51, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_VAR(groupBy); if (zephir_array_isset_string_fetch(&groupBy, ast, SS("groupBy"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_55$$52, this_ptr, "_getgroupclause", NULL, 330, groupBy); + ZEPHIR_CALL_METHOD(&_55$$52, this_ptr, "_getgroupclause", NULL, 328, groupBy); zephir_check_call_status(); zephir_array_update_string(&sqlSelect, SL("group"), &_55$$52, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_VAR(having); if (zephir_array_isset_string_fetch(&having, ast, SS("having"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_56$$53, this_ptr, "_getexpression", &_54, 318, having); + ZEPHIR_CALL_METHOD(&_56$$53, this_ptr, "_getexpression", &_54, 316, having); zephir_check_call_status(); zephir_array_update_string(&sqlSelect, SL("having"), &_56$$53, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_VAR(order); if (zephir_array_isset_string_fetch(&order, ast, SS("orderBy"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_57$$54, this_ptr, "_getorderclause", NULL, 331, order); + ZEPHIR_CALL_METHOD(&_57$$54, this_ptr, "_getorderclause", NULL, 329, order); zephir_check_call_status(); zephir_array_update_string(&sqlSelect, SL("order"), &_57$$54, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_VAR(limit); if (zephir_array_isset_string_fetch(&limit, ast, SS("limit"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_58$$55, this_ptr, "_getlimitclause", NULL, 332, limit); + ZEPHIR_CALL_METHOD(&_58$$55, this_ptr, "_getlimitclause", NULL, 330, limit); zephir_check_call_status(); zephir_array_update_string(&sqlSelect, SL("limit"), &_58$$55, PH_COPY | PH_SEPARATE); } @@ -95194,7 +95513,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) { } else { ZVAL_BOOL(_11$$9, 0); } - ZEPHIR_CALL_METHOD(&_10$$9, this_ptr, "_getexpression", &_12, 318, exprValue, _11$$9); + ZEPHIR_CALL_METHOD(&_10$$9, this_ptr, "_getexpression", &_12, 316, exprValue, _11$$9); zephir_check_call_status(); zephir_array_update_string(&_8$$9, SL("value"), &_10$$9, PH_COPY | PH_SEPARATE); zephir_array_append(&exprValues, _8$$9, PH_SEPARATE, "phalcon/mvc/model/query.zep", 2114); @@ -95375,7 +95694,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) { } else { ZVAL_BOOL(_14$$17, 0); } - ZEPHIR_CALL_METHOD(&_12$$17, this_ptr, "_getexpression", &_15, 318, _13$$17, _14$$17); + ZEPHIR_CALL_METHOD(&_12$$17, this_ptr, "_getexpression", &_15, 316, _13$$17, _14$$17); zephir_check_call_status(); zephir_array_append(&sqlFields, _12$$17, PH_SEPARATE, "phalcon/mvc/model/query.zep", 2262); ZEPHIR_OBS_NVAR(exprColumn); @@ -95391,7 +95710,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) { } else { ZVAL_BOOL(_19$$17, 0); } - ZEPHIR_CALL_METHOD(&_18$$17, this_ptr, "_getexpression", &_15, 318, exprColumn, _19$$17); + ZEPHIR_CALL_METHOD(&_18$$17, this_ptr, "_getexpression", &_15, 316, exprColumn, _19$$17); zephir_check_call_status(); zephir_array_update_string(&_16$$17, SL("value"), &_18$$17, PH_COPY | PH_SEPARATE); zephir_array_append(&sqlValues, _16$$17, PH_SEPARATE, "phalcon/mvc/model/query.zep", 2267); @@ -95406,13 +95725,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) { if (zephir_array_isset_string_fetch(&where, ast, SS("where"), 0 TSRMLS_CC)) { ZEPHIR_INIT_VAR(_21$$18); ZVAL_BOOL(_21$$18, 1); - ZEPHIR_CALL_METHOD(&_20$$18, this_ptr, "_getexpression", &_15, 318, where, _21$$18); + ZEPHIR_CALL_METHOD(&_20$$18, this_ptr, "_getexpression", &_15, 316, where, _21$$18); zephir_check_call_status(); zephir_array_update_string(&sqlUpdate, SL("where"), &_20$$18, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_VAR(limit); if (zephir_array_isset_string_fetch(&limit, ast, SS("limit"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_22$$19, this_ptr, "_getlimitclause", NULL, 332, limit); + ZEPHIR_CALL_METHOD(&_22$$19, this_ptr, "_getlimitclause", NULL, 330, limit); zephir_check_call_status(); zephir_array_update_string(&sqlUpdate, SL("limit"), &_22$$19, PH_COPY | PH_SEPARATE); } @@ -95531,13 +95850,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete) { if (zephir_array_isset_string_fetch(&where, ast, SS("where"), 0 TSRMLS_CC)) { ZEPHIR_INIT_VAR(_10$$14); ZVAL_BOOL(_10$$14, 1); - ZEPHIR_CALL_METHOD(&_9$$14, this_ptr, "_getexpression", NULL, 318, where, _10$$14); + ZEPHIR_CALL_METHOD(&_9$$14, this_ptr, "_getexpression", NULL, 316, where, _10$$14); zephir_check_call_status(); zephir_array_update_string(&sqlDelete, SL("where"), &_9$$14, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_VAR(limit); if (zephir_array_isset_string_fetch(&limit, ast, SS("limit"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_11$$15, this_ptr, "_getlimitclause", NULL, 332, limit); + ZEPHIR_CALL_METHOD(&_11$$15, this_ptr, "_getlimitclause", NULL, 330, limit); zephir_check_call_status(); zephir_array_update_string(&sqlDelete, SL("limit"), &_11$$15, PH_COPY | PH_SEPARATE); } @@ -95585,22 +95904,22 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, parse) { zephir_update_property_this(this_ptr, SL("_type"), type TSRMLS_CC); do { if (ZEPHIR_IS_LONG(type, 309)) { - ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareselect", NULL, 323); + ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareselect", NULL, 321); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(type, 306)) { - ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareinsert", NULL, 333); + ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareinsert", NULL, 331); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(type, 300)) { - ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareupdate", NULL, 334); + ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_prepareupdate", NULL, 332); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(type, 303)) { - ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_preparedelete", NULL, 335); + ZEPHIR_CALL_METHOD(&irPhql, this_ptr, "_preparedelete", NULL, 333); zephir_check_call_status(); break; } @@ -96000,12 +96319,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _executeSelect) { } else { ZVAL_BOOL(_55$$53, 0); } - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 336, simpleColumnMap, resultObject, resultData, cache, _55$$53); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 334, simpleColumnMap, resultObject, resultData, cache, _55$$53); zephir_check_call_status(); RETURN_MM(); } object_init_ex(return_value, phalcon_mvc_model_resultset_complex_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 337, columns1, resultData, cache); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 335, columns1, resultData, cache); zephir_check_call_status(); RETURN_MM(); @@ -96165,7 +96484,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _executeInsert) { object_init_ex(return_value, phalcon_mvc_model_query_status_ce); ZEPHIR_CALL_METHOD(&_20, insertModel, "create", NULL, 0, insertValues); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 338, _20, insertModel); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 336, _20, insertModel); zephir_check_call_status(); RETURN_MM(); @@ -96296,13 +96615,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _executeUpdate) { zephir_array_update_zval(&updateValues, fieldName, &updateValue, PH_COPY | PH_SEPARATE); } - ZEPHIR_CALL_METHOD(&records, this_ptr, "_getrelatedrecords", NULL, 339, model, intermediate, selectBindParams, selectBindTypes); + ZEPHIR_CALL_METHOD(&records, this_ptr, "_getrelatedrecords", NULL, 337, model, intermediate, selectBindParams, selectBindTypes); zephir_check_call_status(); if (!(zephir_fast_count_int(records TSRMLS_CC))) { object_init_ex(return_value, phalcon_mvc_model_query_status_ce); ZEPHIR_INIT_VAR(_17$$19); ZVAL_BOOL(_17$$19, 1); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_18, 338, _17$$19); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_18, 336, _17$$19); zephir_check_call_status(); RETURN_MM(); } @@ -96335,7 +96654,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _executeUpdate) { object_init_ex(return_value, phalcon_mvc_model_query_status_ce); ZEPHIR_INIT_NVAR(_22$$24); ZVAL_BOOL(_22$$24, 0); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_18, 338, _22$$24, record); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_18, 336, _22$$24, record); zephir_check_call_status(); RETURN_MM(); } @@ -96346,7 +96665,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _executeUpdate) { object_init_ex(return_value, phalcon_mvc_model_query_status_ce); ZEPHIR_INIT_VAR(_23); ZVAL_BOOL(_23, 1); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_18, 338, _23); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_18, 336, _23); zephir_check_call_status(); RETURN_MM(); @@ -96379,13 +96698,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _executeDelete) { ZEPHIR_CALL_METHOD(&model, _1$$4, "load", NULL, 0, modelName); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&records, this_ptr, "_getrelatedrecords", NULL, 339, model, intermediate, bindParams, bindTypes); + ZEPHIR_CALL_METHOD(&records, this_ptr, "_getrelatedrecords", NULL, 337, model, intermediate, bindParams, bindTypes); zephir_check_call_status(); if (!(zephir_fast_count_int(records TSRMLS_CC))) { object_init_ex(return_value, phalcon_mvc_model_query_status_ce); ZEPHIR_INIT_VAR(_2$$5); ZVAL_BOOL(_2$$5, 1); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_3, 338, _2$$5); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_3, 336, _2$$5); zephir_check_call_status(); RETURN_MM(); } @@ -96418,7 +96737,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _executeDelete) { object_init_ex(return_value, phalcon_mvc_model_query_status_ce); ZEPHIR_INIT_NVAR(_7$$10); ZVAL_BOOL(_7$$10, 0); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_3, 338, _7$$10, record); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_3, 336, _7$$10, record); zephir_check_call_status(); RETURN_MM(); } @@ -96429,7 +96748,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _executeDelete) { object_init_ex(return_value, phalcon_mvc_model_query_status_ce); ZEPHIR_INIT_VAR(_8); ZVAL_BOOL(_8, 1); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_3, 338, _8); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", &_3, 336, _8); zephir_check_call_status(); RETURN_MM(); @@ -96477,18 +96796,18 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _getRelatedRecords) { } ZEPHIR_INIT_VAR(query); object_init_ex(query, phalcon_mvc_model_query_ce); - ZEPHIR_CALL_METHOD(NULL, query, "__construct", NULL, 340); + ZEPHIR_CALL_METHOD(NULL, query, "__construct", NULL, 338); zephir_check_call_status(); _5 = zephir_fetch_nproperty_this(this_ptr, SL("_dependencyInjector"), PH_NOISY_CC); - ZEPHIR_CALL_METHOD(NULL, query, "setdi", NULL, 341, _5); + ZEPHIR_CALL_METHOD(NULL, query, "setdi", NULL, 339, _5); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_2); ZVAL_LONG(_2, 309); - ZEPHIR_CALL_METHOD(NULL, query, "settype", NULL, 342, _2); + ZEPHIR_CALL_METHOD(NULL, query, "settype", NULL, 340, _2); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, query, "setintermediate", NULL, 343, selectIr); + ZEPHIR_CALL_METHOD(NULL, query, "setintermediate", NULL, 341, selectIr); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(query, "execute", NULL, 344, bindParams, bindTypes); + ZEPHIR_RETURN_CALL_METHOD(query, "execute", NULL, 342, bindParams, bindTypes); zephir_check_call_status(); RETURN_MM(); @@ -96609,22 +96928,22 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, execute) { zephir_read_property_this(&type, this_ptr, SL("_type"), PH_NOISY_CC); do { if (ZEPHIR_IS_LONG(type, 309)) { - ZEPHIR_CALL_METHOD(&result, this_ptr, "_executeselect", NULL, 345, intermediate, mergedParams, mergedTypes); + ZEPHIR_CALL_METHOD(&result, this_ptr, "_executeselect", NULL, 343, intermediate, mergedParams, mergedTypes); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(type, 306)) { - ZEPHIR_CALL_METHOD(&result, this_ptr, "_executeinsert", NULL, 346, intermediate, mergedParams, mergedTypes); + ZEPHIR_CALL_METHOD(&result, this_ptr, "_executeinsert", NULL, 344, intermediate, mergedParams, mergedTypes); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(type, 300)) { - ZEPHIR_CALL_METHOD(&result, this_ptr, "_executeupdate", NULL, 347, intermediate, mergedParams, mergedTypes); + ZEPHIR_CALL_METHOD(&result, this_ptr, "_executeupdate", NULL, 345, intermediate, mergedParams, mergedTypes); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(type, 303)) { - ZEPHIR_CALL_METHOD(&result, this_ptr, "_executedelete", NULL, 348, intermediate, mergedParams, mergedTypes); + ZEPHIR_CALL_METHOD(&result, this_ptr, "_executedelete", NULL, 346, intermediate, mergedParams, mergedTypes); zephir_check_call_status(); break; } @@ -96679,7 +96998,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleResult) { zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&_1, this_ptr, "execute", NULL, 344, bindParams, bindTypes); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "execute", NULL, 342, bindParams, bindTypes); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(_1, "getfirst", NULL, 0); zephir_check_call_status(); @@ -96876,7 +97195,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSql) { _2$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_bindTypes"), PH_NOISY_CC); ZEPHIR_INIT_VAR(_3$$3); ZVAL_BOOL(_3$$3, 1); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_executeselect", NULL, 345, intermediate, _1$$3, _2$$3, _3$$3); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_executeselect", NULL, 343, intermediate, _1$$3, _2$$3, _3$$3); zephir_check_call_status(); RETURN_MM(); } @@ -98278,7 +98597,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Transaction, rollback) { ZEPHIR_INIT_VAR(_5$$4); object_init_ex(_5$$4, phalcon_mvc_model_transaction_failed_ce); _6$$4 = zephir_fetch_nproperty_this(this_ptr, SL("_rollbackRecord"), PH_NOISY_CC); - ZEPHIR_CALL_METHOD(NULL, _5$$4, "__construct", NULL, 353, rollbackMessage, _6$$4); + ZEPHIR_CALL_METHOD(NULL, _5$$4, "__construct", NULL, 351, rollbackMessage, _6$$4); zephir_check_call_status(); zephir_throw_exception_debug(_5$$4, "phalcon/mvc/model/transaction.zep", 160 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -98297,7 +98616,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Transaction, getConnection) { _0 = zephir_fetch_nproperty_this(this_ptr, SL("_rollbackOnAbort"), PH_NOISY_CC); if (zephir_is_true(_0)) { - ZEPHIR_CALL_FUNCTION(&_1$$3, "connection_aborted", NULL, 354); + ZEPHIR_CALL_FUNCTION(&_1$$3, "connection_aborted", NULL, 352); zephir_check_call_status(); if (zephir_is_true(_1$$3)) { ZEPHIR_INIT_VAR(_2$$4); @@ -98351,9 +98670,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Transaction, isManaged) { zval *_0; + ZEPHIR_MM_GROW(); - _0 = zephir_fetch_nproperty_this(this_ptr, SL("_manager"), PH_NOISY_CC); - RETURN_BOOL(!zephir_is_true(_0)); + ZEPHIR_OBS_VAR(_0); + zephir_read_property_this(&_0, this_ptr, SL("_manager"), PH_NOISY_CC); + RETURN_MM_BOOL(Z_TYPE_P(_0) == IS_OBJECT); } @@ -98667,7 +98988,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Validator, isSetOption) { } -static zend_object_value zephir_init_properties_Phalcon_Mvc_Model_Validator(zend_class_entry *class_type TSRMLS_DC) { +zend_object_value zephir_init_properties_Phalcon_Mvc_Model_Validator(zend_class_entry *class_type TSRMLS_DC) { zval *_0, *_1$$3; @@ -98873,7 +99194,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Behavior_Timestampable, notify) { ZVAL_NULL(timestamp); ZEPHIR_OBS_VAR(format); if (zephir_array_isset_string_fetch(&format, options, SS("format"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_FUNCTION(×tamp, "date", NULL, 294, format); + ZEPHIR_CALL_FUNCTION(×tamp, "date", NULL, 289, format); zephir_check_call_status(); } else { ZEPHIR_OBS_VAR(generator); @@ -99222,9 +99543,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData_Libmemcached, __construct) { ZEPHIR_OBS_VAR(_4); zephir_read_property_this(&_4, this_ptr, SL("_ttl"), PH_NOISY_CC); zephir_array_update_string(&_3, SL("lifetime"), &_4, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, _2, "__construct", NULL, 313, _3); + ZEPHIR_CALL_METHOD(NULL, _2, "__construct", NULL, 311, _3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, _1, "__construct", NULL, 314, _2, options); + ZEPHIR_CALL_METHOD(NULL, _1, "__construct", NULL, 312, _2, options); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_memcache"), _1 TSRMLS_CC); ZEPHIR_INIT_VAR(_5); @@ -99321,7 +99642,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData_Libmemcached, reset) { zephir_check_call_status(); } } - ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_model_metadata_libmemcached_ce, this_ptr, "reset", &_5, 315); + ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_model_metadata_libmemcached_ce, this_ptr, "reset", &_5, 313); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -99405,9 +99726,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData_Memcache, __construct) { ZEPHIR_OBS_VAR(_7); zephir_read_property_this(&_7, this_ptr, SL("_ttl"), PH_NOISY_CC); zephir_array_update_string(&_6, SL("lifetime"), &_7, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, _5, "__construct", NULL, 313, _6); + ZEPHIR_CALL_METHOD(NULL, _5, "__construct", NULL, 311, _6); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, _4, "__construct", NULL, 316, _5, options); + ZEPHIR_CALL_METHOD(NULL, _4, "__construct", NULL, 314, _5, options); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_memcache"), _4 TSRMLS_CC); ZEPHIR_INIT_VAR(_8); @@ -99504,7 +99825,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData_Memcache, reset) { zephir_check_call_status(); } } - ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_model_metadata_memcache_ce, this_ptr, "reset", &_5, 315); + ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_model_metadata_memcache_ce, this_ptr, "reset", &_5, 313); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -99677,9 +99998,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData_Redis, __construct) { ZEPHIR_OBS_VAR(_7); zephir_read_property_this(&_7, this_ptr, SL("_ttl"), PH_NOISY_CC); zephir_array_update_string(&_6, SL("lifetime"), &_7, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, _5, "__construct", NULL, 313, _6); + ZEPHIR_CALL_METHOD(NULL, _5, "__construct", NULL, 311, _6); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, _4, "__construct", NULL, 317, _5, options); + ZEPHIR_CALL_METHOD(NULL, _4, "__construct", NULL, 315, _5, options); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_redis"), _4 TSRMLS_CC); ZEPHIR_INIT_VAR(_8); @@ -99776,7 +100097,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_MetaData_Redis, reset) { zephir_check_call_status(); } } - ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_model_metadata_redis_ce, this_ptr, "reset", &_5, 315); + ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_model_metadata_redis_ce, this_ptr, "reset", &_5, 313); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -102103,7 +102424,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getQuery) { ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&phql, this_ptr, "getphql", NULL, 349); + ZEPHIR_CALL_METHOD(&phql, this_ptr, "getphql", NULL, 347); zephir_check_call_status(); _0 = zephir_fetch_nproperty_this(this_ptr, SL("_dependencyInjector"), PH_NOISY_CC); ZEPHIR_CPY_WRT(dependencyInjector, _0); @@ -112092,7 +112413,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, __construct) { zephir_update_property_this(this_ptr, SL("_columnTypes"), columnTypes TSRMLS_CC); - ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_model_resultset_complex_ce, this_ptr, "__construct", &_0, 350, result, cache); + ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_model_resultset_complex_ce, this_ptr, "__construct", &_0, 348, result, cache); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -112417,7 +112738,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, __construct) { zephir_update_property_this(this_ptr, SL("_model"), model TSRMLS_CC); zephir_update_property_this(this_ptr, SL("_columnMap"), columnMap TSRMLS_CC); zephir_update_property_this(this_ptr, SL("_keepSnapshots"), keepSnapshots TSRMLS_CC); - ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_model_resultset_simple_ce, this_ptr, "__construct", &_0, 350, result, cache); + ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_model_resultset_simple_ce, this_ptr, "__construct", &_0, 348, result, cache); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -112476,12 +112797,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, current) { _8$$9 = zephir_fetch_nproperty_this(this_ptr, SL("_keepSnapshots"), PH_NOISY_CC); ZEPHIR_INIT_VAR(_9$$9); ZVAL_LONG(_9$$9, 0); - ZEPHIR_CALL_CE_STATIC(&activeRow, phalcon_mvc_model_ce, "cloneresultmap", &_6, 351, _7$$9, row, columnMap, _9$$9, _8$$9); + ZEPHIR_CALL_CE_STATIC(&activeRow, phalcon_mvc_model_ce, "cloneresultmap", &_6, 349, _7$$9, row, columnMap, _9$$9, _8$$9); zephir_check_call_status(); } break; } - ZEPHIR_CALL_CE_STATIC(&activeRow, phalcon_mvc_model_ce, "cloneresultmaphydrate", &_10, 352, row, columnMap, hydrateMode); + ZEPHIR_CALL_CE_STATIC(&activeRow, phalcon_mvc_model_ce, "cloneresultmaphydrate", &_10, 350, row, columnMap, hydrateMode); zephir_check_call_status(); break; } while(0); @@ -112953,7 +113274,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Transaction_Manager, get) { ZEPHIR_INIT_VAR(_3$$4); ZVAL_STRING(_3$$4, "rollbackPendent", 1); zephir_array_fast_append(_2$$4, _3$$4); - ZEPHIR_CALL_FUNCTION(NULL, "register_shutdown_function", NULL, 355, _2$$4); + ZEPHIR_CALL_FUNCTION(NULL, "register_shutdown_function", NULL, 353, _2$$4); zephir_check_call_status(); } if (1) { @@ -113028,9 +113349,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Transaction_Manager, getOrCreateTransaction) } else { ZVAL_BOOL(_6, 0); } - ZEPHIR_CALL_METHOD(NULL, transaction, "__construct", NULL, 356, dependencyInjector, _6, _5); + ZEPHIR_CALL_METHOD(NULL, transaction, "__construct", NULL, 354, dependencyInjector, _6, _5); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, transaction, "settransactionmanager", NULL, 357, this_ptr); + ZEPHIR_CALL_METHOD(NULL, transaction, "settransactionmanager", NULL, 355, this_ptr); zephir_check_call_status(); zephir_update_property_array_append(this_ptr, SL("_transactions"), transaction TSRMLS_CC); RETURN_ON_FAILURE(zephir_property_incr(this_ptr, SL("_number") TSRMLS_CC)); @@ -113316,7 +113637,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Validator_Email, validate) { } ZEPHIR_SINIT_VAR(_3); ZVAL_LONG(&_3, 274); - ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 193, value, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 188, value, &_3); zephir_check_call_status(); if (!(zephir_is_true(_4))) { ZEPHIR_INIT_VAR(_5$$5); @@ -113543,7 +113864,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Validator_Inclusionin, validate) { zephir_check_temp_parameter(_5$$7); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_6, "in_array", NULL, 358, value, domain, strict); + ZEPHIR_CALL_FUNCTION(&_6, "in_array", NULL, 356, value, domain, strict); zephir_check_call_status(); if (!(zephir_is_true(_6))) { ZEPHIR_INIT_VAR(_7$$9); @@ -113682,7 +114003,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Validator_Ip, validate) { zephir_array_update_string(&options, SL("flags"), &_8, PH_COPY | PH_SEPARATE); ZEPHIR_SINIT_NVAR(_7); ZVAL_LONG(&_7, 275); - ZEPHIR_CALL_FUNCTION(&_9, "filter_var", NULL, 193, value, &_7, options); + ZEPHIR_CALL_FUNCTION(&_9, "filter_var", NULL, 188, value, &_7, options); zephir_check_call_status(); if (!(zephir_is_true(_9))) { ZEPHIR_INIT_VAR(_10$$5); @@ -114060,7 +114381,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Validator_StringLength, validate) { RETURN_MM_BOOL(1); } if ((zephir_function_exists_ex(SS("mb_strlen") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 359, value); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 357, value); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(length); @@ -114447,7 +114768,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Validator_Url, validate) { } ZEPHIR_SINIT_VAR(_3); ZVAL_LONG(&_3, 273); - ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 193, value, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 188, value, &_3); zephir_check_call_status(); if (!(zephir_is_true(_4))) { ZEPHIR_INIT_VAR(_5$$5); @@ -114495,8 +114816,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Router_Annotations) { zend_declare_property_null(phalcon_mvc_router_annotations_ce, SL("_handlers"), ZEND_ACC_PROTECTED TSRMLS_CC); - zend_declare_property_bool(phalcon_mvc_router_annotations_ce, SL("_processed"), 0, ZEND_ACC_PROTECTED TSRMLS_CC); - zend_declare_property_string(phalcon_mvc_router_annotations_ce, SL("_controllerSuffix"), "Controller", ZEND_ACC_PROTECTED TSRMLS_CC); zend_declare_property_string(phalcon_mvc_router_annotations_ce, SL("_actionSuffix"), "Action", ZEND_ACC_PROTECTED TSRMLS_CC); @@ -114548,11 +114867,6 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, addResource) { zephir_array_fast_append(_0, prefix); zephir_array_fast_append(_0, handler); zephir_update_property_array_append(this_ptr, SL("_handlers"), _0 TSRMLS_CC); - if (0) { - zephir_update_property_this(this_ptr, SL("_processed"), ZEPHIR_GLOBAL(global_true) TSRMLS_CC); - } else { - zephir_update_property_this(this_ptr, SL("_processed"), ZEPHIR_GLOBAL(global_false) TSRMLS_CC); - } RETURN_THIS(); } @@ -114609,22 +114923,17 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, addModuleResource) { zephir_array_fast_append(_0, handler); zephir_array_fast_append(_0, module); zephir_update_property_array_append(this_ptr, SL("_handlers"), _0 TSRMLS_CC); - if (0) { - zephir_update_property_this(this_ptr, SL("_processed"), ZEPHIR_GLOBAL(global_true) TSRMLS_CC); - } else { - zephir_update_property_this(this_ptr, SL("_processed"), ZEPHIR_GLOBAL(global_false) TSRMLS_CC); - } RETURN_THIS(); } static PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) { - HashTable *_2$$6, *_7$$17, *_11$$19, *_15$$21; - HashPosition _1$$6, _6$$17, _10$$19, _14$$21; - zephir_fcall_cache_entry *_9 = NULL, *_17 = NULL, *_18 = NULL; + HashTable *_1$$5, *_6$$16, *_10$$18, *_14$$20; + HashPosition _0$$5, _5$$16, _9$$18, _13$$20; + zephir_fcall_cache_entry *_8 = NULL, *_16 = NULL, *_17 = NULL; int ZEPHIR_LAST_CALL_STATUS; - zval *uri_param = NULL, *realUri = NULL, *annotationsService = NULL, *handlers = NULL, *controllerSuffix = NULL, *scope = NULL, *prefix = NULL, *dependencyInjector = NULL, *handler = NULL, *controllerName = NULL, *lowerControllerName = NULL, *namespaceName = NULL, *moduleName = NULL, *sufixed = NULL, *handlerAnnotations = NULL, *classAnnotations = NULL, *annotations = NULL, *annotation = NULL, *methodAnnotations = NULL, *lowercased = NULL, *method = NULL, *collection = NULL, *_0, **_3$$6, *_4$$11, *_5$$11 = NULL, **_8$$17, **_12$$19, *_13$$21 = NULL, **_16$$21; + zval *uri_param = NULL, *realUri = NULL, *annotationsService = NULL, *handlers = NULL, *controllerSuffix = NULL, *scope = NULL, *prefix = NULL, *dependencyInjector = NULL, *handler = NULL, *controllerName = NULL, *lowerControllerName = NULL, *namespaceName = NULL, *moduleName = NULL, *sufixed = NULL, *handlerAnnotations = NULL, *classAnnotations = NULL, *annotations = NULL, *annotation = NULL, *methodAnnotations = NULL, *lowercased = NULL, *method = NULL, *collection = NULL, **_2$$5, *_3$$10, *_4$$10 = NULL, **_7$$16, **_11$$18, *_12$$20 = NULL, **_15$$20; zval *uri = NULL; ZEPHIR_MM_GROW(); @@ -114653,107 +114962,104 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) { } else { ZEPHIR_CPY_WRT(realUri, uri); } - _0 = zephir_fetch_nproperty_this(this_ptr, SL("_processed"), PH_NOISY_CC); - if (!(zephir_is_true(_0))) { - ZEPHIR_INIT_VAR(annotationsService); - ZVAL_NULL(annotationsService); - ZEPHIR_OBS_VAR(handlers); - zephir_read_property_this(&handlers, this_ptr, SL("_handlers"), PH_NOISY_CC); - if (Z_TYPE_P(handlers) == IS_ARRAY) { - ZEPHIR_OBS_VAR(controllerSuffix); - zephir_read_property_this(&controllerSuffix, this_ptr, SL("_controllerSuffix"), PH_NOISY_CC); - zephir_is_iterable(handlers, &_2$$6, &_1$$6, 0, 0, "phalcon/mvc/router/annotations.zep", 208); - for ( - ; zephir_hash_get_current_data_ex(_2$$6, (void**) &_3$$6, &_1$$6) == SUCCESS - ; zephir_hash_move_forward_ex(_2$$6, &_1$$6) - ) { - ZEPHIR_GET_HVALUE(scope, _3$$6); - if (Z_TYPE_P(scope) == IS_ARRAY) { - ZEPHIR_OBS_NVAR(prefix); - zephir_array_fetch_long(&prefix, scope, 0, PH_NOISY, "phalcon/mvc/router/annotations.zep", 117 TSRMLS_CC); - if (!(ZEPHIR_IS_EMPTY(prefix))) { - if (!(zephir_start_with(realUri, prefix, NULL))) { - continue; - } - } - if (Z_TYPE_P(annotationsService) != IS_OBJECT) { - _4$$11 = zephir_fetch_nproperty_this(this_ptr, SL("_dependencyInjector"), PH_NOISY_CC); - ZEPHIR_CPY_WRT(dependencyInjector, _4$$11); - if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'annotations' service", "phalcon/mvc/router/annotations.zep", 129); - return; - } - ZEPHIR_INIT_NVAR(_5$$11); - ZVAL_STRING(_5$$11, "annotations", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(&annotationsService, dependencyInjector, "getshared", NULL, 0, _5$$11); - zephir_check_temp_parameter(_5$$11); - zephir_check_call_status(); + ZEPHIR_INIT_VAR(annotationsService); + ZVAL_NULL(annotationsService); + ZEPHIR_OBS_VAR(handlers); + zephir_read_property_this(&handlers, this_ptr, SL("_handlers"), PH_NOISY_CC); + if (Z_TYPE_P(handlers) == IS_ARRAY) { + ZEPHIR_OBS_VAR(controllerSuffix); + zephir_read_property_this(&controllerSuffix, this_ptr, SL("_controllerSuffix"), PH_NOISY_CC); + zephir_is_iterable(handlers, &_1$$5, &_0$$5, 0, 0, "phalcon/mvc/router/annotations.zep", 203); + for ( + ; zephir_hash_get_current_data_ex(_1$$5, (void**) &_2$$5, &_0$$5) == SUCCESS + ; zephir_hash_move_forward_ex(_1$$5, &_0$$5) + ) { + ZEPHIR_GET_HVALUE(scope, _2$$5); + if (Z_TYPE_P(scope) == IS_ARRAY) { + ZEPHIR_OBS_NVAR(prefix); + zephir_array_fetch_long(&prefix, scope, 0, PH_NOISY, "phalcon/mvc/router/annotations.zep", 112 TSRMLS_CC); + if (!(ZEPHIR_IS_EMPTY(prefix))) { + if (!(zephir_start_with(realUri, prefix, NULL))) { + continue; } - ZEPHIR_OBS_NVAR(handler); - zephir_array_fetch_long(&handler, scope, 1, PH_NOISY, "phalcon/mvc/router/annotations.zep", 138 TSRMLS_CC); - if (zephir_memnstr_str(handler, SL("\\"), "phalcon/mvc/router/annotations.zep", 140)) { - ZEPHIR_INIT_NVAR(controllerName); - zephir_get_class_ns(controllerName, handler, 0 TSRMLS_CC); - ZEPHIR_INIT_NVAR(lowerControllerName); - zephir_uncamelize(lowerControllerName, controllerName); - ZEPHIR_INIT_NVAR(namespaceName); - zephir_get_ns_class(namespaceName, handler, 0 TSRMLS_CC); - } else { - ZEPHIR_CPY_WRT(controllerName, handler); - ZEPHIR_INIT_NVAR(lowerControllerName); - zephir_uncamelize(lowerControllerName, controllerName); - ZEPHIR_INIT_NVAR(namespaceName); - ZVAL_NULL(namespaceName); + } + if (Z_TYPE_P(annotationsService) != IS_OBJECT) { + _3$$10 = zephir_fetch_nproperty_this(this_ptr, SL("_dependencyInjector"), PH_NOISY_CC); + ZEPHIR_CPY_WRT(dependencyInjector, _3$$10); + if (Z_TYPE_P(dependencyInjector) != IS_OBJECT) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'annotations' service", "phalcon/mvc/router/annotations.zep", 124); + return; } - zephir_update_property_this(this_ptr, SL("_routePrefix"), ZEPHIR_GLOBAL(global_null) TSRMLS_CC); - ZEPHIR_OBS_NVAR(moduleName); - zephir_array_isset_long_fetch(&moduleName, scope, 2, 0 TSRMLS_CC); - ZEPHIR_INIT_NVAR(sufixed); - ZEPHIR_CONCAT_VV(sufixed, handler, controllerSuffix); - ZEPHIR_CALL_METHOD(&handlerAnnotations, annotationsService, "get", NULL, 0, sufixed); + ZEPHIR_INIT_NVAR(_4$$10); + ZVAL_STRING(_4$$10, "annotations", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(&annotationsService, dependencyInjector, "getshared", NULL, 0, _4$$10); + zephir_check_temp_parameter(_4$$10); zephir_check_call_status(); - if (Z_TYPE_P(handlerAnnotations) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(&classAnnotations, handlerAnnotations, "getclassannotations", NULL, 0); - zephir_check_call_status(); - if (Z_TYPE_P(classAnnotations) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(&annotations, classAnnotations, "getannotations", NULL, 0); - zephir_check_call_status(); - if (Z_TYPE_P(annotations) == IS_ARRAY) { - zephir_is_iterable(annotations, &_7$$17, &_6$$17, 0, 0, "phalcon/mvc/router/annotations.zep", 187); - for ( - ; zephir_hash_get_current_data_ex(_7$$17, (void**) &_8$$17, &_6$$17) == SUCCESS - ; zephir_hash_move_forward_ex(_7$$17, &_6$$17) - ) { - ZEPHIR_GET_HVALUE(annotation, _8$$17); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "processcontrollerannotation", &_9, 0, controllerName, annotation); - zephir_check_call_status(); - } - } - } - ZEPHIR_CALL_METHOD(&methodAnnotations, handlerAnnotations, "getmethodsannotations", NULL, 0); + } + ZEPHIR_OBS_NVAR(handler); + zephir_array_fetch_long(&handler, scope, 1, PH_NOISY, "phalcon/mvc/router/annotations.zep", 133 TSRMLS_CC); + if (zephir_memnstr_str(handler, SL("\\"), "phalcon/mvc/router/annotations.zep", 135)) { + ZEPHIR_INIT_NVAR(controllerName); + zephir_get_class_ns(controllerName, handler, 0 TSRMLS_CC); + ZEPHIR_INIT_NVAR(lowerControllerName); + zephir_uncamelize(lowerControllerName, controllerName, NULL ); + ZEPHIR_INIT_NVAR(namespaceName); + zephir_get_ns_class(namespaceName, handler, 0 TSRMLS_CC); + } else { + ZEPHIR_CPY_WRT(controllerName, handler); + ZEPHIR_INIT_NVAR(lowerControllerName); + zephir_uncamelize(lowerControllerName, controllerName, NULL ); + ZEPHIR_INIT_NVAR(namespaceName); + ZVAL_NULL(namespaceName); + } + zephir_update_property_this(this_ptr, SL("_routePrefix"), ZEPHIR_GLOBAL(global_null) TSRMLS_CC); + ZEPHIR_OBS_NVAR(moduleName); + zephir_array_isset_long_fetch(&moduleName, scope, 2, 0 TSRMLS_CC); + ZEPHIR_INIT_NVAR(sufixed); + ZEPHIR_CONCAT_VV(sufixed, handler, controllerSuffix); + ZEPHIR_CALL_METHOD(&handlerAnnotations, annotationsService, "get", NULL, 0, sufixed); + zephir_check_call_status(); + if (Z_TYPE_P(handlerAnnotations) == IS_OBJECT) { + ZEPHIR_CALL_METHOD(&classAnnotations, handlerAnnotations, "getclassannotations", NULL, 0); + zephir_check_call_status(); + if (Z_TYPE_P(classAnnotations) == IS_OBJECT) { + ZEPHIR_CALL_METHOD(&annotations, classAnnotations, "getannotations", NULL, 0); zephir_check_call_status(); - if (Z_TYPE_P(methodAnnotations) == IS_ARRAY) { - ZEPHIR_INIT_NVAR(lowercased); - zephir_uncamelize(lowercased, handler); - zephir_is_iterable(methodAnnotations, &_11$$19, &_10$$19, 0, 0, "phalcon/mvc/router/annotations.zep", 203); + if (Z_TYPE_P(annotations) == IS_ARRAY) { + zephir_is_iterable(annotations, &_6$$16, &_5$$16, 0, 0, "phalcon/mvc/router/annotations.zep", 182); for ( - ; zephir_hash_get_current_data_ex(_11$$19, (void**) &_12$$19, &_10$$19) == SUCCESS - ; zephir_hash_move_forward_ex(_11$$19, &_10$$19) + ; zephir_hash_get_current_data_ex(_6$$16, (void**) &_7$$16, &_5$$16) == SUCCESS + ; zephir_hash_move_forward_ex(_6$$16, &_5$$16) ) { - ZEPHIR_GET_HMKEY(method, _11$$19, _10$$19); - ZEPHIR_GET_HVALUE(collection, _12$$19); - if (Z_TYPE_P(collection) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(&_13$$21, collection, "getannotations", NULL, 0); + ZEPHIR_GET_HVALUE(annotation, _7$$16); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "processcontrollerannotation", &_8, 0, controllerName, annotation); + zephir_check_call_status(); + } + } + } + ZEPHIR_CALL_METHOD(&methodAnnotations, handlerAnnotations, "getmethodsannotations", NULL, 0); + zephir_check_call_status(); + if (Z_TYPE_P(methodAnnotations) == IS_ARRAY) { + ZEPHIR_INIT_NVAR(lowercased); + zephir_uncamelize(lowercased, handler, NULL ); + zephir_is_iterable(methodAnnotations, &_10$$18, &_9$$18, 0, 0, "phalcon/mvc/router/annotations.zep", 198); + for ( + ; zephir_hash_get_current_data_ex(_10$$18, (void**) &_11$$18, &_9$$18) == SUCCESS + ; zephir_hash_move_forward_ex(_10$$18, &_9$$18) + ) { + ZEPHIR_GET_HMKEY(method, _10$$18, _9$$18); + ZEPHIR_GET_HVALUE(collection, _11$$18); + if (Z_TYPE_P(collection) == IS_OBJECT) { + ZEPHIR_CALL_METHOD(&_12$$20, collection, "getannotations", NULL, 0); + zephir_check_call_status(); + zephir_is_iterable(_12$$20, &_14$$20, &_13$$20, 0, 0, "phalcon/mvc/router/annotations.zep", 196); + for ( + ; zephir_hash_get_current_data_ex(_14$$20, (void**) &_15$$20, &_13$$20) == SUCCESS + ; zephir_hash_move_forward_ex(_14$$20, &_13$$20) + ) { + ZEPHIR_GET_HVALUE(annotation, _15$$20); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "processactionannotation", &_16, 0, moduleName, namespaceName, lowerControllerName, method, annotation); zephir_check_call_status(); - zephir_is_iterable(_13$$21, &_15$$21, &_14$$21, 0, 0, "phalcon/mvc/router/annotations.zep", 201); - for ( - ; zephir_hash_get_current_data_ex(_15$$21, (void**) &_16$$21, &_14$$21) == SUCCESS - ; zephir_hash_move_forward_ex(_15$$21, &_14$$21) - ) { - ZEPHIR_GET_HVALUE(annotation, _16$$21); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "processactionannotation", &_17, 0, moduleName, namespaceName, lowerControllerName, method, annotation); - zephir_check_call_status(); - } } } } @@ -114761,13 +115067,8 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) { } } } - if (1) { - zephir_update_property_this(this_ptr, SL("_processed"), ZEPHIR_GLOBAL(global_true) TSRMLS_CC); - } else { - zephir_update_property_this(this_ptr, SL("_processed"), ZEPHIR_GLOBAL(global_false) TSRMLS_CC); - } } - ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_router_annotations_ce, this_ptr, "handle", &_18, 360, realUri); + ZEPHIR_CALL_PARENT(NULL, phalcon_mvc_router_annotations_ce, this_ptr, "handle", &_17, 358, realUri); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -114977,7 +115278,7 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, processActionAnnotation) { zephir_check_temp_parameter(_3$$9); zephir_check_call_status(); if (Z_TYPE_P(converts) == IS_ARRAY) { - zephir_is_iterable(converts, &_6$$24, &_5$$24, 0, 0, "phalcon/mvc/router/annotations.zep", 354); + zephir_is_iterable(converts, &_6$$24, &_5$$24, 0, 0, "phalcon/mvc/router/annotations.zep", 346); for ( ; zephir_hash_get_current_data_ex(_6$$24, (void**) &_7$$24, &_5$$24) == SUCCESS ; zephir_hash_move_forward_ex(_6$$24, &_5$$24) @@ -114994,7 +115295,7 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, processActionAnnotation) { zephir_check_temp_parameter(_3$$9); zephir_check_call_status(); if (Z_TYPE_P(converts) == IS_ARRAY) { - zephir_is_iterable(converts, &_10$$26, &_9$$26, 0, 0, "phalcon/mvc/router/annotations.zep", 364); + zephir_is_iterable(converts, &_10$$26, &_9$$26, 0, 0, "phalcon/mvc/router/annotations.zep", 356); for ( ; zephir_hash_get_current_data_ex(_10$$26, (void**) &_11$$26, &_9$$26) == SUCCESS ; zephir_hash_move_forward_ex(_10$$26, &_9$$26) @@ -115610,7 +115911,7 @@ static PHP_METHOD(Phalcon_Mvc_Router_Group, _addRoute) { ZEPHIR_CALL_METHOD(NULL, route, "__construct", NULL, 78, _2, mergedPaths, httpMethods); zephir_check_call_status(); zephir_update_property_array_append(this_ptr, SL("_routes"), route TSRMLS_CC); - ZEPHIR_CALL_METHOD(NULL, route, "setgroup", NULL, 361, this_ptr); + ZEPHIR_CALL_METHOD(NULL, route, "setgroup", NULL, 359, this_ptr); zephir_check_call_status(); RETURN_CCTOR(route); @@ -116196,7 +116497,7 @@ static PHP_METHOD(Phalcon_Mvc_Router_Route, getRoutePaths) { ZEPHIR_CPY_WRT(realClassName, controllerName); } ZEPHIR_INIT_VAR(_1$$9); - zephir_uncamelize(_1$$9, realClassName); + zephir_uncamelize(_1$$9, realClassName, NULL ); zephir_array_update_string(&routePaths, SL("controller"), &_1$$9, PH_COPY | PH_SEPARATE); } if (Z_TYPE_P(actionName) != IS_NULL) { @@ -117133,7 +117434,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, _loadTemplateEngines) { if (Z_TYPE_P(registeredEngines) != IS_ARRAY) { ZEPHIR_INIT_VAR(_0$$4); object_init_ex(_0$$4, phalcon_mvc_view_engine_php_ce); - ZEPHIR_CALL_METHOD(NULL, _0$$4, "__construct", NULL, 363, this_ptr, dependencyInjector); + ZEPHIR_CALL_METHOD(NULL, _0$$4, "__construct", NULL, 361, this_ptr, dependencyInjector); zephir_check_call_status(); zephir_array_update_string(&engines, SL(".phtml"), &_0$$4, PH_COPY | PH_SEPARATE); } else { @@ -117390,7 +117691,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, render) { } else { ZEPHIR_CPY_WRT(mergedParams, viewParams); } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "_internalrender", NULL, 382, path, mergedParams); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "_internalrender", NULL, 379, path, mergedParams); zephir_check_call_status(); if (Z_TYPE_P(cache) == IS_OBJECT) { ZEPHIR_CALL_METHOD(&_2$$12, cache, "isstarted", NULL, 0); @@ -117457,7 +117758,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, partial) { } else { ZEPHIR_CPY_WRT(mergedParams, params); } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "_internalrender", NULL, 382, partialPath, mergedParams); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "_internalrender", NULL, 379, partialPath, mergedParams); zephir_check_call_status(); if (Z_TYPE_P(params) == IS_ARRAY) { zephir_update_property_this(this_ptr, SL("_viewParams"), viewParams TSRMLS_CC); @@ -117849,7 +118150,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Php, render) { if (mustClean == 1) { - ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 364); + ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 362); zephir_check_call_status(); } if (Z_TYPE_P(params) == IS_ARRAY) { @@ -117944,18 +118245,18 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, getCompiler) { ZEPHIR_INIT_NVAR(compiler); object_init_ex(compiler, phalcon_mvc_view_engine_volt_compiler_ce); _0$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_view"), PH_NOISY_CC); - ZEPHIR_CALL_METHOD(NULL, compiler, "__construct", NULL, 365, _0$$3); + ZEPHIR_CALL_METHOD(NULL, compiler, "__construct", NULL, 363, _0$$3); zephir_check_call_status(); _1$$3 = zephir_fetch_nproperty_this(this_ptr, SL("_dependencyInjector"), PH_NOISY_CC); ZEPHIR_CPY_WRT(dependencyInjector, _1$$3); if (Z_TYPE_P(dependencyInjector) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(NULL, compiler, "setdi", NULL, 366, dependencyInjector); + ZEPHIR_CALL_METHOD(NULL, compiler, "setdi", NULL, 364, dependencyInjector); zephir_check_call_status(); } ZEPHIR_OBS_VAR(options); zephir_read_property_this(&options, this_ptr, SL("_options"), PH_NOISY_CC); if (Z_TYPE_P(options) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(NULL, compiler, "setoptions", NULL, 367, options); + ZEPHIR_CALL_METHOD(NULL, compiler, "setoptions", NULL, 365, options); zephir_check_call_status(); } zephir_update_property_this(this_ptr, SL("_compiler"), compiler TSRMLS_CC); @@ -117994,7 +118295,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, render) { if (mustClean) { - ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 364); + ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 362); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(&compiler, this_ptr, "getcompiler", NULL, 0); @@ -118053,7 +118354,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, length) { ZVAL_LONG(length, zephir_fast_count_int(item TSRMLS_CC)); } else { if ((zephir_function_exists_ex(SS("mb_strlen") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 359, item); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 357, item); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(length); @@ -118079,7 +118380,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, isIncluded) { } if (Z_TYPE_P(haystack) == IS_STRING) { if ((zephir_function_exists_ex(SS("mb_strpos") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&_0$$5, "mb_strpos", NULL, 368, haystack, needle); + ZEPHIR_CALL_FUNCTION(&_0$$5, "mb_strpos", NULL, 366, haystack, needle); zephir_check_call_status(); RETURN_MM_BOOL(!ZEPHIR_IS_FALSE_IDENTICAL(_0$$5)); } @@ -118130,7 +118431,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, convertEncoding) { _0 = ZEPHIR_IS_STRING(to, "utf8"); } if (_0) { - ZEPHIR_RETURN_CALL_FUNCTION("utf8_encode", NULL, 369, text); + ZEPHIR_RETURN_CALL_FUNCTION("utf8_encode", NULL, 367, text); zephir_check_call_status(); RETURN_MM(); } @@ -118139,17 +118440,17 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, convertEncoding) { _1 = ZEPHIR_IS_STRING(from, "utf8"); } if (_1) { - ZEPHIR_RETURN_CALL_FUNCTION("utf8_decode", NULL, 370, text); + ZEPHIR_RETURN_CALL_FUNCTION("utf8_decode", NULL, 368, text); zephir_check_call_status(); RETURN_MM(); } if ((zephir_function_exists_ex(SS("mb_convert_encoding") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 182, text, from, to); + ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 177, text, from, to); zephir_check_call_status(); RETURN_MM(); } if ((zephir_function_exists_ex(SS("iconv") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("iconv", NULL, 371, from, to, text); + ZEPHIR_RETURN_CALL_FUNCTION("iconv", NULL, 369, from, to, text); zephir_check_call_status(); RETURN_MM(); } @@ -118220,7 +118521,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, slice) { if (Z_TYPE_P(value) == IS_ARRAY) { ZEPHIR_SINIT_VAR(_5$$9); ZVAL_LONG(&_5$$9, start); - ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 372, value, &_5$$9, length); + ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 370, value, &_5$$9, length); zephir_check_call_status(); RETURN_MM(); } @@ -118228,13 +118529,13 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, slice) { if (Z_TYPE_P(length) != IS_NULL) { ZEPHIR_SINIT_VAR(_6$$11); ZVAL_LONG(&_6$$11, start); - ZEPHIR_RETURN_CALL_FUNCTION("mb_substr", &_7, 373, value, &_6$$11, length); + ZEPHIR_RETURN_CALL_FUNCTION("mb_substr", &_7, 371, value, &_6$$11, length); zephir_check_call_status(); RETURN_MM(); } ZEPHIR_SINIT_VAR(_8$$10); ZVAL_LONG(&_8$$10, start); - ZEPHIR_RETURN_CALL_FUNCTION("mb_substr", &_7, 373, value, &_8$$10); + ZEPHIR_RETURN_CALL_FUNCTION("mb_substr", &_7, 371, value, &_8$$10); zephir_check_call_status(); RETURN_MM(); } @@ -118264,7 +118565,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, sort) { ZEPHIR_MAKE_REF(value); - ZEPHIR_CALL_FUNCTION(NULL, "asort", NULL, 374, value); + ZEPHIR_CALL_FUNCTION(NULL, "asort", NULL, 372, value); ZEPHIR_UNREF(value); zephir_check_call_status(); RETURN_CTOR(value); @@ -118307,7 +118608,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, callMacro) { ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_RETURN_CALL_FUNCTION("call_user_func", NULL, 375, macro, arguments); + ZEPHIR_CALL_USER_FUNC_ARRAY(return_value, macro, arguments); zephir_check_call_status(); RETURN_MM(); @@ -118767,7 +119068,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, attributeReader) { } } } else { - ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", &_7, 376, left); + ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", &_7, 373, left); zephir_check_call_status(); ZEPHIR_OBS_VAR(leftType); zephir_array_fetch_string(&leftType, left, SL("type"), PH_NOISY, "phalcon/mvc/view/engine/volt/compiler.zep", 339 TSRMLS_CC); @@ -118789,7 +119090,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, attributeReader) { zephir_array_fetch_string(&_10$$13, right, SL("value"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 352 TSRMLS_CC); zephir_concat_self(&exprCode, _10$$13 TSRMLS_CC); } else { - ZEPHIR_CALL_METHOD(&_11$$14, this_ptr, "expression", &_7, 376, right); + ZEPHIR_CALL_METHOD(&_11$$14, this_ptr, "expression", &_7, 373, right); zephir_check_call_status(); zephir_concat_self(&exprCode, _11$$14 TSRMLS_CC); } @@ -118817,7 +119118,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) { ZVAL_NULL(funcArguments); ZEPHIR_OBS_NVAR(funcArguments); if (zephir_array_isset_string_fetch(&funcArguments, expr, SS("arguments"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", &_0, 376, funcArguments); + ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", &_0, 373, funcArguments); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(arguments); @@ -118840,7 +119141,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) { zephir_array_fast_append(_1$$6, funcArguments); ZEPHIR_INIT_VAR(_2$$6); ZVAL_STRING(_2$$6, "compileFunction", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 377, _2$$6, _1$$6); + ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 374, _2$$6, _1$$6); zephir_check_temp_parameter(_2$$6); zephir_check_call_status(); if (Z_TYPE_P(code) == IS_STRING) { @@ -118902,7 +119203,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) { ZEPHIR_OBS_VAR(exprLevel); zephir_read_property_this(&exprLevel, this_ptr, SL("_exprLevel"), PH_NOISY_CC); if (Z_TYPE_P(block) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&code, this_ptr, "_statementlistorextends", NULL, 378, block); + ZEPHIR_CALL_METHOD(&code, this_ptr, "_statementlistorextends", NULL, 375, block); zephir_check_call_status(); if (ZEPHIR_IS_LONG(exprLevel, 1)) { ZEPHIR_CPY_WRT(escapedCode, code); @@ -118928,7 +119229,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) { RETURN_MM_STRING("''", 1); } ZEPHIR_INIT_VAR(_9$$5); - zephir_camelize(_9$$5, name); + zephir_camelize(_9$$5, name, NULL ); ZEPHIR_CALL_FUNCTION(&method, "lcfirst", NULL, 69, _9$$5); zephir_check_call_status(); ZEPHIR_INIT_VAR(className); @@ -118998,7 +119299,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) { ZEPHIR_CONCAT_SVSVS(return_value, "$this->callMacro('", name, "', array(", arguments, "))"); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&_10, this_ptr, "expression", &_0, 376, nameExpr); + ZEPHIR_CALL_METHOD(&_10, this_ptr, "expression", &_0, 373, nameExpr); zephir_check_call_status(); ZEPHIR_CONCAT_VSVS(return_value, _10, "(", arguments, ")"); RETURN_MM(); @@ -119057,28 +119358,28 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveTest) { if (zephir_array_isset_string_fetch(&name, testName, SS("value"), 0 TSRMLS_CC)) { if (ZEPHIR_IS_STRING(name, "divisibleby")) { zephir_array_fetch_string(&_1$$12, test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 641 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_0$$12, this_ptr, "expression", &_2, 376, _1$$12); + ZEPHIR_CALL_METHOD(&_0$$12, this_ptr, "expression", &_2, 373, _1$$12); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "(((", left, ") % (", _0$$12, ")) == 0)"); RETURN_MM(); } if (ZEPHIR_IS_STRING(name, "sameas")) { zephir_array_fetch_string(&_4$$13, test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 648 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_3$$13, this_ptr, "expression", &_2, 376, _4$$13); + ZEPHIR_CALL_METHOD(&_3$$13, this_ptr, "expression", &_2, 373, _4$$13); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "(", left, ") === (", _3$$13, ")"); RETURN_MM(); } if (ZEPHIR_IS_STRING(name, "type")) { zephir_array_fetch_string(&_6$$14, test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 655 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_5$$14, this_ptr, "expression", &_2, 376, _6$$14); + ZEPHIR_CALL_METHOD(&_5$$14, this_ptr, "expression", &_2, 373, _6$$14); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "gettype(", left, ") === (", _5$$14, ")"); RETURN_MM(); } } } - ZEPHIR_CALL_METHOD(&_7, this_ptr, "expression", &_2, 376, test); + ZEPHIR_CALL_METHOD(&_7, this_ptr, "expression", &_2, 373, test); zephir_check_call_status(); ZEPHIR_CONCAT_VSV(return_value, left, " == ", _7); RETURN_MM(); @@ -119149,11 +119450,11 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) { zephir_array_update_string(&_4$$7, SL("file"), &file, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_4$$7, SL("line"), &line, PH_COPY | PH_SEPARATE); ZEPHIR_MAKE_REF(funcArguments); - ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 379, funcArguments, _4$$7); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 376, funcArguments, _4$$7); ZEPHIR_UNREF(funcArguments); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 376, funcArguments); + ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 373, funcArguments); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(arguments, left); @@ -119168,7 +119469,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) { zephir_array_fast_append(_6$$9, funcArguments); ZEPHIR_INIT_VAR(_7$$9); ZVAL_STRING(_7$$9, "compileFilter", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 377, _7$$9, _6$$9); + ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 374, _7$$9, _6$$9); zephir_check_temp_parameter(_7$$9); zephir_check_call_status(); if (Z_TYPE_P(code) == IS_STRING) { @@ -119365,7 +119666,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { zephir_array_fast_append(_0$$4, expr); ZEPHIR_INIT_NVAR(_1$$4); ZVAL_STRING(_1$$4, "resolveExpression", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "fireextensionevent", &_2, 377, _1$$4, _0$$4); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "fireextensionevent", &_2, 374, _1$$4, _0$$4); zephir_check_temp_parameter(_1$$4); zephir_check_call_status(); if (Z_TYPE_P(exprCode) == IS_STRING) { @@ -119383,7 +119684,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { ) { ZEPHIR_GET_HVALUE(singleExpr, _5$$6); zephir_array_fetch_string(&_6$$7, singleExpr, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 993 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_7, 376, _6$$7); + ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_7, 373, _6$$7); zephir_check_call_status(); ZEPHIR_OBS_NVAR(name); if (zephir_array_isset_string_fetch(&name, singleExpr, SS("name"), 0 TSRMLS_CC)) { @@ -119405,7 +119706,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { } ZEPHIR_OBS_NVAR(left); if (zephir_array_isset_string_fetch(&left, expr, SS("left"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", &_7, 376, left); + ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", &_7, 373, left); zephir_check_call_status(); } if (ZEPHIR_IS_LONG(type, 311)) { @@ -119416,13 +119717,13 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { } if (ZEPHIR_IS_LONG(type, 124)) { zephir_array_fetch_string(&_12$$13, expr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1031 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "resolvefilter", &_13, 380, _12$$13, leftCode); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "resolvefilter", &_13, 377, _12$$13, leftCode); zephir_check_call_status(); break; } ZEPHIR_OBS_NVAR(right); if (zephir_array_isset_string_fetch(&right, expr, SS("right"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&rightCode, this_ptr, "expression", &_7, 376, right); + ZEPHIR_CALL_METHOD(&rightCode, this_ptr, "expression", &_7, 373, right); zephir_check_call_status(); } ZEPHIR_INIT_NVAR(exprCode); @@ -119598,7 +119899,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { if (ZEPHIR_IS_LONG(type, 365)) { ZEPHIR_OBS_NVAR(start); if (zephir_array_isset_string_fetch(&start, expr, SS("start"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&startCode, this_ptr, "expression", &_7, 376, start); + ZEPHIR_CALL_METHOD(&startCode, this_ptr, "expression", &_7, 373, start); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(startCode); @@ -119606,7 +119907,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { } ZEPHIR_OBS_NVAR(end); if (zephir_array_isset_string_fetch(&end, expr, SS("end"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&endCode, this_ptr, "expression", &_7, 376, end); + ZEPHIR_CALL_METHOD(&endCode, this_ptr, "expression", &_7, 373, end); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(endCode); @@ -119698,7 +119999,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { } if (ZEPHIR_IS_LONG(type, 366)) { zephir_array_fetch_string(&_21$$69, expr, SL("ternary"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1261 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_20$$69, this_ptr, "expression", &_7, 376, _21$$69); + ZEPHIR_CALL_METHOD(&_20$$69, this_ptr, "expression", &_7, 373, _21$$69); zephir_check_call_status(); ZEPHIR_INIT_NVAR(exprCode); ZEPHIR_CONCAT_SVSVSVS(exprCode, "(", _20$$69, " ? ", leftCode, " : ", rightCode, ")"); @@ -119771,7 +120072,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, _statementListOrExtends } } if (isStatementList == 1) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_statementlist", NULL, 381, statements); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_statementlist", NULL, 378, statements); zephir_check_call_status(); RETURN_MM(); } @@ -119818,7 +120119,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach) { ZEPHIR_CONCAT_VV(prefixLevel, prefix, level); ZEPHIR_OBS_VAR(expr); zephir_array_fetch_string(&expr, statement, SL("expr"), PH_NOISY, "phalcon/mvc/view/engine/volt/compiler.zep", 1363 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_0, 376, expr); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_0, 373, expr); zephir_check_call_status(); ZEPHIR_OBS_VAR(blockStatements); zephir_array_fetch_string(&blockStatements, statement, SL("block_statements"), PH_NOISY, "phalcon/mvc/view/engine/volt/compiler.zep", 1369 TSRMLS_CC); @@ -119854,7 +120155,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach) { } else { ZVAL_BOOL(_5, 0); } - ZEPHIR_CALL_METHOD(&code, this_ptr, "_statementlist", NULL, 381, blockStatements, _5); + ZEPHIR_CALL_METHOD(&code, this_ptr, "_statementlist", NULL, 378, blockStatements, _5); zephir_check_call_status(); ZEPHIR_OBS_VAR(loopContext); zephir_read_property_this(&loopContext, this_ptr, SL("_loopPointers"), PH_NOISY_CC); @@ -119902,7 +120203,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach) { } ZEPHIR_OBS_VAR(ifExpr); if (zephir_array_isset_string_fetch(&ifExpr, statement, SS("if_expr"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_16$$13, this_ptr, "expression", &_0, 376, ifExpr); + ZEPHIR_CALL_METHOD(&_16$$13, this_ptr, "expression", &_0, 373, ifExpr); zephir_check_call_status(); ZEPHIR_INIT_VAR(_17$$13); ZEPHIR_CONCAT_SVS(_17$$13, "if (", _16$$13, ") { ?>"); @@ -119999,7 +120300,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileIf) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupt statement", "phalcon/mvc/view/engine/volt/compiler.zep", 1515); return; } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 376, expr); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 373, expr); zephir_check_call_status(); zephir_array_fetch_string(&_2, statement, SL("true_statements"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1521 TSRMLS_CC); ZEPHIR_INIT_VAR(_3); @@ -120008,7 +120309,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileIf) { } else { ZVAL_BOOL(_3, 0); } - ZEPHIR_CALL_METHOD(&_1, this_ptr, "_statementlist", &_4, 381, _2, _3); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "_statementlist", &_4, 378, _2, _3); zephir_check_call_status(); ZEPHIR_INIT_VAR(compilation); ZEPHIR_CONCAT_SVSV(compilation, "", _1); @@ -120020,7 +120321,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileIf) { } else { ZVAL_BOOL(_6$$4, 0); } - ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "_statementlist", &_4, 381, blockStatements, _6$$4); + ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "_statementlist", &_4, 378, blockStatements, _6$$4); zephir_check_call_status(); ZEPHIR_INIT_VAR(_7$$4); ZEPHIR_CONCAT_SV(_7$$4, "", _5$$4); @@ -120048,7 +120349,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileElseIf) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupt statement", "phalcon/mvc/view/engine/volt/compiler.zep", 1550); return; } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 376, expr); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 373, expr); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, ""); RETURN_MM(); @@ -120079,9 +120380,9 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileCache) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupt statement", "phalcon/mvc/view/engine/volt/compiler.zep", 1570); return; } - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_0, 376, expr); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_0, 373, expr); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "expression", &_0, 376, expr); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "expression", &_0, 373, expr); zephir_check_call_status(); ZEPHIR_INIT_VAR(compilation); ZEPHIR_CONCAT_SVS(compilation, "di->get('viewCache'); "); @@ -120117,7 +120418,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileCache) { } else { ZVAL_BOOL(_12, 0); } - ZEPHIR_CALL_METHOD(&_10, this_ptr, "_statementlist", NULL, 381, _11, _12); + ZEPHIR_CALL_METHOD(&_10, this_ptr, "_statementlist", NULL, 378, _11, _12); zephir_check_call_status(); zephir_concat_self(&compilation, _10 TSRMLS_CC); ZEPHIR_OBS_NVAR(lifetime); @@ -120175,10 +120476,10 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSet) { ) { ZEPHIR_GET_HVALUE(assignment, _2); zephir_array_fetch_string(&_3$$4, assignment, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1633 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_4, 376, _3$$4); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_4, 373, _3$$4); zephir_check_call_status(); zephir_array_fetch_string(&_5$$4, assignment, SL("variable"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1638 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_4, 376, _5$$4); + ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_4, 373, _5$$4); zephir_check_call_status(); zephir_array_fetch_string(&_6$$4, assignment, SL("op"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1644 TSRMLS_CC); do { @@ -120235,7 +120536,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileDo) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/mvc/view/engine/volt/compiler.zep", 1684); return; } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 376, expr); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 373, expr); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, ""); RETURN_MM(); @@ -120259,7 +120560,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileReturn) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/mvc/view/engine/volt/compiler.zep", 1704); return; } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 376, expr); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 373, expr); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, ""); RETURN_MM(); @@ -120295,7 +120596,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileAutoEscape) { } else { ZVAL_BOOL(_1, 0); } - ZEPHIR_CALL_METHOD(&compilation, this_ptr, "_statementlist", NULL, 381, _0, _1); + ZEPHIR_CALL_METHOD(&compilation, this_ptr, "_statementlist", NULL, 378, _0, _1); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_autoescape"), oldAutoescape TSRMLS_CC); RETURN_CCTOR(compilation); @@ -120319,7 +120620,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileEcho) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupt statement", "phalcon/mvc/view/engine/volt/compiler.zep", 1754); return; } - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 376, expr); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 373, expr); zephir_check_call_status(); zephir_array_fetch_string(&_0, expr, SL("type"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1762 TSRMLS_CC); if (ZEPHIR_IS_LONG(_0, 350)) { @@ -120392,14 +120693,14 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileInclude) { RETURN_CCTOR(compilation); } } - ZEPHIR_CALL_METHOD(&path, this_ptr, "expression", &_4, 376, pathExpr); + ZEPHIR_CALL_METHOD(&path, this_ptr, "expression", &_4, 373, pathExpr); zephir_check_call_status(); ZEPHIR_OBS_VAR(params); if (!(zephir_array_isset_string_fetch(¶ms, statement, SS("params"), 0 TSRMLS_CC))) { ZEPHIR_CONCAT_SVS(return_value, "partial(", path, "); ?>"); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&_5, this_ptr, "expression", &_4, 376, params); + ZEPHIR_CALL_METHOD(&_5, this_ptr, "expression", &_4, 373, params); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "partial(", path, ", ", _5, "); ?>"); RETURN_MM(); @@ -120479,7 +120780,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro) { zephir_concat_self_str(&code, SL(" } else { ") TSRMLS_CC); ZEPHIR_OBS_NVAR(defaultValue); if (zephir_array_isset_string_fetch(&defaultValue, parameter, SS("default"), 0 TSRMLS_CC)) { - ZEPHIR_CALL_METHOD(&_12$$8, this_ptr, "expression", &_13, 376, defaultValue); + ZEPHIR_CALL_METHOD(&_12$$8, this_ptr, "expression", &_13, 373, defaultValue); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_14$$8); ZEPHIR_CONCAT_SVSVS(_14$$8, "$", variableName, " = ", _12$$8, ";"); @@ -120501,7 +120802,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro) { } else { ZVAL_BOOL(_17$$10, 0); } - ZEPHIR_CALL_METHOD(&_16$$10, this_ptr, "_statementlist", NULL, 381, blockStatements, _17$$10); + ZEPHIR_CALL_METHOD(&_16$$10, this_ptr, "_statementlist", NULL, 378, blockStatements, _17$$10); zephir_check_call_status(); ZEPHIR_INIT_VAR(_18$$10); ZEPHIR_CONCAT_VS(_18$$10, _16$$10, " 1) { ZEPHIR_OBS_VAR(numberOfBytes); - zephir_array_fetch_long(&numberOfBytes, response, 1, PH_NOISY, "phalcon/queue/beanstalk.zep", 335 TSRMLS_CC); + zephir_array_fetch_long(&numberOfBytes, response, 1, PH_NOISY, "phalcon/queue/beanstalk.zep", 332 TSRMLS_CC); ZEPHIR_CALL_METHOD(&response, this_ptr, "read", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&data, "yaml_parse", NULL, 387, response); + ZEPHIR_CALL_FUNCTION(&data, "yaml_parse", NULL, 384, response); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(numberOfBytes); @@ -131983,13 +132292,13 @@ static PHP_METHOD(Phalcon_Queue_Beanstalk, read) { } ZEPHIR_SINIT_VAR(_0$$5); ZVAL_LONG(&_0$$5, (length + 2)); - ZEPHIR_CALL_FUNCTION(&data, "stream_get_line", &_1, 388, connection, &_0$$5); + ZEPHIR_CALL_FUNCTION(&data, "stream_get_line", &_1, 385, connection, &_0$$5); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_2$$5, "stream_get_meta_data", NULL, 389, connection); + ZEPHIR_CALL_FUNCTION(&_2$$5, "stream_get_meta_data", NULL, 386, connection); zephir_check_call_status(); - zephir_array_fetch_string(&_3$$5, _2$$5, SL("timed_out"), PH_NOISY | PH_READONLY, "phalcon/queue/beanstalk.zep", 376 TSRMLS_CC); + zephir_array_fetch_string(&_3$$5, _2$$5, SL("timed_out"), PH_NOISY | PH_READONLY, "phalcon/queue/beanstalk.zep", 373 TSRMLS_CC); if (zephir_is_true(_3$$5)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_queue_beanstalk_exception_ce, "Connection timed out", "phalcon/queue/beanstalk.zep", 377); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_queue_beanstalk_exception_ce, "Connection timed out", "phalcon/queue/beanstalk.zep", 374); return; } ZEPHIR_SINIT_NVAR(_0$$5); @@ -132001,7 +132310,7 @@ static PHP_METHOD(Phalcon_Queue_Beanstalk, read) { ZVAL_LONG(&_4, 16384); ZEPHIR_SINIT_VAR(_5); ZVAL_STRING(&_5, "\r\n", 0); - ZEPHIR_RETURN_CALL_FUNCTION("stream_get_line", &_1, 388, connection, &_4, &_5); + ZEPHIR_RETURN_CALL_FUNCTION("stream_get_line", &_1, 385, connection, &_4, &_5); zephir_check_call_status(); RETURN_MM(); @@ -132033,7 +132342,7 @@ static PHP_METHOD(Phalcon_Queue_Beanstalk, write) { ZEPHIR_CPY_WRT(packet, _0); ZEPHIR_SINIT_VAR(_1); ZVAL_LONG(&_1, zephir_fast_strlen_ev(packet)); - ZEPHIR_RETURN_CALL_FUNCTION("fwrite", NULL, 390, connection, packet, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("fwrite", NULL, 387, connection, packet, &_1); zephir_check_call_status(); RETURN_MM(); @@ -132396,7 +132705,7 @@ static PHP_METHOD(Phalcon_Security_Random, bytes) { if ((zephir_function_exists_ex(SS("openssl_random_pseudo_bytes") TSRMLS_CC) == SUCCESS)) { ZEPHIR_INIT_VAR(_1$$5); ZVAL_LONG(_1$$5, len); - ZEPHIR_RETURN_CALL_FUNCTION("openssl_random_pseudo_bytes", NULL, 399, _1$$5); + ZEPHIR_RETURN_CALL_FUNCTION("openssl_random_pseudo_bytes", NULL, 396, _1$$5); zephir_check_call_status(); RETURN_MM(); } @@ -132407,16 +132716,16 @@ static PHP_METHOD(Phalcon_Security_Random, bytes) { ZVAL_STRING(&_3$$6, "/dev/urandom", 0); ZEPHIR_SINIT_VAR(_4$$6); ZVAL_STRING(&_4$$6, "rb", 0); - ZEPHIR_CALL_FUNCTION(&handle, "fopen", NULL, 286, &_3$$6, &_4$$6); + ZEPHIR_CALL_FUNCTION(&handle, "fopen", NULL, 281, &_3$$6, &_4$$6); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(handle)) { ZEPHIR_SINIT_VAR(_5$$7); ZVAL_LONG(&_5$$7, 0); - ZEPHIR_CALL_FUNCTION(NULL, "stream_set_read_buffer", NULL, 402, handle, &_5$$7); + ZEPHIR_CALL_FUNCTION(NULL, "stream_set_read_buffer", NULL, 399, handle, &_5$$7); zephir_check_call_status(); ZEPHIR_SINIT_NVAR(_5$$7); ZVAL_LONG(&_5$$7, len); - ZEPHIR_CALL_FUNCTION(&ret, "fread", NULL, 403, handle, &_5$$7); + ZEPHIR_CALL_FUNCTION(&ret, "fread", NULL, 400, handle, &_5$$7); zephir_check_call_status(); zephir_fclose(handle TSRMLS_CC); if (zephir_fast_strlen_ev(ret) != len) { @@ -132452,7 +132761,7 @@ static PHP_METHOD(Phalcon_Security_Random, hex) { zephir_check_call_status(); ZEPHIR_SINIT_VAR(_2); ZVAL_STRING(&_2, "H*", 0); - ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 404, &_2, _0); + ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 401, &_2, _0); zephir_check_call_status(); ZEPHIR_MAKE_REF(_3); ZEPHIR_RETURN_CALL_FUNCTION("array_shift", NULL, 123, _3); @@ -132489,7 +132798,7 @@ static PHP_METHOD(Phalcon_Security_Random, base58) { zephir_check_call_status(); ZEPHIR_SINIT_VAR(_1); ZVAL_STRING(&_1, "C*", 0); - ZEPHIR_CALL_FUNCTION(&bytes, "unpack", NULL, 404, &_1, _0); + ZEPHIR_CALL_FUNCTION(&bytes, "unpack", NULL, 401, &_1, _0); zephir_check_call_status(); zephir_is_iterable(bytes, &_3, &_2, 0, 0, "phalcon/security/random.zep", 199); for ( @@ -132594,9 +132903,9 @@ static PHP_METHOD(Phalcon_Security_Random, uuid) { zephir_check_call_status(); ZEPHIR_SINIT_VAR(_2); ZVAL_STRING(&_2, "N1a/n1b/n1c/n1d/n1e/N1f", 0); - ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 404, &_2, _0); + ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 401, &_2, _0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&ary, "array_values", NULL, 216, _3); + ZEPHIR_CALL_FUNCTION(&ary, "array_values", NULL, 211, _3); zephir_check_call_status(); zephir_array_fetch_long(&_4, ary, 2, PH_NOISY | PH_READONLY, "phalcon/security/random.zep", 279 TSRMLS_CC); ZEPHIR_INIT_NVAR(_1); @@ -132609,7 +132918,7 @@ static PHP_METHOD(Phalcon_Security_Random, uuid) { ZEPHIR_INIT_VAR(_7); ZVAL_STRING(_7, "%08x-%04x-%04x-%04x-%04x%08x", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_MAKE_REF(ary); - ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 379, ary, _7); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 376, ary, _7); zephir_check_temp_parameter(_7); ZEPHIR_UNREF(ary); zephir_check_call_status(); @@ -132650,7 +132959,7 @@ static PHP_METHOD(Phalcon_Security_Random, number) { } ZEPHIR_SINIT_VAR(_1); ZVAL_LONG(&_1, len); - ZEPHIR_CALL_FUNCTION(&hex, "dechex", NULL, 405, &_1); + ZEPHIR_CALL_FUNCTION(&hex, "dechex", NULL, 402, &_1); zephir_check_call_status(); if (((zephir_fast_strlen_ev(hex) & 1)) == 1) { ZEPHIR_INIT_VAR(_2$$5); @@ -132659,7 +132968,7 @@ static PHP_METHOD(Phalcon_Security_Random, number) { } ZEPHIR_SINIT_NVAR(_1); ZVAL_STRING(&_1, "H*", 0); - ZEPHIR_CALL_FUNCTION(&_3, "pack", NULL, 406, &_1, hex); + ZEPHIR_CALL_FUNCTION(&_3, "pack", NULL, 403, &_1, hex); zephir_check_call_status(); zephir_concat_self(&bin, _3 TSRMLS_CC); _4 = ZEPHIR_STRING_OFFSET(bin, 0); @@ -132697,19 +133006,19 @@ static PHP_METHOD(Phalcon_Security_Random, number) { ZVAL_LONG(&_16$$6, 0); ZEPHIR_SINIT_NVAR(_17$$6); ZVAL_LONG(&_17$$6, 1); - ZEPHIR_CALL_FUNCTION(&_18$$6, "substr_replace", &_19, 407, rnd, _13$$6, &_16$$6, &_17$$6); + ZEPHIR_CALL_FUNCTION(&_18$$6, "substr_replace", &_19, 404, rnd, _13$$6, &_16$$6, &_17$$6); zephir_check_call_status(); ZEPHIR_CPY_WRT(rnd, _18$$6); } while (ZEPHIR_LT(bin, rnd)); ZEPHIR_SINIT_NVAR(_1); ZVAL_STRING(&_1, "H*", 0); - ZEPHIR_CALL_FUNCTION(&ret, "unpack", NULL, 404, &_1, rnd); + ZEPHIR_CALL_FUNCTION(&ret, "unpack", NULL, 401, &_1, rnd); zephir_check_call_status(); ZEPHIR_MAKE_REF(ret); ZEPHIR_CALL_FUNCTION(&_20, "array_shift", NULL, 123, ret); ZEPHIR_UNREF(ret); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("hexdec", NULL, 408, _20); + ZEPHIR_RETURN_CALL_FUNCTION("hexdec", NULL, 405, _20); zephir_check_call_status(); RETURN_MM(); @@ -133687,7 +133996,7 @@ static PHP_METHOD(Phalcon_Session_Bag, getIterator) { } object_init_ex(return_value, zephir_get_internal_ce(SS("arrayiterator") TSRMLS_CC)); _1 = zephir_fetch_nproperty_this(this_ptr, SL("_data"), PH_NOISY_CC); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 412, _1); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 409, _1); zephir_check_call_status(); RETURN_MM(); @@ -133955,7 +134264,7 @@ static PHP_METHOD(Phalcon_Session_Adapter_Libmemcached, __construct) { } ZEPHIR_INIT_VAR(_0); ZVAL_LONG(_0, 2592000); - ZEPHIR_CALL_FUNCTION(&_1, "min", NULL, 409, lifetime, _0); + ZEPHIR_CALL_FUNCTION(&_1, "min", NULL, 406, lifetime, _0); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_lifetime"), _1 TSRMLS_CC); ZEPHIR_OBS_VAR(prefix); @@ -133977,7 +134286,7 @@ static PHP_METHOD(Phalcon_Session_Adapter_Libmemcached, __construct) { ZEPHIR_OBS_VAR(_4); zephir_read_property_this(&_4, this_ptr, SL("_lifetime"), PH_NOISY_CC); zephir_array_update_string(&_3, SL("lifetime"), &_4, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, _2, "__construct", NULL, 313, _3); + ZEPHIR_CALL_METHOD(NULL, _2, "__construct", NULL, 311, _3); zephir_check_call_status(); ZEPHIR_INIT_VAR(_5); zephir_create_array(_5, 4, 0 TSRMLS_CC); @@ -133985,7 +134294,7 @@ static PHP_METHOD(Phalcon_Session_Adapter_Libmemcached, __construct) { zephir_array_update_string(&_5, SL("client"), &client, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_5, SL("prefix"), &prefix, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_5, SL("statsKey"), &statsKey, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, _0, "__construct", NULL, 314, _2, _5); + ZEPHIR_CALL_METHOD(NULL, _0, "__construct", NULL, 312, _2, _5); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_libmemcached"), _0 TSRMLS_CC); ZEPHIR_INIT_VAR(_6); @@ -134024,9 +134333,9 @@ static PHP_METHOD(Phalcon_Session_Adapter_Libmemcached, __construct) { ZEPHIR_INIT_NVAR(_7); ZVAL_STRING(_7, "gc", 1); zephir_array_fast_append(_12, _7); - ZEPHIR_CALL_FUNCTION(NULL, "session_set_save_handler", NULL, 410, _6, _8, _9, _10, _11, _12); + ZEPHIR_CALL_FUNCTION(NULL, "session_set_save_handler", NULL, 407, _6, _8, _9, _10, _11, _12); zephir_check_call_status(); - ZEPHIR_CALL_PARENT(NULL, phalcon_session_adapter_libmemcached_ce, this_ptr, "__construct", &_13, 411, options); + ZEPHIR_CALL_PARENT(NULL, phalcon_session_adapter_libmemcached_ce, this_ptr, "__construct", &_13, 408, options); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -134216,9 +134525,9 @@ static PHP_METHOD(Phalcon_Session_Adapter_Memcache, __construct) { ZEPHIR_OBS_VAR(_6); zephir_read_property_this(&_6, this_ptr, SL("_lifetime"), PH_NOISY_CC); zephir_array_update_string(&_5, SL("lifetime"), &_6, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, _4, "__construct", NULL, 313, _5); + ZEPHIR_CALL_METHOD(NULL, _4, "__construct", NULL, 311, _5); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, _3, "__construct", NULL, 316, _4, options); + ZEPHIR_CALL_METHOD(NULL, _3, "__construct", NULL, 314, _4, options); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_memcache"), _3 TSRMLS_CC); ZEPHIR_INIT_VAR(_7); @@ -134257,9 +134566,9 @@ static PHP_METHOD(Phalcon_Session_Adapter_Memcache, __construct) { ZEPHIR_INIT_NVAR(_8); ZVAL_STRING(_8, "gc", 1); zephir_array_fast_append(_13, _8); - ZEPHIR_CALL_FUNCTION(NULL, "session_set_save_handler", NULL, 410, _7, _9, _10, _11, _12, _13); + ZEPHIR_CALL_FUNCTION(NULL, "session_set_save_handler", NULL, 407, _7, _9, _10, _11, _12, _13); zephir_check_call_status(); - ZEPHIR_CALL_PARENT(NULL, phalcon_session_adapter_memcache_ce, this_ptr, "__construct", &_14, 411, options); + ZEPHIR_CALL_PARENT(NULL, phalcon_session_adapter_memcache_ce, this_ptr, "__construct", &_14, 408, options); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -134451,7 +134760,7 @@ static PHP_METHOD(Phalcon_Session_Adapter_Redis, __construct) { ZEPHIR_CALL_METHOD(NULL, _3, "__construct", NULL, 0, _4); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, _2, "__construct", NULL, 317, _3, options); + ZEPHIR_CALL_METHOD(NULL, _2, "__construct", NULL, 315, _3, options); zephir_check_call_status(); zephir_update_property_this(this_ptr, SL("_redis"), _2 TSRMLS_CC); ZEPHIR_INIT_VAR(_6); @@ -134490,9 +134799,9 @@ static PHP_METHOD(Phalcon_Session_Adapter_Redis, __construct) { ZEPHIR_INIT_NVAR(_7); ZVAL_STRING(_7, "gc", 1); zephir_array_fast_append(_12, _7); - ZEPHIR_CALL_FUNCTION(NULL, "session_set_save_handler", NULL, 410, _6, _8, _9, _10, _11, _12); + ZEPHIR_CALL_FUNCTION(NULL, "session_set_save_handler", NULL, 407, _6, _8, _9, _10, _11, _12); zephir_check_call_status(); - ZEPHIR_CALL_PARENT(NULL, phalcon_session_adapter_redis_ce, this_ptr, "__construct", &_13, 411, options); + ZEPHIR_CALL_PARENT(NULL, phalcon_session_adapter_redis_ce, this_ptr, "__construct", &_13, 408, options); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -134743,7 +135052,7 @@ static PHP_METHOD(Phalcon_Tag_Select, selectField) { ZEPHIR_GET_CONSTANT(_10$$24, "PHP_EOL"); ZEPHIR_INIT_VAR(_11$$24); ZEPHIR_CONCAT_SV(_11$$24, "", _10$$24); - ZEPHIR_CALL_SELF(&_8$$24, "_optionsfromresultset", &_9, 416, options, using, value, _11$$24); + ZEPHIR_CALL_SELF(&_8$$24, "_optionsfromresultset", &_9, 413, options, using, value, _11$$24); zephir_check_call_status(); zephir_concat_self(&code, _8$$24 TSRMLS_CC); } else { @@ -134752,7 +135061,7 @@ static PHP_METHOD(Phalcon_Tag_Select, selectField) { ZEPHIR_GET_CONSTANT(_14$$26, "PHP_EOL"); ZEPHIR_INIT_VAR(_15$$26); ZEPHIR_CONCAT_SV(_15$$26, "", _14$$26); - ZEPHIR_CALL_SELF(&_12$$26, "_optionsfromarray", &_13, 417, options, value, _15$$26); + ZEPHIR_CALL_SELF(&_12$$26, "_optionsfromarray", &_13, 414, options, value, _15$$26); zephir_check_call_status(); zephir_concat_self(&code, _12$$26 TSRMLS_CC); } else { @@ -134890,12 +135199,12 @@ static PHP_METHOD(Phalcon_Tag_Select, _optionsFromArray) { ) { ZEPHIR_GET_HMKEY(optionValue, _1, _0); ZEPHIR_GET_HVALUE(optionText, _2); - ZEPHIR_CALL_FUNCTION(&escaped, "htmlspecialchars", &_3, 183, optionValue); + ZEPHIR_CALL_FUNCTION(&escaped, "htmlspecialchars", &_3, 178, optionValue); zephir_check_call_status(); if (Z_TYPE_P(optionText) == IS_ARRAY) { ZEPHIR_INIT_NVAR(_4$$4); ZEPHIR_GET_CONSTANT(_4$$4, "PHP_EOL"); - ZEPHIR_CALL_SELF(&_5$$4, "_optionsfromarray", &_6, 417, optionText, value, closeOption); + ZEPHIR_CALL_SELF(&_5$$4, "_optionsfromarray", &_6, 414, optionText, value, closeOption); zephir_check_call_status(); ZEPHIR_INIT_NVAR(_7$$4); ZEPHIR_GET_CONSTANT(_7$$4, "PHP_EOL"); @@ -135282,7 +135591,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Csv, __construct) { options = options_param; - ZEPHIR_CALL_PARENT(NULL, phalcon_translate_adapter_csv_ce, this_ptr, "__construct", &_0, 426, options); + ZEPHIR_CALL_PARENT(NULL, phalcon_translate_adapter_csv_ce, this_ptr, "__construct", &_0, 423, options); zephir_check_call_status(); if (!(zephir_array_isset_string(options, SS("content")))) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_translate_exception_ce, "Parameter 'content' is required", "phalcon/translate/adapter/csv.zep", 43); @@ -135295,7 +135604,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Csv, __construct) { ZVAL_STRING(_3, ";", ZEPHIR_TEMP_PARAM_COPY); ZEPHIR_INIT_VAR(_4); ZVAL_STRING(_4, "\"", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "_load", NULL, 427, _1, _2, _3, _4); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "_load", NULL, 424, _1, _2, _3, _4); zephir_check_temp_parameter(_3); zephir_check_temp_parameter(_4); zephir_check_call_status(); @@ -135317,7 +135626,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Csv, _load) { ZEPHIR_SINIT_VAR(_0); ZVAL_STRING(&_0, "rb", 0); - ZEPHIR_CALL_FUNCTION(&fileHandler, "fopen", NULL, 286, file, &_0); + ZEPHIR_CALL_FUNCTION(&fileHandler, "fopen", NULL, 281, file, &_0); zephir_check_call_status(); if (Z_TYPE_P(fileHandler) != IS_RESOURCE) { ZEPHIR_INIT_VAR(_1$$3); @@ -135331,7 +135640,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Csv, _load) { return; } while (1) { - ZEPHIR_CALL_FUNCTION(&data, "fgetcsv", &_3, 428, fileHandler, length, delimiter, enclosure); + ZEPHIR_CALL_FUNCTION(&data, "fgetcsv", &_3, 425, fileHandler, length, delimiter, enclosure); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(data)) { break; @@ -135420,7 +135729,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Csv, exists) { } -static zend_object_value zephir_init_properties_Phalcon_Translate_Adapter_Csv(zend_class_entry *class_type TSRMLS_DC) { +zend_object_value zephir_init_properties_Phalcon_Translate_Adapter_Csv(zend_class_entry *class_type TSRMLS_DC) { zval *_0, *_1$$3; @@ -135522,9 +135831,9 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, __construct) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_translate_exception_ce, "This class requires the gettext extension for PHP", "phalcon/translate/adapter/gettext.zep", 60); return; } - ZEPHIR_CALL_PARENT(NULL, phalcon_translate_adapter_gettext_ce, this_ptr, "__construct", &_0, 426, options); + ZEPHIR_CALL_PARENT(NULL, phalcon_translate_adapter_gettext_ce, this_ptr, "__construct", &_0, 423, options); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "prepareoptions", NULL, 429, options); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "prepareoptions", NULL, 0, options); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -135556,19 +135865,19 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, query) { ZEPHIR_INIT_VAR(domain); ZVAL_NULL(domain); - ZEPHIR_CALL_FUNCTION(&_0, "func_num_args", NULL, 421); + ZEPHIR_CALL_FUNCTION(&_0, "func_num_args", NULL, 418); zephir_check_call_status(); if (ZEPHIR_GT_LONG(_0, 2)) { ZEPHIR_SINIT_VAR(_1$$3); ZVAL_LONG(&_1$$3, 2); - ZEPHIR_CALL_FUNCTION(&domain, "func_get_arg", NULL, 420, &_1$$3); + ZEPHIR_CALL_FUNCTION(&domain, "func_get_arg", NULL, 417, &_1$$3); zephir_check_call_status(); } if (!(zephir_is_true(domain))) { - ZEPHIR_CALL_FUNCTION(&translation, "gettext", NULL, 430, index); + ZEPHIR_CALL_FUNCTION(&translation, "gettext", NULL, 426, index); zephir_check_call_status(); } else { - ZEPHIR_CALL_FUNCTION(&translation, "dgettext", NULL, 431, domain, index); + ZEPHIR_CALL_FUNCTION(&translation, "dgettext", NULL, 427, domain, index); zephir_check_call_status(); } ZEPHIR_RETURN_CALL_METHOD(this_ptr, "replaceplaceholders", NULL, 0, translation, placeholders); @@ -135661,12 +135970,12 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, nquery) { if (!(!(!domain) && Z_STRLEN_P(domain))) { ZEPHIR_SINIT_VAR(_0$$3); ZVAL_LONG(&_0$$3, count); - ZEPHIR_CALL_FUNCTION(&translation, "ngettext", NULL, 432, msgid1, msgid2, &_0$$3); + ZEPHIR_CALL_FUNCTION(&translation, "ngettext", NULL, 428, msgid1, msgid2, &_0$$3); zephir_check_call_status(); } else { ZEPHIR_SINIT_VAR(_1$$4); ZVAL_LONG(&_1$$4, count); - ZEPHIR_CALL_FUNCTION(&translation, "dngettext", NULL, 433, domain, msgid1, msgid2, &_1$$4); + ZEPHIR_CALL_FUNCTION(&translation, "dngettext", NULL, 429, domain, msgid1, msgid2, &_1$$4); zephir_check_call_status(); } ZEPHIR_RETURN_CALL_METHOD(this_ptr, "replaceplaceholders", NULL, 0, translation, placeholders); @@ -135685,7 +135994,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, setDomain) { - ZEPHIR_RETURN_CALL_FUNCTION("textdomain", NULL, 434, domain); + ZEPHIR_RETURN_CALL_FUNCTION("textdomain", NULL, 430, domain); zephir_check_call_status(); RETURN_MM(); @@ -135700,7 +136009,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, resetDomain) { ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdefaultdomain", NULL, 0); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("textdomain", NULL, 434, _0); + ZEPHIR_RETURN_CALL_FUNCTION("textdomain", NULL, 430, _0); zephir_check_call_status(); RETURN_MM(); @@ -135756,13 +136065,13 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, setDirectory) { ) { ZEPHIR_GET_HMKEY(key, _1$$4, _0$$4); ZEPHIR_GET_HVALUE(value, _2$$4); - ZEPHIR_CALL_FUNCTION(NULL, "bindtextdomain", &_3, 435, key, value); + ZEPHIR_CALL_FUNCTION(NULL, "bindtextdomain", &_3, 431, key, value); zephir_check_call_status(); } } else { ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "getdefaultdomain", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "bindtextdomain", &_3, 435, _4$$6, directory); + ZEPHIR_CALL_FUNCTION(NULL, "bindtextdomain", &_3, 431, _4$$6, directory); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -135797,7 +136106,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, setLocale) { ZEPHIR_INIT_VAR(_0); - ZEPHIR_CALL_FUNCTION(&_1, "func_get_args", NULL, 168); + ZEPHIR_CALL_FUNCTION(&_1, "func_get_args", NULL, 163); zephir_check_call_status(); ZEPHIR_SINIT_VAR(_2); ZVAL_STRING(&_2, "setlocale", 0); @@ -135810,22 +136119,22 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, setLocale) { _3 = zephir_fetch_nproperty_this(this_ptr, SL("_locale"), PH_NOISY_CC); ZEPHIR_INIT_VAR(_4); ZEPHIR_CONCAT_SV(_4, "LC_ALL=", _3); - ZEPHIR_CALL_FUNCTION(NULL, "putenv", &_5, 436, _4); + ZEPHIR_CALL_FUNCTION(NULL, "putenv", &_5, 432, _4); zephir_check_call_status(); _6 = zephir_fetch_nproperty_this(this_ptr, SL("_locale"), PH_NOISY_CC); ZEPHIR_INIT_VAR(_7); ZEPHIR_CONCAT_SV(_7, "LANG=", _6); - ZEPHIR_CALL_FUNCTION(NULL, "putenv", &_5, 436, _7); + ZEPHIR_CALL_FUNCTION(NULL, "putenv", &_5, 432, _7); zephir_check_call_status(); _8 = zephir_fetch_nproperty_this(this_ptr, SL("_locale"), PH_NOISY_CC); ZEPHIR_INIT_VAR(_9); ZEPHIR_CONCAT_SV(_9, "LANGUAGE=", _8); - ZEPHIR_CALL_FUNCTION(NULL, "putenv", &_5, 436, _9); + ZEPHIR_CALL_FUNCTION(NULL, "putenv", &_5, 432, _9); zephir_check_call_status(); _10 = zephir_fetch_nproperty_this(this_ptr, SL("_locale"), PH_NOISY_CC); ZEPHIR_SINIT_VAR(_11); ZVAL_LONG(&_11, 0); - ZEPHIR_CALL_FUNCTION(NULL, "setlocale", NULL, 415, &_11, _10); + ZEPHIR_CALL_FUNCTION(NULL, "setlocale", NULL, 412, &_11, _10); zephir_check_call_status(); RETURN_MM_MEMBER(this_ptr, "_locale"); @@ -135852,7 +136161,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Gettext, prepareOptions) { return; } ZEPHIR_INIT_VAR(_0); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "getoptionsdefault", NULL, 437); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "getoptionsdefault", NULL, 433); zephir_check_call_status(); zephir_fast_array_merge(_0, &(_1), &(options) TSRMLS_CC); ZEPHIR_CPY_WRT(options, _0); @@ -135923,7 +136232,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_NativeArray, __construct) { options = options_param; - ZEPHIR_CALL_PARENT(NULL, phalcon_translate_adapter_nativearray_ce, this_ptr, "__construct", &_0, 426, options); + ZEPHIR_CALL_PARENT(NULL, phalcon_translate_adapter_nativearray_ce, this_ptr, "__construct", &_0, 423, options); zephir_check_call_status(); ZEPHIR_OBS_VAR(data); if (!(zephir_array_isset_string_fetch(&data, options, SS("content"), 0 TSRMLS_CC))) { @@ -136125,7 +136434,7 @@ static PHP_METHOD(Phalcon_Translate_Interpolator_IndexedArray, replacePlaceholde } if (_0) { ZEPHIR_MAKE_REF(placeholders); - ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 379, placeholders, translation); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 376, placeholders, translation); ZEPHIR_UNREF(placeholders); zephir_check_call_status(); ZEPHIR_SINIT_VAR(_1$$3); @@ -136387,7 +136696,7 @@ static PHP_METHOD(Phalcon_Validation_Message, __set_state) { zephir_array_fetch_string(&_0, message, SL("_message"), PH_NOISY | PH_READONLY, "phalcon/validation/message.zep", 134 TSRMLS_CC); zephir_array_fetch_string(&_1, message, SL("_field"), PH_NOISY | PH_READONLY, "phalcon/validation/message.zep", 134 TSRMLS_CC); zephir_array_fetch_string(&_2, message, SL("_type"), PH_NOISY | PH_READONLY, "phalcon/validation/message.zep", 134 TSRMLS_CC); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 438, _0, _1, _2); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 434, _0, _1, _2); zephir_check_call_status(); RETURN_MM(); @@ -136781,7 +137090,7 @@ static PHP_METHOD(Phalcon_Validation_Message_Group, appendMessages) { ZEPHIR_OBS_VAR(currentMessages); zephir_read_property_this(¤tMessages, this_ptr, SL("_messages"), PH_NOISY_CC); if (Z_TYPE_P(messages) == IS_ARRAY) { - if (ZEPHIR_IS_STRING(currentMessages, "array")) { + if (Z_TYPE_P(currentMessages) == IS_ARRAY) { ZEPHIR_INIT_VAR(finalMessages); zephir_fast_array_merge(finalMessages, &(currentMessages), &(messages) TSRMLS_CC); } else { @@ -136991,7 +137300,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Alnum, validate) { if (_2) { RETURN_MM_BOOL(1); } - ZEPHIR_CALL_FUNCTION(&_3, "ctype_alnum", NULL, 439, value); + ZEPHIR_CALL_FUNCTION(&_3, "ctype_alnum", NULL, 435, value); zephir_check_call_status(); if (!(zephir_is_true(_3))) { ZEPHIR_INIT_VAR(_4$$4); @@ -137024,7 +137333,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Alnum, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_7$$4); ZVAL_STRING(_7$$4, "Alnum", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _4$$4, "__construct", NULL, 438, _6$$4, field, _7$$4); + ZEPHIR_CALL_METHOD(NULL, _4$$4, "__construct", NULL, 434, _6$$4, field, _7$$4); zephir_check_temp_parameter(_7$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _4$$4); @@ -137093,7 +137402,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Alpha, validate) { if (_2) { RETURN_MM_BOOL(1); } - ZEPHIR_CALL_FUNCTION(&_3, "ctype_alpha", NULL, 440, value); + ZEPHIR_CALL_FUNCTION(&_3, "ctype_alpha", NULL, 436, value); zephir_check_call_status(); if (!(zephir_is_true(_3))) { ZEPHIR_INIT_VAR(_4$$4); @@ -137126,7 +137435,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Alpha, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_7$$4); ZVAL_STRING(_7$$4, "Alpha", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _4$$4, "__construct", NULL, 438, _6$$4, field, _7$$4); + ZEPHIR_CALL_METHOD(NULL, _4$$4, "__construct", NULL, 434, _6$$4, field, _7$$4); zephir_check_temp_parameter(_7$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _4$$4); @@ -137242,7 +137551,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Between, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_7$$4); ZVAL_STRING(_7$$4, "Between", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _4$$4, "__construct", NULL, 438, _6$$4, field, _7$$4); + ZEPHIR_CALL_METHOD(NULL, _4$$4, "__construct", NULL, 434, _6$$4, field, _7$$4); zephir_check_temp_parameter(_7$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _4$$4); @@ -137305,7 +137614,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Confirmation, validate) { zephir_check_call_status(); ZEPHIR_CALL_METHOD(&valueWith, validation, "getvalue", NULL, 0, fieldWith); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "compare", NULL, 441, value, valueWith); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "compare", NULL, 437, value, valueWith); zephir_check_call_status(); if (!(zephir_is_true(_1))) { ZEPHIR_INIT_VAR(_2$$3); @@ -137348,7 +137657,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Confirmation, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_5$$3); ZVAL_STRING(_5$$3, "Confirmation", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _2$$3, "__construct", NULL, 438, _4$$3, field, _5$$3); + ZEPHIR_CALL_METHOD(NULL, _2$$3, "__construct", NULL, 434, _4$$3, field, _5$$3); zephir_check_temp_parameter(_5$$3); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _2$$3); @@ -137387,12 +137696,12 @@ static PHP_METHOD(Phalcon_Validation_Validator_Confirmation, compare) { } ZEPHIR_SINIT_VAR(_3$$3); ZVAL_STRING(&_3$$3, "utf-8", 0); - ZEPHIR_CALL_FUNCTION(&_4$$3, "mb_strtolower", &_5, 196, a, &_3$$3); + ZEPHIR_CALL_FUNCTION(&_4$$3, "mb_strtolower", &_5, 191, a, &_3$$3); zephir_check_call_status(); zephir_get_strval(a, _4$$3); ZEPHIR_SINIT_NVAR(_3$$3); ZVAL_STRING(&_3$$3, "utf-8", 0); - ZEPHIR_CALL_FUNCTION(&_6$$3, "mb_strtolower", &_5, 196, b, &_3$$3); + ZEPHIR_CALL_FUNCTION(&_6$$3, "mb_strtolower", &_5, 191, b, &_3$$3); zephir_check_call_status(); zephir_get_strval(b, _6$$3); } @@ -137445,7 +137754,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_CreditCard, validate) { ZEPHIR_CALL_METHOD(&value, validation, "getvalue", NULL, 0, field); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&valid, this_ptr, "verifybyluhnalgorithm", NULL, 442, value); + ZEPHIR_CALL_METHOD(&valid, this_ptr, "verifybyluhnalgorithm", NULL, 438, value); zephir_check_call_status(); if (!(zephir_is_true(valid))) { ZEPHIR_INIT_VAR(_0$$3); @@ -137478,7 +137787,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_CreditCard, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_3$$3); ZVAL_STRING(_3$$3, "CreditCard", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _0$$3, "__construct", NULL, 438, _2$$3, field, _3$$3); + ZEPHIR_CALL_METHOD(NULL, _0$$3, "__construct", NULL, 434, _2$$3, field, _3$$3); zephir_check_temp_parameter(_3$$3); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _0$$3); @@ -137509,7 +137818,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_CreditCard, verifyByLuhnAlgorithm ZEPHIR_CPY_WRT(digits, _2); ZEPHIR_INIT_VAR(hash); ZVAL_STRING(hash, "", 1); - ZEPHIR_CALL_FUNCTION(&_4, "array_reverse", NULL, 443, digits); + ZEPHIR_CALL_FUNCTION(&_4, "array_reverse", NULL, 439, digits); zephir_check_call_status(); zephir_is_iterable(_4, &_6, &_5, 0, 0, "phalcon/validation/validator/creditcard.zep", 87); for ( @@ -137529,7 +137838,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_CreditCard, verifyByLuhnAlgorithm } ZEPHIR_CALL_FUNCTION(&_9, "str_split", &_1, 71, hash); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&result, "array_sum", NULL, 444, _9); + ZEPHIR_CALL_FUNCTION(&result, "array_sum", NULL, 440, _9); zephir_check_call_status(); RETURN_MM_BOOL((zephir_safe_mod_zval_long(result, 10 TSRMLS_CC) == 0)); @@ -137538,6 +137847,140 @@ static PHP_METHOD(Phalcon_Validation_Validator_CreditCard, verifyByLuhnAlgorithm +#ifdef HAVE_CONFIG_H +#endif + +#include + +#include +#include +#include + + + +ZEPHIR_INIT_CLASS(Phalcon_Validation_Validator_Date) { + + ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Validation\\Validator, Date, phalcon, validation_validator_date, phalcon_validation_validator_ce, phalcon_validation_validator_date_method_entry, 0); + + zend_declare_class_constant_string(phalcon_validation_validator_date_ce, SL("DEFAULT_DATE_FORMAT"), "Y-m-d" TSRMLS_CC); + + return SUCCESS; + +} + +static PHP_METHOD(Phalcon_Validation_Validator_Date, validate) { + + int ZEPHIR_LAST_CALL_STATUS; + zval *field = NULL; + zval *validation, *field_param = NULL, *value = NULL, *format = NULL, *label = NULL, *message = NULL, *replacePairs = NULL, *_0, *_1 = NULL, *_2$$4 = NULL, *_4$$4 = NULL, *_5$$4, *_3$$6; + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 2, 0, &validation, &field_param); + + if (unlikely(Z_TYPE_P(field_param) != IS_STRING && Z_TYPE_P(field_param) != IS_NULL)) { + zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'field' must be a string") TSRMLS_CC); + RETURN_MM_NULL(); + } + if (likely(Z_TYPE_P(field_param) == IS_STRING)) { + zephir_get_strval(field, field_param); + } else { + ZEPHIR_INIT_VAR(field); + ZVAL_EMPTY_STRING(field); + } + + + ZEPHIR_CALL_METHOD(&value, validation, "getvalue", NULL, 0, field); + zephir_check_call_status(); + ZEPHIR_INIT_VAR(_0); + ZVAL_STRING(_0, "format", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(&format, this_ptr, "getoption", NULL, 0, _0); + zephir_check_temp_parameter(_0); + zephir_check_call_status(); + if (ZEPHIR_IS_EMPTY(format)) { + ZEPHIR_INIT_NVAR(format); + ZVAL_STRING(format, "Y-m-d", 1); + } + ZEPHIR_CALL_METHOD(&_1, this_ptr, "checkdate", NULL, 441, value, format); + zephir_check_call_status(); + if (!(zephir_is_true(_1))) { + ZEPHIR_INIT_VAR(_2$$4); + ZVAL_STRING(_2$$4, "label", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(&label, this_ptr, "getoption", NULL, 0, _2$$4); + zephir_check_temp_parameter(_2$$4); + zephir_check_call_status(); + if (ZEPHIR_IS_EMPTY(label)) { + ZEPHIR_CALL_METHOD(&label, validation, "getlabel", NULL, 0, field); + zephir_check_call_status(); + } + ZEPHIR_INIT_NVAR(_2$$4); + ZVAL_STRING(_2$$4, "message", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(&message, this_ptr, "getoption", NULL, 0, _2$$4); + zephir_check_temp_parameter(_2$$4); + zephir_check_call_status(); + ZEPHIR_INIT_VAR(replacePairs); + zephir_create_array(replacePairs, 1, 0 TSRMLS_CC); + zephir_array_update_string(&replacePairs, SL(":field"), &label, PH_COPY | PH_SEPARATE); + if (ZEPHIR_IS_EMPTY(message)) { + ZEPHIR_INIT_VAR(_3$$6); + ZVAL_STRING(_3$$6, "Date", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(&message, validation, "getdefaultmessage", NULL, 0, _3$$6); + zephir_check_temp_parameter(_3$$6); + zephir_check_call_status(); + } + ZEPHIR_INIT_NVAR(_2$$4); + object_init_ex(_2$$4, phalcon_validation_message_ce); + ZEPHIR_CALL_FUNCTION(&_4$$4, "strtr", NULL, 55, message, replacePairs); + zephir_check_call_status(); + ZEPHIR_INIT_VAR(_5$$4); + ZVAL_STRING(_5$$4, "Date", ZEPHIR_TEMP_PARAM_COPY); + ZEPHIR_CALL_METHOD(NULL, _2$$4, "__construct", NULL, 434, _4$$4, field, _5$$4); + zephir_check_temp_parameter(_5$$4); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _2$$4); + zephir_check_call_status(); + RETURN_MM_BOOL(0); + } + RETURN_MM_BOOL(1); + +} + +static PHP_METHOD(Phalcon_Validation_Validator_Date, checkDate) { + + zend_bool _3; + zend_class_entry *_0, *_1; + int ZEPHIR_LAST_CALL_STATUS; + zval *value, *format, *date = NULL, *errors = NULL, *_2, *_4; + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 2, 0, &value, &format); + + + + if (!(Z_TYPE_P(value) == IS_STRING)) { + RETURN_MM_BOOL(0); + } + _0 = zend_fetch_class(SL("DateTime"), ZEND_FETCH_CLASS_AUTO TSRMLS_CC); + ZEPHIR_CALL_CE_STATIC(&date, _0, "createfromformat", NULL, 0, format, value); + zephir_check_call_status(); + _1 = zend_fetch_class(SL("DateTime"), ZEND_FETCH_CLASS_AUTO TSRMLS_CC); + ZEPHIR_CALL_CE_STATIC(&errors, _1, "getlasterrors", NULL, 0); + zephir_check_call_status(); + zephir_array_fetch_string(&_2, errors, SL("warning_count"), PH_NOISY | PH_READONLY, "phalcon/validation/validator/date.zep", 90 TSRMLS_CC); + _3 = ZEPHIR_GT_LONG(_2, 0); + if (!(_3)) { + zephir_array_fetch_string(&_4, errors, SL("error_count"), PH_NOISY | PH_READONLY, "phalcon/validation/validator/date.zep", 90 TSRMLS_CC); + _3 = ZEPHIR_GT_LONG(_4, 0); + } + if (_3) { + RETURN_MM_BOOL(0); + } + RETURN_MM_BOOL(1); + +} + + + + #ifdef HAVE_CONFIG_H #endif @@ -137593,7 +138036,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Digit, validate) { if (_2) { RETURN_MM_BOOL(1); } - ZEPHIR_CALL_FUNCTION(&_3, "ctype_digit", NULL, 445, value); + ZEPHIR_CALL_FUNCTION(&_3, "ctype_digit", NULL, 442, value); zephir_check_call_status(); if (!(zephir_is_true(_3))) { ZEPHIR_INIT_VAR(_4$$4); @@ -137626,7 +138069,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Digit, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_7$$4); ZVAL_STRING(_7$$4, "Digit", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _4$$4, "__construct", NULL, 438, _6$$4, field, _7$$4); + ZEPHIR_CALL_METHOD(NULL, _4$$4, "__construct", NULL, 434, _6$$4, field, _7$$4); zephir_check_temp_parameter(_7$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _4$$4); @@ -137697,7 +138140,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Email, validate) { } ZEPHIR_SINIT_VAR(_3); ZVAL_LONG(&_3, 274); - ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 193, value, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 188, value, &_3); zephir_check_call_status(); if (!(zephir_is_true(_4))) { ZEPHIR_INIT_VAR(_5$$4); @@ -137730,7 +138173,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Email, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_8$$4); ZVAL_STRING(_8$$4, "Email", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _5$$4, "__construct", NULL, 438, _7$$4, field, _8$$4); + ZEPHIR_CALL_METHOD(NULL, _5$$4, "__construct", NULL, 434, _7$$4, field, _8$$4); zephir_check_temp_parameter(_8$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _5$$4); @@ -137826,7 +138269,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_ExclusionIn, validate) { zephir_check_temp_parameter(_4$$5); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 358, value, domain, strict); + ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 356, value, domain, strict); zephir_check_call_status(); if (zephir_is_true(_5)) { ZEPHIR_INIT_VAR(_6$$7); @@ -137862,7 +138305,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_ExclusionIn, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_9$$7); ZVAL_STRING(_9$$7, "ExclusionIn", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _6$$7, "__construct", NULL, 438, _8$$7, field, _9$$7); + ZEPHIR_CALL_METHOD(NULL, _6$$7, "__construct", NULL, 434, _8$$7, field, _9$$7); zephir_check_temp_parameter(_9$$7); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _6$$7); @@ -137977,7 +138420,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_13$$4); ZVAL_STRING(_13$$4, "FileIniSize", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _9$$4, "__construct", &_14, 438, _11$$4, field, _13$$4); + ZEPHIR_CALL_METHOD(NULL, _9$$4, "__construct", &_14, 434, _11$$4, field, _13$$4); zephir_check_temp_parameter(_13$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _9$$4); @@ -138017,7 +138460,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { _23 = _21; if (!(_23)) { zephir_array_fetch_string(&_24, value, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/validation/validator/file.zep", 79 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_25, "is_uploaded_file", NULL, 234, _24); + ZEPHIR_CALL_FUNCTION(&_25, "is_uploaded_file", NULL, 229, _24); zephir_check_call_status(); _23 = !zephir_is_true(_25); } @@ -138043,7 +138486,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_29$$7); ZVAL_STRING(_29$$7, "FileEmpty", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _26$$7, "__construct", &_14, 438, _28$$7, field, _29$$7); + ZEPHIR_CALL_METHOD(NULL, _26$$7, "__construct", &_14, 434, _28$$7, field, _29$$7); zephir_check_temp_parameter(_29$$7); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _26$$7); @@ -138080,7 +138523,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_35$$9); ZVAL_STRING(_35$$9, "FileValid", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _32$$9, "__construct", &_14, 438, _34$$9, field, _35$$9); + ZEPHIR_CALL_METHOD(NULL, _32$$9, "__construct", &_14, 434, _34$$9, field, _35$$9); zephir_check_temp_parameter(_35$$9); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _32$$9); @@ -138126,7 +138569,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { zephir_array_fetch_long(&unit, matches, 2, PH_NOISY, "phalcon/validation/validator/file.zep", 115 TSRMLS_CC); } zephir_array_fetch_long(&_41$$11, matches, 1, PH_NOISY | PH_READONLY, "phalcon/validation/validator/file.zep", 118 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_42$$11, "floatval", &_43, 305, _41$$11); + ZEPHIR_CALL_FUNCTION(&_42$$11, "floatval", &_43, 301, _41$$11); zephir_check_call_status(); ZEPHIR_INIT_VAR(_44$$11); zephir_array_fetch(&_45$$11, byteUnits, unit, PH_NOISY | PH_READONLY, "phalcon/validation/validator/file.zep", 118 TSRMLS_CC); @@ -138136,9 +138579,9 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { ZEPHIR_INIT_VAR(bytes); mul_function(bytes, _42$$11, _44$$11 TSRMLS_CC); zephir_array_fetch_string(&_47$$11, value, SL("size"), PH_NOISY | PH_READONLY, "phalcon/validation/validator/file.zep", 120 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&_42$$11, "floatval", &_43, 305, _47$$11); + ZEPHIR_CALL_FUNCTION(&_42$$11, "floatval", &_43, 301, _47$$11); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_48$$11, "floatval", &_43, 305, bytes); + ZEPHIR_CALL_FUNCTION(&_48$$11, "floatval", &_43, 301, bytes); zephir_check_call_status(); if (ZEPHIR_GT(_42$$11, _48$$11)) { ZEPHIR_INIT_VAR(_49$$13); @@ -138163,7 +138606,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_52$$13); ZVAL_STRING(_52$$13, "FileSize", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _49$$13, "__construct", &_14, 438, _51$$13, field, _52$$13); + ZEPHIR_CALL_METHOD(NULL, _49$$13, "__construct", &_14, 434, _51$$13, field, _52$$13); zephir_check_temp_parameter(_52$$13); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _49$$13); @@ -138189,12 +138632,12 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { if ((zephir_function_exists_ex(SS("finfo_open") TSRMLS_CC) == SUCCESS)) { ZEPHIR_SINIT_VAR(_55$$17); ZVAL_LONG(&_55$$17, 16); - ZEPHIR_CALL_FUNCTION(&tmp, "finfo_open", NULL, 231, &_55$$17); + ZEPHIR_CALL_FUNCTION(&tmp, "finfo_open", NULL, 226, &_55$$17); zephir_check_call_status(); zephir_array_fetch_string(&_56$$17, value, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/validation/validator/file.zep", 143 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 232, tmp, _56$$17); + ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 227, tmp, _56$$17); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 233, tmp); + ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 228, tmp); zephir_check_call_status(); } else { ZEPHIR_OBS_NVAR(mime); @@ -138225,7 +138668,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_60$$19); ZVAL_STRING(_60$$19, "FileType", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _57$$19, "__construct", &_14, 438, _59$$19, field, _60$$19); + ZEPHIR_CALL_METHOD(NULL, _57$$19, "__construct", &_14, 434, _59$$19, field, _60$$19); zephir_check_temp_parameter(_60$$19); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _57$$19); @@ -138249,7 +138692,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { } if (_62) { zephir_array_fetch_string(&_64$$21, value, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/validation/validator/file.zep", 164 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 242, _64$$21); + ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 237, _64$$21); zephir_check_call_status(); ZEPHIR_OBS_VAR(width); zephir_array_fetch_long(&width, tmp, 0, PH_NOISY, "phalcon/validation/validator/file.zep", 165 TSRMLS_CC); @@ -138310,7 +138753,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_73$$24); ZVAL_STRING(_73$$24, "FileMinResolution", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _70$$24, "__construct", &_14, 438, _71$$24, field, _73$$24); + ZEPHIR_CALL_METHOD(NULL, _70$$24, "__construct", &_14, 434, _71$$24, field, _73$$24); zephir_check_temp_parameter(_73$$24); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _70$$24); @@ -138366,7 +138809,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_File, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_81$$27); ZVAL_STRING(_81$$27, "FileMaxResolution", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _78$$27, "__construct", &_14, 438, _79$$27, field, _81$$27); + ZEPHIR_CALL_METHOD(NULL, _78$$27, "__construct", &_14, 434, _79$$27, field, _81$$27); zephir_check_temp_parameter(_81$$27); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _78$$27); @@ -138483,7 +138926,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Identical, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_11$$6); ZVAL_STRING(_11$$6, "Identical", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _8$$6, "__construct", NULL, 438, _10$$6, field, _11$$6); + ZEPHIR_CALL_METHOD(NULL, _8$$6, "__construct", NULL, 434, _10$$6, field, _11$$6); zephir_check_temp_parameter(_11$$6); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _8$$6); @@ -138579,7 +139022,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_InclusionIn, validate) { zephir_check_temp_parameter(_4$$5); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 358, value, domain, strict); + ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 356, value, domain, strict); zephir_check_call_status(); if (!(zephir_is_true(_5))) { ZEPHIR_INIT_VAR(_6$$7); @@ -138615,7 +139058,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_InclusionIn, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_9$$7); ZVAL_STRING(_9$$7, "InclusionIn", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _6$$7, "__construct", NULL, 438, _8$$7, field, _9$$7); + ZEPHIR_CALL_METHOD(NULL, _6$$7, "__construct", NULL, 434, _8$$7, field, _9$$7); zephir_check_temp_parameter(_9$$7); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _6$$7); @@ -138720,7 +139163,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Numericality, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_8$$4); ZVAL_STRING(_8$$4, "Numericality", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _5$$4, "__construct", NULL, 438, _7$$4, field, _8$$4); + ZEPHIR_CALL_METHOD(NULL, _5$$4, "__construct", NULL, 434, _7$$4, field, _8$$4); zephir_check_temp_parameter(_8$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _5$$4); @@ -138812,7 +139255,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_PresenceOf, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_4$$3); ZVAL_STRING(_4$$3, "PresenceOf", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _1$$3, "__construct", NULL, 438, _3$$3, field, _4$$3); + ZEPHIR_CALL_METHOD(NULL, _1$$3, "__construct", NULL, 434, _3$$3, field, _4$$3); zephir_check_temp_parameter(_4$$3); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _1$$3); @@ -138927,7 +139370,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Regex, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_9$$6); ZVAL_STRING(_9$$6, "Regex", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _6$$6, "__construct", NULL, 438, _8$$6, field, _9$$6); + ZEPHIR_CALL_METHOD(NULL, _6$$6, "__construct", NULL, 434, _8$$6, field, _9$$6); zephir_check_temp_parameter(_9$$6); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _6$$6); @@ -139025,7 +139468,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_StringLength, validate) { zephir_check_call_status(); } if ((zephir_function_exists_ex(SS("mb_strlen") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 359, value); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 357, value); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(length); @@ -139060,7 +139503,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_StringLength, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_9$$9); ZVAL_STRING(_9$$9, "TooLong", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _5$$9, "__construct", &_10, 438, _7$$9, field, _9$$9); + ZEPHIR_CALL_METHOD(NULL, _5$$9, "__construct", &_10, 434, _7$$9, field, _9$$9); zephir_check_temp_parameter(_9$$9); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _5$$9); @@ -139097,7 +139540,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_StringLength, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_15$$12); ZVAL_STRING(_15$$12, "TooShort", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _12$$12, "__construct", &_10, 438, _14$$12, field, _15$$12); + ZEPHIR_CALL_METHOD(NULL, _12$$12, "__construct", &_10, 434, _14$$12, field, _15$$12); zephir_check_temp_parameter(_15$$12); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _12$$12); @@ -139237,7 +139680,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Uniqueness, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_12$$7); ZVAL_STRING(_12$$7, "Uniqueness", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _9$$7, "__construct", NULL, 438, _11$$7, field, _12$$7); + ZEPHIR_CALL_METHOD(NULL, _9$$7, "__construct", NULL, 434, _11$$7, field, _12$$7); zephir_check_temp_parameter(_12$$7); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _9$$7); @@ -139308,7 +139751,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Url, validate) { } ZEPHIR_SINIT_VAR(_3); ZVAL_LONG(&_3, 273); - ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 193, value, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 188, value, &_3); zephir_check_call_status(); if (!(zephir_is_true(_4))) { ZEPHIR_INIT_VAR(_5$$4); @@ -139341,7 +139784,7 @@ static PHP_METHOD(Phalcon_Validation_Validator_Url, validate) { zephir_check_call_status(); ZEPHIR_INIT_VAR(_8$$4); ZVAL_STRING(_8$$4, "Url", ZEPHIR_TEMP_PARAM_COPY); - ZEPHIR_CALL_METHOD(NULL, _5$$4, "__construct", NULL, 438, _7$$4, field, _8$$4); + ZEPHIR_CALL_METHOD(NULL, _5$$4, "__construct", NULL, 434, _7$$4, field, _8$$4); zephir_check_temp_parameter(_8$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, _5$$4); @@ -139386,9 +139829,9 @@ zend_class_entry *phalcon_cache_frontendinterface_ce; zend_class_entry *phalcon_annotations_adapterinterface_ce; zend_class_entry *phalcon_db_dialectinterface_ce; zend_class_entry *phalcon_dispatcherinterface_ce; +zend_class_entry *phalcon_logger_formatterinterface_ce; zend_class_entry *phalcon_db_adapterinterface_ce; zend_class_entry *phalcon_logger_adapterinterface_ce; -zend_class_entry *phalcon_logger_formatterinterface_ce; zend_class_entry *phalcon_mvc_entityinterface_ce; zend_class_entry *phalcon_mvc_model_resultsetinterface_ce; zend_class_entry *phalcon_session_adapterinterface_ce; @@ -139721,6 +140164,7 @@ zend_class_entry *phalcon_validation_validator_alpha_ce; zend_class_entry *phalcon_validation_validator_between_ce; zend_class_entry *phalcon_validation_validator_confirmation_ce; zend_class_entry *phalcon_validation_validator_creditcard_ce; +zend_class_entry *phalcon_validation_validator_date_ce; zend_class_entry *phalcon_validation_validator_digit_ce; zend_class_entry *phalcon_validation_validator_email_ce; zend_class_entry *phalcon_validation_validator_exclusionin_ce; @@ -139785,9 +140229,9 @@ static PHP_MINIT_FUNCTION(phalcon) ZEPHIR_INIT(Phalcon_Annotations_AdapterInterface); ZEPHIR_INIT(Phalcon_Db_DialectInterface); ZEPHIR_INIT(Phalcon_DispatcherInterface); + ZEPHIR_INIT(Phalcon_Logger_FormatterInterface); ZEPHIR_INIT(Phalcon_Db_AdapterInterface); ZEPHIR_INIT(Phalcon_Logger_AdapterInterface); - ZEPHIR_INIT(Phalcon_Logger_FormatterInterface); ZEPHIR_INIT(Phalcon_Mvc_EntityInterface); ZEPHIR_INIT(Phalcon_Mvc_Model_ResultsetInterface); ZEPHIR_INIT(Phalcon_Session_AdapterInterface); @@ -140119,6 +140563,7 @@ static PHP_MINIT_FUNCTION(phalcon) ZEPHIR_INIT(Phalcon_Validation_Validator_Between); ZEPHIR_INIT(Phalcon_Validation_Validator_Confirmation); ZEPHIR_INIT(Phalcon_Validation_Validator_CreditCard); + ZEPHIR_INIT(Phalcon_Validation_Validator_Date); ZEPHIR_INIT(Phalcon_Validation_Validator_Digit); ZEPHIR_INIT(Phalcon_Validation_Validator_Email); ZEPHIR_INIT(Phalcon_Validation_Validator_ExclusionIn); diff --git a/build/safe/phalcon.zep.h b/build/safe/phalcon.zep.h index 537f2625846..c85d23ded2a 100644 --- a/build/safe/phalcon.zep.h +++ b/build/safe/phalcon.zep.h @@ -430,7 +430,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Validator, getMessages); static PHP_METHOD(Phalcon_Mvc_Model_Validator, getOptions); static PHP_METHOD(Phalcon_Mvc_Model_Validator, getOption); static PHP_METHOD(Phalcon_Mvc_Model_Validator, isSetOption); -static zend_object_value zephir_init_properties_Phalcon_Mvc_Model_Validator(zend_class_entry *class_type TSRMLS_DC); +zend_object_value zephir_init_properties_Phalcon_Mvc_Model_Validator(zend_class_entry *class_type TSRMLS_DC); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_validator___construct, 0, 0, 1) ZEND_ARG_ARRAY_INFO(0, options, 0) @@ -1579,6 +1579,22 @@ ZEPHIR_INIT_FUNCS(phalcon_dispatcherinterface_method_entry) { PHP_FE_END }; +zend_class_entry *phalcon_logger_formatterinterface_ce; + +ZEPHIR_INIT_CLASS(Phalcon_Logger_FormatterInterface); + +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_formatterinterface_format, 0, 0, 3) + ZEND_ARG_INFO(0, message) + ZEND_ARG_INFO(0, type) + ZEND_ARG_INFO(0, timestamp) + ZEND_ARG_INFO(0, context) +ZEND_END_ARG_INFO() + +ZEPHIR_INIT_FUNCS(phalcon_logger_formatterinterface_method_entry) { + PHP_ABSTRACT_ME(Phalcon_Logger_FormatterInterface, format, arginfo_phalcon_logger_formatterinterface_format) + PHP_FE_END +}; + zend_class_entry *phalcon_annotations_adapter_ce; ZEPHIR_INIT_CLASS(Phalcon_Annotations_Adapter); @@ -2572,22 +2588,6 @@ ZEPHIR_INIT_FUNCS(phalcon_logger_formatter_method_entry) { PHP_FE_END }; -zend_class_entry *phalcon_logger_formatterinterface_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Logger_FormatterInterface); - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_formatterinterface_format, 0, 0, 3) - ZEND_ARG_INFO(0, message) - ZEND_ARG_INFO(0, type) - ZEND_ARG_INFO(0, timestamp) - ZEND_ARG_INFO(0, context) -ZEND_END_ARG_INFO() - -ZEPHIR_INIT_FUNCS(phalcon_logger_formatterinterface_method_entry) { - PHP_ABSTRACT_ME(Phalcon_Logger_FormatterInterface, format, arginfo_phalcon_logger_formatterinterface_format) - PHP_FE_END -}; - zend_class_entry *phalcon_mvc_entityinterface_ce; ZEPHIR_INIT_CLASS(Phalcon_Mvc_EntityInterface); @@ -7100,7 +7100,7 @@ static PHP_METHOD(Phalcon_Assets_Collection, setTargetLocal); static PHP_METHOD(Phalcon_Assets_Collection, join); static PHP_METHOD(Phalcon_Assets_Collection, getRealTargetPath); static PHP_METHOD(Phalcon_Assets_Collection, addFilter); -static zend_object_value zephir_init_properties_Phalcon_Assets_Collection(zend_class_entry *class_type TSRMLS_DC); +zend_object_value zephir_init_properties_Phalcon_Assets_Collection(zend_class_entry *class_type TSRMLS_DC); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_assets_collection_add, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, resource, Phalcon\\Assets\\Resource, 0) @@ -8787,6 +8787,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Db_Adapter_Pdo_Mysql); static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, escapeIdentifier); static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns); static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeIndexes); +static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeReferences); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_adapter_pdo_mysql_escapeidentifier, 0, 0, 1) ZEND_ARG_INFO(0, identifier) @@ -8802,10 +8803,16 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_adapter_pdo_mysql_describeindexes, 0, ZEND_ARG_INFO(0, schema) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_db_adapter_pdo_mysql_describereferences, 0, 0, 1) + ZEND_ARG_INFO(0, table) + ZEND_ARG_INFO(0, schema) +ZEND_END_ARG_INFO() + ZEPHIR_INIT_FUNCS(phalcon_db_adapter_pdo_mysql_method_entry) { PHP_ME(Phalcon_Db_Adapter_Pdo_Mysql, escapeIdentifier, arginfo_phalcon_db_adapter_pdo_mysql_escapeidentifier, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns, arginfo_phalcon_db_adapter_pdo_mysql_describecolumns, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Db_Adapter_Pdo_Mysql, describeIndexes, arginfo_phalcon_db_adapter_pdo_mysql_describeindexes, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Db_Adapter_Pdo_Mysql, describeReferences, arginfo_phalcon_db_adapter_pdo_mysql_describereferences, ZEND_ACC_PUBLIC) PHP_FE_END }; @@ -11590,7 +11597,7 @@ static PHP_METHOD(Phalcon_Http_Response_Headers, send); static PHP_METHOD(Phalcon_Http_Response_Headers, reset); static PHP_METHOD(Phalcon_Http_Response_Headers, toArray); static PHP_METHOD(Phalcon_Http_Response_Headers, __set_state); -static zend_object_value zephir_init_properties_Phalcon_Http_Response_Headers(zend_class_entry *class_type TSRMLS_DC); +zend_object_value zephir_init_properties_Phalcon_Http_Response_Headers(zend_class_entry *class_type TSRMLS_DC); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_response_headers_set, 0, 0, 2) ZEND_ARG_INFO(0, name) @@ -12283,8 +12290,10 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Multiple); static PHP_METHOD(Phalcon_Logger_Multiple, getLoggers); static PHP_METHOD(Phalcon_Logger_Multiple, getFormatter); +static PHP_METHOD(Phalcon_Logger_Multiple, getLogLevel); static PHP_METHOD(Phalcon_Logger_Multiple, push); static PHP_METHOD(Phalcon_Logger_Multiple, setFormatter); +static PHP_METHOD(Phalcon_Logger_Multiple, setLogLevel); static PHP_METHOD(Phalcon_Logger_Multiple, log); static PHP_METHOD(Phalcon_Logger_Multiple, critical); static PHP_METHOD(Phalcon_Logger_Multiple, emergency); @@ -12303,6 +12312,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_multiple_setformatter, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, formatter, Phalcon\\Logger\\FormatterInterface, 0) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_multiple_setloglevel, 0, 0, 1) + ZEND_ARG_INFO(0, level) +ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_multiple_log, 0, 0, 1) ZEND_ARG_INFO(0, type) ZEND_ARG_INFO(0, message) @@ -12352,8 +12365,10 @@ ZEND_END_ARG_INFO() ZEPHIR_INIT_FUNCS(phalcon_logger_multiple_method_entry) { PHP_ME(Phalcon_Logger_Multiple, getLoggers, NULL, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Logger_Multiple, getFormatter, NULL, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Logger_Multiple, getLogLevel, NULL, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Logger_Multiple, push, arginfo_phalcon_logger_multiple_push, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Logger_Multiple, setFormatter, arginfo_phalcon_logger_multiple_setformatter, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Logger_Multiple, setLogLevel, arginfo_phalcon_logger_multiple_setloglevel, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Logger_Multiple, log, arginfo_phalcon_logger_multiple_log, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Logger_Multiple, critical, arginfo_phalcon_logger_multiple_critical, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Logger_Multiple, emergency, arginfo_phalcon_logger_multiple_emergency, ZEND_ACC_PUBLIC) @@ -12746,6 +12761,7 @@ static PHP_METHOD(Phalcon_Mvc_Collection_Manager, initialize); static PHP_METHOD(Phalcon_Mvc_Collection_Manager, isInitialized); static PHP_METHOD(Phalcon_Mvc_Collection_Manager, getLastInitialized); static PHP_METHOD(Phalcon_Mvc_Collection_Manager, setConnectionService); +static PHP_METHOD(Phalcon_Mvc_Collection_Manager, getConnectionService); static PHP_METHOD(Phalcon_Mvc_Collection_Manager, useImplicitObjectIds); static PHP_METHOD(Phalcon_Mvc_Collection_Manager, isUsingImplicitObjectIds); static PHP_METHOD(Phalcon_Mvc_Collection_Manager, getConnection); @@ -12783,6 +12799,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_collection_manager_setconnectionservi ZEND_ARG_INFO(0, connectionService) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_collection_manager_getconnectionservice, 0, 0, 1) + ZEND_ARG_OBJ_INFO(0, model, Phalcon\\Mvc\\CollectionInterface, 0) +ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_collection_manager_useimplicitobjectids, 0, 0, 2) ZEND_ARG_OBJ_INFO(0, model, Phalcon\\Mvc\\CollectionInterface, 0) ZEND_ARG_INFO(0, useImplicitObjectIds) @@ -12823,6 +12843,7 @@ ZEPHIR_INIT_FUNCS(phalcon_mvc_collection_manager_method_entry) { PHP_ME(Phalcon_Mvc_Collection_Manager, isInitialized, arginfo_phalcon_mvc_collection_manager_isinitialized, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Collection_Manager, getLastInitialized, NULL, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Collection_Manager, setConnectionService, arginfo_phalcon_mvc_collection_manager_setconnectionservice, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Mvc_Collection_Manager, getConnectionService, arginfo_phalcon_mvc_collection_manager_getconnectionservice, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Collection_Manager, useImplicitObjectIds, arginfo_phalcon_mvc_collection_manager_useimplicitobjectids, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Collection_Manager, isUsingImplicitObjectIds, arginfo_phalcon_mvc_collection_manager_isusingimplicitobjectids, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Collection_Manager, getConnection, arginfo_phalcon_mvc_collection_manager_getconnection, ZEND_ACC_PUBLIC) @@ -13385,6 +13406,8 @@ static PHP_METHOD(Phalcon_Mvc_Model, _invokeFinder); static PHP_METHOD(Phalcon_Mvc_Model, __call); static PHP_METHOD(Phalcon_Mvc_Model, __callStatic); static PHP_METHOD(Phalcon_Mvc_Model, __set); +static PHP_METHOD(Phalcon_Mvc_Model, _possibleSetter); +static PHP_METHOD(Phalcon_Mvc_Model, _isVisible); static PHP_METHOD(Phalcon_Mvc_Model, __get); static PHP_METHOD(Phalcon_Mvc_Model, __isset); static PHP_METHOD(Phalcon_Mvc_Model, serialize); @@ -13686,6 +13709,15 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model___set, 0, 0, 2) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model__possiblesetter, 0, 0, 2) + ZEND_ARG_INFO(0, property) + ZEND_ARG_INFO(0, value) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model__isvisible, 0, 0, 1) + ZEND_ARG_INFO(0, property) +ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model___get, 0, 0, 1) ZEND_ARG_INFO(0, property) ZEND_END_ARG_INFO() @@ -13789,6 +13821,8 @@ ZEPHIR_INIT_FUNCS(phalcon_mvc_model_method_entry) { PHP_ME(Phalcon_Mvc_Model, __call, arginfo_phalcon_mvc_model___call, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model, __callStatic, arginfo_phalcon_mvc_model___callstatic, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) PHP_ME(Phalcon_Mvc_Model, __set, arginfo_phalcon_mvc_model___set, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Mvc_Model, _possibleSetter, arginfo_phalcon_mvc_model__possiblesetter, ZEND_ACC_PROTECTED|ZEND_ACC_FINAL) + PHP_ME(Phalcon_Mvc_Model, _isVisible, arginfo_phalcon_mvc_model__isvisible, ZEND_ACC_PROTECTED|ZEND_ACC_FINAL) PHP_ME(Phalcon_Mvc_Model, __get, arginfo_phalcon_mvc_model___get, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model, __isset, arginfo_phalcon_mvc_model___isset, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model, serialize, NULL, ZEND_ACC_PUBLIC) @@ -17001,7 +17035,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_queue_beanstalk_put, 0, 0, 1) ZEND_ARG_INFO(0, data) - ZEND_ARG_INFO(0, options) + ZEND_ARG_ARRAY_INFO(0, options, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_queue_beanstalk_reserve, 0, 0, 0) @@ -18063,7 +18097,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Csv, __construct); static PHP_METHOD(Phalcon_Translate_Adapter_Csv, _load); static PHP_METHOD(Phalcon_Translate_Adapter_Csv, query); static PHP_METHOD(Phalcon_Translate_Adapter_Csv, exists); -static zend_object_value zephir_init_properties_Phalcon_Translate_Adapter_Csv(zend_class_entry *class_type TSRMLS_DC); +zend_object_value zephir_init_properties_Phalcon_Translate_Adapter_Csv(zend_class_entry *class_type TSRMLS_DC); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_translate_adapter_csv___construct, 0, 0, 1) ZEND_ARG_ARRAY_INFO(0, options, 0) @@ -18169,7 +18203,7 @@ ZEPHIR_INIT_FUNCS(phalcon_translate_adapter_gettext_method_entry) { PHP_ME(Phalcon_Translate_Adapter_Gettext, setDefaultDomain, arginfo_phalcon_translate_adapter_gettext_setdefaultdomain, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Translate_Adapter_Gettext, setDirectory, arginfo_phalcon_translate_adapter_gettext_setdirectory, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Translate_Adapter_Gettext, setLocale, arginfo_phalcon_translate_adapter_gettext_setlocale, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Translate_Adapter_Gettext, prepareOptions, arginfo_phalcon_translate_adapter_gettext_prepareoptions, ZEND_ACC_PRIVATE) + PHP_ME(Phalcon_Translate_Adapter_Gettext, prepareOptions, arginfo_phalcon_translate_adapter_gettext_prepareoptions, ZEND_ACC_PROTECTED) PHP_ME(Phalcon_Translate_Adapter_Gettext, getOptionsDefault, NULL, ZEND_ACC_PRIVATE) PHP_FE_END }; @@ -18582,6 +18616,29 @@ ZEPHIR_INIT_FUNCS(phalcon_validation_validator_creditcard_method_entry) { PHP_FE_END }; +zend_class_entry *phalcon_validation_validator_date_ce; + +ZEPHIR_INIT_CLASS(Phalcon_Validation_Validator_Date); + +static PHP_METHOD(Phalcon_Validation_Validator_Date, validate); +static PHP_METHOD(Phalcon_Validation_Validator_Date, checkDate); + +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_validation_validator_date_validate, 0, 0, 2) + ZEND_ARG_OBJ_INFO(0, validation, Phalcon\\Validation, 0) + ZEND_ARG_INFO(0, field) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_validation_validator_date_checkdate, 0, 0, 2) + ZEND_ARG_INFO(0, value) + ZEND_ARG_INFO(0, format) +ZEND_END_ARG_INFO() + +ZEPHIR_INIT_FUNCS(phalcon_validation_validator_date_method_entry) { + PHP_ME(Phalcon_Validation_Validator_Date, validate, arginfo_phalcon_validation_validator_date_validate, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Validation_Validator_Date, checkDate, arginfo_phalcon_validation_validator_date_checkdate, ZEND_ACC_PRIVATE) + PHP_FE_END +}; + zend_class_entry *phalcon_validation_validator_digit_ce; ZEPHIR_INIT_CLASS(Phalcon_Validation_Validator_Digit); diff --git a/build/safe/php_phalcon.h b/build/safe/php_phalcon.h index 687d79bba0b..3b1a8c8d703 100644 --- a/build/safe/php_phalcon.h +++ b/build/safe/php_phalcon.h @@ -182,10 +182,10 @@ typedef zend_function zephir_fcall_cache_entry; #define PHP_PHALCON_NAME "phalcon" -#define PHP_PHALCON_VERSION "2.0.10" +#define PHP_PHALCON_VERSION "2.0.11" #define PHP_PHALCON_EXTNAME "phalcon" #define PHP_PHALCON_AUTHOR "Phalcon Team and contributors" -#define PHP_PHALCON_ZEPVERSION "0.9.2a-dev" +#define PHP_PHALCON_ZEPVERSION "0.9.3a-dev" #define PHP_PHALCON_DESCRIPTION "Web framework delivered as a C-extension for PHP" typedef struct _zephir_struct_db {
Memory
Usage", _34$$5, "