diff --git a/.github/workflows/compile-windows.yml b/.github/workflows/compile-windows.yml index 99d12a631b8..ef13c3d269b 100644 --- a/.github/workflows/compile-windows.yml +++ b/.github/workflows/compile-windows.yml @@ -6,7 +6,7 @@ on: env: # All versions should be declared here - PHALCON_VERSION: 5.9.3 + PHALCON_VERSION: 5.9.4 jobs: windows: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ea29cfc454a..8cf70356921 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,9 +17,8 @@ on: env: # All versions should be declared here - PHALCON_VERSION: 5.9.3 - ZEPHIR_PARSER_VERSION: 1.6.1 - + PHALCON_VERSION: 5.9.4 + ZEPHIR_PARSER_VERSION: 1.8.0 # For tests LANG: en_US.UTF-8 LANGUAGE: en_US.UTF-8 @@ -38,7 +37,7 @@ jobs: # https://docs.github.com/en/actions/learn-github-actions/reusing-workflows#limitations setup_workflow: name: Setup workflow - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest outputs: zephir_extensions: ${{ steps.setup-zephir-ext.outputs.extensions }} @@ -56,7 +55,7 @@ jobs: name: Check code style - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -128,7 +127,7 @@ jobs: Write-Output "SESSION_SAVE_PATH=$SessionSavePath" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - name: Setup PHP - uses: shivammathur/setup-php@2.32.0 + uses: shivammathur/setup-php@2.35.5 with: php-version: ${{ matrix.php }} extensions: ${{ env.EXTENSIONS }} @@ -283,7 +282,7 @@ jobs: - uses: actions/checkout@v4 - name: Setup PHP - uses: shivammathur/setup-php@2.32.0 + uses: shivammathur/setup-php@2.35.5 with: php-version: ${{ matrix.php }} extensions: ${{ env.EXTENSIONS }} diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md index 12a8992b6f8..fa9ee3ce584 100644 --- a/CHANGELOG-5.0.md +++ b/CHANGELOG-5.0.md @@ -1,5 +1,5 @@ # Changelog -## 5.9.4 (2025-xx-xx) +## 5.9.5 (xxxx-xx-xx) ### Changed @@ -7,6 +7,20 @@ ### Added +### Fixed + +### Removed + +# Changelog +## 5.9.4 (2025-11-21) + +### Changed + +- Changed `bind()` and `validate()` method in `Phalcon\Filter\Validation` and `Phalcon\Filter\Validation\ValidationInterface` to accept `$whitelist` array of only allowed fields to be mutated when using entity [#16800](https://github.com/phalcon/cphalcon/issues/16800) +- Changed `Phalcon\Storage\Adapters\Libmemcached::getAdapter()` to use 50ms for `\Memcached::OPT_CONNECT_TIMEOUT` [#16818](https://github.com/phalcon/cphalcon/issues/16818) + +### Added + - Added `fails()` method helper to `Phalcon\Filter\Validation` useful for standalone validation [#16798](https://github.com/phalcon/cphalcon/issues/16798) ### Fixed diff --git a/build/phalcon/phalcon.zep.c b/build/phalcon/phalcon.zep.c index ee367aa3fe9..7d7c8201afa 100644 --- a/build/phalcon/phalcon.zep.c +++ b/build/phalcon/phalcon.zep.c @@ -3980,7 +3980,7 @@ static int zephir_function_exists(const zval *function_name) static int zephir_function_exists_ex(const char *function_name, unsigned int function_len) { - if (zend_hash_str_exists(CG(function_table), function_name, function_len) != NULL) { + if (zend_hash_str_exists(CG(function_table), function_name, function_len)) { return SUCCESS; } @@ -6527,7 +6527,6 @@ static int zephir_array_update_zval(zval *arr, zval *index, zval *value, int fla if ((flags & PH_CTOR) == PH_CTOR) { zval new_zv; - //Z_TRY_DELREF_P(value); //? ZVAL_DUP(&new_zv, value); value = &new_zv; } @@ -8890,7 +8889,7 @@ static int zephir_require_ret(zval *return_value_ptr, const char *require_path) zend_stream_init_filename_ex(&file_handle, zend_string_path); ret = php_stream_open_for_zend_ex(&file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE); - zval_ptr_dtor(zend_string_path); + zend_string_release(zend_string_path); #else ret = php_stream_open_for_zend_ex(require_path, &file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE); #endif @@ -8960,7 +8959,7 @@ static int zephir_require_once_ret(zval *return_value_ptr, const char *require_p zend_stream_init_filename_ex(&file_handle, zend_string_path); ret = php_stream_open_for_zend_ex(&file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE); - zval_ptr_dtor(zend_string_path); + zend_string_release(zend_string_path); #else ret = php_stream_open_for_zend_ex(require_path, &file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE); #endif @@ -9062,7 +9061,7 @@ static int zephir_file_exists(zval *filename) #if PHP_VERSION_ID >= 80100 zend_string *file = zend_string_init(Z_STRVAL_P(filename), Z_STRLEN_P(filename), 0); php_stat(file, FS_EXISTS, &return_value); - zval_ptr_dtor(file); + zend_string_release(file); #else php_stat(Z_STRVAL_P(filename), (php_stat_len) Z_STRLEN_P(filename), FS_EXISTS, &return_value); #endif @@ -9285,7 +9284,7 @@ static void zephir_filemtime(zval *return_value, zval *path) #if PHP_VERSION_ID >= 80100 zend_string *file = zend_string_init(Z_STRVAL_P(path), Z_STRLEN_P(path), 0); php_stat(file, FS_MTIME, return_value); - zval_ptr_dtor(file); + zend_string_release(file); #else php_stat(Z_STRVAL_P(path), (php_stat_len)(Z_STRLEN_P(path)), FS_MTIME, return_value); #endif @@ -14080,11 +14079,11 @@ static PHP_METHOD(phalcon_8__closure, __invoke) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &element); zephir_memory_observe(&_0); - zephir_array_fetch_long(&_0, element, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 81); + zephir_array_fetch_long(&_0, element, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 86); _1 = Z_TYPE_P(&_0) != IS_ARRAY; if (!(_1)) { zephir_memory_observe(&_2); - zephir_array_fetch_long(&_2, element, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 81); + zephir_array_fetch_long(&_2, element, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 86); _1 = !(zephir_instance_of_ev(&_2, phalcon_filter_validation_abstractcombinedfieldsvalidator_ce)); } RETURN_MM_BOOL(_1); @@ -14123,11 +14122,11 @@ static PHP_METHOD(phalcon_9__closure, __invoke) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &element); zephir_memory_observe(&_0); - zephir_array_fetch_long(&_0, element, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 88); + zephir_array_fetch_long(&_0, element, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 93); _1 = Z_TYPE_P(&_0) == IS_ARRAY; if (_1) { zephir_memory_observe(&_2); - zephir_array_fetch_long(&_2, element, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 88); + zephir_array_fetch_long(&_2, element, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 93); _1 = zephir_instance_of_ev(&_2, phalcon_filter_validation_abstractcombinedfieldsvalidator_ce); } RETURN_MM_BOOL(_1); @@ -14816,7 +14815,7 @@ static PHP_METHOD(Phalcon_Tag, getTitle) zephir_read_static_property_ce(&_6$$3, phalcon_tag_ce, SL("documentPrependTitle"), PH_NOISY_CC); ZEPHIR_CPY_WRT(&documentPrependTitle, &_6$$3); if (!(ZEPHIR_IS_EMPTY(&documentPrependTitle))) { - ZEPHIR_CALL_FUNCTION(&tmp$$5, "array_reverse", NULL, 297, &documentPrependTitle); + ZEPHIR_CALL_FUNCTION(&tmp$$5, "array_reverse", NULL, 299, &documentPrependTitle); zephir_check_call_status(); zephir_is_iterable(&tmp$$5, 0, "phalcon/Tag.zep", 443); if (Z_TYPE_P(&tmp$$5) == IS_ARRAY) { @@ -16478,7 +16477,7 @@ static PHP_METHOD(Phalcon_Tag, textArea) ZVAL_STRING(&_1, "", &_2, ""); @@ -19021,7 +19020,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Stream, process) return; } ZVAL_LONG(&_6, 2); - ZEPHIR_CALL_FUNCTION(NULL, "flock", NULL, 132, &handler, &_6); + ZEPHIR_CALL_FUNCTION(NULL, "flock", NULL, 133, &handler, &_6); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_7, this_ptr, "getformatteditem", NULL, 0, item); zephir_check_call_status(); @@ -19052,7 +19051,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Stream, phpFopen) zephir_fetch_params(1, 2, 0, &filename_param, &mode_param); zephir_get_strval(&filename, filename_param); zephir_get_strval(&mode, mode_param); - ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 140, &filename, &mode); + ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 141, &filename, &mode); zephir_check_call_status(); RETURN_MM(); } @@ -19195,7 +19194,7 @@ static PHP_METHOD(Phalcon_Logger_Adapter_Syslog, process) zephir_cast_to_string(&_6$$3, &_5$$3); ZEPHIR_INIT_VAR(&_7$$3); ZVAL_STRING(&_7$$3, "Cannot open syslog for name [%s] and facility [%s]"); - ZEPHIR_CALL_FUNCTION(&_8$$3, "sprintf", NULL, 117, &_7$$3, &_4$$3, &_6$$3); + ZEPHIR_CALL_FUNCTION(&_8$$3, "sprintf", NULL, 118, &_7$$3, &_4$$3, &_6$$3); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 412, &_8$$3); zephir_check_call_status(); @@ -21002,7 +21001,7 @@ static PHP_METHOD(Phalcon_Di_Service, resolve) zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&instance, &builder, "build", NULL, 222, container, &definition, parameters); + ZEPHIR_CALL_METHOD(&instance, &builder, "build", NULL, 223, container, &definition, parameters); zephir_check_call_status(); } else { found = 0; @@ -21435,7 +21434,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build) } else { zephir_memory_observe(&arguments); if (zephir_array_isset_string_fetch(&arguments, &definition, SL("arguments"), 0)) { - ZEPHIR_CALL_METHOD(&_0$$8, this_ptr, "buildparameters", NULL, 223, container, &arguments); + ZEPHIR_CALL_METHOD(&_0$$8, this_ptr, "buildparameters", NULL, 224, container, &arguments); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&instance); ZEPHIR_LAST_CALL_STATUS = zephir_create_instance_params(&instance, &className, &_0$$8); @@ -21511,7 +21510,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build) } if (zephir_fast_count_int(&arguments)) { ZEPHIR_INIT_NVAR(&_13$$18); - ZEPHIR_CALL_METHOD(&_14$$18, this_ptr, "buildparameters", NULL, 223, container, &arguments); + ZEPHIR_CALL_METHOD(&_14$$18, this_ptr, "buildparameters", NULL, 224, container, &arguments); zephir_check_call_status(); ZEPHIR_CALL_USER_FUNC_ARRAY(&_13$$18, &methodCall, &_14$$18); zephir_check_call_status(); @@ -21579,7 +21578,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build) } if (zephir_fast_count_int(&arguments)) { ZEPHIR_INIT_NVAR(&_24$$24); - ZEPHIR_CALL_METHOD(&_25$$24, this_ptr, "buildparameters", NULL, 223, container, &arguments); + ZEPHIR_CALL_METHOD(&_25$$24, this_ptr, "buildparameters", NULL, 224, container, &arguments); zephir_check_call_status(); ZEPHIR_CALL_USER_FUNC_ARRAY(&_24$$24, &methodCall, &_25$$24); zephir_check_call_status(); @@ -21653,7 +21652,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_37$$28, this_ptr, "buildparameter", &_38, 224, container, &propertyPosition, &propertyValue); + ZEPHIR_CALL_METHOD(&_37$$28, this_ptr, "buildparameter", &_38, 225, container, &propertyPosition, &propertyValue); zephir_check_call_status(); zephir_update_property_zval_zval(&instance, &propertyName, &_37$$28); } ZEND_HASH_FOREACH_END(); @@ -21705,7 +21704,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, build) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_45$$32, this_ptr, "buildparameter", &_38, 224, container, &propertyPosition, &propertyValue); + ZEPHIR_CALL_METHOD(&_45$$32, this_ptr, "buildparameter", &_38, 225, container, &propertyPosition, &propertyValue); zephir_check_call_status(); zephir_update_property_zval_zval(&instance, &propertyName, &_45$$32); ZEPHIR_CALL_METHOD(NULL, ¶mCalls, "next", NULL, 0); @@ -21889,7 +21888,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, buildParameters) } ZEPHIR_INIT_NVAR(&argument); ZVAL_COPY(&argument, _0); - ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "buildparameter", &_5, 224, container, &position, &argument); + ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "buildparameter", &_5, 225, container, &position, &argument); zephir_check_call_status(); zephir_array_append(&buildArguments, &_4$$3, PH_SEPARATE, "phalcon/Di/Service/Builder.zep", 298); } ZEND_HASH_FOREACH_END(); @@ -21906,7 +21905,7 @@ static PHP_METHOD(Phalcon_Di_Service_Builder, buildParameters) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&argument, &arguments, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "buildparameter", &_5, 224, container, &position, &argument); + ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "buildparameter", &_5, 225, container, &position, &argument); zephir_check_call_status(); zephir_array_append(&buildArguments, &_6$$4, PH_SEPARATE, "phalcon/Di/Service/Builder.zep", 298); ZEPHIR_CALL_METHOD(NULL, &arguments, "next", NULL, 0); @@ -22137,7 +22136,7 @@ static PHP_METHOD(Phalcon_Annotations_Annotation, getExpression) ZEPHIR_INIT_NVAR(&item); ZVAL_COPY(&item, _1$$7); zephir_array_fetch_string(&_3$$8, &item, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Annotations/Annotation.zep", 139); - ZEPHIR_CALL_METHOD(&resolvedItem, this_ptr, "getexpression", &_4, 157, &_3$$8); + ZEPHIR_CALL_METHOD(&resolvedItem, this_ptr, "getexpression", &_4, 158, &_3$$8); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&name); if (zephir_array_isset_string_fetch(&name, &item, SL("name"), 0)) { @@ -22158,7 +22157,7 @@ static PHP_METHOD(Phalcon_Annotations_Annotation, getExpression) ZEPHIR_CALL_METHOD(&item, &_0$$7, "current", NULL, 0); zephir_check_call_status(); zephir_array_fetch_string(&_5$$11, &item, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Annotations/Annotation.zep", 139); - ZEPHIR_CALL_METHOD(&resolvedItem, this_ptr, "getexpression", &_4, 157, &_5$$11); + ZEPHIR_CALL_METHOD(&resolvedItem, this_ptr, "getexpression", &_4, 158, &_5$$11); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&name); if (zephir_array_isset_string_fetch(&name, &item, SL("name"), 0)) { @@ -22175,7 +22174,7 @@ static PHP_METHOD(Phalcon_Annotations_Annotation, getExpression) } if (ZEPHIR_IS_LONG(&type, 300)) { object_init_ex(return_value, phalcon_annotations_annotation_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 158, &expr); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 159, &expr); zephir_check_call_status(); RETURN_MM(); } @@ -22406,7 +22405,7 @@ static PHP_METHOD(Phalcon_Annotations_AnnotationsFactory, load) array_init(&_2); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "options"); - ZEPHIR_CALL_METHOD(&options, &_1, "__invoke", NULL, 159, config, &_3, &_2); + ZEPHIR_CALL_METHOD(&options, &_1, "__invoke", NULL, 160, config, &_3, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "newinstance", NULL, 0, &name, &options); zephir_check_call_status(); @@ -22534,7 +22533,7 @@ static PHP_METHOD(Phalcon_Annotations_Collection, __construct) ZVAL_COPY(&annotationData, _0); ZEPHIR_INIT_NVAR(&_2$$3); object_init_ex(&_2$$3, phalcon_annotations_annotation_ce); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", &_3, 158, &annotationData); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", &_3, 159, &annotationData); zephir_check_call_status(); zephir_array_append(&annotations, &_2$$3, PH_SEPARATE, "phalcon/Annotations/Collection.zep", 55); } ZEND_HASH_FOREACH_END(); @@ -22551,7 +22550,7 @@ static PHP_METHOD(Phalcon_Annotations_Collection, __construct) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_4$$4); object_init_ex(&_4$$4, phalcon_annotations_annotation_ce); - ZEPHIR_CALL_METHOD(NULL, &_4$$4, "__construct", &_3, 158, &annotationData); + ZEPHIR_CALL_METHOD(NULL, &_4$$4, "__construct", &_3, 159, &annotationData); zephir_check_call_status(); zephir_array_append(&annotations, &_4$$4, PH_SEPARATE, "phalcon/Annotations/Collection.zep", 55); ZEPHIR_CALL_METHOD(NULL, &reflectionData, "next", NULL, 0); @@ -24280,15 +24279,15 @@ static PHP_METHOD(Phalcon_Annotations_Reader, parse) array_init(&annotations); ZEPHIR_INIT_VAR(&reflection); object_init_ex(&reflection, zephir_get_internal_ce(SL("reflectionclass"))); - ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 154, &className); + ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 155, &className); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&comment, &reflection, "getdoccomment", NULL, 160); + ZEPHIR_CALL_METHOD(&comment, &reflection, "getdoccomment", NULL, 161); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) { ZEPHIR_INIT_VAR(&classAnnotations); - ZEPHIR_CALL_METHOD(&_0$$3, &reflection, "getfilename", NULL, 161); + ZEPHIR_CALL_METHOD(&_0$$3, &reflection, "getfilename", NULL, 162); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1$$3, &reflection, "getstartline", NULL, 162); + ZEPHIR_CALL_METHOD(&_1$$3, &reflection, "getstartline", NULL, 163); zephir_check_call_status(); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&classAnnotations, &comment, &_0$$3, &_1$$3); zephir_check_call_status(); @@ -24296,7 +24295,7 @@ static PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_array_update_string(&annotations, SL("class"), &classAnnotations, PH_COPY | PH_SEPARATE); } } - ZEPHIR_CALL_METHOD(&constants, &reflection, "getconstants", NULL, 163); + ZEPHIR_CALL_METHOD(&constants, &reflection, "getconstants", NULL, 164); zephir_check_call_status(); if (zephir_fast_count_int(&constants)) { line = 1; @@ -24310,13 +24309,13 @@ static PHP_METHOD(Phalcon_Annotations_Reader, parse) { ZEPHIR_INIT_NVAR(&constant); ZVAL_COPY(&constant, _2$$5); - ZEPHIR_CALL_METHOD(&constantReflection, &reflection, "getreflectionconstant", &_4, 164, &constant); + ZEPHIR_CALL_METHOD(&constantReflection, &reflection, "getreflectionconstant", &_4, 165, &constant); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&comment, &constantReflection, "getdoccomment", NULL, 0); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) { ZEPHIR_INIT_NVAR(&constantAnnotations); - ZEPHIR_CALL_METHOD(&_5$$7, &reflection, "getfilename", NULL, 161); + ZEPHIR_CALL_METHOD(&_5$$7, &reflection, "getfilename", NULL, 162); zephir_check_call_status(); ZVAL_LONG(&_6$$7, line); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&constantAnnotations, &comment, &_5$$7, &_6$$7); @@ -24337,13 +24336,13 @@ static PHP_METHOD(Phalcon_Annotations_Reader, parse) } ZEPHIR_CALL_METHOD(&constant, &arrayKeys, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&constantReflection, &reflection, "getreflectionconstant", &_4, 164, &constant); + ZEPHIR_CALL_METHOD(&constantReflection, &reflection, "getreflectionconstant", &_4, 165, &constant); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&comment, &constantReflection, "getdoccomment", NULL, 0); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) { ZEPHIR_INIT_NVAR(&constantAnnotations); - ZEPHIR_CALL_METHOD(&_7$$10, &reflection, "getfilename", NULL, 161); + ZEPHIR_CALL_METHOD(&_7$$10, &reflection, "getfilename", NULL, 162); zephir_check_call_status(); ZVAL_LONG(&_8$$10, line); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&constantAnnotations, &comment, &_7$$10, &_8$$10); @@ -24361,7 +24360,7 @@ static PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_array_update_string(&annotations, SL("constants"), &anotationsConstants, PH_COPY | PH_SEPARATE); } } - ZEPHIR_CALL_METHOD(&properties, &reflection, "getproperties", NULL, 165); + ZEPHIR_CALL_METHOD(&properties, &reflection, "getproperties", NULL, 166); zephir_check_call_status(); if (zephir_fast_count_int(&properties)) { line = 1; @@ -24377,7 +24376,7 @@ static PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) { ZEPHIR_INIT_NVAR(&propertyAnnotations); - ZEPHIR_CALL_METHOD(&_11$$15, &reflection, "getfilename", NULL, 161); + ZEPHIR_CALL_METHOD(&_11$$15, &reflection, "getfilename", NULL, 162); zephir_check_call_status(); ZVAL_LONG(&_12$$15, line); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&propertyAnnotations, &comment, &_11$$15, &_12$$15); @@ -24404,7 +24403,7 @@ static PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) { ZEPHIR_INIT_NVAR(&propertyAnnotations); - ZEPHIR_CALL_METHOD(&_14$$18, &reflection, "getfilename", NULL, 161); + ZEPHIR_CALL_METHOD(&_14$$18, &reflection, "getfilename", NULL, 162); zephir_check_call_status(); ZVAL_LONG(&_15$$18, line); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&propertyAnnotations, &comment, &_14$$18, &_15$$18); @@ -24424,7 +24423,7 @@ static PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_array_update_string(&annotations, SL("properties"), &annotationsProperties, PH_COPY | PH_SEPARATE); } } - ZEPHIR_CALL_METHOD(&methods, &reflection, "getmethods", NULL, 166); + ZEPHIR_CALL_METHOD(&methods, &reflection, "getmethods", NULL, 167); zephir_check_call_status(); if (0 == ZEPHIR_IS_EMPTY(&methods)) { ZEPHIR_INIT_VAR(&annotationsMethods); @@ -26495,33 +26494,33 @@ static PHP_METHOD(Phalcon_Annotations_Adapter_Stream, read) RETURN_MM_BOOL(0); } ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$false); - ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 133); + ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 134); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); ZVAL_STRING(&_4, "8.0"); ZEPHIR_INIT_VAR(&_5); ZVAL_STRING(&_5, ">="); - ZEPHIR_CALL_FUNCTION(&_6, "version_compare", NULL, 134, &version, &_4, &_5); + ZEPHIR_CALL_FUNCTION(&_6, "version_compare", NULL, 135, &version, &_4, &_5); zephir_check_call_status(); if (zephir_is_true(&_6)) { ZEPHIR_INIT_VAR(&_7$$5); ZEPHIR_INIT_NVAR(&_7$$5); zephir_create_closure_ex(&_7$$5, NULL, phalcon_5__closure_ce, SL("__invoke")); ZVAL_LONG(&_8$$5, 2); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 135, &_7$$5, &_8$$5); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 136, &_7$$5, &_8$$5); zephir_check_call_status(); } else { ZEPHIR_INIT_VAR(&_9$$6); ZEPHIR_INIT_NVAR(&_9$$6); zephir_create_closure_ex(&_9$$6, NULL, phalcon_6__closure_ce, SL("__invoke")); ZVAL_LONG(&_10$$6, 2); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 135, &_9$$6, &_10$$6); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 136, &_9$$6, &_10$$6); zephir_check_call_status(); } ZEPHIR_CALL_FUNCTION(&_11, "unserialize", NULL, 16, &contents); zephir_check_call_status(); ZEPHIR_CPY_WRT(&contents, &_11); - ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 136); + ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 137); zephir_check_call_status(); if (UNEXPECTED(ZEPHIR_GLOBAL(warning).enable)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_RuntimeException, "Cannot read annotation data", "phalcon/Annotations/Adapter/Stream.zep", 102); @@ -26947,7 +26946,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Events_Manager) zend_declare_property_null(phalcon_events_manager_ce, SL("events"), ZEND_ACC_PROTECTED); zend_declare_property_null(phalcon_events_manager_ce, SL("responses"), ZEND_ACC_PROTECTED); phalcon_events_manager_ce->create_object = zephir_init_properties_Phalcon_Events_Manager; - zephir_declare_class_constant_long(phalcon_events_manager_ce, SL("DEFAULT_PRIORITY"), 100); zend_class_implements(phalcon_events_manager_ce, 1, phalcon_events_managerinterface_ce); return SUCCESS; @@ -26999,7 +26997,7 @@ static PHP_METHOD(Phalcon_Events_Manager, attach) ZEPHIR_CALL_METHOD(&_0, this_ptr, "isvalidhandler", NULL, 0, handler); zephir_check_call_status(); if (UNEXPECTED(ZEPHIR_IS_FALSE_IDENTICAL(&_0))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_events_exception_ce, "Event handler must be an Object or Callable", "phalcon/Events/Manager.zep", 56); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_events_exception_ce, "Event handler must be an Object or Callable", "phalcon/Events/Manager.zep", 54); return; } zephir_memory_observe(&priorityQueue); @@ -27013,7 +27011,7 @@ static PHP_METHOD(Phalcon_Events_Manager, attach) } ZVAL_LONG(&_2$$4, 1); - ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "setextractflags", NULL, 271, &_2$$4); + ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "setextractflags", NULL, 272, &_2$$4); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("events"), &eventType, &priorityQueue); } @@ -27022,7 +27020,7 @@ static PHP_METHOD(Phalcon_Events_Manager, attach) priority = 100; } ZVAL_LONG(&_4, priority); - ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "insert", NULL, 272, handler, &_4); + ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "insert", NULL, 273, handler, &_4); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -27092,7 +27090,7 @@ static PHP_METHOD(Phalcon_Events_Manager, detach) ZEPHIR_CALL_METHOD(&_0, this_ptr, "isvalidhandler", NULL, 0, handler); zephir_check_call_status(); if (UNEXPECTED(ZEPHIR_IS_FALSE_IDENTICAL(&_0))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_events_exception_ce, "Event handler must be an Object or Callable", "phalcon/Events/Manager.zep", 107); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_events_exception_ce, "Event handler must be an Object or Callable", "phalcon/Events/Manager.zep", 105); return; } zephir_memory_observe(&priorityQueue); @@ -27106,7 +27104,7 @@ static PHP_METHOD(Phalcon_Events_Manager, detach) } ZVAL_LONG(&_2$$4, 1); - ZEPHIR_CALL_METHOD(NULL, &newPriorityQueue, "setextractflags", NULL, 271, &_2$$4); + ZEPHIR_CALL_METHOD(NULL, &newPriorityQueue, "setextractflags", NULL, 272, &_2$$4); zephir_check_call_status(); ZVAL_LONG(&_2$$4, 3); ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "setextractflags", NULL, 0, &_2$$4); @@ -27123,11 +27121,11 @@ static PHP_METHOD(Phalcon_Events_Manager, detach) zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "next", &_5, 0); zephir_check_call_status(); - zephir_array_fetch_string(&_6$$5, &data, SL("data"), PH_NOISY | PH_READONLY, "phalcon/Events/Manager.zep", 132); + zephir_array_fetch_string(&_6$$5, &data, SL("data"), PH_NOISY | PH_READONLY, "phalcon/Events/Manager.zep", 130); if (!ZEPHIR_IS_IDENTICAL(&_6$$5, handler)) { - zephir_array_fetch_string(&_7$$6, &data, SL("data"), PH_NOISY | PH_READONLY, "phalcon/Events/Manager.zep", 134); - zephir_array_fetch_string(&_8$$6, &data, SL("priority"), PH_NOISY | PH_READONLY, "phalcon/Events/Manager.zep", 136); - ZEPHIR_CALL_METHOD(NULL, &newPriorityQueue, "insert", &_9, 272, &_7$$6, &_8$$6); + zephir_array_fetch_string(&_7$$6, &data, SL("data"), PH_NOISY | PH_READONLY, "phalcon/Events/Manager.zep", 132); + zephir_array_fetch_string(&_8$$6, &data, SL("priority"), PH_NOISY | PH_READONLY, "phalcon/Events/Manager.zep", 134); + ZEPHIR_CALL_METHOD(NULL, &newPriorityQueue, "insert", &_9, 273, &_7$$6, &_8$$6); zephir_check_call_status(); } } @@ -27258,23 +27256,23 @@ static PHP_METHOD(Phalcon_Events_Manager, fire) if (ZEPHIR_IS_EMPTY(&events)) { RETURN_MM_NULL(); } - if (UNEXPECTED(!(zephir_memnstr_str(&eventType, SL(":"), "phalcon/Events/Manager.zep", 197)))) { + if (UNEXPECTED(!(zephir_memnstr_str(&eventType, SL(":"), "phalcon/Events/Manager.zep", 195)))) { ZEPHIR_INIT_VAR(&_1$$4); object_init_ex(&_1$$4, phalcon_events_exception_ce); ZEPHIR_INIT_VAR(&_2$$4); ZEPHIR_CONCAT_SV(&_2$$4, "Invalid event type ", &eventType); ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 33, &_2$$4); zephir_check_call_status(); - zephir_throw_exception_debug(&_1$$4, "phalcon/Events/Manager.zep", 198); + zephir_throw_exception_debug(&_1$$4, "phalcon/Events/Manager.zep", 196); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_INIT_VAR(&eventParts); zephir_fast_explode_str(&eventParts, SL(":"), &eventType, LONG_MAX); zephir_memory_observe(&type); - zephir_array_fetch_long(&type, &eventParts, 0, PH_NOISY, "phalcon/Events/Manager.zep", 202); + zephir_array_fetch_long(&type, &eventParts, 0, PH_NOISY, "phalcon/Events/Manager.zep", 200); zephir_memory_observe(&eventName); - zephir_array_fetch_long(&eventName, &eventParts, 1, PH_NOISY, "phalcon/Events/Manager.zep", 203); + zephir_array_fetch_long(&eventName, &eventParts, 1, PH_NOISY, "phalcon/Events/Manager.zep", 201); ZEPHIR_INIT_VAR(&status); ZVAL_NULL(&status); zephir_read_property(&_0, this_ptr, ZEND_STRL("collect"), PH_NOISY_CC | PH_READONLY); @@ -27290,19 +27288,19 @@ static PHP_METHOD(Phalcon_Events_Manager, fire) } else { ZVAL_BOOL(&_4, 0); } - ZEPHIR_CALL_METHOD(NULL, &event, "__construct", NULL, 273, &eventName, source, data, &_4); + ZEPHIR_CALL_METHOD(NULL, &event, "__construct", NULL, 274, &eventName, source, data, &_4); zephir_check_call_status(); zephir_memory_observe(&fireEvents); if (zephir_array_isset_fetch(&fireEvents, &events, &type, 0)) { if (Z_TYPE_P(&fireEvents) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", NULL, 274, &fireEvents, &event); + ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", NULL, 275, &fireEvents, &event); zephir_check_call_status(); } } ZEPHIR_OBS_NVAR(&fireEvents); if (zephir_array_isset_fetch(&fireEvents, &events, &eventType, 0)) { if (Z_TYPE_P(&fireEvents) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", NULL, 274, &fireEvents, &event); + ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", NULL, 275, &fireEvents, &event); zephir_check_call_status(); } } @@ -27344,7 +27342,7 @@ static PHP_METHOD(Phalcon_Events_Manager, fireQueue) ZEPHIR_CALL_METHOD(&eventName, event, "gettype", NULL, 0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&eventName) != IS_STRING)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_events_exception_ce, "The event type not valid", "phalcon/Events/Manager.zep", 250); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_events_exception_ce, "The event type not valid", "phalcon/Events/Manager.zep", 248); return; } ZEPHIR_CALL_METHOD(&source, event, "getsource", NULL, 0); @@ -27466,7 +27464,7 @@ static PHP_METHOD(Phalcon_Events_Manager, getListeners) } ZEPHIR_CALL_METHOD(&_2$$4, &priorityQueue, "current", &_3, 0); zephir_check_call_status(); - zephir_array_append(&listeners, &_2$$4, PH_SEPARATE, "phalcon/Events/Manager.zep", 333); + zephir_array_append(&listeners, &_2$$4, PH_SEPARATE, "phalcon/Events/Manager.zep", 331); ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "next", &_4, 0); zephir_check_call_status(); } @@ -27580,6 +27578,8 @@ ZEPHIR_INIT_CLASS(Phalcon_Events_ManagerInterface) { ZEPHIR_REGISTER_INTERFACE(Phalcon\\Events, ManagerInterface, phalcon, events_managerinterface, phalcon_events_managerinterface_method_entry); + zephir_declare_class_constant_long(phalcon_events_managerinterface_ce, SL("DEFAULT_PRIORITY"), 100); + return SUCCESS; } @@ -29828,10 +29828,10 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addComponent) } else { ZEPHIR_INIT_NVAR(&componentObject); object_init_ex(&componentObject, phalcon_acl_component_ce); - ZEPHIR_CALL_METHOD(NULL, &componentObject, "__construct", NULL, 143, componentValue); + ZEPHIR_CALL_METHOD(NULL, &componentObject, "__construct", NULL, 144, componentValue); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&componentName, &componentObject, "getname", NULL, 144); + ZEPHIR_CALL_METHOD(&componentName, &componentObject, "getname", NULL, 145); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("componentsNames"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset(&_1, &componentName))) { @@ -29879,7 +29879,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addComponentAccess) zephir_read_property(&_0, this_ptr, ZEND_STRL("componentsNames"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "Component"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 145, &_0, &componentName, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 146, &_0, &componentName, &_1); zephir_check_call_status(); _2 = Z_TYPE_P(accessList) != IS_ARRAY; if (_2) { @@ -30016,7 +30016,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZVAL_STRING(&_1, "Role"); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "role list"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 145, &_0, &roleName, &_1, &_2); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 146, &_0, &roleName, &_1, &_2); zephir_check_call_status(); zephir_read_property(&_3, this_ptr, ZEND_STRL("roleInherits"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset(&_3, &roleName))) { @@ -30080,7 +30080,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZEPHIR_INIT_NVAR(&usedRoleToInherit); ZVAL_COPY(&usedRoleToInherit, _17$$12); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 146, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 147, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -30096,7 +30096,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZEPHIR_CALL_METHOD(&usedRoleToInherit, &_16$$12, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 146, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 147, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_16$$12, "next", NULL, 0); @@ -30140,7 +30140,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZEPHIR_INIT_NVAR(&usedRoleToInherit); ZVAL_COPY(&usedRoleToInherit, _26$$18); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 146, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 147, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -30156,7 +30156,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZEPHIR_CALL_METHOD(&usedRoleToInherit, &_25$$18, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 146, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 147, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_25$$18, "next", NULL, 0); @@ -30223,7 +30223,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZEPHIR_INIT_NVAR(&usedRoleToInherit); ZVAL_COPY(&usedRoleToInherit, _37$$27); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 146, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 147, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -30239,7 +30239,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZEPHIR_CALL_METHOD(&usedRoleToInherit, &_36$$27, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 146, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 147, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_36$$27, "next", NULL, 0); @@ -30283,7 +30283,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZEPHIR_INIT_NVAR(&usedRoleToInherit); ZVAL_COPY(&usedRoleToInherit, _44$$33); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 146, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 147, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -30299,7 +30299,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZEPHIR_CALL_METHOD(&usedRoleToInherit, &_43$$33, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 146, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 147, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_43$$33, "next", NULL, 0); @@ -30355,13 +30355,13 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, addRole) } else if (Z_TYPE_P(role) == IS_STRING) { ZEPHIR_INIT_NVAR(&roleObject); object_init_ex(&roleObject, phalcon_acl_role_ce); - ZEPHIR_CALL_METHOD(NULL, &roleObject, "__construct", NULL, 147, role); + ZEPHIR_CALL_METHOD(NULL, &roleObject, "__construct", NULL, 148, role); zephir_check_call_status(); } else { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_acl_exception_ce, "Role must be either a string or implement RoleInterface", "phalcon/Acl/Adapter/Memory.zep", 394); return; } - ZEPHIR_CALL_METHOD(&roleName, &roleObject, "getname", NULL, 148); + ZEPHIR_CALL_METHOD(&roleName, &roleObject, "getname", NULL, 149); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("roles"), PH_NOISY_CC | PH_READONLY); if (zephir_array_isset(&_1, &roleName)) { @@ -30431,7 +30431,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, allow) ZEPHIR_INIT_NVAR(&role); ZVAL_COPY(&role, _2); ZVAL_LONG(&_4$$4, 1); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 149, &role, &componentName, access, &_4$$4, func); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 150, &role, &componentName, access, &_4$$4, func); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); } else { @@ -30446,7 +30446,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, allow) ZEPHIR_CALL_METHOD(&role, &rolesArray, "current", NULL, 0); zephir_check_call_status(); ZVAL_LONG(&_6$$5, 1); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 149, &role, &componentName, access, &_6$$5, func); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 150, &role, &componentName, access, &_6$$5, func); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &rolesArray, "next", NULL, 0); zephir_check_call_status(); @@ -30511,7 +30511,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, deny) ZEPHIR_INIT_NVAR(&role); ZVAL_COPY(&role, _2); ZVAL_LONG(&_4$$4, 0); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 149, &role, &componentName, access, &_4$$4, func); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 150, &role, &componentName, access, &_4$$4, func); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); } else { @@ -30526,7 +30526,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, deny) ZEPHIR_CALL_METHOD(&role, &rolesArray, "current", NULL, 0); zephir_check_call_status(); ZVAL_LONG(&_6$$5, 0); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 149, &role, &componentName, access, &_6$$5, func); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 150, &role, &componentName, access, &_6$$5, func); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &rolesArray, "next", NULL, 0); zephir_check_call_status(); @@ -30870,7 +30870,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) zephir_read_property(&_9$$12, this_ptr, ZEND_STRL("defaultAccess"), PH_NOISY_CC | PH_READONLY); RETURN_MM_BOOL((ZEPHIR_IS_LONG(&_9$$12, 1))); } - ZEPHIR_CALL_METHOD(&accessKey, this_ptr, "canaccess", NULL, 150, roleName, componentName, &access); + ZEPHIR_CALL_METHOD(&accessKey, this_ptr, "canaccess", NULL, 151, roleName, componentName, &access); zephir_check_call_status(); _10 = Z_TYPE_P(&accessKey) != IS_NULL; if (_10) { @@ -30899,9 +30899,9 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) if (zephir_is_callable(&funcAccess)) { ZEPHIR_INIT_VAR(&reflectionFunction); object_init_ex(&reflectionFunction, zephir_get_internal_ce(SL("reflectionfunction"))); - ZEPHIR_CALL_METHOD(NULL, &reflectionFunction, "__construct", NULL, 151, &funcAccess); + ZEPHIR_CALL_METHOD(NULL, &reflectionFunction, "__construct", NULL, 152, &funcAccess); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&reflectionParameters, &reflectionFunction, "getparameters", NULL, 152); + ZEPHIR_CALL_METHOD(&reflectionParameters, &reflectionFunction, "getparameters", NULL, 153); zephir_check_call_status(); ZEPHIR_INIT_VAR(¶meterNumber); ZVAL_LONG(¶meterNumber, zephir_fast_count_int(&reflectionParameters)); @@ -30917,7 +30917,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) } ZEPHIR_INIT_VAR(¶metersForFunction); array_init(¶metersForFunction); - ZEPHIR_CALL_METHOD(&numberOfRequiredParameters, &reflectionFunction, "getnumberofrequiredparameters", NULL, 153); + ZEPHIR_CALL_METHOD(&numberOfRequiredParameters, &reflectionFunction, "getnumberofrequiredparameters", NULL, 154); zephir_check_call_status(); ZEPHIR_CPY_WRT(&userParametersSizeShouldBe, ¶meterNumber); zephir_is_iterable(&reflectionParameters, 0, "phalcon/Acl/Adapter/Memory.zep", 767); @@ -30935,11 +30935,11 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&reflectionClass); object_init_ex(&reflectionClass, zephir_get_internal_ce(SL("reflectionclass"))); - ZEPHIR_CALL_METHOD(NULL, &reflectionClass, "__construct", &_17, 154, &className); + ZEPHIR_CALL_METHOD(NULL, &reflectionClass, "__construct", &_17, 155, &className); zephir_check_call_status(); _18$$18 = Z_TYPE_P(&roleObject) != IS_NULL; if (_18$$18) { - ZEPHIR_CALL_METHOD(&_19$$18, &reflectionClass, "isinstance", &_20, 155, &roleObject); + ZEPHIR_CALL_METHOD(&_19$$18, &reflectionClass, "isinstance", &_20, 156, &roleObject); zephir_check_call_status(); _18$$18 = zephir_is_true(&_19$$18); } @@ -30956,7 +30956,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) } _22$$18 = Z_TYPE_P(&componentObject) != IS_NULL; if (_22$$18) { - ZEPHIR_CALL_METHOD(&_23$$18, &reflectionClass, "isinstance", &_20, 155, &componentObject); + ZEPHIR_CALL_METHOD(&_23$$18, &reflectionClass, "isinstance", &_20, 156, &componentObject); zephir_check_call_status(); _22$$18 = zephir_is_true(&_23$$18); } @@ -30979,7 +30979,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) _27$$18 = _25$$18; if (_27$$18) { zephir_array_fetch(&_29$$18, ¶meters, ¶meterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 744); - ZEPHIR_CALL_METHOD(&_28$$18, &reflectionClass, "isinstance", &_20, 155, &_29$$18); + ZEPHIR_CALL_METHOD(&_28$$18, &reflectionClass, "isinstance", &_20, 156, &_29$$18); zephir_check_call_status(); _27$$18 = !zephir_is_true(&_28$$18); } @@ -30989,7 +30989,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) ZEPHIR_INIT_NVAR(&_31$$21); zephir_array_fetch(&_32$$21, ¶meters, ¶meterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 751); zephir_get_class(&_31$$21, &_32$$21, 0); - ZEPHIR_CALL_METHOD(&_33$$21, &reflectionClass, "getname", &_34, 156); + ZEPHIR_CALL_METHOD(&_33$$21, &reflectionClass, "getname", &_34, 157); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_35$$21); ZEPHIR_CONCAT_SSSVSVSVSVSVS(&_35$$21, "Your passed parameter doesn't have the ", "same class as the parameter in defined function ", "when checking if ", roleName, " can ", &access, " ", componentName, ". Class passed: ", &_31$$21, " , Class in defined function: ", &_33$$21, "."); @@ -31025,11 +31025,11 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&reflectionClass); object_init_ex(&reflectionClass, zephir_get_internal_ce(SL("reflectionclass"))); - ZEPHIR_CALL_METHOD(NULL, &reflectionClass, "__construct", &_17, 154, &className); + ZEPHIR_CALL_METHOD(NULL, &reflectionClass, "__construct", &_17, 155, &className); zephir_check_call_status(); _37$$24 = Z_TYPE_P(&roleObject) != IS_NULL; if (_37$$24) { - ZEPHIR_CALL_METHOD(&_38$$24, &reflectionClass, "isinstance", &_20, 155, &roleObject); + ZEPHIR_CALL_METHOD(&_38$$24, &reflectionClass, "isinstance", &_20, 156, &roleObject); zephir_check_call_status(); _37$$24 = zephir_is_true(&_38$$24); } @@ -31046,7 +31046,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) } _40$$24 = Z_TYPE_P(&componentObject) != IS_NULL; if (_40$$24) { - ZEPHIR_CALL_METHOD(&_41$$24, &reflectionClass, "isinstance", &_20, 155, &componentObject); + ZEPHIR_CALL_METHOD(&_41$$24, &reflectionClass, "isinstance", &_20, 156, &componentObject); zephir_check_call_status(); _40$$24 = zephir_is_true(&_41$$24); } @@ -31069,7 +31069,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) _45$$24 = _43$$24; if (_45$$24) { zephir_array_fetch(&_47$$24, ¶meters, ¶meterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 744); - ZEPHIR_CALL_METHOD(&_46$$24, &reflectionClass, "isinstance", &_20, 155, &_47$$24); + ZEPHIR_CALL_METHOD(&_46$$24, &reflectionClass, "isinstance", &_20, 156, &_47$$24); zephir_check_call_status(); _45$$24 = !zephir_is_true(&_46$$24); } @@ -31079,7 +31079,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) ZEPHIR_INIT_NVAR(&_49$$27); zephir_array_fetch(&_50$$27, ¶meters, ¶meterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 751); zephir_get_class(&_49$$27, &_50$$27, 0); - ZEPHIR_CALL_METHOD(&_51$$27, &reflectionClass, "getname", &_34, 156); + ZEPHIR_CALL_METHOD(&_51$$27, &reflectionClass, "getname", &_34, 157); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_52$$27); ZEPHIR_CONCAT_SSSVSVSVSVSVS(&_52$$27, "Your passed parameter doesn't have the ", "same class as the parameter in defined function ", "when checking if ", roleName, " can ", &access, " ", componentName, ". Class passed: ", &_49$$27, " , Class in defined function: ", &_51$$27, "."); @@ -31259,12 +31259,12 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, allowOrDeny) zephir_read_property(&_0, this_ptr, ZEND_STRL("roles"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "Role"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 145, &_0, &roleName, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 146, &_0, &roleName, &_1); zephir_check_call_status(); zephir_read_property(&_2, this_ptr, ZEND_STRL("componentsNames"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "Component"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 145, &_2, &componentName, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 146, &_2, &componentName, &_1); zephir_check_call_status(); zephir_read_property(&_3, this_ptr, ZEND_STRL("accessList"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&accessList, &_3); @@ -31451,7 +31451,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, canAccess) ZEPHIR_INIT_NVAR(&usedRoleToInherit); ZVAL_COPY(&usedRoleToInherit, _3$$6); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 146, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 147, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -31467,7 +31467,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, canAccess) ZEPHIR_CALL_METHOD(&usedRoleToInherit, &_2$$6, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 146, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 147, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_2$$6, "next", NULL, 0); @@ -31518,7 +31518,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, canAccess) ZEPHIR_INIT_NVAR(&usedRoleToInherit); ZVAL_COPY(&usedRoleToInherit, _13$$14); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 146, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 147, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -31534,7 +31534,7 @@ static PHP_METHOD(Phalcon_Acl_Adapter_Memory, canAccess) ZEPHIR_CALL_METHOD(&usedRoleToInherit, &_12$$14, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 146, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 147, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_12$$14, "next", NULL, 0); @@ -31823,32 +31823,32 @@ static PHP_METHOD(Phalcon_Http_Cookie, delete) ZEPHIR_INIT_VAR(&_8); ZVAL_STRING(&_8, "expires"); ZVAL_LONG(&_0, (zephir_get_numberval(&_3) - 691200)); - ZEPHIR_CALL_METHOD(&_7, this_ptr, "getarrval", NULL, 334, &options, &_8, &_0); + ZEPHIR_CALL_METHOD(&_7, this_ptr, "getarrval", NULL, 336, &options, &_8, &_0); zephir_check_call_status(); zephir_array_update_string(&options, SL("expires"), &_7, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_8); ZVAL_STRING(&_8, "domain"); - ZEPHIR_CALL_METHOD(&_9, this_ptr, "getarrval", NULL, 334, &options, &_8, &domain); + ZEPHIR_CALL_METHOD(&_9, this_ptr, "getarrval", NULL, 336, &options, &_8, &domain); zephir_check_call_status(); zephir_array_update_string(&options, SL("domain"), &_9, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_8); ZVAL_STRING(&_8, "path"); - ZEPHIR_CALL_METHOD(&_10, this_ptr, "getarrval", NULL, 334, &options, &_8, &path); + ZEPHIR_CALL_METHOD(&_10, this_ptr, "getarrval", NULL, 336, &options, &_8, &path); zephir_check_call_status(); zephir_array_update_string(&options, SL("path"), &_10, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_8); ZVAL_STRING(&_8, "secure"); - ZEPHIR_CALL_METHOD(&_11, this_ptr, "getarrval", NULL, 334, &options, &_8, &secure); + ZEPHIR_CALL_METHOD(&_11, this_ptr, "getarrval", NULL, 336, &options, &_8, &secure); zephir_check_call_status(); zephir_array_update_string(&options, SL("secure"), &_11, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_8); ZVAL_STRING(&_8, "httponly"); - ZEPHIR_CALL_METHOD(&_12, this_ptr, "getarrval", NULL, 334, &options, &_8, &httpOnly); + ZEPHIR_CALL_METHOD(&_12, this_ptr, "getarrval", NULL, 336, &options, &_8, &httpOnly); zephir_check_call_status(); zephir_array_update_string(&options, SL("httponly"), &_12, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_8); ZVAL_STRING(&_8, ""); - ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 335, &name, &_8, &options); + ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 337, &name, &_8, &options); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -32308,30 +32308,30 @@ static PHP_METHOD(Phalcon_Http_Cookie, send) } ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "expires"); - ZEPHIR_CALL_METHOD(&_13, this_ptr, "getarrval", NULL, 334, &options, &_3, &expire); + ZEPHIR_CALL_METHOD(&_13, this_ptr, "getarrval", NULL, 336, &options, &_3, &expire); zephir_check_call_status(); zephir_array_update_string(&options, SL("expires"), &_13, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "domain"); - ZEPHIR_CALL_METHOD(&_14, this_ptr, "getarrval", NULL, 334, &options, &_3, &domain); + ZEPHIR_CALL_METHOD(&_14, this_ptr, "getarrval", NULL, 336, &options, &_3, &domain); zephir_check_call_status(); zephir_array_update_string(&options, SL("domain"), &_14, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "path"); - ZEPHIR_CALL_METHOD(&_15, this_ptr, "getarrval", NULL, 334, &options, &_3, &path); + ZEPHIR_CALL_METHOD(&_15, this_ptr, "getarrval", NULL, 336, &options, &_3, &path); zephir_check_call_status(); zephir_array_update_string(&options, SL("path"), &_15, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "secure"); - ZEPHIR_CALL_METHOD(&_16, this_ptr, "getarrval", NULL, 334, &options, &_3, &secure); + ZEPHIR_CALL_METHOD(&_16, this_ptr, "getarrval", NULL, 336, &options, &_3, &secure); zephir_check_call_status(); zephir_array_update_string(&options, SL("secure"), &_16, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "httponly"); - ZEPHIR_CALL_METHOD(&_17, this_ptr, "getarrval", NULL, 334, &options, &_3, &httpOnly); + ZEPHIR_CALL_METHOD(&_17, this_ptr, "getarrval", NULL, 336, &options, &_3, &httpOnly); zephir_check_call_status(); zephir_array_update_string(&options, SL("httponly"), &_17, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 335, &name, &encryptValue, &options); + ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 337, &name, &encryptValue, &options); zephir_check_call_status(); RETURN_THIS(); } @@ -32607,14 +32607,14 @@ static PHP_METHOD(Phalcon_Http_Cookie, assertSignKeyIsLongEnough) } else { ZEPHIR_INIT_VAR(&signKey); } - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 246, &signKey); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 247, &signKey); zephir_check_call_status(); if (UNEXPECTED(ZEPHIR_LT_LONG(&length, 32))) { ZEPHIR_INIT_VAR(&_0$$3); object_init_ex(&_0$$3, phalcon_http_cookie_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "The cookie's key should be at least 32 characters long. Current length is %d."); - ZEPHIR_CALL_FUNCTION(&_2$$3, "sprintf", NULL, 117, &_1$$3, &length); + ZEPHIR_CALL_FUNCTION(&_2$$3, "sprintf", NULL, 118, &_1$$3, &length); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 33, &_2$$3); zephir_check_call_status(); @@ -32698,13 +32698,13 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Request) { ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Http, Request, phalcon, http_request, phalcon_di_abstractinjectionaware_ce, phalcon_http_request_method_entry, 0); - zend_declare_property_null(phalcon_http_request_ce, SL("filterService"), ZEND_ACC_PRIVATE); - zend_declare_property_bool(phalcon_http_request_ce, SL("httpMethodParameterOverride"), 0, ZEND_ACC_PRIVATE); - zend_declare_property_null(phalcon_http_request_ce, SL("queryFilters"), ZEND_ACC_PRIVATE); - zend_declare_property_null(phalcon_http_request_ce, SL("patchCache"), ZEND_ACC_PRIVATE); - zend_declare_property_null(phalcon_http_request_ce, SL("putCache"), ZEND_ACC_PRIVATE); - zend_declare_property_string(phalcon_http_request_ce, SL("rawBody"), "", ZEND_ACC_PRIVATE); - zend_declare_property_bool(phalcon_http_request_ce, SL("strictHostCheck"), 0, ZEND_ACC_PRIVATE); + zend_declare_property_null(phalcon_http_request_ce, SL("filterService"), ZEND_ACC_PROTECTED); + zend_declare_property_bool(phalcon_http_request_ce, SL("httpMethodParameterOverride"), 0, ZEND_ACC_PROTECTED); + zend_declare_property_null(phalcon_http_request_ce, SL("queryFilters"), ZEND_ACC_PROTECTED); + zend_declare_property_null(phalcon_http_request_ce, SL("postCache"), ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_http_request_ce, SL("rawBody"), "", ZEND_ACC_PROTECTED); + zend_declare_property_bool(phalcon_http_request_ce, SL("strictHostCheck"), 0, ZEND_ACC_PROTECTED); + zend_declare_property_null(phalcon_http_request_ce, SL("trustedProxies"), ZEND_ACC_PROTECTED); phalcon_http_request_ce->create_object = zephir_init_properties_Phalcon_Http_Request; zend_class_implements(phalcon_http_request_ce, 1, phalcon_http_requestinterface_ce); @@ -32780,7 +32780,7 @@ static PHP_METHOD(Phalcon_Http_Request, get) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 336, &_REQUEST, &name, filters, defaultValue, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 0, &_REQUEST, &name, filters, defaultValue, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -32801,7 +32801,7 @@ static PHP_METHOD(Phalcon_Http_Request, getAcceptableContent) ZVAL_STRING(&_0, "HTTP_ACCEPT"); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "accept"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 337, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 0, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -32856,7 +32856,7 @@ static PHP_METHOD(Phalcon_Http_Request, getBestAccept) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "accept"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 339, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 0, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -32877,7 +32877,7 @@ static PHP_METHOD(Phalcon_Http_Request, getBestCharset) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "charset"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 339, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 0, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -32898,7 +32898,7 @@ static PHP_METHOD(Phalcon_Http_Request, getBestLanguage) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "language"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 339, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 0, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -32946,16 +32946,35 @@ static PHP_METHOD(Phalcon_Http_Request, getPreferredIsoLocaleVariant) static PHP_METHOD(Phalcon_Http_Request, getClientAddress) { + zval _13$$32, _14$$32, _16$$34, _17$$34; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zephir_fcall_cache_entry *_8 = NULL, *_15 = NULL, *_18 = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *trustForwardedHeader_param = NULL, address, server, _0$$7, _1$$7; - zend_bool trustForwardedHeader; + zval *trustForwardedHeader_param = NULL, address, server, forwardedIps, forwardedIp, invertForwardedIp, trustedForwardedIp, filtered, trustedProxies, filterService, isIpAddressInCIDR, _1$$3, _2$$5, _3$$5, *_11$$5, _12$$5, *_4$$6, _5$$6, *_6$$7, _7$$7, *_9$$19, _10$$19; + zend_bool trustForwardedHeader, isTrusted = 0, _0$$3; zval *this_ptr = getThis(); ZVAL_UNDEF(&address); ZVAL_UNDEF(&server); - ZVAL_UNDEF(&_0$$7); - ZVAL_UNDEF(&_1$$7); + ZVAL_UNDEF(&forwardedIps); + ZVAL_UNDEF(&forwardedIp); + ZVAL_UNDEF(&invertForwardedIp); + ZVAL_UNDEF(&trustedForwardedIp); + ZVAL_UNDEF(&filtered); + ZVAL_UNDEF(&trustedProxies); + ZVAL_UNDEF(&filterService); + ZVAL_UNDEF(&isIpAddressInCIDR); + ZVAL_UNDEF(&_1$$3); + ZVAL_UNDEF(&_2$$5); + ZVAL_UNDEF(&_3$$5); + ZVAL_UNDEF(&_12$$5); + ZVAL_UNDEF(&_5$$6); + ZVAL_UNDEF(&_7$$7); + ZVAL_UNDEF(&_10$$19); + ZVAL_UNDEF(&_13$$32); + ZVAL_UNDEF(&_14$$32); + ZVAL_UNDEF(&_16$$34); + ZVAL_UNDEF(&_17$$34); ZEND_PARSE_PARAMETERS_START(0, 1) Z_PARAM_OPTIONAL Z_PARAM_BOOL(trustForwardedHeader) @@ -32967,31 +32986,218 @@ static PHP_METHOD(Phalcon_Http_Request, getClientAddress) trustForwardedHeader = 0; } else { } - ZEPHIR_INIT_VAR(&address); - ZVAL_NULL(&address); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 340); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 339); zephir_check_call_status(); if (trustForwardedHeader) { - ZEPHIR_OBS_NVAR(&address); + zephir_memory_observe(&address); zephir_array_isset_string_fetch(&address, &server, SL("HTTP_X_FORWARDED_FOR"), 0); if (Z_TYPE_P(&address) == IS_NULL) { ZEPHIR_OBS_NVAR(&address); zephir_array_isset_string_fetch(&address, &server, SL("HTTP_CLIENT_IP"), 0); } - } - if (Z_TYPE_P(&address) == IS_NULL) { + _0$$3 = Z_TYPE_P(&address) != IS_NULL; + if (_0$$3) { + ZEPHIR_INIT_VAR(&_1$$3); + ZVAL_STRING(&_1$$3, ","); + _0$$3 = zephir_memnstr(&address, &_1$$3, "phalcon/Http/Request.zep", 227); + } + if (_0$$3) { + zephir_read_property(&_2$$5, this_ptr, ZEND_STRL("trustedProxies"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CPY_WRT(&trustedProxies, &_2$$5); + ZEPHIR_INIT_VAR(&_3$$5); + ZVAL_STRING(&_3$$5, ","); + ZEPHIR_INIT_VAR(&forwardedIps); + zephir_fast_explode(&forwardedIps, &_3$$5, &address, LONG_MAX); + if (!(ZEPHIR_IS_EMPTY(&trustedProxies))) { + isTrusted = 0; + zephir_is_iterable(&forwardedIps, 0, "phalcon/Http/Request.zep", 257); + if (Z_TYPE_P(&forwardedIps) == IS_ARRAY) { + ZEND_HASH_REVERSE_FOREACH_VAL(Z_ARRVAL_P(&forwardedIps), _4$$6) + { + ZEPHIR_INIT_NVAR(&invertForwardedIp); + ZVAL_COPY(&invertForwardedIp, _4$$6); + if (isTrusted == 1) { + break; + } + zephir_is_iterable(&trustedProxies, 0, "phalcon/Http/Request.zep", 255); + if (Z_TYPE_P(&trustedProxies) == IS_ARRAY) { + ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&trustedProxies), _6$$7) + { + ZEPHIR_INIT_NVAR(&trustedForwardedIp); + ZVAL_COPY(&trustedForwardedIp, _6$$7); + if (zephir_memnstr_str(&trustedForwardedIp, SL("/"), "phalcon/Http/Request.zep", 242)) { + ZEPHIR_CALL_METHOD(&isIpAddressInCIDR, this_ptr, "isipaddressincidr", &_8, 0, &invertForwardedIp, &trustedForwardedIp); + zephir_check_call_status(); + if (ZEPHIR_IS_TRUE_IDENTICAL(&isIpAddressInCIDR)) { + isTrusted = 1; + break; + } + } else { + if (ZEPHIR_IS_IDENTICAL(&invertForwardedIp, &trustedForwardedIp)) { + isTrusted = 1; + break; + } + } + } ZEND_HASH_FOREACH_END(); + } else { + ZEPHIR_CALL_METHOD(NULL, &trustedProxies, "rewind", NULL, 0); + zephir_check_call_status(); + while (1) { + ZEPHIR_CALL_METHOD(&_7$$7, &trustedProxies, "valid", NULL, 0); + zephir_check_call_status(); + if (!zend_is_true(&_7$$7)) { + break; + } + ZEPHIR_CALL_METHOD(&trustedForwardedIp, &trustedProxies, "current", NULL, 0); + zephir_check_call_status(); + if (zephir_memnstr_str(&trustedForwardedIp, SL("/"), "phalcon/Http/Request.zep", 242)) { + ZEPHIR_CALL_METHOD(&isIpAddressInCIDR, this_ptr, "isipaddressincidr", &_8, 0, &invertForwardedIp, &trustedForwardedIp); + zephir_check_call_status(); + if (ZEPHIR_IS_TRUE_IDENTICAL(&isIpAddressInCIDR)) { + isTrusted = 1; + break; + } + } else { + if (ZEPHIR_IS_IDENTICAL(&invertForwardedIp, &trustedForwardedIp)) { + isTrusted = 1; + break; + } + } + ZEPHIR_CALL_METHOD(NULL, &trustedProxies, "next", NULL, 0); + zephir_check_call_status(); + } + } + ZEPHIR_INIT_NVAR(&trustedForwardedIp); + } ZEND_HASH_FOREACH_END(); + } else { + ZEPHIR_CALL_METHOD(NULL, &forwardedIps, "rewind", NULL, 0); + zephir_check_call_status(); + while (1) { + ZEPHIR_CALL_METHOD(&_5$$6, &forwardedIps, "valid", NULL, 0); + zephir_check_call_status(); + if (!zend_is_true(&_5$$6)) { + break; + } + ZEPHIR_CALL_METHOD(&invertForwardedIp, &forwardedIps, "current", NULL, 0); + zephir_check_call_status(); + if (isTrusted == 1) { + break; + } + zephir_is_iterable(&trustedProxies, 0, "phalcon/Http/Request.zep", 255); + if (Z_TYPE_P(&trustedProxies) == IS_ARRAY) { + ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&trustedProxies), _9$$19) + { + ZEPHIR_INIT_NVAR(&trustedForwardedIp); + ZVAL_COPY(&trustedForwardedIp, _9$$19); + if (zephir_memnstr_str(&trustedForwardedIp, SL("/"), "phalcon/Http/Request.zep", 242)) { + ZEPHIR_CALL_METHOD(&isIpAddressInCIDR, this_ptr, "isipaddressincidr", &_8, 0, &invertForwardedIp, &trustedForwardedIp); + zephir_check_call_status(); + if (ZEPHIR_IS_TRUE_IDENTICAL(&isIpAddressInCIDR)) { + isTrusted = 1; + break; + } + } else { + if (ZEPHIR_IS_IDENTICAL(&invertForwardedIp, &trustedForwardedIp)) { + isTrusted = 1; + break; + } + } + } ZEND_HASH_FOREACH_END(); + } else { + ZEPHIR_CALL_METHOD(NULL, &trustedProxies, "rewind", NULL, 0); + zephir_check_call_status(); + while (1) { + ZEPHIR_CALL_METHOD(&_10$$19, &trustedProxies, "valid", NULL, 0); + zephir_check_call_status(); + if (!zend_is_true(&_10$$19)) { + break; + } + ZEPHIR_CALL_METHOD(&trustedForwardedIp, &trustedProxies, "current", NULL, 0); + zephir_check_call_status(); + if (zephir_memnstr_str(&trustedForwardedIp, SL("/"), "phalcon/Http/Request.zep", 242)) { + ZEPHIR_CALL_METHOD(&isIpAddressInCIDR, this_ptr, "isipaddressincidr", &_8, 0, &invertForwardedIp, &trustedForwardedIp); + zephir_check_call_status(); + if (ZEPHIR_IS_TRUE_IDENTICAL(&isIpAddressInCIDR)) { + isTrusted = 1; + break; + } + } else { + if (ZEPHIR_IS_IDENTICAL(&invertForwardedIp, &trustedForwardedIp)) { + isTrusted = 1; + break; + } + } + ZEPHIR_CALL_METHOD(NULL, &trustedProxies, "next", NULL, 0); + zephir_check_call_status(); + } + } + ZEPHIR_INIT_NVAR(&trustedForwardedIp); + ZEPHIR_CALL_METHOD(NULL, &forwardedIps, "next", NULL, 0); + zephir_check_call_status(); + } + } + ZEPHIR_INIT_NVAR(&invertForwardedIp); + if (!(isTrusted)) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(zend_ce_exception, "The forwarded proxy IP addresses are not trusted.", "phalcon/Http/Request.zep", 258); + return; + } + } + ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 340); + zephir_check_call_status(); + zephir_is_iterable(&forwardedIps, 0, "phalcon/Http/Request.zep", 275); + if (Z_TYPE_P(&forwardedIps) == IS_ARRAY) { + ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&forwardedIps), _11$$5) + { + ZEPHIR_INIT_NVAR(&forwardedIp); + ZVAL_COPY(&forwardedIp, _11$$5); + ZEPHIR_INIT_NVAR(&_13$$32); + zephir_create_array(&_13$$32, 1, 0); + ZEPHIR_INIT_NVAR(&_14$$32); + zephir_create_array(&_14$$32, 1, 0); + add_assoc_long_ex(&_14$$32, SL("filter"), (8388608 | 4194304)); + zephir_array_update_string(&_13$$32, SL("ip"), &_14$$32, PH_COPY | PH_SEPARATE); + ZEPHIR_CALL_METHOD(&filtered, &filterService, "sanitize", &_15, 0, &forwardedIp, &_13$$32); + zephir_check_call_status(); + if (zephir_is_true(&filtered)) { + RETURN_CCTOR(&filtered); + } + } ZEND_HASH_FOREACH_END(); + } else { + ZEPHIR_CALL_METHOD(NULL, &forwardedIps, "rewind", NULL, 0); + zephir_check_call_status(); + while (1) { + ZEPHIR_CALL_METHOD(&_12$$5, &forwardedIps, "valid", NULL, 0); + zephir_check_call_status(); + if (!zend_is_true(&_12$$5)) { + break; + } + ZEPHIR_CALL_METHOD(&forwardedIp, &forwardedIps, "current", NULL, 0); + zephir_check_call_status(); + ZEPHIR_INIT_NVAR(&_16$$34); + zephir_create_array(&_16$$34, 1, 0); + ZEPHIR_INIT_NVAR(&_17$$34); + zephir_create_array(&_17$$34, 1, 0); + add_assoc_long_ex(&_17$$34, SL("filter"), (8388608 | 4194304)); + zephir_array_update_string(&_16$$34, SL("ip"), &_17$$34, PH_COPY | PH_SEPARATE); + ZEPHIR_CALL_METHOD(&filtered, &filterService, "sanitize", &_18, 0, &forwardedIp, &_16$$34); + zephir_check_call_status(); + if (zephir_is_true(&filtered)) { + RETURN_CCTOR(&filtered); + } + ZEPHIR_CALL_METHOD(NULL, &forwardedIps, "next", NULL, 0); + zephir_check_call_status(); + } + } + ZEPHIR_INIT_NVAR(&forwardedIp); + RETURN_MM_BOOL(0); + } + } else { ZEPHIR_OBS_NVAR(&address); zephir_array_isset_string_fetch(&address, &server, SL("REMOTE_ADDR"), 0); } - if (Z_TYPE_P(&address) != IS_STRING) { + if (!(Z_TYPE_P(&address) == IS_STRING)) { RETURN_MM_BOOL(0); } - if (zephir_memnstr_str(&address, SL(","), "phalcon/Http/Request.zep", 232)) { - ZEPHIR_INIT_VAR(&_0$$7); - zephir_fast_explode_str(&_0$$7, SL(","), &address, LONG_MAX); - zephir_array_fetch_long(&_1$$7, &_0$$7, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 237); - RETURN_CTOR(&_1$$7); - } RETURN_CCTOR(&address); } @@ -33011,7 +33217,7 @@ static PHP_METHOD(Phalcon_Http_Request, getClientCharsets) ZVAL_STRING(&_0, "HTTP_ACCEPT_CHARSET"); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "charset"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 337, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 0, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -33028,7 +33234,7 @@ static PHP_METHOD(Phalcon_Http_Request, getContentType) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 340); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 339); zephir_check_call_status(); if (!(zephir_array_isset_string_fetch(&contentType, &server, SL("CONTENT_TYPE"), 1))) { RETURN_MM_NULL(); @@ -33062,7 +33268,7 @@ static PHP_METHOD(Phalcon_Http_Request, getDigestAuth) ZEPHIR_INIT_VAR(&auth); array_init(&auth); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 340); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 339); zephir_check_call_status(); zephir_memory_observe(&digest); if (zephir_array_isset_string_fetch(&digest, &server, SL("PHP_AUTH_DIGEST"), 0)) { @@ -33078,15 +33284,15 @@ static PHP_METHOD(Phalcon_Http_Request, getDigestAuth) RETURN_CTOR(&auth); } if (Z_TYPE_P(&matches) == IS_ARRAY) { - zephir_is_iterable(&matches, 0, "phalcon/Http/Request.zep", 291); + zephir_is_iterable(&matches, 0, "phalcon/Http/Request.zep", 336); if (Z_TYPE_P(&matches) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&matches), _3$$5) { ZEPHIR_INIT_NVAR(&match); ZVAL_COPY(&match, _3$$5); - zephir_array_fetch_long(&_5$$6, &match, 3, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 289); + zephir_array_fetch_long(&_5$$6, &match, 3, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 334); ZEPHIR_OBS_NVAR(&_6$$6); - zephir_array_fetch_long(&_6$$6, &match, 1, PH_NOISY, "phalcon/Http/Request.zep", 289); + zephir_array_fetch_long(&_6$$6, &match, 1, PH_NOISY, "phalcon/Http/Request.zep", 334); zephir_array_update_zval(&auth, &_6$$6, &_5$$6, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); } else { @@ -33100,9 +33306,9 @@ static PHP_METHOD(Phalcon_Http_Request, getDigestAuth) } ZEPHIR_CALL_METHOD(&match, &matches, "current", NULL, 0); zephir_check_call_status(); - zephir_array_fetch_long(&_7$$7, &match, 3, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 289); + zephir_array_fetch_long(&_7$$7, &match, 3, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 334); ZEPHIR_OBS_NVAR(&_8$$7); - zephir_array_fetch_long(&_8$$7, &match, 1, PH_NOISY, "phalcon/Http/Request.zep", 289); + zephir_array_fetch_long(&_8$$7, &match, 1, PH_NOISY, "phalcon/Http/Request.zep", 334); zephir_array_update_zval(&auth, &_8$$7, &_7$$7, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &matches, "next", NULL, 0); zephir_check_call_status(); @@ -33405,7 +33611,7 @@ static PHP_METHOD(Phalcon_Http_Request, getHeader) zephir_check_call_status(); ZEPHIR_INIT_VAR(&name); zephir_fast_strtoupper(&name, &_2); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 340); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 339); zephir_check_call_status(); zephir_memory_observe(&value); if (zephir_array_isset_fetch(&value, &server, &name, 0)) { @@ -33484,9 +33690,9 @@ static PHP_METHOD(Phalcon_Http_Request, getHeaders) zephir_array_update_string(&contentHeaders, SL("CONTENT_TYPE"), &__$true, PH_COPY | PH_SEPARATE); zephir_array_update_string(&contentHeaders, SL("CONTENT_LENGTH"), &__$true, PH_COPY | PH_SEPARATE); zephir_array_update_string(&contentHeaders, SL("CONTENT_MD5"), &__$true, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 340); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 339); zephir_check_call_status(); - zephir_is_iterable(&server, 0, "phalcon/Http/Request.zep", 461); + zephir_is_iterable(&server, 0, "phalcon/Http/Request.zep", 506); if (Z_TYPE_P(&server) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&server), _2, _3, _0) { @@ -33510,7 +33716,7 @@ static PHP_METHOD(Phalcon_Http_Request, getHeaders) ZVAL_STRING(&_9$$4, " "); zephir_fast_str_replace(&_5$$4, &_8$$4, &_9$$4, &_7$$4); zephir_fast_strtolower(&_4$$4, &_5$$4); - ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 288, &_4$$4); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 290, &_4$$4); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_11$$4); ZEPHIR_INIT_NVAR(&_12$$4); @@ -33534,7 +33740,7 @@ static PHP_METHOD(Phalcon_Http_Request, getHeaders) ZVAL_STRING(&_18$$5, " "); zephir_fast_str_replace(&_16$$5, &_17$$5, &_18$$5, &name); zephir_fast_strtolower(&_15$$5, &_16$$5); - ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 288, &_15$$5); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 290, &_15$$5); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_19$$5); ZEPHIR_INIT_NVAR(&_20$$5); @@ -33571,7 +33777,7 @@ static PHP_METHOD(Phalcon_Http_Request, getHeaders) ZVAL_STRING(&_27$$7, " "); zephir_fast_str_replace(&_23$$7, &_26$$7, &_27$$7, &_25$$7); zephir_fast_strtolower(&_22$$7, &_23$$7); - ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 288, &_22$$7); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 290, &_22$$7); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_28$$7); ZEPHIR_INIT_NVAR(&_29$$7); @@ -33595,7 +33801,7 @@ static PHP_METHOD(Phalcon_Http_Request, getHeaders) ZVAL_STRING(&_35$$8, " "); zephir_fast_str_replace(&_33$$8, &_34$$8, &_35$$8, &name); zephir_fast_strtolower(&_32$$8, &_33$$8); - ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 288, &_32$$8); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 290, &_32$$8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_36$$8); ZEPHIR_INIT_NVAR(&_37$$8); @@ -33676,7 +33882,7 @@ static PHP_METHOD(Phalcon_Http_Request, getHttpHost) zephir_fast_trim(&_4$$5, &host, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_VAR(&cleanHost); zephir_fast_strtolower(&cleanHost, &_4$$5); - if (zephir_memnstr_str(&cleanHost, SL(":"), "phalcon/Http/Request.zep", 535)) { + if (zephir_memnstr_str(&cleanHost, SL(":"), "phalcon/Http/Request.zep", 580)) { ZEPHIR_INIT_VAR(&_5$$6); ZVAL_STRING(&_5$$6, "/:[[:digit:]]+$/"); ZEPHIR_INIT_VAR(&_6$$6); @@ -33700,7 +33906,7 @@ static PHP_METHOD(Phalcon_Http_Request, getHttpHost) ZEPHIR_CONCAT_SV(&_13$$7, "Invalid host ", &host); ZEPHIR_CALL_METHOD(NULL, &_12$$7, "__construct", NULL, 341, &_13$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_12$$7, "phalcon/Http/Request.zep", 545); + zephir_throw_exception_debug(&_12$$7, "phalcon/Http/Request.zep", 590); ZEPHIR_MM_RESTORE(); return; } @@ -33723,7 +33929,7 @@ static PHP_METHOD(Phalcon_Http_Request, getHTTPReferer) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 340); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 339); zephir_check_call_status(); if (!(zephir_array_isset_string_fetch(&httpReferer, &server, SL("HTTP_REFERER"), 1))) { RETURN_MM_STRING(""); @@ -33774,7 +33980,7 @@ static PHP_METHOD(Phalcon_Http_Request, getJsonRawBody) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(&_0, "__invoke", NULL, 196, &rawBody, &_1); + ZEPHIR_RETURN_CALL_METHOD(&_0, "__invoke", NULL, 197, &rawBody, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -33795,7 +34001,7 @@ static PHP_METHOD(Phalcon_Http_Request, getLanguages) ZVAL_STRING(&_0, "HTTP_ACCEPT_LANGUAGE"); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "language"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 337, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 0, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -33823,7 +34029,7 @@ static PHP_METHOD(Phalcon_Http_Request, getMethod) zephir_get_global(&_REQUEST, SL("_REQUEST")); ZEPHIR_INIT_VAR(&returnMethod); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 340); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 339); zephir_check_call_status(); zephir_memory_observe(&requestMethod); if (EXPECTED(zephir_array_isset_string_fetch(&requestMethod, &server, SL("REQUEST_METHOD"), 0))) { @@ -33837,7 +34043,7 @@ static PHP_METHOD(Phalcon_Http_Request, getMethod) if (ZEPHIR_IS_IDENTICAL(&_0, &returnMethod)) { ZEPHIR_INIT_VAR(&_1$$5); ZVAL_STRING(&_1$$5, "X-HTTP-METHOD-OVERRIDE"); - ZEPHIR_CALL_METHOD(&overridedMethod, this_ptr, "getheader", NULL, 342, &_1$$5); + ZEPHIR_CALL_METHOD(&overridedMethod, this_ptr, "getheader", NULL, 0, &_1$$5); zephir_check_call_status(); zephir_read_property(&_2$$5, this_ptr, ZEND_STRL("httpMethodParameterOverride"), PH_NOISY_CC | PH_READONLY); if (!(ZEPHIR_IS_EMPTY(&overridedMethod))) { @@ -33864,7 +34070,7 @@ static PHP_METHOD(Phalcon_Http_Request, getPatch) zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zend_bool notAllowEmpty, noRecursive; - zval *name_param = NULL, *filters = NULL, filters_sub, *defaultValue = NULL, defaultValue_sub, *notAllowEmpty_param = NULL, *noRecursive_param = NULL, __$null, _0, _1, _2; + zval *name_param = NULL, *filters = NULL, filters_sub, *defaultValue = NULL, defaultValue_sub, *notAllowEmpty_param = NULL, *noRecursive_param = NULL, __$null, _0, _1, _2, _3, _4; zval name; zval *this_ptr = getThis(); @@ -33875,6 +34081,8 @@ static PHP_METHOD(Phalcon_Http_Request, getPatch) ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1); ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_3); + ZVAL_UNDEF(&_4); bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 5) Z_PARAM_OPTIONAL @@ -33916,19 +34124,22 @@ static PHP_METHOD(Phalcon_Http_Request, getPatch) noRecursive = 0; } else { } - ZEPHIR_INIT_VAR(&_0); - ZVAL_STRING(&_0, "patchCache"); + zephir_read_property(&_1, this_ptr, ZEND_STRL("postCache"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getpostdata", NULL, 342, &_1); + zephir_check_call_status(); + zephir_update_property_zval(this_ptr, ZEND_STRL("postCache"), &_0); + zephir_read_property(&_2, this_ptr, ZEND_STRL("postCache"), PH_NOISY_CC | PH_READONLY); if (notAllowEmpty) { - ZVAL_BOOL(&_1, 1); + ZVAL_BOOL(&_3, 1); } else { - ZVAL_BOOL(&_1, 0); + ZVAL_BOOL(&_3, 0); } if (noRecursive) { - ZVAL_BOOL(&_2, 1); + ZVAL_BOOL(&_4, 1); } else { - ZVAL_BOOL(&_2, 0); + ZVAL_BOOL(&_4, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getpatchput", NULL, 343, &_0, &name, filters, defaultValue, &_1, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 0, &_2, &name, filters, defaultValue, &_3, &_4); zephir_check_call_status(); RETURN_MM(); } @@ -33964,10 +34175,10 @@ static PHP_METHOD(Phalcon_Http_Request, getPort) zephir_check_call_status(); RETURN_MM_LONG(zephir_get_intval(&_1$$3)); } - if (zephir_memnstr_str(&host, SL(":"), "phalcon/Http/Request.zep", 686)) { + if (zephir_memnstr_str(&host, SL(":"), "phalcon/Http/Request.zep", 733)) { ZEPHIR_INIT_VAR(&_3$$4); ZVAL_STRING(&_3$$4, ":"); - ZEPHIR_CALL_FUNCTION(&pos, "strrpos", NULL, 241, &host, &_3$$4); + ZEPHIR_CALL_FUNCTION(&pos, "strrpos", NULL, 242, &host, &_3$$4); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&pos)) { ZVAL_LONG(&_4$$5, (zephir_get_numberval(&pos) + 1)); @@ -33996,7 +34207,7 @@ static PHP_METHOD(Phalcon_Http_Request, getPost) zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zend_bool notAllowEmpty, noRecursive; - zval *name_param = NULL, *filters = NULL, filters_sub, *defaultValue = NULL, defaultValue_sub, *notAllowEmpty_param = NULL, *noRecursive_param = NULL, _POST, __$null, _0, _1; + zval *name_param = NULL, *filters = NULL, filters_sub, *defaultValue = NULL, defaultValue_sub, *notAllowEmpty_param = NULL, *noRecursive_param = NULL, _POST, __$null, _0, _1, _2, _3; zval name; zval *this_ptr = getThis(); @@ -34007,6 +34218,8 @@ static PHP_METHOD(Phalcon_Http_Request, getPost) ZVAL_NULL(&__$null); ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_3); bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 5) Z_PARAM_OPTIONAL @@ -34049,17 +34262,21 @@ static PHP_METHOD(Phalcon_Http_Request, getPost) noRecursive = 0; } else { } + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getpostdata", NULL, 342, &_POST); + zephir_check_call_status(); + zephir_update_property_zval(this_ptr, ZEND_STRL("postCache"), &_0); + zephir_read_property(&_1, this_ptr, ZEND_STRL("postCache"), PH_NOISY_CC | PH_READONLY); if (notAllowEmpty) { - ZVAL_BOOL(&_0, 1); + ZVAL_BOOL(&_2, 1); } else { - ZVAL_BOOL(&_0, 0); + ZVAL_BOOL(&_2, 0); } if (noRecursive) { - ZVAL_BOOL(&_1, 1); + ZVAL_BOOL(&_3, 1); } else { - ZVAL_BOOL(&_1, 0); + ZVAL_BOOL(&_3, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 336, &_POST, &name, filters, defaultValue, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 0, &_1, &name, filters, defaultValue, &_2, &_3); zephir_check_call_status(); RETURN_MM(); } @@ -34069,7 +34286,7 @@ static PHP_METHOD(Phalcon_Http_Request, getPut) zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zend_bool notAllowEmpty, noRecursive; - zval *name_param = NULL, *filters = NULL, filters_sub, *defaultValue = NULL, defaultValue_sub, *notAllowEmpty_param = NULL, *noRecursive_param = NULL, __$null, _0, _1, _2; + zval *name_param = NULL, *filters = NULL, filters_sub, *defaultValue = NULL, defaultValue_sub, *notAllowEmpty_param = NULL, *noRecursive_param = NULL, __$null, _0, _1, _2, _3, _4; zval name; zval *this_ptr = getThis(); @@ -34080,6 +34297,8 @@ static PHP_METHOD(Phalcon_Http_Request, getPut) ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1); ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_3); + ZVAL_UNDEF(&_4); bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 5) Z_PARAM_OPTIONAL @@ -34121,19 +34340,22 @@ static PHP_METHOD(Phalcon_Http_Request, getPut) noRecursive = 0; } else { } - ZEPHIR_INIT_VAR(&_0); - ZVAL_STRING(&_0, "putCache"); + zephir_read_property(&_1, this_ptr, ZEND_STRL("postCache"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getpostdata", NULL, 342, &_1); + zephir_check_call_status(); + zephir_update_property_zval(this_ptr, ZEND_STRL("postCache"), &_0); + zephir_read_property(&_2, this_ptr, ZEND_STRL("postCache"), PH_NOISY_CC | PH_READONLY); if (notAllowEmpty) { - ZVAL_BOOL(&_1, 1); + ZVAL_BOOL(&_3, 1); } else { - ZVAL_BOOL(&_1, 0); + ZVAL_BOOL(&_3, 0); } if (noRecursive) { - ZVAL_BOOL(&_2, 1); + ZVAL_BOOL(&_4, 1); } else { - ZVAL_BOOL(&_2, 0); + ZVAL_BOOL(&_4, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getpatchput", NULL, 343, &_0, &name, filters, defaultValue, &_1, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 0, &_2, &name, filters, defaultValue, &_3, &_4); zephir_check_call_status(); RETURN_MM(); } @@ -34206,7 +34428,7 @@ static PHP_METHOD(Phalcon_Http_Request, getQuery) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 336, &_GET, &name, filters, defaultValue, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 0, &_GET, &name, filters, defaultValue, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -34290,7 +34512,7 @@ static PHP_METHOD(Phalcon_Http_Request, getServer) } else { ZEPHIR_INIT_VAR(&name); } - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 340); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 339); zephir_check_call_status(); if (!(zephir_array_isset_fetch(&serverValue, &server, &name, 1))) { RETURN_MM_NULL(); @@ -34318,7 +34540,7 @@ static PHP_METHOD(Phalcon_Http_Request, getServerAddress) if (Z_TYPE_P(&serverAddr) == IS_NULL) { ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "localhost"); - ZEPHIR_RETURN_CALL_FUNCTION("gethostbyname", NULL, 344, &_1$$3); + ZEPHIR_RETURN_CALL_FUNCTION("gethostbyname", NULL, 343, &_1$$3); zephir_check_call_status(); RETURN_MM(); } @@ -34440,7 +34662,7 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) array_init(&files); ZEPHIR_CPY_WRT(&superFiles, &_FILES); if (zephir_fast_count_int(&superFiles) > 0) { - zephir_is_iterable(&superFiles, 0, "phalcon/Http/Request.zep", 930); + zephir_is_iterable(&superFiles, 0, "phalcon/Http/Request.zep", 981); if (Z_TYPE_P(&superFiles) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&superFiles), _2$$3, _3$$3, _0$$3) { @@ -34453,16 +34675,16 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) ZEPHIR_INIT_NVAR(&input); ZVAL_COPY(&input, _0$$3); ZEPHIR_OBS_NVAR(&_4$$4); - zephir_array_fetch_string(&_4$$4, &input, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 887); + zephir_array_fetch_string(&_4$$4, &input, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 938); if (Z_TYPE_P(&_4$$4) == IS_ARRAY) { - zephir_array_fetch_string(&_5$$5, &input, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 889); - zephir_array_fetch_string(&_6$$5, &input, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 890); - zephir_array_fetch_string(&_7$$5, &input, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 891); - zephir_array_fetch_string(&_8$$5, &input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 892); - zephir_array_fetch_string(&_9$$5, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 893); - ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 345, &_5$$5, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &prefix); - zephir_check_call_status(); - zephir_is_iterable(&smoothInput, 0, "phalcon/Http/Request.zep", 920); + zephir_array_fetch_string(&_5$$5, &input, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 940); + zephir_array_fetch_string(&_6$$5, &input, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 941); + zephir_array_fetch_string(&_7$$5, &input, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 942); + zephir_array_fetch_string(&_8$$5, &input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 943); + zephir_array_fetch_string(&_9$$5, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 944); + ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 0, &_5$$5, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &prefix); + zephir_check_call_status(); + zephir_is_iterable(&smoothInput, 0, "phalcon/Http/Request.zep", 971); if (Z_TYPE_P(&smoothInput) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&smoothInput), _11$$5) { @@ -34470,43 +34692,43 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) ZVAL_COPY(&file, _11$$5); _13$$6 = onlySuccessful == 0; if (!(_13$$6)) { - zephir_array_fetch_string(&_14$$6, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 898); + zephir_array_fetch_string(&_14$$6, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 949); _13$$6 = ZEPHIR_IS_LONG(&_14$$6, 0); } if (_13$$6) { ZEPHIR_INIT_NVAR(&dataFile); zephir_create_array(&dataFile, 5, 0); ZEPHIR_OBS_NVAR(&_15$$7); - zephir_array_fetch_string(&_15$$7, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 900); + zephir_array_fetch_string(&_15$$7, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 951); zephir_array_update_string(&dataFile, SL("name"), &_15$$7, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_15$$7); - zephir_array_fetch_string(&_15$$7, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 901); + zephir_array_fetch_string(&_15$$7, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 952); zephir_array_update_string(&dataFile, SL("type"), &_15$$7, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_15$$7); - zephir_array_fetch_string(&_15$$7, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 902); + zephir_array_fetch_string(&_15$$7, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 953); zephir_array_update_string(&dataFile, SL("tmp_name"), &_15$$7, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_15$$7); - zephir_array_fetch_string(&_15$$7, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 903); + zephir_array_fetch_string(&_15$$7, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 954); zephir_array_update_string(&dataFile, SL("size"), &_15$$7, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_15$$7); - zephir_array_fetch_string(&_15$$7, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 905); + zephir_array_fetch_string(&_15$$7, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 956); zephir_array_update_string(&dataFile, SL("error"), &_15$$7, PH_COPY | PH_SEPARATE); if (namedKeys == 1) { ZEPHIR_INIT_NVAR(&_16$$8); object_init_ex(&_16$$8, phalcon_http_request_file_ce); - zephir_array_fetch_string(&_17$$8, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 911); - ZEPHIR_CALL_METHOD(NULL, &_16$$8, "__construct", &_18, 346, &dataFile, &_17$$8); + zephir_array_fetch_string(&_17$$8, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 962); + ZEPHIR_CALL_METHOD(NULL, &_16$$8, "__construct", &_18, 344, &dataFile, &_17$$8); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&_19$$8); - zephir_array_fetch_string(&_19$$8, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 908); + zephir_array_fetch_string(&_19$$8, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 959); zephir_array_update_zval(&files, &_19$$8, &_16$$8, PH_COPY | PH_SEPARATE); } else { ZEPHIR_INIT_NVAR(&_20$$9); object_init_ex(&_20$$9, phalcon_http_request_file_ce); - zephir_array_fetch_string(&_21$$9, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 916); - ZEPHIR_CALL_METHOD(NULL, &_20$$9, "__construct", &_18, 346, &dataFile, &_21$$9); + zephir_array_fetch_string(&_21$$9, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 967); + ZEPHIR_CALL_METHOD(NULL, &_20$$9, "__construct", &_18, 344, &dataFile, &_21$$9); zephir_check_call_status(); - zephir_array_append(&files, &_20$$9, PH_SEPARATE, "phalcon/Http/Request.zep", 916); + zephir_array_append(&files, &_20$$9, PH_SEPARATE, "phalcon/Http/Request.zep", 967); } } } ZEND_HASH_FOREACH_END(); @@ -34523,44 +34745,44 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) zephir_check_call_status(); _22$$10 = onlySuccessful == 0; if (!(_22$$10)) { - zephir_array_fetch_string(&_23$$10, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 898); + zephir_array_fetch_string(&_23$$10, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 949); _22$$10 = ZEPHIR_IS_LONG(&_23$$10, 0); } if (_22$$10) { ZEPHIR_INIT_NVAR(&_24$$11); zephir_create_array(&_24$$11, 5, 0); ZEPHIR_OBS_NVAR(&_25$$11); - zephir_array_fetch_string(&_25$$11, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 900); + zephir_array_fetch_string(&_25$$11, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 951); zephir_array_update_string(&_24$$11, SL("name"), &_25$$11, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_25$$11); - zephir_array_fetch_string(&_25$$11, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 901); + zephir_array_fetch_string(&_25$$11, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 952); zephir_array_update_string(&_24$$11, SL("type"), &_25$$11, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_25$$11); - zephir_array_fetch_string(&_25$$11, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 902); + zephir_array_fetch_string(&_25$$11, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 953); zephir_array_update_string(&_24$$11, SL("tmp_name"), &_25$$11, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_25$$11); - zephir_array_fetch_string(&_25$$11, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 903); + zephir_array_fetch_string(&_25$$11, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 954); zephir_array_update_string(&_24$$11, SL("size"), &_25$$11, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_25$$11); - zephir_array_fetch_string(&_25$$11, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 905); + zephir_array_fetch_string(&_25$$11, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 956); zephir_array_update_string(&_24$$11, SL("error"), &_25$$11, PH_COPY | PH_SEPARATE); ZEPHIR_CPY_WRT(&dataFile, &_24$$11); if (namedKeys == 1) { ZEPHIR_INIT_NVAR(&_26$$12); object_init_ex(&_26$$12, phalcon_http_request_file_ce); - zephir_array_fetch_string(&_27$$12, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 911); - ZEPHIR_CALL_METHOD(NULL, &_26$$12, "__construct", &_18, 346, &dataFile, &_27$$12); + zephir_array_fetch_string(&_27$$12, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 962); + ZEPHIR_CALL_METHOD(NULL, &_26$$12, "__construct", &_18, 344, &dataFile, &_27$$12); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&_28$$12); - zephir_array_fetch_string(&_28$$12, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 908); + zephir_array_fetch_string(&_28$$12, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 959); zephir_array_update_zval(&files, &_28$$12, &_26$$12, PH_COPY | PH_SEPARATE); } else { ZEPHIR_INIT_NVAR(&_29$$13); object_init_ex(&_29$$13, phalcon_http_request_file_ce); - zephir_array_fetch_string(&_30$$13, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 916); - ZEPHIR_CALL_METHOD(NULL, &_29$$13, "__construct", &_18, 346, &dataFile, &_30$$13); + zephir_array_fetch_string(&_30$$13, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 967); + ZEPHIR_CALL_METHOD(NULL, &_29$$13, "__construct", &_18, 344, &dataFile, &_30$$13); zephir_check_call_status(); - zephir_array_append(&files, &_29$$13, PH_SEPARATE, "phalcon/Http/Request.zep", 916); + zephir_array_append(&files, &_29$$13, PH_SEPARATE, "phalcon/Http/Request.zep", 967); } } ZEPHIR_CALL_METHOD(NULL, &smoothInput, "next", NULL, 0); @@ -34571,22 +34793,22 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) } else { _31$$14 = onlySuccessful == 0; if (!(_31$$14)) { - zephir_array_fetch_string(&_32$$14, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 921); + zephir_array_fetch_string(&_32$$14, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 972); _31$$14 = ZEPHIR_IS_LONG(&_32$$14, 0); } if (_31$$14) { if (namedKeys == 1) { ZEPHIR_INIT_NVAR(&_33$$16); object_init_ex(&_33$$16, phalcon_http_request_file_ce); - ZEPHIR_CALL_METHOD(NULL, &_33$$16, "__construct", &_18, 346, &input, &prefix); + ZEPHIR_CALL_METHOD(NULL, &_33$$16, "__construct", &_18, 344, &input, &prefix); zephir_check_call_status(); zephir_array_update_zval(&files, &prefix, &_33$$16, PH_COPY | PH_SEPARATE); } else { ZEPHIR_INIT_NVAR(&_34$$17); object_init_ex(&_34$$17, phalcon_http_request_file_ce); - ZEPHIR_CALL_METHOD(NULL, &_34$$17, "__construct", &_18, 346, &input, &prefix); + ZEPHIR_CALL_METHOD(NULL, &_34$$17, "__construct", &_18, 344, &input, &prefix); zephir_check_call_status(); - zephir_array_append(&files, &_34$$17, PH_SEPARATE, "phalcon/Http/Request.zep", 925); + zephir_array_append(&files, &_34$$17, PH_SEPARATE, "phalcon/Http/Request.zep", 976); } } } @@ -34605,16 +34827,16 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) ZEPHIR_CALL_METHOD(&input, &superFiles, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&_35$$18); - zephir_array_fetch_string(&_35$$18, &input, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 887); + zephir_array_fetch_string(&_35$$18, &input, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 938); if (Z_TYPE_P(&_35$$18) == IS_ARRAY) { - zephir_array_fetch_string(&_36$$19, &input, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 889); - zephir_array_fetch_string(&_37$$19, &input, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 890); - zephir_array_fetch_string(&_38$$19, &input, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 891); - zephir_array_fetch_string(&_39$$19, &input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 892); - zephir_array_fetch_string(&_40$$19, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 893); - ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 345, &_36$$19, &_37$$19, &_38$$19, &_39$$19, &_40$$19, &prefix); + zephir_array_fetch_string(&_36$$19, &input, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 940); + zephir_array_fetch_string(&_37$$19, &input, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 941); + zephir_array_fetch_string(&_38$$19, &input, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 942); + zephir_array_fetch_string(&_39$$19, &input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 943); + zephir_array_fetch_string(&_40$$19, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 944); + ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 0, &_36$$19, &_37$$19, &_38$$19, &_39$$19, &_40$$19, &prefix); zephir_check_call_status(); - zephir_is_iterable(&smoothInput, 0, "phalcon/Http/Request.zep", 920); + zephir_is_iterable(&smoothInput, 0, "phalcon/Http/Request.zep", 971); if (Z_TYPE_P(&smoothInput) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&smoothInput), _41$$19) { @@ -34622,44 +34844,44 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) ZVAL_COPY(&file, _41$$19); _43$$20 = onlySuccessful == 0; if (!(_43$$20)) { - zephir_array_fetch_string(&_44$$20, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 898); + zephir_array_fetch_string(&_44$$20, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 949); _43$$20 = ZEPHIR_IS_LONG(&_44$$20, 0); } if (_43$$20) { ZEPHIR_INIT_NVAR(&_45$$21); zephir_create_array(&_45$$21, 5, 0); ZEPHIR_OBS_NVAR(&_46$$21); - zephir_array_fetch_string(&_46$$21, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 900); + zephir_array_fetch_string(&_46$$21, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 951); zephir_array_update_string(&_45$$21, SL("name"), &_46$$21, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_46$$21); - zephir_array_fetch_string(&_46$$21, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 901); + zephir_array_fetch_string(&_46$$21, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 952); zephir_array_update_string(&_45$$21, SL("type"), &_46$$21, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_46$$21); - zephir_array_fetch_string(&_46$$21, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 902); + zephir_array_fetch_string(&_46$$21, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 953); zephir_array_update_string(&_45$$21, SL("tmp_name"), &_46$$21, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_46$$21); - zephir_array_fetch_string(&_46$$21, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 903); + zephir_array_fetch_string(&_46$$21, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 954); zephir_array_update_string(&_45$$21, SL("size"), &_46$$21, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_46$$21); - zephir_array_fetch_string(&_46$$21, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 905); + zephir_array_fetch_string(&_46$$21, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 956); zephir_array_update_string(&_45$$21, SL("error"), &_46$$21, PH_COPY | PH_SEPARATE); ZEPHIR_CPY_WRT(&dataFile, &_45$$21); if (namedKeys == 1) { ZEPHIR_INIT_NVAR(&_47$$22); object_init_ex(&_47$$22, phalcon_http_request_file_ce); - zephir_array_fetch_string(&_48$$22, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 911); - ZEPHIR_CALL_METHOD(NULL, &_47$$22, "__construct", &_18, 346, &dataFile, &_48$$22); + zephir_array_fetch_string(&_48$$22, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 962); + ZEPHIR_CALL_METHOD(NULL, &_47$$22, "__construct", &_18, 344, &dataFile, &_48$$22); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&_49$$22); - zephir_array_fetch_string(&_49$$22, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 908); + zephir_array_fetch_string(&_49$$22, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 959); zephir_array_update_zval(&files, &_49$$22, &_47$$22, PH_COPY | PH_SEPARATE); } else { ZEPHIR_INIT_NVAR(&_50$$23); object_init_ex(&_50$$23, phalcon_http_request_file_ce); - zephir_array_fetch_string(&_51$$23, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 916); - ZEPHIR_CALL_METHOD(NULL, &_50$$23, "__construct", &_18, 346, &dataFile, &_51$$23); + zephir_array_fetch_string(&_51$$23, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 967); + ZEPHIR_CALL_METHOD(NULL, &_50$$23, "__construct", &_18, 344, &dataFile, &_51$$23); zephir_check_call_status(); - zephir_array_append(&files, &_50$$23, PH_SEPARATE, "phalcon/Http/Request.zep", 916); + zephir_array_append(&files, &_50$$23, PH_SEPARATE, "phalcon/Http/Request.zep", 967); } } } ZEND_HASH_FOREACH_END(); @@ -34676,44 +34898,44 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) zephir_check_call_status(); _52$$24 = onlySuccessful == 0; if (!(_52$$24)) { - zephir_array_fetch_string(&_53$$24, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 898); + zephir_array_fetch_string(&_53$$24, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 949); _52$$24 = ZEPHIR_IS_LONG(&_53$$24, 0); } if (_52$$24) { ZEPHIR_INIT_NVAR(&_54$$25); zephir_create_array(&_54$$25, 5, 0); ZEPHIR_OBS_NVAR(&_55$$25); - zephir_array_fetch_string(&_55$$25, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 900); + zephir_array_fetch_string(&_55$$25, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 951); zephir_array_update_string(&_54$$25, SL("name"), &_55$$25, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_55$$25); - zephir_array_fetch_string(&_55$$25, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 901); + zephir_array_fetch_string(&_55$$25, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 952); zephir_array_update_string(&_54$$25, SL("type"), &_55$$25, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_55$$25); - zephir_array_fetch_string(&_55$$25, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 902); + zephir_array_fetch_string(&_55$$25, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 953); zephir_array_update_string(&_54$$25, SL("tmp_name"), &_55$$25, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_55$$25); - zephir_array_fetch_string(&_55$$25, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 903); + zephir_array_fetch_string(&_55$$25, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 954); zephir_array_update_string(&_54$$25, SL("size"), &_55$$25, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_55$$25); - zephir_array_fetch_string(&_55$$25, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 905); + zephir_array_fetch_string(&_55$$25, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 956); zephir_array_update_string(&_54$$25, SL("error"), &_55$$25, PH_COPY | PH_SEPARATE); ZEPHIR_CPY_WRT(&dataFile, &_54$$25); if (namedKeys == 1) { ZEPHIR_INIT_NVAR(&_56$$26); object_init_ex(&_56$$26, phalcon_http_request_file_ce); - zephir_array_fetch_string(&_57$$26, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 911); - ZEPHIR_CALL_METHOD(NULL, &_56$$26, "__construct", &_18, 346, &dataFile, &_57$$26); + zephir_array_fetch_string(&_57$$26, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 962); + ZEPHIR_CALL_METHOD(NULL, &_56$$26, "__construct", &_18, 344, &dataFile, &_57$$26); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&_58$$26); - zephir_array_fetch_string(&_58$$26, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 908); + zephir_array_fetch_string(&_58$$26, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 959); zephir_array_update_zval(&files, &_58$$26, &_56$$26, PH_COPY | PH_SEPARATE); } else { ZEPHIR_INIT_NVAR(&_59$$27); object_init_ex(&_59$$27, phalcon_http_request_file_ce); - zephir_array_fetch_string(&_60$$27, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 916); - ZEPHIR_CALL_METHOD(NULL, &_59$$27, "__construct", &_18, 346, &dataFile, &_60$$27); + zephir_array_fetch_string(&_60$$27, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 967); + ZEPHIR_CALL_METHOD(NULL, &_59$$27, "__construct", &_18, 344, &dataFile, &_60$$27); zephir_check_call_status(); - zephir_array_append(&files, &_59$$27, PH_SEPARATE, "phalcon/Http/Request.zep", 916); + zephir_array_append(&files, &_59$$27, PH_SEPARATE, "phalcon/Http/Request.zep", 967); } } ZEPHIR_CALL_METHOD(NULL, &smoothInput, "next", NULL, 0); @@ -34724,22 +34946,22 @@ static PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) } else { _61$$28 = onlySuccessful == 0; if (!(_61$$28)) { - zephir_array_fetch_string(&_62$$28, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 921); + zephir_array_fetch_string(&_62$$28, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 972); _61$$28 = ZEPHIR_IS_LONG(&_62$$28, 0); } if (_61$$28) { if (namedKeys == 1) { ZEPHIR_INIT_NVAR(&_63$$30); object_init_ex(&_63$$30, phalcon_http_request_file_ce); - ZEPHIR_CALL_METHOD(NULL, &_63$$30, "__construct", &_18, 346, &input, &prefix); + ZEPHIR_CALL_METHOD(NULL, &_63$$30, "__construct", &_18, 344, &input, &prefix); zephir_check_call_status(); zephir_array_update_zval(&files, &prefix, &_63$$30, PH_COPY | PH_SEPARATE); } else { ZEPHIR_INIT_NVAR(&_64$$31); object_init_ex(&_64$$31, phalcon_http_request_file_ce); - ZEPHIR_CALL_METHOD(NULL, &_64$$31, "__construct", &_18, 346, &input, &prefix); + ZEPHIR_CALL_METHOD(NULL, &_64$$31, "__construct", &_18, 344, &input, &prefix); zephir_check_call_status(); - zephir_array_append(&files, &_64$$31, PH_SEPARATE, "phalcon/Http/Request.zep", 925); + zephir_array_append(&files, &_64$$31, PH_SEPARATE, "phalcon/Http/Request.zep", 976); } } } @@ -34789,7 +35011,7 @@ static PHP_METHOD(Phalcon_Http_Request, getURI) ZEPHIR_INIT_VAR(&_2$$4); ZVAL_STRING(&_2$$4, "?"); zephir_fast_explode(&_1$$4, &_2$$4, &requestURI, LONG_MAX); - zephir_array_fetch_long(&_3$$4, &_1$$4, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 959); + zephir_array_fetch_long(&_3$$4, &_1$$4, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1010); ZEPHIR_CPY_WRT(&requestURI, &_3$$4); } RETURN_CCTOR(&requestURI); @@ -34948,17 +35170,18 @@ static PHP_METHOD(Phalcon_Http_Request, hasPatch) static PHP_METHOD(Phalcon_Http_Request, hasPost) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval *name_param = NULL, _POST; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *name_param = NULL, post; zval name; + zval *this_ptr = getThis(); ZVAL_UNDEF(&name); - ZVAL_UNDEF(&_POST); + ZVAL_UNDEF(&post); ZEND_PARSE_PARAMETERS_START(1, 1) Z_PARAM_STR(name) ZEND_PARSE_PARAMETERS_END(); ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - zephir_get_global(&_POST, SL("_POST")); zephir_fetch_params(1, 1, 0, &name_param); if (UNEXPECTED(Z_TYPE_P(name_param) != IS_STRING && Z_TYPE_P(name_param) != IS_NULL)) { zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'name' must be of the type string")); @@ -34969,7 +35192,9 @@ static PHP_METHOD(Phalcon_Http_Request, hasPost) } else { ZEPHIR_INIT_VAR(&name); } - RETURN_MM_BOOL(zephir_array_isset(&_POST, &name)); + ZEPHIR_CALL_METHOD(&post, this_ptr, "getpost", NULL, 0); + zephir_check_call_status(); + RETURN_MM_BOOL(zephir_array_isset(&post, &name)); } static PHP_METHOD(Phalcon_Http_Request, hasPut) @@ -35054,7 +35279,7 @@ static PHP_METHOD(Phalcon_Http_Request, hasServer) } else { ZEPHIR_INIT_VAR(&name); } - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 340); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 339); zephir_check_call_status(); RETURN_MM_BOOL(zephir_array_isset(&server, &name)); } @@ -35088,6 +35313,40 @@ static PHP_METHOD(Phalcon_Http_Request, isAjax) RETURN_MM_BOOL(_2); } +static PHP_METHOD(Phalcon_Http_Request, isJson) +{ + zend_bool _2; + zval _0, _1, _3, _4; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_3); + ZVAL_UNDEF(&_4); + ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); + zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); + + ZEPHIR_INIT_VAR(&_1); + ZVAL_STRING(&_1, "CONTENT_TYPE"); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 338, &_1); + zephir_check_call_status(); + _2 = zephir_is_true(&_0); + if (_2) { + ZEPHIR_INIT_NVAR(&_1); + ZVAL_STRING(&_1, "CONTENT_TYPE"); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "getserver", NULL, 0, &_1); + zephir_check_call_status(); + ZEPHIR_INIT_NVAR(&_1); + ZVAL_STRING(&_1, "json"); + ZEPHIR_CALL_FUNCTION(&_4, "stripos", NULL, 345, &_3, &_1); + zephir_check_call_status(); + _2 = !ZEPHIR_IS_FALSE_IDENTICAL(&_4); + } + RETURN_MM_BOOL(_2); +} + static PHP_METHOD(Phalcon_Http_Request, isConnect) { zval _0; @@ -35099,7 +35358,7 @@ static PHP_METHOD(Phalcon_Http_Request, isConnect) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 347); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 0); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "CONNECT")); } @@ -35115,7 +35374,7 @@ static PHP_METHOD(Phalcon_Http_Request, isDelete) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 347); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 0); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "DELETE")); } @@ -35131,7 +35390,7 @@ static PHP_METHOD(Phalcon_Http_Request, isGet) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 347); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 0); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "GET")); } @@ -35147,7 +35406,7 @@ static PHP_METHOD(Phalcon_Http_Request, isHead) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 347); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 0); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "HEAD")); } @@ -35184,7 +35443,7 @@ static PHP_METHOD(Phalcon_Http_Request, isMethod) strict = 0; } else { } - ZEPHIR_CALL_METHOD(&httpMethod, this_ptr, "getmethod", NULL, 347); + ZEPHIR_CALL_METHOD(&httpMethod, this_ptr, "getmethod", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(methods) == IS_STRING) { _0$$3 = strict; @@ -35200,14 +35459,14 @@ static PHP_METHOD(Phalcon_Http_Request, isMethod) ZEPHIR_CONCAT_SV(&_3$$4, "Invalid HTTP method: ", methods); ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 33, &_3$$4); zephir_check_call_status(); - zephir_throw_exception_debug(&_2$$4, "phalcon/Http/Request.zep", 1117); + zephir_throw_exception_debug(&_2$$4, "phalcon/Http/Request.zep", 1183); ZEPHIR_MM_RESTORE(); return; } RETURN_MM_BOOL(ZEPHIR_IS_EQUAL(methods, &httpMethod)); } if (Z_TYPE_P(methods) == IS_ARRAY) { - zephir_is_iterable(methods, 0, "phalcon/Http/Request.zep", 1130); + zephir_is_iterable(methods, 0, "phalcon/Http/Request.zep", 1196); if (Z_TYPE_P(methods) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(methods), _4$$5) { @@ -35218,7 +35477,7 @@ static PHP_METHOD(Phalcon_Http_Request, isMethod) } else { ZVAL_BOOL(&_7$$6, 0); } - ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "ismethod", &_8, 348, &method, &_7$$6); + ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "ismethod", &_8, 346, &method, &_7$$6); zephir_check_call_status(); if (zephir_is_true(&_6$$6)) { RETURN_MM_BOOL(1); @@ -35240,7 +35499,7 @@ static PHP_METHOD(Phalcon_Http_Request, isMethod) } else { ZVAL_BOOL(&_10$$8, 0); } - ZEPHIR_CALL_METHOD(&_9$$8, this_ptr, "ismethod", &_8, 348, &method, &_10$$8); + ZEPHIR_CALL_METHOD(&_9$$8, this_ptr, "ismethod", &_8, 346, &method, &_10$$8); zephir_check_call_status(); if (zephir_is_true(&_9$$8)) { RETURN_MM_BOOL(1); @@ -35253,7 +35512,7 @@ static PHP_METHOD(Phalcon_Http_Request, isMethod) RETURN_MM_BOOL(0); } if (UNEXPECTED(strict)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_request_exception_ce, "Invalid HTTP method: non-string", "phalcon/Http/Request.zep", 1134); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_request_exception_ce, "Invalid HTTP method: non-string", "phalcon/Http/Request.zep", 1200); return; } RETURN_MM_BOOL(0); @@ -35270,7 +35529,7 @@ static PHP_METHOD(Phalcon_Http_Request, isOptions) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 347); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 0); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "OPTIONS")); } @@ -35286,7 +35545,7 @@ static PHP_METHOD(Phalcon_Http_Request, isPatch) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 347); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 0); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "PATCH")); } @@ -35302,7 +35561,7 @@ static PHP_METHOD(Phalcon_Http_Request, isPost) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 347); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 0); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "POST")); } @@ -35318,7 +35577,7 @@ static PHP_METHOD(Phalcon_Http_Request, isPut) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 347); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 0); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "PUT")); } @@ -35334,7 +35593,7 @@ static PHP_METHOD(Phalcon_Http_Request, isPurge) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 347); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 0); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "PURGE")); } @@ -35386,7 +35645,7 @@ static PHP_METHOD(Phalcon_Http_Request, isSoap) if (ZEPHIR_IS_EMPTY(&contentType)) { RETURN_MM_BOOL(0); } - RETURN_MM_BOOL(zephir_memnstr_str(&contentType, SL("application/soap+xml"), "phalcon/Http/Request.zep", 1219)); + RETURN_MM_BOOL(zephir_memnstr_str(&contentType, SL("application/soap+xml"), "phalcon/Http/Request.zep", 1285)); } static PHP_METHOD(Phalcon_Http_Request, isTrace) @@ -35400,7 +35659,7 @@ static PHP_METHOD(Phalcon_Http_Request, isTrace) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 347); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 0); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "TRACE")); } @@ -35466,7 +35725,7 @@ static PHP_METHOD(Phalcon_Http_Request, numFiles) if (Z_TYPE_P(&files) != IS_ARRAY) { RETURN_MM_LONG(0); } - zephir_is_iterable(&files, 0, "phalcon/Http/Request.zep", 1284); + zephir_is_iterable(&files, 0, "phalcon/Http/Request.zep", 1350); if (Z_TYPE_P(&files) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&files), _0) { @@ -35489,7 +35748,7 @@ static PHP_METHOD(Phalcon_Http_Request, numFiles) } else { ZVAL_BOOL(&_4$$8, 0); } - ZEPHIR_CALL_METHOD(&_3$$8, this_ptr, "hasfilehelper", &_5, 349, &error, &_4$$8); + ZEPHIR_CALL_METHOD(&_3$$8, this_ptr, "hasfilehelper", &_5, 0, &error, &_4$$8); zephir_check_call_status(); numberFiles += zephir_get_numberval(&_3$$8); } @@ -35523,7 +35782,7 @@ static PHP_METHOD(Phalcon_Http_Request, numFiles) } else { ZVAL_BOOL(&_8$$13, 0); } - ZEPHIR_CALL_METHOD(&_7$$13, this_ptr, "hasfilehelper", &_5, 349, &error, &_8$$13); + ZEPHIR_CALL_METHOD(&_7$$13, this_ptr, "hasfilehelper", &_5, 0, &error, &_8$$13); zephir_check_call_status(); numberFiles += zephir_get_numberval(&_7$$13); } @@ -35623,13 +35882,13 @@ static PHP_METHOD(Phalcon_Http_Request, setParameterFilters) ZEPHIR_CONCAT_SVS(&_1$$3, "Filters have not been defined for '", &name, "'"); ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 33, &_1$$3); zephir_check_call_status(); - zephir_throw_exception_debug(&_0$$3, "phalcon/Http/Request.zep", 1315); + zephir_throw_exception_debug(&_0$$3, "phalcon/Http/Request.zep", 1381); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 350); + ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 340); zephir_check_call_status(); - zephir_is_iterable(&filters, 0, "phalcon/Http/Request.zep", 1328); + zephir_is_iterable(&filters, 0, "phalcon/Http/Request.zep", 1394); if (Z_TYPE_P(&filters) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&filters), _2) { @@ -35644,7 +35903,7 @@ static PHP_METHOD(Phalcon_Http_Request, setParameterFilters) ZEPHIR_CONCAT_SVS(&_7$$5, "Sanitizer '", &sanitizer, "' does not exist in the filter locator"); ZEPHIR_CALL_METHOD(NULL, &_6$$5, "__construct", NULL, 33, &_7$$5); zephir_check_call_status(); - zephir_throw_exception_debug(&_6$$5, "phalcon/Http/Request.zep", 1324); + zephir_throw_exception_debug(&_6$$5, "phalcon/Http/Request.zep", 1390); ZEPHIR_MM_RESTORE(); return; } @@ -35669,7 +35928,7 @@ static PHP_METHOD(Phalcon_Http_Request, setParameterFilters) ZEPHIR_CONCAT_SVS(&_11$$7, "Sanitizer '", &sanitizer, "' does not exist in the filter locator"); ZEPHIR_CALL_METHOD(NULL, &_10$$7, "__construct", NULL, 33, &_11$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_10$$7, "phalcon/Http/Request.zep", 1324); + zephir_throw_exception_debug(&_10$$7, "phalcon/Http/Request.zep", 1390); ZEPHIR_MM_RESTORE(); return; } @@ -35696,7 +35955,7 @@ static PHP_METHOD(Phalcon_Http_Request, setParameterFilters) } else { ZEPHIR_CPY_WRT(&localScope, &scope); } - zephir_is_iterable(&localScope, 0, "phalcon/Http/Request.zep", 1343); + zephir_is_iterable(&localScope, 0, "phalcon/Http/Request.zep", 1409); if (Z_TYPE_P(&localScope) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&localScope), _13) { @@ -35753,6 +36012,184 @@ static PHP_METHOD(Phalcon_Http_Request, setStrictHostCheck) RETURN_THISW(); } +static PHP_METHOD(Phalcon_Http_Request, setTrustedProxies) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zephir_fcall_cache_entry *_3 = NULL, *_5 = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *trustedProxies_param = NULL, filterService, trustedProxy, filtered, *_0, _1, _2$$3, _4$$5; + zval trustedProxies; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&trustedProxies); + ZVAL_UNDEF(&filterService); + ZVAL_UNDEF(&trustedProxy); + ZVAL_UNDEF(&filtered); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2$$3); + ZVAL_UNDEF(&_4$$5); + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_ARRAY(trustedProxies) + ZEND_PARSE_PARAMETERS_END(); + ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); + zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); + zephir_fetch_params(1, 1, 0, &trustedProxies_param); + zephir_get_arrval(&trustedProxies, trustedProxies_param); + ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 340); + zephir_check_call_status(); + zephir_is_iterable(&trustedProxies, 0, "phalcon/Http/Request.zep", 1444); + if (Z_TYPE_P(&trustedProxies) == IS_ARRAY) { + ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&trustedProxies), _0) + { + ZEPHIR_INIT_NVAR(&trustedProxy); + ZVAL_COPY(&trustedProxy, _0); + ZEPHIR_INIT_NVAR(&_2$$3); + ZVAL_STRING(&_2$$3, "ip"); + ZEPHIR_CALL_METHOD(&filtered, &filterService, "sanitize", &_3, 0, &trustedProxy, &_2$$3); + zephir_check_call_status(); + if (!ZEPHIR_IS_FALSE_IDENTICAL(&filtered)) { + zephir_update_property_array_append(this_ptr, SL("trustedProxies"), &filtered); + } + } ZEND_HASH_FOREACH_END(); + } else { + ZEPHIR_CALL_METHOD(NULL, &trustedProxies, "rewind", NULL, 0); + zephir_check_call_status(); + while (1) { + ZEPHIR_CALL_METHOD(&_1, &trustedProxies, "valid", NULL, 0); + zephir_check_call_status(); + if (!zend_is_true(&_1)) { + break; + } + ZEPHIR_CALL_METHOD(&trustedProxy, &trustedProxies, "current", NULL, 0); + zephir_check_call_status(); + ZEPHIR_INIT_NVAR(&_4$$5); + ZVAL_STRING(&_4$$5, "ip"); + ZEPHIR_CALL_METHOD(&filtered, &filterService, "sanitize", &_5, 0, &trustedProxy, &_4$$5); + zephir_check_call_status(); + if (!ZEPHIR_IS_FALSE_IDENTICAL(&filtered)) { + zephir_update_property_array_append(this_ptr, SL("trustedProxies"), &filtered); + } + ZEPHIR_CALL_METHOD(NULL, &trustedProxies, "next", NULL, 0); + zephir_check_call_status(); + } + } + ZEPHIR_INIT_NVAR(&trustedProxy); + RETURN_THIS(); +} + +static PHP_METHOD(Phalcon_Http_Request, isIpAddressInCIDR) +{ + zend_bool _1; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS, maskBytes = 0, tempMask = 0, remainingBits = 0; + zval *ip_param = NULL, *cidr_param = NULL, parts, mask, subnet, maskLength, ipBin, subnetBin, ipBits, subnetBits, ipByte, subnetByte, _0, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11; + zval ip, cidr; + + ZVAL_UNDEF(&ip); + ZVAL_UNDEF(&cidr); + ZVAL_UNDEF(&parts); + ZVAL_UNDEF(&mask); + ZVAL_UNDEF(&subnet); + ZVAL_UNDEF(&maskLength); + ZVAL_UNDEF(&ipBin); + ZVAL_UNDEF(&subnetBin); + ZVAL_UNDEF(&ipBits); + ZVAL_UNDEF(&subnetBits); + ZVAL_UNDEF(&ipByte); + ZVAL_UNDEF(&subnetByte); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_3); + ZVAL_UNDEF(&_4); + ZVAL_UNDEF(&_5); + ZVAL_UNDEF(&_6); + ZVAL_UNDEF(&_7); + ZVAL_UNDEF(&_8); + ZVAL_UNDEF(&_9); + ZVAL_UNDEF(&_10); + ZVAL_UNDEF(&_11); + ZEND_PARSE_PARAMETERS_START(2, 2) + Z_PARAM_STR(ip) + Z_PARAM_STR(cidr) + ZEND_PARSE_PARAMETERS_END(); + ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); + zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); + zephir_fetch_params(1, 2, 0, &ip_param, &cidr_param); + zephir_get_strval(&ip, ip_param); + zephir_get_strval(&cidr, cidr_param); + ZEPHIR_INIT_VAR(&_0); + ZVAL_STRING(&_0, "/"); + ZEPHIR_INIT_VAR(&parts); + zephir_fast_explode(&parts, &_0, &cidr, LONG_MAX); + zephir_memory_observe(&subnet); + zephir_array_fetch_long(&subnet, &parts, 0, PH_NOISY, "phalcon/Http/Request.zep", 1460); + zephir_memory_observe(&maskLength); + zephir_array_fetch_long(&maskLength, &parts, 1, PH_NOISY, "phalcon/Http/Request.zep", 1461); + ZEPHIR_CALL_FUNCTION(&ipBin, "inet_pton", NULL, 347, &ip); + zephir_check_call_status(); + ZEPHIR_CALL_FUNCTION(&subnetBin, "inet_pton", NULL, 347, &subnet); + zephir_check_call_status(); + _1 = ZEPHIR_IS_FALSE_IDENTICAL(&ipBin); + if (!(_1)) { + _1 = ZEPHIR_IS_FALSE_IDENTICAL(&subnetBin); + } + if (_1) { + RETURN_MM_BOOL(0); + } + ZEPHIR_INIT_VAR(&_2); + ZVAL_STRING(&_2, "H*"); + ZEPHIR_CALL_FUNCTION(&ipBits, "unpack", NULL, 269, &_2, &ipBin); + zephir_check_call_status(); + ZEPHIR_INIT_NVAR(&_2); + ZVAL_STRING(&_2, "H*"); + ZEPHIR_CALL_FUNCTION(&subnetBits, "unpack", NULL, 269, &_2, &subnetBin); + zephir_check_call_status(); + zephir_array_fetch_long(&_3, &ipBits, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1473); + ZEPHIR_CPY_WRT(&ipBits, &_3); + zephir_array_fetch_long(&_3, &subnetBits, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1474); + ZEPHIR_CPY_WRT(&subnetBits, &_3); + ZVAL_LONG(&_4, zephir_fast_strlen_ev(&ipBits)); + ZEPHIR_INIT_NVAR(&_2); + ZVAL_STRING(&_2, "0"); + ZEPHIR_CALL_FUNCTION(&_5, "str_pad", NULL, 348, &ipBits, &_4, &_2); + zephir_check_call_status(); + ZEPHIR_CALL_FUNCTION(&ipBits, "hex2bin", NULL, 349, &_5); + zephir_check_call_status(); + ZVAL_LONG(&_4, zephir_fast_strlen_ev(&subnetBits)); + ZEPHIR_INIT_NVAR(&_2); + ZVAL_STRING(&_2, "0"); + ZEPHIR_CALL_FUNCTION(&_6, "str_pad", NULL, 348, &subnetBits, &_4, &_2); + zephir_check_call_status(); + ZEPHIR_CALL_FUNCTION(&subnetBits, "hex2bin", NULL, 349, &_6); + zephir_check_call_status(); + ZVAL_DOUBLE(&_4, zephir_safe_div_zval_long(&maskLength, 8)); + maskBytes = (int) zephir_floor(&_4); + remainingBits = (long) (zephir_safe_mod_zval_long(&maskLength, 8)); + ZVAL_LONG(&_7, maskBytes); + ZEPHIR_CALL_FUNCTION(&_8, "strncmp", NULL, 191, &ipBits, &subnetBits, &_7); + zephir_check_call_status(); + if (!ZEPHIR_IS_LONG_IDENTICAL(&_8, 0)) { + RETURN_MM_BOOL(0); + } + if (remainingBits == 0) { + RETURN_MM_BOOL(1); + } + zephir_array_fetch_long(&_3, &ipBits, maskBytes, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1492); + ZEPHIR_CALL_FUNCTION(&ipByte, "ord", NULL, 245, &_3); + zephir_check_call_status(); + zephir_array_fetch_long(&_9, &subnetBits, maskBytes, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1493); + ZEPHIR_CALL_FUNCTION(&subnetByte, "ord", NULL, 245, &_9); + zephir_check_call_status(); + tempMask = (((1 << ((8 - remainingBits)))) - 1); + ZEPHIR_INIT_VAR(&mask); + ZVAL_LONG(&mask, (0xFF ^ tempMask)); + ZEPHIR_INIT_VAR(&_10); + zephir_bitwise_and_function(&_10, &ipByte, &mask); + ZEPHIR_INIT_VAR(&_11); + zephir_bitwise_and_function(&_11, &subnetByte, &mask); + RETURN_MM_BOOL(ZEPHIR_IS_IDENTICAL(&_10, &_11)); +} + static PHP_METHOD(Phalcon_Http_Request, getBestQuality) { double quality = 0, acceptQuality = 0; @@ -35792,7 +36229,7 @@ static PHP_METHOD(Phalcon_Http_Request, getBestQuality) quality = (0.0); ZEPHIR_INIT_VAR(&selectedName); ZVAL_STRING(&selectedName, ""); - zephir_is_iterable(&qualityParts, 0, "phalcon/Http/Request.zep", 1386); + zephir_is_iterable(&qualityParts, 0, "phalcon/Http/Request.zep", 1530); if (Z_TYPE_P(&qualityParts) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&qualityParts), _0) { @@ -35800,18 +36237,18 @@ static PHP_METHOD(Phalcon_Http_Request, getBestQuality) ZVAL_COPY(&accept, _0); if (i == 0) { ZEPHIR_OBS_NVAR(&_2$$4); - zephir_array_fetch_string(&_2$$4, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1372); + zephir_array_fetch_string(&_2$$4, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1516); quality = (zephir_get_doubleval(&_2$$4)); ZEPHIR_OBS_NVAR(&selectedName); - zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1373); + zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1517); } else { ZEPHIR_OBS_NVAR(&_3$$5); - zephir_array_fetch_string(&_3$$5, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1375); + zephir_array_fetch_string(&_3$$5, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1519); acceptQuality = (zephir_get_doubleval(&_3$$5)); if (acceptQuality > quality) { quality = acceptQuality; ZEPHIR_OBS_NVAR(&selectedName); - zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1379); + zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1523); } } i++; @@ -35829,18 +36266,18 @@ static PHP_METHOD(Phalcon_Http_Request, getBestQuality) zephir_check_call_status(); if (i == 0) { ZEPHIR_OBS_NVAR(&_4$$8); - zephir_array_fetch_string(&_4$$8, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1372); + zephir_array_fetch_string(&_4$$8, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1516); quality = (zephir_get_doubleval(&_4$$8)); ZEPHIR_OBS_NVAR(&selectedName); - zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1373); + zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1517); } else { ZEPHIR_OBS_NVAR(&_5$$9); - zephir_array_fetch_string(&_5$$9, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1375); + zephir_array_fetch_string(&_5$$9, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1519); acceptQuality = (zephir_get_doubleval(&_5$$9)); if (acceptQuality > quality) { quality = acceptQuality; ZEPHIR_OBS_NVAR(&selectedName); - zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1379); + zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1523); } } i++; @@ -35935,7 +36372,7 @@ static PHP_METHOD(Phalcon_Http_Request, getHelper) RETURN_MM(); } if (Z_TYPE_P(filters) != IS_NULL) { - ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 350); + ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 340); zephir_check_call_status(); if (noRecursive) { ZVAL_BOOL(&_3$$6, 1); @@ -35980,7 +36417,7 @@ static PHP_METHOD(Phalcon_Http_Request, hasFileHelper) if (Z_TYPE_P(data) != IS_ARRAY) { RETURN_MM_LONG(1); } - zephir_is_iterable(data, 0, "phalcon/Http/Request.zep", 1455); + zephir_is_iterable(data, 0, "phalcon/Http/Request.zep", 1599); if (Z_TYPE_P(data) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(data), _0) { @@ -36001,7 +36438,7 @@ static PHP_METHOD(Phalcon_Http_Request, hasFileHelper) } else { ZVAL_BOOL(&_4$$7, 0); } - ZEPHIR_CALL_METHOD(&_3$$7, this_ptr, "hasfilehelper", &_5, 349, &value, &_4$$7); + ZEPHIR_CALL_METHOD(&_3$$7, this_ptr, "hasfilehelper", &_5, 350, &value, &_4$$7); zephir_check_call_status(); numberFiles += zephir_get_numberval(&_3$$7); } @@ -36032,7 +36469,7 @@ static PHP_METHOD(Phalcon_Http_Request, hasFileHelper) } else { ZVAL_BOOL(&_8$$11, 0); } - ZEPHIR_CALL_METHOD(&_7$$11, this_ptr, "hasfilehelper", &_5, 349, &value, &_8$$11); + ZEPHIR_CALL_METHOD(&_7$$11, this_ptr, "hasfilehelper", &_5, 350, &value, &_8$$11); zephir_check_call_status(); numberFiles += zephir_get_numberval(&_7$$11); } @@ -36152,7 +36589,7 @@ static PHP_METHOD(Phalcon_Http_Request, getQualityHeader) ZVAL_LONG(&_3, 1); ZEPHIR_CALL_FUNCTION(&parts, "preg_split", NULL, 70, &_1, &serverValue, &_2, &_3); zephir_check_call_status(); - zephir_is_iterable(&parts, 0, "phalcon/Http/Request.zep", 1499); + zephir_is_iterable(&parts, 0, "phalcon/Http/Request.zep", 1643); if (Z_TYPE_P(&parts) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&parts), _4) { @@ -36168,7 +36605,7 @@ static PHP_METHOD(Phalcon_Http_Request, getQualityHeader) ZVAL_LONG(&_9$$3, 1); ZEPHIR_CALL_FUNCTION(&headerSplit, "preg_split", NULL, 70, &_7$$3, &_6$$3, &_8$$3, &_9$$3); zephir_check_call_status(); - zephir_is_iterable(&headerSplit, 0, "phalcon/Http/Request.zep", 1496); + zephir_is_iterable(&headerSplit, 0, "phalcon/Http/Request.zep", 1640); if (Z_TYPE_P(&headerSplit) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&headerSplit), _10$$3) { @@ -36181,17 +36618,17 @@ static PHP_METHOD(Phalcon_Http_Request, getQualityHeader) if (!ZEPHIR_IS_FALSE_IDENTICAL(&_13$$4)) { ZEPHIR_INIT_NVAR(&split); zephir_fast_explode_str(&split, SL("="), &headerPart, 2 ); - zephir_array_fetch_long(&_14$$5, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1485); + zephir_array_fetch_long(&_14$$5, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1629); if (ZEPHIR_IS_STRING_IDENTICAL(&_14$$5, "q")) { ZEPHIR_OBS_NVAR(&_15$$6); - zephir_array_fetch_long(&_15$$6, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1486); + zephir_array_fetch_long(&_15$$6, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1630); ZEPHIR_INIT_NVAR(&_16$$6); ZVAL_DOUBLE(&_16$$6, zephir_get_doubleval(&_15$$6)); zephir_array_update_string(&headerParts, SL("quality"), &_16$$6, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_long(&_17$$7, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1488); + zephir_array_fetch_long(&_17$$7, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1632); ZEPHIR_OBS_NVAR(&_18$$7); - zephir_array_fetch_long(&_18$$7, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1488); + zephir_array_fetch_long(&_18$$7, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1632); zephir_array_update_zval(&headerParts, &_18$$7, &_17$$7, PH_COPY | PH_SEPARATE); } } else { @@ -36219,17 +36656,17 @@ static PHP_METHOD(Phalcon_Http_Request, getQualityHeader) if (!ZEPHIR_IS_FALSE_IDENTICAL(&_21$$9)) { ZEPHIR_INIT_NVAR(&split); zephir_fast_explode_str(&split, SL("="), &headerPart, 2 ); - zephir_array_fetch_long(&_22$$10, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1485); + zephir_array_fetch_long(&_22$$10, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1629); if (ZEPHIR_IS_STRING_IDENTICAL(&_22$$10, "q")) { ZEPHIR_OBS_NVAR(&_23$$11); - zephir_array_fetch_long(&_23$$11, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1486); + zephir_array_fetch_long(&_23$$11, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1630); ZEPHIR_INIT_NVAR(&_24$$11); ZVAL_DOUBLE(&_24$$11, zephir_get_doubleval(&_23$$11)); zephir_array_update_string(&headerParts, SL("quality"), &_24$$11, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_long(&_25$$12, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1488); + zephir_array_fetch_long(&_25$$12, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1632); ZEPHIR_OBS_NVAR(&_26$$12); - zephir_array_fetch_long(&_26$$12, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1488); + zephir_array_fetch_long(&_26$$12, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1632); zephir_array_update_zval(&headerParts, &_26$$12, &_25$$12, PH_COPY | PH_SEPARATE); } } else { @@ -36243,7 +36680,7 @@ static PHP_METHOD(Phalcon_Http_Request, getQualityHeader) } } ZEPHIR_INIT_NVAR(&headerPart); - zephir_array_append(&returnedParts, &headerParts, PH_SEPARATE, "phalcon/Http/Request.zep", 1496); + zephir_array_append(&returnedParts, &headerParts, PH_SEPARATE, "phalcon/Http/Request.zep", 1640); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &parts, "rewind", NULL, 0); @@ -36266,7 +36703,7 @@ static PHP_METHOD(Phalcon_Http_Request, getQualityHeader) ZVAL_LONG(&_31$$14, 1); ZEPHIR_CALL_FUNCTION(&headerSplit, "preg_split", NULL, 70, &_29$$14, &_28$$14, &_30$$14, &_31$$14); zephir_check_call_status(); - zephir_is_iterable(&headerSplit, 0, "phalcon/Http/Request.zep", 1496); + zephir_is_iterable(&headerSplit, 0, "phalcon/Http/Request.zep", 1640); if (Z_TYPE_P(&headerSplit) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&headerSplit), _32$$14) { @@ -36279,17 +36716,17 @@ static PHP_METHOD(Phalcon_Http_Request, getQualityHeader) if (!ZEPHIR_IS_FALSE_IDENTICAL(&_35$$15)) { ZEPHIR_INIT_NVAR(&split); zephir_fast_explode_str(&split, SL("="), &headerPart, 2 ); - zephir_array_fetch_long(&_36$$16, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1485); + zephir_array_fetch_long(&_36$$16, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1629); if (ZEPHIR_IS_STRING_IDENTICAL(&_36$$16, "q")) { ZEPHIR_OBS_NVAR(&_37$$17); - zephir_array_fetch_long(&_37$$17, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1486); + zephir_array_fetch_long(&_37$$17, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1630); ZEPHIR_INIT_NVAR(&_38$$17); ZVAL_DOUBLE(&_38$$17, zephir_get_doubleval(&_37$$17)); zephir_array_update_string(&headerParts, SL("quality"), &_38$$17, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_long(&_39$$18, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1488); + zephir_array_fetch_long(&_39$$18, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1632); ZEPHIR_OBS_NVAR(&_40$$18); - zephir_array_fetch_long(&_40$$18, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1488); + zephir_array_fetch_long(&_40$$18, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1632); zephir_array_update_zval(&headerParts, &_40$$18, &_39$$18, PH_COPY | PH_SEPARATE); } } else { @@ -36317,17 +36754,17 @@ static PHP_METHOD(Phalcon_Http_Request, getQualityHeader) if (!ZEPHIR_IS_FALSE_IDENTICAL(&_43$$20)) { ZEPHIR_INIT_NVAR(&split); zephir_fast_explode_str(&split, SL("="), &headerPart, 2 ); - zephir_array_fetch_long(&_44$$21, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1485); + zephir_array_fetch_long(&_44$$21, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1629); if (ZEPHIR_IS_STRING_IDENTICAL(&_44$$21, "q")) { ZEPHIR_OBS_NVAR(&_45$$22); - zephir_array_fetch_long(&_45$$22, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1486); + zephir_array_fetch_long(&_45$$22, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1630); ZEPHIR_INIT_NVAR(&_46$$22); ZVAL_DOUBLE(&_46$$22, zephir_get_doubleval(&_45$$22)); zephir_array_update_string(&headerParts, SL("quality"), &_46$$22, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_long(&_47$$23, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1488); + zephir_array_fetch_long(&_47$$23, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1632); ZEPHIR_OBS_NVAR(&_48$$23); - zephir_array_fetch_long(&_48$$23, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1488); + zephir_array_fetch_long(&_48$$23, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1632); zephir_array_update_zval(&headerParts, &_48$$23, &_47$$23, PH_COPY | PH_SEPARATE); } } else { @@ -36341,7 +36778,7 @@ static PHP_METHOD(Phalcon_Http_Request, getQualityHeader) } } ZEPHIR_INIT_NVAR(&headerPart); - zephir_array_append(&returnedParts, &headerParts, PH_SEPARATE, "phalcon/Http/Request.zep", 1496); + zephir_array_append(&returnedParts, &headerParts, PH_SEPARATE, "phalcon/Http/Request.zep", 1640); ZEPHIR_CALL_METHOD(NULL, &parts, "next", NULL, 0); zephir_check_call_status(); } @@ -36413,7 +36850,7 @@ static PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders) ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdi", NULL, 0); zephir_check_call_status(); ZEPHIR_CPY_WRT(&container, &_0); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 340); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 339); zephir_check_call_status(); if (Z_TYPE_P(&container) != IS_NULL) { ZEPHIR_INIT_VAR(&_1$$3); @@ -36492,11 +36929,11 @@ static PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders) if (zephir_is_true(&authHeader)) { ZEPHIR_INIT_VAR(&_19$$11); ZVAL_STRING(&_19$$11, "basic "); - ZEPHIR_CALL_FUNCTION(&_20$$11, "stripos", NULL, 351, &authHeader, &_19$$11); + ZEPHIR_CALL_FUNCTION(&_20$$11, "stripos", NULL, 345, &authHeader, &_19$$11); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_19$$11); ZVAL_STRING(&_19$$11, "digest "); - ZEPHIR_CALL_FUNCTION(&_21$$11, "stripos", NULL, 351, &authHeader, &_19$$11); + ZEPHIR_CALL_FUNCTION(&_21$$11, "stripos", NULL, 345, &authHeader, &_19$$11); zephir_check_call_status(); _22$$11 = ZEPHIR_IS_LONG_IDENTICAL(&_21$$11, 0); if (_22$$11) { @@ -36508,20 +36945,20 @@ static PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders) } ZEPHIR_INIT_NVAR(&_19$$11); ZVAL_STRING(&_19$$11, "bearer "); - ZEPHIR_CALL_FUNCTION(&_24$$11, "stripos", NULL, 351, &authHeader, &_19$$11); + ZEPHIR_CALL_FUNCTION(&_24$$11, "stripos", NULL, 345, &authHeader, &_19$$11); zephir_check_call_status(); if (ZEPHIR_IS_LONG_IDENTICAL(&_20$$11, 0)) { ZVAL_LONG(&_25$$12, 6); ZEPHIR_INIT_VAR(&_26$$12); zephir_substr(&_26$$12, &authHeader, 6 , 0, ZEPHIR_SUBSTR_NO_LENGTH); - ZEPHIR_CALL_FUNCTION(&_27$$12, "base64_decode", NULL, 230, &_26$$12); + ZEPHIR_CALL_FUNCTION(&_27$$12, "base64_decode", NULL, 231, &_26$$12); zephir_check_call_status(); ZEPHIR_INIT_VAR(&exploded); zephir_fast_explode_str(&exploded, SL(":"), &_27$$12, 2 ); if (zephir_fast_count_int(&exploded) == 2) { - zephir_array_fetch_long(&_28$$13, &exploded, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1558); + zephir_array_fetch_long(&_28$$13, &exploded, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1702); zephir_array_update_string(&headers, SL("Php-Auth-User"), &_28$$13, PH_COPY | PH_SEPARATE); - zephir_array_fetch_long(&_29$$13, &exploded, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1559); + zephir_array_fetch_long(&_29$$13, &exploded, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1703); zephir_array_update_string(&headers, SL("Php-Auth-Pw"), &_29$$13, PH_COPY | PH_SEPARATE); } } else if (_22$$11) { @@ -36534,11 +36971,11 @@ static PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders) if (!(zephir_array_isset_string(&headers, SL("Authorization")))) { zephir_memory_observe(&digest); if (zephir_array_isset_string(&headers, SL("Php-Auth-User"))) { - zephir_array_fetch_string(&_30$$17, &headers, SL("Php-Auth-User"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1571); - zephir_array_fetch_string(&_31$$17, &headers, SL("Php-Auth-Pw"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1571); + zephir_array_fetch_string(&_30$$17, &headers, SL("Php-Auth-User"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1715); + zephir_array_fetch_string(&_31$$17, &headers, SL("Php-Auth-Pw"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1715); ZEPHIR_INIT_VAR(&_32$$17); ZEPHIR_CONCAT_VSV(&_32$$17, &_30$$17, ":", &_31$$17); - ZEPHIR_CALL_FUNCTION(&_33$$17, "base64_encode", NULL, 231, &_32$$17); + ZEPHIR_CALL_FUNCTION(&_33$$17, "base64_encode", NULL, 232, &_32$$17); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_34$$17); ZEPHIR_CONCAT_SV(&_34$$17, "Basic ", &_33$$17); @@ -36629,7 +37066,7 @@ static PHP_METHOD(Phalcon_Http_Request, smoothFiles) zephir_get_strval(&prefix, prefix_param); ZEPHIR_INIT_VAR(&files); array_init(&files); - zephir_is_iterable(&names, 0, "phalcon/Http/Request.zep", 1635); + zephir_is_iterable(&names, 0, "phalcon/Http/Request.zep", 1779); if (Z_TYPE_P(&names) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&names), _2, _3, _0) { @@ -36648,35 +37085,35 @@ static PHP_METHOD(Phalcon_Http_Request, smoothFiles) zephir_create_array(&_4$$4, 6, 0); zephir_array_update_string(&_4$$4, SL("name"), &name, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_5$$4); - zephir_array_fetch(&_5$$4, &types, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1611); + zephir_array_fetch(&_5$$4, &types, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1755); zephir_array_update_string(&_4$$4, SL("type"), &_5$$4, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_5$$4); - zephir_array_fetch(&_5$$4, &tmp_names, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1612); + zephir_array_fetch(&_5$$4, &tmp_names, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1756); zephir_array_update_string(&_4$$4, SL("tmp_name"), &_5$$4, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_5$$4); - zephir_array_fetch(&_5$$4, &sizes, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1613); + zephir_array_fetch(&_5$$4, &sizes, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1757); zephir_array_update_string(&_4$$4, SL("size"), &_5$$4, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_5$$4); - zephir_array_fetch(&_5$$4, &errors, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1614); + zephir_array_fetch(&_5$$4, &errors, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1758); zephir_array_update_string(&_4$$4, SL("error"), &_5$$4, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_4$$4, SL("key"), &p, PH_COPY | PH_SEPARATE); - zephir_array_append(&files, &_4$$4, PH_SEPARATE, "phalcon/Http/Request.zep", 1616); + zephir_array_append(&files, &_4$$4, PH_SEPARATE, "phalcon/Http/Request.zep", 1760); } if (Z_TYPE_P(&name) == IS_ARRAY) { - zephir_array_fetch(&_6$$5, &names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1621); - zephir_array_fetch(&_7$$5, &types, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1622); - zephir_array_fetch(&_8$$5, &tmp_names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1623); - zephir_array_fetch(&_9$$5, &sizes, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1624); - zephir_array_fetch(&_10$$5, &errors, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1625); - ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 345, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &_10$$5, &p); - zephir_check_call_status(); - zephir_is_iterable(&parentFiles, 0, "phalcon/Http/Request.zep", 1632); + zephir_array_fetch(&_6$$5, &names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1765); + zephir_array_fetch(&_7$$5, &types, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1766); + zephir_array_fetch(&_8$$5, &tmp_names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1767); + zephir_array_fetch(&_9$$5, &sizes, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1768); + zephir_array_fetch(&_10$$5, &errors, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1769); + ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 351, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &_10$$5, &p); + zephir_check_call_status(); + zephir_is_iterable(&parentFiles, 0, "phalcon/Http/Request.zep", 1776); if (Z_TYPE_P(&parentFiles) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&parentFiles), _12$$5) { ZEPHIR_INIT_NVAR(&file); ZVAL_COPY(&file, _12$$5); - zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1630); + zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1774); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &parentFiles, "rewind", NULL, 0); @@ -36689,7 +37126,7 @@ static PHP_METHOD(Phalcon_Http_Request, smoothFiles) } ZEPHIR_CALL_METHOD(&file, &parentFiles, "current", NULL, 0); zephir_check_call_status(); - zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1630); + zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1774); ZEPHIR_CALL_METHOD(NULL, &parentFiles, "next", NULL, 0); zephir_check_call_status(); } @@ -36717,35 +37154,35 @@ static PHP_METHOD(Phalcon_Http_Request, smoothFiles) zephir_create_array(&_14$$9, 6, 0); zephir_array_update_string(&_14$$9, SL("name"), &name, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_15$$9); - zephir_array_fetch(&_15$$9, &types, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1611); + zephir_array_fetch(&_15$$9, &types, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1755); zephir_array_update_string(&_14$$9, SL("type"), &_15$$9, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_15$$9); - zephir_array_fetch(&_15$$9, &tmp_names, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1612); + zephir_array_fetch(&_15$$9, &tmp_names, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1756); zephir_array_update_string(&_14$$9, SL("tmp_name"), &_15$$9, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_15$$9); - zephir_array_fetch(&_15$$9, &sizes, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1613); + zephir_array_fetch(&_15$$9, &sizes, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1757); zephir_array_update_string(&_14$$9, SL("size"), &_15$$9, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_15$$9); - zephir_array_fetch(&_15$$9, &errors, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1614); + zephir_array_fetch(&_15$$9, &errors, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1758); zephir_array_update_string(&_14$$9, SL("error"), &_15$$9, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_14$$9, SL("key"), &p, PH_COPY | PH_SEPARATE); - zephir_array_append(&files, &_14$$9, PH_SEPARATE, "phalcon/Http/Request.zep", 1616); + zephir_array_append(&files, &_14$$9, PH_SEPARATE, "phalcon/Http/Request.zep", 1760); } if (Z_TYPE_P(&name) == IS_ARRAY) { - zephir_array_fetch(&_16$$10, &names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1621); - zephir_array_fetch(&_17$$10, &types, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1622); - zephir_array_fetch(&_18$$10, &tmp_names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1623); - zephir_array_fetch(&_19$$10, &sizes, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1624); - zephir_array_fetch(&_20$$10, &errors, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1625); - ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 345, &_16$$10, &_17$$10, &_18$$10, &_19$$10, &_20$$10, &p); - zephir_check_call_status(); - zephir_is_iterable(&parentFiles, 0, "phalcon/Http/Request.zep", 1632); + zephir_array_fetch(&_16$$10, &names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1765); + zephir_array_fetch(&_17$$10, &types, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1766); + zephir_array_fetch(&_18$$10, &tmp_names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1767); + zephir_array_fetch(&_19$$10, &sizes, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1768); + zephir_array_fetch(&_20$$10, &errors, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1769); + ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 351, &_16$$10, &_17$$10, &_18$$10, &_19$$10, &_20$$10, &p); + zephir_check_call_status(); + zephir_is_iterable(&parentFiles, 0, "phalcon/Http/Request.zep", 1776); if (Z_TYPE_P(&parentFiles) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&parentFiles), _21$$10) { ZEPHIR_INIT_NVAR(&file); ZVAL_COPY(&file, _21$$10); - zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1630); + zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1774); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &parentFiles, "rewind", NULL, 0); @@ -36758,7 +37195,7 @@ static PHP_METHOD(Phalcon_Http_Request, smoothFiles) } ZEPHIR_CALL_METHOD(&file, &parentFiles, "current", NULL, 0); zephir_check_call_status(); - zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1630); + zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1774); ZEPHIR_CALL_METHOD(NULL, &parentFiles, "next", NULL, 0); zephir_check_call_status(); } @@ -36796,7 +37233,7 @@ static PHP_METHOD(Phalcon_Http_Request, getFilterService) zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&container, &_1$$3); if (Z_TYPE_P(&container) == IS_NULL) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_request_exception_ce, "A dependency injection container is required to access the 'filter' service", "phalcon/Http/Request.zep", 1653); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_request_exception_ce, "A dependency injection container is required to access the 'filter' service", "phalcon/Http/Request.zep", 1797); return; } ZEPHIR_INIT_VAR(&_3$$3); @@ -36877,7 +37314,7 @@ static PHP_METHOD(Phalcon_Http_Request, getFilteredData) } zephir_memory_observe(&filters); zephir_read_property(&_0, this_ptr, ZEND_STRL("queryFilters"), PH_NOISY_CC | PH_READONLY); - zephir_array_fetch(&_1, &_0, &methodKey, PH_READONLY, "phalcon/Http/Request.zep", 1685); + zephir_array_fetch(&_1, &_0, &methodKey, PH_READONLY, "phalcon/Http/Request.zep", 1829); if (!(zephir_array_isset_fetch(&filters, &_1, &name, 0))) { ZEPHIR_INIT_NVAR(&filters); array_init(&filters); @@ -36897,135 +37334,69 @@ static PHP_METHOD(Phalcon_Http_Request, getFilteredData) RETURN_MM(); } -static PHP_METHOD(Phalcon_Http_Request, getPatchPut) +static PHP_METHOD(Phalcon_Http_Request, getPostData) { + zend_bool _2$$3; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zend_bool notAllowEmpty, noRecursive, _0$$3, _3$$3; - zval *collection_param = NULL, *name_param = NULL, *filters = NULL, filters_sub, *defaultValue = NULL, defaultValue_sub, *notAllowEmpty_param = NULL, *noRecursive_param = NULL, __$null, cached, contentType, _10, _11, _1$$3, _2$$3, _4$$3, _5$$4, _6$$4, _8$$4, _7$$5, _9$$8; - zval collection, name; + zval *data, data_sub, result, _0$$3, _1$$3, _3$$3, _4$$3, _5$$3, _6$$4, _7$$6; zval *this_ptr = getThis(); - ZVAL_UNDEF(&collection); - ZVAL_UNDEF(&name); - ZVAL_UNDEF(&filters_sub); - ZVAL_UNDEF(&defaultValue_sub); - ZVAL_NULL(&__$null); - ZVAL_UNDEF(&cached); - ZVAL_UNDEF(&contentType); - ZVAL_UNDEF(&_10); - ZVAL_UNDEF(&_11); + ZVAL_UNDEF(&data_sub); + ZVAL_UNDEF(&result); + ZVAL_UNDEF(&_0$$3); ZVAL_UNDEF(&_1$$3); - ZVAL_UNDEF(&_2$$3); + ZVAL_UNDEF(&_3$$3); ZVAL_UNDEF(&_4$$3); - ZVAL_UNDEF(&_5$$4); + ZVAL_UNDEF(&_5$$3); ZVAL_UNDEF(&_6$$4); - ZVAL_UNDEF(&_8$$4); - ZVAL_UNDEF(&_7$$5); - ZVAL_UNDEF(&_9$$8); - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 6) - Z_PARAM_STR(collection) - Z_PARAM_OPTIONAL - Z_PARAM_STR_OR_NULL(name) - Z_PARAM_ZVAL_OR_NULL(filters) - Z_PARAM_ZVAL_OR_NULL(defaultValue) - Z_PARAM_BOOL(notAllowEmpty) - Z_PARAM_BOOL(noRecursive) + ZVAL_UNDEF(&_7$$6); + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_ZVAL(data) ZEND_PARSE_PARAMETERS_END(); ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - zephir_fetch_params(1, 1, 5, &collection_param, &name_param, &filters, &defaultValue, ¬AllowEmpty_param, &noRecursive_param); - zephir_get_strval(&collection, collection_param); - if (!name_param) { - ZEPHIR_INIT_VAR(&name); - } else { - zephir_get_strval(&name, name_param); - } - if (!filters) { - filters = &filters_sub; - filters = &__$null; - } - if (!defaultValue) { - defaultValue = &defaultValue_sub; - defaultValue = &__$null; - } - if (!notAllowEmpty_param) { - notAllowEmpty = 0; - } else { - } - if (!noRecursive_param) { - noRecursive = 0; - } else { - } - zephir_memory_observe(&cached); - zephir_read_property_zval(&cached, this_ptr, &collection, PH_NOISY_CC); - if (Z_TYPE_P(&cached) == IS_NULL) { - ZEPHIR_CALL_METHOD(&contentType, this_ptr, "getcontenttype", NULL, 0); + zephir_fetch_params(1, 1, 0, &data); + if (ZEPHIR_IS_EMPTY(data)) { + ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "isjson", NULL, 0); zephir_check_call_status(); - _0$$3 = Z_TYPE_P(&contentType) == IS_STRING; - if (_0$$3) { - ZEPHIR_INIT_VAR(&_1$$3); - ZVAL_STRING(&_1$$3, "json"); - ZEPHIR_CALL_FUNCTION(&_2$$3, "stripos", NULL, 351, &contentType, &_1$$3); + ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "getcontenttype", NULL, 0); + zephir_check_call_status(); + _2$$3 = zephir_is_true(&_1$$3); + if (_2$$3) { + ZEPHIR_CALL_METHOD(&_3$$3, this_ptr, "getcontenttype", NULL, 0); zephir_check_call_status(); - _3$$3 = !ZEPHIR_IS_FALSE(&_2$$3); - if (!(_3$$3)) { - ZEPHIR_INIT_NVAR(&_1$$3); - ZVAL_STRING(&_1$$3, "multipart/form-data"); - ZEPHIR_CALL_FUNCTION(&_4$$3, "stripos", NULL, 351, &contentType, &_1$$3); - zephir_check_call_status(); - _3$$3 = !ZEPHIR_IS_FALSE_IDENTICAL(&_4$$3); - } - _0$$3 = _3$$3; + ZEPHIR_INIT_VAR(&_4$$3); + ZVAL_STRING(&_4$$3, "multipart/form-data"); + ZEPHIR_CALL_FUNCTION(&_5$$3, "stripos", NULL, 345, &_3$$3, &_4$$3); + zephir_check_call_status(); + _2$$3 = !ZEPHIR_IS_FALSE_IDENTICAL(&_5$$3); } - if (_0$$3) { - ZEPHIR_INIT_VAR(&_5$$4); - ZVAL_STRING(&_5$$4, "json"); - ZEPHIR_CALL_FUNCTION(&_6$$4, "stripos", NULL, 351, &contentType, &_5$$4); + if (zephir_is_true(&_0$$3)) { + ZVAL_BOOL(&_6$$4, 1); + ZEPHIR_CALL_METHOD(&result, this_ptr, "getjsonrawbody", NULL, 0, &_6$$4); zephir_check_call_status(); - if (!ZEPHIR_IS_FALSE(&_6$$4)) { - ZVAL_BOOL(&_7$$5, 1); - ZEPHIR_CALL_METHOD(&cached, this_ptr, "getjsonrawbody", NULL, 0, &_7$$5); - zephir_check_call_status(); - } - ZEPHIR_INIT_NVAR(&_5$$4); - ZVAL_STRING(&_5$$4, "multipart/form-data"); - ZEPHIR_CALL_FUNCTION(&_8$$4, "stripos", NULL, 351, &contentType, &_5$$4); + } else if (_2$$3) { + ZEPHIR_CALL_METHOD(&result, this_ptr, "getformdata", NULL, 352); zephir_check_call_status(); - if (!ZEPHIR_IS_FALSE_IDENTICAL(&_8$$4)) { - ZEPHIR_CALL_METHOD(&cached, this_ptr, "getformdata", NULL, 352); - zephir_check_call_status(); - } - if (Z_TYPE_P(&cached) != IS_ARRAY) { - ZEPHIR_INIT_NVAR(&cached); - array_init(&cached); - } } else { - ZEPHIR_INIT_NVAR(&cached); - array_init(&cached); - ZEPHIR_CALL_METHOD(&_9$$8, this_ptr, "getrawbody", NULL, 0); + ZEPHIR_INIT_NVAR(&result); + array_init(&result); + ZEPHIR_CALL_METHOD(&_7$$6, this_ptr, "getrawbody", NULL, 0); zephir_check_call_status(); - ZEPHIR_MAKE_REF(&cached); - ZEPHIR_CALL_FUNCTION(NULL, "parse_str", NULL, 353, &_9$$8, &cached); - ZEPHIR_UNREF(&cached); + ZEPHIR_MAKE_REF(&result); + ZEPHIR_CALL_FUNCTION(NULL, "parse_str", NULL, 353, &_7$$6, &result); + ZEPHIR_UNREF(&result); zephir_check_call_status(); } - zephir_update_property_zval_zval(this_ptr, &collection, &cached); - } - if (notAllowEmpty) { - ZVAL_BOOL(&_10, 1); } else { - ZVAL_BOOL(&_10, 0); + ZEPHIR_CPY_WRT(&result, data); } - if (noRecursive) { - ZVAL_BOOL(&_11, 1); - } else { - ZVAL_BOOL(&_11, 0); + if (Z_TYPE_P(&result) != IS_ARRAY) { + ZEPHIR_INIT_NVAR(&result); + array_init(&result); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 336, &cached, &name, filters, defaultValue, &_10, &_11); - zephir_check_call_status(); - RETURN_MM(); + RETURN_CCTOR(&result); } static PHP_METHOD(Phalcon_Http_Request, getFormData) @@ -37227,7 +37598,7 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData) ZVAL_STRING(&_3, "/boundary=(.*)$/is"); zephir_preg_match(&_2, &_3, &_0, &matches, 0, 0 , 0 ); zephir_memory_observe(&boundary); - zephir_array_fetch_long(&boundary, &matches, 1, PH_NOISY, "phalcon/Http/Request.zep", 1771); + zephir_array_fetch_long(&boundary, &matches, 1, PH_NOISY, "phalcon/Http/Request.zep", 1884); ZEPHIR_INIT_VAR(&_4); ZVAL_STRING(&_4, "/"); ZEPHIR_CALL_FUNCTION(&_5, "preg_quote", NULL, 354, &boundary, &_4); @@ -37244,7 +37615,7 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData) zephir_check_call_status(); ZEPHIR_INIT_VAR(&dataset); array_init(&dataset); - zephir_is_iterable(&bodyParts, 0, "phalcon/Http/Request.zep", 1832); + zephir_is_iterable(&bodyParts, 0, "phalcon/Http/Request.zep", 1945); if (Z_TYPE_P(&bodyParts) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&bodyParts), _8) { @@ -37260,14 +37631,14 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&headers$$3); array_init(&headers$$3); - zephir_array_fetch_long(&_12$$3, &splited$$3, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1793); + zephir_array_fetch_long(&_12$$3, &splited$$3, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1906); ZEPHIR_INIT_NVAR(&_10$$3); ZVAL_STRING(&_10$$3, "/\\R/s"); ZVAL_LONG(&_11$$3, -1); ZVAL_LONG(&_13$$3, 1); ZEPHIR_CALL_FUNCTION(&headerParts$$3, "preg_split", NULL, 70, &_10$$3, &_12$$3, &_11$$3, &_13$$3); zephir_check_call_status(); - zephir_is_iterable(&headerParts$$3, 0, "phalcon/Http/Request.zep", 1829); + zephir_is_iterable(&headerParts$$3, 0, "phalcon/Http/Request.zep", 1942); if (Z_TYPE_P(&headerParts$$3) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&headerParts$$3), _14$$3) { @@ -37283,11 +37654,11 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData) ZEPHIR_INIT_NVAR(&exploded$$5); zephir_fast_explode_str(&exploded$$5, SL(":"), &headerPart$$3, 2 ); ZEPHIR_INIT_NVAR(&_18$$5); - zephir_array_fetch_long(&_19$$5, &exploded$$5, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1803); + zephir_array_fetch_long(&_19$$5, &exploded$$5, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1916); zephir_fast_trim(&_18$$5, &_19$$5, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&headerName$$5); zephir_fast_strtolower(&headerName$$5, &_18$$5); - zephir_array_fetch_long(&_20$$5, &exploded$$5, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1804); + zephir_array_fetch_long(&_20$$5, &exploded$$5, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1917); ZEPHIR_INIT_NVAR(&headerValue$$5); zephir_fast_trim(&headerValue$$5, &_20$$5, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&_21$$5); @@ -37297,7 +37668,7 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData) if (!ZEPHIR_IS_FALSE_IDENTICAL(&_22$$5)) { ZEPHIR_INIT_NVAR(&explodedHeader$$7); zephir_fast_explode_str(&explodedHeader$$7, SL(";"), &headerValue$$5, LONG_MAX); - zephir_is_iterable(&explodedHeader$$7, 0, "phalcon/Http/Request.zep", 1824); + zephir_is_iterable(&explodedHeader$$7, 0, "phalcon/Http/Request.zep", 1937); if (Z_TYPE_P(&explodedHeader$$7) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&explodedHeader$$7), _23$$7) { @@ -37319,12 +37690,12 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData) ZEPHIR_INIT_NVAR(&explodedPart$$9); zephir_fast_explode_str(&explodedPart$$9, SL("="), &part$$7, 2 ); ZEPHIR_INIT_NVAR(&_29$$9); - zephir_array_fetch_long(&_30$$9, &explodedPart$$9, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1816); + zephir_array_fetch_long(&_30$$9, &explodedPart$$9, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1929); zephir_fast_trim(&_29$$9, &_30$$9, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&namePart$$9); zephir_fast_strtolower(&namePart$$9, &_29$$9); ZEPHIR_INIT_NVAR(&_31$$9); - zephir_array_fetch_long(&_32$$9, &explodedPart$$9, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1817); + zephir_array_fetch_long(&_32$$9, &explodedPart$$9, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1930); zephir_fast_trim(&_31$$9, &_32$$9, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&_33$$9); ZVAL_STRING(&_33$$9, "\""); @@ -37362,12 +37733,12 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData) ZEPHIR_INIT_NVAR(&explodedPart$$12); zephir_fast_explode_str(&explodedPart$$12, SL("="), &part$$7, 2 ); ZEPHIR_INIT_NVAR(&_37$$12); - zephir_array_fetch_long(&_38$$12, &explodedPart$$12, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1816); + zephir_array_fetch_long(&_38$$12, &explodedPart$$12, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1929); zephir_fast_trim(&_37$$12, &_38$$12, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&namePart$$12); zephir_fast_strtolower(&namePart$$12, &_37$$12); ZEPHIR_INIT_NVAR(&_39$$12); - zephir_array_fetch_long(&_40$$12, &explodedPart$$12, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1817); + zephir_array_fetch_long(&_40$$12, &explodedPart$$12, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1930); zephir_fast_trim(&_39$$12, &_40$$12, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&_41$$12); ZVAL_STRING(&_41$$12, "\""); @@ -37407,11 +37778,11 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData) ZEPHIR_INIT_NVAR(&exploded$$15); zephir_fast_explode_str(&exploded$$15, SL(":"), &headerPart$$3, 2 ); ZEPHIR_INIT_NVAR(&_44$$15); - zephir_array_fetch_long(&_45$$15, &exploded$$15, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1803); + zephir_array_fetch_long(&_45$$15, &exploded$$15, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1916); zephir_fast_trim(&_44$$15, &_45$$15, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&headerName$$15); zephir_fast_strtolower(&headerName$$15, &_44$$15); - zephir_array_fetch_long(&_46$$15, &exploded$$15, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1804); + zephir_array_fetch_long(&_46$$15, &exploded$$15, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1917); ZEPHIR_INIT_NVAR(&headerValue$$15); zephir_fast_trim(&headerValue$$15, &_46$$15, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&_47$$15); @@ -37421,7 +37792,7 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData) if (!ZEPHIR_IS_FALSE_IDENTICAL(&_48$$15)) { ZEPHIR_INIT_NVAR(&explodedHeader$$17); zephir_fast_explode_str(&explodedHeader$$17, SL(";"), &headerValue$$15, LONG_MAX); - zephir_is_iterable(&explodedHeader$$17, 0, "phalcon/Http/Request.zep", 1824); + zephir_is_iterable(&explodedHeader$$17, 0, "phalcon/Http/Request.zep", 1937); if (Z_TYPE_P(&explodedHeader$$17) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&explodedHeader$$17), _49$$17) { @@ -37443,12 +37814,12 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData) ZEPHIR_INIT_NVAR(&explodedPart$$19); zephir_fast_explode_str(&explodedPart$$19, SL("="), &part$$17, 2 ); ZEPHIR_INIT_NVAR(&_54$$19); - zephir_array_fetch_long(&_55$$19, &explodedPart$$19, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1816); + zephir_array_fetch_long(&_55$$19, &explodedPart$$19, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1929); zephir_fast_trim(&_54$$19, &_55$$19, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&namePart$$19); zephir_fast_strtolower(&namePart$$19, &_54$$19); ZEPHIR_INIT_NVAR(&_56$$19); - zephir_array_fetch_long(&_57$$19, &explodedPart$$19, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1817); + zephir_array_fetch_long(&_57$$19, &explodedPart$$19, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1930); zephir_fast_trim(&_56$$19, &_57$$19, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&_58$$19); ZVAL_STRING(&_58$$19, "\""); @@ -37486,12 +37857,12 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData) ZEPHIR_INIT_NVAR(&explodedPart$$22); zephir_fast_explode_str(&explodedPart$$22, SL("="), &part$$17, 2 ); ZEPHIR_INIT_NVAR(&_62$$22); - zephir_array_fetch_long(&_63$$22, &explodedPart$$22, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1816); + zephir_array_fetch_long(&_63$$22, &explodedPart$$22, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1929); zephir_fast_trim(&_62$$22, &_63$$22, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&namePart$$22); zephir_fast_strtolower(&namePart$$22, &_62$$22); ZEPHIR_INIT_NVAR(&_64$$22); - zephir_array_fetch_long(&_65$$22, &explodedPart$$22, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1817); + zephir_array_fetch_long(&_65$$22, &explodedPart$$22, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1930); zephir_fast_trim(&_64$$22, &_65$$22, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&_66$$22); ZVAL_STRING(&_66$$22, "\""); @@ -37514,10 +37885,10 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData) } } ZEPHIR_INIT_NVAR(&headerPart$$3); - zephir_array_fetch_long(&_67$$3, &splited$$3, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1829); - zephir_array_fetch_string(&_68$$3, &headers$$3, SL("content-disposition"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1829); + zephir_array_fetch_long(&_67$$3, &splited$$3, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1942); + zephir_array_fetch_string(&_68$$3, &headers$$3, SL("content-disposition"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1942); ZEPHIR_OBS_NVAR(&_69$$3); - zephir_array_fetch_string(&_69$$3, &_68$$3, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 1829); + zephir_array_fetch_string(&_69$$3, &_68$$3, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 1942); zephir_array_update_zval(&dataset, &_69$$3, &_67$$3, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); } else { @@ -37541,14 +37912,14 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&headers$$25); array_init(&headers$$25); - zephir_array_fetch_long(&_72$$25, &splited$$25, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1793); + zephir_array_fetch_long(&_72$$25, &splited$$25, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1906); ZEPHIR_INIT_NVAR(&_70$$25); ZVAL_STRING(&_70$$25, "/\\R/s"); ZVAL_LONG(&_71$$25, -1); ZVAL_LONG(&_73$$25, 1); ZEPHIR_CALL_FUNCTION(&headerParts$$25, "preg_split", NULL, 70, &_70$$25, &_72$$25, &_71$$25, &_73$$25); zephir_check_call_status(); - zephir_is_iterable(&headerParts$$25, 0, "phalcon/Http/Request.zep", 1829); + zephir_is_iterable(&headerParts$$25, 0, "phalcon/Http/Request.zep", 1942); if (Z_TYPE_P(&headerParts$$25) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&headerParts$$25), _74$$25) { @@ -37564,11 +37935,11 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData) ZEPHIR_INIT_NVAR(&exploded$$27); zephir_fast_explode_str(&exploded$$27, SL(":"), &headerPart$$25, 2 ); ZEPHIR_INIT_NVAR(&_78$$27); - zephir_array_fetch_long(&_79$$27, &exploded$$27, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1803); + zephir_array_fetch_long(&_79$$27, &exploded$$27, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1916); zephir_fast_trim(&_78$$27, &_79$$27, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&headerName$$27); zephir_fast_strtolower(&headerName$$27, &_78$$27); - zephir_array_fetch_long(&_80$$27, &exploded$$27, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1804); + zephir_array_fetch_long(&_80$$27, &exploded$$27, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1917); ZEPHIR_INIT_NVAR(&headerValue$$27); zephir_fast_trim(&headerValue$$27, &_80$$27, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&_81$$27); @@ -37578,7 +37949,7 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData) if (!ZEPHIR_IS_FALSE_IDENTICAL(&_82$$27)) { ZEPHIR_INIT_NVAR(&explodedHeader$$29); zephir_fast_explode_str(&explodedHeader$$29, SL(";"), &headerValue$$27, LONG_MAX); - zephir_is_iterable(&explodedHeader$$29, 0, "phalcon/Http/Request.zep", 1824); + zephir_is_iterable(&explodedHeader$$29, 0, "phalcon/Http/Request.zep", 1937); if (Z_TYPE_P(&explodedHeader$$29) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&explodedHeader$$29), _83$$29) { @@ -37600,12 +37971,12 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData) ZEPHIR_INIT_NVAR(&explodedPart$$31); zephir_fast_explode_str(&explodedPart$$31, SL("="), &part$$29, 2 ); ZEPHIR_INIT_NVAR(&_88$$31); - zephir_array_fetch_long(&_89$$31, &explodedPart$$31, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1816); + zephir_array_fetch_long(&_89$$31, &explodedPart$$31, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1929); zephir_fast_trim(&_88$$31, &_89$$31, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&namePart$$31); zephir_fast_strtolower(&namePart$$31, &_88$$31); ZEPHIR_INIT_NVAR(&_90$$31); - zephir_array_fetch_long(&_91$$31, &explodedPart$$31, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1817); + zephir_array_fetch_long(&_91$$31, &explodedPart$$31, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1930); zephir_fast_trim(&_90$$31, &_91$$31, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&_92$$31); ZVAL_STRING(&_92$$31, "\""); @@ -37643,12 +38014,12 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData) ZEPHIR_INIT_NVAR(&explodedPart$$34); zephir_fast_explode_str(&explodedPart$$34, SL("="), &part$$29, 2 ); ZEPHIR_INIT_NVAR(&_96$$34); - zephir_array_fetch_long(&_97$$34, &explodedPart$$34, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1816); + zephir_array_fetch_long(&_97$$34, &explodedPart$$34, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1929); zephir_fast_trim(&_96$$34, &_97$$34, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&namePart$$34); zephir_fast_strtolower(&namePart$$34, &_96$$34); ZEPHIR_INIT_NVAR(&_98$$34); - zephir_array_fetch_long(&_99$$34, &explodedPart$$34, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1817); + zephir_array_fetch_long(&_99$$34, &explodedPart$$34, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1930); zephir_fast_trim(&_98$$34, &_99$$34, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&_100$$34); ZVAL_STRING(&_100$$34, "\""); @@ -37688,11 +38059,11 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData) ZEPHIR_INIT_NVAR(&exploded$$37); zephir_fast_explode_str(&exploded$$37, SL(":"), &headerPart$$25, 2 ); ZEPHIR_INIT_NVAR(&_103$$37); - zephir_array_fetch_long(&_104$$37, &exploded$$37, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1803); + zephir_array_fetch_long(&_104$$37, &exploded$$37, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1916); zephir_fast_trim(&_103$$37, &_104$$37, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&headerName$$37); zephir_fast_strtolower(&headerName$$37, &_103$$37); - zephir_array_fetch_long(&_105$$37, &exploded$$37, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1804); + zephir_array_fetch_long(&_105$$37, &exploded$$37, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1917); ZEPHIR_INIT_NVAR(&headerValue$$37); zephir_fast_trim(&headerValue$$37, &_105$$37, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&_106$$37); @@ -37702,7 +38073,7 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData) if (!ZEPHIR_IS_FALSE_IDENTICAL(&_107$$37)) { ZEPHIR_INIT_NVAR(&explodedHeader$$39); zephir_fast_explode_str(&explodedHeader$$39, SL(";"), &headerValue$$37, LONG_MAX); - zephir_is_iterable(&explodedHeader$$39, 0, "phalcon/Http/Request.zep", 1824); + zephir_is_iterable(&explodedHeader$$39, 0, "phalcon/Http/Request.zep", 1937); if (Z_TYPE_P(&explodedHeader$$39) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&explodedHeader$$39), _108$$39) { @@ -37724,12 +38095,12 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData) ZEPHIR_INIT_NVAR(&explodedPart$$41); zephir_fast_explode_str(&explodedPart$$41, SL("="), &part$$39, 2 ); ZEPHIR_INIT_NVAR(&_113$$41); - zephir_array_fetch_long(&_114$$41, &explodedPart$$41, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1816); + zephir_array_fetch_long(&_114$$41, &explodedPart$$41, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1929); zephir_fast_trim(&_113$$41, &_114$$41, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&namePart$$41); zephir_fast_strtolower(&namePart$$41, &_113$$41); ZEPHIR_INIT_NVAR(&_115$$41); - zephir_array_fetch_long(&_116$$41, &explodedPart$$41, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1817); + zephir_array_fetch_long(&_116$$41, &explodedPart$$41, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1930); zephir_fast_trim(&_115$$41, &_116$$41, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&_117$$41); ZVAL_STRING(&_117$$41, "\""); @@ -37767,12 +38138,12 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData) ZEPHIR_INIT_NVAR(&explodedPart$$44); zephir_fast_explode_str(&explodedPart$$44, SL("="), &part$$39, 2 ); ZEPHIR_INIT_NVAR(&_121$$44); - zephir_array_fetch_long(&_122$$44, &explodedPart$$44, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1816); + zephir_array_fetch_long(&_122$$44, &explodedPart$$44, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1929); zephir_fast_trim(&_121$$44, &_122$$44, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&namePart$$44); zephir_fast_strtolower(&namePart$$44, &_121$$44); ZEPHIR_INIT_NVAR(&_123$$44); - zephir_array_fetch_long(&_124$$44, &explodedPart$$44, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1817); + zephir_array_fetch_long(&_124$$44, &explodedPart$$44, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1930); zephir_fast_trim(&_123$$44, &_124$$44, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&_125$$44); ZVAL_STRING(&_125$$44, "\""); @@ -37795,10 +38166,10 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData) } } ZEPHIR_INIT_NVAR(&headerPart$$25); - zephir_array_fetch_long(&_126$$25, &splited$$25, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1829); - zephir_array_fetch_string(&_127$$25, &headers$$25, SL("content-disposition"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1829); + zephir_array_fetch_long(&_126$$25, &splited$$25, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1942); + zephir_array_fetch_string(&_127$$25, &headers$$25, SL("content-disposition"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1942); ZEPHIR_OBS_NVAR(&_128$$25); - zephir_array_fetch_string(&_128$$25, &_127$$25, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 1829); + zephir_array_fetch_string(&_128$$25, &_127$$25, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 1942); zephir_array_update_zval(&dataset, &_128$$25, &_126$$25, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &bodyParts, "next", NULL, 0); zephir_check_call_status(); @@ -37810,10 +38181,12 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData) zend_object *zephir_init_properties_Phalcon_Http_Request(zend_class_entry *class_type) { - zval _0, _1$$3; + zval _0, _2, _1$$3, _3$$4; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_2); ZVAL_UNDEF(&_1$$3); + ZVAL_UNDEF(&_3$$4); ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); @@ -37822,11 +38195,17 @@ zend_object *zephir_init_properties_Phalcon_Http_Request(zend_class_entry *class { zval local_this_ptr, *this_ptr = &local_this_ptr; ZEPHIR_CREATE_OBJECT(this_ptr, class_type); - zephir_read_property_ex(&_0, this_ptr, ZEND_STRL("queryFilters"), PH_NOISY_CC | PH_READONLY); + zephir_read_property_ex(&_0, this_ptr, ZEND_STRL("trustedProxies"), PH_NOISY_CC | PH_READONLY); if (Z_TYPE_P(&_0) == IS_NULL) { ZEPHIR_INIT_VAR(&_1$$3); array_init(&_1$$3); - zephir_update_property_zval_ex(this_ptr, ZEND_STRL("queryFilters"), &_1$$3); + zephir_update_property_zval_ex(this_ptr, ZEND_STRL("trustedProxies"), &_1$$3); + } + zephir_read_property_ex(&_2, this_ptr, ZEND_STRL("queryFilters"), PH_NOISY_CC | PH_READONLY); + if (Z_TYPE_P(&_2) == IS_NULL) { + ZEPHIR_INIT_VAR(&_3$$4); + array_init(&_3$$4); + zephir_update_property_zval_ex(this_ptr, ZEND_STRL("queryFilters"), &_3$$4); } ZEPHIR_MM_RESTORE(); return Z_OBJ_P(this_ptr); @@ -37922,7 +38301,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Response) zend_declare_property_null(phalcon_http_response_ce, SL("headers"), ZEND_ACC_PROTECTED); zend_declare_property_bool(phalcon_http_response_ce, SL("sent"), 0, ZEND_ACC_PROTECTED); zend_declare_property_null(phalcon_http_response_ce, SL("statusCodes"), ZEND_ACC_PROTECTED); - zend_declare_property_null(phalcon_http_response_ce, SL("encode"), ZEND_ACC_PRIVATE); + zend_declare_property_null(phalcon_http_response_ce, SL("encode"), ZEND_ACC_PROTECTED); phalcon_http_response_ce->create_object = zephir_init_properties_Phalcon_Http_Response; zend_class_implements(phalcon_http_response_ce, 1, phalcon_http_responseinterface_ce); @@ -38764,7 +39143,7 @@ static PHP_METHOD(Phalcon_Http_Response, setFileToSend) if ((zephir_function_exists_ex(ZEND_STRL("mb_detect_encoding")) == SUCCESS)) { ZEPHIR_CALL_FUNCTION(&_0$$6, "mb_detect_order", NULL, 361); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&basePathEncoding, "mb_detect_encoding", NULL, 324, &basePath, &_0$$6, &__$true); + ZEPHIR_CALL_FUNCTION(&basePathEncoding, "mb_detect_encoding", NULL, 326, &basePath, &_0$$6, &__$true); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_1$$5); @@ -38780,7 +39159,7 @@ static PHP_METHOD(Phalcon_Http_Response, setFileToSend) ZEPHIR_CALL_METHOD(NULL, this_ptr, "setrawheader", NULL, 0, &_1$$5); zephir_check_call_status(); if (!ZEPHIR_IS_STRING(&basePathEncoding, "ASCII")) { - ZEPHIR_CALL_FUNCTION(&_2$$7, "rawurlencode", NULL, 328, &basePath); + ZEPHIR_CALL_FUNCTION(&_2$$7, "rawurlencode", NULL, 330, &basePath); zephir_check_call_status(); ZEPHIR_CPY_WRT(&basePath, &_2$$7); ZEPHIR_INIT_VAR(&_3$$7); @@ -38792,7 +39171,7 @@ static PHP_METHOD(Phalcon_Http_Response, setFileToSend) } else { ZEPHIR_INIT_VAR(&_5$$8); ZVAL_STRING(&_5$$8, "\15\17\\\""); - ZEPHIR_CALL_FUNCTION(&_6$$8, "addcslashes", NULL, 215, &basePath, &_5$$8); + ZEPHIR_CALL_FUNCTION(&_6$$8, "addcslashes", NULL, 216, &basePath, &_5$$8); zephir_check_call_status(); ZEPHIR_CPY_WRT(&basePath, &_6$$8); ZEPHIR_INIT_VAR(&_7$$8); @@ -40429,7 +40808,7 @@ static PHP_METHOD(Phalcon_Http_Request_File, __construct) zephir_update_property_zval(this_ptr, ZEND_STRL("name"), &name); ZEPHIR_INIT_VAR(&_0$$3); ZVAL_STRING(&_0$$3, "PATHINFO_EXTENSION"); - ZEPHIR_CALL_FUNCTION(&_1$$3, "defined", NULL, 118, &_0$$3); + ZEPHIR_CALL_FUNCTION(&_1$$3, "defined", NULL, 119, &_0$$3); zephir_check_call_status(); if (zephir_is_true(&_1$$3)) { ZVAL_LONG(&_2$$4, 4); @@ -40502,15 +40881,15 @@ static PHP_METHOD(Phalcon_Http_Request_File, getRealType) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); ZVAL_LONG(&_0, 16); - ZEPHIR_CALL_FUNCTION(&finfo, "finfo_open", NULL, 308, &_0); + ZEPHIR_CALL_FUNCTION(&finfo, "finfo_open", NULL, 310, &_0); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&finfo)) { RETURN_MM_STRING(""); } zephir_read_property(&_0, this_ptr, ZEND_STRL("tmp"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 309, &finfo, &_0); + ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 311, &finfo, &_0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 310, &finfo); + ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 312, &finfo); zephir_check_call_status(); RETURN_CCTOR(&mime); } @@ -44370,15 +44749,15 @@ static PHP_METHOD(Phalcon_Db_Profiler, startProfile) zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlstatement", NULL, 218, &sqlStatement); + ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlstatement", NULL, 219, &sqlStatement); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlvariables", NULL, 219, &sqlVariables); + ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlvariables", NULL, 220, &sqlVariables); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlbindtypes", NULL, 220, &sqlBindTypes); + ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlbindtypes", NULL, 221, &sqlBindTypes); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_0, "hrtime", NULL, 203, &__$true); + ZEPHIR_CALL_FUNCTION(&_0, "hrtime", NULL, 204, &__$true); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setinitialtime", NULL, 221, &_0); + ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setinitialtime", NULL, 222, &_0); zephir_check_call_status(); if ((zephir_method_exists_ex(this_ptr, ZEND_STRL("beforestartprofile")) == SUCCESS)) { ZEPHIR_CALL_METHOD(NULL, this_ptr, "beforestartprofile", NULL, 0, &activeProfile); @@ -44406,7 +44785,7 @@ static PHP_METHOD(Phalcon_Db_Profiler, stopProfile) zephir_read_property(&_0, this_ptr, ZEND_STRL("activeProfile"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&activeProfile, &_0); - ZEPHIR_CALL_FUNCTION(&_1, "hrtime", NULL, 203, &__$true); + ZEPHIR_CALL_FUNCTION(&_1, "hrtime", NULL, 204, &__$true); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setfinaltime", NULL, 0, &_1); zephir_check_call_status(); @@ -44997,7 +45376,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, addColumn) } _8$$5 = _7$$5; if (!(_8$$5)) { - ZEPHIR_CALL_FUNCTION(&_9$$5, "is_float", NULL, 214, &defaultValue); + ZEPHIR_CALL_FUNCTION(&_9$$5, "is_float", NULL, 215, &defaultValue); zephir_check_call_status(); _8$$5 = zephir_is_true(&_9$$5); } @@ -45008,7 +45387,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, addColumn) } else { ZEPHIR_INIT_VAR(&_11$$7); ZVAL_STRING(&_11$$7, "\""); - ZEPHIR_CALL_FUNCTION(&_12$$7, "addcslashes", NULL, 215, &defaultValue, &_11$$7); + ZEPHIR_CALL_FUNCTION(&_12$$7, "addcslashes", NULL, 216, &defaultValue, &_11$$7); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_13$$7); ZEPHIR_CONCAT_SVS(&_13$$7, " DEFAULT \"", &_12$$7, "\""); @@ -45460,7 +45839,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) } _11$$10 = _10$$10; if (!(_11$$10)) { - ZEPHIR_CALL_FUNCTION(&_12$$10, "is_float", &_13, 214, &defaultValue); + ZEPHIR_CALL_FUNCTION(&_12$$10, "is_float", &_13, 215, &defaultValue); zephir_check_call_status(); _11$$10 = zephir_is_true(&_12$$10); } @@ -45471,7 +45850,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) } else { ZEPHIR_INIT_NVAR(&_15$$12); ZVAL_STRING(&_15$$12, "\""); - ZEPHIR_CALL_FUNCTION(&_16$$12, "addcslashes", &_17, 215, &defaultValue, &_15$$12); + ZEPHIR_CALL_FUNCTION(&_16$$12, "addcslashes", &_17, 216, &defaultValue, &_15$$12); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_18$$12); ZEPHIR_CONCAT_SVS(&_18$$12, " DEFAULT \"", &_16$$12, "\""); @@ -45540,7 +45919,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) } _30$$19 = _29$$19; if (!(_30$$19)) { - ZEPHIR_CALL_FUNCTION(&_31$$19, "is_float", &_13, 214, &defaultValue); + ZEPHIR_CALL_FUNCTION(&_31$$19, "is_float", &_13, 215, &defaultValue); zephir_check_call_status(); _30$$19 = zephir_is_true(&_31$$19); } @@ -45551,7 +45930,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) } else { ZEPHIR_INIT_NVAR(&_33$$21); ZVAL_STRING(&_33$$21, "\""); - ZEPHIR_CALL_FUNCTION(&_34$$21, "addcslashes", &_17, 215, &defaultValue, &_33$$21); + ZEPHIR_CALL_FUNCTION(&_34$$21, "addcslashes", &_17, 216, &defaultValue, &_33$$21); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_35$$21); ZEPHIR_CONCAT_SVS(&_35$$21, " DEFAULT \"", &_34$$21, "\""); @@ -46353,7 +46732,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) } ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "getcolumnsize", NULL, 0, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "checkcolumnunsigned", NULL, 216, column); + ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "checkcolumnunsigned", NULL, 217, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2$$3); ZEPHIR_CONCAT_VV(&_2$$3, &_0$$3, &_1$$3); @@ -46415,7 +46794,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) } ZEPHIR_CALL_METHOD(&_7$$18, this_ptr, "getcolumnsizeandscale", NULL, 0, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_8$$18, this_ptr, "checkcolumnunsigned", NULL, 216, column); + ZEPHIR_CALL_METHOD(&_8$$18, this_ptr, "checkcolumnunsigned", NULL, 217, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_9$$18); ZEPHIR_CONCAT_VV(&_9$$18, &_7$$18, &_8$$18); @@ -46426,9 +46805,9 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) if (ZEPHIR_IS_EMPTY(&columnSql)) { zephir_concat_self_str(&columnSql, SL("DOUBLE")); } - ZEPHIR_CALL_METHOD(&_10$$20, this_ptr, "checkcolumnsizeandscale", NULL, 217, column); + ZEPHIR_CALL_METHOD(&_10$$20, this_ptr, "checkcolumnsizeandscale", NULL, 218, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_11$$20, this_ptr, "checkcolumnunsigned", NULL, 216, column); + ZEPHIR_CALL_METHOD(&_11$$20, this_ptr, "checkcolumnunsigned", NULL, 217, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_12$$20); ZEPHIR_CONCAT_VV(&_12$$20, &_10$$20, &_11$$20); @@ -46448,9 +46827,9 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) if (ZEPHIR_IS_EMPTY(&columnSql)) { zephir_concat_self_str(&columnSql, SL("FLOAT")); } - ZEPHIR_CALL_METHOD(&_14$$24, this_ptr, "checkcolumnsizeandscale", NULL, 217, column); + ZEPHIR_CALL_METHOD(&_14$$24, this_ptr, "checkcolumnsizeandscale", NULL, 218, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_15$$24, this_ptr, "checkcolumnunsigned", NULL, 216, column); + ZEPHIR_CALL_METHOD(&_15$$24, this_ptr, "checkcolumnunsigned", NULL, 217, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_16$$24); ZEPHIR_CONCAT_VV(&_16$$24, &_14$$24, &_15$$24); @@ -46463,7 +46842,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) } ZEPHIR_CALL_METHOD(&_17$$26, this_ptr, "getcolumnsize", NULL, 0, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_18$$26, this_ptr, "checkcolumnunsigned", NULL, 216, column); + ZEPHIR_CALL_METHOD(&_18$$26, this_ptr, "checkcolumnunsigned", NULL, 217, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_19$$26); ZEPHIR_CONCAT_VV(&_19$$26, &_17$$26, &_18$$26); @@ -46500,7 +46879,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) } ZEPHIR_CALL_METHOD(&_20$$36, this_ptr, "getcolumnsize", NULL, 0, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_21$$36, this_ptr, "checkcolumnunsigned", NULL, 216, column); + ZEPHIR_CALL_METHOD(&_21$$36, this_ptr, "checkcolumnunsigned", NULL, 217, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_22$$36); ZEPHIR_CONCAT_VV(&_22$$36, &_20$$36, &_21$$36); @@ -46519,7 +46898,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) } ZEPHIR_CALL_METHOD(&_23$$40, this_ptr, "getcolumnsize", NULL, 0, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_24$$40, this_ptr, "checkcolumnunsigned", NULL, 216, column); + ZEPHIR_CALL_METHOD(&_24$$40, this_ptr, "checkcolumnunsigned", NULL, 217, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_25$$40); ZEPHIR_CONCAT_VV(&_25$$40, &_23$$40, &_24$$40); @@ -46570,7 +46949,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) } ZEPHIR_CALL_METHOD(&_30$$52, this_ptr, "getcolumnsize", NULL, 0, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_31$$52, this_ptr, "checkcolumnunsigned", NULL, 216, column); + ZEPHIR_CALL_METHOD(&_31$$52, this_ptr, "checkcolumnunsigned", NULL, 217, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_32$$52); ZEPHIR_CONCAT_VV(&_32$$52, &_30$$52, &_31$$52); @@ -46619,7 +46998,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) ZVAL_COPY(&value$$61, _37$$61); ZEPHIR_INIT_NVAR(&_39$$62); ZVAL_STRING(&_39$$62, "\""); - ZEPHIR_CALL_FUNCTION(&_40$$62, "addcslashes", &_41, 215, &value$$61, &_39$$62); + ZEPHIR_CALL_FUNCTION(&_40$$62, "addcslashes", &_41, 216, &value$$61, &_39$$62); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_42$$62); ZEPHIR_CONCAT_SVS(&_42$$62, "\"", &_40$$62, "\", "); @@ -46638,7 +47017,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_43$$63); ZVAL_STRING(&_43$$63, "\""); - ZEPHIR_CALL_FUNCTION(&_44$$63, "addcslashes", &_41, 215, &value$$61, &_43$$63); + ZEPHIR_CALL_FUNCTION(&_44$$63, "addcslashes", &_41, 216, &value$$61, &_43$$63); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_45$$63); ZEPHIR_CONCAT_SVS(&_45$$63, "\"", &_44$$63, "\", "); @@ -46658,7 +47037,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) } else { ZEPHIR_INIT_VAR(&_50$$64); ZVAL_STRING(&_50$$64, "\""); - ZEPHIR_CALL_FUNCTION(&_51$$64, "addcslashes", &_41, 215, &typeValues, &_50$$64); + ZEPHIR_CALL_FUNCTION(&_51$$64, "addcslashes", &_41, 216, &typeValues, &_50$$64); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_52$$64); ZEPHIR_CONCAT_SVS(&_52$$64, "(\"", &_51$$64, "\")"); @@ -46867,7 +47246,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, modifyColumn) } _13$$8 = _12$$8; if (!(_13$$8)) { - ZEPHIR_CALL_FUNCTION(&_14$$8, "is_float", NULL, 214, &defaultValue); + ZEPHIR_CALL_FUNCTION(&_14$$8, "is_float", NULL, 215, &defaultValue); zephir_check_call_status(); _13$$8 = zephir_is_true(&_14$$8); } @@ -46878,7 +47257,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Mysql, modifyColumn) } else { ZEPHIR_INIT_VAR(&_16$$10); ZVAL_STRING(&_16$$10, "\""); - ZEPHIR_CALL_FUNCTION(&_17$$10, "addcslashes", NULL, 215, &defaultValue, &_16$$10); + ZEPHIR_CALL_FUNCTION(&_17$$10, "addcslashes", NULL, 216, &defaultValue, &_16$$10); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_18$$10); ZEPHIR_CONCAT_SVS(&_18$$10, " DEFAULT \"", &_17$$10, "\""); @@ -48719,7 +49098,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, getColumnDefinition) ZVAL_COPY(&value$$38, _8$$38); ZEPHIR_INIT_NVAR(&_10$$39); ZVAL_STRING(&_10$$39, "\'"); - ZEPHIR_CALL_FUNCTION(&_11$$39, "addcslashes", &_12, 215, &value$$38, &_10$$39); + ZEPHIR_CALL_FUNCTION(&_11$$39, "addcslashes", &_12, 216, &value$$38, &_10$$39); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_13$$39); ZEPHIR_CONCAT_SVS(&_13$$39, "'", &_11$$39, "', "); @@ -48738,7 +49117,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, getColumnDefinition) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_14$$40); ZVAL_STRING(&_14$$40, "\'"); - ZEPHIR_CALL_FUNCTION(&_15$$40, "addcslashes", &_12, 215, &value$$38, &_14$$40); + ZEPHIR_CALL_FUNCTION(&_15$$40, "addcslashes", &_12, 216, &value$$38, &_14$$40); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_16$$40); ZEPHIR_CONCAT_SVS(&_16$$40, "'", &_15$$40, "', "); @@ -48758,7 +49137,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, getColumnDefinition) } else { ZEPHIR_INIT_VAR(&_21$$41); ZVAL_STRING(&_21$$41, "\'"); - ZEPHIR_CALL_FUNCTION(&_22$$41, "addcslashes", &_12, 215, &typeValues, &_21$$41); + ZEPHIR_CALL_FUNCTION(&_22$$41, "addcslashes", &_12, 216, &typeValues, &_21$$41); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_23$$41); ZEPHIR_CONCAT_SVS(&_23$$41, "('", &_22$$41, "')"); @@ -49276,7 +49655,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Postgresql, castDefault) } else { ZEPHIR_INIT_VAR(&_7$$6); ZVAL_STRING(&_7$$6, "\'"); - ZEPHIR_CALL_FUNCTION(&_8$$6, "addcslashes", NULL, 215, &defaultValue, &_7$$6); + ZEPHIR_CALL_FUNCTION(&_8$$6, "addcslashes", NULL, 216, &defaultValue, &_7$$6); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_9$$6); ZEPHIR_CONCAT_SVS(&_9$$6, "'", &_8$$6, "'"); @@ -49395,7 +49774,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, addColumn) } else { ZEPHIR_INIT_VAR(&_7$$5); ZVAL_STRING(&_7$$5, "\""); - ZEPHIR_CALL_FUNCTION(&_8$$5, "addcslashes", NULL, 215, &defaultValue, &_7$$5); + ZEPHIR_CALL_FUNCTION(&_8$$5, "addcslashes", NULL, 216, &defaultValue, &_7$$5); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_9$$5); ZEPHIR_CONCAT_SVS(&_9$$5, " DEFAULT \"", &_8$$5, "\""); @@ -49761,7 +50140,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, createTable) } else { ZEPHIR_INIT_NVAR(&_13$$12); ZVAL_STRING(&_13$$12, "\""); - ZEPHIR_CALL_FUNCTION(&_14$$12, "addcslashes", &_15, 215, &defaultValue, &_13$$12); + ZEPHIR_CALL_FUNCTION(&_14$$12, "addcslashes", &_15, 216, &defaultValue, &_13$$12); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_16$$12); ZEPHIR_CONCAT_SVS(&_16$$12, " DEFAULT \"", &_14$$12, "\""); @@ -49825,7 +50204,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, createTable) } else { ZEPHIR_INIT_NVAR(&_26$$20); ZVAL_STRING(&_26$$20, "\""); - ZEPHIR_CALL_FUNCTION(&_27$$20, "addcslashes", &_15, 215, &defaultValue, &_26$$20); + ZEPHIR_CALL_FUNCTION(&_27$$20, "addcslashes", &_15, 216, &defaultValue, &_26$$20); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_28$$20); ZEPHIR_CONCAT_SVS(&_28$$20, " DEFAULT \"", &_27$$20, "\""); @@ -50715,7 +51094,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, getColumnDefinition) ZVAL_COPY(&value$$40, _8$$40); ZEPHIR_INIT_NVAR(&_10$$41); ZVAL_STRING(&_10$$41, "\""); - ZEPHIR_CALL_FUNCTION(&_11$$41, "addcslashes", &_12, 215, &value$$40, &_10$$41); + ZEPHIR_CALL_FUNCTION(&_11$$41, "addcslashes", &_12, 216, &value$$40, &_10$$41); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_13$$41); ZEPHIR_CONCAT_SVS(&_13$$41, "\"", &_11$$41, "\", "); @@ -50734,7 +51113,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, getColumnDefinition) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_14$$42); ZVAL_STRING(&_14$$42, "\""); - ZEPHIR_CALL_FUNCTION(&_15$$42, "addcslashes", &_12, 215, &value$$40, &_14$$42); + ZEPHIR_CALL_FUNCTION(&_15$$42, "addcslashes", &_12, 216, &value$$40, &_14$$42); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_16$$42); ZEPHIR_CONCAT_SVS(&_16$$42, "\"", &_15$$42, "\", "); @@ -50754,7 +51133,7 @@ static PHP_METHOD(Phalcon_Db_Dialect_Sqlite, getColumnDefinition) } else { ZEPHIR_INIT_VAR(&_21$$43); ZVAL_STRING(&_21$$43, "\""); - ZEPHIR_CALL_FUNCTION(&_22$$43, "addcslashes", &_12, 215, &typeValues, &_21$$43); + ZEPHIR_CALL_FUNCTION(&_22$$43, "addcslashes", &_12, 216, &typeValues, &_21$$43); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_23$$43); ZEPHIR_CONCAT_SVS(&_23$$43, "(\"", &_22$$43, "\")"); @@ -54234,7 +54613,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_PdoFactory, load) array_init(&_2); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "options"); - ZEPHIR_CALL_METHOD(&options, &_1, "__invoke", NULL, 159, config, &_3, &_2); + ZEPHIR_CALL_METHOD(&options, &_1, "__invoke", NULL, 160, config, &_3, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "newinstance", NULL, 0, &name, &options); zephir_check_call_status(); @@ -56318,7 +56697,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) zephir_array_fetch_long(&columnName, &field, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 463); ZEPHIR_INIT_NVAR(&_63$$3); object_init_ex(&_63$$3, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_63$$3, "__construct", &_64, 213, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_63$$3, "__construct", &_64, 214, &columnName, &definition); zephir_check_call_status(); zephir_array_append(&columns, &_63$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Mysql.zep", 464); ZEPHIR_CPY_WRT(&oldColumn, &columnName); @@ -56620,7 +56999,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) zephir_array_fetch_long(&columnName, &field, 0, PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 463); ZEPHIR_INIT_NVAR(&_124$$49); object_init_ex(&_124$$49, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_124$$49, "__construct", &_64, 213, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_124$$49, "__construct", &_64, 214, &columnName, &definition); zephir_check_call_status(); zephir_array_append(&columns, &_124$$49, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Mysql.zep", 464); ZEPHIR_CPY_WRT(&oldColumn, &columnName); @@ -57878,7 +58257,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", 524); ZEPHIR_INIT_NVAR(&_61$$3); object_init_ex(&_61$$3, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_61$$3, "__construct", &_62, 213, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_61$$3, "__construct", &_62, 214, &columnName, &definition); zephir_check_call_status(); zephir_array_append(&columns, &_61$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Postgresql.zep", 525); ZEPHIR_CPY_WRT(&oldColumn, &columnName); @@ -58177,7 +58556,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Postgresql, describeColumns) zephir_array_fetch_long(&columnName, &field, 0, PH_NOISY, "phalcon/Db/Adapter/Pdo/Postgresql.zep", 524); ZEPHIR_INIT_NVAR(&_118$$41); object_init_ex(&_118$$41, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_118$$41, "__construct", &_62, 213, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_118$$41, "__construct", &_62, 214, &columnName, &definition); zephir_check_call_status(); zephir_array_append(&columns, &_118$$41, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Postgresql.zep", 525); ZEPHIR_CPY_WRT(&oldColumn, &columnName); @@ -59047,7 +59426,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", 306); ZEPHIR_INIT_NVAR(&_33$$3); object_init_ex(&_33$$3, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_33$$3, "__construct", &_41, 213, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_33$$3, "__construct", &_41, 214, &columnName, &definition); zephir_check_call_status(); zephir_array_append(&columns, &_33$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 307); ZEPHIR_CPY_WRT(&oldColumn, &columnName); @@ -59212,7 +59591,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) zephir_array_fetch_long(&columnName, &field, 1, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 306); ZEPHIR_INIT_NVAR(&_71$$28); object_init_ex(&_71$$28, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_71$$28, "__construct", &_41, 213, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_71$$28, "__construct", &_41, 214, &columnName, &definition); zephir_check_call_status(); zephir_array_append(&columns, &_71$$28, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 307); ZEPHIR_CPY_WRT(&oldColumn, &columnName); @@ -60433,7 +60812,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, __construct) if (Z_TYPE_P(padFactory) == IS_NULL) { ZEPHIR_INIT_NVAR(padFactory); object_init_ex(padFactory, phalcon_encryption_crypt_padfactory_ce); - ZEPHIR_CALL_METHOD(NULL, padFactory, "__construct", NULL, 225); + ZEPHIR_CALL_METHOD(NULL, padFactory, "__construct", NULL, 226); zephir_check_call_status(); } zephir_update_property_zval(this_ptr, ZEND_STRL("padFactory"), padFactory); @@ -60520,14 +60899,14 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, decrypt) ZVAL_STRING(&_1, "cipher"); ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkcipherhashisavailable", NULL, 0, &cipher, &_1); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&mode, this_ptr, "getmode", NULL, 226); + ZEPHIR_CALL_METHOD(&mode, this_ptr, "getmode", NULL, 227); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&blockSize, this_ptr, "getblocksize", NULL, 227, &mode); + ZEPHIR_CALL_METHOD(&blockSize, this_ptr, "getblocksize", NULL, 228, &mode); zephir_check_call_status(); ZVAL_LONG(&_0, 0); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "8bit"); - ZEPHIR_CALL_FUNCTION(&iv, "mb_substr", NULL, 228, &input, &_0, &ivLength, &_1); + ZEPHIR_CALL_FUNCTION(&iv, "mb_substr", NULL, 229, &input, &_0, &ivLength, &_1); zephir_check_call_status(); ZEPHIR_INIT_VAR(&digest); ZVAL_STRING(&digest, ""); @@ -60543,18 +60922,18 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, decrypt) ZVAL_LONG(&hashLength, zephir_fast_strlen_ev(&_3$$5)); ZEPHIR_INIT_NVAR(&_2$$5); ZVAL_STRING(&_2$$5, "8bit"); - ZEPHIR_CALL_FUNCTION(&digest, "mb_substr", NULL, 228, &input, &ivLength, &hashLength, &_2$$5); + ZEPHIR_CALL_FUNCTION(&digest, "mb_substr", NULL, 229, &input, &ivLength, &hashLength, &_2$$5); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4$$5); zephir_add_function(&_4$$5, &ivLength, &hashLength); ZEPHIR_INIT_NVAR(&_2$$5); ZVAL_STRING(&_2$$5, "8bit"); - ZEPHIR_CALL_FUNCTION(&cipherText, "mb_substr", NULL, 228, &input, &_4$$5, &__$null, &_2$$5); + ZEPHIR_CALL_FUNCTION(&cipherText, "mb_substr", NULL, 229, &input, &_4$$5, &__$null, &_2$$5); zephir_check_call_status(); } else { ZEPHIR_INIT_VAR(&_5$$6); ZVAL_STRING(&_5$$6, "8bit"); - ZEPHIR_CALL_FUNCTION(&cipherText, "mb_substr", NULL, 228, &input, &ivLength, &__$null, &_5$$6); + ZEPHIR_CALL_FUNCTION(&cipherText, "mb_substr", NULL, 229, &input, &ivLength, &__$null, &_5$$6); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(&decrypted, this_ptr, "decryptgcmccmauth", NULL, 0, &mode, &cipherText, &decryptKey, &iv); @@ -60565,7 +60944,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, decrypt) ZEPHIR_CPY_WRT(&decrypted, &_6); zephir_read_property(&_7, this_ptr, ZEND_STRL("useSigning"), PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_7)) { - ZEPHIR_CALL_FUNCTION(&_8$$7, "hash_hmac", NULL, 229, &hashAlgorithm, &padded, &decryptKey, &__$true); + ZEPHIR_CALL_FUNCTION(&_8$$7, "hash_hmac", NULL, 230, &hashAlgorithm, &padded, &decryptKey, &__$true); zephir_check_call_status(); if (!ZEPHIR_IS_IDENTICAL(&digest, &_8$$7)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_crypt_exception_mismatch_ce, "Hash does not match.", "phalcon/Encryption/Crypt.zep", 224); @@ -60628,7 +61007,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, decryptBase64) ZEPHIR_CONCAT_VV(&_4$$3, &_2$$3, &_1$$3); zephir_get_strval(&input, &_4$$3); } - ZEPHIR_CALL_FUNCTION(&_5, "base64_decode", NULL, 230, &input); + ZEPHIR_CALL_FUNCTION(&_5, "base64_decode", NULL, 231, &input); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "decrypt", NULL, 0, &_5, &key); zephir_check_call_status(); @@ -60690,9 +61069,9 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, encrypt) ZVAL_STRING(&_1, "cipher"); ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkcipherhashisavailable", NULL, 0, &cipher, &_1); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&mode, this_ptr, "getmode", NULL, 226); + ZEPHIR_CALL_METHOD(&mode, this_ptr, "getmode", NULL, 227); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&blockSize, this_ptr, "getblocksize", NULL, 227, &mode); + ZEPHIR_CALL_METHOD(&blockSize, this_ptr, "getblocksize", NULL, 228, &mode); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&iv, this_ptr, "phpopensslrandompseudobytes", NULL, 0, &ivLength); zephir_check_call_status(); @@ -60708,7 +61087,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, encrypt) if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { ZEPHIR_CALL_METHOD(&_2$$6, this_ptr, "gethashalgorithm", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&digest, "hash_hmac", NULL, 229, &_2$$6, &padded, &encryptKey, &__$true); + ZEPHIR_CALL_FUNCTION(&digest, "hash_hmac", NULL, 230, &_2$$6, &padded, &encryptKey, &__$true); zephir_check_call_status(); ZEPHIR_CONCAT_VVV(return_value, &iv, &digest, &encrypted); RETURN_MM(); @@ -60757,7 +61136,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, encryptBase64) if (safe) { ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "encrypt", NULL, 0, &input, &key); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1$$3, "base64_encode", NULL, 231, &_0$$3); + ZEPHIR_CALL_FUNCTION(&_1$$3, "base64_encode", NULL, 232, &_0$$3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "+/"); @@ -60772,7 +61151,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, encryptBase64) } ZEPHIR_CALL_METHOD(&_5, this_ptr, "encrypt", NULL, 0, &input, &key); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 231, &_5); + ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 232, &_5); zephir_check_call_status(); RETURN_MM(); } @@ -60818,11 +61197,11 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, getAvailableHashAlgorithms) ZEPHIR_CALL_METHOD(&_0, this_ptr, "phpfunctionexists", NULL, 0, &_1); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { - ZEPHIR_RETURN_CALL_FUNCTION("hash_hmac_algos", NULL, 232); + ZEPHIR_RETURN_CALL_FUNCTION("hash_hmac_algos", NULL, 233); zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_RETURN_CALL_FUNCTION("hash_algos", NULL, 233); + ZEPHIR_RETURN_CALL_FUNCTION("hash_algos", NULL, 234); zephir_check_call_status(); RETURN_MM(); } @@ -60949,7 +61328,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, setCipher) ZVAL_STRING(&_0, "cipher"); ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkcipherhashisavailable", NULL, 0, &cipher, &_0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "getivlength", NULL, 234, &cipher); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "getivlength", NULL, 235, &cipher); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("ivLength"), &_1); zephir_update_property_zval(this_ptr, ZEND_STRL("cipher"), &cipher); @@ -61080,7 +61459,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, checkCipherHashIsAvailable) object_init_ex(&_1$$5, phalcon_encryption_crypt_exception_exception_ce); ZEPHIR_INIT_VAR(&_2$$5); ZVAL_STRING(&_2$$5, "The %s algorithm '%s' is not supported on this system."); - ZEPHIR_CALL_FUNCTION(&_3$$5, "sprintf", NULL, 117, &_2$$5, &type, &cipher); + ZEPHIR_CALL_FUNCTION(&_3$$5, "sprintf", NULL, 118, &_2$$5, &type, &cipher); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$5, "__construct", NULL, 33, &_3$$5); zephir_check_call_status(); @@ -61136,7 +61515,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, cryptPadText) ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "ecb"); zephir_array_fast_append(&_1, &_2); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkismode", NULL, 235, &_1, &mode); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkismode", NULL, 236, &_1, &mode); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { paddingSize = (blockSize - (zephir_safe_mod_long_long(zephir_fast_strlen_ev(&input), blockSize))); @@ -61223,7 +61602,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, cryptUnpadText) ZEPHIR_INIT_NVAR(&_4); ZVAL_STRING(&_4, "ecb"); zephir_array_fast_append(&_3, &_4); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkismode", NULL, 235, &_3, &mode); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkismode", NULL, 236, &_3, &mode); zephir_check_call_status(); _1 = ZEPHIR_IS_TRUE_IDENTICAL(&_2); } @@ -61294,7 +61673,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, decryptGetUnpadded) ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "ecb"); zephir_array_fast_append(&_1, &_2); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkismode", NULL, 235, &_1, &mode); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkismode", NULL, 236, &_1, &mode); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { zephir_read_property(&_3$$3, this_ptr, ZEND_STRL("padding"), PH_NOISY_CC | PH_READONLY); @@ -61356,7 +61735,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, decryptGcmCcmAuth) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "gcm"); zephir_array_fast_append(&_2, &_3); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "checkismode", NULL, 235, &_2, &mode); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "checkismode", NULL, 236, &_2, &mode); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_1)) { zephir_read_property(&_4$$3, this_ptr, ZEND_STRL("authData"), PH_NOISY_CC | PH_READONLY); @@ -61371,11 +61750,11 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, decryptGcmCcmAuth) ZEPHIR_INIT_VAR(&encrypted); zephir_fast_str_replace(&encrypted, &authTag, &_5$$3, &cipherText); ZVAL_LONG(&_4$$3, 1); - ZEPHIR_CALL_FUNCTION(&decrypted, "openssl_decrypt", NULL, 236, &encrypted, &cipher, &decryptKey, &_4$$3, &iv, &authTag, &authData); + ZEPHIR_CALL_FUNCTION(&decrypted, "openssl_decrypt", NULL, 237, &encrypted, &cipher, &decryptKey, &_4$$3, &iv, &authTag, &authData); zephir_check_call_status(); } else { ZVAL_LONG(&_6$$4, 1); - ZEPHIR_CALL_FUNCTION(&decrypted, "openssl_decrypt", NULL, 236, &cipherText, &cipher, &decryptKey, &_6$$4, &iv); + ZEPHIR_CALL_FUNCTION(&decrypted, "openssl_decrypt", NULL, 237, &cipherText, &cipher, &decryptKey, &_6$$4, &iv); zephir_check_call_status(); } if (ZEPHIR_IS_FALSE_IDENTICAL(&decrypted)) { @@ -61424,7 +61803,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, encryptGetPadded) ZEPHIR_INIT_NVAR(&_4); ZVAL_STRING(&_4, "ecb"); zephir_array_fast_append(&_3, &_4); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkismode", NULL, 235, &_3, &mode); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkismode", NULL, 236, &_3, &mode); zephir_check_call_status(); _1 = ZEPHIR_IS_TRUE_IDENTICAL(&_2); } @@ -61487,7 +61866,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, encryptGcmCcm) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "gcm"); zephir_array_fast_append(&_2, &_3); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "checkismode", NULL, 235, &_2, &mode); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "checkismode", NULL, 236, &_2, &mode); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_1)) { zephir_read_property(&_4$$3, this_ptr, ZEND_STRL("authData"), PH_NOISY_CC | PH_READONLY); @@ -61502,13 +61881,13 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, encryptGcmCcm) ZEPHIR_CPY_WRT(&authTagLength, &_4$$3); ZVAL_LONG(&_4$$3, 1); ZEPHIR_MAKE_REF(&authTag); - ZEPHIR_CALL_FUNCTION(&encrypted, "openssl_encrypt", NULL, 237, &padded, &cipher, &encryptKey, &_4$$3, &iv, &authTag, &authData, &authTagLength); + ZEPHIR_CALL_FUNCTION(&encrypted, "openssl_encrypt", NULL, 238, &padded, &cipher, &encryptKey, &_4$$3, &iv, &authTag, &authData, &authTagLength); ZEPHIR_UNREF(&authTag); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("authTag"), &authTag); } else { ZVAL_LONG(&_5$$5, 1); - ZEPHIR_CALL_FUNCTION(&encrypted, "openssl_encrypt", NULL, 237, &padded, &cipher, &encryptKey, &_5$$5, &iv); + ZEPHIR_CALL_FUNCTION(&encrypted, "openssl_encrypt", NULL, 238, &padded, &cipher, &encryptKey, &_5$$5, &iv); zephir_check_call_status(); } if (ZEPHIR_IS_FALSE_IDENTICAL(&encrypted)) { @@ -61546,7 +61925,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, initializeAvailableCiphers) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_crypt_exception_exception_ce, "This class requires the openssl extension for PHP", "phalcon/Encryption/Crypt.zep", 892); return; } - ZEPHIR_CALL_FUNCTION(&available, "openssl_get_cipher_methods", NULL, 238, &__$true); + ZEPHIR_CALL_FUNCTION(&available, "openssl_get_cipher_methods", NULL, 239, &__$true); zephir_check_call_status(); ZEPHIR_INIT_VAR(&allowed); array_init(&allowed); @@ -61658,9 +62037,9 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, getBlockSize) zephir_read_property(&_2, this_ptr, ZEND_STRL("cipher"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, ""); - ZEPHIR_CALL_FUNCTION(&_4, "str_ireplace", NULL, 239, &_1, &_3, &_2); + ZEPHIR_CALL_FUNCTION(&_4, "str_ireplace", NULL, 240, &_1, &_3, &_2); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getivlength", NULL, 234, &_4); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getivlength", NULL, 235, &_4); zephir_check_call_status(); RETURN_MM(); } @@ -61681,7 +62060,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, getIvLength) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &cipher_param); zephir_get_strval(&cipher, cipher_param); - ZEPHIR_CALL_FUNCTION(&length, "openssl_cipher_iv_length", NULL, 240, &cipher); + ZEPHIR_CALL_FUNCTION(&length, "openssl_cipher_iv_length", NULL, 241, &cipher); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&length)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_crypt_exception_exception_ce, "Cannot calculate the initialization vector (IV) length of the cipher", "phalcon/Encryption/Crypt.zep", 962); @@ -61710,7 +62089,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, getMode) zephir_read_property(&_0, this_ptr, ZEND_STRL("cipher"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "-"); - ZEPHIR_CALL_FUNCTION(&_2, "strrpos", NULL, 241, &_0, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "strrpos", NULL, 242, &_0, &_1); zephir_check_call_status(); ZEPHIR_INIT_VAR(&position); ZVAL_LONG(&position, zephir_get_intval(&_2)); @@ -61756,7 +62135,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, phpOpensslCipherIvLength) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &cipher_param); zephir_get_strval(&cipher, cipher_param); - ZEPHIR_RETURN_CALL_FUNCTION("openssl_cipher_iv_length", NULL, 240, &cipher); + ZEPHIR_RETURN_CALL_FUNCTION("openssl_cipher_iv_length", NULL, 241, &cipher); zephir_check_call_status(); RETURN_MM(); } @@ -61775,7 +62154,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt, phpOpensslRandomPseudoBytes) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &length_param); ZVAL_LONG(&_0, length); - ZEPHIR_RETURN_CALL_FUNCTION("openssl_random_pseudo_bytes", NULL, 242, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("openssl_random_pseudo_bytes", NULL, 243, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -61932,7 +62311,7 @@ static PHP_METHOD(Phalcon_Encryption_Security, checkHash) if (_0) { RETURN_MM_BOOL(0); } - ZEPHIR_RETURN_CALL_FUNCTION("password_verify", NULL, 247, &password, &passwordHash); + ZEPHIR_RETURN_CALL_FUNCTION("password_verify", NULL, 248, &password, &passwordHash); zephir_check_call_status(); RETURN_MM(); } @@ -61976,13 +62355,13 @@ static PHP_METHOD(Phalcon_Encryption_Security, checkToken) destroyIfValid = 1; } else { } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "processtokenkey", NULL, 248, &tokenKey); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "processtokenkey", NULL, 249, &tokenKey); zephir_check_call_status(); zephir_get_strval(&tokenKey, &_0); if (!(!(ZEPHIR_IS_EMPTY(&tokenKey)))) { RETURN_MM_BOOL(0); } - ZEPHIR_CALL_METHOD(&userToken, this_ptr, "processusertoken", NULL, 249, &tokenKey, tokenValue); + ZEPHIR_CALL_METHOD(&userToken, this_ptr, "processusertoken", NULL, 250, &tokenKey, tokenValue); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&knownToken, this_ptr, "getrequesttoken", NULL, 0); zephir_check_call_status(); @@ -62041,14 +62420,14 @@ static PHP_METHOD(Phalcon_Encryption_Security, computeHmac) } else { } ZVAL_BOOL(&_0, (raw ? 1 : 0)); - ZEPHIR_CALL_FUNCTION(&hmac, "hash_hmac", NULL, 229, &algo, &data, &key, &_0); + ZEPHIR_CALL_FUNCTION(&hmac, "hash_hmac", NULL, 230, &algo, &data, &key, &_0); zephir_check_call_status(); if (UNEXPECTED(!zephir_is_true(&hmac))) { ZEPHIR_INIT_VAR(&_1$$3); object_init_ex(&_1$$3, phalcon_encryption_security_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "Unknown hashing algorithm: %s"); - ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 117, &_2$$3, &algo); + ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 118, &_2$$3, &algo); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 33, &_3$$3); zephir_check_call_status(); @@ -62116,7 +62495,7 @@ static PHP_METHOD(Phalcon_Encryption_Security, getHashInformation) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &hash_param); zephir_get_strval(&hash, hash_param); - ZEPHIR_RETURN_CALL_FUNCTION("password_get_info", NULL, 250, &hash); + ZEPHIR_RETURN_CALL_FUNCTION("password_get_info", NULL, 251, &hash); zephir_check_call_status(); RETURN_MM(); } @@ -62359,11 +62738,11 @@ static PHP_METHOD(Phalcon_Encryption_Security, hash) } else { zephir_get_arrval(&options, options_param); } - ZEPHIR_CALL_METHOD(&cost, this_ptr, "processcost", NULL, 251, &options); + ZEPHIR_CALL_METHOD(&cost, this_ptr, "processcost", NULL, 252, &options); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "%02s"); - ZEPHIR_CALL_FUNCTION(&formatted, "sprintf", NULL, 117, &_0, &cost); + ZEPHIR_CALL_FUNCTION(&formatted, "sprintf", NULL, 118, &_0, &cost); zephir_check_call_status(); ZEPHIR_INIT_VAR(&prefix); ZVAL_STRING(&prefix, ""); @@ -62393,14 +62772,14 @@ static PHP_METHOD(Phalcon_Encryption_Security, hash) if (ZEPHIR_IS_LONG(&_1, 5)) { ZEPHIR_INIT_VAR(&_2$$6); ZVAL_STRING(&_2$$6, "$2a$%s$"); - ZEPHIR_CALL_FUNCTION(&prefix, "sprintf", NULL, 117, &_2$$6, &formatted); + ZEPHIR_CALL_FUNCTION(&prefix, "sprintf", NULL, 118, &_2$$6, &formatted); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(&_1, 6)) { ZEPHIR_INIT_VAR(&_3$$7); ZVAL_STRING(&_3$$7, "$2x$%s$"); - ZEPHIR_CALL_FUNCTION(&prefix, "sprintf", NULL, 117, &_3$$7, &formatted); + ZEPHIR_CALL_FUNCTION(&prefix, "sprintf", NULL, 118, &_3$$7, &formatted); zephir_check_call_status(); break; } @@ -62414,7 +62793,7 @@ static PHP_METHOD(Phalcon_Encryption_Security, hash) zephir_check_call_status(); ZEPHIR_INIT_VAR(&salt); ZEPHIR_CONCAT_VVS(&salt, &prefix, &_4$$9, "$"); - ZEPHIR_RETURN_CALL_FUNCTION("crypt", NULL, 252, &password, &salt); + ZEPHIR_RETURN_CALL_FUNCTION("crypt", NULL, 253, &password, &salt); zephir_check_call_status(); RETURN_MM(); } @@ -62422,11 +62801,11 @@ static PHP_METHOD(Phalcon_Encryption_Security, hash) zephir_create_array(&_6, 1, 0); zephir_array_update_string(&_6, SL("cost"), &cost, PH_COPY | PH_SEPARATE); ZEPHIR_CPY_WRT(&options, &_6); - ZEPHIR_CALL_METHOD(&algorithm, this_ptr, "processalgorithm", NULL, 253); + ZEPHIR_CALL_METHOD(&algorithm, this_ptr, "processalgorithm", NULL, 254); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&arguments, this_ptr, "processargonoptions", NULL, 254, &options); + ZEPHIR_CALL_METHOD(&arguments, this_ptr, "processargonoptions", NULL, 255, &options); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("password_hash", NULL, 255, &password, &algorithm, &arguments); + ZEPHIR_RETURN_CALL_FUNCTION("password_hash", NULL, 256, &password, &algorithm, &arguments); zephir_check_call_status(); RETURN_MM(); } @@ -62883,7 +63262,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_Random, base64) ZVAL_LONG(&_1, len); ZEPHIR_CALL_METHOD(&_0, this_ptr, "bytes", NULL, 0, &_1); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 231, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 232, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -62924,7 +63303,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_Random, base64Safe) ZVAL_LONG(&_1, len); ZEPHIR_CALL_METHOD(&_0, this_ptr, "base64", NULL, 0, &_1); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_2, "base64_encode", NULL, 231, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "base64_encode", NULL, 232, &_0); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "+/"); @@ -62970,7 +63349,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_Random, bytes) len = 16; } ZVAL_LONG(&_0, len); - ZEPHIR_RETURN_CALL_FUNCTION("random_bytes", NULL, 267, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("random_bytes", NULL, 268, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -63003,7 +63382,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_Random, hex) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "H*"); - ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 268, &_2, &_0); + ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 269, &_2, &_0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&_3); ZEPHIR_RETURN_CALL_FUNCTION("array_shift", NULL, 22, &_3); @@ -63032,7 +63411,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_Random, number) } ZVAL_LONG(&_0, 0); ZVAL_LONG(&_1, len); - ZEPHIR_RETURN_CALL_FUNCTION("random_int", NULL, 269, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("random_int", NULL, 270, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -63061,7 +63440,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_Random, uuid) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "N1a/n1b/n1c/n1d/n1e/N1f"); - ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 268, &_2, &_0); + ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 269, &_2, &_0); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&ary, "array_values", NULL, 14, &_3); zephir_check_call_status(); @@ -63076,7 +63455,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_Random, uuid) ZEPHIR_INIT_VAR(&_7); ZVAL_STRING(&_7, "%08x-%04x-%04x-%04x-%04x%08x"); ZEPHIR_MAKE_REF(&ary); - ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 270, &ary, &_7); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 271, &ary, &_7); ZEPHIR_UNREF(&ary); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_7); @@ -63128,7 +63507,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_Random, base) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "C*"); - ZEPHIR_CALL_FUNCTION(&bytes, "unpack", NULL, 268, &_1, &_0); + ZEPHIR_CALL_FUNCTION(&bytes, "unpack", NULL, 269, &_1, &_0); zephir_check_call_status(); zephir_is_iterable(&bytes, 0, "phalcon/Encryption/Security/Random.zep", 351); if (Z_TYPE_P(&bytes) == IS_ARRAY) { @@ -63608,26 +63987,26 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, getToken) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_2, &_1, "__invoke", NULL, 0, &_3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&encodedClaims, this_ptr, "encodeurl", NULL, 256, &_2); + ZEPHIR_CALL_METHOD(&encodedClaims, this_ptr, "encodeurl", NULL, 257, &_2); zephir_check_call_status(); ZEPHIR_INIT_VAR(&claims); object_init_ex(&claims, phalcon_encryption_security_jwt_token_item_ce); ZEPHIR_CALL_METHOD(&_4, this_ptr, "getclaims", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &claims, "__construct", NULL, 257, &_4, &encodedClaims); + ZEPHIR_CALL_METHOD(NULL, &claims, "__construct", NULL, 258, &_4, &encodedClaims); zephir_check_call_status(); zephir_read_property(&_5, this_ptr, ZEND_STRL("encode"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(&_7, this_ptr, "getheaders", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_6, &_5, "__invoke", NULL, 0, &_7); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&encodedHeaders, this_ptr, "encodeurl", NULL, 256, &_6); + ZEPHIR_CALL_METHOD(&encodedHeaders, this_ptr, "encodeurl", NULL, 257, &_6); zephir_check_call_status(); ZEPHIR_INIT_VAR(&headers); object_init_ex(&headers, phalcon_encryption_security_jwt_token_item_ce); ZEPHIR_CALL_METHOD(&_8, this_ptr, "getheaders", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &headers, "__construct", NULL, 257, &_8, &encodedHeaders); + ZEPHIR_CALL_METHOD(NULL, &headers, "__construct", NULL, 258, &_8, &encodedHeaders); zephir_check_call_status(); zephir_read_property(&_9, this_ptr, ZEND_STRL("signer"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_10); @@ -63635,14 +64014,14 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, getToken) zephir_read_property(&_11, this_ptr, ZEND_STRL("passphrase"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(&signatureHash, &_9, "sign", NULL, 0, &_10, &_11); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&encodedSignature, this_ptr, "encodeurl", NULL, 256, &signatureHash); + ZEPHIR_CALL_METHOD(&encodedSignature, this_ptr, "encodeurl", NULL, 257, &signatureHash); zephir_check_call_status(); ZEPHIR_INIT_VAR(&signature); object_init_ex(&signature, phalcon_encryption_security_jwt_token_signature_ce); - ZEPHIR_CALL_METHOD(NULL, &signature, "__construct", NULL, 258, &signatureHash, &encodedSignature); + ZEPHIR_CALL_METHOD(NULL, &signature, "__construct", NULL, 259, &signatureHash, &encodedSignature); zephir_check_call_status(); object_init_ex(return_value, phalcon_encryption_security_jwt_token_token_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 259, &headers, &claims, &signature); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 260, &headers, &claims, &signature); zephir_check_call_status(); RETURN_MM(); } @@ -64010,7 +64389,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, encodeUrl) } else { ZEPHIR_INIT_VAR(&input); } - ZEPHIR_CALL_FUNCTION(&_0, "base64_encode", NULL, 231, &input); + ZEPHIR_CALL_FUNCTION(&_0, "base64_encode", NULL, 232, &input); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "+/"); @@ -64291,7 +64670,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateExpiration) _7 = zephir_is_true(&_6); if (_7) { ZVAL_LONG(&_9, timestamp); - ZEPHIR_CALL_METHOD(&_8, this_ptr, "gettimestamp", NULL, 266, &_9); + ZEPHIR_CALL_METHOD(&_8, this_ptr, "gettimestamp", NULL, 267, &_9); zephir_check_call_status(); _7 = ZEPHIR_GT_LONG(&_8, tokenExpirationTime); } @@ -64374,7 +64753,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateIssuedAt) zephir_check_call_status(); tokenIssuedAt = zephir_get_intval(&_2); ZVAL_LONG(&_5, timestamp); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "gettimestamp", NULL, 266, &_5); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "gettimestamp", NULL, 267, &_5); zephir_check_call_status(); if (ZEPHIR_LE_LONG(&_4, tokenIssuedAt)) { ZVAL_UNDEF(&_6$$3); @@ -64463,7 +64842,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateNotBefore) zephir_check_call_status(); tokenNotBefore = zephir_get_intval(&_2); ZVAL_LONG(&_5, timestamp); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "gettimestamp", NULL, 266, &_5); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "gettimestamp", NULL, 267, &_5); zephir_check_call_status(); if (ZEPHIR_LE_LONG(&_4, tokenNotBefore)) { ZVAL_UNDEF(&_6$$3); @@ -64891,7 +65270,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, parse) } else { ZEPHIR_INIT_VAR(&token); } - ZEPHIR_CALL_METHOD(&results, this_ptr, "parsetoken", NULL, 261, &token); + ZEPHIR_CALL_METHOD(&results, this_ptr, "parsetoken", NULL, 262, &token); zephir_check_call_status(); zephir_memory_observe(&encodedHeaders); zephir_array_fetch_long(&encodedHeaders, &results, 0, PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 55); @@ -64899,14 +65278,14 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, parse) zephir_array_fetch_long(&encodedClaims, &results, 1, PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 56); zephir_memory_observe(&encodedSignature); zephir_array_fetch_long(&encodedSignature, &results, 2, PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 57); - ZEPHIR_CALL_METHOD(&headers, this_ptr, "decodeheaders", NULL, 262, &encodedHeaders); + ZEPHIR_CALL_METHOD(&headers, this_ptr, "decodeheaders", NULL, 263, &encodedHeaders); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&claims, this_ptr, "decodeclaims", NULL, 263, &encodedClaims); + ZEPHIR_CALL_METHOD(&claims, this_ptr, "decodeclaims", NULL, 264, &encodedClaims); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&signature, this_ptr, "decodesignature", NULL, 264, &headers, &encodedSignature); + ZEPHIR_CALL_METHOD(&signature, this_ptr, "decodesignature", NULL, 265, &headers, &encodedSignature); zephir_check_call_status(); object_init_ex(return_value, phalcon_encryption_security_jwt_token_token_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 259, &headers, &claims, &signature); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 260, &headers, &claims, &signature); zephir_check_call_status(); RETURN_MM(); } @@ -64937,7 +65316,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeClaims) zephir_fetch_params(1, 1, 0, &claims_param); zephir_get_strval(&claims, claims_param); zephir_read_property(&_0, this_ptr, ZEND_STRL("decode"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "decodeurl", NULL, 265, &claims); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "decodeurl", NULL, 266, &claims); zephir_check_call_status(); ZVAL_BOOL(&_2, 1); ZEPHIR_CALL_METHOD(&decoded, &_0, "__invoke", NULL, 0, &_1, &_2); @@ -64961,7 +65340,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeClaims) zephir_array_update_string(&decoded, SL("aud"), &_5$$4, PH_COPY | PH_SEPARATE); } object_init_ex(return_value, phalcon_encryption_security_jwt_token_item_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 257, &decoded, &claims); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 258, &decoded, &claims); zephir_check_call_status(); RETURN_MM(); } @@ -64987,7 +65366,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeHeaders) zephir_fetch_params(1, 1, 0, &headers_param); zephir_get_strval(&headers, headers_param); zephir_read_property(&_0, this_ptr, ZEND_STRL("decode"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "decodeurl", NULL, 265, &headers); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "decodeurl", NULL, 266, &headers); zephir_check_call_status(); ZVAL_BOOL(&_2, 1); ZEPHIR_CALL_METHOD(&decoded, &_0, "__invoke", NULL, 0, &_1, &_2); @@ -65001,7 +65380,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeHeaders) return; } object_init_ex(return_value, phalcon_encryption_security_jwt_token_item_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 257, &decoded, &headers); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 258, &decoded, &headers); zephir_check_call_status(); RETURN_MM(); } @@ -65042,11 +65421,11 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeSignature) ZVAL_STRING(&decoded, ""); ZEPHIR_INIT_NVAR(&signature); } else { - ZEPHIR_CALL_METHOD(&decoded, this_ptr, "decodeurl", NULL, 265, &signature); + ZEPHIR_CALL_METHOD(&decoded, this_ptr, "decodeurl", NULL, 266, &signature); zephir_check_call_status(); } object_init_ex(return_value, phalcon_encryption_security_jwt_token_signature_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 258, &decoded, &signature); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 259, &decoded, &signature); zephir_check_call_status(); RETURN_MM(); } @@ -65128,7 +65507,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeUrl) ZVAL_STRING(&_4, "+/"); ZEPHIR_CALL_FUNCTION(&_5, "strtr", NULL, 5, &input, &_3, &_4); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&data, "base64_decode", NULL, 230, &_5); + ZEPHIR_CALL_FUNCTION(&data, "base64_decode", NULL, 231, &_5); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&data)) { ZEPHIR_INIT_NVAR(&data); @@ -65612,7 +65991,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Signer_Hmac, sign) } else { ZEPHIR_INIT_VAR(&passphrase); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethash", NULL, 260, &payload, &passphrase); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethash", NULL, 261, &payload, &passphrase); zephir_check_call_status(); RETURN_MM(); } @@ -65640,7 +66019,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Signer_Hmac, verify) zephir_get_strval(&source, source_param); zephir_get_strval(&payload, payload_param); zephir_get_strval(&passphrase, passphrase_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "gethash", NULL, 260, &payload, &passphrase); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "gethash", NULL, 261, &payload, &passphrase); zephir_check_call_status(); RETURN_MM_BOOL(zephir_hash_equals(&source, &_0)); } @@ -65668,7 +66047,7 @@ static PHP_METHOD(Phalcon_Encryption_Security_JWT_Signer_Hmac, getHash) zephir_get_strval(&passphrase, passphrase_param); ZEPHIR_CALL_METHOD(&_0, this_ptr, "getalgorithm", NULL, 0); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("hash_hmac", NULL, 229, &_0, &payload, &passphrase, &__$true); + ZEPHIR_RETURN_CALL_FUNCTION("hash_hmac", NULL, 230, &_0, &payload, &passphrase, &__$true); zephir_check_call_status(); RETURN_MM(); } @@ -65958,7 +66337,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_PadFactory, padNumberToService) ZVAL_LONG(&_1, number); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "noop"); - ZEPHIR_RETURN_CALL_METHOD(&_0, "__invoke", NULL, 159, &map, &_1, &_2); + ZEPHIR_RETURN_CALL_METHOD(&_0, "__invoke", NULL, 160, &map, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -66012,13 +66391,13 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Ansi, pad) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &paddingSize_param); ZVAL_LONG(&_0, 0); - ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 243, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 244, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, (paddingSize - 1)); ZEPHIR_CALL_FUNCTION(&_2, "str_repeat", NULL, 1, &_1, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, paddingSize); - ZEPHIR_CALL_FUNCTION(&_3, "chr", NULL, 243, &_0); + ZEPHIR_CALL_FUNCTION(&_3, "chr", NULL, 244, &_0); zephir_check_call_status(); ZEPHIR_CONCAT_VV(return_value, &_2, &_3); RETURN_MM(); @@ -66060,7 +66439,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Ansi, unpad) ZVAL_LONG(&_1, 1); ZEPHIR_INIT_VAR(&last); zephir_substr(&last, &input, zephir_get_intval(&_0), 1 , 0); - ZEPHIR_CALL_FUNCTION(&ord, "ord", NULL, 244, &last); + ZEPHIR_CALL_FUNCTION(&ord, "ord", NULL, 245, &last); zephir_check_call_status(); if (ZEPHIR_LE_LONG(&ord, blockSize)) { ZEPHIR_CPY_WRT(&paddingSize, &ord); @@ -66068,7 +66447,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Ansi, unpad) ZVAL_STRING(&repeat, ""); if (ZEPHIR_GT_LONG(&paddingSize, 1)) { ZVAL_LONG(&_2$$4, 0); - ZEPHIR_CALL_FUNCTION(&_3$$4, "chr", NULL, 243, &_2$$4); + ZEPHIR_CALL_FUNCTION(&_3$$4, "chr", NULL, 244, &_2$$4); zephir_check_call_status(); ZVAL_LONG(&_2$$4, (zephir_get_numberval(&paddingSize) - 1)); ZEPHIR_CALL_FUNCTION(&repeat, "str_repeat", NULL, 1, &_3$$4, &_2$$4); @@ -66143,15 +66522,15 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Iso10126, pad) } ZEPHIR_INIT_NVAR(&counter); ZVAL_LONG(&counter, _1); - ZEPHIR_CALL_FUNCTION(&_3$$3, "rand", &_4, 245); + ZEPHIR_CALL_FUNCTION(&_3$$3, "rand", &_4, 246); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_5$$3, "chr", &_6, 243, &_3$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "chr", &_6, 244, &_3$$3); zephir_check_call_status(); zephir_concat_self(&padding, &_5$$3); } } ZVAL_LONG(&_7, paddingSize); - ZEPHIR_CALL_FUNCTION(&_8, "chr", &_6, 243, &_7); + ZEPHIR_CALL_FUNCTION(&_8, "chr", &_6, 244, &_7); zephir_check_call_status(); zephir_concat_self(&padding, &_8); RETURN_CCTOR(&padding); @@ -66183,7 +66562,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Iso10126, unpad) ZVAL_LONG(&_1, 1); ZEPHIR_INIT_VAR(&last); zephir_substr(&last, &input, zephir_get_intval(&_0), 1 , 0); - ZEPHIR_RETURN_CALL_FUNCTION("ord", NULL, 244, &last); + ZEPHIR_RETURN_CALL_FUNCTION("ord", NULL, 245, &last); zephir_check_call_status(); RETURN_MM(); } @@ -66223,10 +66602,10 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_Padding_IsoIek, pad) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &paddingSize_param); ZVAL_LONG(&_0, 0x80); - ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 243, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 244, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, 0); - ZEPHIR_CALL_FUNCTION(&_2, "chr", NULL, 243, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "chr", NULL, 244, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, (paddingSize - 1)); ZEPHIR_CALL_FUNCTION(&_3, "str_repeat", NULL, 1, &_2, &_0); @@ -66261,7 +66640,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_Padding_IsoIek, unpad) zephir_fetch_params(1, 2, 0, &input_param, &blockSize_param); zephir_get_strval(&input, input_param); paddingSize = 0; - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 246, &input); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 247, &input); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&inputArray, "str_split", NULL, 88, &input); zephir_check_call_status(); @@ -66271,7 +66650,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_Padding_IsoIek, unpad) if (_0) { zephir_array_fetch_long(&_1, &inputArray, counter, PH_NOISY | PH_READONLY, "phalcon/Encryption/Crypt/Padding/IsoIek.zep", 48); ZVAL_LONG(&_2, 0); - ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 243, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 244, &_2); zephir_check_call_status(); _0 = ZEPHIR_IS_IDENTICAL(&_1, &_3); } @@ -66287,7 +66666,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_Padding_IsoIek, unpad) } zephir_array_fetch_long(&_6, &inputArray, counter, PH_NOISY | PH_READONLY, "phalcon/Encryption/Crypt/Padding/IsoIek.zep", 55); ZVAL_LONG(&_2, 0x80); - ZEPHIR_CALL_FUNCTION(&_7, "chr", &_4, 243, &_2); + ZEPHIR_CALL_FUNCTION(&_7, "chr", &_4, 244, &_2); zephir_check_call_status(); if (ZEPHIR_IS_EQUAL(&_6, &_7)) { paddingSize++; @@ -66398,7 +66777,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Pkcs7, pad) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &paddingSize_param); ZVAL_LONG(&_0, paddingSize); - ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 243, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 244, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, paddingSize); ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", NULL, 1, &_1, &_0); @@ -66432,17 +66811,17 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Pkcs7, unpad) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 2, 0, &input_param, &blockSize_param); zephir_get_strval(&input, input_param); - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 246, &input); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 247, &input); zephir_check_call_status(); ZVAL_LONG(&_0, (zephir_get_numberval(&length) - 1)); ZVAL_LONG(&_1, 1); ZEPHIR_INIT_VAR(&last); zephir_substr(&last, &input, zephir_get_intval(&_0), 1 , 0); - ZEPHIR_CALL_FUNCTION(&ord, "ord", NULL, 244, &last); + ZEPHIR_CALL_FUNCTION(&ord, "ord", NULL, 245, &last); zephir_check_call_status(); if (ZEPHIR_LE_LONG(&ord, blockSize)) { ZEPHIR_CPY_WRT(&paddingSize, &ord); - ZEPHIR_CALL_FUNCTION(&_2$$3, "chr", NULL, 243, &paddingSize); + ZEPHIR_CALL_FUNCTION(&_2$$3, "chr", NULL, 244, &paddingSize); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&padding, "str_repeat", NULL, 1, &_2$$3, &paddingSize); zephir_check_call_status(); @@ -66521,7 +66900,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Space, unpad) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 2, 0, &input_param, &blockSize_param); zephir_get_strval(&input, input_param); - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 246, &input); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 247, &input); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&inputArray, "str_split", NULL, 88, &input); zephir_check_call_status(); @@ -66532,7 +66911,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Space, unpad) if (_0) { zephir_array_fetch_long(&_1, &inputArray, counter, PH_NOISY | PH_READONLY, "phalcon/Encryption/Crypt/Padding/Space.zep", 48); ZVAL_LONG(&_2, 32); - ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 243, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 244, &_2); zephir_check_call_status(); _0 = ZEPHIR_IS_EQUAL(&_1, &_3); } @@ -66582,7 +66961,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Zero, pad) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &paddingSize_param); ZVAL_LONG(&_0, 0); - ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 243, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 244, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, paddingSize); ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", NULL, 1, &_1, &_0); @@ -66613,7 +66992,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Zero, unpad) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 2, 0, &input_param, &blockSize_param); zephir_get_strval(&input, input_param); - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 246, &input); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 247, &input); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&inputArray, "str_split", NULL, 88, &input); zephir_check_call_status(); @@ -66624,7 +67003,7 @@ static PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Zero, unpad) if (_0) { zephir_array_fetch_long(&_1, &inputArray, counter, PH_NOISY | PH_READONLY, "phalcon/Encryption/Crypt/Padding/Zero.zep", 48); ZVAL_LONG(&_2, 0); - ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 243, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 244, &_2); zephir_check_call_status(); _0 = ZEPHIR_IS_EQUAL(&_1, &_3); } @@ -67052,7 +67431,7 @@ static PHP_METHOD(Phalcon_Cli_Console, setArgument) ZEPHIR_INIT_NVAR(&_3$$5); ZVAL_STRING(&_3$$5, "--"); ZVAL_LONG(&_4$$5, 2); - ZEPHIR_CALL_FUNCTION(&_5$$5, "strncmp", &_6, 190, &arg, &_3$$5, &_4$$5); + ZEPHIR_CALL_FUNCTION(&_5$$5, "strncmp", &_6, 191, &arg, &_3$$5, &_4$$5); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_5$$5, 0)) { ZEPHIR_INIT_NVAR(&_7$$6); @@ -67084,7 +67463,7 @@ static PHP_METHOD(Phalcon_Cli_Console, setArgument) ZEPHIR_INIT_NVAR(&_18$$9); ZVAL_STRING(&_18$$9, "-"); ZVAL_LONG(&_19$$9, 1); - ZEPHIR_CALL_FUNCTION(&_20$$9, "strncmp", &_6, 190, &arg, &_18$$9, &_19$$9); + ZEPHIR_CALL_FUNCTION(&_20$$9, "strncmp", &_6, 191, &arg, &_18$$9, &_19$$9); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_20$$9, 0)) { ZVAL_LONG(&_21$$10, 1); @@ -67114,7 +67493,7 @@ static PHP_METHOD(Phalcon_Cli_Console, setArgument) ZEPHIR_INIT_NVAR(&_23$$14); ZVAL_STRING(&_23$$14, "--"); ZVAL_LONG(&_24$$14, 2); - ZEPHIR_CALL_FUNCTION(&_25$$14, "strncmp", &_6, 190, &arg, &_23$$14, &_24$$14); + ZEPHIR_CALL_FUNCTION(&_25$$14, "strncmp", &_6, 191, &arg, &_23$$14, &_24$$14); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_25$$14, 0)) { ZEPHIR_INIT_NVAR(&_26$$15); @@ -67146,7 +67525,7 @@ static PHP_METHOD(Phalcon_Cli_Console, setArgument) ZEPHIR_INIT_NVAR(&_37$$18); ZVAL_STRING(&_37$$18, "-"); ZVAL_LONG(&_38$$18, 1); - ZEPHIR_CALL_FUNCTION(&_39$$18, "strncmp", &_6, 190, &arg, &_37$$18, &_38$$18); + ZEPHIR_CALL_FUNCTION(&_39$$18, "strncmp", &_6, 191, &arg, &_37$$18, &_38$$18); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_39$$18, 0)) { ZVAL_LONG(&_40$$19, 1); @@ -67721,7 +68100,7 @@ static PHP_METHOD(Phalcon_Cli_Router, __construct) add_assoc_long_ex(&_1$$3, SL("task"), 1); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "#^(?::delimiter)?([a-zA-Z0-9\\_\\-]+)[:delimiter]{0,1}$#"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 191, &_2$$3, &_1$$3); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 192, &_2$$3, &_1$$3); zephir_check_call_status(); zephir_array_append(&routes, &_0$$3, PH_SEPARATE, "phalcon/Cli/Router.zep", 119); ZEPHIR_INIT_NVAR(&_2$$3); @@ -67733,7 +68112,7 @@ static PHP_METHOD(Phalcon_Cli_Router, __construct) add_assoc_long_ex(&_3$$3, SL("params"), 3); ZEPHIR_INIT_VAR(&_4$$3); ZVAL_STRING(&_4$$3, "#^(?::delimiter)?([a-zA-Z0-9\\_\\-]+):delimiter([a-zA-Z0-9\\.\\_]+)(:delimiter.*)*$#"); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 191, &_4$$3, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 192, &_4$$3, &_3$$3); zephir_check_call_status(); zephir_array_append(&routes, &_2$$3, PH_SEPARATE, "phalcon/Cli/Router.zep", 128); } @@ -67777,7 +68156,7 @@ static PHP_METHOD(Phalcon_Cli_Router, add) } ZEPHIR_INIT_VAR(&route); object_init_ex(&route, phalcon_cli_router_route_ce); - ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 191, &pattern, paths); + ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 192, &pattern, paths); zephir_check_call_status(); zephir_update_property_array_append(this_ptr, SL("routes"), &route); RETURN_CCTOR(&route); @@ -70233,7 +70612,7 @@ static PHP_METHOD(Phalcon_Config_ConfigFactory, parseConfig) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_config_exception_ce, "Config must be array or Phalcon\\Config\\Config object", "phalcon/Config/ConfigFactory.zep", 177); return; } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkconfigarray", NULL, 199, config); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkconfigarray", NULL, 200, config); zephir_check_call_status(); RETVAL_ZVAL(config, 1, 0); RETURN_MM(); @@ -70408,9 +70787,9 @@ static PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) if (ZEPHIR_IS_IDENTICAL(&_5$$5, &defaultAdapter)) { ZEPHIR_INIT_NVAR(&_6$$6); object_init_ex(&_6$$6, phalcon_config_configfactory_ce); - ZEPHIR_CALL_METHOD(NULL, &_6$$6, "__construct", &_7, 192); + ZEPHIR_CALL_METHOD(NULL, &_6$$6, "__construct", &_7, 193); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_8$$6, &_6$$6, "load", &_9, 193, &configName); + ZEPHIR_CALL_METHOD(&_8$$6, &_6$$6, "load", &_9, 194, &configName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "merge", &_4, 0, &_8$$6); zephir_check_call_status(); @@ -70449,9 +70828,9 @@ static PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) } else { ZEPHIR_INIT_NVAR(&_18$$10); object_init_ex(&_18$$10, phalcon_config_configfactory_ce); - ZEPHIR_CALL_METHOD(NULL, &_18$$10, "__construct", &_7, 192); + ZEPHIR_CALL_METHOD(NULL, &_18$$10, "__construct", &_7, 193); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_19$$10, &_18$$10, "load", &_9, 193, &configInstance); + ZEPHIR_CALL_METHOD(&_19$$10, &_18$$10, "load", &_9, 194, &configInstance); zephir_check_call_status(); ZEPHIR_CPY_WRT(&configInstance, &_19$$10); } @@ -70484,9 +70863,9 @@ static PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) if (ZEPHIR_IS_IDENTICAL(&_21$$13, &defaultAdapter)) { ZEPHIR_INIT_NVAR(&_22$$14); object_init_ex(&_22$$14, phalcon_config_configfactory_ce); - ZEPHIR_CALL_METHOD(NULL, &_22$$14, "__construct", &_7, 192); + ZEPHIR_CALL_METHOD(NULL, &_22$$14, "__construct", &_7, 193); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_23$$14, &_22$$14, "load", &_9, 193, &configName); + ZEPHIR_CALL_METHOD(&_23$$14, &_22$$14, "load", &_9, 194, &configName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "merge", &_4, 0, &_23$$14); zephir_check_call_status(); @@ -70525,9 +70904,9 @@ static PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) } else { ZEPHIR_INIT_NVAR(&_30$$18); object_init_ex(&_30$$18, phalcon_config_configfactory_ce); - ZEPHIR_CALL_METHOD(NULL, &_30$$18, "__construct", &_7, 192); + ZEPHIR_CALL_METHOD(NULL, &_30$$18, "__construct", &_7, 193); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_31$$18, &_30$$18, "load", &_9, 193, &configInstance); + ZEPHIR_CALL_METHOD(&_31$$18, &_30$$18, "load", &_9, 194, &configInstance); zephir_check_call_status(); ZEPHIR_CPY_WRT(&configInstance, &_31$$18); } @@ -70966,7 +71345,7 @@ static PHP_METHOD(Phalcon_Config_Adapter_Ini, parseIniString) ZEPHIR_INIT_VAR(&_3); zephir_substr(&_3, &path, zephir_get_intval(&_2), 0, ZEPHIR_SUBSTR_NO_LENGTH); zephir_get_strval(&path, &_3); - ZEPHIR_CALL_METHOD(&result, this_ptr, "parseinistring", NULL, 194, &path, &castValue); + ZEPHIR_CALL_METHOD(&result, this_ptr, "parseinistring", NULL, 195, &path, &castValue); zephir_check_call_status(); zephir_create_array(return_value, 1, 0); zephir_array_update_zval(return_value, &key, &result, PH_COPY); @@ -71004,7 +71383,7 @@ static PHP_METHOD(Phalcon_Config_Adapter_Ini, phpParseIniFile) } ZVAL_BOOL(&_0, (processSections ? 1 : 0)); ZVAL_LONG(&_1, scannerMode); - ZEPHIR_RETURN_CALL_FUNCTION("parse_ini_file", NULL, 195, &filename, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("parse_ini_file", NULL, 196, &filename, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -71063,7 +71442,7 @@ static PHP_METHOD(Phalcon_Config_Adapter_Json, __construct) ZEPHIR_INIT_VAR(&_2); zephir_file_get_contents(&_2, &filePath); ZVAL_BOOL(&_3, 1); - ZEPHIR_CALL_METHOD(&_1, &_0, "__invoke", NULL, 196, &_2, &_3); + ZEPHIR_CALL_METHOD(&_1, &_0, "__invoke", NULL, 197, &_2, &_3); zephir_check_call_status(); ZEPHIR_CALL_PARENT(NULL, phalcon_config_adapter_json_ce, getThis(), "__construct", NULL, 0, &_1); zephir_check_call_status(); @@ -71142,7 +71521,7 @@ static PHP_METHOD(Phalcon_Config_Adapter_Yaml, __construct) zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS, ndocs; zval callbacks; - zval *filePath_param = NULL, *callbacks_param = NULL, yamlConfig, _0, _1, _2$$5, _3$$5, _4$$6, _5$$6, _6$$6; + zval *filePath_param = NULL, *callbacks_param = NULL, yamlConfig, _0, _1, _2$$5, _3$$5, _4$$7, _5$$7, _6$$7; zval filePath; zval *this_ptr = getThis(); @@ -71152,9 +71531,9 @@ static PHP_METHOD(Phalcon_Config_Adapter_Yaml, __construct) ZVAL_UNDEF(&_1); ZVAL_UNDEF(&_2$$5); ZVAL_UNDEF(&_3$$5); - ZVAL_UNDEF(&_4$$6); - ZVAL_UNDEF(&_5$$6); - ZVAL_UNDEF(&_6$$6); + ZVAL_UNDEF(&_4$$7); + ZVAL_UNDEF(&_5$$7); + ZVAL_UNDEF(&_6$$7); ZVAL_UNDEF(&callbacks); bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) @@ -71197,16 +71576,20 @@ static PHP_METHOD(Phalcon_Config_Adapter_Yaml, __construct) ZEPHIR_CALL_METHOD(&yamlConfig, this_ptr, "phpyamlparsefile", NULL, 0, &filePath, &_2$$5, &_3$$5, &callbacks); zephir_check_call_status(); } + if (UNEXPECTED(Z_TYPE_P(&yamlConfig) == IS_NULL)) { + ZEPHIR_INIT_NVAR(&yamlConfig); + array_init(&yamlConfig); + } if (UNEXPECTED(ZEPHIR_IS_FALSE_IDENTICAL(&yamlConfig))) { - ZEPHIR_INIT_VAR(&_4$$6); - object_init_ex(&_4$$6, phalcon_config_exception_ce); - ZEPHIR_INIT_VAR(&_5$$6); - zephir_basename(&_5$$6, &filePath); - ZEPHIR_INIT_VAR(&_6$$6); - ZEPHIR_CONCAT_SVS(&_6$$6, "Configuration file ", &_5$$6, " can't be loaded"); - ZEPHIR_CALL_METHOD(NULL, &_4$$6, "__construct", NULL, 33, &_6$$6); + ZEPHIR_INIT_VAR(&_4$$7); + object_init_ex(&_4$$7, phalcon_config_exception_ce); + ZEPHIR_INIT_VAR(&_5$$7); + zephir_basename(&_5$$7, &filePath); + ZEPHIR_INIT_VAR(&_6$$7); + ZEPHIR_CONCAT_SVS(&_6$$7, "Configuration file ", &_5$$7, " can't be loaded"); + ZEPHIR_CALL_METHOD(NULL, &_4$$7, "__construct", NULL, 33, &_6$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_4$$6, "phalcon/Config/Adapter/Yaml.zep", 76); + zephir_throw_exception_debug(&_4$$7, "phalcon/Config/Adapter/Yaml.zep", 80); ZEPHIR_MM_RESTORE(); return; } @@ -71252,7 +71635,7 @@ static PHP_METHOD(Phalcon_Config_Adapter_Yaml, phpYamlParseFile) array_init(callbacks); } ZEPHIR_MAKE_REF(ndocs); - ZEPHIR_RETURN_CALL_FUNCTION("yaml_parse_file", NULL, 197, filename, pos, ndocs, callbacks); + ZEPHIR_RETURN_CALL_FUNCTION("yaml_parse_file", NULL, 198, filename, pos, ndocs, callbacks); ZEPHIR_UNREF(ndocs); zephir_check_call_status(); RETURN_MM(); @@ -71273,7 +71656,7 @@ static PHP_METHOD(Phalcon_Config_Adapter_Yaml, phpExtensionLoaded) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &name_param); zephir_get_strval(&name, name_param); - ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 198, &name); + ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 199, &name); zephir_check_call_status(); RETURN_MM(); } @@ -72851,7 +73234,7 @@ static PHP_METHOD(Phalcon_Session_Adapter_Stream, destroy) _2 = zephir_is_true(&_3); } if (_2) { - ZEPHIR_CALL_FUNCTION(NULL, "unlink", NULL, 123, &file); + ZEPHIR_CALL_FUNCTION(NULL, "unlink", NULL, 124, &file); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -72935,7 +73318,7 @@ static PHP_METHOD(Phalcon_Session_Adapter_Stream, gc) _10$$7 = ZEPHIR_LT(&_11$$7, &time); } if (_10$$7) { - ZEPHIR_CALL_FUNCTION(NULL, "unlink", &_12, 123, &file); + ZEPHIR_CALL_FUNCTION(NULL, "unlink", &_12, 124, &file); zephir_check_call_status(); } } ZEND_HASH_FOREACH_END(); @@ -72963,7 +73346,7 @@ static PHP_METHOD(Phalcon_Session_Adapter_Stream, gc) _15$$9 = ZEPHIR_LT(&_16$$9, &time); } if (_15$$9) { - ZEPHIR_CALL_FUNCTION(NULL, "unlink", &_12, 123, &file); + ZEPHIR_CALL_FUNCTION(NULL, "unlink", &_12, 124, &file); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(NULL, &glob, "next", NULL, 0); @@ -73027,7 +73410,7 @@ static PHP_METHOD(Phalcon_Session_Adapter_Stream, read) ZEPHIR_CALL_METHOD(&pointer, this_ptr, "phpfopen", NULL, 0, &name, &_3$$3); zephir_check_call_status(); ZVAL_LONG(&_4$$3, 1); - ZEPHIR_CALL_FUNCTION(&_5$$3, "flock", NULL, 132, &pointer, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "flock", NULL, 133, &pointer, &_4$$3); zephir_check_call_status(); if (zephir_is_true(&_5$$3)) { ZEPHIR_CALL_METHOD(&data, this_ptr, "phpfilegetcontents", NULL, 0, &name); @@ -73260,7 +73643,7 @@ static PHP_METHOD(Phalcon_Session_Adapter_Stream, phpFilePutContents) context = &__$null; } ZVAL_LONG(&_0, flags); - ZEPHIR_RETURN_CALL_FUNCTION("file_put_contents", NULL, 139, &filename, data, &_0, context); + ZEPHIR_RETURN_CALL_FUNCTION("file_put_contents", NULL, 140, &filename, data, &_0, context); zephir_check_call_status(); RETURN_MM(); } @@ -73283,7 +73666,7 @@ static PHP_METHOD(Phalcon_Session_Adapter_Stream, phpFopen) zephir_fetch_params(1, 2, 0, &filename_param, &mode_param); zephir_get_strval(&filename, filename_param); zephir_get_strval(&mode, mode_param); - ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 140, &filename, &mode); + ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 141, &filename, &mode); zephir_check_call_status(); RETURN_MM(); } @@ -73731,7 +74114,7 @@ static PHP_METHOD(Phalcon_Storage_Serializer_Base64, serialize) return; } zephir_read_property(&_1, this_ptr, ZEND_STRL("data"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 231, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 232, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -73808,7 +74191,7 @@ static PHP_METHOD(Phalcon_Storage_Serializer_Base64, phpBase64Decode) } else { } ZVAL_BOOL(&_0, (strict ? 1 : 0)); - ZEPHIR_RETURN_CALL_FUNCTION("base64_decode", NULL, 230, &input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("base64_decode", NULL, 231, &input, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -73906,33 +74289,33 @@ static PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, unserialize) if (!ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data); } else { - ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 133); + ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 134); zephir_check_call_status(); ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$false); ZEPHIR_INIT_VAR(&_1$$4); ZVAL_STRING(&_1$$4, "8.0"); ZEPHIR_INIT_VAR(&_2$$4); ZVAL_STRING(&_2$$4, ">="); - ZEPHIR_CALL_FUNCTION(&_3$$4, "version_compare", NULL, 134, &version, &_1$$4, &_2$$4); + ZEPHIR_CALL_FUNCTION(&_3$$4, "version_compare", NULL, 135, &version, &_1$$4, &_2$$4); zephir_check_call_status(); if (zephir_is_true(&_3$$4)) { ZEPHIR_INIT_VAR(&_4$$5); ZEPHIR_INIT_NVAR(&_4$$5); zephir_create_closure_ex(&_4$$5, NULL, phalcon_3__closure_ce, SL("__invoke")); ZVAL_LONG(&_5$$5, 2); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 135, &_4$$5, &_5$$5); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 136, &_4$$5, &_5$$5); zephir_check_call_status(); } else { ZEPHIR_INIT_VAR(&_6$$6); ZEPHIR_INIT_NVAR(&_6$$6); zephir_create_closure_ex(&_6$$6, NULL, phalcon_4__closure_ce, SL("__invoke")); ZVAL_LONG(&_7$$6, 2); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 135, &_6$$6, &_7$$6); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 136, &_6$$6, &_7$$6); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(&result, this_ptr, "dounserialize", NULL, 0, data); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 136); + ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 137); zephir_check_call_status(); _8$$4 = ZEPHIR_GLOBAL(warning).enable; if (!(_8$$4)) { @@ -73971,7 +74354,7 @@ static PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, phpIgbinarySerialize) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &value); - ZEPHIR_RETURN_CALL_FUNCTION("igbinary_serialize", NULL, 141, value); + ZEPHIR_RETURN_CALL_FUNCTION("igbinary_serialize", NULL, 142, value); zephir_check_call_status(); RETURN_MM(); } @@ -74008,7 +74391,7 @@ static PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, doUnserialize) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &value); - ZEPHIR_RETURN_CALL_FUNCTION("igbinary_unserialize", NULL, 142, value); + ZEPHIR_RETURN_CALL_FUNCTION("igbinary_unserialize", NULL, 143, value); zephir_check_call_status(); RETURN_MM(); } @@ -74109,7 +74492,7 @@ static PHP_METHOD(Phalcon_Storage_Serializer_Json, serialize) object_init_ex(&_3$$3, spl_ce_InvalidArgumentException); ZEPHIR_INIT_VAR(&_4$$3); ZEPHIR_CONCAT_SS(&_4$$3, "Data for the JSON serializer cannot be of type 'object' ", "without implementing 'JsonSerializable'"); - ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 200, &_4$$3); + ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 201, &_4$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_3$$3, "phalcon/Storage/Serializer/Json.zep", 54); ZEPHIR_MM_RESTORE(); @@ -74379,33 +74762,33 @@ static PHP_METHOD(Phalcon_Storage_Serializer_Php, unserialize) zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data); RETURN_MM_NULL(); } - ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 133); + ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 134); zephir_check_call_status(); ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$false); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "8.0"); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, ">="); - ZEPHIR_CALL_FUNCTION(&_3, "version_compare", NULL, 134, &version, &_1, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "version_compare", NULL, 135, &version, &_1, &_2); zephir_check_call_status(); if (zephir_is_true(&_3)) { ZEPHIR_INIT_VAR(&_4$$4); ZEPHIR_INIT_NVAR(&_4$$4); zephir_create_closure_ex(&_4$$4, NULL, phalcon_11__closure_ce, SL("__invoke")); ZVAL_LONG(&_5$$4, 8); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 135, &_4$$4, &_5$$4); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 136, &_4$$4, &_5$$4); zephir_check_call_status(); } else { ZEPHIR_INIT_VAR(&_6$$5); ZEPHIR_INIT_NVAR(&_6$$5); zephir_create_closure_ex(&_6$$5, NULL, phalcon_12__closure_ce, SL("__invoke")); ZVAL_LONG(&_7$$5, 8); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 135, &_6$$5, &_7$$5); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 136, &_6$$5, &_7$$5); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(&result, this_ptr, "phpunserialize", NULL, 0, data); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 136); + ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 137); zephir_check_call_status(); _8 = ZEPHIR_GLOBAL(warning).enable; if (!(_8)) { @@ -76193,22 +76576,22 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Libmemcached, getAdapter) zephir_check_call_status(); ZEPHIR_INIT_VAR(&failover); zephir_create_array(&failover, 5, 0); - add_index_long(&failover, 14, 10); + add_index_long(&failover, 14, 50); add_index_long(&failover, 9, 1); add_index_long(&failover, 21, 2); zephir_array_update_long(&failover, 35, &__$true, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY); add_index_long(&failover, 15, 1); - ZEPHIR_INIT_NVAR(&_7$$4); - zephir_fast_array_merge(&_7$$4, &failover, &client); - ZEPHIR_CPY_WRT(&client, &_7$$4); - ZEPHIR_CALL_METHOD(&_9$$4, this_ptr, "setoptions", NULL, 109, &connection, &client); + ZEPHIR_CALL_FUNCTION(&_9$$4, "array_replace", NULL, 109, &failover, &client); + zephir_check_call_status(); + ZEPHIR_CPY_WRT(&client, &_9$$4); + ZEPHIR_CALL_METHOD(&_9$$4, this_ptr, "setoptions", NULL, 110, &connection, &client); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_10$$4, &_9$$4, "setservers", NULL, 110, &connection, &servers); + ZEPHIR_CALL_METHOD(&_10$$4, &_9$$4, "setservers", NULL, 111, &connection, &servers); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_10$$4, "setsasl", NULL, 111, &connection, &saslUser, &saslPass); + ZEPHIR_CALL_METHOD(NULL, &_10$$4, "setsasl", NULL, 112, &connection, &saslUser, &saslPass); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "setserializer", NULL, 112, &connection); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setserializer", NULL, 113, &connection); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("adapter"), &connection); } @@ -77400,17 +77783,17 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Redis, getAdapter) object_init_ex(&connection, zephir_get_internal_ce(SL("redis"))); ZEPHIR_CALL_METHOD(NULL, &connection, "__construct", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "checkconnect", NULL, 113, &connection); + ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "checkconnect", NULL, 114, &connection); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_2$$3, &_1$$3, "checkauth", NULL, 114, &connection); + ZEPHIR_CALL_METHOD(&_2$$3, &_1$$3, "checkauth", NULL, 115, &connection); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "checkindex", NULL, 115, &connection); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "checkindex", NULL, 116, &connection); zephir_check_call_status(); zephir_read_property(&_3$$3, this_ptr, ZEND_STRL("prefix"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_4$$3, 2); ZEPHIR_CALL_METHOD(NULL, &connection, "setoption", NULL, 0, &_4$$3, &_3$$3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "setserializer", NULL, 116, &connection); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setserializer", NULL, 117, &connection); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("adapter"), &connection); } @@ -77842,7 +78225,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Redis, checkConnect) object_init_ex(&_4$$8, phalcon_storage_exception_ce); ZEPHIR_INIT_VAR(&_5$$8); ZVAL_STRING(&_5$$8, "Could not connect to the Redisd server [%s:%s]"); - ZEPHIR_CALL_FUNCTION(&_6$$8, "sprintf", NULL, 117, &_5$$8, &host, &port); + ZEPHIR_CALL_FUNCTION(&_6$$8, "sprintf", NULL, 118, &_5$$8, &host, &port); zephir_check_call_status_or_jump(try_end_1); ZEPHIR_CALL_METHOD(NULL, &_4$$8, "__construct", NULL, 33, &_6$$8); zephir_check_call_status_or_jump(try_end_1); @@ -77945,34 +78328,34 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Redis, setSerializer) add_assoc_long_ex(&map, SL("redis_php"), 1); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "\\Redis::SERIALIZER_IGBINARY"); - ZEPHIR_CALL_FUNCTION(&_1, "defined", NULL, 118, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "defined", NULL, 119, &_0); zephir_check_call_status(); if (zephir_is_true(&_1)) { ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "\\Redis::SERIALIZER_IGBINARY"); - ZEPHIR_CALL_FUNCTION(&_3$$3, "constant", NULL, 119, &_2$$3); + ZEPHIR_CALL_FUNCTION(&_3$$3, "constant", NULL, 120, &_2$$3); zephir_check_call_status(); zephir_array_update_string(&map, SL("redis_igbinary"), &_3$$3, PH_COPY | PH_SEPARATE); } ZEPHIR_INIT_NVAR(&_0); ZVAL_STRING(&_0, "\\Redis::SERIALIZER_MSGPACK"); - ZEPHIR_CALL_FUNCTION(&_4, "defined", NULL, 118, &_0); + ZEPHIR_CALL_FUNCTION(&_4, "defined", NULL, 119, &_0); zephir_check_call_status(); if (zephir_is_true(&_4)) { ZEPHIR_INIT_VAR(&_5$$4); ZVAL_STRING(&_5$$4, "\\Redis::SERIALIZER_MSGPACK"); - ZEPHIR_CALL_FUNCTION(&_6$$4, "constant", NULL, 119, &_5$$4); + ZEPHIR_CALL_FUNCTION(&_6$$4, "constant", NULL, 120, &_5$$4); zephir_check_call_status(); zephir_array_update_string(&map, SL("redis_msgpack"), &_6$$4, PH_COPY | PH_SEPARATE); } ZEPHIR_INIT_NVAR(&_0); ZVAL_STRING(&_0, "\\Redis::SERIALIZER_JSON"); - ZEPHIR_CALL_FUNCTION(&_7, "defined", NULL, 118, &_0); + ZEPHIR_CALL_FUNCTION(&_7, "defined", NULL, 119, &_0); zephir_check_call_status(); if (zephir_is_true(&_7)) { ZEPHIR_INIT_VAR(&_8$$5); ZVAL_STRING(&_8$$5, "\\Redis::SERIALIZER_JSON"); - ZEPHIR_CALL_FUNCTION(&_9$$5, "constant", NULL, 119, &_8$$5); + ZEPHIR_CALL_FUNCTION(&_9$$5, "constant", NULL, 120, &_8$$5); zephir_check_call_status(); zephir_array_update_string(&map, SL("redis_json"), &_9$$5, PH_COPY | PH_SEPARATE); } @@ -78051,7 +78434,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, __construct) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_storage_exception_ce, "The 'storageDir' must be specified in the options", "phalcon/Storage/Adapter/Stream.zep", 60); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "getdirseparator", NULL, 120, &storageDir); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "getdirseparator", NULL, 121, &storageDir); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("storageDir"), &_2); ZEPHIR_CALL_PARENT(NULL, phalcon_storage_adapter_stream_ce, getThis(), "__construct", NULL, 0, factory, &options); @@ -78086,9 +78469,9 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, clear) result = 1; zephir_read_property(&_0, this_ptr, ZEND_STRL("storageDir"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdirseparator", NULL, 120, &_0); + ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdirseparator", NULL, 121, &_0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&iterator, this_ptr, "getiterator", NULL, 121, &directory); + ZEPHIR_CALL_METHOD(&iterator, this_ptr, "getiterator", NULL, 122, &directory); zephir_check_call_status(); zephir_is_iterable(&iterator, 0, "phalcon/Storage/Adapter/Stream.zep", 91); if (Z_TYPE_P(&iterator) == IS_ARRAY) { @@ -78262,9 +78645,9 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, delete) zephir_check_call_status(); RETURN_MM_BOOL(0); } - ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 122, &key); + ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 123, &key); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&result, "unlink", NULL, 123, &filepath); + ZEPHIR_CALL_FUNCTION(&result, "unlink", NULL, 124, &filepath); zephir_check_call_status(); zephir_read_property(&_5, this_ptr, ZEND_STRL("eventType"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_6); @@ -78325,7 +78708,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, get) ZEPHIR_CONCAT_VS(&_1, &_0, ":beforeGet"); ZEPHIR_CALL_METHOD(NULL, this_ptr, "fire", NULL, 0, &_1, &key); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 122, &key); + ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 123, &key); zephir_check_call_status(); if (1 != (zephir_file_exists(&filepath) == SUCCESS)) { zephir_read_property(&_2$$3, this_ptr, ZEND_STRL("eventType"), PH_NOISY_CC | PH_READONLY); @@ -78336,11 +78719,11 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, get) RETVAL_ZVAL(defaultValue, 1, 0); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&payload, this_ptr, "getpayload", NULL, 124, &filepath); + ZEPHIR_CALL_METHOD(&payload, this_ptr, "getpayload", NULL, 125, &filepath); zephir_check_call_status(); _4 = ZEPHIR_IS_EMPTY(&payload); if (!(_4)) { - ZEPHIR_CALL_METHOD(&_5, this_ptr, "isexpired", NULL, 125, &payload); + ZEPHIR_CALL_METHOD(&_5, this_ptr, "isexpired", NULL, 126, &payload); zephir_check_call_status(); _4 = zephir_is_true(&_5); } @@ -78409,7 +78792,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, getKeys) } ZEPHIR_INIT_VAR(&files); array_init(&files); - ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 126); + ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 127); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_0, this_ptr, "phpfileexists", NULL, 0, &directory); zephir_check_call_status(); @@ -78417,7 +78800,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, getKeys) array_init(return_value); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&iterator, this_ptr, "getiterator", NULL, 121, &directory); + ZEPHIR_CALL_METHOD(&iterator, this_ptr, "getiterator", NULL, 122, &directory); zephir_check_call_status(); zephir_is_iterable(&iterator, 0, "phalcon/Storage/Adapter/Stream.zep", 219); if (Z_TYPE_P(&iterator) == IS_ARRAY) { @@ -78509,7 +78892,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, has) ZEPHIR_CONCAT_VS(&_1, &_0, ":beforeHas"); ZEPHIR_CALL_METHOD(NULL, this_ptr, "fire", NULL, 0, &_1, &key); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 122, &key); + ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 123, &key); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_2, this_ptr, "phpfileexists", NULL, 0, &filepath); zephir_check_call_status(); @@ -78521,7 +78904,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, has) zephir_check_call_status(); RETURN_MM_BOOL(0); } - ZEPHIR_CALL_METHOD(&payload, this_ptr, "getpayload", NULL, 124, &filepath); + ZEPHIR_CALL_METHOD(&payload, this_ptr, "getpayload", NULL, 125, &filepath); zephir_check_call_status(); if (UNEXPECTED(ZEPHIR_IS_EMPTY(&payload))) { zephir_read_property(&_5$$4, this_ptr, ZEND_STRL("eventType"), PH_NOISY_CC | PH_READONLY); @@ -78531,7 +78914,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, has) zephir_check_call_status(); RETURN_MM_BOOL(0); } - ZEPHIR_CALL_METHOD(&_7, this_ptr, "isexpired", NULL, 125, &payload); + ZEPHIR_CALL_METHOD(&_7, this_ptr, "isexpired", NULL, 126, &payload); zephir_check_call_status(); result = !zephir_is_true(&_7); zephir_read_property(&_8, this_ptr, ZEND_STRL("eventType"), PH_NOISY_CC | PH_READONLY); @@ -78691,7 +79074,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, set) ZEPHIR_CALL_METHOD(&_6, this_ptr, "getserializeddata", NULL, 0, value); zephir_check_call_status(); zephir_array_update_string(&payload, SL("content"), &_6, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&result, this_ptr, "storepayload", NULL, 127, &payload, &key); + ZEPHIR_CALL_METHOD(&result, this_ptr, "storepayload", NULL, 128, &payload, &key); zephir_check_call_status(); zephir_read_property(&_7, this_ptr, ZEND_STRL("eventType"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_8); @@ -78740,7 +79123,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, setForever) ZEPHIR_CALL_METHOD(&_1, this_ptr, "getserializeddata", NULL, 0, value); zephir_check_call_status(); zephir_array_update_string(&payload, SL("content"), &_1, PH_COPY | PH_SEPARATE); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "storepayload", NULL, 127, &payload, &key); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "storepayload", NULL, 128, &payload, &key); zephir_check_call_status(); RETURN_MM(); } @@ -78786,15 +79169,15 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, getDir) zephir_read_property(&_1, this_ptr, ZEND_STRL("prefix"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_2); ZEPHIR_CONCAT_VV(&_2, &_0, &_1); - ZEPHIR_CALL_METHOD(&dirPrefix, this_ptr, "getdirseparator", NULL, 120, &_2); + ZEPHIR_CALL_METHOD(&dirPrefix, this_ptr, "getdirseparator", NULL, 121, &_2); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "getkeywithoutprefix", NULL, 128, &key); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "getkeywithoutprefix", NULL, 129, &key); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&dirFromFile, this_ptr, "getdirfromfile", NULL, 129, &_3); + ZEPHIR_CALL_METHOD(&dirFromFile, this_ptr, "getdirfromfile", NULL, 130, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); ZEPHIR_CONCAT_VV(&_4, &dirPrefix, &dirFromFile); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getdirseparator", NULL, 120, &_4); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getdirseparator", NULL, 121, &_4); zephir_check_call_status(); RETURN_MM(); } @@ -78817,9 +79200,9 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, getFilepath) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &key_param); zephir_get_strval(&key, key_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdir", NULL, 126, &key); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdir", NULL, 127, &key); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "getkeywithoutprefix", NULL, 128, &key); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "getkeywithoutprefix", NULL, 129, &key); zephir_check_call_status(); ZEPHIR_CONCAT_VV(return_value, &_0, &_1); RETURN_MM(); @@ -78882,10 +79265,10 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, getIterator) ZEPHIR_INIT_VAR(&_0); object_init_ex(&_0, spl_ce_RecursiveDirectoryIterator); ZVAL_LONG(&_1, 4096); - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 130, &dir, &_1); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 131, &dir, &_1); zephir_check_call_status(); ZVAL_LONG(&_1, 2); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 131, &_0, &_1); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 132, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -78932,7 +79315,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, getPayload) RETURN_MM(); } ZVAL_LONG(&_1, 1); - ZEPHIR_CALL_FUNCTION(&_2, "flock", NULL, 132, &pointer, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "flock", NULL, 133, &pointer, &_1); zephir_check_call_status(); if (EXPECTED(ZEPHIR_IS_TRUE_IDENTICAL(&_2))) { ZEPHIR_CALL_METHOD(&payload, this_ptr, "phpfilegetcontents", NULL, 0, &filepath); @@ -78943,34 +79326,34 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, getPayload) array_init(return_value); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 133); + ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 134); zephir_check_call_status(); ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$false); ZEPHIR_INIT_NVAR(&_0); ZVAL_STRING(&_0, "8.0"); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, ">="); - ZEPHIR_CALL_FUNCTION(&_4, "version_compare", NULL, 134, &version, &_0, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "version_compare", NULL, 135, &version, &_0, &_3); zephir_check_call_status(); if (zephir_is_true(&_4)) { ZEPHIR_INIT_VAR(&_5$$6); ZEPHIR_INIT_NVAR(&_5$$6); zephir_create_closure_ex(&_5$$6, NULL, phalcon_1__closure_ce, SL("__invoke")); ZVAL_LONG(&_6$$6, 8); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 135, &_5$$6, &_6$$6); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 136, &_5$$6, &_6$$6); zephir_check_call_status(); } else { ZEPHIR_INIT_VAR(&_7$$7); ZEPHIR_INIT_NVAR(&_7$$7); zephir_create_closure_ex(&_7$$7, NULL, phalcon_2__closure_ce, SL("__invoke")); ZVAL_LONG(&_8$$7, 8); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 135, &_7$$7, &_8$$7); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 136, &_7$$7, &_8$$7); zephir_check_call_status(); } ZEPHIR_CALL_FUNCTION(&_9, "unserialize", NULL, 16, &payload); zephir_check_call_status(); ZEPHIR_CPY_WRT(&payload, &_9); - ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 136); + ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 137); zephir_check_call_status(); _10 = ZEPHIR_GLOBAL(warning).enable; if (!(_10)) { @@ -79058,13 +79441,13 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, storePayload) ZEPHIR_CALL_FUNCTION(&_0, "serialize", NULL, 15, &payload); zephir_check_call_status(); ZEPHIR_CPY_WRT(&payload, &_0); - ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 126, &key); + ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 127, &key); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_0, "is_dir", NULL, 137, &directory); + ZEPHIR_CALL_FUNCTION(&_0, "is_dir", NULL, 138, &directory); zephir_check_call_status(); if (!(zephir_is_true(&_0))) { ZVAL_LONG(&_1$$3, 0777); - ZEPHIR_CALL_FUNCTION(NULL, "mkdir", NULL, 138, &directory, &_1$$3, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "mkdir", NULL, 139, &directory, &_1$$3, &__$true); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_3); @@ -79143,7 +79526,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, phpFilePutContents) context = &__$null; } ZVAL_LONG(&_0, flags); - ZEPHIR_RETURN_CALL_FUNCTION("file_put_contents", NULL, 139, &filename, data, &_0, context); + ZEPHIR_RETURN_CALL_FUNCTION("file_put_contents", NULL, 140, &filename, data, &_0, context); zephir_check_call_status(); RETURN_MM(); } @@ -79166,7 +79549,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, phpFopen) zephir_fetch_params(1, 2, 0, &filename_param, &mode_param); zephir_get_strval(&filename, filename_param); zephir_get_strval(&mode, mode_param); - ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 140, &filename, &mode); + ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 141, &filename, &mode); zephir_check_call_status(); RETURN_MM(); } @@ -79186,7 +79569,7 @@ static PHP_METHOD(Phalcon_Storage_Adapter_Stream, phpUnlink) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &filename_param); zephir_get_strval(&filename, filename_param); - ZEPHIR_RETURN_CALL_FUNCTION("unlink", NULL, 123, &filename); + ZEPHIR_RETURN_CALL_FUNCTION("unlink", NULL, 124, &filename); zephir_check_call_status(); RETURN_MM(); } @@ -80936,7 +81319,7 @@ static PHP_METHOD(Phalcon_Cache_CacheFactory, newInstance) ZEPHIR_CALL_METHOD(&adapter, &_0, "newinstance", NULL, 0, &name, &options); zephir_check_call_status(); object_init_ex(return_value, phalcon_cache_cache_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 189, &adapter); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 190, &adapter); zephir_check_call_status(); RETURN_MM(); } @@ -81240,7 +81623,7 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Connection, __construct) zephir_array_fetch_long(&_2$$3, &parts, 0, PH_NOISY | PH_READONLY, "phalcon/DataMapper/Pdo/Connection.zep", 67); ZEPHIR_INIT_VAR(&_3$$3); ZEPHIR_CONCAT_SVS(&_3$$3, "Driver not supported [", &_2$$3, "]"); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 200, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 201, &_3$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/DataMapper/Pdo/Connection.zep", 68); ZEPHIR_MM_RESTORE(); @@ -81262,7 +81645,7 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Connection, __construct) if (Z_TYPE_P(profiler) == IS_NULL) { ZEPHIR_INIT_NVAR(profiler); object_init_ex(profiler, phalcon_datamapper_pdo_profiler_profiler_ce); - ZEPHIR_CALL_METHOD(NULL, profiler, "__construct", NULL, 201); + ZEPHIR_CALL_METHOD(NULL, profiler, "__construct", NULL, 202); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(NULL, this_ptr, "setprofiler", NULL, 0, profiler); @@ -81761,7 +82144,7 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_ConnectionLocator, getConnection) ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, ""); if (ZEPHIR_IS_IDENTICAL(&_1, &requested)) { - ZEPHIR_CALL_FUNCTION(&requested, "array_rand", NULL, 202, &collection); + ZEPHIR_CALL_FUNCTION(&requested, "array_rand", NULL, 203, &collection); zephir_check_call_status(); } if (!(zephir_array_isset(&collection, &requested))) { @@ -82430,9 +82813,9 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_Profiler, finish) object_init_ex(&ex, phalcon_datamapper_pdo_exception_exception_ce); ZEPHIR_CALL_METHOD(NULL, &ex, "__construct", NULL, 33); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&finish, "hrtime", NULL, 203, &__$true); + ZEPHIR_CALL_FUNCTION(&finish, "hrtime", NULL, 204, &__$true); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1$$3, &ex, "gettraceasstring", NULL, 204); + ZEPHIR_CALL_METHOD(&_1$$3, &ex, "gettraceasstring", NULL, 205); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "backtrace"); @@ -82583,7 +82966,7 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_Profiler, start) ZEPHIR_INIT_VAR(&_1$$3); zephir_create_array(&_1$$3, 2, 0); zephir_array_update_string(&_1$$3, SL("method"), &method, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_FUNCTION(&_2$$3, "hrtime", NULL, 203, &__$true); + ZEPHIR_CALL_FUNCTION(&_2$$3, "hrtime", NULL, 204, &__$true); zephir_check_call_status(); zephir_array_update_string(&_1$$3, SL("start"), &_2$$3, PH_COPY | PH_SEPARATE); zephir_update_property_zval(this_ptr, ZEND_STRL("context"), &_1$$3); @@ -84165,7 +84548,7 @@ static PHP_METHOD(Phalcon_DataMapper_Pdo_Connection_Decorated, __construct) if (Z_TYPE_P(profiler) == IS_NULL) { ZEPHIR_INIT_NVAR(profiler); object_init_ex(profiler, phalcon_datamapper_pdo_profiler_profiler_ce); - ZEPHIR_CALL_METHOD(NULL, profiler, "__construct", NULL, 201); + ZEPHIR_CALL_METHOD(NULL, profiler, "__construct", NULL, 202); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(NULL, this_ptr, "setprofiler", NULL, 0, profiler); @@ -86347,7 +86730,7 @@ static PHP_METHOD(Phalcon_DataMapper_Query_Insert, getStatement) zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("store"), PH_NOISY_CC | PH_READONLY); zephir_array_fetch_string(&_2, &_1, SL("FROM"), PH_NOISY | PH_READONLY, "phalcon/DataMapper/Query/Insert.zep", 113); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "buildcolumns", NULL, 205); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "buildcolumns", NULL, 206); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_4, this_ptr, "buildreturning", NULL, 0); zephir_check_call_status(); @@ -86626,7 +87009,7 @@ static PHP_METHOD(Phalcon_DataMapper_Query_QueryFactory, newDelete) object_init_ex(return_value, phalcon_datamapper_query_delete_ce); ZEPHIR_CALL_METHOD(&_0, this_ptr, "newbind", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 206, connection, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 207, connection, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -86649,7 +87032,7 @@ static PHP_METHOD(Phalcon_DataMapper_Query_QueryFactory, newInsert) object_init_ex(return_value, phalcon_datamapper_query_insert_ce); ZEPHIR_CALL_METHOD(&_0, this_ptr, "newbind", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 207, connection, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 208, connection, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -86710,7 +87093,7 @@ static PHP_METHOD(Phalcon_DataMapper_Query_QueryFactory, newUpdate) object_init_ex(return_value, phalcon_datamapper_query_update_ce); ZEPHIR_CALL_METHOD(&_0, this_ptr, "newbind", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 208, connection, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 209, connection, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -87451,7 +87834,7 @@ static PHP_METHOD(Phalcon_DataMapper_Query_Select, subSelect) object_init_ex(return_value, phalcon_datamapper_query_select_ce); zephir_read_property(&_0, this_ptr, ZEND_STRL("connection"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_1, this_ptr, ZEND_STRL("bind"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 209, &_0, &_1); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 210, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -87549,9 +87932,9 @@ static PHP_METHOD(Phalcon_DataMapper_Query_Select, getCurrentStatement) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_2, this_ptr, "buildlimitearly", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "buildcolumns", NULL, 210); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "buildcolumns", NULL, 211); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "buildfrom", NULL, 211); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "buildfrom", NULL, 212); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_6); ZVAL_STRING(&_6, "WHERE"); @@ -87917,7 +88300,7 @@ static PHP_METHOD(Phalcon_DataMapper_Query_Update, getStatement) zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("store"), PH_NOISY_CC | PH_READONLY); zephir_array_fetch_string(&_2, &_1, SL("FROM"), PH_NOISY | PH_READONLY, "phalcon/DataMapper/Query/Update.zep", 101); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "buildcolumns", NULL, 212); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "buildcolumns", NULL, 213); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5); ZVAL_STRING(&_5, "WHERE"); @@ -88166,6 +88549,8 @@ ZEPHIR_INIT_CLASS(Phalcon_Filter_Filter) zephir_declare_class_constant_string(phalcon_filter_filter_ce, SL("FILTER_INT"), "int"); + zephir_declare_class_constant_string(phalcon_filter_filter_ce, SL("FILTER_IP"), "ip"); + zephir_declare_class_constant_string(phalcon_filter_filter_ce, SL("FILTER_LOWER"), "lower"); zephir_declare_class_constant_string(phalcon_filter_filter_ce, SL("FILTER_LOWERFIRST"), "lowerfirst"); @@ -88296,7 +88681,7 @@ static PHP_METHOD(Phalcon_Filter_Filter, get) ZEPHIR_CONCAT_SVS(&_2$$3, "Filter ", &name, " is not registered"); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 33, &_2$$3); zephir_check_call_status(); - zephir_throw_exception_debug(&_1$$3, "phalcon/Filter/Filter.zep", 121); + zephir_throw_exception_debug(&_1$$3, "phalcon/Filter/Filter.zep", 123); ZEPHIR_MM_RESTORE(); return; } @@ -88304,13 +88689,13 @@ static PHP_METHOD(Phalcon_Filter_Filter, get) if (1 != zephir_array_isset(&_3, &name)) { zephir_read_property(&_4$$4, this_ptr, ZEND_STRL("mapper"), PH_NOISY_CC | PH_READONLY); zephir_memory_observe(&definition); - zephir_array_fetch(&definition, &_4$$4, &name, PH_NOISY, "phalcon/Filter/Filter.zep", 125); - ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "createinstance", NULL, 275, &definition); + zephir_array_fetch(&definition, &_4$$4, &name, PH_NOISY, "phalcon/Filter/Filter.zep", 127); + ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "createinstance", NULL, 276, &definition); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("services"), &name, &_5$$4); } zephir_read_property(&_6, this_ptr, ZEND_STRL("services"), PH_NOISY_CC | PH_READONLY); - zephir_array_fetch(&_7, &_6, &name, PH_NOISY | PH_READONLY, "phalcon/Filter/Filter.zep", 129); + zephir_array_fetch(&_7, &_6, &name, PH_NOISY | PH_READONLY, "phalcon/Filter/Filter.zep", 131); RETURN_CTOR(&_7); } @@ -88364,7 +88749,7 @@ static PHP_METHOD(Phalcon_Filter_Filter, sanitize) } else { ZVAL_BOOL(&_0$$3, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processarraysanitizers", NULL, 276, sanitizers, value, &_0$$3); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processarraysanitizers", NULL, 277, sanitizers, value, &_0$$3); zephir_check_call_status(); RETURN_MM(); } @@ -88373,11 +88758,11 @@ static PHP_METHOD(Phalcon_Filter_Filter, sanitize) _1 = !noRecursive; } if (_1) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processarrayvalues", NULL, 277, value, sanitizers); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processarrayvalues", NULL, 278, value, sanitizers); zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "sanitizer", NULL, 278, value, sanitizers); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "sanitizer", NULL, 279, value, sanitizers); zephir_check_call_status(); RETURN_MM(); } @@ -88429,7 +88814,7 @@ static PHP_METHOD(Phalcon_Filter_Filter, init) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &mapper_param); zephir_get_arrval(&mapper, mapper_param); - zephir_is_iterable(&mapper, 0, "phalcon/Filter/Filter.zep", 231); + zephir_is_iterable(&mapper, 0, "phalcon/Filter/Filter.zep", 233); if (Z_TYPE_P(&mapper) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&mapper), _2, _3, _0) { @@ -88531,7 +88916,7 @@ static PHP_METHOD(Phalcon_Filter_Filter, processArraySanitizers) RETVAL_ZVAL(value, 1, 0); RETURN_MM(); } - zephir_is_iterable(&sanitizers, 0, "phalcon/Filter/Filter.zep", 305); + zephir_is_iterable(&sanitizers, 0, "phalcon/Filter/Filter.zep", 307); if (Z_TYPE_P(&sanitizers) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&sanitizers), _2, _3, _0) { @@ -88543,23 +88928,23 @@ static PHP_METHOD(Phalcon_Filter_Filter, processArraySanitizers) } ZEPHIR_INIT_NVAR(&sanitizer); ZVAL_COPY(&sanitizer, _0); - ZEPHIR_CALL_METHOD(&split, this_ptr, "splitsanitizerparameters", &_4, 279, &sanitizerKey, &sanitizer); + ZEPHIR_CALL_METHOD(&split, this_ptr, "splitsanitizerparameters", &_4, 280, &sanitizerKey, &sanitizer); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&sanitizerName); - zephir_array_fetch_long(&sanitizerName, &split, 0, PH_NOISY, "phalcon/Filter/Filter.zep", 281); + zephir_array_fetch_long(&sanitizerName, &split, 0, PH_NOISY, "phalcon/Filter/Filter.zep", 283); ZEPHIR_OBS_NVAR(&sanitizerParams); - zephir_array_fetch_long(&sanitizerParams, &split, 1, PH_NOISY, "phalcon/Filter/Filter.zep", 282); + zephir_array_fetch_long(&sanitizerParams, &split, 1, PH_NOISY, "phalcon/Filter/Filter.zep", 284); if (Z_TYPE_P(value) == IS_ARRAY) { if (noRecursive) { ZVAL_BOOL(&_6$$5, 1); } else { ZVAL_BOOL(&_6$$5, 0); } - ZEPHIR_CALL_METHOD(&_5$$5, this_ptr, "processvalueisarray", &_7, 280, value, &sanitizerName, &sanitizerParams, &_6$$5); + ZEPHIR_CALL_METHOD(&_5$$5, this_ptr, "processvalueisarray", &_7, 281, value, &sanitizerName, &sanitizerParams, &_6$$5); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_5$$5); } else { - ZEPHIR_CALL_METHOD(&_8$$6, this_ptr, "processvalueisnotarray", &_9, 281, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_8$$6, this_ptr, "processvalueisnotarray", &_9, 282, value, &sanitizerName, &sanitizerParams); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_8$$6); } @@ -88577,23 +88962,23 @@ static PHP_METHOD(Phalcon_Filter_Filter, processArraySanitizers) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&sanitizer, &sanitizers, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&split, this_ptr, "splitsanitizerparameters", &_4, 279, &sanitizerKey, &sanitizer); + ZEPHIR_CALL_METHOD(&split, this_ptr, "splitsanitizerparameters", &_4, 280, &sanitizerKey, &sanitizer); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&sanitizerName); - zephir_array_fetch_long(&sanitizerName, &split, 0, PH_NOISY, "phalcon/Filter/Filter.zep", 281); + zephir_array_fetch_long(&sanitizerName, &split, 0, PH_NOISY, "phalcon/Filter/Filter.zep", 283); ZEPHIR_OBS_NVAR(&sanitizerParams); - zephir_array_fetch_long(&sanitizerParams, &split, 1, PH_NOISY, "phalcon/Filter/Filter.zep", 282); + zephir_array_fetch_long(&sanitizerParams, &split, 1, PH_NOISY, "phalcon/Filter/Filter.zep", 284); if (Z_TYPE_P(value) == IS_ARRAY) { if (noRecursive) { ZVAL_BOOL(&_11$$8, 1); } else { ZVAL_BOOL(&_11$$8, 0); } - ZEPHIR_CALL_METHOD(&_10$$8, this_ptr, "processvalueisarray", &_7, 280, value, &sanitizerName, &sanitizerParams, &_11$$8); + ZEPHIR_CALL_METHOD(&_10$$8, this_ptr, "processvalueisarray", &_7, 281, value, &sanitizerName, &sanitizerParams, &_11$$8); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_10$$8); } else { - ZEPHIR_CALL_METHOD(&_12$$9, this_ptr, "processvalueisnotarray", &_9, 281, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_12$$9, this_ptr, "processvalueisnotarray", &_9, 282, value, &sanitizerName, &sanitizerParams); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_12$$9); } @@ -88647,7 +89032,7 @@ static PHP_METHOD(Phalcon_Filter_Filter, processArrayValues) } ZEPHIR_INIT_VAR(&arrayValues); array_init(&arrayValues); - zephir_is_iterable(&values, 0, "phalcon/Filter/Filter.zep", 334); + zephir_is_iterable(&values, 0, "phalcon/Filter/Filter.zep", 336); if (Z_TYPE_P(&values) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&values), _2, _3, _0) { @@ -88659,7 +89044,7 @@ static PHP_METHOD(Phalcon_Filter_Filter, processArrayValues) } ZEPHIR_INIT_NVAR(&itemValue); ZVAL_COPY(&itemValue, _0); - ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "sanitizer", &_5, 278, &itemValue, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "sanitizer", &_5, 279, &itemValue, &sanitizerName, &sanitizerParams); zephir_check_call_status(); zephir_array_update_zval(&arrayValues, &itemKey, &_4$$3, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -88676,7 +89061,7 @@ static PHP_METHOD(Phalcon_Filter_Filter, processArrayValues) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&itemValue, &values, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "sanitizer", &_5, 278, &itemValue, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "sanitizer", &_5, 279, &itemValue, &sanitizerName, &sanitizerParams); zephir_check_call_status(); zephir_array_update_zval(&arrayValues, &itemKey, &_6$$4, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &values, "next", NULL, 0); @@ -88775,11 +89160,11 @@ static PHP_METHOD(Phalcon_Filter_Filter, processValueIsArray) zephir_get_strval(&sanitizerName, sanitizerName_param); zephir_get_arrval(&sanitizerParams, sanitizerParams_param); if (noRecursive) { - ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "sanitizer", NULL, 278, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "sanitizer", NULL, 279, value, &sanitizerName, &sanitizerParams); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_0$$3); } else { - ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "processarrayvalues", NULL, 277, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "processarrayvalues", NULL, 278, value, &sanitizerName, &sanitizerParams); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_1$$4); } @@ -88812,7 +89197,7 @@ static PHP_METHOD(Phalcon_Filter_Filter, processValueIsNotArray) zephir_get_strval(&sanitizerName, sanitizerName_param); zephir_get_arrval(&sanitizerParams, sanitizerParams_param); if (Z_TYPE_P(value) != IS_ARRAY) { - ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "sanitizer", NULL, 278, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "sanitizer", NULL, 279, value, &sanitizerName, &sanitizerParams); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_0$$3); } @@ -88913,7 +89298,7 @@ static PHP_METHOD(Phalcon_Filter_FilterFactory, newInstance) object_init_ex(return_value, phalcon_filter_filter_ce); ZEPHIR_CALL_METHOD(&_0, this_ptr, "getservices", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 282, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 283, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -88921,7 +89306,7 @@ static PHP_METHOD(Phalcon_Filter_FilterFactory, newInstance) static PHP_METHOD(Phalcon_Filter_FilterFactory, getServices) { - zephir_create_array(return_value, 22, 0); + zephir_create_array(return_value, 23, 0); add_assoc_stringl_ex(return_value, SL("absint"), SL("Phalcon\\Filter\\Sanitize\\AbsInt")); add_assoc_stringl_ex(return_value, SL("alnum"), SL("Phalcon\\Filter\\Sanitize\\Alnum")); add_assoc_stringl_ex(return_value, SL("alpha"), SL("Phalcon\\Filter\\Sanitize\\Alpha")); @@ -88929,6 +89314,7 @@ static PHP_METHOD(Phalcon_Filter_FilterFactory, getServices) add_assoc_stringl_ex(return_value, SL("email"), SL("Phalcon\\Filter\\Sanitize\\Email")); add_assoc_stringl_ex(return_value, SL("float"), SL("Phalcon\\Filter\\Sanitize\\FloatVal")); add_assoc_stringl_ex(return_value, SL("int"), SL("Phalcon\\Filter\\Sanitize\\IntVal")); + add_assoc_stringl_ex(return_value, SL("ip"), SL("Phalcon\\Filter\\Sanitize\\Ip")); add_assoc_stringl_ex(return_value, SL("lower"), SL("Phalcon\\Filter\\Sanitize\\Lower")); add_assoc_stringl_ex(return_value, SL("lowerfirst"), SL("Phalcon\\Filter\\Sanitize\\LowerFirst")); add_assoc_stringl_ex(return_value, SL("regex"), SL("Phalcon\\Filter\\Sanitize\\Regex")); @@ -88983,6 +89369,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Filter_Validation) zend_declare_property_null(phalcon_filter_validation_ce, SL("data"), ZEND_ACC_PROTECTED); zend_declare_property_null(phalcon_filter_validation_ce, SL("entity"), ZEND_ACC_PROTECTED); zend_declare_property_null(phalcon_filter_validation_ce, SL("filters"), ZEND_ACC_PROTECTED); + zend_declare_property_null(phalcon_filter_validation_ce, SL("whitelist"), ZEND_ACC_PROTECTED); zend_declare_property_null(phalcon_filter_validation_ce, SL("labels"), ZEND_ACC_PROTECTED); zend_declare_property_null(phalcon_filter_validation_ce, SL("messages"), ZEND_ACC_PROTECTED); zend_declare_property_null(phalcon_filter_validation_ce, SL("validators"), ZEND_ACC_PROTECTED); @@ -89066,7 +89453,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, add) zephir_array_fast_append(&_0$$4, validator); zephir_update_property_array_append(this_ptr, SL("combinedFieldsValidators"), &_0$$4); } else { - zephir_is_iterable(field, 0, "phalcon/Filter/Validation.zep", 120); + zephir_is_iterable(field, 0, "phalcon/Filter/Validation.zep", 125); if (Z_TYPE_P(field) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(field), _1$$5) { @@ -89095,7 +89482,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, add) } else if (Z_TYPE_P(field) == IS_STRING) { zephir_update_property_array_multi(this_ptr, SL("validators"), validator, SL("za"), 2, field); } else { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Field must be passed as array of fields or string", "phalcon/Filter/Validation.zep", 126); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Field must be passed as array of fields or string", "phalcon/Filter/Validation.zep", 131); return; } RETURN_THIS(); @@ -89125,7 +89512,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, appendMessage) ZEPHIR_CALL_METHOD(NULL, &messages, "__construct", NULL, 8); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, &messages, "appendmessage", NULL, 289, message); + ZEPHIR_CALL_METHOD(NULL, &messages, "appendmessage", NULL, 291, message); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("messages"), &messages); RETURN_THIS(); @@ -89133,32 +89520,191 @@ static PHP_METHOD(Phalcon_Filter_Validation, appendMessage) static PHP_METHOD(Phalcon_Filter_Validation, bind) { - zend_bool _0; + zend_string *_9; + zend_ulong _8; + zend_bool _0, _1, _10$$8, _19$$14; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zephir_fcall_cache_entry *_12 = NULL, *_18 = NULL, *_21 = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *entity, entity_sub, *data, data_sub; + zval whitelist; + zval *entity, entity_sub, *data, data_sub, *whitelist_param = NULL, container, field, value, fieldFilters, filterService, filters, method, _2, _3, _5, *_6, _7, _4$$7, _13$$8, _14$$8, _15$$8, _16$$8, _17$$8, _11$$10, _22$$14, _23$$14, _24$$14, _25$$14, _26$$14, _20$$16; zval *this_ptr = getThis(); ZVAL_UNDEF(&entity_sub); ZVAL_UNDEF(&data_sub); - ZEND_PARSE_PARAMETERS_START(2, 2) + ZVAL_UNDEF(&container); + ZVAL_UNDEF(&field); + ZVAL_UNDEF(&value); + ZVAL_UNDEF(&fieldFilters); + ZVAL_UNDEF(&filterService); + ZVAL_UNDEF(&filters); + ZVAL_UNDEF(&method); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_3); + ZVAL_UNDEF(&_5); + ZVAL_UNDEF(&_7); + ZVAL_UNDEF(&_4$$7); + ZVAL_UNDEF(&_13$$8); + ZVAL_UNDEF(&_14$$8); + ZVAL_UNDEF(&_15$$8); + ZVAL_UNDEF(&_16$$8); + ZVAL_UNDEF(&_17$$8); + ZVAL_UNDEF(&_11$$10); + ZVAL_UNDEF(&_22$$14); + ZVAL_UNDEF(&_23$$14); + ZVAL_UNDEF(&_24$$14); + ZVAL_UNDEF(&_25$$14); + ZVAL_UNDEF(&_26$$14); + ZVAL_UNDEF(&_20$$16); + ZVAL_UNDEF(&whitelist); + ZEND_PARSE_PARAMETERS_START(2, 3) Z_PARAM_ZVAL(entity) Z_PARAM_ZVAL(data) + Z_PARAM_OPTIONAL + Z_PARAM_ARRAY(whitelist) ZEND_PARSE_PARAMETERS_END(); ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - zephir_fetch_params(1, 2, 0, &entity, &data); + zephir_fetch_params(1, 2, 1, &entity, &data, &whitelist_param); + if (!whitelist_param) { + ZEPHIR_INIT_VAR(&whitelist); + array_init(&whitelist); + } else { + zephir_get_arrval(&whitelist, whitelist_param); + } + zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data); ZEPHIR_CALL_METHOD(NULL, this_ptr, "setentity", NULL, 0, entity); zephir_check_call_status(); _0 = Z_TYPE_P(data) != IS_ARRAY; if (_0) { _0 = Z_TYPE_P(data) != IS_OBJECT; } - if (UNEXPECTED(_0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Data to validate must be an array or object", "phalcon/Filter/Validation.zep", 166); + _1 = _0; + if (!(_1)) { + _1 = (Z_TYPE_P(entity) == IS_NULL); + } + if (UNEXPECTED(_1)) { + RETURN_THIS(); + } + ZEPHIR_CALL_METHOD(&container, this_ptr, "getdi", NULL, 0); + zephir_check_call_status(); + if (Z_TYPE_P(&container) == IS_NULL) { + ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", NULL, 0); + zephir_check_call_status(); + if (Z_TYPE_P(&container) == IS_NULL) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "A dependency injection container is required to access the 'filter' service", "phalcon/Filter/Validation.zep", 194); + return; + } + } + ZEPHIR_INIT_VAR(&_3); + ZVAL_STRING(&_3, "filter"); + ZEPHIR_CALL_METHOD(&_2, &container, "getshared", NULL, 0, &_3); + zephir_check_call_status(); + ZEPHIR_CPY_WRT(&filterService, &_2); + if (UNEXPECTED(Z_TYPE_P(&filterService) != IS_OBJECT)) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Returned 'filter' service is invalid", "phalcon/Filter/Validation.zep", 199); return; } - zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data); + if (ZEPHIR_IS_EMPTY(&whitelist)) { + zephir_read_property(&_4$$7, this_ptr, ZEND_STRL("whitelist"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CPY_WRT(&whitelist, &_4$$7); + } + zephir_read_property(&_5, this_ptr, ZEND_STRL("filters"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CPY_WRT(&filters, &_5); + zephir_is_iterable(data, 0, "phalcon/Filter/Validation.zep", 233); + if (Z_TYPE_P(data) == IS_ARRAY) { + ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(data), _8, _9, _6) + { + ZEPHIR_INIT_NVAR(&field); + if (_9 != NULL) { + ZVAL_STR_COPY(&field, _9); + } else { + ZVAL_LONG(&field, _8); + } + ZEPHIR_INIT_NVAR(&value); + ZVAL_COPY(&value, _6); + _10$$8 = !(ZEPHIR_IS_EMPTY(&whitelist)); + if (_10$$8) { + _10$$8 = !(zephir_fast_in_array(&field, &whitelist)); + } + if (_10$$8) { + continue; + } + ZEPHIR_OBS_NVAR(&fieldFilters); + if (zephir_array_isset_fetch(&fieldFilters, &filters, &field, 0)) { + ZEPHIR_CALL_METHOD(&_11$$10, &filterService, "sanitize", &_12, 0, &value, &fieldFilters); + zephir_check_call_status(); + ZEPHIR_CPY_WRT(&value, &_11$$10); + } + ZEPHIR_INIT_NVAR(&_13$$8); + zephir_camelize(&_13$$8, &field, NULL ); + ZEPHIR_INIT_NVAR(&method); + ZEPHIR_CONCAT_SV(&method, "set", &_13$$8); + zephir_read_property(&_14$$8, this_ptr, ZEND_STRL("entity"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_15$$8, this_ptr, ZEND_STRL("entity"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_16$$8, this_ptr, ZEND_STRL("entity"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_FUNCTION(&_17$$8, "property_exists", &_18, 292, &_16$$8, &field); + zephir_check_call_status(); + if ((zephir_method_exists(&_14$$8, &method) == SUCCESS)) { + ZEPHIR_CALL_METHOD_ZVAL(NULL, entity, &method, NULL, 0, &value); + zephir_check_call_status(); + } else if ((zephir_method_exists_ex(&_15$$8, ZEND_STRL("writeattribute")) == SUCCESS)) { + ZEPHIR_CALL_METHOD(NULL, entity, "writeattribute", NULL, 0, &field, &value); + zephir_check_call_status(); + } else if (zephir_is_true(&_17$$8)) { + zephir_update_property_zval_zval(entity, &field, &value); + } + } ZEND_HASH_FOREACH_END(); + } else { + ZEPHIR_CALL_METHOD(NULL, data, "rewind", NULL, 0); + zephir_check_call_status(); + while (1) { + ZEPHIR_CALL_METHOD(&_7, data, "valid", NULL, 0); + zephir_check_call_status(); + if (!zend_is_true(&_7)) { + break; + } + ZEPHIR_CALL_METHOD(&field, data, "key", NULL, 0); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&value, data, "current", NULL, 0); + zephir_check_call_status(); + _19$$14 = !(ZEPHIR_IS_EMPTY(&whitelist)); + if (_19$$14) { + _19$$14 = !(zephir_fast_in_array(&field, &whitelist)); + } + if (_19$$14) { + continue; + } + ZEPHIR_OBS_NVAR(&fieldFilters); + if (zephir_array_isset_fetch(&fieldFilters, &filters, &field, 0)) { + ZEPHIR_CALL_METHOD(&_20$$16, &filterService, "sanitize", &_21, 0, &value, &fieldFilters); + zephir_check_call_status(); + ZEPHIR_CPY_WRT(&value, &_20$$16); + } + ZEPHIR_INIT_NVAR(&_22$$14); + zephir_camelize(&_22$$14, &field, NULL ); + ZEPHIR_INIT_NVAR(&method); + ZEPHIR_CONCAT_SV(&method, "set", &_22$$14); + zephir_read_property(&_23$$14, this_ptr, ZEND_STRL("entity"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_24$$14, this_ptr, ZEND_STRL("entity"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_25$$14, this_ptr, ZEND_STRL("entity"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_FUNCTION(&_26$$14, "property_exists", &_18, 292, &_25$$14, &field); + zephir_check_call_status(); + if ((zephir_method_exists(&_23$$14, &method) == SUCCESS)) { + ZEPHIR_CALL_METHOD_ZVAL(NULL, entity, &method, NULL, 0, &value); + zephir_check_call_status(); + } else if ((zephir_method_exists_ex(&_24$$14, ZEND_STRL("writeattribute")) == SUCCESS)) { + ZEPHIR_CALL_METHOD(NULL, entity, "writeattribute", NULL, 0, &field, &value); + zephir_check_call_status(); + } else if (zephir_is_true(&_26$$14)) { + zephir_update_property_zval_zval(entity, &field, &value); + } + ZEPHIR_CALL_METHOD(NULL, data, "next", NULL, 0); + zephir_check_call_status(); + } + } + ZEPHIR_INIT_NVAR(&value); + ZEPHIR_INIT_NVAR(&field); RETURN_THIS(); } @@ -89325,7 +89871,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, getValueByData) } if (Z_TYPE_P(data) == IS_ARRAY) { if (zephir_array_isset(data, &field)) { - zephir_array_fetch(&_1$$5, data, &field, PH_NOISY | PH_READONLY, "phalcon/Filter/Validation.zep", 296); + zephir_array_fetch(&_1$$5, data, &field, PH_NOISY | PH_READONLY, "phalcon/Filter/Validation.zep", 358); RETURN_CTOR(&_1$$5); } } @@ -89388,7 +89934,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, getValue) _1$$5 = Z_TYPE_P(&data) != IS_OBJECT; } if (UNEXPECTED(_1$$5)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "There is no data to validate", "phalcon/Filter/Validation.zep", 333); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "There is no data to validate", "phalcon/Filter/Validation.zep", 395); return; } ZEPHIR_CALL_METHOD(&value, this_ptr, "getvaluebydata", NULL, 0, &data, &field); @@ -89408,7 +89954,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, getValue) ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&container) == IS_NULL) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "A dependency injection container is required to access the 'filter' service", "phalcon/Filter/Validation.zep", 354); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "A dependency injection container is required to access the 'filter' service", "phalcon/Filter/Validation.zep", 416); return; } } @@ -89418,7 +89964,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, getValue) zephir_check_call_status(); ZEPHIR_CPY_WRT(&filterService, &_2$$9); if (UNEXPECTED(Z_TYPE_P(&filterService) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Returned 'filter' service is invalid", "phalcon/Filter/Validation.zep", 361); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Returned 'filter' service is invalid", "phalcon/Filter/Validation.zep", 423); return; } ZEPHIR_CALL_METHOD(&_2$$9, &filterService, "sanitize", NULL, 0, &value, &fieldFilters); @@ -89433,7 +89979,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, getValue) zephir_camelize(&_5$$13, &field, NULL ); ZEPHIR_INIT_VAR(&method); ZEPHIR_CONCAT_SV(&method, "set", &_5$$13); - ZEPHIR_CALL_FUNCTION(&_6$$13, "property_exists", NULL, 290, &entity, &field); + ZEPHIR_CALL_FUNCTION(&_6$$13, "property_exists", NULL, 292, &entity, &field); zephir_check_call_status(); if ((zephir_method_exists(&entity, &method) == SUCCESS)) { ZEPHIR_CALL_METHOD_ZVAL(NULL, &entity, &method, NULL, 0, &value); @@ -89496,7 +90042,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, rules) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 2, 0, &field, &validators_param); ZEPHIR_OBS_COPY_OR_DUP(&validators, validators_param); - zephir_is_iterable(&validators, 0, "phalcon/Filter/Validation.zep", 419); + zephir_is_iterable(&validators, 0, "phalcon/Filter/Validation.zep", 481); if (Z_TYPE_P(&validators) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&validators), _0) { @@ -89541,7 +90087,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, setEntity) ZEND_PARSE_PARAMETERS_END(); zephir_fetch_params_without_memory_grow(1, 0, &entity); if (UNEXPECTED(Z_TYPE_P(entity) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_filter_validation_exception_ce, "Entity must be an object", "phalcon/Filter/Validation.zep", 430); + ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_filter_validation_exception_ce, "Entity must be an object", "phalcon/Filter/Validation.zep", 492); return; } zephir_update_property_zval(this_ptr, ZEND_STRL("entity"), entity); @@ -89566,7 +90112,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, setFilters) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 2, 0, &field, &filters); if (Z_TYPE_P(field) == IS_ARRAY) { - zephir_is_iterable(field, 0, "phalcon/Filter/Validation.zep", 450); + zephir_is_iterable(field, 0, "phalcon/Filter/Validation.zep", 512); if (Z_TYPE_P(field) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(field), _0$$3) { @@ -89594,7 +90140,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, setFilters) } else if (Z_TYPE_P(field) == IS_STRING) { zephir_update_property_array(this_ptr, SL("filters"), field, filters); } else { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Field must be passed as array of fields or string.", "phalcon/Filter/Validation.zep", 455); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Field must be passed as array of fields or string.", "phalcon/Filter/Validation.zep", 517); return; } RETURN_THIS(); @@ -89640,13 +90186,14 @@ static PHP_METHOD(Phalcon_Filter_Validation, setValidators) static PHP_METHOD(Phalcon_Filter_Validation, validate) { - zend_bool _4$$7; - zend_string *_8; - zend_ulong _7; + zend_bool _3$$4; + zend_string *_9; + zend_ulong _8; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zephir_fcall_cache_entry *_12 = NULL; + zephir_fcall_cache_entry *_13 = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *data = NULL, data_sub, *entity = NULL, entity_sub, __$null, combinedFieldsValidators, field, scope, status, validator, validatorData, validators, _0, _1, _2, *_5, _6, *_30, _31, _3$$5, *_9$$9, _10$$9, _11$$10, _13$$10, _14$$13, _15$$13, _16$$15, _17$$15, _18$$18, _19$$18, *_20$$20, _21$$20, _22$$21, _23$$21, _24$$24, _25$$24, _26$$26, _27$$26, _28$$29, _29$$29, _32$$31, _33$$31, _34$$35, _35$$35, _36$$37, _37$$37, _38$$41, _39$$41, _40$$43; + zval whitelist; + zval *data = NULL, data_sub, *entity = NULL, entity_sub, *whitelist_param = NULL, __$null, combinedFieldsValidators, field, scope, status, validator, validatorData, validators, inputData, _0, _1, _2, *_6, _7, *_31, _32, _4$$8, _5$$8, *_10$$10, _11$$10, _12$$11, _14$$11, _15$$14, _16$$14, _17$$16, _18$$16, _19$$19, _20$$19, *_21$$21, _22$$21, _23$$22, _24$$22, _25$$25, _26$$25, _27$$27, _28$$27, _29$$30, _30$$30, _33$$32, _34$$32, _35$$36, _36$$36, _37$$38, _38$$38, _39$$42, _40$$42, _41$$44, _42$$44; zval *this_ptr = getThis(); ZVAL_UNDEF(&data_sub); @@ -89659,48 +90206,53 @@ static PHP_METHOD(Phalcon_Filter_Validation, validate) ZVAL_UNDEF(&validator); ZVAL_UNDEF(&validatorData); ZVAL_UNDEF(&validators); + ZVAL_UNDEF(&inputData); ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1); ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_6); - ZVAL_UNDEF(&_31); - ZVAL_UNDEF(&_3$$5); - ZVAL_UNDEF(&_10$$9); + ZVAL_UNDEF(&_7); + ZVAL_UNDEF(&_32); + ZVAL_UNDEF(&_4$$8); + ZVAL_UNDEF(&_5$$8); ZVAL_UNDEF(&_11$$10); - ZVAL_UNDEF(&_13$$10); - ZVAL_UNDEF(&_14$$13); - ZVAL_UNDEF(&_15$$13); - ZVAL_UNDEF(&_16$$15); - ZVAL_UNDEF(&_17$$15); - ZVAL_UNDEF(&_18$$18); - ZVAL_UNDEF(&_19$$18); - ZVAL_UNDEF(&_21$$20); + ZVAL_UNDEF(&_12$$11); + ZVAL_UNDEF(&_14$$11); + ZVAL_UNDEF(&_15$$14); + ZVAL_UNDEF(&_16$$14); + ZVAL_UNDEF(&_17$$16); + ZVAL_UNDEF(&_18$$16); + ZVAL_UNDEF(&_19$$19); + ZVAL_UNDEF(&_20$$19); ZVAL_UNDEF(&_22$$21); - ZVAL_UNDEF(&_23$$21); - ZVAL_UNDEF(&_24$$24); - ZVAL_UNDEF(&_25$$24); - ZVAL_UNDEF(&_26$$26); - ZVAL_UNDEF(&_27$$26); - ZVAL_UNDEF(&_28$$29); - ZVAL_UNDEF(&_29$$29); - ZVAL_UNDEF(&_32$$31); - ZVAL_UNDEF(&_33$$31); - ZVAL_UNDEF(&_34$$35); - ZVAL_UNDEF(&_35$$35); - ZVAL_UNDEF(&_36$$37); - ZVAL_UNDEF(&_37$$37); - ZVAL_UNDEF(&_38$$41); - ZVAL_UNDEF(&_39$$41); - ZVAL_UNDEF(&_40$$43); + ZVAL_UNDEF(&_23$$22); + ZVAL_UNDEF(&_24$$22); + ZVAL_UNDEF(&_25$$25); + ZVAL_UNDEF(&_26$$25); + ZVAL_UNDEF(&_27$$27); + ZVAL_UNDEF(&_28$$27); + ZVAL_UNDEF(&_29$$30); + ZVAL_UNDEF(&_30$$30); + ZVAL_UNDEF(&_33$$32); + ZVAL_UNDEF(&_34$$32); + ZVAL_UNDEF(&_35$$36); + ZVAL_UNDEF(&_36$$36); + ZVAL_UNDEF(&_37$$38); + ZVAL_UNDEF(&_38$$38); + ZVAL_UNDEF(&_39$$42); + ZVAL_UNDEF(&_40$$42); + ZVAL_UNDEF(&_41$$44); + ZVAL_UNDEF(&_42$$44); + ZVAL_UNDEF(&whitelist); bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(0, 2) + ZEND_PARSE_PARAMETERS_START(0, 3) Z_PARAM_OPTIONAL Z_PARAM_ZVAL_OR_NULL(data) Z_PARAM_ZVAL_OR_NULL(entity) + Z_PARAM_ARRAY(whitelist) ZEND_PARSE_PARAMETERS_END(); ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - zephir_fetch_params(1, 0, 2, &data, &entity); + zephir_fetch_params(1, 0, 3, &data, &entity, &whitelist_param); if (!data) { data = &data_sub; data = &__$null; @@ -89709,12 +90261,20 @@ static PHP_METHOD(Phalcon_Filter_Validation, validate) entity = &entity_sub; entity = &__$null; } + if (!whitelist_param) { + ZEPHIR_INIT_VAR(&whitelist); + array_init(&whitelist); + } else { + zephir_get_arrval(&whitelist, whitelist_param); + } + ZEPHIR_INIT_VAR(&inputData); + ZVAL_NULL(&inputData); zephir_memory_observe(&validatorData); zephir_read_property(&validatorData, this_ptr, ZEND_STRL("validators"), PH_NOISY_CC); zephir_read_property(&_0, this_ptr, ZEND_STRL("combinedFieldsValidators"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&combinedFieldsValidators, &_0); if (UNEXPECTED(Z_TYPE_P(&validatorData) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "There are no validators to validate", "phalcon/Filter/Validation.zep", 493); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "There are no validators to validate", "phalcon/Filter/Validation.zep", 572); return; } ZEPHIR_INIT_VAR(&_1); @@ -89725,64 +90285,70 @@ static PHP_METHOD(Phalcon_Filter_Validation, validate) ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 8); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("messages"), &_2); + zephir_read_property(&_0, this_ptr, ZEND_STRL("data"), PH_NOISY_CC | PH_READONLY); + if (Z_TYPE_P(data) != IS_NULL) { + _3$$4 = Z_TYPE_P(data) != IS_ARRAY; + if (_3$$4) { + _3$$4 = Z_TYPE_P(data) != IS_OBJECT; + } + if (UNEXPECTED(_3$$4)) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Invalid data to validate", "phalcon/Filter/Validation.zep", 587); + return; + } + zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data); + ZEPHIR_CPY_WRT(&inputData, data); + } else if (!(ZEPHIR_IS_EMPTY(&_0))) { + ZEPHIR_OBS_NVAR(&inputData); + zephir_read_property(&inputData, this_ptr, ZEND_STRL("data"), PH_NOISY_CC); + } if (Z_TYPE_P(entity) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, this_ptr, "setentity", NULL, 0, entity); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "bind", NULL, 0, entity, &inputData, &whitelist); zephir_check_call_status(); } if ((zephir_method_exists_ex(this_ptr, ZEND_STRL("beforevalidation")) == SUCCESS)) { - zephir_read_property(&_3$$5, this_ptr, ZEND_STRL("messages"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&status, this_ptr, "beforevalidation", NULL, 0, data, entity, &_3$$5); + zephir_read_property(&_4$$8, this_ptr, ZEND_STRL("entity"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_5$$8, this_ptr, ZEND_STRL("messages"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(&status, this_ptr, "beforevalidation", NULL, 0, &inputData, &_4$$8, &_5$$8); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&status)) { RETURN_CCTOR(&status); } } - if (Z_TYPE_P(data) != IS_NULL) { - _4$$7 = Z_TYPE_P(data) != IS_ARRAY; - if (_4$$7) { - _4$$7 = Z_TYPE_P(data) != IS_OBJECT; - } - if (UNEXPECTED(_4$$7)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Invalid data to validate", "phalcon/Filter/Validation.zep", 523); - return; - } - zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data); - } - zephir_is_iterable(&validatorData, 0, "phalcon/Filter/Validation.zep", 554); + zephir_is_iterable(&validatorData, 0, "phalcon/Filter/Validation.zep", 637); if (Z_TYPE_P(&validatorData) == IS_ARRAY) { - ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&validatorData), _7, _8, _5) + ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&validatorData), _8, _9, _6) { ZEPHIR_INIT_NVAR(&field); - if (_8 != NULL) { - ZVAL_STR_COPY(&field, _8); + if (_9 != NULL) { + ZVAL_STR_COPY(&field, _9); } else { - ZVAL_LONG(&field, _7); + ZVAL_LONG(&field, _8); } ZEPHIR_INIT_NVAR(&validators); - ZVAL_COPY(&validators, _5); - zephir_is_iterable(&validators, 0, "phalcon/Filter/Validation.zep", 552); + ZVAL_COPY(&validators, _6); + zephir_is_iterable(&validators, 0, "phalcon/Filter/Validation.zep", 635); if (Z_TYPE_P(&validators) == IS_ARRAY) { - ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&validators), _9$$9) + ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&validators), _10$$10) { ZEPHIR_INIT_NVAR(&validator); - ZVAL_COPY(&validator, _9$$9); + ZVAL_COPY(&validator, _10$$10); if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 532); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 615); return; } - ZEPHIR_CALL_METHOD(&_11$$10, this_ptr, "prechecking", &_12, 0, &field, &validator); + ZEPHIR_CALL_METHOD(&_12$$11, this_ptr, "prechecking", &_13, 0, &field, &validator); zephir_check_call_status(); - if (zephir_is_true(&_11$$10)) { + if (zephir_is_true(&_12$$11)) { continue; } - ZEPHIR_CALL_METHOD(&_13$$10, &validator, "validate", NULL, 0, this_ptr, &field); + ZEPHIR_CALL_METHOD(&_14$$11, &validator, "validate", NULL, 0, this_ptr, &field); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(&_13$$10)) { - ZEPHIR_INIT_NVAR(&_15$$13); - ZVAL_STRING(&_15$$13, "cancelOnFail"); - ZEPHIR_CALL_METHOD(&_14$$13, &validator, "getoption", NULL, 0, &_15$$13); + if (ZEPHIR_IS_FALSE_IDENTICAL(&_14$$11)) { + ZEPHIR_INIT_NVAR(&_16$$14); + ZVAL_STRING(&_16$$14, "cancelOnFail"); + ZEPHIR_CALL_METHOD(&_15$$14, &validator, "getoption", NULL, 0, &_16$$14); zephir_check_call_status(); - if (zephir_is_true(&_14$$13)) { + if (zephir_is_true(&_15$$14)) { break; } } @@ -89791,30 +90357,30 @@ static PHP_METHOD(Phalcon_Filter_Validation, validate) ZEPHIR_CALL_METHOD(NULL, &validators, "rewind", NULL, 0); zephir_check_call_status(); while (1) { - ZEPHIR_CALL_METHOD(&_10$$9, &validators, "valid", NULL, 0); + ZEPHIR_CALL_METHOD(&_11$$10, &validators, "valid", NULL, 0); zephir_check_call_status(); - if (!zend_is_true(&_10$$9)) { + if (!zend_is_true(&_11$$10)) { break; } ZEPHIR_CALL_METHOD(&validator, &validators, "current", NULL, 0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 532); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 615); return; } - ZEPHIR_CALL_METHOD(&_16$$15, this_ptr, "prechecking", &_12, 0, &field, &validator); + ZEPHIR_CALL_METHOD(&_17$$16, this_ptr, "prechecking", &_13, 0, &field, &validator); zephir_check_call_status(); - if (zephir_is_true(&_16$$15)) { + if (zephir_is_true(&_17$$16)) { continue; } - ZEPHIR_CALL_METHOD(&_17$$15, &validator, "validate", NULL, 0, this_ptr, &field); + ZEPHIR_CALL_METHOD(&_18$$16, &validator, "validate", NULL, 0, this_ptr, &field); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(&_17$$15)) { - ZEPHIR_INIT_NVAR(&_19$$18); - ZVAL_STRING(&_19$$18, "cancelOnFail"); - ZEPHIR_CALL_METHOD(&_18$$18, &validator, "getoption", NULL, 0, &_19$$18); + if (ZEPHIR_IS_FALSE_IDENTICAL(&_18$$16)) { + ZEPHIR_INIT_NVAR(&_20$$19); + ZVAL_STRING(&_20$$19, "cancelOnFail"); + ZEPHIR_CALL_METHOD(&_19$$19, &validator, "getoption", NULL, 0, &_20$$19); zephir_check_call_status(); - if (zephir_is_true(&_18$$18)) { + if (zephir_is_true(&_19$$19)) { break; } } @@ -89828,38 +90394,38 @@ static PHP_METHOD(Phalcon_Filter_Validation, validate) ZEPHIR_CALL_METHOD(NULL, &validatorData, "rewind", NULL, 0); zephir_check_call_status(); while (1) { - ZEPHIR_CALL_METHOD(&_6, &validatorData, "valid", NULL, 0); + ZEPHIR_CALL_METHOD(&_7, &validatorData, "valid", NULL, 0); zephir_check_call_status(); - if (!zend_is_true(&_6)) { + if (!zend_is_true(&_7)) { break; } ZEPHIR_CALL_METHOD(&field, &validatorData, "key", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&validators, &validatorData, "current", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&validators, 0, "phalcon/Filter/Validation.zep", 552); + zephir_is_iterable(&validators, 0, "phalcon/Filter/Validation.zep", 635); if (Z_TYPE_P(&validators) == IS_ARRAY) { - ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&validators), _20$$20) + ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&validators), _21$$21) { ZEPHIR_INIT_NVAR(&validator); - ZVAL_COPY(&validator, _20$$20); + ZVAL_COPY(&validator, _21$$21); if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 532); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 615); return; } - ZEPHIR_CALL_METHOD(&_22$$21, this_ptr, "prechecking", &_12, 0, &field, &validator); + ZEPHIR_CALL_METHOD(&_23$$22, this_ptr, "prechecking", &_13, 0, &field, &validator); zephir_check_call_status(); - if (zephir_is_true(&_22$$21)) { + if (zephir_is_true(&_23$$22)) { continue; } - ZEPHIR_CALL_METHOD(&_23$$21, &validator, "validate", NULL, 0, this_ptr, &field); + ZEPHIR_CALL_METHOD(&_24$$22, &validator, "validate", NULL, 0, this_ptr, &field); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(&_23$$21)) { - ZEPHIR_INIT_NVAR(&_25$$24); - ZVAL_STRING(&_25$$24, "cancelOnFail"); - ZEPHIR_CALL_METHOD(&_24$$24, &validator, "getoption", NULL, 0, &_25$$24); + if (ZEPHIR_IS_FALSE_IDENTICAL(&_24$$22)) { + ZEPHIR_INIT_NVAR(&_26$$25); + ZVAL_STRING(&_26$$25, "cancelOnFail"); + ZEPHIR_CALL_METHOD(&_25$$25, &validator, "getoption", NULL, 0, &_26$$25); zephir_check_call_status(); - if (zephir_is_true(&_24$$24)) { + if (zephir_is_true(&_25$$25)) { break; } } @@ -89868,30 +90434,30 @@ static PHP_METHOD(Phalcon_Filter_Validation, validate) ZEPHIR_CALL_METHOD(NULL, &validators, "rewind", NULL, 0); zephir_check_call_status(); while (1) { - ZEPHIR_CALL_METHOD(&_21$$20, &validators, "valid", NULL, 0); + ZEPHIR_CALL_METHOD(&_22$$21, &validators, "valid", NULL, 0); zephir_check_call_status(); - if (!zend_is_true(&_21$$20)) { + if (!zend_is_true(&_22$$21)) { break; } ZEPHIR_CALL_METHOD(&validator, &validators, "current", NULL, 0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 532); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 615); return; } - ZEPHIR_CALL_METHOD(&_26$$26, this_ptr, "prechecking", &_12, 0, &field, &validator); + ZEPHIR_CALL_METHOD(&_27$$27, this_ptr, "prechecking", &_13, 0, &field, &validator); zephir_check_call_status(); - if (zephir_is_true(&_26$$26)) { + if (zephir_is_true(&_27$$27)) { continue; } - ZEPHIR_CALL_METHOD(&_27$$26, &validator, "validate", NULL, 0, this_ptr, &field); + ZEPHIR_CALL_METHOD(&_28$$27, &validator, "validate", NULL, 0, this_ptr, &field); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(&_27$$26)) { - ZEPHIR_INIT_NVAR(&_29$$29); - ZVAL_STRING(&_29$$29, "cancelOnFail"); - ZEPHIR_CALL_METHOD(&_28$$29, &validator, "getoption", NULL, 0, &_29$$29); + if (ZEPHIR_IS_FALSE_IDENTICAL(&_28$$27)) { + ZEPHIR_INIT_NVAR(&_30$$30); + ZVAL_STRING(&_30$$30, "cancelOnFail"); + ZEPHIR_CALL_METHOD(&_29$$30, &validator, "getoption", NULL, 0, &_30$$30); zephir_check_call_status(); - if (zephir_is_true(&_28$$29)) { + if (zephir_is_true(&_29$$30)) { break; } } @@ -89906,37 +90472,37 @@ static PHP_METHOD(Phalcon_Filter_Validation, validate) } ZEPHIR_INIT_NVAR(&validators); ZEPHIR_INIT_NVAR(&field); - zephir_is_iterable(&combinedFieldsValidators, 0, "phalcon/Filter/Validation.zep", 587); + zephir_is_iterable(&combinedFieldsValidators, 0, "phalcon/Filter/Validation.zep", 670); if (Z_TYPE_P(&combinedFieldsValidators) == IS_ARRAY) { - ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&combinedFieldsValidators), _30) + ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&combinedFieldsValidators), _31) { ZEPHIR_INIT_NVAR(&scope); - ZVAL_COPY(&scope, _30); + ZVAL_COPY(&scope, _31); if (UNEXPECTED(Z_TYPE_P(&scope) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "The validator scope is not valid", "phalcon/Filter/Validation.zep", 556); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "The validator scope is not valid", "phalcon/Filter/Validation.zep", 639); return; } ZEPHIR_OBS_NVAR(&field); - zephir_array_fetch_long(&field, &scope, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 559); + zephir_array_fetch_long(&field, &scope, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 642); ZEPHIR_OBS_NVAR(&validator); - zephir_array_fetch_long(&validator, &scope, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 560); + zephir_array_fetch_long(&validator, &scope, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 643); if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 563); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 646); return; } - ZEPHIR_CALL_METHOD(&_32$$31, this_ptr, "prechecking", &_12, 0, &field, &validator); + ZEPHIR_CALL_METHOD(&_33$$32, this_ptr, "prechecking", &_13, 0, &field, &validator); zephir_check_call_status(); - if (zephir_is_true(&_32$$31)) { + if (zephir_is_true(&_33$$32)) { continue; } - ZEPHIR_CALL_METHOD(&_33$$31, &validator, "validate", NULL, 0, this_ptr, &field); + ZEPHIR_CALL_METHOD(&_34$$32, &validator, "validate", NULL, 0, this_ptr, &field); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(&_33$$31)) { - ZEPHIR_INIT_NVAR(&_35$$35); - ZVAL_STRING(&_35$$35, "cancelOnFail"); - ZEPHIR_CALL_METHOD(&_34$$35, &validator, "getoption", NULL, 0, &_35$$35); + if (ZEPHIR_IS_FALSE_IDENTICAL(&_34$$32)) { + ZEPHIR_INIT_NVAR(&_36$$36); + ZVAL_STRING(&_36$$36, "cancelOnFail"); + ZEPHIR_CALL_METHOD(&_35$$36, &validator, "getoption", NULL, 0, &_36$$36); zephir_check_call_status(); - if (zephir_is_true(&_34$$35)) { + if (zephir_is_true(&_35$$36)) { break; } } @@ -89945,38 +90511,38 @@ static PHP_METHOD(Phalcon_Filter_Validation, validate) ZEPHIR_CALL_METHOD(NULL, &combinedFieldsValidators, "rewind", NULL, 0); zephir_check_call_status(); while (1) { - ZEPHIR_CALL_METHOD(&_31, &combinedFieldsValidators, "valid", NULL, 0); + ZEPHIR_CALL_METHOD(&_32, &combinedFieldsValidators, "valid", NULL, 0); zephir_check_call_status(); - if (!zend_is_true(&_31)) { + if (!zend_is_true(&_32)) { break; } ZEPHIR_CALL_METHOD(&scope, &combinedFieldsValidators, "current", NULL, 0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&scope) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "The validator scope is not valid", "phalcon/Filter/Validation.zep", 556); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "The validator scope is not valid", "phalcon/Filter/Validation.zep", 639); return; } ZEPHIR_OBS_NVAR(&field); - zephir_array_fetch_long(&field, &scope, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 559); + zephir_array_fetch_long(&field, &scope, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 642); ZEPHIR_OBS_NVAR(&validator); - zephir_array_fetch_long(&validator, &scope, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 560); + zephir_array_fetch_long(&validator, &scope, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 643); if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 563); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 646); return; } - ZEPHIR_CALL_METHOD(&_36$$37, this_ptr, "prechecking", &_12, 0, &field, &validator); + ZEPHIR_CALL_METHOD(&_37$$38, this_ptr, "prechecking", &_13, 0, &field, &validator); zephir_check_call_status(); - if (zephir_is_true(&_36$$37)) { + if (zephir_is_true(&_37$$38)) { continue; } - ZEPHIR_CALL_METHOD(&_37$$37, &validator, "validate", NULL, 0, this_ptr, &field); + ZEPHIR_CALL_METHOD(&_38$$38, &validator, "validate", NULL, 0, this_ptr, &field); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(&_37$$37)) { - ZEPHIR_INIT_NVAR(&_39$$41); - ZVAL_STRING(&_39$$41, "cancelOnFail"); - ZEPHIR_CALL_METHOD(&_38$$41, &validator, "getoption", NULL, 0, &_39$$41); + if (ZEPHIR_IS_FALSE_IDENTICAL(&_38$$38)) { + ZEPHIR_INIT_NVAR(&_40$$42); + ZVAL_STRING(&_40$$42, "cancelOnFail"); + ZEPHIR_CALL_METHOD(&_39$$42, &validator, "getoption", NULL, 0, &_40$$42); zephir_check_call_status(); - if (zephir_is_true(&_38$$41)) { + if (zephir_is_true(&_39$$42)) { break; } } @@ -89986,13 +90552,42 @@ static PHP_METHOD(Phalcon_Filter_Validation, validate) } ZEPHIR_INIT_NVAR(&scope); if ((zephir_method_exists_ex(this_ptr, ZEND_STRL("aftervalidation")) == SUCCESS)) { - zephir_read_property(&_40$$43, this_ptr, ZEND_STRL("messages"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "aftervalidation", NULL, 0, data, entity, &_40$$43); + zephir_read_property(&_41$$44, this_ptr, ZEND_STRL("entity"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_42$$44, this_ptr, ZEND_STRL("messages"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "aftervalidation", NULL, 0, &inputData, &_41$$44, &_42$$44); zephir_check_call_status(); } RETURN_MM_MEMBER(getThis(), "messages"); } +static PHP_METHOD(Phalcon_Filter_Validation, fails) +{ + zend_bool _1; + zval _0, _2, _3; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_3); + ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); + zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); + + zephir_read_property(&_0, this_ptr, ZEND_STRL("messages"), PH_NOISY_CC | PH_READONLY); + _1 = !(Z_TYPE_P(&_0) == IS_NULL); + if (_1) { + zephir_read_property(&_2, this_ptr, ZEND_STRL("messages"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(&_3, &_2, "count", NULL, 0); + zephir_check_call_status(); + _1 = ZEPHIR_GT_LONG(&_3, 0); + } + if (UNEXPECTED(_1)) { + RETURN_MM_BOOL(1); + } + RETURN_MM_BOOL(0); +} + static PHP_METHOD(Phalcon_Filter_Validation, preChecking) { zval results; @@ -90026,15 +90621,15 @@ static PHP_METHOD(Phalcon_Filter_Validation, preChecking) ZEPHIR_INIT_VAR(&results); array_init(&results); if (Z_TYPE_P(field) == IS_ARRAY) { - zephir_is_iterable(field, 0, "phalcon/Filter/Validation.zep", 615); + zephir_is_iterable(field, 0, "phalcon/Filter/Validation.zep", 710); if (Z_TYPE_P(field) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(field), _0$$3) { ZEPHIR_INIT_NVAR(&singleField); ZVAL_COPY(&singleField, _0$$3); - ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "prechecking", &_3, 291, &singleField, validator); + ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "prechecking", &_3, 293, &singleField, validator); zephir_check_call_status(); - zephir_array_append(&results, &_2$$4, PH_SEPARATE, "phalcon/Filter/Validation.zep", 607); + zephir_array_append(&results, &_2$$4, PH_SEPARATE, "phalcon/Filter/Validation.zep", 702); if (zephir_fast_in_array(&__$false, &results)) { RETURN_MM_BOOL(0); } @@ -90051,9 +90646,9 @@ static PHP_METHOD(Phalcon_Filter_Validation, preChecking) } ZEPHIR_CALL_METHOD(&singleField, field, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "prechecking", &_3, 291, &singleField, validator); + ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "prechecking", &_3, 293, &singleField, validator); zephir_check_call_status(); - zephir_array_append(&results, &_4$$6, PH_SEPARATE, "phalcon/Filter/Validation.zep", 607); + zephir_array_append(&results, &_4$$6, PH_SEPARATE, "phalcon/Filter/Validation.zep", 702); if (zephir_fast_in_array(&__$false, &results)) { RETURN_MM_BOOL(0); } @@ -90078,7 +90673,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, preChecking) ZEPHIR_CALL_METHOD(&value, this_ptr, "getvalue", NULL, 0, field); zephir_check_call_status(); if (Z_TYPE_P(&allowEmpty) == IS_ARRAY) { - zephir_is_iterable(&allowEmpty, 0, "phalcon/Filter/Validation.zep", 632); + zephir_is_iterable(&allowEmpty, 0, "phalcon/Filter/Validation.zep", 727); if (Z_TYPE_P(&allowEmpty) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&allowEmpty), _7$$11) { @@ -90117,18 +90712,20 @@ static PHP_METHOD(Phalcon_Filter_Validation, preChecking) zend_object *zephir_init_properties_Phalcon_Filter_Validation(zend_class_entry *class_type) { - zval _0, _2, _4, _6, _8, _1$$3, _3$$4, _5$$5, _7$$6, _9$$7; + zval _0, _2, _4, _6, _8, _10, _1$$3, _3$$4, _5$$5, _7$$6, _9$$7, _11$$8; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_2); ZVAL_UNDEF(&_4); ZVAL_UNDEF(&_6); ZVAL_UNDEF(&_8); + ZVAL_UNDEF(&_10); ZVAL_UNDEF(&_1$$3); ZVAL_UNDEF(&_3$$4); ZVAL_UNDEF(&_5$$5); ZVAL_UNDEF(&_7$$6); ZVAL_UNDEF(&_9$$7); + ZVAL_UNDEF(&_11$$8); ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); @@ -90155,17 +90752,23 @@ zend_object *zephir_init_properties_Phalcon_Filter_Validation(zend_class_entry * array_init(&_5$$5); zephir_update_property_zval_ex(this_ptr, ZEND_STRL("labels"), &_5$$5); } - zephir_read_property_ex(&_6, this_ptr, ZEND_STRL("filters"), PH_NOISY_CC | PH_READONLY); + zephir_read_property_ex(&_6, this_ptr, ZEND_STRL("whitelist"), PH_NOISY_CC | PH_READONLY); if (Z_TYPE_P(&_6) == IS_NULL) { ZEPHIR_INIT_VAR(&_7$$6); array_init(&_7$$6); - zephir_update_property_zval_ex(this_ptr, ZEND_STRL("filters"), &_7$$6); + zephir_update_property_zval_ex(this_ptr, ZEND_STRL("whitelist"), &_7$$6); } - zephir_read_property_ex(&_8, this_ptr, ZEND_STRL("combinedFieldsValidators"), PH_NOISY_CC | PH_READONLY); + zephir_read_property_ex(&_8, this_ptr, ZEND_STRL("filters"), PH_NOISY_CC | PH_READONLY); if (Z_TYPE_P(&_8) == IS_NULL) { ZEPHIR_INIT_VAR(&_9$$7); array_init(&_9$$7); - zephir_update_property_zval_ex(this_ptr, ZEND_STRL("combinedFieldsValidators"), &_9$$7); + zephir_update_property_zval_ex(this_ptr, ZEND_STRL("filters"), &_9$$7); + } + zephir_read_property_ex(&_10, this_ptr, ZEND_STRL("combinedFieldsValidators"), PH_NOISY_CC | PH_READONLY); + if (Z_TYPE_P(&_10) == IS_NULL) { + ZEPHIR_INIT_VAR(&_11$$8); + array_init(&_11$$8); + zephir_update_property_zval_ex(this_ptr, ZEND_STRL("combinedFieldsValidators"), &_11$$8); } ZEPHIR_MM_RESTORE(); return Z_OBJ_P(this_ptr); @@ -90205,10 +90808,10 @@ static PHP_METHOD(Phalcon_Filter_Sanitize_AbsInt, __invoke) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &input); ZVAL_LONG(&_0, 519); - ZEPHIR_CALL_FUNCTION(&_1, "filter_var", NULL, 283, input, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "filter_var", NULL, 284, input, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, zephir_get_intval(&_1)); - ZEPHIR_RETURN_CALL_FUNCTION("abs", NULL, 284, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("abs", NULL, 285, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -90437,7 +91040,7 @@ static PHP_METHOD(Phalcon_Filter_Sanitize_Email, __invoke) zephir_fetch_params(1, 1, 0, &input); ZVAL_LONG(&_0, 517); ZVAL_LONG(&_1, 1048576); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 283, input, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 284, input, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -90480,7 +91083,7 @@ static PHP_METHOD(Phalcon_Filter_Sanitize_FloatVal, __invoke) zephir_create_array(&_0, 1, 0); add_assoc_long_ex(&_0, SL("flags"), 4096); ZVAL_LONG(&_1, 520); - ZEPHIR_CALL_FUNCTION(&_2, "filter_var", NULL, 283, input, &_1, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "filter_var", NULL, 284, input, &_1, &_0); zephir_check_call_status(); RETURN_MM_DOUBLE(zephir_get_doubleval(&_2)); } @@ -90518,7 +91121,7 @@ static PHP_METHOD(Phalcon_Filter_Sanitize_IntVal, __invoke) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &input); ZVAL_LONG(&_0, 519); - ZEPHIR_CALL_FUNCTION(&_1, "filter_var", NULL, 283, input, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "filter_var", NULL, 284, input, &_0); zephir_check_call_status(); RETURN_MM_LONG(zephir_get_intval(&_1)); } @@ -90533,6 +91136,175 @@ static PHP_METHOD(Phalcon_Filter_Sanitize_IntVal, __invoke) +ZEPHIR_INIT_CLASS(Phalcon_Filter_Sanitize_Ip) +{ + ZEPHIR_REGISTER_CLASS(Phalcon\\Filter\\Sanitize, Ip, phalcon, filter_sanitize_ip, phalcon_filter_sanitize_ip_method_entry, 0); + + return SUCCESS; +} + +static PHP_METHOD(Phalcon_Filter_Sanitize_Ip, __invoke) +{ + zend_bool _2$$6, _3$$6, _6$$9, _7$$9; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long filter, ZEPHIR_LAST_CALL_STATUS; + zval *input_param = NULL, *filter_param = NULL, parts, ip, mask, protocol, filtered, _0$$5, _1$$5, _4$$8, _5$$8, _8$$12, _9$$12, _10$$13, _11$$13; + zval input; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&input); + ZVAL_UNDEF(&parts); + ZVAL_UNDEF(&ip); + ZVAL_UNDEF(&mask); + ZVAL_UNDEF(&protocol); + ZVAL_UNDEF(&filtered); + ZVAL_UNDEF(&_0$$5); + ZVAL_UNDEF(&_1$$5); + ZVAL_UNDEF(&_4$$8); + ZVAL_UNDEF(&_5$$8); + ZVAL_UNDEF(&_8$$12); + ZVAL_UNDEF(&_9$$12); + ZVAL_UNDEF(&_10$$13); + ZVAL_UNDEF(&_11$$13); + ZEND_PARSE_PARAMETERS_START(1, 2) + Z_PARAM_STR(input) + Z_PARAM_OPTIONAL + Z_PARAM_LONG(filter) + ZEND_PARSE_PARAMETERS_END(); + ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); + zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); + zephir_fetch_params(1, 1, 1, &input_param, &filter_param); + zephir_get_strval(&input, input_param); + if (!filter_param) { + filter = 0; + } else { + } + ZEPHIR_CALL_METHOD(&protocol, this_ptr, "getipaddressprotocolversion", NULL, 286, &input); + zephir_check_call_status(); + if (ZEPHIR_IS_FALSE_IDENTICAL(&protocol)) { + RETURN_MM_BOOL(0); + } + if (zephir_memnstr_str(&input, SL("/"), "phalcon/Filter/Sanitize/Ip.zep", 35)) { + ZEPHIR_INIT_VAR(&parts); + zephir_fast_explode_str(&parts, SL("/"), &input, 2 ); + zephir_memory_observe(&ip); + zephir_array_fetch_long(&ip, &parts, 0, PH_NOISY, "phalcon/Filter/Sanitize/Ip.zep", 37); + zephir_memory_observe(&mask); + zephir_array_fetch_long(&mask, &parts, 1, PH_NOISY, "phalcon/Filter/Sanitize/Ip.zep", 38); + if (ZEPHIR_IS_LONG_IDENTICAL(&protocol, 4)) { + ZVAL_LONG(&_0$$5, 275); + ZVAL_LONG(&_1$$5, (1048576 | filter)); + ZEPHIR_CALL_FUNCTION(&filtered, "filter_var", NULL, 284, &ip, &_0$$5, &_1$$5); + zephir_check_call_status(); + if (!ZEPHIR_IS_FALSE_IDENTICAL(&filtered)) { + _2$$6 = zephir_is_numeric(&mask); + if (_2$$6) { + _2$$6 = ZEPHIR_GE_LONG(&mask, 0); + } + _3$$6 = _2$$6; + if (_3$$6) { + _3$$6 = ZEPHIR_LE_LONG(&mask, 32); + } + if (_3$$6) { + ZEPHIR_CONCAT_VSV(return_value, &filtered, "/", &mask); + RETURN_MM(); + } + } + } + if (ZEPHIR_IS_LONG_IDENTICAL(&protocol, 6)) { + ZVAL_LONG(&_4$$8, 275); + ZVAL_LONG(&_5$$8, (2097152 | filter)); + ZEPHIR_CALL_FUNCTION(&filtered, "filter_var", NULL, 284, &ip, &_4$$8, &_5$$8); + zephir_check_call_status(); + if (zephir_is_true(&filtered)) { + _6$$9 = zephir_is_numeric(&mask); + if (_6$$9) { + _6$$9 = ZEPHIR_GE_LONG(&mask, 0); + } + _7$$9 = _6$$9; + if (_7$$9) { + _7$$9 = ZEPHIR_LE_LONG(&mask, 128); + } + if (_7$$9) { + ZEPHIR_CONCAT_VSV(return_value, &filtered, "/", &mask); + RETURN_MM(); + } + } + } + } else { + if (ZEPHIR_IS_LONG_IDENTICAL(&protocol, 4)) { + ZVAL_LONG(&_8$$12, 275); + ZVAL_LONG(&_9$$12, (1048576 | filter)); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 284, &input, &_8$$12, &_9$$12); + zephir_check_call_status(); + RETURN_MM(); + } + if (ZEPHIR_IS_LONG_IDENTICAL(&protocol, 6)) { + ZVAL_LONG(&_10$$13, 275); + ZVAL_LONG(&_11$$13, (2097152 | filter)); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 284, &input, &_10$$13, &_11$$13); + zephir_check_call_status(); + RETURN_MM(); + } + } + RETURN_MM_BOOL(0); +} + +static PHP_METHOD(Phalcon_Filter_Sanitize_Ip, getIpAddressProtocolVersion) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *input_param = NULL, parts, ip, _0, _1, _2, _3; + zval input; + + ZVAL_UNDEF(&input); + ZVAL_UNDEF(&parts); + ZVAL_UNDEF(&ip); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_3); + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_STR(input) + ZEND_PARSE_PARAMETERS_END(); + ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); + zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); + zephir_fetch_params(1, 1, 0, &input_param); + zephir_get_strval(&input, input_param); + ZEPHIR_CPY_WRT(&ip, &input); + if (zephir_memnstr_str(&ip, SL("/"), "phalcon/Filter/Sanitize/Ip.zep", 85)) { + ZEPHIR_INIT_VAR(&parts); + zephir_fast_explode_str(&parts, SL("/"), &ip, 2 ); + ZEPHIR_OBS_NVAR(&ip); + zephir_array_fetch_long(&ip, &parts, 0, PH_NOISY, "phalcon/Filter/Sanitize/Ip.zep", 87); + } + ZVAL_LONG(&_0, 275); + ZVAL_LONG(&_1, 1048576); + ZEPHIR_CALL_FUNCTION(&_2, "filter_var", NULL, 284, &ip, &_0, &_1); + zephir_check_call_status(); + if (!ZEPHIR_IS_FALSE_IDENTICAL(&_2)) { + RETURN_MM_LONG(4); + } + ZVAL_LONG(&_0, 275); + ZVAL_LONG(&_1, 2097152); + ZEPHIR_CALL_FUNCTION(&_3, "filter_var", NULL, 284, &ip, &_0, &_1); + zephir_check_call_status(); + if (!ZEPHIR_IS_FALSE_IDENTICAL(&_3)) { + RETURN_MM_LONG(6); + } + RETURN_MM_BOOL(0); +} + + + + +#ifdef HAVE_CONFIG_H +#endif + + + + + ZEPHIR_INIT_CLASS(Phalcon_Filter_Sanitize_Lower) { ZEPHIR_REGISTER_CLASS(Phalcon\\Filter\\Sanitize, Lower, phalcon, filter_sanitize_lower, phalcon_filter_sanitize_lower_method_entry, 0); @@ -90574,7 +91346,7 @@ static PHP_METHOD(Phalcon_Filter_Sanitize_Lower, __invoke) zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 285, &input); + ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 287, &input); zephir_check_call_status(); zephir_fast_strtolower(return_value, &_2); RETURN_MM(); @@ -90775,7 +91547,7 @@ static PHP_METHOD(Phalcon_Filter_Sanitize_Special, __invoke) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &input); ZVAL_LONG(&_0, 515); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 283, input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 284, input, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -90812,7 +91584,7 @@ static PHP_METHOD(Phalcon_Filter_Sanitize_SpecialFull, __invoke) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &input); ZVAL_LONG(&_0, 522); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 283, input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 284, input, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -90857,7 +91629,7 @@ static PHP_METHOD(Phalcon_Filter_Sanitize_StringVal, __invoke) } else { } ZVAL_LONG(&_0, flags); - ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 286, &input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 288, &input, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -90911,7 +91683,7 @@ static PHP_METHOD(Phalcon_Filter_Sanitize_StringValLegacy, __invoke) } if (_0) { ZVAL_LONG(&_2$$3, 513); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 283, input, &_2$$3); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 284, input, &_2$$3); zephir_check_call_status(); RETURN_MM(); } @@ -90959,7 +91731,7 @@ static PHP_METHOD(Phalcon_Filter_Sanitize_Striptags, __invoke) } else { ZEPHIR_INIT_VAR(&input); } - ZEPHIR_RETURN_CALL_FUNCTION("strip_tags", NULL, 287, &input); + ZEPHIR_RETURN_CALL_FUNCTION("strip_tags", NULL, 289, &input); zephir_check_call_status(); RETURN_MM(); } @@ -91058,7 +91830,7 @@ static PHP_METHOD(Phalcon_Filter_Sanitize_Upper, __invoke) zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 285, &input); + ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 287, &input); zephir_check_call_status(); zephir_fast_strtoupper(return_value, &_2); RETURN_MM(); @@ -91158,9 +91930,9 @@ static PHP_METHOD(Phalcon_Filter_Sanitize_UpperWords, __invoke) zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 285, &input); + ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 287, &input); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("ucwords", NULL, 288, &_2); + ZEPHIR_RETURN_CALL_FUNCTION("ucwords", NULL, 290, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -91197,7 +91969,7 @@ static PHP_METHOD(Phalcon_Filter_Sanitize_Url, __invoke) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &input); ZVAL_LONG(&_0, 518); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 283, input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 284, input, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -92207,7 +92979,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_Alnum, validate) RETURN_MM_BOOL(1); } zephir_cast_to_string(&_1, &value); - ZEPHIR_CALL_FUNCTION(&_2, "ctype_alnum", NULL, 292, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "ctype_alnum", NULL, 294, &_1); zephir_check_call_status(); if (!(zephir_is_true(&_2))) { ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "messagefactory", NULL, 0, validation, field); @@ -92501,7 +93273,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_Callback, validate) ZEPHIR_CALL_METHOD(&data, validation, "getdata", NULL, 0); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&returnedValue, "call_user_func", NULL, 188, &callback, &data); + ZEPHIR_CALL_FUNCTION(&returnedValue, "call_user_func", NULL, 189, &callback, &data); zephir_check_call_status(); _1$$3 = Z_TYPE_P(&returnedValue) == IS_OBJECT; if (_1$$3) { @@ -92615,7 +93387,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_Confirmation, validate) zephir_check_call_status(); zephir_cast_to_string(&_3, &value); zephir_cast_to_string(&_4, &valueWith); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "compare", NULL, 293, &_3, &_4); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "compare", NULL, 295, &_3, &_4); zephir_check_call_status(); if (!(zephir_is_true(&_2))) { ZEPHIR_INIT_VAR(&_5$$4); @@ -92689,7 +93461,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_Confirmation, compare) zephir_check_call_status(); zephir_get_strval(&b, &_5$$3); } - ZEPHIR_CALL_FUNCTION(&_6, "strcmp", NULL, 294, &a, &b); + ZEPHIR_CALL_FUNCTION(&_6, "strcmp", NULL, 296, &a, &b); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_LONG_IDENTICAL(&_6, 0)); } @@ -92768,7 +93540,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_CreditCard, validate) RETURN_MM_BOOL(1); } zephir_cast_to_string(&_1, &value); - ZEPHIR_CALL_METHOD(&valid, this_ptr, "verifybyluhnalgorithm", NULL, 295, &_1); + ZEPHIR_CALL_METHOD(&valid, this_ptr, "verifybyluhnalgorithm", NULL, 297, &_1); zephir_check_call_status(); if (!(zephir_is_true(&valid))) { ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "messagefactory", NULL, 0, validation, field); @@ -92810,14 +93582,14 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_CreditCard, verifyByLuhnAl zephir_get_strval(&number, number_param); ZEPHIR_INIT_VAR(&hash); ZVAL_STRING(&hash, ""); - ZEPHIR_CALL_FUNCTION(&_0, "ctype_digit", NULL, 296, &number); + ZEPHIR_CALL_FUNCTION(&_0, "ctype_digit", NULL, 298, &number); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&_0)) { RETURN_MM_BOOL(0); } ZEPHIR_CALL_FUNCTION(&_1, "str_split", NULL, 88, &number); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&digits, "array_reverse", NULL, 297, &_1); + ZEPHIR_CALL_FUNCTION(&digits, "array_reverse", NULL, 299, &_1); zephir_check_call_status(); zephir_is_iterable(&digits, 0, "phalcon/Filter/Validation/Validator/CreditCard.zep", 112); if (Z_TYPE_P(&digits) == IS_ARRAY) { @@ -92869,7 +93641,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_CreditCard, verifyByLuhnAl ZEPHIR_INIT_NVAR(&position); ZEPHIR_CALL_FUNCTION(&_8, "str_split", NULL, 88, &hash); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&result, "array_sum", NULL, 298, &_8); + ZEPHIR_CALL_FUNCTION(&result, "array_sum", NULL, 300, &_8); zephir_check_call_status(); RETURN_MM_BOOL((zephir_safe_mod_zval_long(&result, 10) == 0)); } @@ -92960,7 +93732,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_Date, validate) ZEPHIR_INIT_NVAR(&format); ZVAL_STRING(&format, "Y-m-d"); } - ZEPHIR_CALL_METHOD(&_3, this_ptr, "checkdate", NULL, 299, &value, &format); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "checkdate", NULL, 301, &value, &format); zephir_check_call_status(); if (!(zephir_is_true(&_3))) { ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "messagefactory", NULL, 0, validation, field); @@ -93092,7 +93864,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_Digit, validate) _1 = Z_TYPE_P(&value) == IS_LONG; if (!(_1)) { zephir_cast_to_string(&_2, &value); - ZEPHIR_CALL_FUNCTION(&_3, "ctype_digit", NULL, 296, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "ctype_digit", NULL, 298, &_2); zephir_check_call_status(); _1 = zephir_is_true(&_3); } @@ -93192,7 +93964,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_Email, validate) ZVAL_LONG(&flags, 1048576); } ZVAL_LONG(&_3, 274); - ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 283, &value, &_3, &flags); + ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 284, &value, &_3, &flags); zephir_check_call_status(); if (!(zephir_is_true(&_4))) { ZEPHIR_CALL_METHOD(&_5$$5, this_ptr, "messagefactory", NULL, 0, validation, field); @@ -93335,7 +94107,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_ExclusionIn, validate) return; } } - ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 300, &value, &domain, &strict); + ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 302, &value, &domain, &strict); zephir_check_call_status(); if (zephir_is_true(&_5)) { ZEPHIR_INIT_VAR(&replacePairs); @@ -93471,21 +94243,21 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) if (zephir_array_isset_string(&options, SL("messageFileEmpty"))) { ZEPHIR_INIT_VAR(&_0$$3); ZVAL_STRING(&_0$$3, "messageFileEmpty"); - ZEPHIR_CALL_METHOD(&messageFileEmpty, &helper, "__invoke", NULL, 159, &options, &_0$$3); + ZEPHIR_CALL_METHOD(&messageFileEmpty, &helper, "__invoke", NULL, 160, &options, &_0$$3); zephir_check_call_status(); zephir_array_unset_string(&options, SL("messageFileEmpty"), PH_SEPARATE); } if (zephir_array_isset_string(&options, SL("messageIniSize"))) { ZEPHIR_INIT_VAR(&_1$$4); ZVAL_STRING(&_1$$4, "messageIniSize"); - ZEPHIR_CALL_METHOD(&messageIniSize, &helper, "__invoke", NULL, 159, &options, &_1$$4); + ZEPHIR_CALL_METHOD(&messageIniSize, &helper, "__invoke", NULL, 160, &options, &_1$$4); zephir_check_call_status(); zephir_array_unset_string(&options, SL("messageIniSize"), PH_SEPARATE); } if (zephir_array_isset_string(&options, SL("messageValid"))) { ZEPHIR_INIT_VAR(&_2$$5); ZVAL_STRING(&_2$$5, "messageValid"); - ZEPHIR_CALL_METHOD(&messageValid, &helper, "__invoke", NULL, 159, &options, &_2$$5); + ZEPHIR_CALL_METHOD(&messageValid, &helper, "__invoke", NULL, 160, &options, &_2$$5); zephir_check_call_status(); zephir_array_unset_string(&options, SL("messageValid"), PH_SEPARATE); } @@ -93532,11 +94304,11 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) if (ZEPHIR_IS_LONG_IDENTICAL(&_8$$6, 0)) { ZEPHIR_INIT_NVAR(&_16$$7); ZVAL_STRING(&_16$$7, "messageMinSize"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 159, &options, &_16$$7); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 160, &options, &_16$$7); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_16$$7); ZVAL_STRING(&_16$$7, "includedMinSize"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 159, &options, &_16$$7); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 160, &options, &_16$$7); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_min_ce); @@ -93545,18 +94317,18 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_array_update_string(&_17$$7, SL("size"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_17$$7, SL("message"), &message, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_17$$7, SL("included"), &included, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_18, 301, &_17$$7); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_18, 303, &_17$$7); zephir_check_call_status(); zephir_array_unset_string(&options, SL("messageMinSize"), PH_SEPARATE); zephir_array_unset_string(&options, SL("includedMinSize"), PH_SEPARATE); } else if (ZEPHIR_IS_LONG_IDENTICAL(&_10$$6, 0)) { ZEPHIR_INIT_NVAR(&_19$$8); ZVAL_STRING(&_19$$8, "messageSize"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 159, &options, &_19$$8); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 160, &options, &_19$$8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_19$$8); ZVAL_STRING(&_19$$8, "includedSize"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 159, &options, &_19$$8); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 160, &options, &_19$$8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_max_ce); @@ -93565,7 +94337,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_array_update_string(&_20$$8, SL("size"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_20$$8, SL("message"), &message, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_20$$8, SL("included"), &included, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_18, 301, &_20$$8); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_18, 303, &_20$$8); zephir_check_call_status(); zephir_array_unset_string(&options, SL("maxSize"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageSize"), PH_SEPARATE); @@ -93573,7 +94345,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) } else if (ZEPHIR_IS_LONG_IDENTICAL(&_11$$6, 0)) { ZEPHIR_INIT_NVAR(&_21$$9); ZVAL_STRING(&_21$$9, "messageEqualSize"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 159, &options, &_21$$9); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 160, &options, &_21$$9); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_equal_ce); @@ -93581,14 +94353,14 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_create_array(&_22$$9, 2, 0); zephir_array_update_string(&_22$$9, SL("size"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_22$$9, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_18, 301, &_22$$9); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_18, 303, &_22$$9); zephir_check_call_status(); zephir_array_unset_string(&options, SL("equalSize"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageEqualSize"), PH_SEPARATE); } else if (ZEPHIR_IS_LONG_IDENTICAL(&_12$$6, 0)) { ZEPHIR_INIT_NVAR(&_23$$10); ZVAL_STRING(&_23$$10, "messageType"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 159, &options, &_23$$10); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 160, &options, &_23$$10); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_mimetype_ce); @@ -93596,18 +94368,18 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_create_array(&_24$$10, 2, 0); zephir_array_update_string(&_24$$10, SL("types"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_24$$10, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_18, 301, &_24$$10); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_18, 303, &_24$$10); zephir_check_call_status(); zephir_array_unset_string(&options, SL("allowedTypes"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageType"), PH_SEPARATE); } else if (ZEPHIR_IS_LONG_IDENTICAL(&_13$$6, 0)) { ZEPHIR_INIT_NVAR(&_25$$11); ZVAL_STRING(&_25$$11, "messageMaxResolution"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 159, &options, &_25$$11); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 160, &options, &_25$$11); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_25$$11); ZVAL_STRING(&_25$$11, "includedMaxResolution"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 159, &options, &_25$$11); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 160, &options, &_25$$11); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_max_ce); @@ -93616,7 +94388,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_array_update_string(&_26$$11, SL("resolution"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_26$$11, SL("included"), &included, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_26$$11, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_27, 302, &_26$$11); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_27, 304, &_26$$11); zephir_check_call_status(); zephir_array_unset_string(&options, SL("maxResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("includedMaxResolution"), PH_SEPARATE); @@ -93624,11 +94396,11 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) } else if (ZEPHIR_IS_LONG_IDENTICAL(&_14$$6, 0)) { ZEPHIR_INIT_NVAR(&_28$$12); ZVAL_STRING(&_28$$12, "messageMinResolution"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 159, &options, &_28$$12); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 160, &options, &_28$$12); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_28$$12); ZVAL_STRING(&_28$$12, "includedMinResolution"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 159, &options, &_28$$12); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 160, &options, &_28$$12); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_min_ce); @@ -93637,7 +94409,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_array_update_string(&_29$$12, SL("resolution"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_29$$12, SL("included"), &included, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_29$$12, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_30, 303, &_29$$12); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_30, 305, &_29$$12); zephir_check_call_status(); zephir_array_unset_string(&options, SL("minResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("includedMinResolution"), PH_SEPARATE); @@ -93645,7 +94417,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) } else if (ZEPHIR_IS_LONG_IDENTICAL(&_15$$6, 0)) { ZEPHIR_INIT_NVAR(&_31$$13); ZVAL_STRING(&_31$$13, "messageEqualResolution"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 159, &options, &_31$$13); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 160, &options, &_31$$13); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_equal_ce); @@ -93653,7 +94425,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_create_array(&_32$$13, 2, 0); zephir_array_update_string(&_32$$13, SL("resolution"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_32$$13, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 304, &_32$$13); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 306, &_32$$13); zephir_check_call_status(); zephir_array_unset_string(&options, SL("equalResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageEqualResolution"), PH_SEPARATE); @@ -93661,15 +94433,15 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) continue; } if (Z_TYPE_P(&messageFileEmpty) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagefileempty", &_34, 305, &messageFileEmpty); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagefileempty", &_34, 307, &messageFileEmpty); zephir_check_call_status(); } if (Z_TYPE_P(&messageIniSize) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessageinisize", &_35, 306, &messageIniSize); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessageinisize", &_35, 308, &messageIniSize); zephir_check_call_status(); } if (Z_TYPE_P(&messageValid) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagevalid", &_36, 307, &messageValid); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagevalid", &_36, 309, &messageValid); zephir_check_call_status(); } zephir_update_property_array_append(this_ptr, SL("validators"), &validator); @@ -93718,11 +94490,11 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) if (ZEPHIR_IS_LONG_IDENTICAL(&_38$$18, 0)) { ZEPHIR_INIT_NVAR(&_45$$19); ZVAL_STRING(&_45$$19, "messageMinSize"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 159, &options, &_45$$19); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 160, &options, &_45$$19); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_45$$19); ZVAL_STRING(&_45$$19, "includedMinSize"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 159, &options, &_45$$19); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 160, &options, &_45$$19); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_min_ce); @@ -93731,18 +94503,18 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_array_update_string(&_46$$19, SL("size"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_46$$19, SL("message"), &message, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_46$$19, SL("included"), &included, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 304, &_46$$19); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 306, &_46$$19); zephir_check_call_status(); zephir_array_unset_string(&options, SL("messageMinSize"), PH_SEPARATE); zephir_array_unset_string(&options, SL("includedMinSize"), PH_SEPARATE); } else if (ZEPHIR_IS_LONG_IDENTICAL(&_39$$18, 0)) { ZEPHIR_INIT_NVAR(&_47$$20); ZVAL_STRING(&_47$$20, "messageSize"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 159, &options, &_47$$20); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 160, &options, &_47$$20); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_47$$20); ZVAL_STRING(&_47$$20, "includedSize"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 159, &options, &_47$$20); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 160, &options, &_47$$20); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_max_ce); @@ -93751,7 +94523,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_array_update_string(&_48$$20, SL("size"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_48$$20, SL("message"), &message, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_48$$20, SL("included"), &included, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 304, &_48$$20); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 306, &_48$$20); zephir_check_call_status(); zephir_array_unset_string(&options, SL("maxSize"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageSize"), PH_SEPARATE); @@ -93759,7 +94531,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) } else if (ZEPHIR_IS_LONG_IDENTICAL(&_40$$18, 0)) { ZEPHIR_INIT_NVAR(&_49$$21); ZVAL_STRING(&_49$$21, "messageEqualSize"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 159, &options, &_49$$21); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 160, &options, &_49$$21); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_equal_ce); @@ -93767,14 +94539,14 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_create_array(&_50$$21, 2, 0); zephir_array_update_string(&_50$$21, SL("size"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_50$$21, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 304, &_50$$21); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 306, &_50$$21); zephir_check_call_status(); zephir_array_unset_string(&options, SL("equalSize"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageEqualSize"), PH_SEPARATE); } else if (ZEPHIR_IS_LONG_IDENTICAL(&_41$$18, 0)) { ZEPHIR_INIT_NVAR(&_51$$22); ZVAL_STRING(&_51$$22, "messageType"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 159, &options, &_51$$22); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 160, &options, &_51$$22); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_mimetype_ce); @@ -93782,18 +94554,18 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_create_array(&_52$$22, 2, 0); zephir_array_update_string(&_52$$22, SL("types"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_52$$22, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 304, &_52$$22); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 306, &_52$$22); zephir_check_call_status(); zephir_array_unset_string(&options, SL("allowedTypes"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageType"), PH_SEPARATE); } else if (ZEPHIR_IS_LONG_IDENTICAL(&_42$$18, 0)) { ZEPHIR_INIT_NVAR(&_53$$23); ZVAL_STRING(&_53$$23, "messageMaxResolution"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 159, &options, &_53$$23); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 160, &options, &_53$$23); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_53$$23); ZVAL_STRING(&_53$$23, "includedMaxResolution"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 159, &options, &_53$$23); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 160, &options, &_53$$23); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_max_ce); @@ -93802,7 +94574,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_array_update_string(&_54$$23, SL("resolution"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_54$$23, SL("included"), &included, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_54$$23, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 304, &_54$$23); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 306, &_54$$23); zephir_check_call_status(); zephir_array_unset_string(&options, SL("maxResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("includedMaxResolution"), PH_SEPARATE); @@ -93810,11 +94582,11 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) } else if (ZEPHIR_IS_LONG_IDENTICAL(&_43$$18, 0)) { ZEPHIR_INIT_NVAR(&_55$$24); ZVAL_STRING(&_55$$24, "messageMinResolution"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 159, &options, &_55$$24); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 160, &options, &_55$$24); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_55$$24); ZVAL_STRING(&_55$$24, "includedMinResolution"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 159, &options, &_55$$24); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 160, &options, &_55$$24); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_min_ce); @@ -93823,7 +94595,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_array_update_string(&_56$$24, SL("resolution"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_56$$24, SL("included"), &included, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_56$$24, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 304, &_56$$24); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 306, &_56$$24); zephir_check_call_status(); zephir_array_unset_string(&options, SL("minResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("includedMinResolution"), PH_SEPARATE); @@ -93831,7 +94603,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) } else if (ZEPHIR_IS_LONG_IDENTICAL(&_44$$18, 0)) { ZEPHIR_INIT_NVAR(&_57$$25); ZVAL_STRING(&_57$$25, "messageEqualResolution"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 159, &options, &_57$$25); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 160, &options, &_57$$25); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_equal_ce); @@ -93839,7 +94611,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_create_array(&_58$$25, 2, 0); zephir_array_update_string(&_58$$25, SL("resolution"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_58$$25, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 304, &_58$$25); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 306, &_58$$25); zephir_check_call_status(); zephir_array_unset_string(&options, SL("equalResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageEqualResolution"), PH_SEPARATE); @@ -93847,15 +94619,15 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) continue; } if (Z_TYPE_P(&messageFileEmpty) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagefileempty", &_34, 305, &messageFileEmpty); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagefileempty", &_34, 307, &messageFileEmpty); zephir_check_call_status(); } if (Z_TYPE_P(&messageIniSize) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessageinisize", &_35, 306, &messageIniSize); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessageinisize", &_35, 308, &messageIniSize); zephir_check_call_status(); } if (Z_TYPE_P(&messageValid) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagevalid", &_36, 307, &messageValid); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagevalid", &_36, 309, &messageValid); zephir_check_call_status(); } zephir_update_property_array_append(this_ptr, SL("validators"), &validator); @@ -94098,7 +94870,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_InclusionIn, validate) return; } } - ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 300, &value, &domain, &strict); + ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 302, &value, &domain, &strict); zephir_check_call_status(); if (!(zephir_is_true(&_5))) { ZEPHIR_INIT_VAR(&replacePairs); @@ -94257,7 +95029,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_Ip, validate) zephir_bitwise_or_function(&_10, &_9, &allowReserved); zephir_array_update_string(&options, SL("flags"), &_10, PH_COPY | PH_SEPARATE); ZVAL_LONG(&_2, 275); - ZEPHIR_CALL_FUNCTION(&_11, "filter_var", NULL, 283, &value, &_2, &options); + ZEPHIR_CALL_FUNCTION(&_11, "filter_var", NULL, 284, &value, &_2, &options); zephir_check_call_status(); if (!(zephir_is_true(&_11))) { ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "messagefactory", NULL, 0, validation, field); @@ -94658,7 +95430,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength, __construct) zephir_array_update_string(&_8$$4, SL("min"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_8$$4, SL("message"), &message, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_8$$4, SL("included"), &included, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_9, 312, &_8$$4); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_9, 314, &_8$$4); zephir_check_call_status(); zephir_array_unset_string(&options, SL("min"), PH_SEPARATE); zephir_array_unset_string(&options, SL("message"), PH_SEPARATE); @@ -94687,7 +95459,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength, __construct) zephir_array_update_string(&_10$$9, SL("max"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_10$$9, SL("message"), &message, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_10$$9, SL("included"), &included, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_11, 313, &_10$$9); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_11, 315, &_10$$9); zephir_check_call_status(); zephir_array_unset_string(&options, SL("max"), PH_SEPARATE); zephir_array_unset_string(&options, SL("message"), PH_SEPARATE); @@ -94742,7 +95514,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength, __construct) zephir_array_update_string(&_15$$16, SL("min"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_15$$16, SL("message"), &message, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_15$$16, SL("included"), &included, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_11, 313, &_15$$16); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_11, 315, &_15$$16); zephir_check_call_status(); zephir_array_unset_string(&options, SL("min"), PH_SEPARATE); zephir_array_unset_string(&options, SL("message"), PH_SEPARATE); @@ -94771,7 +95543,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength, __construct) zephir_array_update_string(&_16$$21, SL("max"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_16$$21, SL("message"), &message, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_16$$21, SL("included"), &included, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_11, 313, &_16$$21); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_11, 315, &_16$$21); zephir_check_call_status(); zephir_array_unset_string(&options, SL("max"), PH_SEPARATE); zephir_array_unset_string(&options, SL("message"), PH_SEPARATE); @@ -95294,7 +96066,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_Uniqueness, isUniquenessMo zephir_array_keys(&_10$$6, &except); ZVAL_LONG(&_11$$6, 0); ZVAL_LONG(&_12$$6, (zephir_fast_count_int(&except) - 1)); - ZEPHIR_CALL_FUNCTION(&_13$$6, "range", &_14, 314, &_11$$6, &_12$$6); + ZEPHIR_CALL_FUNCTION(&_13$$6, "range", &_14, 316, &_11$$6, &_12$$6); zephir_check_call_status(); _9$$6 = !ZEPHIR_IS_IDENTICAL(&_10$$6, &_13$$6); } @@ -95698,7 +96470,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_Uniqueness, isUniquenessMo zephir_array_keys(&_88$$37, &except); ZVAL_LONG(&_89$$37, 0); ZVAL_LONG(&_90$$37, (zephir_fast_count_int(&except) - 1)); - ZEPHIR_CALL_FUNCTION(&_91$$37, "range", &_14, 314, &_89$$37, &_90$$37); + ZEPHIR_CALL_FUNCTION(&_91$$37, "range", &_14, 316, &_89$$37, &_90$$37); zephir_check_call_status(); _87$$37 = !ZEPHIR_IS_IDENTICAL(&_88$$37, &_91$$37); } @@ -96216,11 +96988,11 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_Url, validate) zephir_read_property(&_1, this_ptr, ZEND_STRL("options"), PH_NOISY_CC | PH_READONLY); if (zephir_array_isset_string_fetch(&options, &_1, SL("options"), 0)) { ZVAL_LONG(&_2$$4, 273); - ZEPHIR_CALL_FUNCTION(&result, "filter_var", NULL, 283, &value, &_2$$4, &options); + ZEPHIR_CALL_FUNCTION(&result, "filter_var", NULL, 284, &value, &_2$$4, &options); zephir_check_call_status(); } else { ZVAL_LONG(&_3$$5, 273); - ZEPHIR_CALL_FUNCTION(&result, "filter_var", NULL, 283, &value, &_3$$5); + ZEPHIR_CALL_FUNCTION(&result, "filter_var", NULL, 284, &value, &_3$$5); zephir_check_call_status(); } if (!(zephir_is_true(&result))) { @@ -96821,13 +97593,13 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_MimeType, validate) } if ((zephir_function_exists_ex(ZEND_STRL("finfo_open")) == SUCCESS)) { ZVAL_LONG(&_2$$6, 16); - ZEPHIR_CALL_FUNCTION(&tmp, "finfo_open", NULL, 308, &_2$$6); + ZEPHIR_CALL_FUNCTION(&tmp, "finfo_open", NULL, 310, &_2$$6); zephir_check_call_status(); if (zephir_is_true(&tmp)) { zephir_array_fetch_string(&_3$$7, &value, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/Validator/File/MimeType.zep", 102); - ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 309, &tmp, &_3$$7); + ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 311, &tmp, &_3$$7); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 310, &tmp); + ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 312, &tmp); zephir_check_call_status(); } } @@ -97150,7 +97922,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_Resolution_Equal, val ZEPHIR_CALL_METHOD(&value, validation, "getvalue", NULL, 0, field); zephir_check_call_status(); zephir_array_fetch_string(&_1, &value, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/Validator/File/Resolution/Equal.zep", 88); - ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 311, &_1); + ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 313, &_1); zephir_check_call_status(); zephir_memory_observe(&width); zephir_array_fetch_long(&width, &tmp, 0, PH_NOISY, "phalcon/Filter/Validation/Validator/File/Resolution/Equal.zep", 89); @@ -97280,7 +98052,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_Resolution_Max, valid ZEPHIR_CALL_METHOD(&value, validation, "getvalue", NULL, 0, field); zephir_check_call_status(); zephir_array_fetch_string(&_1, &value, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/Validator/File/Resolution/Max.zep", 94); - ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 311, &_1); + ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 313, &_1); zephir_check_call_status(); zephir_memory_observe(&width); zephir_array_fetch_long(&width, &tmp, 0, PH_NOISY, "phalcon/Filter/Validation/Validator/File/Resolution/Max.zep", 95); @@ -97434,7 +98206,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_File_Resolution_Min, valid ZEPHIR_CALL_METHOD(&value, validation, "getvalue", NULL, 0, field); zephir_check_call_status(); zephir_array_fetch_string(&_1, &value, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/Validator/File/Resolution/Min.zep", 94); - ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 311, &_1); + ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 313, &_1); zephir_check_call_status(); zephir_memory_observe(&width); zephir_array_fetch_long(&width, &tmp, 0, PH_NOISY, "phalcon/Filter/Validation/Validator/File/Resolution/Min.zep", 95); @@ -97583,7 +98355,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength_Max, validate } if ((zephir_function_exists_ex(ZEND_STRL("mb_strlen")) == SUCCESS)) { zephir_cast_to_string(&_1$$4, &value); - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 246, &_1$$4); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 247, &_1$$4); zephir_check_call_status(); } else { zephir_cast_to_string(&_2$$5, &value); @@ -97715,7 +98487,7 @@ static PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength_Min, validate } if ((zephir_function_exists_ex(ZEND_STRL("mb_strlen")) == SUCCESS)) { zephir_cast_to_string(&_1$$4, &value); - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 246, &_1$$4); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 247, &_1$$4); zephir_check_call_status(); } else { zephir_cast_to_string(&_2$$5, &value); @@ -99129,7 +99901,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("realpath"), &_2$$3); zephir_read_property(&_3$$3, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&imageInfo, "getimagesize", NULL, 311, &_3$$3); + ZEPHIR_CALL_FUNCTION(&imageInfo, "getimagesize", NULL, 313, &_3$$3); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&imageInfo)) { zephir_array_fetch_long(&_4$$4, &imageInfo, 0, PH_NOISY | PH_READONLY, "phalcon/Image/Adapter/Gd.zep", 42); @@ -99302,7 +100074,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, getVersion) ZVAL_NULL(&version); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "GD_VERSION"); - ZEPHIR_CALL_FUNCTION(&_1, "defined", NULL, 118, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "defined", NULL, 119, &_0); zephir_check_call_status(); if (zephir_is_true(&_1)) { ZEPHIR_INIT_NVAR(&version); @@ -99360,7 +100132,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processBackground) zephir_fetch_params(1, 4, 0, &red_param, &green_param, &blue_param, &opacity_param); ZEPHIR_INIT_VAR(&_0); ZVAL_DOUBLE(&_1, ((zephir_safe_div_long_long((opacity * 127), 100)) - (double) (127))); - ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 284, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 285, &_1); zephir_check_call_status(); zephir_round(&_0, &_2, NULL, NULL); opacity = zephir_get_intval(&_0); @@ -99819,7 +100591,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processReflection) zephir_fetch_params(1, 3, 0, &height_param, &opacity_param, &fadeIn_param); ZEPHIR_INIT_VAR(&_0); ZVAL_DOUBLE(&_1, ((zephir_safe_div_long_long((opacity * 127), 100)) - (double) (127))); - ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 284, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 285, &_1); zephir_check_call_status(); zephir_round(&_0, &_2, NULL, NULL); opacity = zephir_get_intval(&_0); @@ -100255,7 +101027,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processSharpen) zephir_fetch_params(1, 1, 0, &amount_param); ZEPHIR_INIT_VAR(&_0); ZVAL_LONG(&_1, (-18 + ((amount * 0.08)))); - ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 284, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 285, &_1); zephir_check_call_status(); ZVAL_LONG(&_1, 2); zephir_round(&_0, &_2, &_1, NULL); @@ -100400,7 +101172,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processText) ZVAL_LONG(offsetY, _1); ZEPHIR_INIT_VAR(&_2); ZVAL_DOUBLE(&_3, ((zephir_safe_div_long_long((opacity * 127), 100)) - (double) (127))); - ZEPHIR_CALL_FUNCTION(&_4, "abs", NULL, 284, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "abs", NULL, 285, &_3); zephir_check_call_status(); zephir_round(&_2, &_4, NULL, NULL); opacity = zephir_get_intval(&_2); @@ -100429,11 +101201,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processText) topRightY = zephir_get_intval(&_10$$5); } ZVAL_LONG(&_5$$3, (topRightX - bottomLeftX)); - ZEPHIR_CALL_FUNCTION(&_11$$3, "abs", NULL, 284, &_5$$3); + ZEPHIR_CALL_FUNCTION(&_11$$3, "abs", NULL, 285, &_5$$3); zephir_check_call_status(); ZVAL_LONG(&width, (zephir_get_numberval(&_11$$3) + 10)); ZVAL_LONG(&_5$$3, (topRightY - bottomLeftY)); - ZEPHIR_CALL_FUNCTION(&_12$$3, "abs", NULL, 284, &_5$$3); + ZEPHIR_CALL_FUNCTION(&_12$$3, "abs", NULL, 285, &_5$$3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&height); ZVAL_LONG(&height, (zephir_get_numberval(&_12$$3) + 10)); @@ -100558,7 +101330,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, processWatermark) if (opacity < 100) { ZEPHIR_INIT_VAR(&_3$$3); ZVAL_DOUBLE(&_4$$3, ((zephir_safe_div_long_long((opacity * 127), 100)) - (double) (127))); - ZEPHIR_CALL_FUNCTION(&_5$$3, "abs", NULL, 284, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "abs", NULL, 285, &_4$$3); zephir_check_call_status(); zephir_round(&_3$$3, &_5$$3, NULL, NULL); opacity = zephir_get_intval(&_3$$3); @@ -100619,7 +101391,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Gd, check) ZVAL_STRING(&_0, "2.0.1"); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, ">="); - ZEPHIR_CALL_FUNCTION(&_2, "version_compare", NULL, 134, &version, &_0, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "version_compare", NULL, 135, &version, &_0, &_1); zephir_check_call_status(); if (!ZEPHIR_IS_TRUE_IDENTICAL(&_2)) { ZEPHIR_INIT_VAR(&_3$$3); @@ -100760,7 +101532,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, __construct) zephir_read_property(&_12$$5, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_13$$5); ZVAL_STRING(&_13$$5, "Imagick::ALPHACHANNEL_SET"); - ZEPHIR_CALL_FUNCTION(&_14$$5, "constant", NULL, 119, &_13$$5); + ZEPHIR_CALL_FUNCTION(&_14$$5, "constant", NULL, 120, &_13$$5); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_12$$5, "setimagealphachannel", NULL, 0, &_14$$5); zephir_check_call_status(); @@ -101024,7 +101796,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processBackground) ZVAL_LONG(&_1, red); ZVAL_LONG(&_2, green); ZVAL_LONG(&_3, blue); - ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 117, &_0, &_1, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 118, &_0, &_1, &_2, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&pixel1); object_init_ex(&pixel1, zephir_get_internal_ce(SL("imagickpixel"))); @@ -101057,7 +101829,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processBackground) if (!ZEPHIR_IS_TRUE_IDENTICAL(&_7$$3)) { ZEPHIR_INIT_NVAR(&_9$$4); ZVAL_STRING(&_9$$4, "Imagick::ALPHACHANNEL_SET"); - ZEPHIR_CALL_FUNCTION(&_10$$4, "constant", &_11, 119, &_9$$4); + ZEPHIR_CALL_FUNCTION(&_10$$4, "constant", &_11, 120, &_9$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &background, "setimagealphachannel", &_12, 0, &_10$$4); zephir_check_call_status(); @@ -101066,11 +101838,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processBackground) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_14$$3); ZVAL_STRING(&_14$$3, "Imagick::EVALUATE_MULTIPLY"); - ZEPHIR_CALL_FUNCTION(&_15$$3, "constant", &_11, 119, &_14$$3); + ZEPHIR_CALL_FUNCTION(&_15$$3, "constant", &_11, 120, &_14$$3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_14$$3); ZVAL_STRING(&_14$$3, "Imagick::CHANNEL_ALPHA"); - ZEPHIR_CALL_FUNCTION(&_16$$3, "constant", &_11, 119, &_14$$3); + ZEPHIR_CALL_FUNCTION(&_16$$3, "constant", &_11, 120, &_14$$3); zephir_check_call_status(); ZVAL_LONG(&_17$$3, opacity); ZEPHIR_CALL_METHOD(NULL, &background, "evaluateimage", &_18, 0, &_15$$3, &_17$$3, &_16$$3); @@ -101083,7 +101855,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processBackground) zephir_read_property(&_21$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_14$$3); ZVAL_STRING(&_14$$3, "Imagick::COMPOSITE_DISSOLVE"); - ZEPHIR_CALL_FUNCTION(&_22$$3, "constant", &_11, 119, &_14$$3); + ZEPHIR_CALL_FUNCTION(&_22$$3, "constant", &_11, 120, &_14$$3); zephir_check_call_status(); ZVAL_LONG(&_23$$3, 0); ZVAL_LONG(&_24$$3, 0); @@ -101311,7 +102083,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processMask) zephir_read_property(&_4$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_5$$3); ZVAL_STRING(&_5$$3, "Imagick::COMPOSITE_DSTIN"); - ZEPHIR_CALL_FUNCTION(&_6$$3, "constant", &_7, 119, &_5$$3); + ZEPHIR_CALL_FUNCTION(&_6$$3, "constant", &_7, 120, &_5$$3); zephir_check_call_status(); ZVAL_LONG(&_8$$3, 0); ZVAL_LONG(&_9$$3, 0); @@ -101532,7 +102304,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) } ZEPHIR_INIT_NVAR(&_18$$7); ZVAL_STRING(&_18$$7, "Imagick::COMPOSITE_DSTOUT"); - ZEPHIR_CALL_FUNCTION(&_19$$7, "constant", &_20, 119, &_18$$7); + ZEPHIR_CALL_FUNCTION(&_19$$7, "constant", &_20, 120, &_18$$7); zephir_check_call_status(); ZVAL_LONG(&_21$$7, 0); ZVAL_LONG(&_22$$7, 0); @@ -101544,11 +102316,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) } ZEPHIR_INIT_NVAR(&_18$$7); ZVAL_STRING(&_18$$7, "Imagick::EVALUATE_MULTIPLY"); - ZEPHIR_CALL_FUNCTION(&_24$$7, "constant", &_20, 119, &_18$$7); + ZEPHIR_CALL_FUNCTION(&_24$$7, "constant", &_20, 120, &_18$$7); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_18$$7); ZVAL_STRING(&_18$$7, "Imagick::CHANNEL_ALPHA"); - ZEPHIR_CALL_FUNCTION(&_25$$7, "constant", &_20, 119, &_18$$7); + ZEPHIR_CALL_FUNCTION(&_25$$7, "constant", &_20, 120, &_18$$7); zephir_check_call_status(); ZVAL_LONG(&_21$$7, opacity); ZEPHIR_CALL_METHOD(NULL, &reflection, "evaluateimage", &_26, 0, &_24$$7, &_21$$7, &_25$$7); @@ -101588,7 +102360,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_34$$10); ZVAL_STRING(&_34$$10, "Imagick::ALPHACHANNEL_SET"); - ZEPHIR_CALL_FUNCTION(&_35$$10, "constant", &_20, 119, &_34$$10); + ZEPHIR_CALL_FUNCTION(&_35$$10, "constant", &_20, 120, &_34$$10); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &image, "setimagealphachannel", &_36, 0, &_35$$10); zephir_check_call_status(); @@ -101605,7 +102377,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) zephir_read_property(&_42$$10, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_34$$10); ZVAL_STRING(&_34$$10, "Imagick::COMPOSITE_SRC"); - ZEPHIR_CALL_FUNCTION(&_43$$10, "constant", &_20, 119, &_34$$10); + ZEPHIR_CALL_FUNCTION(&_43$$10, "constant", &_20, 120, &_34$$10); zephir_check_call_status(); ZVAL_LONG(&_44$$10, 0); ZVAL_LONG(&_45$$10, 0); @@ -101634,7 +102406,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) } ZEPHIR_INIT_NVAR(&_48$$13); ZVAL_STRING(&_48$$13, "Imagick::COMPOSITE_OVER"); - ZEPHIR_CALL_FUNCTION(&_49$$13, "constant", &_20, 119, &_48$$13); + ZEPHIR_CALL_FUNCTION(&_49$$13, "constant", &_20, 120, &_48$$13); zephir_check_call_status(); zephir_read_property(&_50$$13, this_ptr, ZEND_STRL("height"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_51$$13, 0); @@ -101730,7 +102502,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processRender) if (ZEPHIR_IS_STRING(&extension, "jpg") || ZEPHIR_IS_STRING(&extension, "jpeg")) { ZEPHIR_INIT_VAR(&_5$$4); ZVAL_STRING(&_5$$4, "Imagick::COMPRESSION_JPEG"); - ZEPHIR_CALL_FUNCTION(&_6$$4, "constant", NULL, 119, &_5$$4); + ZEPHIR_CALL_FUNCTION(&_6$$4, "constant", NULL, 120, &_5$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &image, "setimagecompression", NULL, 0, &_6$$4); zephir_check_call_status(); @@ -101928,7 +102700,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processSave) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_9$$3); ZVAL_STRING(&_9$$3, "w"); - ZEPHIR_CALL_FUNCTION(&fp, "fopen", NULL, 140, &file, &_9$$3); + ZEPHIR_CALL_FUNCTION(&fp, "fopen", NULL, 141, &file, &_9$$3); zephir_check_call_status(); zephir_read_property(&_10$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(NULL, &_10$$3, "writeimagesfile", NULL, 0, &fp); @@ -101940,7 +102712,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processSave) zephir_read_property(&_11$$4, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_12$$4); ZVAL_STRING(&_12$$4, "Imagick::COMPRESSION_JPEG"); - ZEPHIR_CALL_FUNCTION(&_13$$4, "constant", NULL, 119, &_12$$4); + ZEPHIR_CALL_FUNCTION(&_13$$4, "constant", NULL, 120, &_12$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_11$$4, "setimagecompression", NULL, 0, &_13$$4); zephir_check_call_status(); @@ -102082,7 +102854,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) ZVAL_LONG(&_1, red); ZVAL_LONG(&_2, green); ZVAL_LONG(&_3, blue); - ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 117, &_0, &_1, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 118, &_0, &_1, &_2, &_3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_0); object_init_ex(&_0, zephir_get_internal_ce(SL("imagickpixel"))); @@ -102114,7 +102886,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) ZVAL_LONG(offsetY, 0); ZEPHIR_INIT_VAR(&_6$$7); ZVAL_STRING(&_6$$7, "Imagick::GRAVITY_CENTER"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 119, &_6$$7); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 120, &_6$$7); zephir_check_call_status(); } else if (Z_TYPE_P(offsetY) == IS_LONG) { ZEPHIR_INIT_VAR(&y); @@ -102126,7 +102898,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (_7$$8) { ZEPHIR_INIT_VAR(&_8$$8); ZVAL_STRING(&_8$$8, "Imagick::GRAVITY_SOUTHEAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 119, &_8$$8); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 120, &_8$$8); zephir_check_call_status(); } else { } @@ -102137,7 +102909,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (_9$$8) { ZEPHIR_INIT_NVAR(&_8$$8); ZVAL_STRING(&_8$$8, "Imagick::GRAVITY_NORTHEAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 119, &_8$$8); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 120, &_8$$8); zephir_check_call_status(); } else { } @@ -102148,7 +102920,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (_10$$8) { ZEPHIR_INIT_NVAR(&_8$$8); ZVAL_STRING(&_8$$8, "Imagick::GRAVITY_SOUTH"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 119, &_8$$8); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 120, &_8$$8); zephir_check_call_status(); } else { } @@ -102159,7 +102931,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (_11$$8) { ZEPHIR_INIT_NVAR(&_8$$8); ZVAL_STRING(&_8$$8, "Imagick::GRAVITY_NORTH"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 119, &_8$$8); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 120, &_8$$8); zephir_check_call_status(); } else { } @@ -102183,7 +102955,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (_12$$11) { ZEPHIR_INIT_VAR(&_13$$11); ZVAL_STRING(&_13$$11, "Imagick::GRAVITY_SOUTHEAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 119, &_13$$11); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 120, &_13$$11); zephir_check_call_status(); } else { } @@ -102194,7 +102966,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (_14$$11) { ZEPHIR_INIT_NVAR(&_13$$11); ZVAL_STRING(&_13$$11, "Imagick::GRAVITY_SOUTH"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 119, &_13$$11); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 120, &_13$$11); zephir_check_call_status(); } else { } @@ -102205,7 +102977,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (_15$$11) { ZEPHIR_INIT_NVAR(&_13$$11); ZVAL_STRING(&_13$$11, "Imagick::GRAVITY_EAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 119, &_13$$11); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 120, &_13$$11); zephir_check_call_status(); } else { } @@ -102216,7 +102988,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (_16$$11) { ZEPHIR_INIT_NVAR(&_13$$11); ZVAL_STRING(&_13$$11, "Imagick::GRAVITY_WEST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 119, &_13$$11); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 120, &_13$$11); zephir_check_call_status(); } else { } @@ -102245,14 +103017,14 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (ZEPHIR_LT_LONG(&y, 0)) { ZEPHIR_INIT_VAR(&_17$$12); ZVAL_STRING(&_17$$12, "Imagick::GRAVITY_SOUTHEAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 119, &_17$$12); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 120, &_17$$12); zephir_check_call_status(); } else { } if (ZEPHIR_GE_LONG(&y, 0)) { ZEPHIR_INIT_NVAR(&_17$$12); ZVAL_STRING(&_17$$12, "Imagick::GRAVITY_NORTHEAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 119, &_17$$12); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 120, &_17$$12); zephir_check_call_status(); } else { } @@ -102329,11 +103101,11 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processWatermark) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "Imagick::EVALUATE_MULTIPLY"); - ZEPHIR_CALL_FUNCTION(&_2, "constant", NULL, 119, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "constant", NULL, 120, &_1); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "Imagick::CHANNEL_ALPHA"); - ZEPHIR_CALL_FUNCTION(&_3, "constant", NULL, 119, &_1); + ZEPHIR_CALL_FUNCTION(&_3, "constant", NULL, 120, &_1); zephir_check_call_status(); ZVAL_LONG(&_4, opacity); ZEPHIR_CALL_METHOD(NULL, &watermark, "evaluateimage", NULL, 0, &_2, &_4, &_3); @@ -102349,7 +103121,7 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, processWatermark) zephir_read_property(&_6$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_7$$3); ZVAL_STRING(&_7$$3, "Imagick::COMPOSITE_OVER"); - ZEPHIR_CALL_FUNCTION(&_8$$3, "constant", NULL, 119, &_7$$3); + ZEPHIR_CALL_FUNCTION(&_8$$3, "constant", NULL, 120, &_7$$3); zephir_check_call_status(); ZVAL_LONG(&_9$$3, offsetX); ZVAL_LONG(&_10$$3, offsetY); @@ -102396,12 +103168,12 @@ static PHP_METHOD(Phalcon_Image_Adapter_Imagick, check) } ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "Imagick::IMAGICK_EXTNUM"); - ZEPHIR_CALL_FUNCTION(&_2, "defined", NULL, 118, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "defined", NULL, 119, &_1); zephir_check_call_status(); if (zephir_is_true(&_2)) { ZEPHIR_INIT_VAR(&_3$$4); ZVAL_STRING(&_3$$4, "Imagick::IMAGICK_EXTNUM"); - ZEPHIR_CALL_FUNCTION(&_4$$4, "constant", NULL, 119, &_3$$4); + ZEPHIR_CALL_FUNCTION(&_4$$4, "constant", NULL, 120, &_3$$4); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("version"), &_4$$4); } @@ -103159,7 +103931,7 @@ static PHP_METHOD(Phalcon_Assets_Collection, add) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &asset); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 167, asset); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 168, asset); zephir_check_call_status(); RETURN_THIS(); } @@ -103231,7 +104003,7 @@ static PHP_METHOD(Phalcon_Assets_Collection, addCss) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processadd", NULL, 168, &_0, &path, isLocal, &_1, &attributes, &version, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processadd", NULL, 169, &_0, &path, isLocal, &_1, &attributes, &version, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -103264,7 +104036,7 @@ static PHP_METHOD(Phalcon_Assets_Collection, addInline) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &code); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 167, code); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 168, code); zephir_check_call_status(); RETURN_THIS(); } @@ -103310,7 +104082,7 @@ static PHP_METHOD(Phalcon_Assets_Collection, addInlineCss) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processaddinline", NULL, 169, &_0, &content, &_1, &attributes); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processaddinline", NULL, 170, &_0, &content, &_1, &attributes); zephir_check_call_status(); RETURN_MM(); } @@ -103356,7 +104128,7 @@ static PHP_METHOD(Phalcon_Assets_Collection, addInlineJs) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processaddinline", NULL, 169, &_0, &content, &_1, &attributes); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processaddinline", NULL, 170, &_0, &content, &_1, &attributes); zephir_check_call_status(); RETURN_MM(); } @@ -103428,7 +104200,7 @@ static PHP_METHOD(Phalcon_Assets_Collection, addJs) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processadd", NULL, 168, &_0, &path, isLocal, &_1, &attributes, &version, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processadd", NULL, 169, &_0, &path, isLocal, &_1, &attributes, &version, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -103948,7 +104720,7 @@ static PHP_METHOD(Phalcon_Assets_Collection, processAdd) ZEPHIR_CPY_WRT(&name, &_0); zephir_memory_observe(&flag); zephir_read_property(&flag, this_ptr, ZEND_STRL("isLocal"), PH_NOISY_CC); - ZEPHIR_CALL_METHOD(&attrs, this_ptr, "processattributes", NULL, 170, &attributes); + ZEPHIR_CALL_METHOD(&attrs, this_ptr, "processattributes", NULL, 171, &attributes); zephir_check_call_status(); if (Z_TYPE_P(isLocal) != IS_NULL) { ZEPHIR_INIT_NVAR(&flag); @@ -104027,7 +104799,7 @@ static PHP_METHOD(Phalcon_Assets_Collection, processAddInline) ZEPHIR_INIT_VAR(&_0); ZEPHIR_CONCAT_SV(&_0, "Phalcon\\Assets\\Inline\\", &className); ZEPHIR_CPY_WRT(&name, &_0); - ZEPHIR_CALL_METHOD(&attrs, this_ptr, "processattributes", NULL, 170, &attributes); + ZEPHIR_CALL_METHOD(&attrs, this_ptr, "processattributes", NULL, 171, &attributes); zephir_check_call_status(); ZEPHIR_INIT_VAR(&asset); zephir_fetch_safe_class(&_1, &name); @@ -104440,7 +105212,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, addAssetByType) } else { ZEPHIR_INIT_VAR(&type); } - ZEPHIR_CALL_METHOD(&collection, this_ptr, "checkandcreatecollection", NULL, 171, &type); + ZEPHIR_CALL_METHOD(&collection, this_ptr, "checkandcreatecollection", NULL, 172, &type); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &collection, "add", NULL, 0, asset); zephir_check_call_status(); @@ -104527,7 +105299,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, addCss) } else { ZVAL_BOOL(&_3, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 172, &path, &_1, &_2, &attributes, &version, &_3); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 173, &path, &_1, &_2, &attributes, &version, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); ZVAL_STRING(&_4, "css"); @@ -104585,7 +105357,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, addInlineCodeByType) } else { ZEPHIR_INIT_VAR(&type); } - ZEPHIR_CALL_METHOD(&collection, this_ptr, "checkandcreatecollection", NULL, 171, &type); + ZEPHIR_CALL_METHOD(&collection, this_ptr, "checkandcreatecollection", NULL, 172, &type); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &collection, "addinline", NULL, 0, code); zephir_check_call_status(); @@ -104634,7 +105406,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, addInlineCss) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 173, &content, &_1, &attributes); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 174, &content, &_1, &attributes); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "css"); @@ -104685,7 +105457,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, addInlineJs) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 174, &content, &_1, &attributes); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 175, &content, &_1, &attributes); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "js"); @@ -104774,7 +105546,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, addJs) } else { ZVAL_BOOL(&_3, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 175, &path, &_1, &_2, &attributes, &version, &_3); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 176, &path, &_1, &_2, &attributes, &version, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); ZVAL_STRING(&_4, "js"); @@ -104799,7 +105571,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, collection) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &name_param); zephir_get_strval(&name, name_param); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 171, &name); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 172, &name); zephir_check_call_status(); RETURN_MM(); } @@ -104959,7 +105731,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, getCss) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "css"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 171, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 172, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -104977,7 +105749,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, getJs) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "js"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 171, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 172, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -105188,7 +105960,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, output) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_FUNCTION(&_5$$8, "is_dir", NULL, 137, &completeTargetPath); + ZEPHIR_CALL_FUNCTION(&_5$$8, "is_dir", NULL, 138, &completeTargetPath); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_5$$8)) { ZEPHIR_INIT_VAR(&_6$$10); @@ -105277,13 +106049,13 @@ static PHP_METHOD(Phalcon_Assets_Manager, output) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_21$$21, &asset, "getrealsourcepath", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 176, collection, &_20$$21, &_21$$21); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 177, collection, &_20$$21, &_21$$21); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_23$$21, &asset, "getattributes", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_24$$21, &asset, "islocal", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 177, &callback, &_23$$21, &prefixedPath, &_24$$21); + ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 178, &callback, &_23$$21, &prefixedPath, &_24$$21); zephir_check_call_status(); zephir_read_property(&_26$$21, this_ptr, ZEND_STRL("implicitOutput"), PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_26$$21)) { @@ -105360,12 +106132,12 @@ static PHP_METHOD(Phalcon_Assets_Manager, output) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_31$$36, &asset, "getrealsourcepath", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 176, collection, &_30$$36, &_31$$36); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 177, collection, &_30$$36, &_31$$36); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_32$$36, collection, "getattributes", &_33, 0); zephir_check_call_status(); ZVAL_BOOL(&_34$$36, 1); - ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 177, &callback, &_32$$36, &prefixedPath, &_34$$36); + ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 178, &callback, &_32$$36, &prefixedPath, &_34$$36); zephir_check_call_status(); zephir_read_property(&_34$$36, this_ptr, ZEND_STRL("implicitOutput"), PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_34$$36)) { @@ -105454,13 +106226,13 @@ static PHP_METHOD(Phalcon_Assets_Manager, output) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_46$$49, &asset, "getrealsourcepath", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 176, collection, &_45$$49, &_46$$49); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 177, collection, &_45$$49, &_46$$49); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_47$$49, &asset, "getattributes", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_48$$49, &asset, "islocal", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 177, &callback, &_47$$49, &prefixedPath, &_48$$49); + ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 178, &callback, &_47$$49, &prefixedPath, &_48$$49); zephir_check_call_status(); zephir_read_property(&_49$$49, this_ptr, ZEND_STRL("implicitOutput"), PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_49$$49)) { @@ -105537,12 +106309,12 @@ static PHP_METHOD(Phalcon_Assets_Manager, output) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_54$$64, &asset, "getrealsourcepath", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 176, collection, &_53$$64, &_54$$64); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 177, collection, &_53$$64, &_54$$64); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_55$$64, collection, "getattributes", &_33, 0); zephir_check_call_status(); ZVAL_BOOL(&_56$$64, 1); - ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 177, &callback, &_55$$64, &prefixedPath, &_56$$64); + ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 178, &callback, &_55$$64, &prefixedPath, &_56$$64); zephir_check_call_status(); zephir_read_property(&_56$$64, this_ptr, ZEND_STRL("implicitOutput"), PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_56$$64)) { @@ -105564,13 +106336,13 @@ static PHP_METHOD(Phalcon_Assets_Manager, output) zephir_file_put_contents(NULL, &completeTargetPath, &filteredJoinedContent); ZEPHIR_CALL_METHOD(&_58$$67, collection, "gettargeturi", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 176, collection, &_58$$67, &completeTargetPath); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 177, collection, &_58$$67, &completeTargetPath); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_59$$67, collection, "getattributes", &_33, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_60$$67, collection, "gettargetislocal", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 177, &callback, &_59$$67, &prefixedPath, &_60$$67); + ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 178, &callback, &_59$$67, &prefixedPath, &_60$$67); zephir_check_call_status(); zephir_read_property(&_61$$67, this_ptr, ZEND_STRL("implicitOutput"), PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_61$$67)) { @@ -106150,7 +106922,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, cssLink) ZVAL_STRING(&_2, "text/css"); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "href"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processparameters", NULL, 178, parameters, &_0, &_1, &_2, &_3); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processparameters", NULL, 179, parameters, &_0, &_1, &_2, &_3); zephir_check_call_status(); RETURN_MM(); } @@ -106241,7 +107013,7 @@ static PHP_METHOD(Phalcon_Assets_Manager, jsLink) ZVAL_STRING(&_2, "application/javascript"); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "src"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processparameters", NULL, 178, parameters, &_0, &_1, &_2, &_3); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processparameters", NULL, 179, parameters, &_0, &_1, &_2, &_3); zephir_check_call_status(); RETURN_MM(); } @@ -108237,7 +109009,7 @@ static PHP_METHOD(Phalcon_Translate_Interpolator_IndexedArray, replacePlaceholde } if (1 != ZEPHIR_IS_EMPTY(&placeholders)) { ZEPHIR_MAKE_REF(&placeholders); - ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 270, &placeholders, &translation); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 271, &placeholders, &translation); ZEPHIR_UNREF(&placeholders); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_0$$3); @@ -108819,7 +109591,7 @@ static PHP_METHOD(Phalcon_Translate_Adapter_Csv, phpFopen) zephir_fetch_params(1, 2, 0, &filename_param, &mode_param); zephir_get_strval(&filename, filename_param); zephir_get_strval(&mode, mode_param); - ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 140, &filename, &mode); + ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 141, &filename, &mode); zephir_check_call_status(); RETURN_MM(); } @@ -111995,7 +112767,7 @@ static PHP_METHOD(Phalcon_Paginator_Adapter_Model, paginate) ZEPHIR_INIT_VAR(&_6); ZVAL_STRING(&_6, "count"); zephir_array_fast_append(&_5, &_6); - ZEPHIR_CALL_FUNCTION(&rowCountResult, "call_user_func", NULL, 188, &_5, ¶meters); + ZEPHIR_CALL_FUNCTION(&rowCountResult, "call_user_func", NULL, 189, &_5, ¶meters); zephir_check_call_status(); if (Z_TYPE_P(&rowCountResult) == IS_OBJECT) { ZEPHIR_CALL_METHOD(&_7$$6, &rowCountResult, "count", NULL, 0); @@ -112022,7 +112794,7 @@ static PHP_METHOD(Phalcon_Paginator_Adapter_Model, paginate) ZEPHIR_INIT_VAR(&_11$$10); ZVAL_STRING(&_11$$10, "find"); zephir_array_fast_append(&_10$$10, &_11$$10); - ZEPHIR_CALL_FUNCTION(&_12$$10, "call_user_func", NULL, 188, &_10$$10, ¶meters); + ZEPHIR_CALL_FUNCTION(&_12$$10, "call_user_func", NULL, 189, &_10$$10, ¶meters); zephir_check_call_status(); ZEPHIR_CPY_WRT(&pageItems, &_12$$10); } @@ -115863,7 +116635,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, __set) RETVAL_ZVAL(value, 1, 0); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_15, "property_exists", NULL, 290, this_ptr, &property); + ZEPHIR_CALL_FUNCTION(&_15, "property_exists", NULL, 292, this_ptr, &property); zephir_check_call_status(); if (zephir_is_true(&_15)) { ZEPHIR_CALL_METHOD(&manager, this_ptr, "getmodelsmanager", NULL, 0); @@ -129701,7 +130473,7 @@ static PHP_METHOD(Phalcon_Mvc_View, loadTemplateEngines) ZEPHIR_CALL_CE_STATIC(&_7$$9, _8$$9, "bind", &_9, 0, &engineService, &di); zephir_check_call_status(); ZEPHIR_CPY_WRT(&engineService, &_7$$9); - ZEPHIR_CALL_FUNCTION(&_7$$9, "call_user_func", &_10, 188, &engineService, this_ptr); + ZEPHIR_CALL_FUNCTION(&_7$$9, "call_user_func", &_10, 189, &engineService, this_ptr); zephir_check_call_status(); zephir_array_update_zval(&engines, &extension, &_7$$9, PH_COPY | PH_SEPARATE); } else { @@ -129746,7 +130518,7 @@ static PHP_METHOD(Phalcon_Mvc_View, loadTemplateEngines) ZEPHIR_CALL_CE_STATIC(&_16$$15, _17$$15, "bind", &_9, 0, &engineService, &di); zephir_check_call_status(); ZEPHIR_CPY_WRT(&engineService, &_16$$15); - ZEPHIR_CALL_FUNCTION(&_16$$15, "call_user_func", &_10, 188, &engineService, this_ptr); + ZEPHIR_CALL_FUNCTION(&_16$$15, "call_user_func", &_10, 189, &engineService, this_ptr); zephir_check_call_status(); zephir_array_update_zval(&engines, &extension, &_16$$15, PH_COPY | PH_SEPARATE); } else { @@ -130839,12 +131611,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection) zephir_check_call_status(); } else { object_init_ex(&reflection, zephir_get_internal_ce(SL("reflectionfunction"))); - ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 151, handler); + ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 152, handler); zephir_check_call_status(); } zephir_read_property(&_0, this_ptr, ZEND_STRL("cache"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&cache, &_0); - ZEPHIR_CALL_METHOD(&methodParams, &reflection, "getparameters", NULL, 152); + ZEPHIR_CALL_METHOD(&methodParams, &reflection, "getparameters", NULL, 153); zephir_check_call_status(); ZEPHIR_INIT_VAR(¶msKeys); zephir_array_keys(¶msKeys, ¶ms); @@ -132230,11 +133002,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Criteria, limit) } else { } ZVAL_LONG(&_0, limit); - ZEPHIR_CALL_FUNCTION(&_1, "abs", NULL, 284, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "abs", NULL, 285, &_0); zephir_check_call_status(); limit = zephir_get_numberval(&_1); ZVAL_LONG(&_0, offset); - ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 284, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 285, &_0); zephir_check_call_status(); offset = zephir_get_numberval(&_2); if (UNEXPECTED(limit == 0)) { @@ -135539,10 +136311,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Manager, isVisibleModelProperty) array_init(&publicProperties); ZEPHIR_INIT_VAR(&classReflection); object_init_ex(&classReflection, zephir_get_internal_ce(SL("reflectionclass"))); - ZEPHIR_CALL_METHOD(NULL, &classReflection, "__construct", NULL, 154, &className); + ZEPHIR_CALL_METHOD(NULL, &classReflection, "__construct", NULL, 155, &className); zephir_check_call_status(); ZVAL_LONG(&_1$$3, 1); - ZEPHIR_CALL_METHOD(&reflectionProperties, &classReflection, "getproperties", NULL, 165, &_1$$3); + ZEPHIR_CALL_METHOD(&reflectionProperties, &classReflection, "getproperties", NULL, 166, &_1$$3); zephir_check_call_status(); zephir_is_iterable(&reflectionProperties, 0, "phalcon/Mvc/Model/Manager.zep", 1915); if (Z_TYPE_P(&reflectionProperties) == IS_ARRAY) { @@ -138518,7 +139290,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSql) zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "This type of statement generates multiple SQL statements", "phalcon/Mvc/Model/Query.zep", 521); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "This type of statement generates multiple SQL statements", "phalcon/Mvc/Model/Query.zep", 529); return; } @@ -138581,7 +139353,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, parse) zephir_read_static_property_ce(&_1$$5, phalcon_mvc_model_query_ce, SL("internalPhqlCache"), PH_NOISY_CC | PH_READONLY); if (zephir_array_isset_fetch(&irPhql, &_1$$5, &uniqueId, 0)) { if (Z_TYPE_P(&irPhql) == IS_ARRAY) { - zephir_array_fetch_string(&_2$$7, &ast, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 586); + zephir_array_fetch_string(&_2$$7, &ast, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 594); zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &_2$$7); RETURN_CCTOR(&irPhql); } @@ -138618,7 +139390,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, parse) ZEPHIR_CONCAT_SVSV(&_4$$13, "Unknown statement ", &type, ", when preparing: ", &phql); ZEPHIR_CALL_METHOD(NULL, &_3$$13, "__construct", NULL, 33, &_4$$13); zephir_check_call_status(); - zephir_throw_exception_debug(&_3$$13, "phalcon/Mvc/Model/Query.zep", 620); + zephir_throw_exception_debug(&_3$$13, "phalcon/Mvc/Model/Query.zep", 628); ZEPHIR_MM_RESTORE(); return; } while(0); @@ -138626,7 +139398,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, parse) } } if (UNEXPECTED(Z_TYPE_P(&irPhql) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted AST", "phalcon/Mvc/Model/Query.zep", 626); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted AST", "phalcon/Mvc/Model/Query.zep", 634); return; } if (Z_TYPE_P(&uniqueId) == IS_LONG) { @@ -138734,7 +139506,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, setDI) ZEPHIR_CALL_METHOD(&manager, container, "getshared", NULL, 0, &_0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&manager) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Injected service 'modelsManager' is invalid", "phalcon/Mvc/Model/Query.zep", 690); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Injected service 'modelsManager' is invalid", "phalcon/Mvc/Model/Query.zep", 698); return; } ZEPHIR_INIT_NVAR(&_0); @@ -138742,7 +139514,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, setDI) ZEPHIR_CALL_METHOD(&metaData, container, "getshared", NULL, 0, &_0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&metaData) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Injected service 'modelsMetaData' is invalid", "phalcon/Mvc/Model/Query.zep", 696); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Injected service 'modelsMetaData' is invalid", "phalcon/Mvc/Model/Query.zep", 704); return; } zephir_update_property_zval(this_ptr, ZEND_STRL("manager"), &manager); @@ -138885,13 +139657,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeDelete) zephir_get_arrval(&bindParams, bindParams_param); zephir_get_arrval(&bindTypes, bindTypes_param); zephir_memory_observe(&models); - zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 764); + zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 772); if (UNEXPECTED(zephir_array_isset_long(&models, 1))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Delete from several models at the same time is still not supported", "phalcon/Mvc/Model/Query.zep", 769); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Delete from several models at the same time is still not supported", "phalcon/Mvc/Model/Query.zep", 777); return; } zephir_memory_observe(&modelName); - zephir_array_fetch_long(&modelName, &models, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 772); + zephir_array_fetch_long(&modelName, &models, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 780); zephir_memory_observe(&model); zephir_read_property(&_0, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset_fetch(&model, &_0, &modelName, 0))) { @@ -138950,7 +139722,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeDelete) ZEPHIR_CPY_WRT(&exception, &_9$$6); ZEPHIR_CALL_METHOD(NULL, &connection, "rollback", &_10, 0); zephir_check_call_status(); - zephir_throw_exception_debug(&exception, "phalcon/Mvc/Model/Query.zep", 831); + zephir_throw_exception_debug(&exception, "phalcon/Mvc/Model/Query.zep", 839); ZEPHIR_MM_RESTORE(); return; } @@ -139033,7 +139805,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) zephir_get_arrval(&bindParams, bindParams_param); zephir_get_arrval(&bindTypes, bindTypes_param); zephir_memory_observe(&modelName); - zephir_array_fetch_string(&modelName, &intermediate, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 859); + zephir_array_fetch_string(&modelName, &intermediate, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 867); zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&manager, &_0); zephir_memory_observe(&model); @@ -139062,16 +139834,16 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) } } zephir_memory_observe(&values); - zephir_array_fetch_string(&values, &intermediate, SL("values"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 894); + zephir_array_fetch_string(&values, &intermediate, SL("values"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 902); if (UNEXPECTED(zephir_fast_count_int(&fields) != zephir_fast_count_int(&values))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The column count does not match the values count", "phalcon/Mvc/Model/Query.zep", 903); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The column count does not match the values count", "phalcon/Mvc/Model/Query.zep", 911); return; } ZEPHIR_CALL_METHOD(&dialect, &connection, "getdialect", NULL, 0); zephir_check_call_status(); ZEPHIR_INIT_VAR(&insertValues); array_init(&insertValues); - zephir_is_iterable(&values, 0, "phalcon/Mvc/Model/Query.zep", 974); + zephir_is_iterable(&values, 0, "phalcon/Mvc/Model/Query.zep", 982); if (Z_TYPE_P(&values) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&values), _4, _5, _2) { @@ -139084,8 +139856,8 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_INIT_NVAR(&value); ZVAL_COPY(&value, _2); ZEPHIR_OBS_NVAR(&exprValue); - zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 913); - zephir_array_fetch_string(&_6$$8, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 915); + zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 921); + zephir_array_fetch_string(&_6$$8, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 923); do { if (ZEPHIR_IS_LONG(&_6$$8, 260) || ZEPHIR_IS_LONG(&_6$$8, 258) || ZEPHIR_IS_LONG(&_6$$8, 259)) { ZEPHIR_CALL_METHOD(&insertValue, &dialect, "getsqlexpression", &_7, 0, &exprValue); @@ -139114,7 +139886,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_CONCAT_SVS(&_13$$12, "Bound parameter '", &wildcard, "' cannot be replaced because it isn't in the placeholders list"); ZEPHIR_CALL_METHOD(NULL, &_12$$12, "__construct", &_14, 33, &_13$$12); zephir_check_call_status(); - zephir_throw_exception_debug(&_12$$12, "phalcon/Mvc/Model/Query.zep", 939); + zephir_throw_exception_debug(&_12$$12, "phalcon/Mvc/Model/Query.zep", 947); ZEPHIR_MM_RESTORE(); return; } @@ -139130,7 +139902,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) } while(0); ZEPHIR_OBS_NVAR(&fieldName); - zephir_array_fetch(&fieldName, &fields, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 952); + zephir_array_fetch(&fieldName, &fields, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 960); _18$$8 = automaticFields; if (_18$$8) { _18$$8 = Z_TYPE_P(&columnMap) == IS_ARRAY; @@ -139144,7 +139916,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_CONCAT_SVS(&_20$$15, "Column '", &fieldName, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_19$$15, "__construct", &_14, 33, &_20$$15); zephir_check_call_status(); - zephir_throw_exception_debug(&_19$$15, "phalcon/Mvc/Model/Query.zep", 962); + zephir_throw_exception_debug(&_19$$15, "phalcon/Mvc/Model/Query.zep", 970); ZEPHIR_MM_RESTORE(); return; } @@ -139167,8 +139939,8 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_CALL_METHOD(&value, &values, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&exprValue); - zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 913); - zephir_array_fetch_string(&_21$$17, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 915); + zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 921); + zephir_array_fetch_string(&_21$$17, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 923); do { if (ZEPHIR_IS_LONG(&_21$$17, 260) || ZEPHIR_IS_LONG(&_21$$17, 258) || ZEPHIR_IS_LONG(&_21$$17, 259)) { ZEPHIR_CALL_METHOD(&insertValue, &dialect, "getsqlexpression", &_22, 0, &exprValue); @@ -139197,7 +139969,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_CONCAT_SVS(&_28$$21, "Bound parameter '", &wildcard, "' cannot be replaced because it isn't in the placeholders list"); ZEPHIR_CALL_METHOD(NULL, &_27$$21, "__construct", &_14, 33, &_28$$21); zephir_check_call_status(); - zephir_throw_exception_debug(&_27$$21, "phalcon/Mvc/Model/Query.zep", 939); + zephir_throw_exception_debug(&_27$$21, "phalcon/Mvc/Model/Query.zep", 947); ZEPHIR_MM_RESTORE(); return; } @@ -139213,7 +139985,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) } while(0); ZEPHIR_OBS_NVAR(&fieldName); - zephir_array_fetch(&fieldName, &fields, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 952); + zephir_array_fetch(&fieldName, &fields, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 960); _31$$17 = automaticFields; if (_31$$17) { _31$$17 = Z_TYPE_P(&columnMap) == IS_ARRAY; @@ -139227,7 +139999,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_CONCAT_SVS(&_33$$24, "Column '", &fieldName, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_32$$24, "__construct", &_14, 33, &_33$$24); zephir_check_call_status(); - zephir_throw_exception_debug(&_32$$24, "phalcon/Mvc/Model/Query.zep", 962); + zephir_throw_exception_debug(&_32$$24, "phalcon/Mvc/Model/Query.zep", 970); ZEPHIR_MM_RESTORE(); return; } @@ -139393,8 +140165,8 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_VAR(&connectionTypes); array_init(&connectionTypes); zephir_memory_observe(&models); - zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1011); - zephir_is_iterable(&models, 0, "phalcon/Mvc/Model/Query.zep", 1039); + zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1019); + zephir_is_iterable(&models, 0, "phalcon/Mvc/Model/Query.zep", 1047); if (Z_TYPE_P(&models) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&models), _1) { @@ -139414,7 +140186,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_check_call_status(); zephir_array_update_zval(&connectionTypes, &_6$$5, &__$true, PH_COPY | PH_SEPARATE); if (UNEXPECTED(zephir_fast_count_int(&connectionTypes) == 2)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cannot use models of different database systems in the same query", "phalcon/Mvc/Model/Query.zep", 1034); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cannot use models of different database systems in the same query", "phalcon/Mvc/Model/Query.zep", 1042); return; } } @@ -139444,7 +140216,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_check_call_status(); zephir_array_update_zval(&connectionTypes, &_9$$9, &__$true, PH_COPY | PH_SEPARATE); if (UNEXPECTED(zephir_fast_count_int(&connectionTypes) == 2)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cannot use models of different database systems in the same query", "phalcon/Mvc/Model/Query.zep", 1034); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cannot use models of different database systems in the same query", "phalcon/Mvc/Model/Query.zep", 1042); return; } } @@ -139454,23 +140226,23 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) } ZEPHIR_INIT_NVAR(&modelName); zephir_memory_observe(&columns); - zephir_array_fetch_string(&columns, &intermediate, SL("columns"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1039); + zephir_array_fetch_string(&columns, &intermediate, SL("columns"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1047); haveObjects = 0; haveScalars = 0; isComplex = 0; numberObjects = 0; ZEPHIR_CPY_WRT(&columns1, &columns); - zephir_is_iterable(&columns, 0, "phalcon/Mvc/Model/Query.zep", 1067); + zephir_is_iterable(&columns, 0, "phalcon/Mvc/Model/Query.zep", 1075); if (Z_TYPE_P(&columns) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&columns), _10) { ZEPHIR_INIT_NVAR(&column); ZVAL_COPY(&column, _10); if (UNEXPECTED(Z_TYPE_P(&column) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid column definition", "phalcon/Mvc/Model/Query.zep", 1051); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid column definition", "phalcon/Mvc/Model/Query.zep", 1059); return; } - zephir_array_fetch_string(&_12$$11, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1054); + zephir_array_fetch_string(&_12$$11, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1062); if (ZEPHIR_IS_STRING(&_12$$11, "scalar")) { if (!(zephir_array_isset_string(&column, SL("balias")))) { isComplex = 1; @@ -139493,10 +140265,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_CALL_METHOD(&column, &columns, "current", NULL, 0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&column) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid column definition", "phalcon/Mvc/Model/Query.zep", 1051); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid column definition", "phalcon/Mvc/Model/Query.zep", 1059); return; } - zephir_array_fetch_string(&_13$$16, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1054); + zephir_array_fetch_string(&_13$$16, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1062); if (ZEPHIR_IS_STRING(&_13$$16, "scalar")) { if (!(zephir_array_isset_string(&column, SL("balias")))) { isComplex = 1; @@ -139534,7 +140306,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) array_init(&simpleColumnMap); zephir_read_property(&_0, this_ptr, ZEND_STRL("metaData"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&metaData, &_0); - zephir_is_iterable(&columns, 0, "phalcon/Mvc/Model/Query.zep", 1173); + zephir_is_iterable(&columns, 0, "phalcon/Mvc/Model/Query.zep", 1181); if (Z_TYPE_P(&columns) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&columns), _16, _17, _14) { @@ -139547,11 +140319,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&column); ZVAL_COPY(&column, _14); ZEPHIR_OBS_NVAR(&sqlColumn); - zephir_array_fetch_string(&sqlColumn, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1090); - zephir_array_fetch_string(&_18$$28, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1093); + zephir_array_fetch_string(&sqlColumn, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1098); + zephir_array_fetch_string(&_18$$28, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1101); if (ZEPHIR_IS_STRING(&_18$$28, "object")) { ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &column, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1094); + zephir_array_fetch_string(&modelName, &column, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1102); ZEPHIR_OBS_NVAR(&instance); zephir_read_property(&_19$$29, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset_fetch(&instance, &_19$$29, &modelName, 0))) { @@ -139569,7 +140341,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&columnMap); ZVAL_NULL(&columnMap); } - zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1130); + zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1138); if (Z_TYPE_P(&attributes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _23$$31) { @@ -139582,7 +140354,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&_26$$34); ZEPHIR_CONCAT_SVSV(&_26$$34, "_", &sqlColumn, "_", &attribute); zephir_array_fast_append(&_25$$34, &_26$$34); - zephir_array_append(&selectColumns, &_25$$34, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1123); + zephir_array_append(&selectColumns, &_25$$34, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1131); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &attributes, "rewind", NULL, 0); @@ -139602,7 +140374,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&_28$$35); ZEPHIR_CONCAT_SVSV(&_28$$35, "_", &sqlColumn, "_", &attribute); zephir_array_fast_append(&_27$$35, &_28$$35); - zephir_array_append(&selectColumns, &_27$$35, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1123); + zephir_array_append(&selectColumns, &_27$$35, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1131); ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0); zephir_check_call_status(); } @@ -139620,7 +140392,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_array_update_multi(&columns1, &_31$$36, SL("zs"), 3, &aliasCopy, SL("keepSnapshots")); } } else { - zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1147); + zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1155); if (Z_TYPE_P(&attributes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _32$$37) { @@ -139630,7 +140402,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_34$$38, 2, 0); zephir_array_fast_append(&_34$$38, &attribute); zephir_array_fast_append(&_34$$38, &sqlColumn); - zephir_array_append(&selectColumns, &_34$$38, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1145); + zephir_array_append(&selectColumns, &_34$$38, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1153); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &attributes, "rewind", NULL, 0); @@ -139647,7 +140419,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_35$$39, 2, 0); zephir_array_fast_append(&_35$$39, &attribute); zephir_array_fast_append(&_35$$39, &sqlColumn); - zephir_array_append(&selectColumns, &_35$$39, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1145); + zephir_array_append(&selectColumns, &_35$$39, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1153); ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0); zephir_check_call_status(); } @@ -139670,7 +140442,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_array_fast_append(&_37$$42, &aliasCopy); ZEPHIR_CPY_WRT(&columnAlias, &_37$$42); } - zephir_array_append(&selectColumns, &columnAlias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1158); + zephir_array_append(&selectColumns, &columnAlias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1166); } _38$$28 = !isComplex; if (_38$$28) { @@ -139699,11 +140471,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_CALL_METHOD(&column, &columns, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&sqlColumn); - zephir_array_fetch_string(&sqlColumn, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1090); - zephir_array_fetch_string(&_39$$46, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1093); + zephir_array_fetch_string(&sqlColumn, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1098); + zephir_array_fetch_string(&_39$$46, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1101); if (ZEPHIR_IS_STRING(&_39$$46, "object")) { ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &column, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1094); + zephir_array_fetch_string(&modelName, &column, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1102); ZEPHIR_OBS_NVAR(&instance); zephir_read_property(&_40$$47, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset_fetch(&instance, &_40$$47, &modelName, 0))) { @@ -139721,7 +140493,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&columnMap); ZVAL_NULL(&columnMap); } - zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1130); + zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1138); if (Z_TYPE_P(&attributes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _44$$49) { @@ -139734,7 +140506,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&_47$$52); ZEPHIR_CONCAT_SVSV(&_47$$52, "_", &sqlColumn, "_", &attribute); zephir_array_fast_append(&_46$$52, &_47$$52); - zephir_array_append(&selectColumns, &_46$$52, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1123); + zephir_array_append(&selectColumns, &_46$$52, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1131); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &attributes, "rewind", NULL, 0); @@ -139754,7 +140526,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&_49$$53); ZEPHIR_CONCAT_SVSV(&_49$$53, "_", &sqlColumn, "_", &attribute); zephir_array_fast_append(&_48$$53, &_49$$53); - zephir_array_append(&selectColumns, &_48$$53, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1123); + zephir_array_append(&selectColumns, &_48$$53, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1131); ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0); zephir_check_call_status(); } @@ -139772,7 +140544,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_array_update_multi(&columns1, &_52$$54, SL("zs"), 3, &aliasCopy, SL("keepSnapshots")); } } else { - zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1147); + zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1155); if (Z_TYPE_P(&attributes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _53$$55) { @@ -139782,7 +140554,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_55$$56, 2, 0); zephir_array_fast_append(&_55$$56, &attribute); zephir_array_fast_append(&_55$$56, &sqlColumn); - zephir_array_append(&selectColumns, &_55$$56, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1145); + zephir_array_append(&selectColumns, &_55$$56, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1153); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &attributes, "rewind", NULL, 0); @@ -139799,7 +140571,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_56$$57, 2, 0); zephir_array_fast_append(&_56$$57, &attribute); zephir_array_fast_append(&_56$$57, &sqlColumn); - zephir_array_append(&selectColumns, &_56$$57, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1145); + zephir_array_append(&selectColumns, &_56$$57, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1153); ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0); zephir_check_call_status(); } @@ -139821,7 +140593,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_array_fast_append(&_58$$60, &aliasCopy); ZEPHIR_CPY_WRT(&columnAlias, &_58$$60); } - zephir_array_append(&selectColumns, &columnAlias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1158); + zephir_array_append(&selectColumns, &columnAlias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1166); } _59$$46 = !isComplex; if (_59$$46) { @@ -139846,7 +140618,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_VAR(&bindCounts); array_init(&bindCounts); zephir_array_update_string(&intermediate, SL("columns"), &selectColumns, PH_COPY | PH_SEPARATE); - zephir_is_iterable(&bindParams, 0, "phalcon/Mvc/Model/Query.zep", 1194); + zephir_is_iterable(&bindParams, 0, "phalcon/Mvc/Model/Query.zep", 1202); if (Z_TYPE_P(&bindParams) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&bindParams), _62, _63, _60) { @@ -139904,7 +140676,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&wildcard); ZEPHIR_INIT_VAR(&processedTypes); array_init(&processedTypes); - zephir_is_iterable(&bindTypes, 0, "phalcon/Mvc/Model/Query.zep", 1207); + zephir_is_iterable(&bindTypes, 0, "phalcon/Mvc/Model/Query.zep", 1215); if (Z_TYPE_P(&bindTypes) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&bindTypes), _68, _69, _66) { @@ -140009,7 +140781,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) array_init(&simpleColumnMap); ZEPHIR_CALL_METHOD(&_74$$90, &metaData, "getattributes", NULL, 0, &resultObject); zephir_check_call_status(); - zephir_is_iterable(&_74$$90, 0, "phalcon/Mvc/Model/Query.zep", 1295); + zephir_is_iterable(&_74$$90, 0, "phalcon/Mvc/Model/Query.zep", 1303); if (Z_TYPE_P(&_74$$90) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_74$$90), _75$$90) { @@ -140019,7 +140791,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_77$$91, 2, 0); zephir_array_fast_append(&_77$$91, &attribute); ZEPHIR_OBS_NVAR(&_78$$91); - zephir_array_fetch(&_78$$91, &typesColumnMap, &attribute, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1293); + zephir_array_fetch(&_78$$91, &typesColumnMap, &attribute, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1301); zephir_array_fast_append(&_77$$91, &_78$$91); zephir_array_update_zval(&simpleColumnMap, &attribute, &_77$$91, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -140038,7 +140810,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_79$$92, 2, 0); zephir_array_fast_append(&_79$$92, &attribute); ZEPHIR_OBS_NVAR(&_80$$92); - zephir_array_fetch(&_80$$92, &typesColumnMap, &attribute, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1293); + zephir_array_fetch(&_80$$92, &typesColumnMap, &attribute, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1301); zephir_array_fast_append(&_79$$92, &_80$$92); zephir_array_update_zval(&simpleColumnMap, &attribute, &_79$$92, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &_74$$90, "next", NULL, 0); @@ -140048,7 +140820,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&attribute); } else { array_init(&simpleColumnMap); - zephir_is_iterable(&columnMap, 0, "phalcon/Mvc/Model/Query.zep", 1304); + zephir_is_iterable(&columnMap, 0, "phalcon/Mvc/Model/Query.zep", 1312); if (Z_TYPE_P(&columnMap) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&columnMap), _83$$93, _84$$93, _81$$93) { @@ -140064,7 +140836,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_85$$94, 2, 0); zephir_array_fast_append(&_85$$94, &attribute); ZEPHIR_OBS_NVAR(&_86$$94); - zephir_array_fetch(&_86$$94, &typesColumnMap, &column, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1302); + zephir_array_fetch(&_86$$94, &typesColumnMap, &column, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1310); zephir_array_fast_append(&_85$$94, &_86$$94); zephir_array_update_zval(&simpleColumnMap, &column, &_85$$94, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -140085,7 +140857,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_87$$95, 2, 0); zephir_array_fast_append(&_87$$95, &attribute); ZEPHIR_OBS_NVAR(&_88$$95); - zephir_array_fetch(&_88$$95, &typesColumnMap, &column, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1302); + zephir_array_fetch(&_88$$95, &typesColumnMap, &column, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1310); zephir_array_fast_append(&_87$$95, &_88$$95); zephir_array_update_zval(&simpleColumnMap, &column, &_87$$95, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &columnMap, "next", NULL, 0); @@ -140115,7 +140887,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_CONCAT_SVS(&_92$$98, "Resultset class \"", &resultsetClassName, "\" not found"); ZEPHIR_CALL_METHOD(NULL, &_91$$98, "__construct", NULL, 33, &_92$$98); zephir_check_call_status(); - zephir_throw_exception_debug(&_91$$98, "phalcon/Mvc/Model/Query.zep", 1320); + zephir_throw_exception_debug(&_91$$98, "phalcon/Mvc/Model/Query.zep", 1328); ZEPHIR_MM_RESTORE(); return; } @@ -140130,7 +140902,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_CONCAT_SVS(&_96$$99, "Resultset class \"", &resultsetClassName, "\" must be an implementation of Phalcon\\Mvc\\Model\\ResultsetInterface"); ZEPHIR_CALL_METHOD(NULL, &_95$$99, "__construct", NULL, 33, &_96$$99); zephir_check_call_status(); - zephir_throw_exception_debug(&_95$$99, "phalcon/Mvc/Model/Query.zep", 1326); + zephir_throw_exception_debug(&_95$$99, "phalcon/Mvc/Model/Query.zep", 1334); ZEPHIR_MM_RESTORE(); return; } @@ -140233,13 +141005,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) zephir_get_arrval(&bindParams, bindParams_param); zephir_get_arrval(&bindTypes, bindTypes_param); zephir_memory_observe(&models); - zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1375); + zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1383); if (UNEXPECTED(zephir_array_isset_long(&models, 1))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Updating several models at the same time is still not supported", "phalcon/Mvc/Model/Query.zep", 1380); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Updating several models at the same time is still not supported", "phalcon/Mvc/Model/Query.zep", 1388); return; } zephir_memory_observe(&modelName); - zephir_array_fetch_long(&modelName, &models, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1383); + zephir_array_fetch_long(&modelName, &models, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1391); zephir_memory_observe(&model); zephir_read_property(&_0, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset_fetch(&model, &_0, &modelName, 0))) { @@ -140252,14 +141024,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) ZEPHIR_CALL_METHOD(&dialect, &connection, "getdialect", NULL, 0); zephir_check_call_status(); zephir_memory_observe(&fields); - zephir_array_fetch_string(&fields, &intermediate, SL("fields"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1402); + zephir_array_fetch_string(&fields, &intermediate, SL("fields"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1410); zephir_memory_observe(&values); - zephir_array_fetch_string(&values, &intermediate, SL("values"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1403); + zephir_array_fetch_string(&values, &intermediate, SL("values"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1411); ZEPHIR_INIT_VAR(&updateValues); array_init(&updateValues); ZEPHIR_CPY_WRT(&selectBindParams, &bindParams); ZEPHIR_CPY_WRT(&selectBindTypes, &bindTypes); - zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 1475); + zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 1483); if (Z_TYPE_P(&fields) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _4, _5, _2) { @@ -140272,17 +141044,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) ZEPHIR_INIT_NVAR(&field); ZVAL_COPY(&field, _2); ZEPHIR_OBS_NVAR(&value); - zephir_array_fetch(&value, &values, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1418); + zephir_array_fetch(&value, &values, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1426); ZEPHIR_OBS_NVAR(&exprValue); - zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1419); + zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1427); if (zephir_array_isset_string(&field, SL("balias"))) { ZEPHIR_OBS_NVAR(&fieldName); - zephir_array_fetch_string(&fieldName, &field, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1422); + zephir_array_fetch_string(&fieldName, &field, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1430); } else { ZEPHIR_OBS_NVAR(&fieldName); - zephir_array_fetch_string(&fieldName, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1424); + zephir_array_fetch_string(&fieldName, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1432); } - zephir_array_fetch_string(&_6$$5, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1427); + zephir_array_fetch_string(&_6$$5, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1435); do { if (ZEPHIR_IS_LONG(&_6$$5, 260) || ZEPHIR_IS_LONG(&_6$$5, 258) || ZEPHIR_IS_LONG(&_6$$5, 259)) { ZEPHIR_CALL_METHOD(&updateValue, &dialect, "getsqlexpression", &_7, 0, &exprValue); @@ -140311,7 +141083,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) ZEPHIR_CONCAT_SVS(&_13$$11, "Bound parameter '", &wildcard, "' cannot be replaced because it's not in the placeholders list"); ZEPHIR_CALL_METHOD(NULL, &_12$$11, "__construct", &_14, 33, &_13$$11); zephir_check_call_status(); - zephir_throw_exception_debug(&_12$$11, "phalcon/Mvc/Model/Query.zep", 1450); + zephir_throw_exception_debug(&_12$$11, "phalcon/Mvc/Model/Query.zep", 1458); ZEPHIR_MM_RESTORE(); return; } @@ -140320,7 +141092,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) break; } if (ZEPHIR_IS_LONG(&_6$$5, 277)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not supported", "phalcon/Mvc/Model/Query.zep", 1459); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not supported", "phalcon/Mvc/Model/Query.zep", 1467); return; } ZEPHIR_INIT_NVAR(&updateValue); @@ -140348,17 +141120,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) ZEPHIR_CALL_METHOD(&field, &fields, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&value); - zephir_array_fetch(&value, &values, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1418); + zephir_array_fetch(&value, &values, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1426); ZEPHIR_OBS_NVAR(&exprValue); - zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1419); + zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1427); if (zephir_array_isset_string(&field, SL("balias"))) { ZEPHIR_OBS_NVAR(&fieldName); - zephir_array_fetch_string(&fieldName, &field, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1422); + zephir_array_fetch_string(&fieldName, &field, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1430); } else { ZEPHIR_OBS_NVAR(&fieldName); - zephir_array_fetch_string(&fieldName, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1424); + zephir_array_fetch_string(&fieldName, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1432); } - zephir_array_fetch_string(&_18$$14, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1427); + zephir_array_fetch_string(&_18$$14, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1435); do { if (ZEPHIR_IS_LONG(&_18$$14, 260) || ZEPHIR_IS_LONG(&_18$$14, 258) || ZEPHIR_IS_LONG(&_18$$14, 259)) { ZEPHIR_CALL_METHOD(&updateValue, &dialect, "getsqlexpression", &_19, 0, &exprValue); @@ -140387,7 +141159,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) ZEPHIR_CONCAT_SVS(&_25$$20, "Bound parameter '", &wildcard, "' cannot be replaced because it's not in the placeholders list"); ZEPHIR_CALL_METHOD(NULL, &_24$$20, "__construct", &_14, 33, &_25$$20); zephir_check_call_status(); - zephir_throw_exception_debug(&_24$$20, "phalcon/Mvc/Model/Query.zep", 1450); + zephir_throw_exception_debug(&_24$$20, "phalcon/Mvc/Model/Query.zep", 1458); ZEPHIR_MM_RESTORE(); return; } @@ -140396,7 +141168,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) break; } if (ZEPHIR_IS_LONG(&_18$$14, 277)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not supported", "phalcon/Mvc/Model/Query.zep", 1459); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not supported", "phalcon/Mvc/Model/Query.zep", 1467); return; } ZEPHIR_INIT_NVAR(&updateValue); @@ -140468,7 +141240,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) ZEPHIR_CPY_WRT(&exception, &_35$$24); ZEPHIR_CALL_METHOD(NULL, &connection, "rollback", &_36, 0); zephir_check_call_status(); - zephir_throw_exception_debug(&exception, "phalcon/Mvc/Model/Query.zep", 1525); + zephir_throw_exception_debug(&exception, "phalcon/Mvc/Model/Query.zep", 1533); ZEPHIR_MM_RESTORE(); return; } @@ -140500,7 +141272,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getCallArgument) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &argument_param); ZEPHIR_OBS_COPY_OR_DUP(&argument, argument_param); - zephir_array_fetch_string(&_0, &argument, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1542); + zephir_array_fetch_string(&_0, &argument, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1550); if (ZEPHIR_IS_LONG(&_0, 352)) { zephir_create_array(return_value, 1, 0); add_assoc_stringl_ex(return_value, SL("type"), SL("all")); @@ -140550,8 +141322,8 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression) ZEPHIR_OBS_COPY_OR_DUP(&expr, expr_param); ZEPHIR_INIT_VAR(&whenClauses); array_init(&whenClauses); - zephir_array_fetch_string(&_0, &expr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1560); - zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model/Query.zep", 1575); + zephir_array_fetch_string(&_0, &expr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1568); + zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model/Query.zep", 1583); if (Z_TYPE_P(&_0) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _1) { @@ -140561,24 +141333,24 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression) ZEPHIR_INIT_NVAR(&_3$$4); zephir_create_array(&_3$$4, 3, 0); add_assoc_stringl_ex(&_3$$4, SL("type"), SL("when")); - zephir_array_fetch_string(&_5$$4, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1564); + zephir_array_fetch_string(&_5$$4, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1572); ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "getexpression", &_6, 461, &_5$$4); zephir_check_call_status(); zephir_array_update_string(&_3$$4, SL("expr"), &_4$$4, PH_COPY | PH_SEPARATE); - zephir_array_fetch_string(&_7$$4, &whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1565); + zephir_array_fetch_string(&_7$$4, &whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1573); ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "getexpression", &_6, 461, &_7$$4); zephir_check_call_status(); zephir_array_update_string(&_3$$4, SL("then"), &_4$$4, PH_COPY | PH_SEPARATE); - zephir_array_append(&whenClauses, &_3$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1566); + zephir_array_append(&whenClauses, &_3$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1574); } else { ZEPHIR_INIT_NVAR(&_8$$5); zephir_create_array(&_8$$5, 2, 0); add_assoc_stringl_ex(&_8$$5, SL("type"), SL("else")); - zephir_array_fetch_string(&_10$$5, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1570); + zephir_array_fetch_string(&_10$$5, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1578); ZEPHIR_CALL_METHOD(&_9$$5, this_ptr, "getexpression", &_6, 461, &_10$$5); zephir_check_call_status(); zephir_array_update_string(&_8$$5, SL("expr"), &_9$$5, PH_COPY | PH_SEPARATE); - zephir_array_append(&whenClauses, &_8$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1571); + zephir_array_append(&whenClauses, &_8$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1579); } } ZEND_HASH_FOREACH_END(); } else { @@ -140596,24 +141368,24 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression) ZEPHIR_INIT_NVAR(&_11$$7); zephir_create_array(&_11$$7, 3, 0); add_assoc_stringl_ex(&_11$$7, SL("type"), SL("when")); - zephir_array_fetch_string(&_13$$7, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1564); + zephir_array_fetch_string(&_13$$7, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1572); ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "getexpression", &_6, 461, &_13$$7); zephir_check_call_status(); zephir_array_update_string(&_11$$7, SL("expr"), &_12$$7, PH_COPY | PH_SEPARATE); - zephir_array_fetch_string(&_14$$7, &whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1565); + zephir_array_fetch_string(&_14$$7, &whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1573); ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "getexpression", &_6, 461, &_14$$7); zephir_check_call_status(); zephir_array_update_string(&_11$$7, SL("then"), &_12$$7, PH_COPY | PH_SEPARATE); - zephir_array_append(&whenClauses, &_11$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1566); + zephir_array_append(&whenClauses, &_11$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1574); } else { ZEPHIR_INIT_NVAR(&_15$$8); zephir_create_array(&_15$$8, 2, 0); add_assoc_stringl_ex(&_15$$8, SL("type"), SL("else")); - zephir_array_fetch_string(&_17$$8, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1570); + zephir_array_fetch_string(&_17$$8, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1578); ZEPHIR_CALL_METHOD(&_16$$8, this_ptr, "getexpression", &_6, 461, &_17$$8); zephir_check_call_status(); zephir_array_update_string(&_15$$8, SL("expr"), &_16$$8, PH_COPY | PH_SEPARATE); - zephir_array_append(&whenClauses, &_15$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1571); + zephir_array_append(&whenClauses, &_15$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1579); } ZEPHIR_CALL_METHOD(NULL, &_0, "next", NULL, 0); zephir_check_call_status(); @@ -140622,7 +141394,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression) ZEPHIR_INIT_NVAR(&whenExpr); zephir_create_array(return_value, 3, 0); add_assoc_stringl_ex(return_value, SL("type"), SL("case")); - zephir_array_fetch_string(&_19, &expr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1577); + zephir_array_fetch_string(&_19, &expr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1585); ZEPHIR_CALL_METHOD(&_18, this_ptr, "getexpression", &_6, 461, &_19); zephir_check_call_status(); zephir_array_update_string(return_value, SL("expr"), &_18, PH_COPY | PH_SEPARATE); @@ -140963,7 +141735,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) zephir_create_array(&_18$$25, 2, 0); add_assoc_stringl_ex(&_18$$25, SL("type"), SL("literal")); zephir_memory_observe(&_19$$25); - zephir_array_fetch_string(&_19$$25, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1793); + zephir_array_fetch_string(&_19$$25, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1801); zephir_array_update_string(&_18$$25, SL("value"), &_19$$25, PH_COPY | PH_SEPARATE); ZEPHIR_CPY_WRT(&exprReturn, &_18$$25); break; @@ -140986,9 +141758,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) } if (ZEPHIR_IS_LONG(&exprType, 260)) { zephir_memory_observe(&value); - zephir_array_fetch_string(&value, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1814); + zephir_array_fetch_string(&value, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1822); if (quoting) { - if (zephir_memnstr_str(&value, SL("'"), "phalcon/Mvc/Model/Query.zep", 1821)) { + if (zephir_memnstr_str(&value, SL("'"), "phalcon/Mvc/Model/Query.zep", 1829)) { ZEPHIR_INIT_VAR(&escapedValue); phalcon_orm_singlequotes(&escapedValue, &value); } else { @@ -141011,7 +141783,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) zephir_create_array(&_23$$33, 2, 0); add_assoc_stringl_ex(&_23$$33, SL("type"), SL("placeholder")); ZEPHIR_INIT_VAR(&_24$$33); - zephir_array_fetch_string(&_25$$33, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1842); + zephir_array_fetch_string(&_25$$33, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1850); ZEPHIR_INIT_VAR(&_26$$33); ZVAL_STRING(&_26$$33, "?"); ZEPHIR_INIT_VAR(&_27$$33); @@ -141025,7 +141797,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZEPHIR_INIT_VAR(&_28$$34); zephir_create_array(&_28$$34, 2, 0); add_assoc_stringl_ex(&_28$$34, SL("type"), SL("placeholder")); - zephir_array_fetch_string(&_29$$34, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1851); + zephir_array_fetch_string(&_29$$34, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1859); ZEPHIR_INIT_VAR(&_30$$34); ZEPHIR_CONCAT_SV(&_30$$34, ":", &_29$$34); zephir_array_update_string(&_28$$34, SL("value"), &_30$$34, PH_COPY | PH_SEPARATE); @@ -141034,14 +141806,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) } if (ZEPHIR_IS_LONG(&exprType, 277)) { ZEPHIR_OBS_NVAR(&value); - zephir_array_fetch_string(&value, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1856); - if (zephir_memnstr_str(&value, SL(":"), "phalcon/Mvc/Model/Query.zep", 1858)) { + zephir_array_fetch_string(&value, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1864); + if (zephir_memnstr_str(&value, SL(":"), "phalcon/Mvc/Model/Query.zep", 1866)) { ZEPHIR_INIT_VAR(&valueParts); zephir_fast_explode_str(&valueParts, SL(":"), &value, LONG_MAX); zephir_memory_observe(&name); - zephir_array_fetch_long(&name, &valueParts, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1860); + zephir_array_fetch_long(&name, &valueParts, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1868); zephir_memory_observe(&bindType); - zephir_array_fetch_long(&bindType, &valueParts, 1, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1861); + zephir_array_fetch_long(&bindType, &valueParts, 1, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1869); do { if (ZEPHIR_IS_STRING(&bindType, "str")) { ZEPHIR_INIT_VAR(&_31$$37); @@ -141131,7 +141903,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZEPHIR_CONCAT_SV(&_51$$44, "Bind value is required for array type placeholder: ", &name); ZEPHIR_CALL_METHOD(NULL, &_50$$44, "__construct", NULL, 33, &_51$$44); zephir_check_call_status(); - zephir_throw_exception_debug(&_50$$44, "phalcon/Mvc/Model/Query.zep", 1931); + zephir_throw_exception_debug(&_50$$44, "phalcon/Mvc/Model/Query.zep", 1939); ZEPHIR_MM_RESTORE(); return; } @@ -141142,7 +141914,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZEPHIR_CONCAT_SV(&_53$$45, "Bind type requires an array in placeholder: ", &name); ZEPHIR_CALL_METHOD(NULL, &_52$$45, "__construct", NULL, 33, &_53$$45); zephir_check_call_status(); - zephir_throw_exception_debug(&_52$$45, "phalcon/Mvc/Model/Query.zep", 1937); + zephir_throw_exception_debug(&_52$$45, "phalcon/Mvc/Model/Query.zep", 1945); ZEPHIR_MM_RESTORE(); return; } @@ -141153,7 +141925,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZEPHIR_CONCAT_SV(&_55$$46, "At least one value must be bound in placeholder: ", &name); ZEPHIR_CALL_METHOD(NULL, &_54$$46, "__construct", NULL, 33, &_55$$46); zephir_check_call_status(); - zephir_throw_exception_debug(&_54$$46, "phalcon/Mvc/Model/Query.zep", 1943); + zephir_throw_exception_debug(&_54$$46, "phalcon/Mvc/Model/Query.zep", 1951); ZEPHIR_MM_RESTORE(); return; } @@ -141174,7 +141946,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZEPHIR_CONCAT_SV(&_59$$47, "Unknown bind type: ", &bindType); ZEPHIR_CALL_METHOD(NULL, &_58$$47, "__construct", NULL, 33, &_59$$47); zephir_check_call_status(); - zephir_throw_exception_debug(&_58$$47, "phalcon/Mvc/Model/Query.zep", 1958); + zephir_throw_exception_debug(&_58$$47, "phalcon/Mvc/Model/Query.zep", 1966); ZEPHIR_MM_RESTORE(); return; } while(0); @@ -141356,7 +142128,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) zephir_create_array(&_79$$66, 2, 0); add_assoc_stringl_ex(&_79$$66, SL("type"), SL("literal")); zephir_memory_observe(&_80$$66); - zephir_array_fetch_string(&_80$$66, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2134); + zephir_array_fetch_string(&_80$$66, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2142); zephir_array_update_string(&_79$$66, SL("value"), &_80$$66, PH_COPY | PH_SEPARATE); ZEPHIR_CPY_WRT(&exprReturn, &_79$$66); break; @@ -141388,7 +142160,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZEPHIR_CONCAT_SV(&_85$$70, "Unknown expression type ", &exprType); ZEPHIR_CALL_METHOD(NULL, &_84$$70, "__construct", NULL, 33, &_85$$70); zephir_check_call_status(); - zephir_throw_exception_debug(&_84$$70, "phalcon/Mvc/Model/Query.zep", 2157); + zephir_throw_exception_debug(&_84$$70, "phalcon/Mvc/Model/Query.zep", 2165); ZEPHIR_MM_RESTORE(); return; } while(0); @@ -141403,7 +142175,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) if (zephir_array_isset_long(&expr, 0)) { ZEPHIR_INIT_VAR(&listItems); array_init(&listItems); - zephir_is_iterable(&expr, 0, "phalcon/Mvc/Model/Query.zep", 2180); + zephir_is_iterable(&expr, 0, "phalcon/Mvc/Model/Query.zep", 2188); if (Z_TYPE_P(&expr) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&expr), _86$$72) { @@ -141411,7 +142183,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZVAL_COPY(&exprListItem, _86$$72); ZEPHIR_CALL_METHOD(&_88$$73, this_ptr, "getexpression", NULL, 461, &exprListItem); zephir_check_call_status(); - zephir_array_append(&listItems, &_88$$73, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2177); + zephir_array_append(&listItems, &_88$$73, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2185); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &expr, "rewind", NULL, 0); @@ -141426,7 +142198,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_89$$74, this_ptr, "getexpression", NULL, 461, &exprListItem); zephir_check_call_status(); - zephir_array_append(&listItems, &_89$$74, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2177); + zephir_array_append(&listItems, &_89$$74, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2185); ZEPHIR_CALL_METHOD(NULL, &expr, "next", NULL, 0); zephir_check_call_status(); } @@ -141437,7 +142209,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) zephir_array_fast_append(return_value, &listItems); RETURN_MM(); } - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Unknown expression", "phalcon/Mvc/Model/Query.zep", 2186); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Unknown expression", "phalcon/Mvc/Model/Query.zep", 2194); return; } @@ -141480,7 +142252,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) if (zephir_array_isset_long(&arguments, 0)) { ZEPHIR_INIT_VAR(&functionArgs); array_init(&functionArgs); - zephir_is_iterable(&arguments, 0, "phalcon/Mvc/Model/Query.zep", 2212); + zephir_is_iterable(&arguments, 0, "phalcon/Mvc/Model/Query.zep", 2220); if (Z_TYPE_P(&arguments) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&arguments), _0$$6) { @@ -141488,7 +142260,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) ZVAL_COPY(&argument, _0$$6); ZEPHIR_CALL_METHOD(&_2$$7, this_ptr, "getcallargument", &_3, 465, &argument); zephir_check_call_status(); - zephir_array_append(&functionArgs, &_2$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2210); + zephir_array_append(&functionArgs, &_2$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2218); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &arguments, "rewind", NULL, 0); @@ -141503,7 +142275,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_4$$8, this_ptr, "getcallargument", &_3, 465, &argument); zephir_check_call_status(); - zephir_array_append(&functionArgs, &_4$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2210); + zephir_array_append(&functionArgs, &_4$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2218); ZEPHIR_CALL_METHOD(NULL, &arguments, "next", NULL, 0); zephir_check_call_status(); } @@ -141521,7 +142293,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) zephir_create_array(return_value, 4, 0); add_assoc_stringl_ex(return_value, SL("type"), SL("functionCall")); zephir_memory_observe(&_7$$10); - zephir_array_fetch_string(&_7$$10, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2222); + zephir_array_fetch_string(&_7$$10, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2230); zephir_array_update_string(return_value, SL("name"), &_7$$10, PH_COPY | PH_SEPARATE); zephir_array_update_string(return_value, SL("arguments"), &functionArgs, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_VAR(&_8$$10); @@ -141532,7 +142304,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) zephir_create_array(return_value, 3, 0); add_assoc_stringl_ex(return_value, SL("type"), SL("functionCall")); zephir_memory_observe(&_9$$11); - zephir_array_fetch_string(&_9$$11, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2229); + zephir_array_fetch_string(&_9$$11, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2237); zephir_array_update_string(return_value, SL("name"), &_9$$11, PH_COPY | PH_SEPARATE); zephir_array_update_string(return_value, SL("arguments"), &functionArgs, PH_COPY | PH_SEPARATE); RETURN_MM(); @@ -141541,7 +142313,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) zephir_create_array(return_value, 2, 0); add_assoc_stringl_ex(return_value, SL("type"), SL("functionCall")); zephir_memory_observe(&_10); - zephir_array_fetch_string(&_10, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2238); + zephir_array_fetch_string(&_10, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2246); zephir_array_update_string(return_value, SL("name"), &_10, PH_COPY | PH_SEPARATE); RETURN_MM(); } @@ -141573,7 +142345,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getGroupClause) if (zephir_array_isset_long(&group, 0)) { ZEPHIR_INIT_VAR(&groupParts); array_init(&groupParts); - zephir_is_iterable(&group, 0, "phalcon/Mvc/Model/Query.zep", 2258); + zephir_is_iterable(&group, 0, "phalcon/Mvc/Model/Query.zep", 2266); if (Z_TYPE_P(&group) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&group), _0$$3) { @@ -141581,7 +142353,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getGroupClause) ZVAL_COPY(&groupItem, _0$$3); ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "getexpression", &_3, 461, &groupItem); zephir_check_call_status(); - zephir_array_append(&groupParts, &_2$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2256); + zephir_array_append(&groupParts, &_2$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2264); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &group, "rewind", NULL, 0); @@ -141596,7 +142368,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getGroupClause) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_4$$5, this_ptr, "getexpression", &_3, 461, &groupItem); zephir_check_call_status(); - zephir_array_append(&groupParts, &_4$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2256); + zephir_array_append(&groupParts, &_4$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2264); ZEPHIR_CALL_METHOD(NULL, &group, "next", NULL, 0); zephir_check_call_status(); } @@ -141676,10 +142448,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoin) zephir_get_arrval(&join, join_param); zephir_memory_observe(&qualified); if (zephir_array_isset_string_fetch(&qualified, &join, SL("qualified"), 0)) { - zephir_array_fetch_string(&_0$$3, &qualified, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2294); + zephir_array_fetch_string(&_0$$3, &qualified, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2302); if (ZEPHIR_IS_LONG(&_0$$3, 355)) { zephir_memory_observe(&modelName); - zephir_array_fetch_string(&modelName, &qualified, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2295); + zephir_array_fetch_string(&modelName, &qualified, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2303); ZEPHIR_CALL_METHOD(&model, manager, "load", NULL, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0); @@ -141694,7 +142466,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoin) RETURN_MM(); } } - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 2310); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 2318); return; } @@ -141720,7 +142492,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoinType) zephir_get_arrval(&join, join_param); zephir_memory_observe(&type); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&type, &join, SL("type"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 2321); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 2329); return; } do { @@ -141748,7 +142520,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoinType) ZEPHIR_CONCAT_SVSV(&_2, "Unknown join type ", &type, ", when preparing: ", &_1); ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 33, &_2); zephir_check_call_status(); - zephir_throw_exception_debug(&_0, "phalcon/Mvc/Model/Query.zep", 2343); + zephir_throw_exception_debug(&_0, "phalcon/Mvc/Model/Query.zep", 2351); ZEPHIR_MM_RESTORE(); return; } @@ -141912,7 +142684,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&manager, &_0); zephir_memory_observe(&tables); - zephir_array_fetch_string(&tables, &select, SL("tables"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2379); + zephir_array_fetch_string(&tables, &select, SL("tables"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2387); if (!(zephir_array_isset_long(&tables, 0))) { ZEPHIR_INIT_VAR(&selectTables); zephir_create_array(&selectTables, 1, 0); @@ -141921,7 +142693,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CPY_WRT(&selectTables, &tables); } zephir_memory_observe(&joins); - zephir_array_fetch_string(&joins, &select, SL("joins"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2387); + zephir_array_fetch_string(&joins, &select, SL("joins"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2395); if (!(zephir_array_isset_long(&joins, 0))) { ZEPHIR_INIT_VAR(&selectJoins); zephir_create_array(&selectJoins, 1, 0); @@ -141929,7 +142701,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } else { ZEPHIR_CPY_WRT(&selectJoins, &joins); } - zephir_is_iterable(&selectJoins, 0, "phalcon/Mvc/Model/Query.zep", 2538); + zephir_is_iterable(&selectJoins, 0, "phalcon/Mvc/Model/Query.zep", 2546); if (Z_TYPE_P(&selectJoins) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&selectJoins), _1) { @@ -141938,13 +142710,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CALL_METHOD(&joinData, this_ptr, "getjoin", &_3, 466, &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", 2401); + zephir_array_fetch_string(&source, &joinData, SL("source"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2409); ZEPHIR_OBS_NVAR(&schema); - zephir_array_fetch_string(&schema, &joinData, SL("schema"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2402); + zephir_array_fetch_string(&schema, &joinData, SL("schema"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2410); ZEPHIR_OBS_NVAR(&model); - zephir_array_fetch_string(&model, &joinData, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2403); + zephir_array_fetch_string(&model, &joinData, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2411); ZEPHIR_OBS_NVAR(&realModelName); - zephir_array_fetch_string(&realModelName, &joinData, SL("modelName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2404); + zephir_array_fetch_string(&realModelName, &joinData, SL("modelName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2412); ZEPHIR_INIT_NVAR(&completeSource); zephir_create_array(&completeSource, 2, 0); zephir_array_fast_append(&completeSource, &source); @@ -141954,7 +142726,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_OBS_NVAR(&aliasExpr); if (zephir_array_isset_string_fetch(&aliasExpr, &joinItem, SL("alias"), 0)) { ZEPHIR_OBS_NVAR(&alias); - zephir_array_fetch_string(&alias, &aliasExpr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2416); + zephir_array_fetch_string(&alias, &aliasExpr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2424); if (UNEXPECTED(zephir_array_isset(&joinModels, &alias))) { ZEPHIR_INIT_NVAR(&_5$$9); object_init_ex(&_5$$9, phalcon_mvc_model_exception_ce); @@ -141963,11 +142735,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSV(&_7$$9, "Cannot use '", &alias, "' as join alias because it was already used, when preparing: ", &_6$$9); ZEPHIR_CALL_METHOD(NULL, &_5$$9, "__construct", &_8, 33, &_7$$9); zephir_check_call_status(); - zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/Model/Query.zep", 2424); + zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/Model/Query.zep", 2432); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2430); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2438); zephir_array_update_zval(&joinTypes, &alias, &joinType, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&joinModels, &alias, &realModelName, PH_COPY | PH_SEPARATE); @@ -141986,7 +142758,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSV(&_11$$11, "Cannot use '", &realModelName, "' as join alias because it was already used, when preparing: ", &_10$$11); ZEPHIR_CALL_METHOD(NULL, &_9$$11, "__construct", &_8, 33, &_11$$11); zephir_check_call_status(); - zephir_throw_exception_debug(&_9$$11, "phalcon/Mvc/Model/Query.zep", 2483); + zephir_throw_exception_debug(&_9$$11, "phalcon/Mvc/Model/Query.zep", 2491); ZEPHIR_MM_RESTORE(); return; } @@ -142016,13 +142788,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CALL_METHOD(&joinData, this_ptr, "getjoin", &_3, 466, &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", 2401); + zephir_array_fetch_string(&source, &joinData, SL("source"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2409); ZEPHIR_OBS_NVAR(&schema); - zephir_array_fetch_string(&schema, &joinData, SL("schema"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2402); + zephir_array_fetch_string(&schema, &joinData, SL("schema"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2410); ZEPHIR_OBS_NVAR(&model); - zephir_array_fetch_string(&model, &joinData, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2403); + zephir_array_fetch_string(&model, &joinData, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2411); ZEPHIR_OBS_NVAR(&realModelName); - zephir_array_fetch_string(&realModelName, &joinData, SL("modelName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2404); + zephir_array_fetch_string(&realModelName, &joinData, SL("modelName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2412); ZEPHIR_INIT_NVAR(&_12$$12); zephir_create_array(&_12$$12, 2, 0); zephir_array_fast_append(&_12$$12, &source); @@ -142033,7 +142805,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_OBS_NVAR(&aliasExpr); if (zephir_array_isset_string_fetch(&aliasExpr, &joinItem, SL("alias"), 0)) { ZEPHIR_OBS_NVAR(&alias); - zephir_array_fetch_string(&alias, &aliasExpr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2416); + zephir_array_fetch_string(&alias, &aliasExpr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2424); if (UNEXPECTED(zephir_array_isset(&joinModels, &alias))) { ZEPHIR_INIT_NVAR(&_13$$14); object_init_ex(&_13$$14, phalcon_mvc_model_exception_ce); @@ -142042,11 +142814,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSV(&_15$$14, "Cannot use '", &alias, "' as join alias because it was already used, when preparing: ", &_14$$14); ZEPHIR_CALL_METHOD(NULL, &_13$$14, "__construct", &_8, 33, &_15$$14); zephir_check_call_status(); - zephir_throw_exception_debug(&_13$$14, "phalcon/Mvc/Model/Query.zep", 2424); + zephir_throw_exception_debug(&_13$$14, "phalcon/Mvc/Model/Query.zep", 2432); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2430); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2438); zephir_array_update_zval(&joinTypes, &alias, &joinType, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&joinModels, &alias, &realModelName, PH_COPY | PH_SEPARATE); @@ -142065,7 +142837,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSV(&_18$$16, "Cannot use '", &realModelName, "' as join alias because it was already used, when preparing: ", &_17$$16); ZEPHIR_CALL_METHOD(NULL, &_16$$16, "__construct", &_8, 33, &_18$$16); zephir_check_call_status(); - zephir_throw_exception_debug(&_16$$16, "phalcon/Mvc/Model/Query.zep", 2483); + zephir_throw_exception_debug(&_16$$16, "phalcon/Mvc/Model/Query.zep", 2491); ZEPHIR_MM_RESTORE(); return; } @@ -142091,7 +142863,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_update_property_zval(this_ptr, ZEND_STRL("sqlModelsAliases"), &sqlModelsAliases); zephir_update_property_zval(this_ptr, ZEND_STRL("sqlAliasesModelsInstances"), &sqlAliasesModelsInstances); zephir_update_property_zval(this_ptr, ZEND_STRL("modelsInstances"), &modelsInstances); - zephir_is_iterable(&joinPrepared, 0, "phalcon/Mvc/Model/Query.zep", 2558); + zephir_is_iterable(&joinPrepared, 0, "phalcon/Mvc/Model/Query.zep", 2566); if (Z_TYPE_P(&joinPrepared) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&joinPrepared), _21, _22, _19) { @@ -142138,7 +142910,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_read_property(&_0, this_ptr, ZEND_STRL("enableImplicitJoins"), PH_NOISY_CC | PH_READONLY); if (!(zephir_is_true(&_0))) { ZEPHIR_INIT_VAR(&_26$$21); - zephir_is_iterable(&joinPrepared, 0, "phalcon/Mvc/Model/Query.zep", 2570); + zephir_is_iterable(&joinPrepared, 0, "phalcon/Mvc/Model/Query.zep", 2578); if (Z_TYPE_P(&joinPrepared) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&joinPrepared), _29$$21, _30$$21, _27$$21) { @@ -142151,11 +142923,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&_26$$21); ZVAL_COPY(&_26$$21, _27$$21); ZEPHIR_OBS_NVAR(&joinType); - zephir_array_fetch(&joinType, &joinTypes, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2560); + zephir_array_fetch(&joinType, &joinTypes, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2568); ZEPHIR_OBS_NVAR(&joinSource); - zephir_array_fetch(&joinSource, &joinSources, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2561); + zephir_array_fetch(&joinSource, &joinSources, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2569); ZEPHIR_OBS_NVAR(&preCondition); - zephir_array_fetch(&preCondition, &joinPreCondition, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2562); + zephir_array_fetch(&preCondition, &joinPreCondition, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2570); ZEPHIR_INIT_NVAR(&_31$$22); zephir_create_array(&_31$$22, 3, 0); zephir_array_update_string(&_31$$22, SL("type"), &joinType, PH_COPY | PH_SEPARATE); @@ -142164,7 +142936,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_create_array(&_32$$22, 1, 0); zephir_array_fast_append(&_32$$22, &preCondition); zephir_array_update_string(&_31$$22, SL("conditions"), &_32$$22, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_31$$22, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2567); + zephir_array_append(&sqlJoins, &_31$$22, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2575); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &joinPrepared, "rewind", NULL, 0); @@ -142180,11 +142952,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CALL_METHOD(&_26$$21, &joinPrepared, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&joinType); - zephir_array_fetch(&joinType, &joinTypes, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2560); + zephir_array_fetch(&joinType, &joinTypes, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2568); ZEPHIR_OBS_NVAR(&joinSource); - zephir_array_fetch(&joinSource, &joinSources, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2561); + zephir_array_fetch(&joinSource, &joinSources, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2569); ZEPHIR_OBS_NVAR(&preCondition); - zephir_array_fetch(&preCondition, &joinPreCondition, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2562); + zephir_array_fetch(&preCondition, &joinPreCondition, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2570); ZEPHIR_INIT_NVAR(&_33$$23); zephir_create_array(&_33$$23, 3, 0); zephir_array_update_string(&_33$$23, SL("type"), &joinType, PH_COPY | PH_SEPARATE); @@ -142193,7 +142965,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_create_array(&_34$$23, 1, 0); zephir_array_fast_append(&_34$$23, &preCondition); zephir_array_update_string(&_33$$23, SL("conditions"), &_34$$23, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_33$$23, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2567); + zephir_array_append(&sqlJoins, &_33$$23, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2575); ZEPHIR_CALL_METHOD(NULL, &joinPrepared, "next", NULL, 0); zephir_check_call_status(); } @@ -142204,15 +142976,15 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_INIT_NVAR(&fromModels); array_init(&fromModels); - zephir_is_iterable(&selectTables, 0, "phalcon/Mvc/Model/Query.zep", 2585); + zephir_is_iterable(&selectTables, 0, "phalcon/Mvc/Model/Query.zep", 2593); if (Z_TYPE_P(&selectTables) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&selectTables), _35) { ZEPHIR_INIT_NVAR(&tableItem); ZVAL_COPY(&tableItem, _35); - zephir_array_fetch_string(&_37$$24, &tableItem, SL("qualifiedName"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2579); + zephir_array_fetch_string(&_37$$24, &tableItem, SL("qualifiedName"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2587); ZEPHIR_OBS_NVAR(&_38$$24); - zephir_array_fetch_string(&_38$$24, &_37$$24, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2579); + zephir_array_fetch_string(&_38$$24, &_37$$24, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2587); zephir_array_update_zval(&fromModels, &_38$$24, &__$true, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); } else { @@ -142226,9 +142998,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_CALL_METHOD(&tableItem, &selectTables, "current", NULL, 0); zephir_check_call_status(); - zephir_array_fetch_string(&_39$$25, &tableItem, SL("qualifiedName"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2579); + zephir_array_fetch_string(&_39$$25, &tableItem, SL("qualifiedName"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2587); ZEPHIR_OBS_NVAR(&_40$$25); - zephir_array_fetch_string(&_40$$25, &_39$$25, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2579); + zephir_array_fetch_string(&_40$$25, &_39$$25, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2587); zephir_array_update_zval(&fromModels, &_40$$25, &__$true, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &selectTables, "next", NULL, 0); zephir_check_call_status(); @@ -142236,7 +143008,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_INIT_NVAR(&tableItem); ZEPHIR_INIT_VAR(&_41); - zephir_is_iterable(&fromModels, 0, "phalcon/Mvc/Model/Query.zep", 2705); + zephir_is_iterable(&fromModels, 0, "phalcon/Mvc/Model/Query.zep", 2713); if (Z_TYPE_P(&fromModels) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fromModels), _44, _45, _42) { @@ -142248,7 +143020,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_INIT_NVAR(&_41); ZVAL_COPY(&_41, _42); - zephir_is_iterable(&joinModels, 0, "phalcon/Mvc/Model/Query.zep", 2703); + zephir_is_iterable(&joinModels, 0, "phalcon/Mvc/Model/Query.zep", 2711); if (Z_TYPE_P(&joinModels) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&joinModels), _48$$26, _49$$26, _46$$26) { @@ -142261,13 +143033,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&joinModel); ZVAL_COPY(&joinModel, _46$$26); ZEPHIR_OBS_NVAR(&joinSource); - zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2590); + zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2598); ZEPHIR_OBS_NVAR(&joinType); - zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2595); + zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2603); ZEPHIR_OBS_NVAR(&preCondition); if (!(zephir_array_isset_fetch(&preCondition, &joinPreCondition, &joinAlias, 0))) { ZEPHIR_OBS_NVAR(&modelNameAlias); - zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2604); + zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2612); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_50, 0, &fromModelName, &modelNameAlias); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&relation)) { @@ -142282,17 +143054,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSVSV(&_54$$31, "There is more than one relation between models '", &fromModelName, "' and '", &joinModel, "', the join must be done using an alias, when preparing: ", &_53$$31); ZEPHIR_CALL_METHOD(NULL, &_52$$31, "__construct", &_8, 33, &_54$$31); zephir_check_call_status(); - zephir_throw_exception_debug(&_52$$31, "phalcon/Mvc/Model/Query.zep", 2630); + zephir_throw_exception_debug(&_52$$31, "phalcon/Mvc/Model/Query.zep", 2638); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&relation); - zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2636); + zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2644); } } if (Z_TYPE_P(&relation) == IS_OBJECT) { ZEPHIR_OBS_NVAR(&modelAlias); - zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2647); + zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2655); ZEPHIR_CALL_METHOD(&_55$$32, &relation, "isthrough", NULL, 0); zephir_check_call_status(); if (!(zephir_is_true(&_55$$32))) { @@ -142303,13 +143075,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_check_call_status(); } if (zephir_array_isset_long(&sqlJoin, 0)) { - zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2677); + zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2685); if (Z_TYPE_P(&sqlJoin) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&sqlJoin), _58$$35) { ZEPHIR_INIT_NVAR(&sqlJoinItem); ZVAL_COPY(&sqlJoinItem, _58$$35); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2675); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2683); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "rewind", NULL, 0); @@ -142322,14 +143094,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_CALL_METHOD(&sqlJoinItem, &sqlJoin, "current", NULL, 0); zephir_check_call_status(); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2675); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2683); ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "next", NULL, 0); zephir_check_call_status(); } } ZEPHIR_INIT_NVAR(&sqlJoinItem); } else { - zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2678); + zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2686); } } else { ZEPHIR_INIT_NVAR(&_60$$39); @@ -142339,7 +143111,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&_61$$39); array_init(&_61$$39); zephir_array_update_string(&_60$$39, SL("conditions"), &_61$$39, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_60$$39, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2689); + zephir_array_append(&sqlJoins, &_60$$39, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2697); } } else { ZEPHIR_INIT_NVAR(&_62$$40); @@ -142350,7 +143122,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_create_array(&_63$$40, 1, 0); zephir_array_fast_append(&_63$$40, &preCondition); zephir_array_update_string(&_62$$40, SL("conditions"), &_63$$40, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_62$$40, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2700); + zephir_array_append(&sqlJoins, &_62$$40, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2708); } } ZEND_HASH_FOREACH_END(); } else { @@ -142367,13 +143139,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CALL_METHOD(&joinModel, &joinModels, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&joinSource); - zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2590); + zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2598); ZEPHIR_OBS_NVAR(&joinType); - zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2595); + zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2603); ZEPHIR_OBS_NVAR(&preCondition); if (!(zephir_array_isset_fetch(&preCondition, &joinPreCondition, &joinAlias, 0))) { ZEPHIR_OBS_NVAR(&modelNameAlias); - zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2604); + zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2612); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_64, 0, &fromModelName, &modelNameAlias); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&relation)) { @@ -142388,17 +143160,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSVSV(&_68$$45, "There is more than one relation between models '", &fromModelName, "' and '", &joinModel, "', the join must be done using an alias, when preparing: ", &_67$$45); ZEPHIR_CALL_METHOD(NULL, &_66$$45, "__construct", &_8, 33, &_68$$45); zephir_check_call_status(); - zephir_throw_exception_debug(&_66$$45, "phalcon/Mvc/Model/Query.zep", 2630); + zephir_throw_exception_debug(&_66$$45, "phalcon/Mvc/Model/Query.zep", 2638); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&relation); - zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2636); + zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2644); } } if (Z_TYPE_P(&relation) == IS_OBJECT) { ZEPHIR_OBS_NVAR(&modelAlias); - zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2647); + zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2655); ZEPHIR_CALL_METHOD(&_69$$46, &relation, "isthrough", NULL, 0); zephir_check_call_status(); if (!(zephir_is_true(&_69$$46))) { @@ -142409,13 +143181,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_check_call_status(); } if (zephir_array_isset_long(&sqlJoin, 0)) { - zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2677); + zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2685); if (Z_TYPE_P(&sqlJoin) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&sqlJoin), _70$$49) { ZEPHIR_INIT_NVAR(&sqlJoinItem); ZVAL_COPY(&sqlJoinItem, _70$$49); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2675); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2683); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "rewind", NULL, 0); @@ -142428,14 +143200,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_CALL_METHOD(&sqlJoinItem, &sqlJoin, "current", NULL, 0); zephir_check_call_status(); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2675); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2683); ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "next", NULL, 0); zephir_check_call_status(); } } ZEPHIR_INIT_NVAR(&sqlJoinItem); } else { - zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2678); + zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2686); } } else { ZEPHIR_INIT_NVAR(&_72$$53); @@ -142445,7 +143217,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&_73$$53); array_init(&_73$$53); zephir_array_update_string(&_72$$53, SL("conditions"), &_73$$53, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_72$$53, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2689); + zephir_array_append(&sqlJoins, &_72$$53, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2697); } } else { ZEPHIR_INIT_NVAR(&_74$$54); @@ -142456,7 +143228,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_create_array(&_75$$54, 1, 0); zephir_array_fast_append(&_75$$54, &preCondition); zephir_array_update_string(&_74$$54, SL("conditions"), &_75$$54, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_74$$54, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2700); + zephir_array_append(&sqlJoins, &_74$$54, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2708); } ZEPHIR_CALL_METHOD(NULL, &joinModels, "next", NULL, 0); zephir_check_call_status(); @@ -142478,7 +143250,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_41, &fromModels, "current", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&joinModels, 0, "phalcon/Mvc/Model/Query.zep", 2703); + zephir_is_iterable(&joinModels, 0, "phalcon/Mvc/Model/Query.zep", 2711); if (Z_TYPE_P(&joinModels) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&joinModels), _78$$55, _79$$55, _76$$55) { @@ -142491,13 +143263,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&joinModel); ZVAL_COPY(&joinModel, _76$$55); ZEPHIR_OBS_NVAR(&joinSource); - zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2590); + zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2598); ZEPHIR_OBS_NVAR(&joinType); - zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2595); + zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2603); ZEPHIR_OBS_NVAR(&preCondition); if (!(zephir_array_isset_fetch(&preCondition, &joinPreCondition, &joinAlias, 0))) { ZEPHIR_OBS_NVAR(&modelNameAlias); - zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2604); + zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2612); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_80, 0, &fromModelName, &modelNameAlias); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&relation)) { @@ -142512,17 +143284,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSVSV(&_84$$60, "There is more than one relation between models '", &fromModelName, "' and '", &joinModel, "', the join must be done using an alias, when preparing: ", &_83$$60); ZEPHIR_CALL_METHOD(NULL, &_82$$60, "__construct", &_8, 33, &_84$$60); zephir_check_call_status(); - zephir_throw_exception_debug(&_82$$60, "phalcon/Mvc/Model/Query.zep", 2630); + zephir_throw_exception_debug(&_82$$60, "phalcon/Mvc/Model/Query.zep", 2638); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&relation); - zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2636); + zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2644); } } if (Z_TYPE_P(&relation) == IS_OBJECT) { ZEPHIR_OBS_NVAR(&modelAlias); - zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2647); + zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2655); ZEPHIR_CALL_METHOD(&_85$$61, &relation, "isthrough", NULL, 0); zephir_check_call_status(); if (!(zephir_is_true(&_85$$61))) { @@ -142533,13 +143305,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_check_call_status(); } if (zephir_array_isset_long(&sqlJoin, 0)) { - zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2677); + zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2685); if (Z_TYPE_P(&sqlJoin) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&sqlJoin), _86$$64) { ZEPHIR_INIT_NVAR(&sqlJoinItem); ZVAL_COPY(&sqlJoinItem, _86$$64); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2675); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2683); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "rewind", NULL, 0); @@ -142552,14 +143324,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_CALL_METHOD(&sqlJoinItem, &sqlJoin, "current", NULL, 0); zephir_check_call_status(); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2675); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2683); ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "next", NULL, 0); zephir_check_call_status(); } } ZEPHIR_INIT_NVAR(&sqlJoinItem); } else { - zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2678); + zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2686); } } else { ZEPHIR_INIT_NVAR(&_88$$68); @@ -142569,7 +143341,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&_89$$68); array_init(&_89$$68); zephir_array_update_string(&_88$$68, SL("conditions"), &_89$$68, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_88$$68, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2689); + zephir_array_append(&sqlJoins, &_88$$68, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2697); } } else { ZEPHIR_INIT_NVAR(&_90$$69); @@ -142580,7 +143352,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_create_array(&_91$$69, 1, 0); zephir_array_fast_append(&_91$$69, &preCondition); zephir_array_update_string(&_90$$69, SL("conditions"), &_91$$69, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_90$$69, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2700); + zephir_array_append(&sqlJoins, &_90$$69, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2708); } } ZEND_HASH_FOREACH_END(); } else { @@ -142597,13 +143369,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CALL_METHOD(&joinModel, &joinModels, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&joinSource); - zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2590); + zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2598); ZEPHIR_OBS_NVAR(&joinType); - zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2595); + zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2603); ZEPHIR_OBS_NVAR(&preCondition); if (!(zephir_array_isset_fetch(&preCondition, &joinPreCondition, &joinAlias, 0))) { ZEPHIR_OBS_NVAR(&modelNameAlias); - zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2604); + zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2612); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_92, 0, &fromModelName, &modelNameAlias); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&relation)) { @@ -142618,17 +143390,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSVSV(&_96$$74, "There is more than one relation between models '", &fromModelName, "' and '", &joinModel, "', the join must be done using an alias, when preparing: ", &_95$$74); ZEPHIR_CALL_METHOD(NULL, &_94$$74, "__construct", &_8, 33, &_96$$74); zephir_check_call_status(); - zephir_throw_exception_debug(&_94$$74, "phalcon/Mvc/Model/Query.zep", 2630); + zephir_throw_exception_debug(&_94$$74, "phalcon/Mvc/Model/Query.zep", 2638); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&relation); - zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2636); + zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2644); } } if (Z_TYPE_P(&relation) == IS_OBJECT) { ZEPHIR_OBS_NVAR(&modelAlias); - zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2647); + zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2655); ZEPHIR_CALL_METHOD(&_97$$75, &relation, "isthrough", NULL, 0); zephir_check_call_status(); if (!(zephir_is_true(&_97$$75))) { @@ -142639,13 +143411,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_check_call_status(); } if (zephir_array_isset_long(&sqlJoin, 0)) { - zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2677); + zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2685); if (Z_TYPE_P(&sqlJoin) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&sqlJoin), _98$$78) { ZEPHIR_INIT_NVAR(&sqlJoinItem); ZVAL_COPY(&sqlJoinItem, _98$$78); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2675); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2683); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "rewind", NULL, 0); @@ -142658,14 +143430,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_CALL_METHOD(&sqlJoinItem, &sqlJoin, "current", NULL, 0); zephir_check_call_status(); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2675); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2683); ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "next", NULL, 0); zephir_check_call_status(); } } ZEPHIR_INIT_NVAR(&sqlJoinItem); } else { - zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2678); + zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2686); } } else { ZEPHIR_INIT_NVAR(&_100$$82); @@ -142675,7 +143447,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&_101$$82); array_init(&_101$$82); zephir_array_update_string(&_100$$82, SL("conditions"), &_101$$82, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_100$$82, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2689); + zephir_array_append(&sqlJoins, &_100$$82, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2697); } } else { ZEPHIR_INIT_NVAR(&_102$$83); @@ -142686,7 +143458,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_create_array(&_103$$83, 1, 0); zephir_array_fast_append(&_103$$83, &preCondition); zephir_array_update_string(&_102$$83, SL("conditions"), &_103$$83, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_102$$83, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2700); + zephir_array_append(&sqlJoins, &_102$$83, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2708); } ZEPHIR_CALL_METHOD(NULL, &joinModels, "next", NULL, 0); zephir_check_call_status(); @@ -142805,7 +143577,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin) ZEPHIR_CALL_METHOD(&referencedModelName, relation, "getreferencedmodel", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&fields) == IS_ARRAY) { - zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 2822); + zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 2830); if (Z_TYPE_P(&fields) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _3$$3, _4$$3, _1$$3) { @@ -142825,12 +143597,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin) ZEPHIR_CONCAT_SVSVSV(&_7$$5, "The number of fields must be equal to the number of referenced fields in join ", &modelAlias, "-", &joinAlias, ", when preparing: ", &_6$$5); ZEPHIR_CALL_METHOD(NULL, &_5$$5, "__construct", &_8, 33, &_7$$5); zephir_check_call_status(); - zephir_throw_exception_debug(&_5$$5, "phalcon/Mvc/Model/Query.zep", 2789); + zephir_throw_exception_debug(&_5$$5, "phalcon/Mvc/Model/Query.zep", 2797); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&intermediateField); - zephir_array_fetch(&intermediateField, &intermediateFields, &position, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2795); + zephir_array_fetch(&intermediateField, &intermediateFields, &position, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2803); ZEPHIR_INIT_NVAR(&sqlEqualsJoinCondition); zephir_create_array(&sqlEqualsJoinCondition, 4, 0); add_assoc_stringl_ex(&sqlEqualsJoinCondition, SL("type"), SL("binary-op")); @@ -142873,12 +143645,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin) ZEPHIR_CONCAT_SVSVSV(&_15$$7, "The number of fields must be equal to the number of referenced fields in join ", &modelAlias, "-", &joinAlias, ", when preparing: ", &_14$$7); ZEPHIR_CALL_METHOD(NULL, &_13$$7, "__construct", &_8, 33, &_15$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_13$$7, "phalcon/Mvc/Model/Query.zep", 2789); + zephir_throw_exception_debug(&_13$$7, "phalcon/Mvc/Model/Query.zep", 2797); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&intermediateField); - zephir_array_fetch(&intermediateField, &intermediateFields, &position, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2795); + zephir_array_fetch(&intermediateField, &intermediateFields, &position, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2803); ZEPHIR_INIT_NVAR(&_16$$6); zephir_create_array(&_16$$6, 4, 0); add_assoc_stringl_ex(&_16$$6, SL("type"), SL("binary-op")); @@ -143019,13 +143791,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getOrderClause) } ZEPHIR_INIT_VAR(&orderParts); array_init(&orderParts); - zephir_is_iterable(&orderColumns, 0, "phalcon/Mvc/Model/Query.zep", 2931); + zephir_is_iterable(&orderColumns, 0, "phalcon/Mvc/Model/Query.zep", 2939); if (Z_TYPE_P(&orderColumns) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&orderColumns), _0) { ZEPHIR_INIT_NVAR(&orderItem); ZVAL_COPY(&orderItem, _0); - zephir_array_fetch_string(&_2$$5, &orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2913); + zephir_array_fetch_string(&_2$$5, &orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2921); ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "getexpression", &_3, 461, &_2$$5); zephir_check_call_status(); if (zephir_array_isset_string_fetch(&orderSort, &orderItem, SL("sort"), 1)) { @@ -143051,7 +143823,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getOrderClause) zephir_array_fast_append(&_7$$9, &orderPartExpr); ZEPHIR_CPY_WRT(&orderPartSort, &_7$$9); } - zephir_array_append(&orderParts, &orderPartSort, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2928); + zephir_array_append(&orderParts, &orderPartSort, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2936); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &orderColumns, "rewind", NULL, 0); @@ -143064,7 +143836,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getOrderClause) } ZEPHIR_CALL_METHOD(&orderItem, &orderColumns, "current", NULL, 0); zephir_check_call_status(); - zephir_array_fetch_string(&_8$$10, &orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2913); + zephir_array_fetch_string(&_8$$10, &orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2921); ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "getexpression", &_3, 461, &_8$$10); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&orderSort); @@ -143092,7 +143864,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getOrderClause) zephir_array_fast_append(&_13$$14, &orderPartExpr); ZEPHIR_CPY_WRT(&orderPartSort, &_13$$14); } - zephir_array_append(&orderParts, &orderPartSort, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2928); + zephir_array_append(&orderParts, &orderPartSort, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2936); ZEPHIR_CALL_METHOD(NULL, &orderColumns, "next", NULL, 0); zephir_check_call_status(); } @@ -143170,13 +143942,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) zephir_fetch_params(1, 1, 0, &expr_param); ZEPHIR_OBS_COPY_OR_DUP(&expr, expr_param); zephir_memory_observe(&columnName); - zephir_array_fetch_string(&columnName, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2945); + zephir_array_fetch_string(&columnName, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2953); zephir_read_property(&_0, this_ptr, ZEND_STRL("nestingLevel"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&nestingLevel, &_0); zephir_read_property(&_0, this_ptr, ZEND_STRL("sqlColumnAliases"), PH_NOISY_CC | PH_READONLY); if (zephir_array_isset(&_0, &nestingLevel)) { zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("sqlColumnAliases"), PH_NOISY_CC | PH_READONLY); - zephir_array_fetch(&_2$$3, &_1$$3, &nestingLevel, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2953); + zephir_array_fetch(&_2$$3, &_1$$3, &nestingLevel, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2961); ZEPHIR_CPY_WRT(&sqlColumnAliases, &_2$$3); } else { ZEPHIR_INIT_NVAR(&sqlColumnAliases); @@ -143186,7 +143958,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) if (_3) { _4 = !(zephir_array_isset_string(&expr, SL("domain"))); if (!(_4)) { - zephir_array_fetch_string(&_5, &expr, SL("domain"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2958); + zephir_array_fetch_string(&_5, &expr, SL("domain"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2966); _4 = ZEPHIR_IS_EMPTY(&_5); } _3 = _4; @@ -143212,7 +143984,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_10$$7, "Unknown model or alias '", &columnDomain, "' (11), when preparing: ", &_9$$7); ZEPHIR_CALL_METHOD(NULL, &_8$$7, "__construct", NULL, 33, &_10$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_8$$7, "phalcon/Mvc/Model/Query.zep", 2979); + zephir_throw_exception_debug(&_8$$7, "phalcon/Mvc/Model/Query.zep", 2987); ZEPHIR_MM_RESTORE(); return; } @@ -143228,7 +144000,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_14$$9, "There is no model related to model or alias '", &columnDomain, "', when executing: ", &_13$$9); ZEPHIR_CALL_METHOD(NULL, &_12$$9, "__construct", NULL, 33, &_14$$9); zephir_check_call_status(); - zephir_throw_exception_debug(&_12$$9, "phalcon/Mvc/Model/Query.zep", 2998); + zephir_throw_exception_debug(&_12$$9, "phalcon/Mvc/Model/Query.zep", 3006); ZEPHIR_MM_RESTORE(); return; } @@ -143248,7 +144020,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSVSV(&_17$$12, "Column '", &columnName, "' doesn't belong to the model or alias '", &columnDomain, "', when executing: ", &_16$$12); ZEPHIR_CALL_METHOD(NULL, &_15$$12, "__construct", NULL, 33, &_17$$12); zephir_check_call_status(); - zephir_throw_exception_debug(&_15$$12, "phalcon/Mvc/Model/Query.zep", 3010); + zephir_throw_exception_debug(&_15$$12, "phalcon/Mvc/Model/Query.zep", 3018); ZEPHIR_MM_RESTORE(); return; } @@ -143260,7 +144032,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_INIT_VAR(&hasModel); ZVAL_BOOL(&hasModel, 0); zephir_read_property(&_18$$14, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY); - zephir_is_iterable(&_18$$14, 0, "phalcon/Mvc/Model/Query.zep", 3044); + zephir_is_iterable(&_18$$14, 0, "phalcon/Mvc/Model/Query.zep", 3052); if (Z_TYPE_P(&_18$$14) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_18$$14), _19$$14) { @@ -143278,7 +144050,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_25$$17, "The column '", &columnName, "' is ambiguous, when preparing: ", &_24$$17); ZEPHIR_CALL_METHOD(NULL, &_23$$17, "__construct", NULL, 33, &_25$$17); zephir_check_call_status(); - zephir_throw_exception_debug(&_23$$17, "phalcon/Mvc/Model/Query.zep", 3033); + zephir_throw_exception_debug(&_23$$17, "phalcon/Mvc/Model/Query.zep", 3041); ZEPHIR_MM_RESTORE(); return; } @@ -143308,7 +144080,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_30$$20, "The column '", &columnName, "' is ambiguous, when preparing: ", &_29$$20); ZEPHIR_CALL_METHOD(NULL, &_28$$20, "__construct", NULL, 33, &_30$$20); zephir_check_call_status(); - zephir_throw_exception_debug(&_28$$20, "phalcon/Mvc/Model/Query.zep", 3033); + zephir_throw_exception_debug(&_28$$20, "phalcon/Mvc/Model/Query.zep", 3041); ZEPHIR_MM_RESTORE(); return; } @@ -143327,14 +144099,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_33$$21, "Column '", &columnName, "' doesn't belong to any of the selected models (1), when preparing: ", &_32$$21); ZEPHIR_CALL_METHOD(NULL, &_31$$21, "__construct", NULL, 33, &_33$$21); zephir_check_call_status(); - zephir_throw_exception_debug(&_31$$21, "phalcon/Mvc/Model/Query.zep", 3047); + zephir_throw_exception_debug(&_31$$21, "phalcon/Mvc/Model/Query.zep", 3055); ZEPHIR_MM_RESTORE(); return; } zephir_read_property(&_34$$14, this_ptr, ZEND_STRL("models"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&models, &_34$$14); if (UNEXPECTED(Z_TYPE_P(&models) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The models list was not loaded correctly", "phalcon/Mvc/Model/Query.zep", 3058); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The models list was not loaded correctly", "phalcon/Mvc/Model/Query.zep", 3066); return; } ZEPHIR_INIT_VAR(&className); @@ -143348,7 +144120,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_37$$23, "Can't obtain model's source from models list: '", &className, "', when preparing: ", &_36$$23); ZEPHIR_CALL_METHOD(NULL, &_35$$23, "__construct", NULL, 33, &_37$$23); zephir_check_call_status(); - zephir_throw_exception_debug(&_35$$23, "phalcon/Mvc/Model/Query.zep", 3069); + zephir_throw_exception_debug(&_35$$23, "phalcon/Mvc/Model/Query.zep", 3077); ZEPHIR_MM_RESTORE(); return; } @@ -143369,7 +144141,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_40$$27, "Column '", &columnName, "' doesn't belong to any of the selected models (3), when preparing: ", &_39$$27); ZEPHIR_CALL_METHOD(NULL, &_38$$27, "__construct", NULL, 33, &_40$$27); zephir_check_call_status(); - zephir_throw_exception_debug(&_38$$27, "phalcon/Mvc/Model/Query.zep", 3088); + zephir_throw_exception_debug(&_38$$27, "phalcon/Mvc/Model/Query.zep", 3096); ZEPHIR_MM_RESTORE(); return; } @@ -143446,7 +144218,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getReadConnection) ZEPHIR_CALL_METHOD(&connection, model, "selectreadconnection", NULL, 0, &intermediate, &bindParams, &bindTypes); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&connection) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "selectReadConnection did not return a connection", "phalcon/Mvc/Model/Query.zep", 3132); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "selectReadConnection did not return a connection", "phalcon/Mvc/Model/Query.zep", 3140); return; } RETURN_CCTOR(&connection); @@ -143507,10 +144279,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getRelatedRecords) zephir_array_fast_append(&_0, &_1); zephir_array_update_string(&selectIr, SL("columns"), &_0, PH_COPY | PH_SEPARATE); zephir_memory_observe(&_4); - zephir_array_fetch_string(&_4, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3162); + zephir_array_fetch_string(&_4, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3170); zephir_array_update_string(&selectIr, SL("models"), &_4, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_4); - zephir_array_fetch_string(&_4, &intermediate, SL("tables"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3164); + zephir_array_fetch_string(&_4, &intermediate, SL("tables"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3172); zephir_array_update_string(&selectIr, SL("tables"), &_4, PH_COPY | PH_SEPARATE); zephir_memory_observe(&whereConditions); if (zephir_array_isset_string_fetch(&whereConditions, &intermediate, SL("where"), 0)) { @@ -143589,7 +144361,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) ZEPHIR_OBS_COPY_OR_DUP(&column, column_param); zephir_memory_observe(&columnType); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&columnType, &column, SL("type"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3204); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3212); return; } ZEPHIR_INIT_VAR(&sqlColumns); @@ -143598,7 +144370,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) zephir_array_isset_string_fetch(&eager, &column, SL("eager"), 0); if (ZEPHIR_IS_LONG(&columnType, 352)) { zephir_read_property(&_0$$4, this_ptr, ZEND_STRL("models"), PH_NOISY_CC | PH_READONLY); - zephir_is_iterable(&_0$$4, 0, "phalcon/Mvc/Model/Query.zep", 3234); + zephir_is_iterable(&_0$$4, 0, "phalcon/Mvc/Model/Query.zep", 3242); if (Z_TYPE_P(&_0$$4) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_0$$4), _3$$4, _4$$4, _1$$4) { @@ -143620,10 +144392,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) zephir_array_update_string(&sqlColumn, SL("balias"), &_5$$5, PH_COPY | PH_SEPARATE); if (Z_TYPE_P(&eager) != IS_NULL) { zephir_array_update_string(&sqlColumn, SL("eager"), &eager, PH_COPY | PH_SEPARATE); - zephir_array_fetch_string(&_7$$6, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3228); + zephir_array_fetch_string(&_7$$6, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3236); zephir_array_update_string(&sqlColumn, SL("eagerType"), &_7$$6, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3231); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3239); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &_0$$4, "rewind", NULL, 0); @@ -143649,10 +144421,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) ZEPHIR_CPY_WRT(&sqlColumn, &_8$$7); if (Z_TYPE_P(&eager) != IS_NULL) { zephir_array_update_string(&sqlColumn, SL("eager"), &eager, PH_COPY | PH_SEPARATE); - zephir_array_fetch_string(&_10$$8, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3228); + zephir_array_fetch_string(&_10$$8, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3236); zephir_array_update_string(&sqlColumn, SL("eagerType"), &_10$$8, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3231); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3239); ZEPHIR_CALL_METHOD(NULL, &_0$$4, "next", NULL, 0); zephir_check_call_status(); } @@ -143662,14 +144434,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) RETURN_CTOR(&sqlColumns); } if (UNEXPECTED(!(zephir_array_isset_string(&column, SL("column"))))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3238); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3246); return; } if (ZEPHIR_IS_LONG(&columnType, 353)) { zephir_read_property(&_11$$10, this_ptr, ZEND_STRL("sqlAliases"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&sqlAliases, &_11$$10); zephir_memory_observe(&columnDomain); - zephir_array_fetch_string(&columnDomain, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3250); + zephir_array_fetch_string(&columnDomain, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3258); ZEPHIR_OBS_NVAR(&source); if (UNEXPECTED(!(zephir_array_isset_fetch(&source, &sqlAliases, &columnDomain, 0)))) { ZEPHIR_INIT_VAR(&_12$$11); @@ -143679,7 +144451,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) ZEPHIR_CONCAT_SVSV(&_14$$11, "Unknown model or alias '", &columnDomain, "' (2), when preparing: ", &_13$$11); ZEPHIR_CALL_METHOD(NULL, &_12$$11, "__construct", NULL, 33, &_14$$11); zephir_check_call_status(); - zephir_throw_exception_debug(&_12$$11, "phalcon/Mvc/Model/Query.zep", 3255); + zephir_throw_exception_debug(&_12$$11, "phalcon/Mvc/Model/Query.zep", 3263); ZEPHIR_MM_RESTORE(); return; } @@ -143689,7 +144461,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) zephir_read_property(&_11$$10, this_ptr, ZEND_STRL("sqlAliasesModels"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&sqlAliasesModels, &_11$$10); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch(&modelName, &sqlAliasesModels, &columnDomain, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3269); + zephir_array_fetch(&modelName, &sqlAliasesModels, &columnDomain, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3277); if (Z_TYPE_P(&preparedAlias) != IS_STRING) { if (ZEPHIR_IS_EQUAL(&columnDomain, &modelName)) { ZEPHIR_CALL_FUNCTION(&preparedAlias, "lcfirst", &_6, 76, &modelName); @@ -143707,10 +144479,10 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) ZEPHIR_CPY_WRT(&sqlColumn, &_15$$10); if (Z_TYPE_P(&eager) != IS_NULL) { zephir_array_update_string(&sqlColumn, SL("eager"), &eager, PH_COPY | PH_SEPARATE); - zephir_array_fetch_string(&_16$$15, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3296); + zephir_array_fetch_string(&_16$$15, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3304); zephir_array_update_string(&sqlColumn, SL("eagerType"), &_16$$15, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3299); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3307); RETURN_CTOR(&sqlColumns); } if (ZEPHIR_IS_LONG(&columnType, 354)) { @@ -143719,7 +144491,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) add_assoc_stringl_ex(&_17$$16, SL("type"), SL("scalar")); ZEPHIR_CPY_WRT(&sqlColumn, &_17$$16); zephir_memory_observe(&columnData); - zephir_array_fetch_string(&columnData, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3313); + zephir_array_fetch_string(&columnData, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3321); ZEPHIR_CALL_METHOD(&sqlExprColumn, this_ptr, "getexpression", NULL, 461, &columnData); zephir_check_call_status(); zephir_memory_observe(&balias); @@ -143729,11 +144501,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) } if (Z_TYPE_P(&eager) != IS_NULL) { zephir_array_update_string(&sqlColumn, SL("eager"), &eager, PH_COPY | PH_SEPARATE); - zephir_array_fetch_string(&_18$$18, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3326); + zephir_array_fetch_string(&_18$$18, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3334); zephir_array_update_string(&sqlColumn, SL("eagerType"), &_18$$18, PH_COPY | PH_SEPARATE); } zephir_array_update_string(&sqlColumn, SL("column"), &sqlExprColumn, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3330); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3338); RETURN_CTOR(&sqlColumns); } ZEPHIR_INIT_VAR(&_19); @@ -143742,7 +144514,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) ZEPHIR_CONCAT_SV(&_20, "Unknown type of column ", &columnType); ZEPHIR_CALL_METHOD(NULL, &_19, "__construct", NULL, 33, &_20); zephir_check_call_status(); - zephir_throw_exception_debug(&_19, "phalcon/Mvc/Model/Query.zep", 3335); + zephir_throw_exception_debug(&_19, "phalcon/Mvc/Model/Query.zep", 3343); ZEPHIR_MM_RESTORE(); return; } @@ -143846,7 +144618,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) } else { ZEPHIR_INIT_VAR(&sqlJoinPartialConditions); array_init(&sqlJoinPartialConditions); - zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 3425); + zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 3433); if (Z_TYPE_P(&fields) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _7$$4, _8$$4, _5$$4) { @@ -143867,7 +144639,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) ZEPHIR_CONCAT_SVSVSV(&_11$$6, "The number of fields must be equal to the number of referenced fields in join ", &modelAlias, "-", &joinAlias, ", when preparing: ", &_10$$6); ZEPHIR_CALL_METHOD(NULL, &_9$$6, "__construct", &_12, 33, &_11$$6); zephir_check_call_status(); - zephir_throw_exception_debug(&_9$$6, "phalcon/Mvc/Model/Query.zep", 3397); + zephir_throw_exception_debug(&_9$$6, "phalcon/Mvc/Model/Query.zep", 3405); ZEPHIR_MM_RESTORE(); return; } @@ -143891,7 +144663,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) ZEPHIR_CALL_METHOD(&_14$$5, this_ptr, "getqualified", NULL, 462, &_16$$5); zephir_check_call_status(); zephir_array_update_string(&_13$$5, SL("right"), &_14$$5, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoinPartialConditions, &_13$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3422); + zephir_array_append(&sqlJoinPartialConditions, &_13$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3430); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &fields, "rewind", NULL, 0); @@ -143915,7 +144687,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) ZEPHIR_CONCAT_SVSVSV(&_19$$8, "The number of fields must be equal to the number of referenced fields in join ", &modelAlias, "-", &joinAlias, ", when preparing: ", &_18$$8); ZEPHIR_CALL_METHOD(NULL, &_17$$8, "__construct", &_12, 33, &_19$$8); zephir_check_call_status(); - zephir_throw_exception_debug(&_17$$8, "phalcon/Mvc/Model/Query.zep", 3397); + zephir_throw_exception_debug(&_17$$8, "phalcon/Mvc/Model/Query.zep", 3405); ZEPHIR_MM_RESTORE(); return; } @@ -143939,7 +144711,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) ZEPHIR_CALL_METHOD(&_21$$7, this_ptr, "getqualified", NULL, 462, &_23$$7); zephir_check_call_status(); zephir_array_update_string(&_20$$7, SL("right"), &_21$$7, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoinPartialConditions, &_20$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3422); + zephir_array_append(&sqlJoinPartialConditions, &_20$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3430); ZEPHIR_CALL_METHOD(NULL, &fields, "next", NULL, 0); zephir_check_call_status(); } @@ -143977,7 +144749,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getTable) zephir_get_arrval(&qualifiedName, qualifiedName_param); zephir_memory_observe(&modelName); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&modelName, &qualifiedName, SL("name"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3447); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3455); return; } ZEPHIR_CALL_METHOD(&model, manager, "load", NULL, 0, &modelName); @@ -144056,7 +144828,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, getWriteConnection) ZEPHIR_CALL_METHOD(&connection, model, "selectwriteconnection", NULL, 0, &intermediate, &bindParams, &bindTypes); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&connection) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "selectWriteConnection did not return a connection", "phalcon/Mvc/Model/Query.zep", 3485); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "selectWriteConnection did not return a connection", "phalcon/Mvc/Model/Query.zep", 3493); return; } RETURN_CCTOR(&connection); @@ -144113,12 +144885,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete) ZEPHIR_CPY_WRT(&ast, &_0); zephir_memory_observe(&delete); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&delete, &ast, SL("delete"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted DELETE AST", "phalcon/Mvc/Model/Query.zep", 3507); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted DELETE AST", "phalcon/Mvc/Model/Query.zep", 3515); return; } zephir_memory_observe(&tables); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&tables, &delete, SL("tables"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted DELETE AST", "phalcon/Mvc/Model/Query.zep", 3511); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted DELETE AST", "phalcon/Mvc/Model/Query.zep", 3519); return; } ZEPHIR_INIT_VAR(&models); @@ -144142,16 +144914,16 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete) } zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&manager, &_0); - zephir_is_iterable(&deleteTables, 0, "phalcon/Mvc/Model/Query.zep", 3571); + zephir_is_iterable(&deleteTables, 0, "phalcon/Mvc/Model/Query.zep", 3579); if (Z_TYPE_P(&deleteTables) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&deleteTables), _1) { ZEPHIR_INIT_NVAR(&table); ZVAL_COPY(&table, _1); ZEPHIR_OBS_NVAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3535); + zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3543); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3536); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3544); ZEPHIR_CALL_METHOD(&model, &manager, "load", &_3, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0); @@ -144175,17 +144947,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete) ZEPHIR_OBS_NVAR(&alias); if (zephir_array_isset_string_fetch(&alias, &table, SL("alias"), 0)) { zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE); - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3553); - zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3554); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3561); + zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3562); zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&models, &alias, &modelName, PH_COPY | PH_SEPARATE); } else { zephir_array_update_zval(&sqlAliases, &modelName, &source, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliasesModelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3560); + zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3568); zephir_array_update_zval(&models, &modelName, &source, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3564); + zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3572); zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); } else { @@ -144200,9 +144972,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete) ZEPHIR_CALL_METHOD(&table, &deleteTables, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3535); + zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3543); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3536); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3544); ZEPHIR_CALL_METHOD(&model, &manager, "load", &_6, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0); @@ -144225,17 +144997,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete) ZEPHIR_OBS_NVAR(&alias); if (zephir_array_isset_string_fetch(&alias, &table, SL("alias"), 0)) { zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE); - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3553); - zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3554); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3561); + zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3562); zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&models, &alias, &modelName, PH_COPY | PH_SEPARATE); } else { zephir_array_update_zval(&sqlAliases, &modelName, &source, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliasesModelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3560); + zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3568); zephir_array_update_zval(&models, &modelName, &source, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3564); + zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3572); zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &deleteTables, "next", NULL, 0); zephir_check_call_status(); @@ -144318,23 +145090,23 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) zephir_read_property(&_0, this_ptr, ZEND_STRL("ast"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&ast, &_0); if (UNEXPECTED(!(zephir_array_isset_string(&ast, SL("qualifiedName"))))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3605); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3613); return; } if (UNEXPECTED(!(zephir_array_isset_string(&ast, SL("values"))))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3609); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3617); return; } zephir_memory_observe(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &ast, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3612); + zephir_array_fetch_string(&qualifiedName, &ast, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3620); if (UNEXPECTED(!(zephir_array_isset_string(&qualifiedName, SL("name"))))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3616); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3624); return; } zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&manager, &_0); zephir_memory_observe(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3620); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3628); ZEPHIR_CALL_METHOD(&model, &manager, "load", NULL, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0); @@ -144351,8 +145123,8 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) notQuoting = 0; ZEPHIR_INIT_VAR(&exprValues); array_init(&exprValues); - zephir_array_fetch_string(&_2, &ast, SL("values"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3633); - zephir_is_iterable(&_2, 0, "phalcon/Mvc/Model/Query.zep", 3641); + zephir_array_fetch_string(&_2, &ast, SL("values"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3641); + zephir_is_iterable(&_2, 0, "phalcon/Mvc/Model/Query.zep", 3649); if (Z_TYPE_P(&_2) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_2), _3) { @@ -144361,7 +145133,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_INIT_NVAR(&_5$$7); zephir_create_array(&_5$$7, 2, 0); ZEPHIR_OBS_NVAR(&_6$$7); - zephir_array_fetch_string(&_6$$7, &exprValue, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3636); + zephir_array_fetch_string(&_6$$7, &exprValue, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3644); zephir_array_update_string(&_5$$7, SL("type"), &_6$$7, PH_COPY | PH_SEPARATE); if (notQuoting) { ZVAL_BOOL(&_8$$7, 1); @@ -144371,7 +145143,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_CALL_METHOD(&_7$$7, this_ptr, "getexpression", &_9, 461, &exprValue, &_8$$7); zephir_check_call_status(); zephir_array_update_string(&_5$$7, SL("value"), &_7$$7, PH_COPY | PH_SEPARATE); - zephir_array_append(&exprValues, &_5$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3638); + zephir_array_append(&exprValues, &_5$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3646); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &_2, "rewind", NULL, 0); @@ -144387,7 +145159,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_INIT_NVAR(&_10$$8); zephir_create_array(&_10$$8, 2, 0); ZEPHIR_OBS_NVAR(&_11$$8); - zephir_array_fetch_string(&_11$$8, &exprValue, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3636); + zephir_array_fetch_string(&_11$$8, &exprValue, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3644); zephir_array_update_string(&_10$$8, SL("type"), &_11$$8, PH_COPY | PH_SEPARATE); if (notQuoting) { ZVAL_BOOL(&_13$$8, 1); @@ -144397,7 +145169,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_CALL_METHOD(&_12$$8, this_ptr, "getexpression", &_9, 461, &exprValue, &_13$$8); zephir_check_call_status(); zephir_array_update_string(&_10$$8, SL("value"), &_12$$8, PH_COPY | PH_SEPARATE); - zephir_array_append(&exprValues, &_10$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3638); + zephir_array_append(&exprValues, &_10$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3646); ZEPHIR_CALL_METHOD(NULL, &_2, "next", NULL, 0); zephir_check_call_status(); } @@ -144413,14 +145185,14 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) if (zephir_array_isset_string_fetch(&fields, &ast, SL("fields"), 0)) { ZEPHIR_INIT_VAR(&sqlFields); array_init(&sqlFields); - zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 3665); + zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 3673); if (Z_TYPE_P(&fields) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&fields), _14$$9) { ZEPHIR_INIT_NVAR(&field); ZVAL_COPY(&field, _14$$9); ZEPHIR_OBS_NVAR(&name); - zephir_array_fetch_string(&name, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3652); + zephir_array_fetch_string(&name, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3660); ZEPHIR_CALL_METHOD(&_16$$10, &metaData, "hasattribute", &_17, 0, &model, &name); zephir_check_call_status(); if (UNEXPECTED(!zephir_is_true(&_16$$10))) { @@ -144431,11 +145203,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_CONCAT_SVSVSV(&_20$$11, "The model '", &modelName, "' doesn't have the attribute '", &name, "', when preparing: ", &_19$$11); ZEPHIR_CALL_METHOD(NULL, &_18$$11, "__construct", &_21, 33, &_20$$11); zephir_check_call_status(); - zephir_throw_exception_debug(&_18$$11, "phalcon/Mvc/Model/Query.zep", 3658); + zephir_throw_exception_debug(&_18$$11, "phalcon/Mvc/Model/Query.zep", 3666); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&sqlFields, &name, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3662); + zephir_array_append(&sqlFields, &name, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3670); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &fields, "rewind", NULL, 0); @@ -144449,7 +145221,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_CALL_METHOD(&field, &fields, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&name); - zephir_array_fetch_string(&name, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3652); + zephir_array_fetch_string(&name, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3660); ZEPHIR_CALL_METHOD(&_22$$12, &metaData, "hasattribute", &_23, 0, &model, &name); zephir_check_call_status(); if (UNEXPECTED(!zephir_is_true(&_22$$12))) { @@ -144460,11 +145232,11 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_CONCAT_SVSVSV(&_26$$13, "The model '", &modelName, "' doesn't have the attribute '", &name, "', when preparing: ", &_25$$13); ZEPHIR_CALL_METHOD(NULL, &_24$$13, "__construct", &_21, 33, &_26$$13); zephir_check_call_status(); - zephir_throw_exception_debug(&_24$$13, "phalcon/Mvc/Model/Query.zep", 3658); + zephir_throw_exception_debug(&_24$$13, "phalcon/Mvc/Model/Query.zep", 3666); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&sqlFields, &name, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3662); + zephir_array_append(&sqlFields, &name, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3670); ZEPHIR_CALL_METHOD(NULL, &fields, "next", NULL, 0); zephir_check_call_status(); } @@ -144661,12 +145433,12 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) } zephir_memory_observe(&tables); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&tables, &select, SL("tables"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3701); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3709); return; } zephir_memory_observe(&columns); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&columns, &select, SL("columns"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3705); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3713); return; } RETURN_ON_FAILURE(zephir_property_incr(this_ptr, SL("nestingLevel"))); @@ -144707,26 +145479,26 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_read_property(&_1, this_ptr, ZEND_STRL("metaData"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&metaData, &_1); if (UNEXPECTED(Z_TYPE_P(&manager) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A models-manager is required to execute the query", "phalcon/Mvc/Model/Query.zep", 3772); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A models-manager is required to execute the query", "phalcon/Mvc/Model/Query.zep", 3780); return; } if (UNEXPECTED(Z_TYPE_P(&metaData) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A meta-data is required to execute the query", "phalcon/Mvc/Model/Query.zep", 3778); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A meta-data is required to execute the query", "phalcon/Mvc/Model/Query.zep", 3786); return; } number = 0; ZEPHIR_INIT_VAR(&automaticJoins); array_init(&automaticJoins); - zephir_is_iterable(&selectedModels, 0, "phalcon/Mvc/Model/Query.zep", 3908); + zephir_is_iterable(&selectedModels, 0, "phalcon/Mvc/Model/Query.zep", 3916); if (Z_TYPE_P(&selectedModels) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&selectedModels), _2) { ZEPHIR_INIT_NVAR(&selectedModel); ZVAL_COPY(&selectedModel, _2); ZEPHIR_OBS_NVAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &selectedModel, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3786); + zephir_array_fetch_string(&qualifiedName, &selectedModel, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3794); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3787); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3795); ZEPHIR_CALL_METHOD(&model, &manager, "load", &_4, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&schema, &model, "getschema", NULL, 0); @@ -144751,7 +145523,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SVSV(&_7$$17, "Alias '", &alias, "' is used more than once, when preparing: ", &_6$$17); ZEPHIR_CALL_METHOD(NULL, &_5$$17, "__construct", &_8, 33, &_7$$17); zephir_check_call_status(); - zephir_throw_exception_debug(&_5$$17, "phalcon/Mvc/Model/Query.zep", 3812); + zephir_throw_exception_debug(&_5$$17, "phalcon/Mvc/Model/Query.zep", 3820); ZEPHIR_MM_RESTORE(); return; } @@ -144760,7 +145532,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_array_update_zval(&sqlModelsAliases, &modelName, &alias, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE); if (Z_TYPE_P(&completeSource) == IS_ARRAY) { - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3824); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3832); } else { ZEPHIR_INIT_NVAR(&_9$$19); zephir_create_array(&_9$$19, 3, 0); @@ -144787,7 +145559,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) } else { ZEPHIR_CPY_WRT(&withs, &with); } - zephir_is_iterable(&withs, 0, "phalcon/Mvc/Model/Query.zep", 3900); + zephir_is_iterable(&withs, 0, "phalcon/Mvc/Model/Query.zep", 3908); if (Z_TYPE_P(&withs) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&withs), _10$$21) { @@ -144799,7 +145571,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_13$$24, "AA", &_12$$24); ZEPHIR_CPY_WRT(&joinAlias, &_13$$24); ZEPHIR_OBS_NVAR(&relationModel); - zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3850); + zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3858); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_14, 0, &modelName, &relationModel); zephir_check_call_status(); if (Z_TYPE_P(&relation) == IS_OBJECT) { @@ -144822,7 +145594,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SVSVSV(&_19$$27, "Can't find a relationship between '", &modelName, "' and '", &relationModel, "' when preparing: ", &_18$$27); ZEPHIR_CALL_METHOD(NULL, &_17$$27, "__construct", &_8, 33, &_19$$27); zephir_check_call_status(); - zephir_throw_exception_debug(&_17$$27, "phalcon/Mvc/Model/Query.zep", 3870); + zephir_throw_exception_debug(&_17$$27, "phalcon/Mvc/Model/Query.zep", 3878); ZEPHIR_MM_RESTORE(); return; } @@ -144842,7 +145614,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_array_update_string(&_21$$24, SL("eager"), &alias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_21$$24, SL("eagerType"), &eagerType, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_21$$24, SL("balias"), &bestAlias, PH_COPY | PH_SEPARATE); - zephir_array_append(&selectColumns, &_21$$24, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3884); + zephir_array_append(&selectColumns, &_21$$24, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3892); ZEPHIR_INIT_NVAR(&_22$$24); zephir_create_array(&_22$$24, 3, 0); add_assoc_long_ex(&_22$$24, SL("type"), 360); @@ -144856,7 +145628,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) add_assoc_long_ex(&_23$$24, SL("type"), 355); zephir_array_update_string(&_23$$24, SL("name"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_22$$24, SL("alias"), &_23$$24, PH_COPY | PH_SEPARATE); - zephir_array_append(&automaticJoins, &_22$$24, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3896); + zephir_array_append(&automaticJoins, &_22$$24, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3904); number++; } ZEND_HASH_FOREACH_END(); } else { @@ -144876,7 +145648,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_25$$28, "AA", &_24$$28); ZEPHIR_CPY_WRT(&joinAlias, &_25$$28); ZEPHIR_OBS_NVAR(&relationModel); - zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3850); + zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3858); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_26, 0, &modelName, &relationModel); zephir_check_call_status(); if (Z_TYPE_P(&relation) == IS_OBJECT) { @@ -144899,7 +145671,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SVSVSV(&_31$$31, "Can't find a relationship between '", &modelName, "' and '", &relationModel, "' when preparing: ", &_30$$31); ZEPHIR_CALL_METHOD(NULL, &_29$$31, "__construct", &_8, 33, &_31$$31); zephir_check_call_status(); - zephir_throw_exception_debug(&_29$$31, "phalcon/Mvc/Model/Query.zep", 3870); + zephir_throw_exception_debug(&_29$$31, "phalcon/Mvc/Model/Query.zep", 3878); ZEPHIR_MM_RESTORE(); return; } @@ -144919,7 +145691,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_array_update_string(&_33$$28, SL("eager"), &alias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_33$$28, SL("eagerType"), &eagerType, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_33$$28, SL("balias"), &bestAlias, PH_COPY | PH_SEPARATE); - zephir_array_append(&selectColumns, &_33$$28, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3884); + zephir_array_append(&selectColumns, &_33$$28, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3892); ZEPHIR_INIT_NVAR(&_34$$28); zephir_create_array(&_34$$28, 3, 0); add_assoc_long_ex(&_34$$28, SL("type"), 360); @@ -144933,7 +145705,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) add_assoc_long_ex(&_35$$28, SL("type"), 355); zephir_array_update_string(&_35$$28, SL("name"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_34$$28, SL("alias"), &_35$$28, PH_COPY | PH_SEPARATE); - zephir_array_append(&automaticJoins, &_34$$28, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3896); + zephir_array_append(&automaticJoins, &_34$$28, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3904); number++; ZEPHIR_CALL_METHOD(NULL, &withs, "next", NULL, 0); zephir_check_call_status(); @@ -144941,8 +145713,8 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) } ZEPHIR_INIT_NVAR(&withItem); } - zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3902); - zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3903); + zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3910); + zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3911); zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); } else { @@ -144957,9 +145729,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CALL_METHOD(&selectedModel, &selectedModels, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &selectedModel, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3786); + zephir_array_fetch_string(&qualifiedName, &selectedModel, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3794); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3787); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3795); ZEPHIR_CALL_METHOD(&model, &manager, "load", &_36, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&schema, &model, "getschema", NULL, 0); @@ -144985,7 +145757,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SVSV(&_40$$36, "Alias '", &alias, "' is used more than once, when preparing: ", &_39$$36); ZEPHIR_CALL_METHOD(NULL, &_38$$36, "__construct", &_8, 33, &_40$$36); zephir_check_call_status(); - zephir_throw_exception_debug(&_38$$36, "phalcon/Mvc/Model/Query.zep", 3812); + zephir_throw_exception_debug(&_38$$36, "phalcon/Mvc/Model/Query.zep", 3820); ZEPHIR_MM_RESTORE(); return; } @@ -144994,7 +145766,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_array_update_zval(&sqlModelsAliases, &modelName, &alias, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE); if (Z_TYPE_P(&completeSource) == IS_ARRAY) { - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3824); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3832); } else { ZEPHIR_INIT_NVAR(&_41$$38); zephir_create_array(&_41$$38, 3, 0); @@ -145022,7 +145794,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) } else { ZEPHIR_CPY_WRT(&withs, &with); } - zephir_is_iterable(&withs, 0, "phalcon/Mvc/Model/Query.zep", 3900); + zephir_is_iterable(&withs, 0, "phalcon/Mvc/Model/Query.zep", 3908); if (Z_TYPE_P(&withs) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&withs), _43$$40) { @@ -145034,7 +145806,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_46$$43, "AA", &_45$$43); ZEPHIR_CPY_WRT(&joinAlias, &_46$$43); ZEPHIR_OBS_NVAR(&relationModel); - zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3850); + zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3858); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_47, 0, &modelName, &relationModel); zephir_check_call_status(); if (Z_TYPE_P(&relation) == IS_OBJECT) { @@ -145057,7 +145829,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SVSVSV(&_52$$46, "Can't find a relationship between '", &modelName, "' and '", &relationModel, "' when preparing: ", &_51$$46); ZEPHIR_CALL_METHOD(NULL, &_50$$46, "__construct", &_8, 33, &_52$$46); zephir_check_call_status(); - zephir_throw_exception_debug(&_50$$46, "phalcon/Mvc/Model/Query.zep", 3870); + zephir_throw_exception_debug(&_50$$46, "phalcon/Mvc/Model/Query.zep", 3878); ZEPHIR_MM_RESTORE(); return; } @@ -145077,7 +145849,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_array_update_string(&_54$$43, SL("eager"), &alias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_54$$43, SL("eagerType"), &eagerType, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_54$$43, SL("balias"), &bestAlias, PH_COPY | PH_SEPARATE); - zephir_array_append(&selectColumns, &_54$$43, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3884); + zephir_array_append(&selectColumns, &_54$$43, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3892); ZEPHIR_INIT_NVAR(&_55$$43); zephir_create_array(&_55$$43, 3, 0); add_assoc_long_ex(&_55$$43, SL("type"), 360); @@ -145091,7 +145863,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) add_assoc_long_ex(&_56$$43, SL("type"), 355); zephir_array_update_string(&_56$$43, SL("name"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_55$$43, SL("alias"), &_56$$43, PH_COPY | PH_SEPARATE); - zephir_array_append(&automaticJoins, &_55$$43, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3896); + zephir_array_append(&automaticJoins, &_55$$43, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3904); number++; } ZEND_HASH_FOREACH_END(); } else { @@ -145111,7 +145883,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_58$$47, "AA", &_57$$47); ZEPHIR_CPY_WRT(&joinAlias, &_58$$47); ZEPHIR_OBS_NVAR(&relationModel); - zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3850); + zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3858); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_59, 0, &modelName, &relationModel); zephir_check_call_status(); if (Z_TYPE_P(&relation) == IS_OBJECT) { @@ -145134,7 +145906,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SVSVSV(&_64$$50, "Can't find a relationship between '", &modelName, "' and '", &relationModel, "' when preparing: ", &_63$$50); ZEPHIR_CALL_METHOD(NULL, &_62$$50, "__construct", &_8, 33, &_64$$50); zephir_check_call_status(); - zephir_throw_exception_debug(&_62$$50, "phalcon/Mvc/Model/Query.zep", 3870); + zephir_throw_exception_debug(&_62$$50, "phalcon/Mvc/Model/Query.zep", 3878); ZEPHIR_MM_RESTORE(); return; } @@ -145154,7 +145926,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_array_update_string(&_66$$47, SL("eager"), &alias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_66$$47, SL("eagerType"), &eagerType, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_66$$47, SL("balias"), &bestAlias, PH_COPY | PH_SEPARATE); - zephir_array_append(&selectColumns, &_66$$47, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3884); + zephir_array_append(&selectColumns, &_66$$47, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3892); ZEPHIR_INIT_NVAR(&_67$$47); zephir_create_array(&_67$$47, 3, 0); add_assoc_long_ex(&_67$$47, SL("type"), 360); @@ -145168,7 +145940,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) add_assoc_long_ex(&_68$$47, SL("type"), 355); zephir_array_update_string(&_68$$47, SL("name"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_67$$47, SL("alias"), &_68$$47, PH_COPY | PH_SEPARATE); - zephir_array_append(&automaticJoins, &_67$$47, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3896); + zephir_array_append(&automaticJoins, &_67$$47, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3904); number++; ZEPHIR_CALL_METHOD(NULL, &withs, "next", NULL, 0); zephir_check_call_status(); @@ -145176,8 +145948,8 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) } ZEPHIR_INIT_NVAR(&withItem); } - zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3902); - zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3903); + zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3910); + zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3911); zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &selectedModels, "next", NULL, 0); zephir_check_call_status(); @@ -145238,7 +146010,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_fast_array_merge(&_81$$55, &joins, &automaticJoins); zephir_array_update_string(&select, SL("joins"), &_81$$55, PH_COPY | PH_SEPARATE); } else { - zephir_array_append(&automaticJoins, &joins, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3939); + zephir_array_append(&automaticJoins, &joins, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3947); zephir_array_update_string(&select, SL("joins"), &automaticJoins, PH_COPY | PH_SEPARATE); } } @@ -145257,7 +146029,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) position = 0; ZEPHIR_INIT_VAR(&sqlColumnAliases); array_init(&sqlColumnAliases); - zephir_is_iterable(&selectColumns, 0, "phalcon/Mvc/Model/Query.zep", 3990); + zephir_is_iterable(&selectColumns, 0, "phalcon/Mvc/Model/Query.zep", 3998); if (Z_TYPE_P(&selectColumns) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&selectColumns), _82) { @@ -145265,7 +146037,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZVAL_COPY(&column, _82); ZEPHIR_CALL_METHOD(&_84$$60, this_ptr, "getselectcolumn", &_85, 477, &column); zephir_check_call_status(); - zephir_is_iterable(&_84$$60, 0, "phalcon/Mvc/Model/Query.zep", 3988); + zephir_is_iterable(&_84$$60, 0, "phalcon/Mvc/Model/Query.zep", 3996); if (Z_TYPE_P(&_84$$60) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_84$$60), _86$$60) { @@ -145282,7 +146054,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) if (zephir_array_isset_string_fetch(&alias, &sqlColumn, SL("balias"), 0)) { zephir_array_update_zval(&sqlColumns, &alias, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_string(&_88$$65, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3978); + zephir_array_fetch_string(&_88$$65, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3986); if (ZEPHIR_IS_STRING(&_88$$65, "scalar")) { ZEPHIR_INIT_NVAR(&_89$$66); ZVAL_LONG(&_89$$66, position); @@ -145290,7 +146062,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_90$$66, "_", &_89$$66); zephir_array_update_zval(&sqlColumns, &_90$$66, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3981); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3989); } } } @@ -145318,7 +146090,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) if (zephir_array_isset_string_fetch(&alias, &sqlColumn, SL("balias"), 0)) { zephir_array_update_zval(&sqlColumns, &alias, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_string(&_91$$72, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3978); + zephir_array_fetch_string(&_91$$72, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3986); if (ZEPHIR_IS_STRING(&_91$$72, "scalar")) { ZEPHIR_INIT_NVAR(&_92$$73); ZVAL_LONG(&_92$$73, position); @@ -145326,7 +146098,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_93$$73, "_", &_92$$73); zephir_array_update_zval(&sqlColumns, &_93$$73, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3981); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3989); } } } @@ -145350,7 +146122,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_94$$75, this_ptr, "getselectcolumn", &_85, 477, &column); zephir_check_call_status(); - zephir_is_iterable(&_94$$75, 0, "phalcon/Mvc/Model/Query.zep", 3988); + zephir_is_iterable(&_94$$75, 0, "phalcon/Mvc/Model/Query.zep", 3996); if (Z_TYPE_P(&_94$$75) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_94$$75), _95$$75) { @@ -145367,7 +146139,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) if (zephir_array_isset_string_fetch(&alias, &sqlColumn, SL("balias"), 0)) { zephir_array_update_zval(&sqlColumns, &alias, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_string(&_97$$80, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3978); + zephir_array_fetch_string(&_97$$80, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3986); if (ZEPHIR_IS_STRING(&_97$$80, "scalar")) { ZEPHIR_INIT_NVAR(&_98$$81); ZVAL_LONG(&_98$$81, position); @@ -145375,7 +146147,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_99$$81, "_", &_98$$81); zephir_array_update_zval(&sqlColumns, &_99$$81, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3981); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3989); } } } @@ -145403,7 +146175,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) if (zephir_array_isset_string_fetch(&alias, &sqlColumn, SL("balias"), 0)) { zephir_array_update_zval(&sqlColumns, &alias, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_string(&_100$$87, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3978); + zephir_array_fetch_string(&_100$$87, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3986); if (ZEPHIR_IS_STRING(&_100$$87, "scalar")) { ZEPHIR_INIT_NVAR(&_101$$88); ZVAL_LONG(&_101$$88, position); @@ -145411,7 +146183,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_102$$88, "_", &_101$$88); zephir_array_update_zval(&sqlColumns, &_102$$88, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3981); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3989); } } } @@ -145556,17 +146328,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_CPY_WRT(&ast, &_0); zephir_memory_observe(&update); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&update, &ast, SL("update"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4067); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4075); return; } zephir_memory_observe(&tables); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&tables, &update, SL("tables"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4071); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4079); return; } zephir_memory_observe(&values); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&values, &update, SL("values"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4075); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4083); return; } ZEPHIR_INIT_VAR(&models); @@ -145590,16 +146362,16 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) } zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&manager, &_0); - zephir_is_iterable(&updateTables, 0, "phalcon/Mvc/Model/Query.zep", 4141); + zephir_is_iterable(&updateTables, 0, "phalcon/Mvc/Model/Query.zep", 4149); if (Z_TYPE_P(&updateTables) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&updateTables), _1) { ZEPHIR_INIT_NVAR(&table); ZVAL_COPY(&table, _1); ZEPHIR_OBS_NVAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4099); + zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4107); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4100); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4108); ZEPHIR_CALL_METHOD(&model, &manager, "load", &_3, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0); @@ -145623,17 +146395,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_OBS_NVAR(&alias); if (zephir_array_isset_string_fetch(&alias, &table, SL("alias"), 0)) { zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE); - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4123); - zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4124); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4131); + zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4132); zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&models, &alias, &modelName, PH_COPY | PH_SEPARATE); } else { zephir_array_update_zval(&sqlAliases, &modelName, &source, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliasesModelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4130); + zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4138); zephir_array_update_zval(&models, &modelName, &source, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4134); + zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4142); zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); } else { @@ -145648,9 +146420,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_CALL_METHOD(&table, &updateTables, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4099); + zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4107); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4100); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4108); ZEPHIR_CALL_METHOD(&model, &manager, "load", &_6, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0); @@ -145673,17 +146445,17 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_OBS_NVAR(&alias); if (zephir_array_isset_string_fetch(&alias, &table, SL("alias"), 0)) { zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE); - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4123); - zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4124); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4131); + zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4132); zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&models, &alias, &modelName, PH_COPY | PH_SEPARATE); } else { zephir_array_update_zval(&sqlAliases, &modelName, &source, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliasesModelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4130); + zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4138); zephir_array_update_zval(&models, &modelName, &source, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4134); + zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4142); zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &updateTables, "next", NULL, 0); zephir_check_call_status(); @@ -145706,13 +146478,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_CPY_WRT(&updateValues, &values); } notQuoting = 0; - zephir_is_iterable(&updateValues, 0, "phalcon/Mvc/Model/Query.zep", 4165); + zephir_is_iterable(&updateValues, 0, "phalcon/Mvc/Model/Query.zep", 4173); if (Z_TYPE_P(&updateValues) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&updateValues), _9) { ZEPHIR_INIT_NVAR(&updateValue); ZVAL_COPY(&updateValue, _9); - zephir_array_fetch_string(&_12$$20, &updateValue, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 4157); + zephir_array_fetch_string(&_12$$20, &updateValue, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 4165); if (notQuoting) { ZVAL_BOOL(&_13$$20, 1); } else { @@ -145720,13 +146492,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) } ZEPHIR_CALL_METHOD(&_11$$20, this_ptr, "getexpression", &_14, 461, &_12$$20, &_13$$20); zephir_check_call_status(); - zephir_array_append(&sqlFields, &_11$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4157); + zephir_array_append(&sqlFields, &_11$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4165); ZEPHIR_OBS_NVAR(&exprColumn); - zephir_array_fetch_string(&exprColumn, &updateValue, SL("expr"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4158); + zephir_array_fetch_string(&exprColumn, &updateValue, SL("expr"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4166); ZEPHIR_INIT_NVAR(&_15$$20); zephir_create_array(&_15$$20, 2, 0); ZEPHIR_OBS_NVAR(&_16$$20); - zephir_array_fetch_string(&_16$$20, &exprColumn, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4160); + zephir_array_fetch_string(&_16$$20, &exprColumn, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4168); zephir_array_update_string(&_15$$20, SL("type"), &_16$$20, PH_COPY | PH_SEPARATE); if (notQuoting) { ZVAL_BOOL(&_18$$20, 1); @@ -145736,7 +146508,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_CALL_METHOD(&_17$$20, this_ptr, "getexpression", &_14, 461, &exprColumn, &_18$$20); zephir_check_call_status(); zephir_array_update_string(&_15$$20, SL("value"), &_17$$20, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlValues, &_15$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4162); + zephir_array_append(&sqlValues, &_15$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4170); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &updateValues, "rewind", NULL, 0); @@ -145749,7 +146521,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) } ZEPHIR_CALL_METHOD(&updateValue, &updateValues, "current", NULL, 0); zephir_check_call_status(); - zephir_array_fetch_string(&_20$$21, &updateValue, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 4157); + zephir_array_fetch_string(&_20$$21, &updateValue, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 4165); if (notQuoting) { ZVAL_BOOL(&_21$$21, 1); } else { @@ -145757,13 +146529,13 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) } ZEPHIR_CALL_METHOD(&_19$$21, this_ptr, "getexpression", &_14, 461, &_20$$21, &_21$$21); zephir_check_call_status(); - zephir_array_append(&sqlFields, &_19$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4157); + zephir_array_append(&sqlFields, &_19$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4165); ZEPHIR_OBS_NVAR(&exprColumn); - zephir_array_fetch_string(&exprColumn, &updateValue, SL("expr"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4158); + zephir_array_fetch_string(&exprColumn, &updateValue, SL("expr"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4166); ZEPHIR_INIT_NVAR(&_22$$21); zephir_create_array(&_22$$21, 2, 0); ZEPHIR_OBS_NVAR(&_23$$21); - zephir_array_fetch_string(&_23$$21, &exprColumn, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4160); + zephir_array_fetch_string(&_23$$21, &exprColumn, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4168); zephir_array_update_string(&_22$$21, SL("type"), &_23$$21, PH_COPY | PH_SEPARATE); if (notQuoting) { ZVAL_BOOL(&_25$$21, 1); @@ -145773,7 +146545,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_CALL_METHOD(&_24$$21, this_ptr, "getexpression", &_14, 461, &exprColumn, &_25$$21); zephir_check_call_status(); zephir_array_update_string(&_22$$21, SL("value"), &_24$$21, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlValues, &_22$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4162); + zephir_array_append(&sqlValues, &_22$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4170); ZEPHIR_CALL_METHOD(NULL, &updateValues, "next", NULL, 0); zephir_check_call_status(); } @@ -146428,7 +147200,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset, __construct) ZEPHIR_CONCAT_SS(&_7$$5, "Cache service must be an object implementing ", "Phalcon\\Cache\\CacheInterface or Psr\\SimpleCache\\CacheInterface"); ZEPHIR_CALL_METHOD(NULL, &_6$$5, "__construct", NULL, 33, &_7$$5); zephir_check_call_status(); - zephir_throw_exception_debug(&_6$$5, "phalcon/Mvc/Model/Resultset.zep", 168); + zephir_throw_exception_debug(&_6$$5, "phalcon/Mvc/Model/Resultset.zep", 169); ZEPHIR_MM_RESTORE(); return; } @@ -146521,7 +147293,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset, delete) zephir_check_call_status(); if (transaction == 0) { if (UNEXPECTED(!((zephir_method_exists_ex(&record, ZEND_STRL("getwriteconnection")) == SUCCESS)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The returned record is not valid", "phalcon/Mvc/Model/Resultset.zep", 242); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The returned record is not valid", "phalcon/Mvc/Model/Resultset.zep", 243); return; } ZEPHIR_CALL_METHOD(&connection, &record, "getwriteconnection", NULL, 0); @@ -146614,7 +147386,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset, filter) zephir_check_call_status(); continue; } - zephir_array_append(&records, &processedRecord, PH_SEPARATE, "phalcon/Mvc/Model/Resultset.zep", 336); + zephir_array_append(&records, &processedRecord, PH_SEPARATE, "phalcon/Mvc/Model/Resultset.zep", 337); ZEPHIR_CALL_METHOD(NULL, this_ptr, "next", &_5, 0); zephir_check_call_status(); } @@ -146754,9 +147526,9 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset, jsonSerialize) if (_3$$3) { ZEPHIR_CALL_METHOD(&_4$$4, ¤t, "jsonserialize", NULL, 0); zephir_check_call_status(); - zephir_array_append(&records, &_4$$4, PH_SEPARATE, "phalcon/Mvc/Model/Resultset.zep", 461); + zephir_array_append(&records, &_4$$4, PH_SEPARATE, "phalcon/Mvc/Model/Resultset.zep", 462); } else { - zephir_array_append(&records, ¤t, PH_SEPARATE, "phalcon/Mvc/Model/Resultset.zep", 463); + zephir_array_append(&records, ¤t, PH_SEPARATE, "phalcon/Mvc/Model/Resultset.zep", 464); } ZEPHIR_CALL_METHOD(NULL, this_ptr, "next", &_5, 0); zephir_check_call_status(); @@ -146820,7 +147592,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset, offsetGet) zephir_fetch_params(1, 1, 0, &index); zephir_read_property(&_0, this_ptr, ZEND_STRL("count"), PH_NOISY_CC | PH_READONLY); if (UNEXPECTED(ZEPHIR_GE(index, &_0))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The index does not exist in the cursor", "phalcon/Mvc/Model/Resultset.zep", 503); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The index does not exist in the cursor", "phalcon/Mvc/Model/Resultset.zep", 504); return; } ZEPHIR_CALL_METHOD(NULL, this_ptr, "seek", NULL, 93, index); @@ -146856,7 +147628,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset, offsetSet) Z_PARAM_ZVAL(value) ZEND_PARSE_PARAMETERS_END(); zephir_fetch_params_without_memory_grow(2, 0, &offset, &value); - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_model_exception_ce, "Cursor is an immutable ArrayAccess object", "phalcon/Mvc/Model/Resultset.zep", 530); + ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_model_exception_ce, "Cursor is an immutable ArrayAccess object", "phalcon/Mvc/Model/Resultset.zep", 531); return; } @@ -146869,7 +147641,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset, offsetUnset) Z_PARAM_ZVAL(offset) ZEND_PARSE_PARAMETERS_END(); zephir_fetch_params_without_memory_grow(1, 0, &offset); - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_model_exception_ce, "Cursor is an immutable ArrayAccess object", "phalcon/Mvc/Model/Resultset.zep", 538); + ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_model_exception_ce, "Cursor is an immutable ArrayAccess object", "phalcon/Mvc/Model/Resultset.zep", 539); return; } @@ -147062,7 +147834,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Resultset, update) zephir_check_call_status(); if (transaction == 0) { if (UNEXPECTED(!((zephir_method_exists_ex(&record, ZEND_STRL("getwriteconnection")) == SUCCESS)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The returned record is not valid", "phalcon/Mvc/Model/Resultset.zep", 655); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The returned record is not valid", "phalcon/Mvc/Model/Resultset.zep", 656); return; } ZEPHIR_CALL_METHOD(&connection, &record, "getwriteconnection", NULL, 0); @@ -152172,7 +152944,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, limit) offset = &__$null; } ZVAL_LONG(&_0, limit); - ZEPHIR_CALL_FUNCTION(&_1, "abs", NULL, 284, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "abs", NULL, 285, &_0); zephir_check_call_status(); limit = zephir_get_numberval(&_1); if (UNEXPECTED(limit == 0)) { @@ -152183,7 +152955,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, limit) zephir_update_property_zval(this_ptr, ZEND_STRL("limit"), &_0); if (zephir_is_numeric(offset)) { ZVAL_LONG(&_2$$4, zephir_get_intval(offset)); - ZEPHIR_CALL_FUNCTION(&_3$$4, "abs", NULL, 284, &_2$$4); + ZEPHIR_CALL_FUNCTION(&_3$$4, "abs", NULL, 285, &_2$$4); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("offset"), &_3$$4); } @@ -152826,7 +153598,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, conditionBetween) object_init_ex(&_1$$3, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "Operator % is not available."); - ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 117, &_2$$3, &operator); + ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 118, &_2$$3, &operator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 33, &_3$$3); zephir_check_call_status(); @@ -152939,7 +153711,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, conditionIn) object_init_ex(&_1$$3, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "Operator % is not available."); - ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 117, &_2$$3, &operator); + ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 118, &_2$$3, &operator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 33, &_3$$3); zephir_check_call_status(); @@ -153091,7 +153863,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, conditionNotBetween) object_init_ex(&_1$$3, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "Operator % is not available."); - ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 117, &_2$$3, &operator); + ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 118, &_2$$3, &operator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 33, &_3$$3); zephir_check_call_status(); @@ -153204,7 +153976,7 @@ static PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, conditionNotIn) object_init_ex(&_1$$3, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "Operator % is not available."); - ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 117, &_2$$3, &operator); + ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 118, &_2$$3, &operator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 33, &_3$$3); zephir_check_call_status(); @@ -166645,7 +167417,7 @@ static PHP_METHOD(Phalcon_Mvc_Router_Annotations, processActionAnnotation) zephir_read_property(&_2, this_ptr, ZEND_STRL("actionPreformatCallback"), PH_NOISY_CC | PH_READONLY); if (Z_TYPE_P(&_2) != IS_NULL) { zephir_read_property(&_3$$6, this_ptr, ZEND_STRL("actionPreformatCallback"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_4$$6, "call_user_func", NULL, 188, &_3$$6, &proxyActionName); + ZEPHIR_CALL_FUNCTION(&_4$$6, "call_user_func", NULL, 189, &_3$$6, &proxyActionName); zephir_check_call_status(); ZEPHIR_CPY_WRT(&proxyActionName, &_4$$6); } @@ -169301,7 +170073,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, loadTemplateEngines) ZEPHIR_CALL_CE_STATIC(&_7$$9, _8$$9, "bind", &_9, 0, &engineService, &di); zephir_check_call_status(); ZEPHIR_CPY_WRT(&engineService, &_7$$9); - ZEPHIR_CALL_FUNCTION(&engineObject, "call_user_func", &_10, 188, &engineService, this_ptr); + ZEPHIR_CALL_FUNCTION(&engineObject, "call_user_func", &_10, 189, &engineService, this_ptr); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&engineObject, &engineService); @@ -169344,7 +170116,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Simple, loadTemplateEngines) ZEPHIR_CALL_CE_STATIC(&_15$$15, _16$$15, "bind", &_9, 0, &engineService, &di); zephir_check_call_status(); ZEPHIR_CPY_WRT(&engineService, &_15$$15); - ZEPHIR_CALL_FUNCTION(&engineObject, "call_user_func", &_10, 188, &engineService, this_ptr); + ZEPHIR_CALL_FUNCTION(&engineObject, "call_user_func", &_10, 189, &engineService, this_ptr); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&engineObject, &engineService); @@ -169991,7 +170763,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, callMacro) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_RETURN_CALL_FUNCTION("call_user_func", NULL, 188, ¯o, &arguments); + ZEPHIR_RETURN_CALL_FUNCTION("call_user_func", NULL, 189, ¯o, &arguments); zephir_check_call_status(); RETURN_MM(); } @@ -170048,12 +170820,12 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, convertEncoding) _1 = ZEPHIR_IS_STRING_IDENTICAL(&from, "utf8"); } if (_1) { - ZEPHIR_RETURN_CALL_FUNCTION("utf8_decode", NULL, 285, &text); + ZEPHIR_RETURN_CALL_FUNCTION("utf8_decode", NULL, 287, &text); zephir_check_call_status(); RETURN_MM(); } if ((zephir_function_exists_ex(ZEND_STRL("mb_convert_encoding")) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 327, &text, &from, &to); + ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 329, &text, &from, &to); zephir_check_call_status(); RETURN_MM(); } @@ -170180,7 +170952,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, length) RETURN_MM_LONG(zephir_fast_count_int(item)); } if ((zephir_function_exists_ex(ZEND_STRL("mb_strlen")) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("mb_strlen", NULL, 246, item); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strlen", NULL, 247, item); zephir_check_call_status(); RETURN_MM(); } @@ -170538,12 +171310,12 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, slice) if ((zephir_function_exists_ex(ZEND_STRL("mb_substr")) == SUCCESS)) { if (Z_TYPE_P(&length) != IS_NULL) { ZVAL_LONG(&_6$$11, start); - ZEPHIR_RETURN_CALL_FUNCTION("mb_substr", NULL, 228, value, &_6$$11, &length); + ZEPHIR_RETURN_CALL_FUNCTION("mb_substr", NULL, 229, value, &_6$$11, &length); zephir_check_call_status(); RETURN_MM(); } ZVAL_LONG(&_7$$10, start); - ZEPHIR_RETURN_CALL_FUNCTION("mb_substr", NULL, 228, value, &_7$$10); + ZEPHIR_RETURN_CALL_FUNCTION("mb_substr", NULL, 229, value, &_7$$10); zephir_check_call_status(); RETURN_MM(); } @@ -174054,7 +174826,7 @@ 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, 270, &funcArguments, &_4$$7); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 271, &funcArguments, &_4$$7); ZEPHIR_UNREF(&funcArguments); zephir_check_call_status(); } @@ -184760,7 +185532,7 @@ static PHP_METHOD(Phalcon_Html_Attributes, renderAttributes) ZVAL_LONG(&_5$$4, 3); ZEPHIR_INIT_NVAR(&_6$$4); ZVAL_STRING(&_6$$4, "utf-8"); - ZEPHIR_CALL_FUNCTION(&_7$$4, "htmlspecialchars", &_8, 286, &value, &_5$$4, &_6$$4, &__$true); + ZEPHIR_CALL_FUNCTION(&_7$$4, "htmlspecialchars", &_8, 288, &value, &_5$$4, &_6$$4, &__$true); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_9$$4); ZEPHIR_CONCAT_VSVS(&_9$$4, &key, "=\"", &_7$$4, "\" "); @@ -184788,7 +185560,7 @@ static PHP_METHOD(Phalcon_Html_Attributes, renderAttributes) ZVAL_LONG(&_11$$6, 3); ZEPHIR_INIT_NVAR(&_12$$6); ZVAL_STRING(&_12$$6, "utf-8"); - ZEPHIR_CALL_FUNCTION(&_13$$6, "htmlspecialchars", &_8, 286, &value, &_11$$6, &_12$$6, &__$true); + ZEPHIR_CALL_FUNCTION(&_13$$6, "htmlspecialchars", &_8, 288, &value, &_11$$6, &_12$$6, &__$true); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_14$$6); ZEPHIR_CONCAT_VSVS(&_14$$6, &key, "=\"", &_13$$6, "\" "); @@ -184946,7 +185718,7 @@ static PHP_METHOD(Phalcon_Html_Breadcrumbs, render) ZEPHIR_INIT_VAR(&urls); zephir_array_keys(&urls, &elements); ZEPHIR_MAKE_REF(&urls); - ZEPHIR_CALL_FUNCTION(&lastUrl, "end", NULL, 321, &urls); + ZEPHIR_CALL_FUNCTION(&lastUrl, "end", NULL, 323, &urls); ZEPHIR_UNREF(&urls); zephir_check_call_status(); zephir_memory_observe(&lastLabel); @@ -185269,9 +186041,9 @@ static PHP_METHOD(Phalcon_Html_Escaper, css) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &input_param); zephir_get_strval(&input, input_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 322, &input); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 324, &input); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "doescapecss", NULL, 323, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "doescapecss", NULL, 325, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -185328,7 +186100,7 @@ static PHP_METHOD(Phalcon_Html_Escaper, detectEncoding) { ZEPHIR_INIT_NVAR(&charset); ZVAL_COPY(&charset, _2); - ZEPHIR_CALL_FUNCTION(&_4$$5, "mb_detect_encoding", &_5, 324, &input, &charset, &__$true); + ZEPHIR_CALL_FUNCTION(&_4$$5, "mb_detect_encoding", &_5, 326, &input, &charset, &__$true); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&_4$$5)) { RETURN_CCTOR(&charset); @@ -185345,7 +186117,7 @@ static PHP_METHOD(Phalcon_Html_Escaper, detectEncoding) } ZEPHIR_CALL_METHOD(&charset, &_0, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_6$$7, "mb_detect_encoding", &_5, 324, &input, &charset, &__$true); + ZEPHIR_CALL_FUNCTION(&_6$$7, "mb_detect_encoding", &_5, 326, &input, &charset, &__$true); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&_6$$7)) { RETURN_CCTOR(&charset); @@ -185355,7 +186127,7 @@ static PHP_METHOD(Phalcon_Html_Escaper, detectEncoding) } } ZEPHIR_INIT_NVAR(&charset); - ZEPHIR_RETURN_CALL_FUNCTION("mb_detect_encoding", &_5, 324, &input); + ZEPHIR_RETURN_CALL_FUNCTION("mb_detect_encoding", &_5, 326, &input); zephir_check_call_status(); RETURN_MM(); } @@ -185524,7 +186296,7 @@ static PHP_METHOD(Phalcon_Html_Escaper, html) zephir_read_property(&_0, this_ptr, ZEND_STRL("flags"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_1, this_ptr, ZEND_STRL("encoding"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_2, this_ptr, ZEND_STRL("doubleEncode"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 286, &input, &_0, &_1, &_2); + ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 288, &input, &_0, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -185546,9 +186318,9 @@ static PHP_METHOD(Phalcon_Html_Escaper, js) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &input_param); zephir_get_strval(&input, input_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 322, &input); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 324, &input); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "doescapejs", NULL, 325, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "doescapejs", NULL, 327, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -185571,11 +186343,11 @@ static PHP_METHOD(Phalcon_Html_Escaper, normalizeEncoding) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &input_param); zephir_get_strval(&input, input_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "detectencoding", NULL, 326, &input); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "detectencoding", NULL, 328, &input); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "UTF-32"); - ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 327, &input, &_1, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 329, &input, &_1, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -185671,7 +186443,7 @@ static PHP_METHOD(Phalcon_Html_Escaper, url) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &input_param); zephir_get_strval(&input, input_param); - ZEPHIR_RETURN_CALL_FUNCTION("rawurlencode", NULL, 328, &input); + ZEPHIR_RETURN_CALL_FUNCTION("rawurlencode", NULL, 330, &input); zephir_check_call_status(); RETURN_MM(); } @@ -185698,7 +186470,7 @@ static PHP_METHOD(Phalcon_Html_Escaper, phpHtmlSpecialChars) zephir_read_property(&_0, this_ptr, ZEND_STRL("flags"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_1, this_ptr, ZEND_STRL("encoding"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_2, this_ptr, ZEND_STRL("doubleEncode"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 286, &input, &_0, &_1, &_2); + ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 288, &input, &_0, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -188833,7 +189605,7 @@ static PHP_METHOD(Phalcon_Html_Helper_Breadcrumbs, render) ZVAL_COPY(&element, _5); zephir_read_property(&_8$$4, this_ptr, ZEND_STRL("template"), PH_NOISY_CC | PH_READONLY); zephir_array_fetch_string(&_9$$4, &_8$$4, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Html/Helper/Breadcrumbs.zep", 220); - ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "getlink", &_10, 329, &_9$$4, &element); + ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "getlink", &_10, 331, &_9$$4, &element); zephir_check_call_status(); zephir_array_append(&output, &_7$$4, PH_SEPARATE, "phalcon/Html/Helper/Breadcrumbs.zep", 220); } ZEND_HASH_FOREACH_END(); @@ -188850,7 +189622,7 @@ static PHP_METHOD(Phalcon_Html_Helper_Breadcrumbs, render) zephir_check_call_status(); zephir_read_property(&_12$$5, this_ptr, ZEND_STRL("template"), PH_NOISY_CC | PH_READONLY); zephir_array_fetch_string(&_13$$5, &_12$$5, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Html/Helper/Breadcrumbs.zep", 220); - ZEPHIR_CALL_METHOD(&_11$$5, this_ptr, "getlink", &_10, 329, &_13$$5, &element); + ZEPHIR_CALL_METHOD(&_11$$5, this_ptr, "getlink", &_10, 331, &_13$$5, &element); zephir_check_call_status(); zephir_array_append(&output, &_11$$5, PH_SEPARATE, "phalcon/Html/Helper/Breadcrumbs.zep", 220); ZEPHIR_CALL_METHOD(NULL, &_4, "next", NULL, 0); @@ -188860,7 +189632,7 @@ static PHP_METHOD(Phalcon_Html_Helper_Breadcrumbs, render) ZEPHIR_INIT_NVAR(&element); zephir_read_property(&_15, this_ptr, ZEND_STRL("template"), PH_NOISY_CC | PH_READONLY); zephir_array_fetch_string(&_16, &_15, SL("last"), PH_NOISY | PH_READONLY, "phalcon/Html/Helper/Breadcrumbs.zep", 226); - ZEPHIR_CALL_METHOD(&_14, this_ptr, "getlink", &_10, 329, &_16, &lastElement); + ZEPHIR_CALL_METHOD(&_14, this_ptr, "getlink", &_10, 331, &_16, &lastElement); zephir_check_call_status(); zephir_array_append(&output, &_14, PH_SEPARATE, "phalcon/Html/Helper/Breadcrumbs.zep", 226); zephir_read_property(&_17, this_ptr, ZEND_STRL("interpolator"), PH_NOISY_CC | PH_READONLY); @@ -188869,7 +189641,7 @@ static PHP_METHOD(Phalcon_Html_Helper_Breadcrumbs, render) ZEPHIR_INIT_VAR(&_20); zephir_create_array(&_20, 4, 0); zephir_read_property(&_22, this_ptr, ZEND_STRL("attributes"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&_21, this_ptr, "processattributes", NULL, 330, &_22); + ZEPHIR_CALL_METHOD(&_21, this_ptr, "processattributes", NULL, 332, &_22); zephir_check_call_status(); zephir_array_update_string(&_20, SL("attributes"), &_21, PH_COPY | PH_SEPARATE); zephir_memory_observe(&_23); @@ -189002,7 +189774,7 @@ static PHP_METHOD(Phalcon_Html_Helper_Breadcrumbs, getLink) ZEPHIR_INIT_VAR(&_3); zephir_create_array(&_3, 4, 0); zephir_array_fetch_string(&_5, &element, SL("attributes"), PH_NOISY | PH_READONLY, "phalcon/Html/Helper/Breadcrumbs.zep", 300); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "processattributes", NULL, 330, &_5); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "processattributes", NULL, 332, &_5); zephir_check_call_status(); zephir_array_update_string(&_3, SL("attributes"), &_4, PH_COPY | PH_SEPARATE); zephir_memory_observe(&_6); @@ -189825,7 +190597,7 @@ static PHP_METHOD(Phalcon_Html_Helper_Meta, addHttp) zephir_get_strval(&content, content_param); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "http-equiv"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addelement", NULL, 332, &_0, &httpEquiv, &content); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addelement", NULL, 334, &_0, &httpEquiv, &content); zephir_check_call_status(); RETURN_MM(); } @@ -189852,7 +190624,7 @@ static PHP_METHOD(Phalcon_Html_Helper_Meta, addName) zephir_get_strval(&content, content_param); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "name"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "addelement", NULL, 332, &_0, &name, &content); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addelement", NULL, 334, &_0, &name, &content); zephir_check_call_status(); RETURN_THIS(); } @@ -189879,7 +190651,7 @@ static PHP_METHOD(Phalcon_Html_Helper_Meta, addProperty) zephir_get_strval(&content, content_param); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "property"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "addelement", NULL, 332, &_0, &name, &content); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addelement", NULL, 334, &_0, &name, &content); zephir_check_call_status(); RETURN_THIS(); } @@ -190359,7 +191131,7 @@ static PHP_METHOD(Phalcon_Html_Helper_Title, __toString) zephir_read_property(&_2, this_ptr, ZEND_STRL("title"), PH_NOISY_CC); zephir_array_fast_append(&_1, &_2); zephir_read_property(&_3, this_ptr, ZEND_STRL("append"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&items, "array_merge", NULL, 333, &_0, &_1, &_3); + ZEPHIR_CALL_FUNCTION(&items, "array_merge", NULL, 335, &_0, &_1, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); array_init(&_4); @@ -190545,7 +191317,7 @@ static PHP_METHOD(Phalcon_Html_Helper_Title, prepend) zephir_read_property(&_2, this_ptr, ZEND_STRL("prepend"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&prepend, &_2); ZEPHIR_MAKE_REF(&prepend); - ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 270, &prepend, &text); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 271, &prepend, &text); ZEPHIR_UNREF(&prepend); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("prepend"), &prepend); @@ -191394,7 +192166,7 @@ static PHP_METHOD(Phalcon_Html_Helper_Input_Select, add) raw = 0; } else { } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "processvalue", NULL, 331, &attributes, &value); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "processvalue", NULL, 333, &attributes, &value); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attributes, &_0); ZEPHIR_INIT_VAR(&_1); @@ -192093,7 +192865,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, addNamespace) ZEPHIR_INIT_VAR(&_1); ZEPHIR_CONCAT_VV(&_1, &_0, &nsSeparator); ZEPHIR_CPY_WRT(&nsName, &_1); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkdirectories", NULL, 179, directories, &dirSeparator); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkdirectories", NULL, 180, directories, &dirSeparator); zephir_check_call_status(); ZEPHIR_CPY_WRT(directories, &_2); zephir_read_property(&_3, this_ptr, ZEND_STRL("namespaces"), PH_NOISY_CC | PH_READONLY); @@ -192118,7 +192890,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, addNamespace) } ZEPHIR_INIT_VAR(&_7); zephir_fast_array_merge(&_7, &source, &target); - ZEPHIR_CALL_FUNCTION(&_2, "array_unique", NULL, 180, &_7); + ZEPHIR_CALL_FUNCTION(&_2, "array_unique", NULL, 181, &_7); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("namespaces"), &nsName, &_2); RETURN_THIS(); @@ -192156,40 +192928,40 @@ static PHP_METHOD(Phalcon_Autoload_Loader, autoload) zephir_update_property_zval(this_ptr, ZEND_STRL("debug"), &_0); ZEPHIR_INIT_VAR(&_1); ZEPHIR_CONCAT_SV(&_1, "Loading: ", &className); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 181, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 182, &_1); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "loader:beforeCheckClass"); ZEPHIR_CALL_METHOD(NULL, this_ptr, "firemanagerevent", NULL, 0, &_2, &className); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "autoloadcheckclasses", NULL, 182, &className); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "autoloadcheckclasses", NULL, 183, &className); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_3)) { RETURN_MM_BOOL(1); } ZEPHIR_INIT_VAR(&_4); ZEPHIR_CONCAT_SV(&_4, "Class: 404: ", &className); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 181, &_4); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 182, &_4); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_5, this_ptr, "autoloadchecknamespaces", NULL, 183, &className); + ZEPHIR_CALL_METHOD(&_5, this_ptr, "autoloadchecknamespaces", NULL, 184, &className); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_5)) { RETURN_MM_BOOL(1); } ZEPHIR_INIT_VAR(&_6); ZEPHIR_CONCAT_SV(&_6, "Namespace: 404: ", &className); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 181, &_6); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 182, &_6); zephir_check_call_status(); zephir_read_property(&_8, this_ptr, ZEND_STRL("directories"), PH_NOISY_CC | PH_READONLY); ZVAL_BOOL(&_9, 1); - ZEPHIR_CALL_METHOD(&_7, this_ptr, "autoloadcheckdirectories", NULL, 184, &_8, &className, &_9); + ZEPHIR_CALL_METHOD(&_7, this_ptr, "autoloadcheckdirectories", NULL, 185, &_8, &className, &_9); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_7)) { RETURN_MM_BOOL(1); } ZEPHIR_INIT_VAR(&_10); ZEPHIR_CONCAT_SV(&_10, "Directories: 404: ", &className); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 181, &_10); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 182, &_10); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "loader:afterCheckClass"); @@ -192358,7 +193130,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, register) ZVAL_STRING(&_2$$3, "autoload"); zephir_array_fast_append(&_1$$3, &_2$$3); ZVAL_BOOL(&_3$$3, (prepend ? 1 : 0)); - ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_register", NULL, 185, &_1$$3, &__$true, &_3$$3); + ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_register", NULL, 186, &_1$$3, &__$true, &_3$$3); zephir_check_call_status(); if (1) { zephir_update_property_zval(this_ptr, ZEND_STRL("isRegistered"), &__$true); @@ -192478,7 +193250,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, setDirectories) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addtocollection", NULL, 186, &directories, &_0, &_1, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addtocollection", NULL, 187, &directories, &_0, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -192627,7 +193399,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, setFiles) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addtocollection", NULL, 186, &files, &_0, &_1, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addtocollection", NULL, 187, &files, &_0, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -192684,7 +193456,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, setNamespaces) } ZEPHIR_INIT_NVAR(&directories); ZVAL_COPY(&directories, _1); - ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "checkdirectories", &_6, 179, &directories, &dirSeparator); + ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "checkdirectories", &_6, 180, &directories, &dirSeparator); zephir_check_call_status(); ZEPHIR_CPY_WRT(&directories, &_5$$4); ZEPHIR_CALL_METHOD(NULL, this_ptr, "addnamespace", &_7, 0, &name, &directories); @@ -192703,7 +193475,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, setNamespaces) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&directories, &namespaces, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_8$$5, this_ptr, "checkdirectories", &_6, 179, &directories, &dirSeparator); + ZEPHIR_CALL_METHOD(&_8$$5, this_ptr, "checkdirectories", &_6, 180, &directories, &dirSeparator); zephir_check_call_status(); ZEPHIR_CPY_WRT(&directories, &_8$$5); ZEPHIR_CALL_METHOD(NULL, this_ptr, "addnamespace", &_7, 0, &name, &directories); @@ -192741,7 +193513,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, unregister) ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "autoload"); zephir_array_fast_append(&_1$$3, &_2$$3); - ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_unregister", NULL, 187, &_1$$3); + ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_unregister", NULL, 188, &_1$$3); zephir_check_call_status(); if (0) { zephir_update_property_zval(this_ptr, ZEND_STRL("isRegistered"), &__$true); @@ -192780,7 +193552,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, requireFile) zephir_fetch_params(1, 1, 0, &file_param); zephir_get_strval(&file, file_param); zephir_read_property(&_0, this_ptr, ZEND_STRL("fileCheckingCallback"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_1, "call_user_func", NULL, 188, &_0, &file); + ZEPHIR_CALL_FUNCTION(&_1, "call_user_func", NULL, 189, &_0, &file); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&_1)) { ZEPHIR_INIT_VAR(&_2$$3); @@ -192789,7 +193561,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, requireFile) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_3$$3); ZEPHIR_CONCAT_SV(&_3$$3, "Require: ", &file); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 181, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 182, &_3$$3); zephir_check_call_status(); if (zephir_require_once_zval(&file) == FAILURE) { RETURN_MM_NULL(); @@ -192798,7 +193570,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, requireFile) } ZEPHIR_INIT_VAR(&_4); ZEPHIR_CONCAT_SV(&_4, "Require: 404: ", &file); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 181, &_4); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 182, &_4); zephir_check_call_status(); RETURN_MM_BOOL(0); } @@ -192928,7 +193700,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckClasses) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_3$$3); ZEPHIR_CONCAT_SV(&_3$$3, "Class: load: ", &filePath); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 181, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 182, &_3$$3); zephir_check_call_status(); RETURN_MM_BOOL(1); } @@ -193026,7 +193798,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckDirectories) if (isDirectory) { ZEPHIR_INIT_NVAR(&_11$$6); ZEPHIR_CONCAT_SV(&_11$$6, "Directories: ", &filePath); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 181, &_11$$6); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 182, &_11$$6); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -193056,7 +193828,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckDirectories) if (isDirectory) { ZEPHIR_INIT_NVAR(&_15$$9); ZEPHIR_CONCAT_SV(&_15$$9, "Directories: ", &filePath); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 181, &_15$$9); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 182, &_15$$9); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -193101,7 +193873,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckDirectories) if (isDirectory) { ZEPHIR_INIT_NVAR(&_21$$13); ZEPHIR_CONCAT_SV(&_21$$13, "Directories: ", &filePath); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 181, &_21$$13); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 182, &_21$$13); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -193131,7 +193903,7 @@ static PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckDirectories) if (isDirectory) { ZEPHIR_INIT_NVAR(&_24$$16); ZEPHIR_CONCAT_SV(&_24$$16, "Directories: ", &filePath); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 181, &_24$$16); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 182, &_24$$16); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -193214,13 +193986,13 @@ static PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckNamespaces) ZVAL_LONG(&_7$$3, zephir_fast_strlen_ev(&prefix)); ZEPHIR_INIT_NVAR(&fileName); zephir_substr(&fileName, &className, zephir_get_intval(&_7$$3), 0, ZEPHIR_SUBSTR_NO_LENGTH); - ZEPHIR_CALL_METHOD(&_8$$3, this_ptr, "autoloadcheckdirectories", &_9, 184, &directories, &fileName); + ZEPHIR_CALL_METHOD(&_8$$3, this_ptr, "autoloadcheckdirectories", &_9, 185, &directories, &fileName); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_8$$3)) { zephir_read_property(&_10$$5, this_ptr, ZEND_STRL("checkedPath"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_11$$5); ZEPHIR_CONCAT_SVSV(&_11$$5, "Namespace: ", &prefix, " - ", &_10$$5); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 181, &_11$$5); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 182, &_11$$5); zephir_check_call_status(); RETURN_MM_BOOL(1); } @@ -193249,13 +194021,13 @@ static PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckNamespaces) ZVAL_LONG(&_15$$6, zephir_fast_strlen_ev(&prefix)); ZEPHIR_INIT_NVAR(&fileName); zephir_substr(&fileName, &className, zephir_get_intval(&_15$$6), 0, ZEPHIR_SUBSTR_NO_LENGTH); - ZEPHIR_CALL_METHOD(&_16$$6, this_ptr, "autoloadcheckdirectories", &_9, 184, &directories, &fileName); + ZEPHIR_CALL_METHOD(&_16$$6, this_ptr, "autoloadcheckdirectories", &_9, 185, &directories, &fileName); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_16$$6)) { zephir_read_property(&_17$$8, this_ptr, ZEND_STRL("checkedPath"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_18$$8); ZEPHIR_CONCAT_SVSV(&_18$$8, "Namespace: ", &prefix, " - ", &_17$$8); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 181, &_18$$8); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 182, &_18$$8); zephir_check_call_status(); RETURN_MM_BOOL(1); } @@ -193681,7 +194453,7 @@ static PHP_METHOD(Phalcon_Tag_Select, optionsFromArray) } ZEPHIR_INIT_NVAR(&optionText); ZVAL_COPY(&optionText, _0); - ZEPHIR_CALL_FUNCTION(&escaped, "htmlspecialchars", &_4, 286, &optionValue); + ZEPHIR_CALL_FUNCTION(&escaped, "htmlspecialchars", &_4, 288, &optionValue); zephir_check_call_status(); if (Z_TYPE_P(&optionText) == IS_ARRAY) { ZEPHIR_INIT_NVAR(&_5$$4); @@ -193734,7 +194506,7 @@ static PHP_METHOD(Phalcon_Tag_Select, optionsFromArray) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&optionText, &data, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&escaped, "htmlspecialchars", &_4, 286, &optionValue); + ZEPHIR_CALL_FUNCTION(&escaped, "htmlspecialchars", &_4, 288, &optionValue); zephir_check_call_status(); if (Z_TYPE_P(&optionText) == IS_ARRAY) { ZEPHIR_INIT_NVAR(&_16$$12); @@ -195060,7 +195832,7 @@ static PHP_METHOD(Phalcon_Support_Debug, listenLowSeverity) ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "onUncaughtLowSeverity"); zephir_array_fast_append(&_0, &_1); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 135, &_0); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 136, &_0); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); zephir_create_array(&_2, 2, 0); @@ -196132,7 +196904,7 @@ static PHP_METHOD(Phalcon_Support_Debug, showTraceItem) } else { ZEPHIR_INIT_VAR(&classReflection); object_init_ex(&classReflection, zephir_get_internal_ce(SL("reflectionclass"))); - ZEPHIR_CALL_METHOD(NULL, &classReflection, "__construct", NULL, 154, &className); + ZEPHIR_CALL_METHOD(NULL, &classReflection, "__construct", NULL, 155, &className); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_11$$5, &classReflection, "isinternal", NULL, 0); zephir_check_call_status(); @@ -196165,7 +196937,7 @@ static PHP_METHOD(Phalcon_Support_Debug, showTraceItem) if ((zephir_function_exists(&functionName) == SUCCESS)) { ZEPHIR_INIT_VAR(&functionReflection); object_init_ex(&functionReflection, zephir_get_internal_ce(SL("reflectionfunction"))); - ZEPHIR_CALL_METHOD(NULL, &functionReflection, "__construct", NULL, 151, &functionName); + ZEPHIR_CALL_METHOD(NULL, &functionReflection, "__construct", NULL, 152, &functionName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_17$$10, &functionReflection, "isinternal", NULL, 0); zephir_check_call_status(); @@ -197171,7 +197943,7 @@ static PHP_METHOD(Phalcon_Support_Version, getVersion) ZVAL_LONG(&_0, 9); zephir_array_fast_append(return_value, &_0); ZEPHIR_INIT_NVAR(&_0); - ZVAL_LONG(&_0, 3); + ZVAL_LONG(&_0, 4); zephir_array_fast_append(return_value, &_0); ZEPHIR_INIT_NVAR(&_0); ZVAL_LONG(&_0, 4); @@ -197298,11 +198070,11 @@ static PHP_METHOD(Phalcon_Support_Version, getId) zephir_array_fetch_long(&specialNumber, &version, 4, PH_NOISY, "phalcon/Support/Version.zep", 164); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "%02s"); - ZEPHIR_CALL_FUNCTION(&_1, "sprintf", NULL, 117, &_0, &medium); + ZEPHIR_CALL_FUNCTION(&_1, "sprintf", NULL, 118, &_0, &medium); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_0); ZVAL_STRING(&_0, "%02s"); - ZEPHIR_CALL_FUNCTION(&_2, "sprintf", NULL, 117, &_0, &minor); + ZEPHIR_CALL_FUNCTION(&_2, "sprintf", NULL, 118, &_0, &minor); zephir_check_call_status(); ZEPHIR_CONCAT_VVVVV(return_value, &major, &_1, &_2, &special, &specialNumber); RETURN_MM(); @@ -198182,10 +198954,10 @@ static PHP_METHOD(Phalcon_Support_Debug_Dump, output) } else { ZEPHIR_INIT_VAR(&reflect$$15); object_init_ex(&reflect$$15, zephir_get_internal_ce(SL("reflectionclass"))); - ZEPHIR_CALL_METHOD(NULL, &reflect$$15, "__construct", NULL, 154, variable); + ZEPHIR_CALL_METHOD(NULL, &reflect$$15, "__construct", NULL, 155, variable); zephir_check_call_status(); ZVAL_LONG(&_67$$15, ((1 | 2) | 4)); - ZEPHIR_CALL_METHOD(&props$$15, &reflect$$15, "getproperties", NULL, 165, &_67$$15); + ZEPHIR_CALL_METHOD(&props$$15, &reflect$$15, "getproperties", NULL, 166, &_67$$15); zephir_check_call_status(); zephir_is_iterable(&props$$15, 0, "phalcon/Support/Debug/Dump.zep", 306); if (Z_TYPE_P(&props$$15) == IS_ARRAY) { @@ -198463,7 +199235,7 @@ static PHP_METHOD(Phalcon_Support_Debug_Dump, output) ZEPHIR_CONCAT_VV(return_value, &output, &_145$$26); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_147, "is_float", NULL, 214, variable); + ZEPHIR_CALL_FUNCTION(&_147, "is_float", NULL, 215, variable); zephir_check_call_status(); if (zephir_is_true(&_147)) { ZEPHIR_INIT_VAR(&_148$$27); @@ -199462,7 +200234,7 @@ static PHP_METHOD(Phalcon_Support_Helper_Arr_Group, processCallable) ZEPHIR_CALL_METHOD(&_0, this_ptr, "iscallable", NULL, 0, method); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { - ZEPHIR_CALL_FUNCTION(&key, "call_user_func", NULL, 188, method, element); + ZEPHIR_CALL_FUNCTION(&key, "call_user_func", NULL, 189, method, element); zephir_check_call_status(); zephir_array_update_multi(&output, element, SL("za"), 2, &key); } @@ -199620,7 +200392,7 @@ static PHP_METHOD(Phalcon_Support_Helper_Arr_IsUnique, __invoke) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &collection_param); zephir_get_arrval(&collection, collection_param); - ZEPHIR_CALL_FUNCTION(&_0, "array_unique", NULL, 180, &collection); + ZEPHIR_CALL_FUNCTION(&_0, "array_unique", NULL, 181, &collection); zephir_check_call_status(); RETURN_MM_BOOL(zephir_fast_count_int(&collection) == zephir_fast_count_int(&_0)); } @@ -199671,7 +200443,7 @@ static PHP_METHOD(Phalcon_Support_Helper_Arr_Last, __invoke) ZEPHIR_CALL_METHOD(&filtered, this_ptr, "tofilter", NULL, 0, &collection, method); zephir_check_call_status(); ZEPHIR_MAKE_REF(&filtered); - ZEPHIR_RETURN_CALL_FUNCTION("end", NULL, 321, &filtered); + ZEPHIR_RETURN_CALL_FUNCTION("end", NULL, 323, &filtered); ZEPHIR_UNREF(&filtered); zephir_check_call_status(); RETURN_MM(); @@ -200786,7 +201558,7 @@ static PHP_METHOD(Phalcon_Support_Helper_Str_Concat, __invoke) ZEPHIR_UNREF(&arguments); zephir_check_call_status(); ZEPHIR_MAKE_REF(&arguments); - ZEPHIR_CALL_FUNCTION(&last, "end", NULL, 321, &arguments); + ZEPHIR_CALL_FUNCTION(&last, "end", NULL, 323, &arguments); ZEPHIR_UNREF(&arguments); zephir_check_call_status(); ZEPHIR_INIT_VAR(&prefix); @@ -200937,7 +201709,7 @@ static PHP_METHOD(Phalcon_Support_Helper_Str_Decapitalize, __invoke) zephir_get_strval(&encoding, encoding_param); } ZVAL_LONG(&_0, 1); - ZEPHIR_CALL_FUNCTION(&substr, "mb_substr", NULL, 228, &text, &_0); + ZEPHIR_CALL_FUNCTION(&substr, "mb_substr", NULL, 229, &text, &_0); zephir_check_call_status(); if (upperRest) { ZEPHIR_CALL_METHOD(&suffix, this_ptr, "toupper", NULL, 0, &substr, &encoding); @@ -200947,7 +201719,7 @@ static PHP_METHOD(Phalcon_Support_Helper_Str_Decapitalize, __invoke) } ZVAL_LONG(&_0, 0); ZVAL_LONG(&_2, 1); - ZEPHIR_CALL_FUNCTION(&_3, "mb_substr", NULL, 228, &text, &_0, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "mb_substr", NULL, 229, &text, &_0, &_2); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_1, this_ptr, "tolower", NULL, 0, &_3, &encoding); zephir_check_call_status(); @@ -201075,12 +201847,12 @@ static PHP_METHOD(Phalcon_Support_Helper_Str_DirFromFile, __invoke) zephir_check_call_status(); ZVAL_LONG(&_0, 0); ZVAL_LONG(&_1, -2); - ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 228, &name, &_0, &_1); + ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 229, &name, &_0, &_1); zephir_check_call_status(); if (!zephir_is_true(&start)) { ZVAL_LONG(&_2$$3, 0); ZVAL_LONG(&_3$$3, 1); - ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 228, &name, &_2$$3, &_3$$3); + ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 229, &name, &_2$$3, &_3$$3); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_4); @@ -201266,7 +202038,7 @@ static PHP_METHOD(Phalcon_Support_Helper_Str_Dynamic, __invoke) ZEPHIR_INIT_NVAR(&words); zephir_fast_explode(&words, &separator, &_9$$6, LONG_MAX); ZEPHIR_OBS_NVAR(&word); - ZEPHIR_CALL_FUNCTION(&_10$$6, "array_rand", &_11, 202, &words); + ZEPHIR_CALL_FUNCTION(&_10$$6, "array_rand", &_11, 203, &words); zephir_check_call_status(); zephir_array_fetch(&word, &words, &_10$$6, PH_NOISY, "phalcon/Support/Helper/Str/Dynamic.zep", 62); zephir_array_fetch_long(&_12$$6, &match, 0, PH_NOISY | PH_READONLY, "phalcon/Support/Helper/Str/Dynamic.zep", 63); @@ -201301,7 +202073,7 @@ static PHP_METHOD(Phalcon_Support_Helper_Str_Dynamic, __invoke) ZEPHIR_INIT_NVAR(&words); zephir_fast_explode(&words, &separator, &_18$$8, LONG_MAX); ZEPHIR_OBS_NVAR(&word); - ZEPHIR_CALL_FUNCTION(&_19$$8, "array_rand", &_11, 202, &words); + ZEPHIR_CALL_FUNCTION(&_19$$8, "array_rand", &_11, 203, &words); zephir_check_call_status(); zephir_array_fetch(&word, &words, &_19$$8, PH_NOISY, "phalcon/Support/Helper/Str/Dynamic.zep", 62); zephir_array_fetch_long(&_20$$8, &match, 0, PH_NOISY | PH_READONLY, "phalcon/Support/Helper/Str/Dynamic.zep", 63); @@ -202272,7 +203044,7 @@ static PHP_METHOD(Phalcon_Support_Helper_Str_Len, __invoke) } else { zephir_get_strval(&encoding, encoding_param); } - ZEPHIR_RETURN_CALL_FUNCTION("mb_strlen", NULL, 246, &text, &encoding); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strlen", NULL, 247, &text, &encoding); zephir_check_call_status(); RETURN_MM(); } @@ -202653,37 +203425,37 @@ static PHP_METHOD(Phalcon_Support_Helper_Str_Random, __invoke) ZVAL_STRING(&_3, "a"); ZEPHIR_INIT_VAR(&_4); ZVAL_STRING(&_4, "z"); - ZEPHIR_CALL_FUNCTION(&_5, "range", NULL, 314, &_3, &_4); + ZEPHIR_CALL_FUNCTION(&_5, "range", NULL, 316, &_3, &_4); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "A"); ZEPHIR_INIT_NVAR(&_4); ZVAL_STRING(&_4, "Z"); - ZEPHIR_CALL_FUNCTION(&_6, "range", NULL, 314, &_3, &_4); + ZEPHIR_CALL_FUNCTION(&_6, "range", NULL, 316, &_3, &_4); zephir_check_call_status(); zephir_fast_array_merge(&_2, &_5, &_6); zephir_array_update_long(&pools, 1, &_2, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY); ZEPHIR_INIT_NVAR(&_2); ZVAL_LONG(&_7, 0); ZVAL_LONG(&_8, 9); - ZEPHIR_CALL_FUNCTION(&_9, "range", NULL, 314, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&_9, "range", NULL, 316, &_7, &_8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "a"); ZEPHIR_INIT_NVAR(&_4); ZVAL_STRING(&_4, "f"); - ZEPHIR_CALL_FUNCTION(&_10, "range", NULL, 314, &_3, &_4); + ZEPHIR_CALL_FUNCTION(&_10, "range", NULL, 316, &_3, &_4); zephir_check_call_status(); zephir_fast_array_merge(&_2, &_9, &_10); zephir_array_update_long(&pools, 2, &_2, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY); ZVAL_LONG(&_7, 0); ZVAL_LONG(&_8, 9); - ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 314, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 316, &_7, &_8); zephir_check_call_status(); zephir_array_update_long(&pools, 3, &_11, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY); ZVAL_LONG(&_7, 1); ZVAL_LONG(&_8, 9); - ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 314, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 316, &_7, &_8); zephir_check_call_status(); zephir_array_update_long(&pools, 4, &_11, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY); ZEPHIR_INIT_NVAR(&_2); @@ -202693,21 +203465,21 @@ static PHP_METHOD(Phalcon_Support_Helper_Str_Random, __invoke) zephir_array_update_long(&pools, 5, &_11, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY); ZVAL_LONG(&_7, 0); ZVAL_LONG(&_8, 9); - ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 314, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 316, &_7, &_8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "a"); ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "z"); - ZEPHIR_CALL_FUNCTION(&_12, "range", NULL, 314, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&_12, "range", NULL, 316, &_2, &_3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "A"); ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Z"); - ZEPHIR_CALL_FUNCTION(&_13, "range", NULL, 314, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&_13, "range", NULL, 316, &_2, &_3); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_14, "array_merge", NULL, 333, &_11, &_12, &_13); + ZEPHIR_CALL_FUNCTION(&_14, "array_merge", NULL, 335, &_11, &_12, &_13); zephir_check_call_status(); zephir_array_update_long(&pools, 0, &_14, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY); zephir_array_fetch_long(&_15, &pools, type, PH_NOISY | PH_READONLY, "phalcon/Support/Helper/Str/Random.zep", 66); @@ -203201,7 +203973,7 @@ static PHP_METHOD(Phalcon_Support_Helper_Json_Decode, __invoke) zephir_json_encode(&_3$$3, &__$null, 0 ); ZEPHIR_INIT_VAR(&_4$$3); object_init_ex(&_4$$3, spl_ce_InvalidArgumentException); - ZEPHIR_CALL_METHOD(NULL, &_4$$3, "__construct", NULL, 200, &message, &error); + ZEPHIR_CALL_METHOD(NULL, &_4$$3, "__construct", NULL, 201, &message, &error); zephir_check_call_status(); zephir_throw_exception_debug(&_4$$3, "phalcon/Support/Helper/Json/Decode.zep", 64); ZEPHIR_MM_RESTORE(); @@ -203276,7 +204048,7 @@ static PHP_METHOD(Phalcon_Support_Helper_Json_Encode, __invoke) zephir_json_encode(&_2$$3, &__$null, 0 ); ZEPHIR_INIT_VAR(&_3$$3); object_init_ex(&_3$$3, spl_ce_InvalidArgumentException); - ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 200, &message, &error); + ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 201, &message, &error); zephir_check_call_status(); zephir_throw_exception_debug(&_3$$3, "phalcon/Support/Helper/Json/Encode.zep", 64); ZEPHIR_MM_RESTORE(); @@ -204110,7 +204882,7 @@ static PHP_METHOD(Phalcon_Forms_Form, bind) zephir_update_property_zval_zval(entity, &key, &filteredValue); continue; } - ZEPHIR_CALL_FUNCTION(&_13$$11, "property_exists", &_14, 290, entity, &key); + ZEPHIR_CALL_FUNCTION(&_13$$11, "property_exists", &_14, 292, entity, &key); zephir_check_call_status(); if (zephir_is_true(&_13$$11)) { zephir_update_property_zval_zval(entity, &key, &filteredValue); @@ -204176,7 +204948,7 @@ static PHP_METHOD(Phalcon_Forms_Form, bind) zephir_update_property_zval_zval(entity, &key, &filteredValue); continue; } - ZEPHIR_CALL_FUNCTION(&_21$$21, "property_exists", &_14, 290, entity, &key); + ZEPHIR_CALL_FUNCTION(&_21$$21, "property_exists", &_14, 292, entity, &key); zephir_check_call_status(); if (zephir_is_true(&_21$$21)) { zephir_update_property_zval_zval(entity, &key, &filteredValue); @@ -204958,7 +205730,7 @@ static PHP_METHOD(Phalcon_Forms_Form, isValid) if (_7) { ZEPHIR_INIT_NVAR(&validation); object_init_ex(&validation, phalcon_filter_validation_ce); - ZEPHIR_CALL_METHOD(NULL, &validation, "__construct", NULL, 315); + ZEPHIR_CALL_METHOD(NULL, &validation, "__construct", NULL, 317); zephir_check_call_status(); } zephir_read_property(&_8, this_ptr, ZEND_STRL("elements"), PH_NOISY_CC | PH_READONLY); @@ -204981,7 +205753,7 @@ static PHP_METHOD(Phalcon_Forms_Form, isValid) { ZEPHIR_INIT_NVAR(&validator); ZVAL_COPY(&validator, _11$$10); - ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 316, &name, &validator); + ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 318, &name, &validator); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); } else { @@ -204995,7 +205767,7 @@ static PHP_METHOD(Phalcon_Forms_Form, isValid) } ZEPHIR_CALL_METHOD(&validator, &validators, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 316, &name, &validator); + ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 318, &name, &validator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &validators, "next", NULL, 0); zephir_check_call_status(); @@ -205005,7 +205777,7 @@ static PHP_METHOD(Phalcon_Forms_Form, isValid) ZEPHIR_CALL_METHOD(&filters, &element, "getfilters", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&filters) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(NULL, &validation, "setfilters", &_14, 317, &name, &filters); + ZEPHIR_CALL_METHOD(NULL, &validation, "setfilters", &_14, 319, &name, &filters); zephir_check_call_status(); } } ZEND_HASH_FOREACH_END(); @@ -205033,7 +205805,7 @@ static PHP_METHOD(Phalcon_Forms_Form, isValid) { ZEPHIR_INIT_NVAR(&validator); ZVAL_COPY(&validator, _15$$15); - ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 316, &name, &validator); + ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 318, &name, &validator); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); } else { @@ -205047,7 +205819,7 @@ static PHP_METHOD(Phalcon_Forms_Form, isValid) } ZEPHIR_CALL_METHOD(&validator, &validators, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 316, &name, &validator); + ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 318, &name, &validator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &validators, "next", NULL, 0); zephir_check_call_status(); @@ -205057,7 +205829,7 @@ static PHP_METHOD(Phalcon_Forms_Form, isValid) ZEPHIR_CALL_METHOD(&filters, &element, "getfilters", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&filters) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(NULL, &validation, "setfilters", &_14, 317, &name, &filters); + ZEPHIR_CALL_METHOD(NULL, &validation, "setfilters", &_14, 319, &name, &filters); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(NULL, &_8, "next", NULL, 0); @@ -205065,9 +205837,9 @@ static PHP_METHOD(Phalcon_Forms_Form, isValid) } } ZEPHIR_INIT_NVAR(&element); - ZEPHIR_CALL_METHOD(NULL, &validation, "validate", NULL, 318, data, entity); + ZEPHIR_CALL_METHOD(NULL, &validation, "validate", NULL, 320, data, entity); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&messages, &validation, "getmessages", NULL, 319); + ZEPHIR_CALL_METHOD(&messages, &validation, "getmessages", NULL, 321); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_17, &messages, "count", NULL, 0); zephir_check_call_status(); @@ -205558,7 +206330,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, 320, entity); + ZEPHIR_CALL_METHOD(NULL, &form, "__construct", NULL, 322, entity); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("forms"), &name, &form); RETURN_CCTOR(&form); @@ -207339,6 +208111,7 @@ zend_class_entry *phalcon_filter_sanitize_boolval_ce; zend_class_entry *phalcon_filter_sanitize_email_ce; zend_class_entry *phalcon_filter_sanitize_floatval_ce; zend_class_entry *phalcon_filter_sanitize_intval_ce; +zend_class_entry *phalcon_filter_sanitize_ip_ce; zend_class_entry *phalcon_filter_sanitize_lower_ce; zend_class_entry *phalcon_filter_sanitize_lowerfirst_ce; zend_class_entry *phalcon_filter_sanitize_regex_ce; @@ -207977,6 +208750,7 @@ static PHP_MINIT_FUNCTION(phalcon) ZEPHIR_INIT(Phalcon_Filter_Sanitize_Email); ZEPHIR_INIT(Phalcon_Filter_Sanitize_FloatVal); ZEPHIR_INIT(Phalcon_Filter_Sanitize_IntVal); + ZEPHIR_INIT(Phalcon_Filter_Sanitize_Ip); ZEPHIR_INIT(Phalcon_Filter_Sanitize_Lower); ZEPHIR_INIT(Phalcon_Filter_Sanitize_LowerFirst); ZEPHIR_INIT(Phalcon_Filter_Sanitize_Regex); diff --git a/build/phalcon/phalcon.zep.h b/build/phalcon/phalcon.zep.h index 0df8853748b..21bbceb5432 100644 --- a/build/phalcon/phalcon.zep.h +++ b/build/phalcon/phalcon.zep.h @@ -8355,6 +8355,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_events_managerinterface_ ZEND_ARG_TYPE_INFO(0, eventType, IS_STRING, 0) ZEND_ARG_INFO(0, handler) + ZEND_ARG_TYPE_INFO(0, priority, IS_LONG, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_events_managerinterface_detach, 0, 2, IS_VOID, 0) @@ -8429,6 +8430,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_filter_validation_validationinterface_bind, 0, 2, Phalcon\\Filter\\Validation\\ValidationInterface, 0) ZEND_ARG_INFO(0, entity) ZEND_ARG_INFO(0, data) +ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, whitelist, IS_ARRAY, 0, "[]") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_filter_validation_validationinterface_getentity, 0, 0, 0) @@ -8475,6 +8477,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_filter_validation_validationinterface_validate, 0, 0, 0) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(0, entity) +ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, whitelist, IS_ARRAY, 0, "[]") ZEND_END_ARG_INFO() ZEPHIR_INIT_FUNCS(phalcon_filter_validation_validationinterface_method_entry) { @@ -18693,6 +18696,28 @@ ZEPHIR_INIT_FUNCS(phalcon_filter_sanitize_intval_method_entry) { PHP_FE_END }; +zend_class_entry *phalcon_filter_sanitize_ip_ce; + +ZEPHIR_INIT_CLASS(Phalcon_Filter_Sanitize_Ip); + +static PHP_METHOD(Phalcon_Filter_Sanitize_Ip, __invoke); +static PHP_METHOD(Phalcon_Filter_Sanitize_Ip, getIpAddressProtocolVersion); + +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_filter_sanitize_ip___invoke, 0, 0, 1) + ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, filter, IS_LONG, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_phalcon_filter_sanitize_ip_getipaddressprotocolversion, 0, 1, MAY_BE_LONG|MAY_BE_FALSE) + ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0) +ZEND_END_ARG_INFO() + +ZEPHIR_INIT_FUNCS(phalcon_filter_sanitize_ip_method_entry) { + PHP_ME(Phalcon_Filter_Sanitize_Ip, __invoke, arginfo_phalcon_filter_sanitize_ip___invoke, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Filter_Sanitize_Ip, getIpAddressProtocolVersion, arginfo_phalcon_filter_sanitize_ip_getipaddressprotocolversion, ZEND_ACC_PRIVATE) + PHP_FE_END +}; + zend_class_entry *phalcon_filter_sanitize_lower_ce; ZEPHIR_INIT_CLASS(Phalcon_Filter_Sanitize_Lower); @@ -18948,6 +18973,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, setFilters); static PHP_METHOD(Phalcon_Filter_Validation, setLabels); static PHP_METHOD(Phalcon_Filter_Validation, setValidators); static PHP_METHOD(Phalcon_Filter_Validation, validate); +static PHP_METHOD(Phalcon_Filter_Validation, fails); static PHP_METHOD(Phalcon_Filter_Validation, preChecking); zend_object *zephir_init_properties_Phalcon_Filter_Validation(zend_class_entry *class_type); @@ -18967,6 +18993,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_filter_validation_bind, 0, 2, Phalcon\\Filter\\Validation\\ValidationInterface, 0) ZEND_ARG_INFO(0, entity) ZEND_ARG_INFO(0, data) +ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, whitelist, IS_ARRAY, 0, "[]") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_filter_validation_getdata, 0, 0, 0) @@ -19035,6 +19062,10 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_filter_validation_validate, 0, 0, 0) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(0, entity) +ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, whitelist, IS_ARRAY, 0, "[]") +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_fails, 0, 0, _IS_BOOL, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_prechecking, 0, 2, _IS_BOOL, 0) @@ -19066,6 +19097,7 @@ PHP_ME(Phalcon_Filter_Validation, getEntity, arginfo_phalcon_filter_validation_g PHP_ME(Phalcon_Filter_Validation, setLabels, arginfo_phalcon_filter_validation_setlabels, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Filter_Validation, setValidators, arginfo_phalcon_filter_validation_setvalidators, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Filter_Validation, validate, arginfo_phalcon_filter_validation_validate, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Filter_Validation, fails, arginfo_phalcon_filter_validation_fails, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Filter_Validation, preChecking, arginfo_phalcon_filter_validation_prechecking, ZEND_ACC_PROTECTED) PHP_FE_END }; @@ -21459,6 +21491,7 @@ static PHP_METHOD(Phalcon_Http_Request, hasPut); static PHP_METHOD(Phalcon_Http_Request, hasQuery); static PHP_METHOD(Phalcon_Http_Request, hasServer); static PHP_METHOD(Phalcon_Http_Request, isAjax); +static PHP_METHOD(Phalcon_Http_Request, isJson); static PHP_METHOD(Phalcon_Http_Request, isConnect); static PHP_METHOD(Phalcon_Http_Request, isDelete); static PHP_METHOD(Phalcon_Http_Request, isGet); @@ -21478,6 +21511,8 @@ static PHP_METHOD(Phalcon_Http_Request, numFiles); static PHP_METHOD(Phalcon_Http_Request, setHttpMethodParameterOverride); static PHP_METHOD(Phalcon_Http_Request, setParameterFilters); static PHP_METHOD(Phalcon_Http_Request, setStrictHostCheck); +static PHP_METHOD(Phalcon_Http_Request, setTrustedProxies); +static PHP_METHOD(Phalcon_Http_Request, isIpAddressInCIDR); static PHP_METHOD(Phalcon_Http_Request, getBestQuality); static PHP_METHOD(Phalcon_Http_Request, getHelper); static PHP_METHOD(Phalcon_Http_Request, hasFileHelper); @@ -21487,7 +21522,7 @@ static PHP_METHOD(Phalcon_Http_Request, smoothFiles); static PHP_METHOD(Phalcon_Http_Request, getFilterService); static PHP_METHOD(Phalcon_Http_Request, getServerArray); static PHP_METHOD(Phalcon_Http_Request, getFilteredData); -static PHP_METHOD(Phalcon_Http_Request, getPatchPut); +static PHP_METHOD(Phalcon_Http_Request, getPostData); static PHP_METHOD(Phalcon_Http_Request, getFormData); zend_object *zephir_init_properties_Phalcon_Http_Request(zend_class_entry *class_type); @@ -21681,6 +21716,9 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_request_isajax, 0, 0, _IS_BOOL, 0) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_request_isjson, 0, 0, _IS_BOOL, 0) +ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_request_isconnect, 0, 0, _IS_BOOL, 0) ZEND_END_ARG_INFO() @@ -21747,6 +21785,15 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_request_setstricthos ZEND_ARG_TYPE_INFO(0, flag, _IS_BOOL, 0) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_request_settrustedproxies, 0, 1, Phalcon\\Http\\RequestInterface, 0) + ZEND_ARG_ARRAY_INFO(0, trustedProxies, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_request_isipaddressincidr, 0, 2, _IS_BOOL, 0) + ZEND_ARG_TYPE_INFO(0, ip, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, cidr, IS_STRING, 0) +ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_request_getbestquality, 0, 2, IS_STRING, 0) ZEND_ARG_ARRAY_INFO(0, qualityParts, 0) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) @@ -21798,13 +21845,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_request_getfiltereddata, 0, 0, 2) ZEND_ARG_TYPE_INFO(0, noRecursive, _IS_BOOL, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_request_getpatchput, 0, 0, 1) - ZEND_ARG_TYPE_INFO(0, collection, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 1) - ZEND_ARG_INFO(0, filters) - ZEND_ARG_INFO(0, defaultValue) - ZEND_ARG_TYPE_INFO(0, notAllowEmpty, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, noRecursive, _IS_BOOL, 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_request_getpostdata, 0, 1, IS_ARRAY, 0) + ZEND_ARG_INFO(0, data) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_request_getformdata, 0, 0, IS_ARRAY, 0) @@ -21830,13 +21872,13 @@ ZEPHIR_INIT_FUNCS(phalcon_http_request_method_entry) { PHP_ME(Phalcon_Http_Request, getFilteredPatch, arginfo_phalcon_http_request_getfilteredpatch, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, getFilteredPost, arginfo_phalcon_http_request_getfilteredpost, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, getFilteredPut, arginfo_phalcon_http_request_getfilteredput, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Request, getHeader, arginfo_phalcon_http_request_getheader, ZEND_ACC_FINAL|ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Http_Request, getHeader, arginfo_phalcon_http_request_getheader, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, getHeaders, arginfo_phalcon_http_request_getheaders, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, getHttpHost, arginfo_phalcon_http_request_gethttphost, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, getHTTPReferer, arginfo_phalcon_http_request_gethttpreferer, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, getJsonRawBody, arginfo_phalcon_http_request_getjsonrawbody, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, getLanguages, arginfo_phalcon_http_request_getlanguages, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Request, getMethod, arginfo_phalcon_http_request_getmethod, ZEND_ACC_FINAL|ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Http_Request, getMethod, arginfo_phalcon_http_request_getmethod, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, getPatch, arginfo_phalcon_http_request_getpatch, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, getPort, arginfo_phalcon_http_request_getport, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, getPost, arginfo_phalcon_http_request_getpost, ZEND_ACC_PUBLIC) @@ -21848,7 +21890,7 @@ ZEPHIR_INIT_FUNCS(phalcon_http_request_method_entry) { PHP_ME(Phalcon_Http_Request, getServerAddress, arginfo_phalcon_http_request_getserveraddress, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, getServerName, arginfo_phalcon_http_request_getservername, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, getUploadedFiles, arginfo_phalcon_http_request_getuploadedfiles, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Request, getURI, arginfo_phalcon_http_request_geturi, ZEND_ACC_FINAL|ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Http_Request, getURI, arginfo_phalcon_http_request_geturi, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, getUserAgent, arginfo_phalcon_http_request_getuseragent, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, has, arginfo_phalcon_http_request_has, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, hasFiles, arginfo_phalcon_http_request_hasfiles, ZEND_ACC_PUBLIC) @@ -21859,6 +21901,7 @@ ZEPHIR_INIT_FUNCS(phalcon_http_request_method_entry) { PHP_ME(Phalcon_Http_Request, hasQuery, arginfo_phalcon_http_request_hasquery, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, hasServer, arginfo_phalcon_http_request_hasserver, ZEND_ACC_FINAL|ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, isAjax, arginfo_phalcon_http_request_isajax, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Http_Request, isJson, arginfo_phalcon_http_request_isjson, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, isConnect, arginfo_phalcon_http_request_isconnect, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, isDelete, arginfo_phalcon_http_request_isdelete, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, isGet, arginfo_phalcon_http_request_isget, ZEND_ACC_PUBLIC) @@ -21878,16 +21921,18 @@ ZEPHIR_INIT_FUNCS(phalcon_http_request_method_entry) { PHP_ME(Phalcon_Http_Request, setHttpMethodParameterOverride, arginfo_phalcon_http_request_sethttpmethodparameteroverride, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, setParameterFilters, arginfo_phalcon_http_request_setparameterfilters, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, setStrictHostCheck, arginfo_phalcon_http_request_setstricthostcheck, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Request, getBestQuality, arginfo_phalcon_http_request_getbestquality, ZEND_ACC_FINAL|ZEND_ACC_PROTECTED) - PHP_ME(Phalcon_Http_Request, getHelper, arginfo_phalcon_http_request_gethelper, ZEND_ACC_FINAL|ZEND_ACC_PROTECTED) - PHP_ME(Phalcon_Http_Request, hasFileHelper, arginfo_phalcon_http_request_hasfilehelper, ZEND_ACC_FINAL|ZEND_ACC_PROTECTED) - PHP_ME(Phalcon_Http_Request, getQualityHeader, arginfo_phalcon_http_request_getqualityheader, ZEND_ACC_FINAL|ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Http_Request, setTrustedProxies, arginfo_phalcon_http_request_settrustedproxies, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Http_Request, isIpAddressInCIDR, arginfo_phalcon_http_request_isipaddressincidr, ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Http_Request, getBestQuality, arginfo_phalcon_http_request_getbestquality, ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Http_Request, getHelper, arginfo_phalcon_http_request_gethelper, ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Http_Request, hasFileHelper, arginfo_phalcon_http_request_hasfilehelper, ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Http_Request, getQualityHeader, arginfo_phalcon_http_request_getqualityheader, ZEND_ACC_PROTECTED) PHP_ME(Phalcon_Http_Request, resolveAuthorizationHeaders, arginfo_phalcon_http_request_resolveauthorizationheaders, ZEND_ACC_PROTECTED) - PHP_ME(Phalcon_Http_Request, smoothFiles, arginfo_phalcon_http_request_smoothfiles, ZEND_ACC_FINAL|ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Http_Request, smoothFiles, arginfo_phalcon_http_request_smoothfiles, ZEND_ACC_PROTECTED) PHP_ME(Phalcon_Http_Request, getFilterService, arginfo_phalcon_http_request_getfilterservice, ZEND_ACC_PRIVATE) PHP_ME(Phalcon_Http_Request, getServerArray, arginfo_phalcon_http_request_getserverarray, ZEND_ACC_PRIVATE) PHP_ME(Phalcon_Http_Request, getFilteredData, arginfo_phalcon_http_request_getfiltereddata, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Request, getPatchPut, arginfo_phalcon_http_request_getpatchput, ZEND_ACC_PRIVATE) + PHP_ME(Phalcon_Http_Request, getPostData, arginfo_phalcon_http_request_getpostdata, ZEND_ACC_PRIVATE) PHP_ME(Phalcon_Http_Request, getFormData, arginfo_phalcon_http_request_getformdata, ZEND_ACC_PRIVATE) PHP_FE_END }; diff --git a/build/phalcon/php_phalcon.h b/build/phalcon/php_phalcon.h index 7fb0e431051..b907085e28d 100644 --- a/build/phalcon/php_phalcon.h +++ b/build/phalcon/php_phalcon.h @@ -103,10 +103,10 @@ typedef zend_function zephir_fcall_cache_entry; #define PHP_PHALCON_NAME "phalcon" -#define PHP_PHALCON_VERSION "5.9.3" +#define PHP_PHALCON_VERSION "5.9.4" #define PHP_PHALCON_EXTNAME "phalcon" #define PHP_PHALCON_AUTHOR "Phalcon Team and contributors" -#define PHP_PHALCON_ZEPVERSION "0.18.0-$Id$" +#define PHP_PHALCON_ZEPVERSION "0.19.0-$Id$" #define PHP_PHALCON_DESCRIPTION "Phalcon is a full stack PHP framework, delivered as a PHP extension, offering lower resource consumption and high performance." typedef struct _zephir_struct_db { @@ -135,7 +135,7 @@ typedef struct _zephir_struct_orm { zend_bool late_state_binding; zend_bool not_null_validations; HashTable* parser_cache; - zend_string* resultset_prefetch_records; + char * resultset_prefetch_records; int unique_cache_id; zend_bool update_snapshot_on_save; zend_bool virtual_foreign_keys; diff --git a/composer.json b/composer.json index 0643b289b33..6e299faf690 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ "high load", "mvc" ], - "version": "5.9.3", + "version": "5.9.4", "license": "BSD-3-Clause", "authors": [ { diff --git a/composer.lock b/composer.lock index addd4ce1cfa..3840eb84782 100644 --- a/composer.lock +++ b/composer.lock @@ -4,21 +4,21 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "13f528e00792dac8dffa64bafce8b5b0", + "content-hash": "ac889e226b32cdda51a0124e8b160e5c", "packages": [], "packages-dev": [ { "name": "amphp/amp", - "version": "v2.6.4", + "version": "v2.6.5", "source": { "type": "git", "url": "https://github.com/amphp/amp.git", - "reference": "ded3d9be08f526089eb7ee8d9f16a9768f9dec2d" + "reference": "d7dda98dae26e56f3f6fcfbf1c1f819c9a993207" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/amp/zipball/ded3d9be08f526089eb7ee8d9f16a9768f9dec2d", - "reference": "ded3d9be08f526089eb7ee8d9f16a9768f9dec2d", + "url": "https://api.github.com/repos/amphp/amp/zipball/d7dda98dae26e56f3f6fcfbf1c1f819c9a993207", + "reference": "d7dda98dae26e56f3f6fcfbf1c1f819c9a993207", "shasum": "" }, "require": { @@ -34,11 +34,6 @@ "vimeo/psalm": "^3.12" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.x-dev" - } - }, "autoload": { "files": [ "lib/functions.php", @@ -86,7 +81,7 @@ "support": { "irc": "irc://irc.freenode.org/amphp", "issues": "https://github.com/amphp/amp/issues", - "source": "https://github.com/amphp/amp/tree/v2.6.4" + "source": "https://github.com/amphp/amp/tree/v2.6.5" }, "funding": [ { @@ -94,7 +89,7 @@ "type": "github" } ], - "time": "2024-03-21T18:52:26+00:00" + "time": "2025-09-03T19:41:28+00:00" }, { "name": "amphp/byte-stream", @@ -169,30 +164,30 @@ }, { "name": "behat/gherkin", - "version": "v4.12.0", + "version": "v4.15.0", "source": { "type": "git", "url": "https://github.com/Behat/Gherkin.git", - "reference": "cc3a7e224b36373be382b53ef02ede0f1807bb58" + "reference": "05a7459283e8e6af0d46ec25b8bb5960ca3cfa7b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/Gherkin/zipball/cc3a7e224b36373be382b53ef02ede0f1807bb58", - "reference": "cc3a7e224b36373be382b53ef02ede0f1807bb58", + "url": "https://api.github.com/repos/Behat/Gherkin/zipball/05a7459283e8e6af0d46ec25b8bb5960ca3cfa7b", + "reference": "05a7459283e8e6af0d46ec25b8bb5960ca3cfa7b", "shasum": "" }, "require": { "composer-runtime-api": "^2.2", - "php": "8.1.* || 8.2.* || 8.3.* || 8.4.*" + "php": ">=8.1 <8.6" }, "require-dev": { - "cucumber/cucumber": "dev-gherkin-24.1.0", - "friendsofphp/php-cs-fixer": "^3.65", + "cucumber/gherkin-monorepo": "dev-gherkin-v36.0.0", + "friendsofphp/php-cs-fixer": "^3.77", + "mikey179/vfsstream": "^1.6", "phpstan/extension-installer": "^1", "phpstan/phpstan": "^2", "phpstan/phpstan-phpunit": "^2", "phpunit/phpunit": "^10.5", - "symfony/filesystem": "^5.4 || ^6.4 || ^7.0", "symfony/yaml": "^5.4 || ^6.4 || ^7.0" }, "suggest": { @@ -205,8 +200,8 @@ } }, "autoload": { - "psr-0": { - "Behat\\Gherkin": "src/" + "psr-4": { + "Behat\\Gherkin\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -232,9 +227,9 @@ ], "support": { "issues": "https://github.com/Behat/Gherkin/issues", - "source": "https://github.com/Behat/Gherkin/tree/v4.12.0" + "source": "https://github.com/Behat/Gherkin/tree/v4.15.0" }, - "time": "2025-02-26T14:28:23+00:00" + "time": "2025-11-05T15:34:04+00:00" }, { "name": "clue/ndjson-react", @@ -302,20 +297,20 @@ }, { "name": "codeception/codeception", - "version": "5.2.1", + "version": "5.2.2", "source": { "type": "git", "url": "https://github.com/Codeception/Codeception.git", - "reference": "6e06224627dcd89e7d4753f44ba4df35034b6314" + "reference": "7d5e5b8736ee8eb9a3f08323a65fd7935270c8d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/Codeception/zipball/6e06224627dcd89e7d4753f44ba4df35034b6314", - "reference": "6e06224627dcd89e7d4753f44ba4df35034b6314", + "url": "https://api.github.com/repos/Codeception/Codeception/zipball/7d5e5b8736ee8eb9a3f08323a65fd7935270c8d1", + "reference": "7d5e5b8736ee8eb9a3f08323a65fd7935270c8d1", "shasum": "" }, "require": { - "behat/gherkin": "^4.6.2", + "behat/gherkin": "^4.12", "codeception/lib-asserts": "^2.0", "codeception/stub": "^4.1", "ext-curl": "*", @@ -411,7 +406,7 @@ ], "support": { "issues": "https://github.com/Codeception/Codeception/issues", - "source": "https://github.com/Codeception/Codeception/tree/5.2.1" + "source": "https://github.com/Codeception/Codeception/tree/5.2.2" }, "funding": [ { @@ -419,7 +414,7 @@ "type": "open_collective" } ], - "time": "2025-02-20T14:52:49+00:00" + "time": "2025-05-07T12:48:28+00:00" }, { "name": "codeception/lib-asserts", @@ -477,21 +472,21 @@ }, { "name": "codeception/lib-innerbrowser", - "version": "4.0.6", + "version": "4.0.7", "source": { "type": "git", "url": "https://github.com/Codeception/lib-innerbrowser.git", - "reference": "74476dd019ec7900b26b7dca91a42fdcb04e549f" + "reference": "cf2ddaae5e07eb3cceb504d93bd95f4a2d892dab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/lib-innerbrowser/zipball/74476dd019ec7900b26b7dca91a42fdcb04e549f", - "reference": "74476dd019ec7900b26b7dca91a42fdcb04e549f", + "url": "https://api.github.com/repos/Codeception/lib-innerbrowser/zipball/cf2ddaae5e07eb3cceb504d93bd95f4a2d892dab", + "reference": "cf2ddaae5e07eb3cceb504d93bd95f4a2d892dab", "shasum": "" }, "require": { "codeception/codeception": "^5.0.8", - "codeception/lib-web": "^1.0.1", + "codeception/lib-web": "^1.0.1 || ^2", "ext-dom": "*", "ext-json": "*", "ext-mbstring": "*", @@ -530,9 +525,9 @@ ], "support": { "issues": "https://github.com/Codeception/lib-innerbrowser/issues", - "source": "https://github.com/Codeception/lib-innerbrowser/tree/4.0.6" + "source": "https://github.com/Codeception/lib-innerbrowser/tree/4.0.7" }, - "time": "2025-02-14T07:02:48+00:00" + "time": "2025-10-23T05:52:19+00:00" }, { "name": "codeception/lib-web", @@ -638,22 +633,22 @@ }, { "name": "codeception/module-asserts", - "version": "3.0.0", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/Codeception/module-asserts.git", - "reference": "1b6b150b30586c3614e7e5761b31834ed7968603" + "reference": "c58281f3d741599c81676bcb92996cf1e22d9ffd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/module-asserts/zipball/1b6b150b30586c3614e7e5761b31834ed7968603", - "reference": "1b6b150b30586c3614e7e5761b31834ed7968603", + "url": "https://api.github.com/repos/Codeception/module-asserts/zipball/c58281f3d741599c81676bcb92996cf1e22d9ffd", + "reference": "c58281f3d741599c81676bcb92996cf1e22d9ffd", "shasum": "" }, "require": { "codeception/codeception": "*@dev", "codeception/lib-asserts": "^2.0", - "php": "^8.0" + "php": "^8.1" }, "conflict": { "codeception/codeception": "<5.0" @@ -689,9 +684,9 @@ ], "support": { "issues": "https://github.com/Codeception/module-asserts/issues", - "source": "https://github.com/Codeception/module-asserts/tree/3.0.0" + "source": "https://github.com/Codeception/module-asserts/tree/3.1.0" }, - "time": "2022-02-16T19:48:08+00:00" + "time": "2025-04-24T17:18:25+00:00" }, { "name": "codeception/module-cli", @@ -967,16 +962,16 @@ }, { "name": "codeception/module-phpbrowser", - "version": "3.0.1", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/Codeception/module-phpbrowser.git", - "reference": "a972411f60cd00d00d5e5e3b35496ba4a23bcffc" + "reference": "460e392c77370f7836012b16e06071eb1607876a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/module-phpbrowser/zipball/a972411f60cd00d00d5e5e3b35496ba4a23bcffc", - "reference": "a972411f60cd00d00d5e5e3b35496ba4a23bcffc", + "url": "https://api.github.com/repos/Codeception/module-phpbrowser/zipball/460e392c77370f7836012b16e06071eb1607876a", + "reference": "460e392c77370f7836012b16e06071eb1607876a", "shasum": "" }, "require": { @@ -984,8 +979,8 @@ "codeception/lib-innerbrowser": "*@dev", "ext-json": "*", "guzzlehttp/guzzle": "^7.4", - "php": "^8.0", - "symfony/browser-kit": "^5.4 || ^6.0 || ^7.0" + "php": "^8.1", + "symfony/browser-kit": "^5.4 | ^6.0 | ^7.0" }, "conflict": { "codeception/codeception": "<5.0", @@ -993,8 +988,10 @@ }, "require-dev": { "aws/aws-sdk-php": "^3.199", - "codeception/module-rest": "^2.0 || *@dev", - "ext-curl": "*" + "codeception/module-rest": "^2.0 | *@dev", + "ext-curl": "*", + "phpstan/phpstan": "^1.10", + "squizlabs/php_codesniffer": "^3.10" }, "suggest": { "codeception/phpbuiltinserver": "Start and stop PHP built-in web server for your tests" @@ -1026,9 +1023,9 @@ ], "support": { "issues": "https://github.com/Codeception/module-phpbrowser/issues", - "source": "https://github.com/Codeception/module-phpbrowser/tree/3.0.1" + "source": "https://github.com/Codeception/module-phpbrowser/tree/3.0.2" }, - "time": "2023-12-08T19:41:28+00:00" + "time": "2025-09-04T10:45:58+00:00" }, { "name": "codeception/module-redis", @@ -1085,20 +1082,20 @@ }, { "name": "codeception/stub", - "version": "4.1.4", + "version": "4.2.0", "source": { "type": "git", "url": "https://github.com/Codeception/Stub.git", - "reference": "6ce453073a0c220b254dd7f4383645615e4071c3" + "reference": "19014cec368cefc0579499779c451551cd288557" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/Stub/zipball/6ce453073a0c220b254dd7f4383645615e4071c3", - "reference": "6ce453073a0c220b254dd7f4383645615e4071c3", + "url": "https://api.github.com/repos/Codeception/Stub/zipball/19014cec368cefc0579499779c451551cd288557", + "reference": "19014cec368cefc0579499779c451551cd288557", "shasum": "" }, "require": { - "php": "^7.4 | ^8.0", + "php": "^8.1", "phpunit/phpunit": "^8.4 | ^9.0 | ^10.0 | ^11 | ^12" }, "conflict": { @@ -1120,9 +1117,9 @@ "description": "Flexible Stub wrapper for PHPUnit's Mock Builder", "support": { "issues": "https://github.com/Codeception/Stub/issues", - "source": "https://github.com/Codeception/Stub/tree/4.1.4" + "source": "https://github.com/Codeception/Stub/tree/4.2.0" }, - "time": "2025-02-14T06:56:33+00:00" + "time": "2025-08-01T08:15:29+00:00" }, { "name": "composer/pcre", @@ -1205,16 +1202,16 @@ }, { "name": "composer/semver", - "version": "3.4.3", + "version": "3.4.4", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12" + "reference": "198166618906cb2de69b95d7d47e5fa8aa1b2b95" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/4313d26ada5e0c4edfbd1dc481a92ff7bff91f12", - "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12", + "url": "https://api.github.com/repos/composer/semver/zipball/198166618906cb2de69b95d7d47e5fa8aa1b2b95", + "reference": "198166618906cb2de69b95d7d47e5fa8aa1b2b95", "shasum": "" }, "require": { @@ -1266,7 +1263,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.4.3" + "source": "https://github.com/composer/semver/tree/3.4.4" }, "funding": [ { @@ -1276,13 +1273,9 @@ { "url": "https://github.com/composer", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" } ], - "time": "2024-09-19T14:15:21+00:00" + "time": "2025-08-20T19:15:30+00:00" }, { "name": "composer/xdebug-handler", @@ -1585,16 +1578,16 @@ }, { "name": "fidry/cpu-core-counter", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/theofidry/cpu-core-counter.git", - "reference": "8520451a140d3f46ac33042715115e290cf5785f" + "reference": "db9508f7b1474469d9d3c53b86f817e344732678" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/8520451a140d3f46ac33042715115e290cf5785f", - "reference": "8520451a140d3f46ac33042715115e290cf5785f", + "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/db9508f7b1474469d9d3c53b86f817e344732678", + "reference": "db9508f7b1474469d9d3c53b86f817e344732678", "shasum": "" }, "require": { @@ -1604,10 +1597,10 @@ "fidry/makefile": "^0.2.0", "fidry/php-cs-fixer-config": "^1.1.2", "phpstan/extension-installer": "^1.2.0", - "phpstan/phpstan": "^1.9.2", - "phpstan/phpstan-deprecation-rules": "^1.0.0", - "phpstan/phpstan-phpunit": "^1.2.2", - "phpstan/phpstan-strict-rules": "^1.4.4", + "phpstan/phpstan": "^2.0", + "phpstan/phpstan-deprecation-rules": "^2.0.0", + "phpstan/phpstan-phpunit": "^2.0", + "phpstan/phpstan-strict-rules": "^2.0", "phpunit/phpunit": "^8.5.31 || ^9.5.26", "webmozarts/strict-phpunit": "^7.5" }, @@ -1634,7 +1627,7 @@ ], "support": { "issues": "https://github.com/theofidry/cpu-core-counter/issues", - "source": "https://github.com/theofidry/cpu-core-counter/tree/1.2.0" + "source": "https://github.com/theofidry/cpu-core-counter/tree/1.3.0" }, "funding": [ { @@ -1642,62 +1635,61 @@ "type": "github" } ], - "time": "2024-08-06T10:04:20+00:00" + "time": "2025-08-14T07:29:31+00:00" }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.75.0", + "version": "v3.89.2", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "399a128ff2fdaf4281e4e79b755693286cdf325c" + "reference": "7569658f91e475ec93b99bd5964b059ad1336dcf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/399a128ff2fdaf4281e4e79b755693286cdf325c", - "reference": "399a128ff2fdaf4281e4e79b755693286cdf325c", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/7569658f91e475ec93b99bd5964b059ad1336dcf", + "reference": "7569658f91e475ec93b99bd5964b059ad1336dcf", "shasum": "" }, "require": { - "clue/ndjson-react": "^1.0", + "clue/ndjson-react": "^1.3", "composer/semver": "^3.4", - "composer/xdebug-handler": "^3.0.3", + "composer/xdebug-handler": "^3.0.5", "ext-filter": "*", "ext-hash": "*", "ext-json": "*", "ext-tokenizer": "*", - "fidry/cpu-core-counter": "^1.2", + "fidry/cpu-core-counter": "^1.3", "php": "^7.4 || ^8.0", - "react/child-process": "^0.6.5", - "react/event-loop": "^1.0", - "react/promise": "^2.0 || ^3.0", - "react/socket": "^1.0", - "react/stream": "^1.0", - "sebastian/diff": "^4.0 || ^5.1 || ^6.0 || ^7.0", - "symfony/console": "^5.4 || ^6.4 || ^7.0", - "symfony/event-dispatcher": "^5.4 || ^6.4 || ^7.0", - "symfony/filesystem": "^5.4 || ^6.4 || ^7.0", - "symfony/finder": "^5.4 || ^6.4 || ^7.0", - "symfony/options-resolver": "^5.4 || ^6.4 || ^7.0", - "symfony/polyfill-mbstring": "^1.31", - "symfony/polyfill-php80": "^1.31", - "symfony/polyfill-php81": "^1.31", - "symfony/process": "^5.4 || ^6.4 || ^7.2", - "symfony/stopwatch": "^5.4 || ^6.4 || ^7.0" + "react/child-process": "^0.6.6", + "react/event-loop": "^1.5", + "react/socket": "^1.16", + "react/stream": "^1.4", + "sebastian/diff": "^4.0.6 || ^5.1.1 || ^6.0.2 || ^7.0", + "symfony/console": "^5.4.47 || ^6.4.24 || ^7.0", + "symfony/event-dispatcher": "^5.4.45 || ^6.4.24 || ^7.0", + "symfony/filesystem": "^5.4.45 || ^6.4.24 || ^7.0", + "symfony/finder": "^5.4.45 || ^6.4.24 || ^7.0", + "symfony/options-resolver": "^5.4.45 || ^6.4.24 || ^7.0", + "symfony/polyfill-mbstring": "^1.33", + "symfony/polyfill-php80": "^1.33", + "symfony/polyfill-php81": "^1.33", + "symfony/polyfill-php84": "^1.33", + "symfony/process": "^5.4.47 || ^6.4.24 || ^7.2", + "symfony/stopwatch": "^5.4.45 || ^6.4.24 || ^7.0" }, "require-dev": { - "facile-it/paraunit": "^1.3.1 || ^2.6", - "infection/infection": "^0.29.14", - "justinrainbow/json-schema": "^5.3 || ^6.2", - "keradus/cli-executor": "^2.1", + "facile-it/paraunit": "^1.3.1 || ^2.7", + "infection/infection": "^0.31.0", + "justinrainbow/json-schema": "^6.5", + "keradus/cli-executor": "^2.2", "mikey179/vfsstream": "^1.6.12", - "php-coveralls/php-coveralls": "^2.7", - "php-cs-fixer/accessible-object": "^1.1", + "php-coveralls/php-coveralls": "^2.9", "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.6", "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.6", - "phpunit/phpunit": "^9.6.22 || ^10.5.45 || ^11.5.12", - "symfony/var-dumper": "^5.4.48 || ^6.4.18 || ^7.2.3", - "symfony/yaml": "^5.4.45 || ^6.4.18 || ^7.2.3" + "phpunit/phpunit": "^9.6.25 || ^10.5.53 || ^11.5.34", + "symfony/var-dumper": "^5.4.48 || ^6.4.24 || ^7.3.2", + "symfony/yaml": "^5.4.45 || ^6.4.24 || ^7.3.2" }, "suggest": { "ext-dom": "For handling output formats in XML", @@ -1738,7 +1730,7 @@ ], "support": { "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.75.0" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.89.2" }, "funding": [ { @@ -1746,7 +1738,7 @@ "type": "github" } ], - "time": "2025-03-31T18:40:42+00:00" + "time": "2025-11-06T21:12:50+00:00" }, { "name": "graham-campbell/result-type", @@ -1812,22 +1804,22 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.9.3", + "version": "7.10.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77" + "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/7b2f29fe81dc4da0ca0ea7d42107a0845946ea77", - "reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b51ac707cfa420b7bfd4e4d5e510ba8008e822b4", + "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^1.5.3 || ^2.0.3", - "guzzlehttp/psr7": "^2.7.0", + "guzzlehttp/promises": "^2.3", + "guzzlehttp/psr7": "^2.8", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", "symfony/deprecation-contracts": "^2.2 || ^3.0" @@ -1918,7 +1910,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.9.3" + "source": "https://github.com/guzzle/guzzle/tree/7.10.0" }, "funding": [ { @@ -1934,20 +1926,20 @@ "type": "tidelift" } ], - "time": "2025-03-27T13:37:11+00:00" + "time": "2025-08-23T22:36:01+00:00" }, { "name": "guzzlehttp/promises", - "version": "2.2.0", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "7c69f28996b0a6920945dd20b3857e499d9ca96c" + "reference": "481557b130ef3790cf82b713667b43030dc9c957" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/7c69f28996b0a6920945dd20b3857e499d9ca96c", - "reference": "7c69f28996b0a6920945dd20b3857e499d9ca96c", + "url": "https://api.github.com/repos/guzzle/promises/zipball/481557b130ef3790cf82b713667b43030dc9c957", + "reference": "481557b130ef3790cf82b713667b43030dc9c957", "shasum": "" }, "require": { @@ -1955,7 +1947,7 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", - "phpunit/phpunit": "^8.5.39 || ^9.6.20" + "phpunit/phpunit": "^8.5.44 || ^9.6.25" }, "type": "library", "extra": { @@ -2001,7 +1993,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/2.2.0" + "source": "https://github.com/guzzle/promises/tree/2.3.0" }, "funding": [ { @@ -2017,20 +2009,20 @@ "type": "tidelift" } ], - "time": "2025-03-27T13:27:01+00:00" + "time": "2025-08-22T14:34:08+00:00" }, { "name": "guzzlehttp/psr7", - "version": "2.7.1", + "version": "2.8.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16" + "reference": "21dc724a0583619cd1652f673303492272778051" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/c2270caaabe631b3b44c85f99e5a04bbb8060d16", - "reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/21dc724a0583619cd1652f673303492272778051", + "reference": "21dc724a0583619cd1652f673303492272778051", "shasum": "" }, "require": { @@ -2046,7 +2038,7 @@ "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", "http-interop/http-factory-tests": "0.9.0", - "phpunit/phpunit": "^8.5.39 || ^9.6.20" + "phpunit/phpunit": "^8.5.44 || ^9.6.25" }, "suggest": { "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" @@ -2117,7 +2109,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.7.1" + "source": "https://github.com/guzzle/psr7/tree/2.8.0" }, "funding": [ { @@ -2133,20 +2125,20 @@ "type": "tidelift" } ], - "time": "2025-03-27T12:30:47+00:00" + "time": "2025-08-23T21:21:41+00:00" }, { "name": "masterminds/html5", - "version": "2.9.0", + "version": "2.10.0", "source": { "type": "git", "url": "https://github.com/Masterminds/html5-php.git", - "reference": "f5ac2c0b0a2eefca70b2ce32a5809992227e75a6" + "reference": "fcf91eb64359852f00d921887b219479b4f21251" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f5ac2c0b0a2eefca70b2ce32a5809992227e75a6", - "reference": "f5ac2c0b0a2eefca70b2ce32a5809992227e75a6", + "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/fcf91eb64359852f00d921887b219479b4f21251", + "reference": "fcf91eb64359852f00d921887b219479b4f21251", "shasum": "" }, "require": { @@ -2198,9 +2190,9 @@ ], "support": { "issues": "https://github.com/Masterminds/html5-php/issues", - "source": "https://github.com/Masterminds/html5-php/tree/2.9.0" + "source": "https://github.com/Masterminds/html5-php/tree/2.10.0" }, - "time": "2024-03-31T07:05:07+00:00" + "time": "2025-07-25T09:04:22+00:00" }, { "name": "monolog/monolog", @@ -2356,16 +2348,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.13.0", + "version": "1.13.4", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "024473a478be9df5fdaca2c793f2232fe788e414" + "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/024473a478be9df5fdaca2c793f2232fe788e414", - "reference": "024473a478be9df5fdaca2c793f2232fe788e414", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/07d290f0c47959fd5eed98c95ee5602db07e0b6a", + "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a", "shasum": "" }, "require": { @@ -2404,7 +2396,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.13.0" + "source": "https://github.com/myclabs/DeepCopy/tree/1.13.4" }, "funding": [ { @@ -2412,7 +2404,7 @@ "type": "tidelift" } ], - "time": "2025-02-12T12:17:51+00:00" + "time": "2025-08-01T08:46:24+00:00" }, { "name": "netresearch/jsonmapper", @@ -2603,16 +2595,16 @@ }, { "name": "phalcon/ide-stubs", - "version": "v5.9.1", + "version": "v5.9.3", "source": { "type": "git", "url": "https://github.com/phalcon/ide-stubs.git", - "reference": "14bb6376444345dea0a860f39b8e3eb2481a6c63" + "reference": "279475ec34dd07cda7e95cdbb944f3d3df035fb4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phalcon/ide-stubs/zipball/14bb6376444345dea0a860f39b8e3eb2481a6c63", - "reference": "14bb6376444345dea0a860f39b8e3eb2481a6c63", + "url": "https://api.github.com/repos/phalcon/ide-stubs/zipball/279475ec34dd07cda7e95cdbb944f3d3df035fb4", + "reference": "279475ec34dd07cda7e95cdbb944f3d3df035fb4", "shasum": "" }, "require": { @@ -2666,7 +2658,7 @@ "type": "open_collective" } ], - "time": "2025-04-01T00:20:50+00:00" + "time": "2025-04-22T19:22:59+00:00" }, { "name": "phalcon/zephir", @@ -2674,12 +2666,12 @@ "source": { "type": "git", "url": "https://github.com/zephir-lang/zephir.git", - "reference": "fdf88639bb51c5cd4e88b963af02de908729d978" + "reference": "faa6d55597b900290a81e4cb1e5ffb8b7729a49a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zephir-lang/zephir/zipball/fdf88639bb51c5cd4e88b963af02de908729d978", - "reference": "fdf88639bb51c5cd4e88b963af02de908729d978", + "url": "https://api.github.com/repos/zephir-lang/zephir/zipball/faa6d55597b900290a81e4cb1e5ffb8b7729a49a", + "reference": "faa6d55597b900290a81e4cb1e5ffb8b7729a49a", "shasum": "" }, "require": { @@ -2751,7 +2743,7 @@ "type": "github" } ], - "time": "2025-03-02T21:33:55+00:00" + "time": "2025-11-16T15:10:29+00:00" }, { "name": "phar-io/manifest", @@ -2926,16 +2918,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.6.2", + "version": "5.6.4", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "92dde6a5919e34835c506ac8c523ef095a95ed62" + "reference": "90a04bcbf03784066f16038e87e23a0a83cee3c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/92dde6a5919e34835c506ac8c523ef095a95ed62", - "reference": "92dde6a5919e34835c506ac8c523ef095a95ed62", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/90a04bcbf03784066f16038e87e23a0a83cee3c2", + "reference": "90a04bcbf03784066f16038e87e23a0a83cee3c2", "shasum": "" }, "require": { @@ -2984,22 +2976,22 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.2" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.4" }, - "time": "2025-04-13T19:20:35+00:00" + "time": "2025-11-17T21:13:10+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "1.10.0", + "version": "1.10.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a" + "reference": "431c02da15e566adb0ad9c5030fa6f6204d9de9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/679e3ce485b99e84c775d28e2e96fade9a7fb50a", - "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/431c02da15e566adb0ad9c5030fa6f6204d9de9e", + "reference": "431c02da15e566adb0ad9c5030fa6f6204d9de9e", "shasum": "" }, "require": { @@ -3042,22 +3034,22 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.10.0" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.10.1" }, - "time": "2024-11-09T15:12:26+00:00" + "time": "2025-11-18T07:51:16+00:00" }, { "name": "phpoption/phpoption", - "version": "1.9.3", + "version": "1.9.4", "source": { "type": "git", "url": "https://github.com/schmittjoh/php-option.git", - "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54" + "reference": "638a154f8d4ee6a5cfa96d6a34dfbe0cffa9566d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/e3fac8b24f56113f7cb96af14958c0dd16330f54", - "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/638a154f8d4ee6a5cfa96d6a34dfbe0cffa9566d", + "reference": "638a154f8d4ee6a5cfa96d6a34dfbe0cffa9566d", "shasum": "" }, "require": { @@ -3065,7 +3057,7 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", - "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28" + "phpunit/phpunit": "^8.5.44 || ^9.6.25 || ^10.5.53 || ^11.5.34" }, "type": "library", "extra": { @@ -3107,7 +3099,7 @@ ], "support": { "issues": "https://github.com/schmittjoh/php-option/issues", - "source": "https://github.com/schmittjoh/php-option/tree/1.9.3" + "source": "https://github.com/schmittjoh/php-option/tree/1.9.4" }, "funding": [ { @@ -3119,20 +3111,20 @@ "type": "tidelift" } ], - "time": "2024-07-20T21:41:07+00:00" + "time": "2025-08-21T11:53:16+00:00" }, { "name": "phpstan/phpdoc-parser", - "version": "2.1.0", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "9b30d6fd026b2c132b3985ce6b23bec09ab3aa68" + "reference": "1e0cd5370df5dd2e556a36b9c62f62e555870495" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/9b30d6fd026b2c132b3985ce6b23bec09ab3aa68", - "reference": "9b30d6fd026b2c132b3985ce6b23bec09ab3aa68", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/1e0cd5370df5dd2e556a36b9c62f62e555870495", + "reference": "1e0cd5370df5dd2e556a36b9c62f62e555870495", "shasum": "" }, "require": { @@ -3164,22 +3156,17 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/2.1.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/2.3.0" }, - "time": "2025-02-19T13:28:12+00:00" + "time": "2025-08-30T15:50:23+00:00" }, { "name": "phpstan/phpstan", - "version": "2.1.12", - "source": { - "type": "git", - "url": "https://github.com/phpstan/phpstan.git", - "reference": "96dde49e967c0c22812bcfa7bda4ff82c09f3b0c" - }, + "version": "2.1.32", "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/96dde49e967c0c22812bcfa7bda4ff82c09f3b0c", - "reference": "96dde49e967c0c22812bcfa7bda4ff82c09f3b0c", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e126cad1e30a99b137b8ed75a85a676450ebb227", + "reference": "e126cad1e30a99b137b8ed75a85a676450ebb227", "shasum": "" }, "require": { @@ -3224,7 +3211,7 @@ "type": "github" } ], - "time": "2025-04-16T13:19:18+00:00" + "time": "2025-11-11T15:18:17+00:00" }, { "name": "phpunit/php-code-coverage", @@ -3549,16 +3536,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.45", + "version": "10.5.58", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "bd68a781d8e30348bc297449f5234b3458267ae8" + "reference": "e24fb46da450d8e6a5788670513c1af1424f16ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bd68a781d8e30348bc297449f5234b3458267ae8", - "reference": "bd68a781d8e30348bc297449f5234b3458267ae8", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e24fb46da450d8e6a5788670513c1af1424f16ca", + "reference": "e24fb46da450d8e6a5788670513c1af1424f16ca", "shasum": "" }, "require": { @@ -3568,7 +3555,7 @@ "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.12.1", + "myclabs/deep-copy": "^1.13.4", "phar-io/manifest": "^2.0.4", "phar-io/version": "^3.2.1", "php": ">=8.1", @@ -3579,13 +3566,13 @@ "phpunit/php-timer": "^6.0.0", "sebastian/cli-parser": "^2.0.1", "sebastian/code-unit": "^2.0.0", - "sebastian/comparator": "^5.0.3", + "sebastian/comparator": "^5.0.4", "sebastian/diff": "^5.1.1", "sebastian/environment": "^6.1.0", - "sebastian/exporter": "^5.1.2", + "sebastian/exporter": "^5.1.4", "sebastian/global-state": "^6.0.2", "sebastian/object-enumerator": "^5.0.0", - "sebastian/recursion-context": "^5.0.0", + "sebastian/recursion-context": "^5.0.1", "sebastian/type": "^4.0.0", "sebastian/version": "^4.0.1" }, @@ -3630,7 +3617,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.45" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.58" }, "funding": [ { @@ -3641,25 +3628,33 @@ "url": "https://github.com/sebastianbergmann", "type": "github" }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, { "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", "type": "tidelift" } ], - "time": "2025-02-06T16:08:12+00:00" + "time": "2025-09-28T12:04:46+00:00" }, { "name": "predis/predis", - "version": "v2.3.0", + "version": "v2.4.1", "source": { "type": "git", "url": "https://github.com/predis/predis.git", - "reference": "bac46bfdb78cd6e9c7926c697012aae740cb9ec9" + "reference": "07105e050622ed80bd60808367ced9e379f31530" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/predis/predis/zipball/bac46bfdb78cd6e9c7926c697012aae740cb9ec9", - "reference": "bac46bfdb78cd6e9c7926c697012aae740cb9ec9", + "url": "https://api.github.com/repos/predis/predis/zipball/07105e050622ed80bd60808367ced9e379f31530", + "reference": "07105e050622ed80bd60808367ced9e379f31530", "shasum": "" }, "require": { @@ -3668,6 +3663,7 @@ "require-dev": { "friendsofphp/php-cs-fixer": "^3.3", "phpstan/phpstan": "^1.9", + "phpunit/phpcov": "^6.0 || ^8.0", "phpunit/phpunit": "^8.0 || ^9.4" }, "suggest": { @@ -3690,7 +3686,7 @@ "role": "Maintainer" } ], - "description": "A flexible and feature-complete Redis client for PHP.", + "description": "A flexible and feature-complete Redis/Valkey client for PHP.", "homepage": "http://github.com/predis/predis", "keywords": [ "nosql", @@ -3699,7 +3695,7 @@ ], "support": { "issues": "https://github.com/predis/predis/issues", - "source": "https://github.com/predis/predis/tree/v2.3.0" + "source": "https://github.com/predis/predis/tree/v2.4.1" }, "funding": [ { @@ -3707,7 +3703,7 @@ "type": "github" } ], - "time": "2024-11-21T20:00:02+00:00" + "time": "2025-11-12T18:00:11+00:00" }, { "name": "psr/container", @@ -4024,16 +4020,16 @@ }, { "name": "psy/psysh", - "version": "v0.12.8", + "version": "v0.12.14", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "85057ceedee50c49d4f6ecaff73ee96adb3b3625" + "reference": "95c29b3756a23855a30566b745d218bee690bef2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/85057ceedee50c49d4f6ecaff73ee96adb3b3625", - "reference": "85057ceedee50c49d4f6ecaff73ee96adb3b3625", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/95c29b3756a23855a30566b745d218bee690bef2", + "reference": "95c29b3756a23855a30566b745d218bee690bef2", "shasum": "" }, "require": { @@ -4048,11 +4044,12 @@ "symfony/console": "4.4.37 || 5.3.14 || 5.3.15 || 5.4.3 || 5.4.4 || 6.0.3 || 6.0.4" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.2" + "bamarni/composer-bin-plugin": "^1.2", + "composer/class-map-generator": "^1.6" }, "suggest": { + "composer/class-map-generator": "Improved tab completion performance with better class discovery.", "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)", - "ext-pdo-sqlite": "The doc command requires SQLite to work.", "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well." }, "bin": [ @@ -4083,12 +4080,11 @@ "authors": [ { "name": "Justin Hileman", - "email": "justin@justinhileman.info", - "homepage": "http://justinhileman.com" + "email": "justin@justinhileman.info" } ], "description": "An interactive shell for modern PHP.", - "homepage": "http://psysh.org", + "homepage": "https://psysh.org", "keywords": [ "REPL", "console", @@ -4097,9 +4093,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.12.8" + "source": "https://github.com/bobthecow/psysh/tree/v0.12.14" }, - "time": "2025-03-16T03:05:19+00:00" + "time": "2025-10-27T17:15:31+00:00" }, { "name": "ralouphie/getallheaders", @@ -4294,16 +4290,16 @@ }, { "name": "react/dns", - "version": "v1.13.0", + "version": "v1.14.0", "source": { "type": "git", "url": "https://github.com/reactphp/dns.git", - "reference": "eb8ae001b5a455665c89c1df97f6fb682f8fb0f5" + "reference": "7562c05391f42701c1fccf189c8225fece1cd7c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/dns/zipball/eb8ae001b5a455665c89c1df97f6fb682f8fb0f5", - "reference": "eb8ae001b5a455665c89c1df97f6fb682f8fb0f5", + "url": "https://api.github.com/repos/reactphp/dns/zipball/7562c05391f42701c1fccf189c8225fece1cd7c3", + "reference": "7562c05391f42701c1fccf189c8225fece1cd7c3", "shasum": "" }, "require": { @@ -4358,7 +4354,7 @@ ], "support": { "issues": "https://github.com/reactphp/dns/issues", - "source": "https://github.com/reactphp/dns/tree/v1.13.0" + "source": "https://github.com/reactphp/dns/tree/v1.14.0" }, "funding": [ { @@ -4366,20 +4362,20 @@ "type": "open_collective" } ], - "time": "2024-06-13T14:18:03+00:00" + "time": "2025-11-18T19:34:28+00:00" }, { "name": "react/event-loop", - "version": "v1.5.0", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/reactphp/event-loop.git", - "reference": "bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354" + "reference": "ba276bda6083df7e0050fd9b33f66ad7a4ac747a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/event-loop/zipball/bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354", - "reference": "bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354", + "url": "https://api.github.com/repos/reactphp/event-loop/zipball/ba276bda6083df7e0050fd9b33f66ad7a4ac747a", + "reference": "ba276bda6083df7e0050fd9b33f66ad7a4ac747a", "shasum": "" }, "require": { @@ -4430,7 +4426,7 @@ ], "support": { "issues": "https://github.com/reactphp/event-loop/issues", - "source": "https://github.com/reactphp/event-loop/tree/v1.5.0" + "source": "https://github.com/reactphp/event-loop/tree/v1.6.0" }, "funding": [ { @@ -4438,27 +4434,27 @@ "type": "open_collective" } ], - "time": "2023-11-13T13:48:05+00:00" + "time": "2025-11-17T20:46:25+00:00" }, { "name": "react/promise", - "version": "v3.2.0", + "version": "v3.3.0", "source": { "type": "git", "url": "https://github.com/reactphp/promise.git", - "reference": "8a164643313c71354582dc850b42b33fa12a4b63" + "reference": "23444f53a813a3296c1368bb104793ce8d88f04a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/promise/zipball/8a164643313c71354582dc850b42b33fa12a4b63", - "reference": "8a164643313c71354582dc850b42b33fa12a4b63", + "url": "https://api.github.com/repos/reactphp/promise/zipball/23444f53a813a3296c1368bb104793ce8d88f04a", + "reference": "23444f53a813a3296c1368bb104793ce8d88f04a", "shasum": "" }, "require": { "php": ">=7.1.0" }, "require-dev": { - "phpstan/phpstan": "1.10.39 || 1.4.10", + "phpstan/phpstan": "1.12.28 || 1.4.10", "phpunit/phpunit": "^9.6 || ^7.5" }, "type": "library", @@ -4503,7 +4499,7 @@ ], "support": { "issues": "https://github.com/reactphp/promise/issues", - "source": "https://github.com/reactphp/promise/tree/v3.2.0" + "source": "https://github.com/reactphp/promise/tree/v3.3.0" }, "funding": [ { @@ -4511,7 +4507,7 @@ "type": "open_collective" } ], - "time": "2024-05-24T10:39:05+00:00" + "time": "2025-08-19T18:57:03+00:00" }, { "name": "react/socket", @@ -4841,16 +4837,16 @@ }, { "name": "sebastian/comparator", - "version": "5.0.3", + "version": "5.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e" + "reference": "e8e53097718d2b53cfb2aa859b06a41abf58c62e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e", - "reference": "a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/e8e53097718d2b53cfb2aa859b06a41abf58c62e", + "reference": "e8e53097718d2b53cfb2aa859b06a41abf58c62e", "shasum": "" }, "require": { @@ -4906,15 +4902,27 @@ "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", "security": "https://github.com/sebastianbergmann/comparator/security/policy", - "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.3" + "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.4" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/comparator", + "type": "tidelift" } ], - "time": "2024-10-18T14:56:07+00:00" + "time": "2025-09-07T05:25:07+00:00" }, { "name": "sebastian/complexity", @@ -5107,16 +5115,16 @@ }, { "name": "sebastian/exporter", - "version": "5.1.2", + "version": "5.1.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "955288482d97c19a372d3f31006ab3f37da47adf" + "reference": "0735b90f4da94969541dac1da743446e276defa6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/955288482d97c19a372d3f31006ab3f37da47adf", - "reference": "955288482d97c19a372d3f31006ab3f37da47adf", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/0735b90f4da94969541dac1da743446e276defa6", + "reference": "0735b90f4da94969541dac1da743446e276defa6", "shasum": "" }, "require": { @@ -5125,7 +5133,7 @@ "sebastian/recursion-context": "^5.0" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^10.5" }, "type": "library", "extra": { @@ -5173,15 +5181,27 @@ "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", "security": "https://github.com/sebastianbergmann/exporter/security/policy", - "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.2" + "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.4" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/exporter", + "type": "tidelift" } ], - "time": "2024-03-02T07:17:12+00:00" + "time": "2025-09-24T06:09:11+00:00" }, { "name": "sebastian/global-state", @@ -5417,23 +5437,23 @@ }, { "name": "sebastian/recursion-context", - "version": "5.0.0", + "version": "5.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "05909fb5bc7df4c52992396d0116aed689f93712" + "reference": "47e34210757a2f37a97dcd207d032e1b01e64c7a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/05909fb5bc7df4c52992396d0116aed689f93712", - "reference": "05909fb5bc7df4c52992396d0116aed689f93712", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/47e34210757a2f37a97dcd207d032e1b01e64c7a", + "reference": "47e34210757a2f37a97dcd207d032e1b01e64c7a", "shasum": "" }, "require": { "php": ">=8.1" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^10.5" }, "type": "library", "extra": { @@ -5468,15 +5488,28 @@ "homepage": "https://github.com/sebastianbergmann/recursion-context", "support": { "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/5.0.0" + "security": "https://github.com/sebastianbergmann/recursion-context/security/policy", + "source": "https://github.com/sebastianbergmann/recursion-context/tree/5.0.1" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/recursion-context", + "type": "tidelift" } ], - "time": "2023-02-03T07:05:40+00:00" + "time": "2025-08-10T07:50:56+00:00" }, { "name": "sebastian/type", @@ -5589,16 +5622,16 @@ }, { "name": "spatie/array-to-xml", - "version": "3.4.0", + "version": "3.4.1", "source": { "type": "git", "url": "https://github.com/spatie/array-to-xml.git", - "reference": "7dcfc67d60b0272926dabad1ec01f6b8a5fb5e67" + "reference": "6a740f39415aee8886aea10333403adc77d50791" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/7dcfc67d60b0272926dabad1ec01f6b8a5fb5e67", - "reference": "7dcfc67d60b0272926dabad1ec01f6b8a5fb5e67", + "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/6a740f39415aee8886aea10333403adc77d50791", + "reference": "6a740f39415aee8886aea10333403adc77d50791", "shasum": "" }, "require": { @@ -5641,7 +5674,7 @@ "xml" ], "support": { - "source": "https://github.com/spatie/array-to-xml/tree/3.4.0" + "source": "https://github.com/spatie/array-to-xml/tree/3.4.1" }, "funding": [ { @@ -5653,20 +5686,20 @@ "type": "github" } ], - "time": "2024-12-16T12:45:15+00:00" + "time": "2025-11-12T10:32:50+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "3.12.2", + "version": "3.13.5", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "6d4cf6032d4b718f168c90a96e36c7d0eaacb2aa" + "reference": "0ca86845ce43291e8f5692c7356fccf3bcf02bf4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/6d4cf6032d4b718f168c90a96e36c7d0eaacb2aa", - "reference": "6d4cf6032d4b718f168c90a96e36c7d0eaacb2aa", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/0ca86845ce43291e8f5692c7356fccf3bcf02bf4", + "reference": "0ca86845ce43291e8f5692c7356fccf3bcf02bf4", "shasum": "" }, "require": { @@ -5683,11 +5716,6 @@ "bin/phpcs" ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.x-dev" - } - }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" @@ -5737,20 +5765,20 @@ "type": "thanks_dev" } ], - "time": "2025-04-13T04:10:18+00:00" + "time": "2025-11-04T16:30:35+00:00" }, { "name": "symfony/browser-kit", - "version": "v6.4.19", + "version": "v6.4.28", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "ce95f3e3239159e7fa3be7690c6ce95a4714637f" + "reference": "067e301786bbb58048077fc10507aceb18226e23" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/ce95f3e3239159e7fa3be7690c6ce95a4714637f", - "reference": "ce95f3e3239159e7fa3be7690c6ce95a4714637f", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/067e301786bbb58048077fc10507aceb18226e23", + "reference": "067e301786bbb58048077fc10507aceb18226e23", "shasum": "" }, "require": { @@ -5789,7 +5817,7 @@ "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/browser-kit/tree/v6.4.19" + "source": "https://github.com/symfony/browser-kit/tree/v6.4.28" }, "funding": [ { @@ -5800,25 +5828,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-02-14T11:23:16+00:00" + "time": "2025-10-16T22:35:35+00:00" }, { "name": "symfony/console", - "version": "v6.4.20", + "version": "v6.4.27", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "2e4af9c952617cc3f9559ff706aee420a8464c36" + "reference": "13d3176cf8ad8ced24202844e9f95af11e2959fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/2e4af9c952617cc3f9559ff706aee420a8464c36", - "reference": "2e4af9c952617cc3f9559ff706aee420a8464c36", + "url": "https://api.github.com/repos/symfony/console/zipball/13d3176cf8ad8ced24202844e9f95af11e2959fc", + "reference": "13d3176cf8ad8ced24202844e9f95af11e2959fc", "shasum": "" }, "require": { @@ -5883,7 +5915,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.20" + "source": "https://github.com/symfony/console/tree/v6.4.27" }, "funding": [ { @@ -5894,25 +5926,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-03-03T17:16:38+00:00" + "time": "2025-10-06T10:25:16+00:00" }, { "name": "symfony/css-selector", - "version": "v6.4.13", + "version": "v6.4.24", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "cb23e97813c5837a041b73a6d63a9ddff0778f5e" + "reference": "9b784413143701aa3c94ac1869a159a9e53e8761" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/cb23e97813c5837a041b73a6d63a9ddff0778f5e", - "reference": "cb23e97813c5837a041b73a6d63a9ddff0778f5e", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/9b784413143701aa3c94ac1869a159a9e53e8761", + "reference": "9b784413143701aa3c94ac1869a159a9e53e8761", "shasum": "" }, "require": { @@ -5948,7 +5984,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v6.4.13" + "source": "https://github.com/symfony/css-selector/tree/v6.4.24" }, "funding": [ { @@ -5959,25 +5995,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-25T14:18:03+00:00" + "time": "2025-07-10T08:14:14+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.5.1", + "version": "v3.6.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6" + "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6", - "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62", + "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62", "shasum": "" }, "require": { @@ -5990,7 +6030,7 @@ "name": "symfony/contracts" }, "branch-alias": { - "dev-main": "3.5-dev" + "dev-main": "3.6-dev" } }, "autoload": { @@ -6015,7 +6055,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.1" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.6.0" }, "funding": [ { @@ -6031,20 +6071,20 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:20:29+00:00" + "time": "2024-09-25T14:21:43+00:00" }, { "name": "symfony/dom-crawler", - "version": "v6.4.19", + "version": "v6.4.25", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "19073e3e0bb50cbc1cb286077069b3107085206f" + "reference": "976302990f9f2a6d4c07206836dd4ca77cae9524" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/19073e3e0bb50cbc1cb286077069b3107085206f", - "reference": "19073e3e0bb50cbc1cb286077069b3107085206f", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/976302990f9f2a6d4c07206836dd4ca77cae9524", + "reference": "976302990f9f2a6d4c07206836dd4ca77cae9524", "shasum": "" }, "require": { @@ -6082,7 +6122,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v6.4.19" + "source": "https://github.com/symfony/dom-crawler/tree/v6.4.25" }, "funding": [ { @@ -6093,25 +6133,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-02-14T17:58:34+00:00" + "time": "2025-08-05T18:56:08+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v6.4.13", + "version": "v6.4.25", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e" + "reference": "b0cf3162020603587363f0551cd3be43958611ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e", - "reference": "0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b0cf3162020603587363f0551cd3be43958611ff", + "reference": "b0cf3162020603587363f0551cd3be43958611ff", "shasum": "" }, "require": { @@ -6162,7 +6206,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.13" + "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.25" }, "funding": [ { @@ -6173,25 +6217,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-25T14:18:03+00:00" + "time": "2025-08-13T09:41:44+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v3.5.1", + "version": "v3.6.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f" + "reference": "59eb412e93815df44f05f342958efa9f46b1e586" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7642f5e970b672283b7823222ae8ef8bbc160b9f", - "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/59eb412e93815df44f05f342958efa9f46b1e586", + "reference": "59eb412e93815df44f05f342958efa9f46b1e586", "shasum": "" }, "require": { @@ -6205,7 +6253,7 @@ "name": "symfony/contracts" }, "branch-alias": { - "dev-main": "3.5-dev" + "dev-main": "3.6-dev" } }, "autoload": { @@ -6238,7 +6286,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.1" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.6.0" }, "funding": [ { @@ -6254,20 +6302,20 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:20:29+00:00" + "time": "2024-09-25T14:21:43+00:00" }, { "name": "symfony/filesystem", - "version": "v6.4.13", + "version": "v6.4.24", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "4856c9cf585d5a0313d8d35afd681a526f038dd3" + "reference": "75ae2edb7cdcc0c53766c30b0a2512b8df574bd8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/4856c9cf585d5a0313d8d35afd681a526f038dd3", - "reference": "4856c9cf585d5a0313d8d35afd681a526f038dd3", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/75ae2edb7cdcc0c53766c30b0a2512b8df574bd8", + "reference": "75ae2edb7cdcc0c53766c30b0a2512b8df574bd8", "shasum": "" }, "require": { @@ -6304,7 +6352,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.4.13" + "source": "https://github.com/symfony/filesystem/tree/v6.4.24" }, "funding": [ { @@ -6315,25 +6363,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-10-25T15:07:50+00:00" + "time": "2025-07-10T08:14:14+00:00" }, { "name": "symfony/finder", - "version": "v6.4.17", + "version": "v6.4.27", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "1d0e8266248c5d9ab6a87e3789e6dc482af3c9c7" + "reference": "a1b6aa435d2fba50793b994a839c32b6064f063b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/1d0e8266248c5d9ab6a87e3789e6dc482af3c9c7", - "reference": "1d0e8266248c5d9ab6a87e3789e6dc482af3c9c7", + "url": "https://api.github.com/repos/symfony/finder/zipball/a1b6aa435d2fba50793b994a839c32b6064f063b", + "reference": "a1b6aa435d2fba50793b994a839c32b6064f063b", "shasum": "" }, "require": { @@ -6368,7 +6420,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v6.4.17" + "source": "https://github.com/symfony/finder/tree/v6.4.27" }, "funding": [ { @@ -6379,25 +6431,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-12-29T13:51:37+00:00" + "time": "2025-10-15T18:32:00+00:00" }, { "name": "symfony/options-resolver", - "version": "v6.4.16", + "version": "v6.4.25", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "368128ad168f20e22c32159b9f761e456cec0c78" + "reference": "d28e7e2db8a73e9511df892d36445f61314bbebe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/368128ad168f20e22c32159b9f761e456cec0c78", - "reference": "368128ad168f20e22c32159b9f761e456cec0c78", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/d28e7e2db8a73e9511df892d36445f61314bbebe", + "reference": "d28e7e2db8a73e9511df892d36445f61314bbebe", "shasum": "" }, "require": { @@ -6435,7 +6491,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v6.4.16" + "source": "https://github.com/symfony/options-resolver/tree/v6.4.25" }, "funding": [ { @@ -6446,16 +6502,20 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-11-20T10:57:02+00:00" + "time": "2025-08-04T17:06:28+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", @@ -6514,7 +6574,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.33.0" }, "funding": [ { @@ -6525,6 +6585,10 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" @@ -6534,16 +6598,16 @@ }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe" + "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", - "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/380872130d3a5dd3ace2f4010d95125fde5d5c70", + "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70", "shasum": "" }, "require": { @@ -6592,7 +6656,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.33.0" }, "funding": [ { @@ -6603,16 +6667,20 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-09T11:45:10+00:00" + "time": "2025-06-27T09:58:17+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", @@ -6673,7 +6741,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.33.0" }, "funding": [ { @@ -6684,6 +6752,10 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" @@ -6693,19 +6765,20 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341" + "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341", - "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493", + "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493", "shasum": "" }, "require": { + "ext-iconv": "*", "php": ">=7.2" }, "provide": { @@ -6753,7 +6826,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.33.0" }, "funding": [ { @@ -6764,25 +6837,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-09T11:45:10+00:00" + "time": "2024-12-23T08:48:59+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" + "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", - "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/0cc9dd0f17f61d8131e7df6b84bd344899fe2608", + "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608", "shasum": "" }, "require": { @@ -6833,7 +6910,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.33.0" }, "funding": [ { @@ -6844,16 +6921,20 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-09T11:45:10+00:00" + "time": "2025-01-02T08:10:11+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", @@ -6909,7 +6990,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.33.0" }, "funding": [ { @@ -6920,6 +7001,10 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" @@ -6927,18 +7012,98 @@ ], "time": "2024-09-09T11:45:10+00:00" }, + { + "name": "symfony/polyfill-php84", + "version": "v1.33.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php84.git", + "reference": "d8ced4d875142b6a7426000426b8abc631d6b191" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/d8ced4d875142b6a7426000426b8abc631d6b191", + "reference": "d8ced4d875142b6a7426000426b8abc631d6b191", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "type": "library", + "extra": { + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php84\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.4+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php84/tree/v1.33.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2025-06-24T13:30:11+00:00" + }, { "name": "symfony/process", - "version": "v6.4.20", + "version": "v6.4.26", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "e2a61c16af36c9a07e5c9906498b73e091949a20" + "reference": "48bad913268c8cafabbf7034b39c8bb24fbc5ab8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/e2a61c16af36c9a07e5c9906498b73e091949a20", - "reference": "e2a61c16af36c9a07e5c9906498b73e091949a20", + "url": "https://api.github.com/repos/symfony/process/zipball/48bad913268c8cafabbf7034b39c8bb24fbc5ab8", + "reference": "48bad913268c8cafabbf7034b39c8bb24fbc5ab8", "shasum": "" }, "require": { @@ -6970,7 +7135,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.4.20" + "source": "https://github.com/symfony/process/tree/v6.4.26" }, "funding": [ { @@ -6981,25 +7146,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-03-10T17:11:00+00:00" + "time": "2025-09-11T09:57:09+00:00" }, { "name": "symfony/service-contracts", - "version": "v3.5.1", + "version": "v3.6.1", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0" + "reference": "45112560a3ba2d715666a509a0bc9521d10b6c43" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/e53260aabf78fb3d63f8d79d69ece59f80d5eda0", - "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/45112560a3ba2d715666a509a0bc9521d10b6c43", + "reference": "45112560a3ba2d715666a509a0bc9521d10b6c43", "shasum": "" }, "require": { @@ -7017,7 +7186,7 @@ "name": "symfony/contracts" }, "branch-alias": { - "dev-main": "3.5-dev" + "dev-main": "3.6-dev" } }, "autoload": { @@ -7053,7 +7222,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.5.1" + "source": "https://github.com/symfony/service-contracts/tree/v3.6.1" }, "funding": [ { @@ -7064,25 +7233,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-25T14:20:29+00:00" + "time": "2025-07-15T11:30:57+00:00" }, { "name": "symfony/stopwatch", - "version": "v6.4.19", + "version": "v6.4.24", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "dfe1481c12c06266d0c3d58c0cb4b09bd497ab9c" + "reference": "b67e94e06a05d9572c2fa354483b3e13e3cb1898" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/dfe1481c12c06266d0c3d58c0cb4b09bd497ab9c", - "reference": "dfe1481c12c06266d0c3d58c0cb4b09bd497ab9c", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/b67e94e06a05d9572c2fa354483b3e13e3cb1898", + "reference": "b67e94e06a05d9572c2fa354483b3e13e3cb1898", "shasum": "" }, "require": { @@ -7115,7 +7288,7 @@ "description": "Provides a way to profile code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v6.4.19" + "source": "https://github.com/symfony/stopwatch/tree/v6.4.24" }, "funding": [ { @@ -7126,25 +7299,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-02-21T10:06:30+00:00" + "time": "2025-07-10T08:14:14+00:00" }, { "name": "symfony/string", - "version": "v6.4.15", + "version": "v6.4.26", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f" + "reference": "5621f039a71a11c87c106c1c598bdcd04a19aeea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f", - "reference": "73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f", + "url": "https://api.github.com/repos/symfony/string/zipball/5621f039a71a11c87c106c1c598bdcd04a19aeea", + "reference": "5621f039a71a11c87c106c1c598bdcd04a19aeea", "shasum": "" }, "require": { @@ -7158,7 +7335,6 @@ "symfony/translation-contracts": "<2.5" }, "require-dev": { - "symfony/error-handler": "^5.4|^6.0|^7.0", "symfony/http-client": "^5.4|^6.0|^7.0", "symfony/intl": "^6.2|^7.0", "symfony/translation-contracts": "^2.5|^3.0", @@ -7201,7 +7377,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.15" + "source": "https://github.com/symfony/string/tree/v6.4.26" }, "funding": [ { @@ -7212,25 +7388,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-11-13T13:31:12+00:00" + "time": "2025-09-11T14:32:46+00:00" }, { "name": "symfony/var-dumper", - "version": "v6.4.18", + "version": "v6.4.26", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "4ad10cf8b020e77ba665305bb7804389884b4837" + "reference": "cfae1497a2f1eaad78dbc0590311c599c7178d4a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/4ad10cf8b020e77ba665305bb7804389884b4837", - "reference": "4ad10cf8b020e77ba665305bb7804389884b4837", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/cfae1497a2f1eaad78dbc0590311c599c7178d4a", + "reference": "cfae1497a2f1eaad78dbc0590311c599c7178d4a", "shasum": "" }, "require": { @@ -7242,7 +7422,6 @@ "symfony/console": "<5.4" }, "require-dev": { - "ext-iconv": "*", "symfony/console": "^5.4|^6.0|^7.0", "symfony/error-handler": "^6.3|^7.0", "symfony/http-kernel": "^5.4|^6.0|^7.0", @@ -7286,7 +7465,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.18" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.26" }, "funding": [ { @@ -7297,25 +7476,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-01-17T11:26:11+00:00" + "time": "2025-09-25T15:37:27+00:00" }, { "name": "symfony/yaml", - "version": "v6.4.20", + "version": "v6.4.26", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "28ee818fce4a73ac1474346b94e4b966f665c53f" + "reference": "0fc8b966fd0dcaab544ae59bfc3a433f048c17b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/28ee818fce4a73ac1474346b94e4b966f665c53f", - "reference": "28ee818fce4a73ac1474346b94e4b966f665c53f", + "url": "https://api.github.com/repos/symfony/yaml/zipball/0fc8b966fd0dcaab544ae59bfc3a433f048c17b0", + "reference": "0fc8b966fd0dcaab544ae59bfc3a433f048c17b0", "shasum": "" }, "require": { @@ -7358,7 +7541,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.4.20" + "source": "https://github.com/symfony/yaml/tree/v6.4.26" }, "funding": [ { @@ -7369,25 +7552,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-02-27T20:15:30+00:00" + "time": "2025-09-26T15:07:38+00:00" }, { "name": "theseer/tokenizer", - "version": "1.2.3", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2" + "reference": "b7489ce515e168639d17feec34b8847c326b0b3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", - "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b7489ce515e168639d17feec34b8847c326b0b3c", + "reference": "b7489ce515e168639d17feec34b8847c326b0b3c", "shasum": "" }, "require": { @@ -7416,7 +7603,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.3" + "source": "https://github.com/theseer/tokenizer/tree/1.3.1" }, "funding": [ { @@ -7424,20 +7611,20 @@ "type": "github" } ], - "time": "2024-03-03T12:36:25+00:00" + "time": "2025-11-17T20:03:58+00:00" }, { "name": "twig/twig", - "version": "v3.20.0", + "version": "v3.22.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "3468920399451a384bef53cf7996965f7cd40183" + "reference": "4509984193026de413baf4ba80f68590a7f2c51d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/3468920399451a384bef53cf7996965f7cd40183", - "reference": "3468920399451a384bef53cf7996965f7cd40183", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/4509984193026de413baf4ba80f68590a7f2c51d", + "reference": "4509984193026de413baf4ba80f68590a7f2c51d", "shasum": "" }, "require": { @@ -7491,7 +7678,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.20.0" + "source": "https://github.com/twigphp/Twig/tree/v3.22.0" }, "funding": [ { @@ -7503,7 +7690,7 @@ "type": "tidelift" } ], - "time": "2025-02-13T08:34:43+00:00" + "time": "2025-10-29T15:56:47+00:00" }, { "name": "vimeo/psalm", @@ -7617,16 +7804,16 @@ }, { "name": "vlucas/phpdotenv", - "version": "v5.6.1", + "version": "v5.6.2", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "a59a13791077fe3d44f90e7133eb68e7d22eaff2" + "reference": "24ac4c74f91ee2c193fa1aaa5c249cb0822809af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/a59a13791077fe3d44f90e7133eb68e7d22eaff2", - "reference": "a59a13791077fe3d44f90e7133eb68e7d22eaff2", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/24ac4c74f91ee2c193fa1aaa5c249cb0822809af", + "reference": "24ac4c74f91ee2c193fa1aaa5c249cb0822809af", "shasum": "" }, "require": { @@ -7685,7 +7872,7 @@ ], "support": { "issues": "https://github.com/vlucas/phpdotenv/issues", - "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.1" + "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.2" }, "funding": [ { @@ -7697,32 +7884,32 @@ "type": "tidelift" } ], - "time": "2024-07-20T21:52:34+00:00" + "time": "2025-04-30T23:37:27+00:00" }, { "name": "webmozart/assert", - "version": "1.11.0", + "version": "1.12.1", "source": { "type": "git", "url": "https://github.com/webmozarts/assert.git", - "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991" + "reference": "9be6926d8b485f55b9229203f962b51ed377ba68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991", - "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/9be6926d8b485f55b9229203f962b51ed377ba68", + "reference": "9be6926d8b485f55b9229203f962b51ed377ba68", "shasum": "" }, "require": { "ext-ctype": "*", + "ext-date": "*", + "ext-filter": "*", "php": "^7.2 || ^8.0" }, - "conflict": { - "phpstan/phpstan": "<0.12.20", - "vimeo/psalm": "<4.6.1 || 4.6.2" - }, - "require-dev": { - "phpunit/phpunit": "^8.5.13" + "suggest": { + "ext-intl": "", + "ext-simplexml": "", + "ext-spl": "" }, "type": "library", "extra": { @@ -7753,9 +7940,9 @@ ], "support": { "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/1.11.0" + "source": "https://github.com/webmozarts/assert/tree/1.12.1" }, - "time": "2022-06-03T18:03:27+00:00" + "time": "2025-10-29T15:56:20+00:00" } ], "aliases": [], @@ -7785,5 +7972,5 @@ "ext-sqlite3": "*", "ext-xml": "*" }, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.9.0" } diff --git a/config.json b/config.json index 89ac96e28b4..b894d608835 100644 --- a/config.json +++ b/config.json @@ -3,7 +3,7 @@ "name": "phalcon", "description": "Phalcon is a full stack PHP framework, delivered as a PHP extension, offering lower resource consumption and high performance.", "author": "Phalcon Team and contributors", - "version": "5.9.3", + "version": "5.9.4", "verbose": false, "stubs": { "path": "ide\/%version%\/%namespace%\/", diff --git a/docker/Dockerfile b/docker/Dockerfile index fce491de494..8bf1927f77f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -82,7 +82,7 @@ FROM base AS dev # This part prepares a dev environment to compile phalcon from zephir # hadolint ignore=DL3022 -COPY --from=composer/composer:2 --chown=${USER}:${GROUP} --chmod=0770 /usr/bin/composer /usr/bin/composer +COPY --from=composer/composer:2 --chown=${USER}:${GROUP} --chmod=0775 /usr/bin/composer /usr/bin/composer WORKDIR /srv @@ -118,7 +118,7 @@ FROM base AS prod # This part builds the last step required for production image. -ARG PHALCON_VERSION="v5.9.3" +ARG PHALCON_VERSION="v5.9.4" ENV PATH=/app/bin:/app:${PATH} \ PHP_VERSION=${PHP_VERSION} \ diff --git a/ext/config.m4 b/ext/config.m4 index a3506cc4780..ebd4a500ebd 100644 --- a/ext/config.m4 +++ b/ext/config.m4 @@ -314,6 +314,7 @@ if test "$PHP_PHALCON" = "yes"; then phalcon/filter/sanitize/email.zep.c phalcon/filter/sanitize/floatval.zep.c phalcon/filter/sanitize/intval.zep.c + phalcon/filter/sanitize/ip.zep.c phalcon/filter/sanitize/lower.zep.c phalcon/filter/sanitize/lowerfirst.zep.c phalcon/filter/sanitize/regex.zep.c diff --git a/ext/config.w32 b/ext/config.w32 index 852d491c5a5..899455f5296 100644 --- a/ext/config.w32 +++ b/ext/config.w32 @@ -106,7 +106,7 @@ if (PHP_PHALCON != "no") { ADD_SOURCES(configure_module_dirname + "/phalcon/encryption/security", "exception.zep.c random.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/encryption/security/jwt", "builder.zep.c validator.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/encryption/security/jwt/exceptions", "unsupportedalgorithmexception.zep.c validatorexception.zep.c", "phalcon"); - ADD_SOURCES(configure_module_dirname + "/phalcon/filter/sanitize", "absint.zep.c alnum.zep.c alpha.zep.c boolval.zep.c email.zep.c floatval.zep.c intval.zep.c lower.zep.c lowerfirst.zep.c regex.zep.c remove.zep.c replace.zep.c special.zep.c specialfull.zep.c stringval.zep.c stringvallegacy.zep.c striptags.zep.c trim.zep.c upper.zep.c upperfirst.zep.c upperwords.zep.c url.zep.c", "phalcon"); + ADD_SOURCES(configure_module_dirname + "/phalcon/filter/sanitize", "absint.zep.c alnum.zep.c alpha.zep.c boolval.zep.c email.zep.c floatval.zep.c intval.zep.c ip.zep.c lower.zep.c lowerfirst.zep.c regex.zep.c remove.zep.c replace.zep.c special.zep.c specialfull.zep.c stringval.zep.c stringvallegacy.zep.c striptags.zep.c trim.zep.c upper.zep.c upperfirst.zep.c upperwords.zep.c url.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/filter/validation/validator", "alnum.zep.c alpha.zep.c between.zep.c callback.zep.c confirmation.zep.c creditcard.zep.c date.zep.c digit.zep.c email.zep.c exception.zep.c exclusionin.zep.c file.zep.c identical.zep.c inclusionin.zep.c ip.zep.c numericality.zep.c presenceof.zep.c regex.zep.c stringlength.zep.c uniqueness.zep.c url.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/filter/validation/validator/file/resolution", "equal.zep.c max.zep.c min.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/filter/validation/validator/stringlength", "max.zep.c min.zep.c", "phalcon"); diff --git a/ext/kernel/array.c b/ext/kernel/array.c index e1dfbdc700f..71fcdd20efe 100644 --- a/ext/kernel/array.c +++ b/ext/kernel/array.c @@ -652,7 +652,6 @@ int zephir_array_update_zval(zval *arr, zval *index, zval *value, int flags) if ((flags & PH_CTOR) == PH_CTOR) { zval new_zv; - //Z_TRY_DELREF_P(value); //? ZVAL_DUP(&new_zv, value); value = &new_zv; } diff --git a/ext/kernel/file.c b/ext/kernel/file.c index 83237c4faef..6be88c4d75f 100644 --- a/ext/kernel/file.c +++ b/ext/kernel/file.c @@ -68,7 +68,7 @@ int zephir_file_exists(zval *filename) #if PHP_VERSION_ID >= 80100 zend_string *file = zend_string_init(Z_STRVAL_P(filename), Z_STRLEN_P(filename), 0); php_stat(file, FS_EXISTS, &return_value); - zval_ptr_dtor(file); + zend_string_release(file); #else php_stat(Z_STRVAL_P(filename), (php_stat_len) Z_STRLEN_P(filename), FS_EXISTS, &return_value); #endif @@ -297,7 +297,7 @@ void zephir_filemtime(zval *return_value, zval *path) #if PHP_VERSION_ID >= 80100 zend_string *file = zend_string_init(Z_STRVAL_P(path), Z_STRLEN_P(path), 0); php_stat(file, FS_MTIME, return_value); - zval_ptr_dtor(file); + zend_string_release(file); #else php_stat(Z_STRVAL_P(path), (php_stat_len)(Z_STRLEN_P(path)), FS_MTIME, return_value); #endif diff --git a/ext/kernel/main.c b/ext/kernel/main.c index 8aeedda44ea..639d84c48bb 100644 --- a/ext/kernel/main.c +++ b/ext/kernel/main.c @@ -272,7 +272,7 @@ int zephir_function_exists(const zval *function_name) */ int zephir_function_exists_ex(const char *function_name, unsigned int function_len) { - if (zend_hash_str_exists(CG(function_table), function_name, function_len) != NULL) { + if (zend_hash_str_exists(CG(function_table), function_name, function_len)) { return SUCCESS; } diff --git a/ext/kernel/require.c b/ext/kernel/require.c index 98125c93847..5559922bcd9 100644 --- a/ext/kernel/require.c +++ b/ext/kernel/require.c @@ -51,7 +51,7 @@ int zephir_require_ret(zval *return_value_ptr, const char *require_path) zend_stream_init_filename_ex(&file_handle, zend_string_path); ret = php_stream_open_for_zend_ex(&file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE); - zval_ptr_dtor(zend_string_path); + zend_string_release(zend_string_path); #else ret = php_stream_open_for_zend_ex(require_path, &file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE); #endif @@ -124,7 +124,7 @@ int zephir_require_once_ret(zval *return_value_ptr, const char *require_path) zend_stream_init_filename_ex(&file_handle, zend_string_path); ret = php_stream_open_for_zend_ex(&file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE); - zval_ptr_dtor(zend_string_path); + zend_string_release(zend_string_path); #else ret = php_stream_open_for_zend_ex(require_path, &file_handle, USE_PATH|STREAM_OPEN_FOR_INCLUDE); #endif diff --git a/ext/phalcon.c b/ext/phalcon.c index 14d972eb4cc..087474fa8e3 100644 --- a/ext/phalcon.c +++ b/ext/phalcon.c @@ -348,6 +348,7 @@ zend_class_entry *phalcon_filter_sanitize_boolval_ce; zend_class_entry *phalcon_filter_sanitize_email_ce; zend_class_entry *phalcon_filter_sanitize_floatval_ce; zend_class_entry *phalcon_filter_sanitize_intval_ce; +zend_class_entry *phalcon_filter_sanitize_ip_ce; zend_class_entry *phalcon_filter_sanitize_lower_ce; zend_class_entry *phalcon_filter_sanitize_lowerfirst_ce; zend_class_entry *phalcon_filter_sanitize_regex_ce; @@ -986,6 +987,7 @@ static PHP_MINIT_FUNCTION(phalcon) ZEPHIR_INIT(Phalcon_Filter_Sanitize_Email); ZEPHIR_INIT(Phalcon_Filter_Sanitize_FloatVal); ZEPHIR_INIT(Phalcon_Filter_Sanitize_IntVal); + ZEPHIR_INIT(Phalcon_Filter_Sanitize_Ip); ZEPHIR_INIT(Phalcon_Filter_Sanitize_Lower); ZEPHIR_INIT(Phalcon_Filter_Sanitize_LowerFirst); ZEPHIR_INIT(Phalcon_Filter_Sanitize_Regex); diff --git a/ext/phalcon.h b/ext/phalcon.h index e9cbd58837d..615b2dc18ae 100644 --- a/ext/phalcon.h +++ b/ext/phalcon.h @@ -309,6 +309,7 @@ #include "phalcon/filter/sanitize/email.zep.h" #include "phalcon/filter/sanitize/floatval.zep.h" #include "phalcon/filter/sanitize/intval.zep.h" +#include "phalcon/filter/sanitize/ip.zep.h" #include "phalcon/filter/sanitize/lower.zep.h" #include "phalcon/filter/sanitize/lowerfirst.zep.h" #include "phalcon/filter/sanitize/regex.zep.h" diff --git a/ext/phalcon/8__closure.zep.c b/ext/phalcon/8__closure.zep.c index d6dfdc9d9f0..3367dc6eae2 100644 --- a/ext/phalcon/8__closure.zep.c +++ b/ext/phalcon/8__closure.zep.c @@ -40,11 +40,11 @@ PHP_METHOD(phalcon_8__closure, __invoke) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &element); zephir_memory_observe(&_0); - zephir_array_fetch_long(&_0, element, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 81); + zephir_array_fetch_long(&_0, element, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 86); _1 = Z_TYPE_P(&_0) != IS_ARRAY; if (!(_1)) { zephir_memory_observe(&_2); - zephir_array_fetch_long(&_2, element, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 81); + zephir_array_fetch_long(&_2, element, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 86); _1 = !(zephir_instance_of_ev(&_2, phalcon_filter_validation_abstractcombinedfieldsvalidator_ce)); } RETURN_MM_BOOL(_1); diff --git a/ext/phalcon/9__closure.zep.c b/ext/phalcon/9__closure.zep.c index 398dd418b40..3185d0b69cb 100644 --- a/ext/phalcon/9__closure.zep.c +++ b/ext/phalcon/9__closure.zep.c @@ -40,11 +40,11 @@ PHP_METHOD(phalcon_9__closure, __invoke) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &element); zephir_memory_observe(&_0); - zephir_array_fetch_long(&_0, element, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 88); + zephir_array_fetch_long(&_0, element, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 93); _1 = Z_TYPE_P(&_0) == IS_ARRAY; if (_1) { zephir_memory_observe(&_2); - zephir_array_fetch_long(&_2, element, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 88); + zephir_array_fetch_long(&_2, element, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 93); _1 = zephir_instance_of_ev(&_2, phalcon_filter_validation_abstractcombinedfieldsvalidator_ce); } RETURN_MM_BOOL(_1); diff --git a/ext/phalcon/acl/adapter/memory.zep.c b/ext/phalcon/acl/adapter/memory.zep.c index de515792ae5..2cae1db757e 100644 --- a/ext/phalcon/acl/adapter/memory.zep.c +++ b/ext/phalcon/acl/adapter/memory.zep.c @@ -256,10 +256,10 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, addComponent) } else { ZEPHIR_INIT_NVAR(&componentObject); object_init_ex(&componentObject, phalcon_acl_component_ce); - ZEPHIR_CALL_METHOD(NULL, &componentObject, "__construct", NULL, 143, componentValue); + ZEPHIR_CALL_METHOD(NULL, &componentObject, "__construct", NULL, 144, componentValue); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&componentName, &componentObject, "getname", NULL, 144); + ZEPHIR_CALL_METHOD(&componentName, &componentObject, "getname", NULL, 145); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("componentsNames"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset(&_1, &componentName))) { @@ -310,7 +310,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, addComponentAccess) zephir_read_property(&_0, this_ptr, ZEND_STRL("componentsNames"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "Component"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 145, &_0, &componentName, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 146, &_0, &componentName, &_1); zephir_check_call_status(); _2 = Z_TYPE_P(accessList) != IS_ARRAY; if (_2) { @@ -455,7 +455,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZVAL_STRING(&_1, "Role"); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "role list"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 145, &_0, &roleName, &_1, &_2); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 146, &_0, &roleName, &_1, &_2); zephir_check_call_status(); zephir_read_property(&_3, this_ptr, ZEND_STRL("roleInherits"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset(&_3, &roleName))) { @@ -519,7 +519,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZEPHIR_INIT_NVAR(&usedRoleToInherit); ZVAL_COPY(&usedRoleToInherit, _17$$12); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 146, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 147, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -535,7 +535,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZEPHIR_CALL_METHOD(&usedRoleToInherit, &_16$$12, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 146, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 147, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_16$$12, "next", NULL, 0); @@ -579,7 +579,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZEPHIR_INIT_NVAR(&usedRoleToInherit); ZVAL_COPY(&usedRoleToInherit, _26$$18); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 146, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 147, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -595,7 +595,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZEPHIR_CALL_METHOD(&usedRoleToInherit, &_25$$18, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 146, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 147, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_25$$18, "next", NULL, 0); @@ -662,7 +662,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZEPHIR_INIT_NVAR(&usedRoleToInherit); ZVAL_COPY(&usedRoleToInherit, _37$$27); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 146, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 147, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -678,7 +678,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZEPHIR_CALL_METHOD(&usedRoleToInherit, &_36$$27, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 146, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 147, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_36$$27, "next", NULL, 0); @@ -722,7 +722,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZEPHIR_INIT_NVAR(&usedRoleToInherit); ZVAL_COPY(&usedRoleToInherit, _44$$33); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 146, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 147, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -738,7 +738,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZEPHIR_CALL_METHOD(&usedRoleToInherit, &_43$$33, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 146, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 147, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_43$$33, "next", NULL, 0); @@ -807,13 +807,13 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, addRole) } else if (Z_TYPE_P(role) == IS_STRING) { ZEPHIR_INIT_NVAR(&roleObject); object_init_ex(&roleObject, phalcon_acl_role_ce); - ZEPHIR_CALL_METHOD(NULL, &roleObject, "__construct", NULL, 147, role); + ZEPHIR_CALL_METHOD(NULL, &roleObject, "__construct", NULL, 148, role); zephir_check_call_status(); } else { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_acl_exception_ce, "Role must be either a string or implement RoleInterface", "phalcon/Acl/Adapter/Memory.zep", 394); return; } - ZEPHIR_CALL_METHOD(&roleName, &roleObject, "getname", NULL, 148); + ZEPHIR_CALL_METHOD(&roleName, &roleObject, "getname", NULL, 149); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("roles"), PH_NOISY_CC | PH_READONLY); if (zephir_array_isset(&_1, &roleName)) { @@ -900,7 +900,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, allow) ZEPHIR_INIT_NVAR(&role); ZVAL_COPY(&role, _2); ZVAL_LONG(&_4$$4, 1); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 149, &role, &componentName, access, &_4$$4, func); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 150, &role, &componentName, access, &_4$$4, func); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); } else { @@ -915,7 +915,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, allow) ZEPHIR_CALL_METHOD(&role, &rolesArray, "current", NULL, 0); zephir_check_call_status(); ZVAL_LONG(&_6$$5, 1); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 149, &role, &componentName, access, &_6$$5, func); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 150, &role, &componentName, access, &_6$$5, func); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &rolesArray, "next", NULL, 0); zephir_check_call_status(); @@ -997,7 +997,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, deny) ZEPHIR_INIT_NVAR(&role); ZVAL_COPY(&role, _2); ZVAL_LONG(&_4$$4, 0); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 149, &role, &componentName, access, &_4$$4, func); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 150, &role, &componentName, access, &_4$$4, func); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); } else { @@ -1012,7 +1012,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, deny) ZEPHIR_CALL_METHOD(&role, &rolesArray, "current", NULL, 0); zephir_check_call_status(); ZVAL_LONG(&_6$$5, 0); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 149, &role, &componentName, access, &_6$$5, func); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 150, &role, &componentName, access, &_6$$5, func); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &rolesArray, "next", NULL, 0); zephir_check_call_status(); @@ -1396,7 +1396,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) zephir_read_property(&_9$$12, this_ptr, ZEND_STRL("defaultAccess"), PH_NOISY_CC | PH_READONLY); RETURN_MM_BOOL((ZEPHIR_IS_LONG(&_9$$12, 1))); } - ZEPHIR_CALL_METHOD(&accessKey, this_ptr, "canaccess", NULL, 150, roleName, componentName, &access); + ZEPHIR_CALL_METHOD(&accessKey, this_ptr, "canaccess", NULL, 151, roleName, componentName, &access); zephir_check_call_status(); _10 = Z_TYPE_P(&accessKey) != IS_NULL; if (_10) { @@ -1425,9 +1425,9 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) if (zephir_is_callable(&funcAccess)) { ZEPHIR_INIT_VAR(&reflectionFunction); object_init_ex(&reflectionFunction, zephir_get_internal_ce(SL("reflectionfunction"))); - ZEPHIR_CALL_METHOD(NULL, &reflectionFunction, "__construct", NULL, 151, &funcAccess); + ZEPHIR_CALL_METHOD(NULL, &reflectionFunction, "__construct", NULL, 152, &funcAccess); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&reflectionParameters, &reflectionFunction, "getparameters", NULL, 152); + ZEPHIR_CALL_METHOD(&reflectionParameters, &reflectionFunction, "getparameters", NULL, 153); zephir_check_call_status(); ZEPHIR_INIT_VAR(¶meterNumber); ZVAL_LONG(¶meterNumber, zephir_fast_count_int(&reflectionParameters)); @@ -1443,7 +1443,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) } ZEPHIR_INIT_VAR(¶metersForFunction); array_init(¶metersForFunction); - ZEPHIR_CALL_METHOD(&numberOfRequiredParameters, &reflectionFunction, "getnumberofrequiredparameters", NULL, 153); + ZEPHIR_CALL_METHOD(&numberOfRequiredParameters, &reflectionFunction, "getnumberofrequiredparameters", NULL, 154); zephir_check_call_status(); ZEPHIR_CPY_WRT(&userParametersSizeShouldBe, ¶meterNumber); zephir_is_iterable(&reflectionParameters, 0, "phalcon/Acl/Adapter/Memory.zep", 767); @@ -1461,11 +1461,11 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&reflectionClass); object_init_ex(&reflectionClass, zephir_get_internal_ce(SL("reflectionclass"))); - ZEPHIR_CALL_METHOD(NULL, &reflectionClass, "__construct", &_17, 154, &className); + ZEPHIR_CALL_METHOD(NULL, &reflectionClass, "__construct", &_17, 155, &className); zephir_check_call_status(); _18$$18 = Z_TYPE_P(&roleObject) != IS_NULL; if (_18$$18) { - ZEPHIR_CALL_METHOD(&_19$$18, &reflectionClass, "isinstance", &_20, 155, &roleObject); + ZEPHIR_CALL_METHOD(&_19$$18, &reflectionClass, "isinstance", &_20, 156, &roleObject); zephir_check_call_status(); _18$$18 = zephir_is_true(&_19$$18); } @@ -1482,7 +1482,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) } _22$$18 = Z_TYPE_P(&componentObject) != IS_NULL; if (_22$$18) { - ZEPHIR_CALL_METHOD(&_23$$18, &reflectionClass, "isinstance", &_20, 155, &componentObject); + ZEPHIR_CALL_METHOD(&_23$$18, &reflectionClass, "isinstance", &_20, 156, &componentObject); zephir_check_call_status(); _22$$18 = zephir_is_true(&_23$$18); } @@ -1505,7 +1505,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) _27$$18 = _25$$18; if (_27$$18) { zephir_array_fetch(&_29$$18, ¶meters, ¶meterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 744); - ZEPHIR_CALL_METHOD(&_28$$18, &reflectionClass, "isinstance", &_20, 155, &_29$$18); + ZEPHIR_CALL_METHOD(&_28$$18, &reflectionClass, "isinstance", &_20, 156, &_29$$18); zephir_check_call_status(); _27$$18 = !zephir_is_true(&_28$$18); } @@ -1515,7 +1515,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) ZEPHIR_INIT_NVAR(&_31$$21); zephir_array_fetch(&_32$$21, ¶meters, ¶meterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 751); zephir_get_class(&_31$$21, &_32$$21, 0); - ZEPHIR_CALL_METHOD(&_33$$21, &reflectionClass, "getname", &_34, 156); + ZEPHIR_CALL_METHOD(&_33$$21, &reflectionClass, "getname", &_34, 157); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_35$$21); ZEPHIR_CONCAT_SSSVSVSVSVSVS(&_35$$21, "Your passed parameter doesn't have the ", "same class as the parameter in defined function ", "when checking if ", roleName, " can ", &access, " ", componentName, ". Class passed: ", &_31$$21, " , Class in defined function: ", &_33$$21, "."); @@ -1551,11 +1551,11 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&reflectionClass); object_init_ex(&reflectionClass, zephir_get_internal_ce(SL("reflectionclass"))); - ZEPHIR_CALL_METHOD(NULL, &reflectionClass, "__construct", &_17, 154, &className); + ZEPHIR_CALL_METHOD(NULL, &reflectionClass, "__construct", &_17, 155, &className); zephir_check_call_status(); _37$$24 = Z_TYPE_P(&roleObject) != IS_NULL; if (_37$$24) { - ZEPHIR_CALL_METHOD(&_38$$24, &reflectionClass, "isinstance", &_20, 155, &roleObject); + ZEPHIR_CALL_METHOD(&_38$$24, &reflectionClass, "isinstance", &_20, 156, &roleObject); zephir_check_call_status(); _37$$24 = zephir_is_true(&_38$$24); } @@ -1572,7 +1572,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) } _40$$24 = Z_TYPE_P(&componentObject) != IS_NULL; if (_40$$24) { - ZEPHIR_CALL_METHOD(&_41$$24, &reflectionClass, "isinstance", &_20, 155, &componentObject); + ZEPHIR_CALL_METHOD(&_41$$24, &reflectionClass, "isinstance", &_20, 156, &componentObject); zephir_check_call_status(); _40$$24 = zephir_is_true(&_41$$24); } @@ -1595,7 +1595,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) _45$$24 = _43$$24; if (_45$$24) { zephir_array_fetch(&_47$$24, ¶meters, ¶meterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 744); - ZEPHIR_CALL_METHOD(&_46$$24, &reflectionClass, "isinstance", &_20, 155, &_47$$24); + ZEPHIR_CALL_METHOD(&_46$$24, &reflectionClass, "isinstance", &_20, 156, &_47$$24); zephir_check_call_status(); _45$$24 = !zephir_is_true(&_46$$24); } @@ -1605,7 +1605,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) ZEPHIR_INIT_NVAR(&_49$$27); zephir_array_fetch(&_50$$27, ¶meters, ¶meterToCheck, PH_NOISY | PH_READONLY, "phalcon/Acl/Adapter/Memory.zep", 751); zephir_get_class(&_49$$27, &_50$$27, 0); - ZEPHIR_CALL_METHOD(&_51$$27, &reflectionClass, "getname", &_34, 156); + ZEPHIR_CALL_METHOD(&_51$$27, &reflectionClass, "getname", &_34, 157); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_52$$27); ZEPHIR_CONCAT_SSSVSVSVSVSVS(&_52$$27, "Your passed parameter doesn't have the ", "same class as the parameter in defined function ", "when checking if ", roleName, " can ", &access, " ", componentName, ". Class passed: ", &_49$$27, " , Class in defined function: ", &_51$$27, "."); @@ -1799,12 +1799,12 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, allowOrDeny) zephir_read_property(&_0, this_ptr, ZEND_STRL("roles"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "Role"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 145, &_0, &roleName, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 146, &_0, &roleName, &_1); zephir_check_call_status(); zephir_read_property(&_2, this_ptr, ZEND_STRL("componentsNames"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "Component"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 145, &_2, &componentName, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 146, &_2, &componentName, &_1); zephir_check_call_status(); zephir_read_property(&_3, this_ptr, ZEND_STRL("accessList"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&accessList, &_3); @@ -1994,7 +1994,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, canAccess) ZEPHIR_INIT_NVAR(&usedRoleToInherit); ZVAL_COPY(&usedRoleToInherit, _3$$6); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 146, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 147, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -2010,7 +2010,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, canAccess) ZEPHIR_CALL_METHOD(&usedRoleToInherit, &_2$$6, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 146, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 147, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_2$$6, "next", NULL, 0); @@ -2061,7 +2061,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, canAccess) ZEPHIR_INIT_NVAR(&usedRoleToInherit); ZVAL_COPY(&usedRoleToInherit, _13$$14); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 146, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 147, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -2077,7 +2077,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, canAccess) ZEPHIR_CALL_METHOD(&usedRoleToInherit, &_12$$14, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 146, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 147, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_12$$14, "next", NULL, 0); diff --git a/ext/phalcon/annotations/adapter/stream.zep.c b/ext/phalcon/annotations/adapter/stream.zep.c index e1dc2730df9..dad94a97706 100644 --- a/ext/phalcon/annotations/adapter/stream.zep.c +++ b/ext/phalcon/annotations/adapter/stream.zep.c @@ -143,33 +143,33 @@ PHP_METHOD(Phalcon_Annotations_Adapter_Stream, read) RETURN_MM_BOOL(0); } ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$false); - ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 133); + ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 134); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); ZVAL_STRING(&_4, "8.0"); ZEPHIR_INIT_VAR(&_5); ZVAL_STRING(&_5, ">="); - ZEPHIR_CALL_FUNCTION(&_6, "version_compare", NULL, 134, &version, &_4, &_5); + ZEPHIR_CALL_FUNCTION(&_6, "version_compare", NULL, 135, &version, &_4, &_5); zephir_check_call_status(); if (zephir_is_true(&_6)) { ZEPHIR_INIT_VAR(&_7$$5); ZEPHIR_INIT_NVAR(&_7$$5); zephir_create_closure_ex(&_7$$5, NULL, phalcon_5__closure_ce, SL("__invoke")); ZVAL_LONG(&_8$$5, 2); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 135, &_7$$5, &_8$$5); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 136, &_7$$5, &_8$$5); zephir_check_call_status(); } else { ZEPHIR_INIT_VAR(&_9$$6); ZEPHIR_INIT_NVAR(&_9$$6); zephir_create_closure_ex(&_9$$6, NULL, phalcon_6__closure_ce, SL("__invoke")); ZVAL_LONG(&_10$$6, 2); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 135, &_9$$6, &_10$$6); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 136, &_9$$6, &_10$$6); zephir_check_call_status(); } ZEPHIR_CALL_FUNCTION(&_11, "unserialize", NULL, 16, &contents); zephir_check_call_status(); ZEPHIR_CPY_WRT(&contents, &_11); - ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 136); + ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 137); zephir_check_call_status(); if (UNEXPECTED(ZEPHIR_GLOBAL(warning).enable)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_RuntimeException, "Cannot read annotation data", "phalcon/Annotations/Adapter/Stream.zep", 102); diff --git a/ext/phalcon/annotations/annotation.zep.c b/ext/phalcon/annotations/annotation.zep.c index 1207ed29dd2..2942d4a24c3 100644 --- a/ext/phalcon/annotations/annotation.zep.c +++ b/ext/phalcon/annotations/annotation.zep.c @@ -255,7 +255,7 @@ PHP_METHOD(Phalcon_Annotations_Annotation, getExpression) ZEPHIR_INIT_NVAR(&item); ZVAL_COPY(&item, _1$$7); zephir_array_fetch_string(&_3$$8, &item, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Annotations/Annotation.zep", 139); - ZEPHIR_CALL_METHOD(&resolvedItem, this_ptr, "getexpression", &_4, 157, &_3$$8); + ZEPHIR_CALL_METHOD(&resolvedItem, this_ptr, "getexpression", &_4, 158, &_3$$8); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&name); if (zephir_array_isset_string_fetch(&name, &item, SL("name"), 0)) { @@ -276,7 +276,7 @@ PHP_METHOD(Phalcon_Annotations_Annotation, getExpression) ZEPHIR_CALL_METHOD(&item, &_0$$7, "current", NULL, 0); zephir_check_call_status(); zephir_array_fetch_string(&_5$$11, &item, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Annotations/Annotation.zep", 139); - ZEPHIR_CALL_METHOD(&resolvedItem, this_ptr, "getexpression", &_4, 157, &_5$$11); + ZEPHIR_CALL_METHOD(&resolvedItem, this_ptr, "getexpression", &_4, 158, &_5$$11); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&name); if (zephir_array_isset_string_fetch(&name, &item, SL("name"), 0)) { @@ -293,7 +293,7 @@ PHP_METHOD(Phalcon_Annotations_Annotation, getExpression) } if (ZEPHIR_IS_LONG(&type, 300)) { object_init_ex(return_value, phalcon_annotations_annotation_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 158, &expr); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 159, &expr); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/annotations/annotationsfactory.zep.c b/ext/phalcon/annotations/annotationsfactory.zep.c index fd11c3026ea..7ea05d801be 100644 --- a/ext/phalcon/annotations/annotationsfactory.zep.c +++ b/ext/phalcon/annotations/annotationsfactory.zep.c @@ -124,7 +124,7 @@ PHP_METHOD(Phalcon_Annotations_AnnotationsFactory, load) array_init(&_2); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "options"); - ZEPHIR_CALL_METHOD(&options, &_1, "__invoke", NULL, 159, config, &_3, &_2); + ZEPHIR_CALL_METHOD(&options, &_1, "__invoke", NULL, 160, config, &_3, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "newinstance", NULL, 0, &name, &options); zephir_check_call_status(); diff --git a/ext/phalcon/annotations/collection.zep.c b/ext/phalcon/annotations/collection.zep.c index 4411ef14069..b4239da5cd6 100644 --- a/ext/phalcon/annotations/collection.zep.c +++ b/ext/phalcon/annotations/collection.zep.c @@ -104,7 +104,7 @@ PHP_METHOD(Phalcon_Annotations_Collection, __construct) ZVAL_COPY(&annotationData, _0); ZEPHIR_INIT_NVAR(&_2$$3); object_init_ex(&_2$$3, phalcon_annotations_annotation_ce); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", &_3, 158, &annotationData); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", &_3, 159, &annotationData); zephir_check_call_status(); zephir_array_append(&annotations, &_2$$3, PH_SEPARATE, "phalcon/Annotations/Collection.zep", 55); } ZEND_HASH_FOREACH_END(); @@ -121,7 +121,7 @@ PHP_METHOD(Phalcon_Annotations_Collection, __construct) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_4$$4); object_init_ex(&_4$$4, phalcon_annotations_annotation_ce); - ZEPHIR_CALL_METHOD(NULL, &_4$$4, "__construct", &_3, 158, &annotationData); + ZEPHIR_CALL_METHOD(NULL, &_4$$4, "__construct", &_3, 159, &annotationData); zephir_check_call_status(); zephir_array_append(&annotations, &_4$$4, PH_SEPARATE, "phalcon/Annotations/Collection.zep", 55); ZEPHIR_CALL_METHOD(NULL, &reflectionData, "next", NULL, 0); diff --git a/ext/phalcon/annotations/reader.zep.c b/ext/phalcon/annotations/reader.zep.c index e2de431adb4..91717ff3b50 100644 --- a/ext/phalcon/annotations/reader.zep.c +++ b/ext/phalcon/annotations/reader.zep.c @@ -103,15 +103,15 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) array_init(&annotations); ZEPHIR_INIT_VAR(&reflection); object_init_ex(&reflection, zephir_get_internal_ce(SL("reflectionclass"))); - ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 154, &className); + ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 155, &className); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&comment, &reflection, "getdoccomment", NULL, 160); + ZEPHIR_CALL_METHOD(&comment, &reflection, "getdoccomment", NULL, 161); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) { ZEPHIR_INIT_VAR(&classAnnotations); - ZEPHIR_CALL_METHOD(&_0$$3, &reflection, "getfilename", NULL, 161); + ZEPHIR_CALL_METHOD(&_0$$3, &reflection, "getfilename", NULL, 162); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1$$3, &reflection, "getstartline", NULL, 162); + ZEPHIR_CALL_METHOD(&_1$$3, &reflection, "getstartline", NULL, 163); zephir_check_call_status(); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&classAnnotations, &comment, &_0$$3, &_1$$3); zephir_check_call_status(); @@ -119,7 +119,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_array_update_string(&annotations, SL("class"), &classAnnotations, PH_COPY | PH_SEPARATE); } } - ZEPHIR_CALL_METHOD(&constants, &reflection, "getconstants", NULL, 163); + ZEPHIR_CALL_METHOD(&constants, &reflection, "getconstants", NULL, 164); zephir_check_call_status(); if (zephir_fast_count_int(&constants)) { line = 1; @@ -133,13 +133,13 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) { ZEPHIR_INIT_NVAR(&constant); ZVAL_COPY(&constant, _2$$5); - ZEPHIR_CALL_METHOD(&constantReflection, &reflection, "getreflectionconstant", &_4, 164, &constant); + ZEPHIR_CALL_METHOD(&constantReflection, &reflection, "getreflectionconstant", &_4, 165, &constant); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&comment, &constantReflection, "getdoccomment", NULL, 0); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) { ZEPHIR_INIT_NVAR(&constantAnnotations); - ZEPHIR_CALL_METHOD(&_5$$7, &reflection, "getfilename", NULL, 161); + ZEPHIR_CALL_METHOD(&_5$$7, &reflection, "getfilename", NULL, 162); zephir_check_call_status(); ZVAL_LONG(&_6$$7, line); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&constantAnnotations, &comment, &_5$$7, &_6$$7); @@ -160,13 +160,13 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) } ZEPHIR_CALL_METHOD(&constant, &arrayKeys, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&constantReflection, &reflection, "getreflectionconstant", &_4, 164, &constant); + ZEPHIR_CALL_METHOD(&constantReflection, &reflection, "getreflectionconstant", &_4, 165, &constant); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&comment, &constantReflection, "getdoccomment", NULL, 0); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) { ZEPHIR_INIT_NVAR(&constantAnnotations); - ZEPHIR_CALL_METHOD(&_7$$10, &reflection, "getfilename", NULL, 161); + ZEPHIR_CALL_METHOD(&_7$$10, &reflection, "getfilename", NULL, 162); zephir_check_call_status(); ZVAL_LONG(&_8$$10, line); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&constantAnnotations, &comment, &_7$$10, &_8$$10); @@ -184,7 +184,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_array_update_string(&annotations, SL("constants"), &anotationsConstants, PH_COPY | PH_SEPARATE); } } - ZEPHIR_CALL_METHOD(&properties, &reflection, "getproperties", NULL, 165); + ZEPHIR_CALL_METHOD(&properties, &reflection, "getproperties", NULL, 166); zephir_check_call_status(); if (zephir_fast_count_int(&properties)) { line = 1; @@ -200,7 +200,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) { ZEPHIR_INIT_NVAR(&propertyAnnotations); - ZEPHIR_CALL_METHOD(&_11$$15, &reflection, "getfilename", NULL, 161); + ZEPHIR_CALL_METHOD(&_11$$15, &reflection, "getfilename", NULL, 162); zephir_check_call_status(); ZVAL_LONG(&_12$$15, line); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&propertyAnnotations, &comment, &_11$$15, &_12$$15); @@ -227,7 +227,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&comment)) { ZEPHIR_INIT_NVAR(&propertyAnnotations); - ZEPHIR_CALL_METHOD(&_14$$18, &reflection, "getfilename", NULL, 161); + ZEPHIR_CALL_METHOD(&_14$$18, &reflection, "getfilename", NULL, 162); zephir_check_call_status(); ZVAL_LONG(&_15$$18, line); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&propertyAnnotations, &comment, &_14$$18, &_15$$18); @@ -247,7 +247,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_array_update_string(&annotations, SL("properties"), &annotationsProperties, PH_COPY | PH_SEPARATE); } } - ZEPHIR_CALL_METHOD(&methods, &reflection, "getmethods", NULL, 166); + ZEPHIR_CALL_METHOD(&methods, &reflection, "getmethods", NULL, 167); zephir_check_call_status(); if (0 == ZEPHIR_IS_EMPTY(&methods)) { ZEPHIR_INIT_VAR(&annotationsMethods); diff --git a/ext/phalcon/assets/collection.zep.c b/ext/phalcon/assets/collection.zep.c index 37bd697f10b..307fde236ac 100644 --- a/ext/phalcon/assets/collection.zep.c +++ b/ext/phalcon/assets/collection.zep.c @@ -118,7 +118,7 @@ PHP_METHOD(Phalcon_Assets_Collection, add) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &asset); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 167, asset); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 168, asset); zephir_check_call_status(); RETURN_THIS(); } @@ -200,7 +200,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addCss) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processadd", NULL, 168, &_0, &path, isLocal, &_1, &attributes, &version, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processadd", NULL, 169, &_0, &path, isLocal, &_1, &attributes, &version, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -243,7 +243,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addInline) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &code); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 167, code); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 168, code); zephir_check_call_status(); RETURN_THIS(); } @@ -296,7 +296,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addInlineCss) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processaddinline", NULL, 169, &_0, &content, &_1, &attributes); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processaddinline", NULL, 170, &_0, &content, &_1, &attributes); zephir_check_call_status(); RETURN_MM(); } @@ -349,7 +349,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addInlineJs) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processaddinline", NULL, 169, &_0, &content, &_1, &attributes); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processaddinline", NULL, 170, &_0, &content, &_1, &attributes); zephir_check_call_status(); RETURN_MM(); } @@ -431,7 +431,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addJs) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processadd", NULL, 168, &_0, &path, isLocal, &_1, &attributes, &version, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processadd", NULL, 169, &_0, &path, isLocal, &_1, &attributes, &version, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -1097,7 +1097,7 @@ PHP_METHOD(Phalcon_Assets_Collection, processAdd) ZEPHIR_CPY_WRT(&name, &_0); zephir_memory_observe(&flag); zephir_read_property(&flag, this_ptr, ZEND_STRL("isLocal"), PH_NOISY_CC); - ZEPHIR_CALL_METHOD(&attrs, this_ptr, "processattributes", NULL, 170, &attributes); + ZEPHIR_CALL_METHOD(&attrs, this_ptr, "processattributes", NULL, 171, &attributes); zephir_check_call_status(); if (Z_TYPE_P(isLocal) != IS_NULL) { ZEPHIR_INIT_NVAR(&flag); @@ -1179,7 +1179,7 @@ PHP_METHOD(Phalcon_Assets_Collection, processAddInline) ZEPHIR_INIT_VAR(&_0); ZEPHIR_CONCAT_SV(&_0, "Phalcon\\Assets\\Inline\\", &className); ZEPHIR_CPY_WRT(&name, &_0); - ZEPHIR_CALL_METHOD(&attrs, this_ptr, "processattributes", NULL, 170, &attributes); + ZEPHIR_CALL_METHOD(&attrs, this_ptr, "processattributes", NULL, 171, &attributes); zephir_check_call_status(); ZEPHIR_INIT_VAR(&asset); zephir_fetch_safe_class(&_1, &name); diff --git a/ext/phalcon/assets/manager.zep.c b/ext/phalcon/assets/manager.zep.c index b0d4c6664ce..2c60dd1fbb9 100644 --- a/ext/phalcon/assets/manager.zep.c +++ b/ext/phalcon/assets/manager.zep.c @@ -154,7 +154,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addAssetByType) } else { ZEPHIR_INIT_VAR(&type); } - ZEPHIR_CALL_METHOD(&collection, this_ptr, "checkandcreatecollection", NULL, 171, &type); + ZEPHIR_CALL_METHOD(&collection, this_ptr, "checkandcreatecollection", NULL, 172, &type); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &collection, "add", NULL, 0, asset); zephir_check_call_status(); @@ -251,7 +251,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addCss) } else { ZVAL_BOOL(&_3, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 172, &path, &_1, &_2, &attributes, &version, &_3); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 173, &path, &_1, &_2, &attributes, &version, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); ZVAL_STRING(&_4, "css"); @@ -320,7 +320,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addInlineCodeByType) } else { ZEPHIR_INIT_VAR(&type); } - ZEPHIR_CALL_METHOD(&collection, this_ptr, "checkandcreatecollection", NULL, 171, &type); + ZEPHIR_CALL_METHOD(&collection, this_ptr, "checkandcreatecollection", NULL, 172, &type); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &collection, "addinline", NULL, 0, code); zephir_check_call_status(); @@ -376,7 +376,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addInlineCss) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 173, &content, &_1, &attributes); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 174, &content, &_1, &attributes); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "css"); @@ -434,7 +434,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addInlineJs) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 174, &content, &_1, &attributes); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 175, &content, &_1, &attributes); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "js"); @@ -538,7 +538,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addJs) } else { ZVAL_BOOL(&_3, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 175, &path, &_1, &_2, &attributes, &version, &_3); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 176, &path, &_1, &_2, &attributes, &version, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); ZVAL_STRING(&_4, "js"); @@ -568,7 +568,7 @@ PHP_METHOD(Phalcon_Assets_Manager, collection) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &name_param); zephir_get_strval(&name, name_param); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 171, &name); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 172, &name); zephir_check_call_status(); RETURN_MM(); } @@ -769,7 +769,7 @@ PHP_METHOD(Phalcon_Assets_Manager, getCss) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "css"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 171, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 172, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -792,7 +792,7 @@ PHP_METHOD(Phalcon_Assets_Manager, getJs) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "js"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 171, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 172, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -1027,7 +1027,7 @@ PHP_METHOD(Phalcon_Assets_Manager, output) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_FUNCTION(&_5$$8, "is_dir", NULL, 137, &completeTargetPath); + ZEPHIR_CALL_FUNCTION(&_5$$8, "is_dir", NULL, 138, &completeTargetPath); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_5$$8)) { ZEPHIR_INIT_VAR(&_6$$10); @@ -1116,13 +1116,13 @@ PHP_METHOD(Phalcon_Assets_Manager, output) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_21$$21, &asset, "getrealsourcepath", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 176, collection, &_20$$21, &_21$$21); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 177, collection, &_20$$21, &_21$$21); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_23$$21, &asset, "getattributes", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_24$$21, &asset, "islocal", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 177, &callback, &_23$$21, &prefixedPath, &_24$$21); + ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 178, &callback, &_23$$21, &prefixedPath, &_24$$21); zephir_check_call_status(); zephir_read_property(&_26$$21, this_ptr, ZEND_STRL("implicitOutput"), PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_26$$21)) { @@ -1199,12 +1199,12 @@ PHP_METHOD(Phalcon_Assets_Manager, output) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_31$$36, &asset, "getrealsourcepath", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 176, collection, &_30$$36, &_31$$36); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 177, collection, &_30$$36, &_31$$36); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_32$$36, collection, "getattributes", &_33, 0); zephir_check_call_status(); ZVAL_BOOL(&_34$$36, 1); - ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 177, &callback, &_32$$36, &prefixedPath, &_34$$36); + ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 178, &callback, &_32$$36, &prefixedPath, &_34$$36); zephir_check_call_status(); zephir_read_property(&_34$$36, this_ptr, ZEND_STRL("implicitOutput"), PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_34$$36)) { @@ -1293,13 +1293,13 @@ PHP_METHOD(Phalcon_Assets_Manager, output) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_46$$49, &asset, "getrealsourcepath", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 176, collection, &_45$$49, &_46$$49); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 177, collection, &_45$$49, &_46$$49); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_47$$49, &asset, "getattributes", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_48$$49, &asset, "islocal", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 177, &callback, &_47$$49, &prefixedPath, &_48$$49); + ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 178, &callback, &_47$$49, &prefixedPath, &_48$$49); zephir_check_call_status(); zephir_read_property(&_49$$49, this_ptr, ZEND_STRL("implicitOutput"), PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_49$$49)) { @@ -1376,12 +1376,12 @@ PHP_METHOD(Phalcon_Assets_Manager, output) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_54$$64, &asset, "getrealsourcepath", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 176, collection, &_53$$64, &_54$$64); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 177, collection, &_53$$64, &_54$$64); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_55$$64, collection, "getattributes", &_33, 0); zephir_check_call_status(); ZVAL_BOOL(&_56$$64, 1); - ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 177, &callback, &_55$$64, &prefixedPath, &_56$$64); + ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 178, &callback, &_55$$64, &prefixedPath, &_56$$64); zephir_check_call_status(); zephir_read_property(&_56$$64, this_ptr, ZEND_STRL("implicitOutput"), PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_56$$64)) { @@ -1403,13 +1403,13 @@ PHP_METHOD(Phalcon_Assets_Manager, output) zephir_file_put_contents(NULL, &completeTargetPath, &filteredJoinedContent); ZEPHIR_CALL_METHOD(&_58$$67, collection, "gettargeturi", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 176, collection, &_58$$67, &completeTargetPath); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 177, collection, &_58$$67, &completeTargetPath); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_59$$67, collection, "getattributes", &_33, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_60$$67, collection, "gettargetislocal", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 177, &callback, &_59$$67, &prefixedPath, &_60$$67); + ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 178, &callback, &_59$$67, &prefixedPath, &_60$$67); zephir_check_call_status(); zephir_read_property(&_61$$67, this_ptr, ZEND_STRL("implicitOutput"), PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_61$$67)) { @@ -2069,7 +2069,7 @@ PHP_METHOD(Phalcon_Assets_Manager, cssLink) ZVAL_STRING(&_2, "text/css"); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "href"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processparameters", NULL, 178, parameters, &_0, &_1, &_2, &_3); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processparameters", NULL, 179, parameters, &_0, &_1, &_2, &_3); zephir_check_call_status(); RETURN_MM(); } @@ -2175,7 +2175,7 @@ PHP_METHOD(Phalcon_Assets_Manager, jsLink) ZVAL_STRING(&_2, "application/javascript"); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "src"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processparameters", NULL, 178, parameters, &_0, &_1, &_2, &_3); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processparameters", NULL, 179, parameters, &_0, &_1, &_2, &_3); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/autoload/loader.zep.c b/ext/phalcon/autoload/loader.zep.c index a41d6c037ba..7aafa4347e5 100644 --- a/ext/phalcon/autoload/loader.zep.c +++ b/ext/phalcon/autoload/loader.zep.c @@ -319,7 +319,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, addNamespace) ZEPHIR_INIT_VAR(&_1); ZEPHIR_CONCAT_VV(&_1, &_0, &nsSeparator); ZEPHIR_CPY_WRT(&nsName, &_1); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkdirectories", NULL, 179, directories, &dirSeparator); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkdirectories", NULL, 180, directories, &dirSeparator); zephir_check_call_status(); ZEPHIR_CPY_WRT(directories, &_2); zephir_read_property(&_3, this_ptr, ZEND_STRL("namespaces"), PH_NOISY_CC | PH_READONLY); @@ -344,7 +344,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, addNamespace) } ZEPHIR_INIT_VAR(&_7); zephir_fast_array_merge(&_7, &source, &target); - ZEPHIR_CALL_FUNCTION(&_2, "array_unique", NULL, 180, &_7); + ZEPHIR_CALL_FUNCTION(&_2, "array_unique", NULL, 181, &_7); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("namespaces"), &nsName, &_2); RETURN_THIS(); @@ -389,40 +389,40 @@ PHP_METHOD(Phalcon_Autoload_Loader, autoload) zephir_update_property_zval(this_ptr, ZEND_STRL("debug"), &_0); ZEPHIR_INIT_VAR(&_1); ZEPHIR_CONCAT_SV(&_1, "Loading: ", &className); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 181, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 182, &_1); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "loader:beforeCheckClass"); ZEPHIR_CALL_METHOD(NULL, this_ptr, "firemanagerevent", NULL, 0, &_2, &className); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "autoloadcheckclasses", NULL, 182, &className); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "autoloadcheckclasses", NULL, 183, &className); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_3)) { RETURN_MM_BOOL(1); } ZEPHIR_INIT_VAR(&_4); ZEPHIR_CONCAT_SV(&_4, "Class: 404: ", &className); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 181, &_4); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 182, &_4); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_5, this_ptr, "autoloadchecknamespaces", NULL, 183, &className); + ZEPHIR_CALL_METHOD(&_5, this_ptr, "autoloadchecknamespaces", NULL, 184, &className); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_5)) { RETURN_MM_BOOL(1); } ZEPHIR_INIT_VAR(&_6); ZEPHIR_CONCAT_SV(&_6, "Namespace: 404: ", &className); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 181, &_6); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 182, &_6); zephir_check_call_status(); zephir_read_property(&_8, this_ptr, ZEND_STRL("directories"), PH_NOISY_CC | PH_READONLY); ZVAL_BOOL(&_9, 1); - ZEPHIR_CALL_METHOD(&_7, this_ptr, "autoloadcheckdirectories", NULL, 184, &_8, &className, &_9); + ZEPHIR_CALL_METHOD(&_7, this_ptr, "autoloadcheckdirectories", NULL, 185, &_8, &className, &_9); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_7)) { RETURN_MM_BOOL(1); } ZEPHIR_INIT_VAR(&_10); ZEPHIR_CONCAT_SV(&_10, "Directories: 404: ", &className); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 181, &_10); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 182, &_10); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "loader:afterCheckClass"); @@ -637,7 +637,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, register) ZVAL_STRING(&_2$$3, "autoload"); zephir_array_fast_append(&_1$$3, &_2$$3); ZVAL_BOOL(&_3$$3, (prepend ? 1 : 0)); - ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_register", NULL, 185, &_1$$3, &__$true, &_3$$3); + ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_register", NULL, 186, &_1$$3, &__$true, &_3$$3); zephir_check_call_status(); if (1) { zephir_update_property_zval(this_ptr, ZEND_STRL("isRegistered"), &__$true); @@ -773,7 +773,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, setDirectories) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addtocollection", NULL, 186, &directories, &_0, &_1, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addtocollection", NULL, 187, &directories, &_0, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -960,7 +960,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, setFiles) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addtocollection", NULL, 186, &files, &_0, &_1, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addtocollection", NULL, 187, &files, &_0, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -1025,7 +1025,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, setNamespaces) } ZEPHIR_INIT_NVAR(&directories); ZVAL_COPY(&directories, _1); - ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "checkdirectories", &_6, 179, &directories, &dirSeparator); + ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "checkdirectories", &_6, 180, &directories, &dirSeparator); zephir_check_call_status(); ZEPHIR_CPY_WRT(&directories, &_5$$4); ZEPHIR_CALL_METHOD(NULL, this_ptr, "addnamespace", &_7, 0, &name, &directories); @@ -1044,7 +1044,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, setNamespaces) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&directories, &namespaces, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_8$$5, this_ptr, "checkdirectories", &_6, 179, &directories, &dirSeparator); + ZEPHIR_CALL_METHOD(&_8$$5, this_ptr, "checkdirectories", &_6, 180, &directories, &dirSeparator); zephir_check_call_status(); ZEPHIR_CPY_WRT(&directories, &_8$$5); ZEPHIR_CALL_METHOD(NULL, this_ptr, "addnamespace", &_7, 0, &name, &directories); @@ -1087,7 +1087,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, unregister) ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "autoload"); zephir_array_fast_append(&_1$$3, &_2$$3); - ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_unregister", NULL, 187, &_1$$3); + ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_unregister", NULL, 188, &_1$$3); zephir_check_call_status(); if (0) { zephir_update_property_zval(this_ptr, ZEND_STRL("isRegistered"), &__$true); @@ -1138,7 +1138,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, requireFile) zephir_fetch_params(1, 1, 0, &file_param); zephir_get_strval(&file, file_param); zephir_read_property(&_0, this_ptr, ZEND_STRL("fileCheckingCallback"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_1, "call_user_func", NULL, 188, &_0, &file); + ZEPHIR_CALL_FUNCTION(&_1, "call_user_func", NULL, 189, &_0, &file); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&_1)) { ZEPHIR_INIT_VAR(&_2$$3); @@ -1147,7 +1147,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, requireFile) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_3$$3); ZEPHIR_CONCAT_SV(&_3$$3, "Require: ", &file); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 181, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 182, &_3$$3); zephir_check_call_status(); if (zephir_require_once_zval(&file) == FAILURE) { RETURN_MM_NULL(); @@ -1156,7 +1156,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, requireFile) } ZEPHIR_INIT_VAR(&_4); ZEPHIR_CONCAT_SV(&_4, "Require: 404: ", &file); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 181, &_4); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 182, &_4); zephir_check_call_status(); RETURN_MM_BOOL(0); } @@ -1310,7 +1310,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckClasses) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_3$$3); ZEPHIR_CONCAT_SV(&_3$$3, "Class: load: ", &filePath); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 181, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 182, &_3$$3); zephir_check_call_status(); RETURN_MM_BOOL(1); } @@ -1418,7 +1418,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckDirectories) if (isDirectory) { ZEPHIR_INIT_NVAR(&_11$$6); ZEPHIR_CONCAT_SV(&_11$$6, "Directories: ", &filePath); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 181, &_11$$6); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 182, &_11$$6); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -1448,7 +1448,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckDirectories) if (isDirectory) { ZEPHIR_INIT_NVAR(&_15$$9); ZEPHIR_CONCAT_SV(&_15$$9, "Directories: ", &filePath); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 181, &_15$$9); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 182, &_15$$9); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -1493,7 +1493,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckDirectories) if (isDirectory) { ZEPHIR_INIT_NVAR(&_21$$13); ZEPHIR_CONCAT_SV(&_21$$13, "Directories: ", &filePath); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 181, &_21$$13); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 182, &_21$$13); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -1523,7 +1523,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckDirectories) if (isDirectory) { ZEPHIR_INIT_NVAR(&_24$$16); ZEPHIR_CONCAT_SV(&_24$$16, "Directories: ", &filePath); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 181, &_24$$16); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 182, &_24$$16); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -1614,13 +1614,13 @@ PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckNamespaces) ZVAL_LONG(&_7$$3, zephir_fast_strlen_ev(&prefix)); ZEPHIR_INIT_NVAR(&fileName); zephir_substr(&fileName, &className, zephir_get_intval(&_7$$3), 0, ZEPHIR_SUBSTR_NO_LENGTH); - ZEPHIR_CALL_METHOD(&_8$$3, this_ptr, "autoloadcheckdirectories", &_9, 184, &directories, &fileName); + ZEPHIR_CALL_METHOD(&_8$$3, this_ptr, "autoloadcheckdirectories", &_9, 185, &directories, &fileName); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_8$$3)) { zephir_read_property(&_10$$5, this_ptr, ZEND_STRL("checkedPath"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_11$$5); ZEPHIR_CONCAT_SVSV(&_11$$5, "Namespace: ", &prefix, " - ", &_10$$5); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 181, &_11$$5); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 182, &_11$$5); zephir_check_call_status(); RETURN_MM_BOOL(1); } @@ -1649,13 +1649,13 @@ PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckNamespaces) ZVAL_LONG(&_15$$6, zephir_fast_strlen_ev(&prefix)); ZEPHIR_INIT_NVAR(&fileName); zephir_substr(&fileName, &className, zephir_get_intval(&_15$$6), 0, ZEPHIR_SUBSTR_NO_LENGTH); - ZEPHIR_CALL_METHOD(&_16$$6, this_ptr, "autoloadcheckdirectories", &_9, 184, &directories, &fileName); + ZEPHIR_CALL_METHOD(&_16$$6, this_ptr, "autoloadcheckdirectories", &_9, 185, &directories, &fileName); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_16$$6)) { zephir_read_property(&_17$$8, this_ptr, ZEND_STRL("checkedPath"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_18$$8); ZEPHIR_CONCAT_SVSV(&_18$$8, "Namespace: ", &prefix, " - ", &_17$$8); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 181, &_18$$8); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 182, &_18$$8); zephir_check_call_status(); RETURN_MM_BOOL(1); } diff --git a/ext/phalcon/cache/cachefactory.zep.c b/ext/phalcon/cache/cachefactory.zep.c index dd0a1581986..d3bfb79480b 100644 --- a/ext/phalcon/cache/cachefactory.zep.c +++ b/ext/phalcon/cache/cachefactory.zep.c @@ -196,7 +196,7 @@ PHP_METHOD(Phalcon_Cache_CacheFactory, newInstance) ZEPHIR_CALL_METHOD(&adapter, &_0, "newinstance", NULL, 0, &name, &options); zephir_check_call_status(); object_init_ex(return_value, phalcon_cache_cache_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 189, &adapter); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 190, &adapter); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/cli/console.zep.c b/ext/phalcon/cli/console.zep.c index e22dc87e1aa..6a38f4cb50c 100644 --- a/ext/phalcon/cli/console.zep.c +++ b/ext/phalcon/cli/console.zep.c @@ -415,7 +415,7 @@ PHP_METHOD(Phalcon_Cli_Console, setArgument) ZEPHIR_INIT_NVAR(&_3$$5); ZVAL_STRING(&_3$$5, "--"); ZVAL_LONG(&_4$$5, 2); - ZEPHIR_CALL_FUNCTION(&_5$$5, "strncmp", &_6, 190, &arg, &_3$$5, &_4$$5); + ZEPHIR_CALL_FUNCTION(&_5$$5, "strncmp", &_6, 191, &arg, &_3$$5, &_4$$5); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_5$$5, 0)) { ZEPHIR_INIT_NVAR(&_7$$6); @@ -447,7 +447,7 @@ PHP_METHOD(Phalcon_Cli_Console, setArgument) ZEPHIR_INIT_NVAR(&_18$$9); ZVAL_STRING(&_18$$9, "-"); ZVAL_LONG(&_19$$9, 1); - ZEPHIR_CALL_FUNCTION(&_20$$9, "strncmp", &_6, 190, &arg, &_18$$9, &_19$$9); + ZEPHIR_CALL_FUNCTION(&_20$$9, "strncmp", &_6, 191, &arg, &_18$$9, &_19$$9); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_20$$9, 0)) { ZVAL_LONG(&_21$$10, 1); @@ -477,7 +477,7 @@ PHP_METHOD(Phalcon_Cli_Console, setArgument) ZEPHIR_INIT_NVAR(&_23$$14); ZVAL_STRING(&_23$$14, "--"); ZVAL_LONG(&_24$$14, 2); - ZEPHIR_CALL_FUNCTION(&_25$$14, "strncmp", &_6, 190, &arg, &_23$$14, &_24$$14); + ZEPHIR_CALL_FUNCTION(&_25$$14, "strncmp", &_6, 191, &arg, &_23$$14, &_24$$14); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_25$$14, 0)) { ZEPHIR_INIT_NVAR(&_26$$15); @@ -509,7 +509,7 @@ PHP_METHOD(Phalcon_Cli_Console, setArgument) ZEPHIR_INIT_NVAR(&_37$$18); ZVAL_STRING(&_37$$18, "-"); ZVAL_LONG(&_38$$18, 1); - ZEPHIR_CALL_FUNCTION(&_39$$18, "strncmp", &_6, 190, &arg, &_37$$18, &_38$$18); + ZEPHIR_CALL_FUNCTION(&_39$$18, "strncmp", &_6, 191, &arg, &_37$$18, &_38$$18); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_39$$18, 0)) { ZVAL_LONG(&_40$$19, 1); diff --git a/ext/phalcon/cli/router.zep.c b/ext/phalcon/cli/router.zep.c index a404e74ae22..a690b52efce 100644 --- a/ext/phalcon/cli/router.zep.c +++ b/ext/phalcon/cli/router.zep.c @@ -146,7 +146,7 @@ PHP_METHOD(Phalcon_Cli_Router, __construct) add_assoc_long_ex(&_1$$3, SL("task"), 1); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "#^(?::delimiter)?([a-zA-Z0-9\\_\\-]+)[:delimiter]{0,1}$#"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 191, &_2$$3, &_1$$3); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 192, &_2$$3, &_1$$3); zephir_check_call_status(); zephir_array_append(&routes, &_0$$3, PH_SEPARATE, "phalcon/Cli/Router.zep", 119); ZEPHIR_INIT_NVAR(&_2$$3); @@ -158,7 +158,7 @@ PHP_METHOD(Phalcon_Cli_Router, __construct) add_assoc_long_ex(&_3$$3, SL("params"), 3); ZEPHIR_INIT_VAR(&_4$$3); ZVAL_STRING(&_4$$3, "#^(?::delimiter)?([a-zA-Z0-9\\_\\-]+):delimiter([a-zA-Z0-9\\.\\_]+)(:delimiter.*)*$#"); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 191, &_4$$3, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 192, &_4$$3, &_3$$3); zephir_check_call_status(); zephir_array_append(&routes, &_2$$3, PH_SEPARATE, "phalcon/Cli/Router.zep", 128); } @@ -211,7 +211,7 @@ PHP_METHOD(Phalcon_Cli_Router, add) } ZEPHIR_INIT_VAR(&route); object_init_ex(&route, phalcon_cli_router_route_ce); - ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 191, &pattern, paths); + ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 192, &pattern, paths); zephir_check_call_status(); zephir_update_property_array_append(this_ptr, SL("routes"), &route); RETURN_CCTOR(&route); diff --git a/ext/phalcon/config/adapter/grouped.zep.c b/ext/phalcon/config/adapter/grouped.zep.c index c6f010b2f6b..94cca7702e6 100644 --- a/ext/phalcon/config/adapter/grouped.zep.c +++ b/ext/phalcon/config/adapter/grouped.zep.c @@ -179,9 +179,9 @@ PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) if (ZEPHIR_IS_IDENTICAL(&_5$$5, &defaultAdapter)) { ZEPHIR_INIT_NVAR(&_6$$6); object_init_ex(&_6$$6, phalcon_config_configfactory_ce); - ZEPHIR_CALL_METHOD(NULL, &_6$$6, "__construct", &_7, 192); + ZEPHIR_CALL_METHOD(NULL, &_6$$6, "__construct", &_7, 193); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_8$$6, &_6$$6, "load", &_9, 193, &configName); + ZEPHIR_CALL_METHOD(&_8$$6, &_6$$6, "load", &_9, 194, &configName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "merge", &_4, 0, &_8$$6); zephir_check_call_status(); @@ -220,9 +220,9 @@ PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) } else { ZEPHIR_INIT_NVAR(&_18$$10); object_init_ex(&_18$$10, phalcon_config_configfactory_ce); - ZEPHIR_CALL_METHOD(NULL, &_18$$10, "__construct", &_7, 192); + ZEPHIR_CALL_METHOD(NULL, &_18$$10, "__construct", &_7, 193); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_19$$10, &_18$$10, "load", &_9, 193, &configInstance); + ZEPHIR_CALL_METHOD(&_19$$10, &_18$$10, "load", &_9, 194, &configInstance); zephir_check_call_status(); ZEPHIR_CPY_WRT(&configInstance, &_19$$10); } @@ -255,9 +255,9 @@ PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) if (ZEPHIR_IS_IDENTICAL(&_21$$13, &defaultAdapter)) { ZEPHIR_INIT_NVAR(&_22$$14); object_init_ex(&_22$$14, phalcon_config_configfactory_ce); - ZEPHIR_CALL_METHOD(NULL, &_22$$14, "__construct", &_7, 192); + ZEPHIR_CALL_METHOD(NULL, &_22$$14, "__construct", &_7, 193); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_23$$14, &_22$$14, "load", &_9, 193, &configName); + ZEPHIR_CALL_METHOD(&_23$$14, &_22$$14, "load", &_9, 194, &configName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "merge", &_4, 0, &_23$$14); zephir_check_call_status(); @@ -296,9 +296,9 @@ PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) } else { ZEPHIR_INIT_NVAR(&_30$$18); object_init_ex(&_30$$18, phalcon_config_configfactory_ce); - ZEPHIR_CALL_METHOD(NULL, &_30$$18, "__construct", &_7, 192); + ZEPHIR_CALL_METHOD(NULL, &_30$$18, "__construct", &_7, 193); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_31$$18, &_30$$18, "load", &_9, 193, &configInstance); + ZEPHIR_CALL_METHOD(&_31$$18, &_30$$18, "load", &_9, 194, &configInstance); zephir_check_call_status(); ZEPHIR_CPY_WRT(&configInstance, &_31$$18); } diff --git a/ext/phalcon/config/adapter/ini.zep.c b/ext/phalcon/config/adapter/ini.zep.c index 5745df1d426..a5d6a3cf82a 100644 --- a/ext/phalcon/config/adapter/ini.zep.c +++ b/ext/phalcon/config/adapter/ini.zep.c @@ -517,7 +517,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Ini, parseIniString) ZEPHIR_INIT_VAR(&_3); zephir_substr(&_3, &path, zephir_get_intval(&_2), 0, ZEPHIR_SUBSTR_NO_LENGTH); zephir_get_strval(&path, &_3); - ZEPHIR_CALL_METHOD(&result, this_ptr, "parseinistring", NULL, 194, &path, &castValue); + ZEPHIR_CALL_METHOD(&result, this_ptr, "parseinistring", NULL, 195, &path, &castValue); zephir_check_call_status(); zephir_create_array(return_value, 1, 0); zephir_array_update_zval(return_value, &key, &result, PH_COPY); @@ -558,7 +558,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Ini, phpParseIniFile) } ZVAL_BOOL(&_0, (processSections ? 1 : 0)); ZVAL_LONG(&_1, scannerMode); - ZEPHIR_RETURN_CALL_FUNCTION("parse_ini_file", NULL, 195, &filename, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("parse_ini_file", NULL, 196, &filename, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/config/adapter/json.zep.c b/ext/phalcon/config/adapter/json.zep.c index 51f1ddf3c29..4552017563e 100644 --- a/ext/phalcon/config/adapter/json.zep.c +++ b/ext/phalcon/config/adapter/json.zep.c @@ -96,7 +96,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Json, __construct) ZEPHIR_INIT_VAR(&_2); zephir_file_get_contents(&_2, &filePath); ZVAL_BOOL(&_3, 1); - ZEPHIR_CALL_METHOD(&_1, &_0, "__invoke", NULL, 196, &_2, &_3); + ZEPHIR_CALL_METHOD(&_1, &_0, "__invoke", NULL, 197, &_2, &_3); zephir_check_call_status(); ZEPHIR_CALL_PARENT(NULL, phalcon_config_adapter_json_ce, getThis(), "__construct", NULL, 0, &_1); zephir_check_call_status(); diff --git a/ext/phalcon/config/adapter/yaml.zep.c b/ext/phalcon/config/adapter/yaml.zep.c index 4931e37d2be..481ae0198b8 100644 --- a/ext/phalcon/config/adapter/yaml.zep.c +++ b/ext/phalcon/config/adapter/yaml.zep.c @@ -82,7 +82,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Yaml, __construct) zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS, ndocs; zval callbacks; - zval *filePath_param = NULL, *callbacks_param = NULL, yamlConfig, _0, _1, _2$$5, _3$$5, _4$$6, _5$$6, _6$$6; + zval *filePath_param = NULL, *callbacks_param = NULL, yamlConfig, _0, _1, _2$$5, _3$$5, _4$$7, _5$$7, _6$$7; zval filePath; zval *this_ptr = getThis(); @@ -92,9 +92,9 @@ PHP_METHOD(Phalcon_Config_Adapter_Yaml, __construct) ZVAL_UNDEF(&_1); ZVAL_UNDEF(&_2$$5); ZVAL_UNDEF(&_3$$5); - ZVAL_UNDEF(&_4$$6); - ZVAL_UNDEF(&_5$$6); - ZVAL_UNDEF(&_6$$6); + ZVAL_UNDEF(&_4$$7); + ZVAL_UNDEF(&_5$$7); + ZVAL_UNDEF(&_6$$7); ZVAL_UNDEF(&callbacks); bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) @@ -137,16 +137,20 @@ PHP_METHOD(Phalcon_Config_Adapter_Yaml, __construct) ZEPHIR_CALL_METHOD(&yamlConfig, this_ptr, "phpyamlparsefile", NULL, 0, &filePath, &_2$$5, &_3$$5, &callbacks); zephir_check_call_status(); } + if (UNEXPECTED(Z_TYPE_P(&yamlConfig) == IS_NULL)) { + ZEPHIR_INIT_NVAR(&yamlConfig); + array_init(&yamlConfig); + } if (UNEXPECTED(ZEPHIR_IS_FALSE_IDENTICAL(&yamlConfig))) { - ZEPHIR_INIT_VAR(&_4$$6); - object_init_ex(&_4$$6, phalcon_config_exception_ce); - ZEPHIR_INIT_VAR(&_5$$6); - zephir_basename(&_5$$6, &filePath); - ZEPHIR_INIT_VAR(&_6$$6); - ZEPHIR_CONCAT_SVS(&_6$$6, "Configuration file ", &_5$$6, " can't be loaded"); - ZEPHIR_CALL_METHOD(NULL, &_4$$6, "__construct", NULL, 33, &_6$$6); + ZEPHIR_INIT_VAR(&_4$$7); + object_init_ex(&_4$$7, phalcon_config_exception_ce); + ZEPHIR_INIT_VAR(&_5$$7); + zephir_basename(&_5$$7, &filePath); + ZEPHIR_INIT_VAR(&_6$$7); + ZEPHIR_CONCAT_SVS(&_6$$7, "Configuration file ", &_5$$7, " can't be loaded"); + ZEPHIR_CALL_METHOD(NULL, &_4$$7, "__construct", NULL, 33, &_6$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_4$$6, "phalcon/Config/Adapter/Yaml.zep", 76); + zephir_throw_exception_debug(&_4$$7, "phalcon/Config/Adapter/Yaml.zep", 80); ZEPHIR_MM_RESTORE(); return; } @@ -195,7 +199,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Yaml, phpYamlParseFile) array_init(callbacks); } ZEPHIR_MAKE_REF(ndocs); - ZEPHIR_RETURN_CALL_FUNCTION("yaml_parse_file", NULL, 197, filename, pos, ndocs, callbacks); + ZEPHIR_RETURN_CALL_FUNCTION("yaml_parse_file", NULL, 198, filename, pos, ndocs, callbacks); ZEPHIR_UNREF(ndocs); zephir_check_call_status(); RETURN_MM(); @@ -216,7 +220,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Yaml, phpExtensionLoaded) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &name_param); zephir_get_strval(&name, name_param); - ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 198, &name); + ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 199, &name); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/config/configfactory.zep.c b/ext/phalcon/config/configfactory.zep.c index f0cad1a14df..8e427c9e4ee 100644 --- a/ext/phalcon/config/configfactory.zep.c +++ b/ext/phalcon/config/configfactory.zep.c @@ -306,7 +306,7 @@ PHP_METHOD(Phalcon_Config_ConfigFactory, parseConfig) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_config_exception_ce, "Config must be array or Phalcon\\Config\\Config object", "phalcon/Config/ConfigFactory.zep", 177); return; } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkconfigarray", NULL, 199, config); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkconfigarray", NULL, 200, config); zephir_check_call_status(); RETVAL_ZVAL(config, 1, 0); RETURN_MM(); diff --git a/ext/phalcon/datamapper/pdo/connection.zep.c b/ext/phalcon/datamapper/pdo/connection.zep.c index 648b9739094..5d23831a670 100644 --- a/ext/phalcon/datamapper/pdo/connection.zep.c +++ b/ext/phalcon/datamapper/pdo/connection.zep.c @@ -149,7 +149,7 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_Connection, __construct) zephir_array_fetch_long(&_2$$3, &parts, 0, PH_NOISY | PH_READONLY, "phalcon/DataMapper/Pdo/Connection.zep", 67); ZEPHIR_INIT_VAR(&_3$$3); ZEPHIR_CONCAT_SVS(&_3$$3, "Driver not supported [", &_2$$3, "]"); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 200, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 201, &_3$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/DataMapper/Pdo/Connection.zep", 68); ZEPHIR_MM_RESTORE(); @@ -171,7 +171,7 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_Connection, __construct) if (Z_TYPE_P(profiler) == IS_NULL) { ZEPHIR_INIT_NVAR(profiler); object_init_ex(profiler, phalcon_datamapper_pdo_profiler_profiler_ce); - ZEPHIR_CALL_METHOD(NULL, profiler, "__construct", NULL, 201); + ZEPHIR_CALL_METHOD(NULL, profiler, "__construct", NULL, 202); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(NULL, this_ptr, "setprofiler", NULL, 0, profiler); diff --git a/ext/phalcon/datamapper/pdo/connection/decorated.zep.c b/ext/phalcon/datamapper/pdo/connection/decorated.zep.c index da912d71ac4..b57825b1a10 100644 --- a/ext/phalcon/datamapper/pdo/connection/decorated.zep.c +++ b/ext/phalcon/datamapper/pdo/connection/decorated.zep.c @@ -83,7 +83,7 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_Connection_Decorated, __construct) if (Z_TYPE_P(profiler) == IS_NULL) { ZEPHIR_INIT_NVAR(profiler); object_init_ex(profiler, phalcon_datamapper_pdo_profiler_profiler_ce); - ZEPHIR_CALL_METHOD(NULL, profiler, "__construct", NULL, 201); + ZEPHIR_CALL_METHOD(NULL, profiler, "__construct", NULL, 202); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(NULL, this_ptr, "setprofiler", NULL, 0, profiler); diff --git a/ext/phalcon/datamapper/pdo/connectionlocator.zep.c b/ext/phalcon/datamapper/pdo/connectionlocator.zep.c index 11a821fcd26..efa2a618a95 100644 --- a/ext/phalcon/datamapper/pdo/connectionlocator.zep.c +++ b/ext/phalcon/datamapper/pdo/connectionlocator.zep.c @@ -422,7 +422,7 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_ConnectionLocator, getConnection) ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, ""); if (ZEPHIR_IS_IDENTICAL(&_1, &requested)) { - ZEPHIR_CALL_FUNCTION(&requested, "array_rand", NULL, 202, &collection); + ZEPHIR_CALL_FUNCTION(&requested, "array_rand", NULL, 203, &collection); zephir_check_call_status(); } if (!(zephir_array_isset(&collection, &requested))) { diff --git a/ext/phalcon/datamapper/pdo/profiler/profiler.zep.c b/ext/phalcon/datamapper/pdo/profiler/profiler.zep.c index 40df62b7431..d7d7d90e34d 100644 --- a/ext/phalcon/datamapper/pdo/profiler/profiler.zep.c +++ b/ext/phalcon/datamapper/pdo/profiler/profiler.zep.c @@ -189,9 +189,9 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_Profiler, finish) object_init_ex(&ex, phalcon_datamapper_pdo_exception_exception_ce); ZEPHIR_CALL_METHOD(NULL, &ex, "__construct", NULL, 33); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&finish, "hrtime", NULL, 203, &__$true); + ZEPHIR_CALL_FUNCTION(&finish, "hrtime", NULL, 204, &__$true); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1$$3, &ex, "gettraceasstring", NULL, 204); + ZEPHIR_CALL_METHOD(&_1$$3, &ex, "gettraceasstring", NULL, 205); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "backtrace"); @@ -388,7 +388,7 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_Profiler, start) ZEPHIR_INIT_VAR(&_1$$3); zephir_create_array(&_1$$3, 2, 0); zephir_array_update_string(&_1$$3, SL("method"), &method, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_FUNCTION(&_2$$3, "hrtime", NULL, 203, &__$true); + ZEPHIR_CALL_FUNCTION(&_2$$3, "hrtime", NULL, 204, &__$true); zephir_check_call_status(); zephir_array_update_string(&_1$$3, SL("start"), &_2$$3, PH_COPY | PH_SEPARATE); zephir_update_property_zval(this_ptr, ZEND_STRL("context"), &_1$$3); diff --git a/ext/phalcon/datamapper/query/insert.zep.c b/ext/phalcon/datamapper/query/insert.zep.c index b853ca791d2..b268985de80 100644 --- a/ext/phalcon/datamapper/query/insert.zep.c +++ b/ext/phalcon/datamapper/query/insert.zep.c @@ -302,7 +302,7 @@ PHP_METHOD(Phalcon_DataMapper_Query_Insert, getStatement) zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("store"), PH_NOISY_CC | PH_READONLY); zephir_array_fetch_string(&_2, &_1, SL("FROM"), PH_NOISY | PH_READONLY, "phalcon/DataMapper/Query/Insert.zep", 113); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "buildcolumns", NULL, 205); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "buildcolumns", NULL, 206); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_4, this_ptr, "buildreturning", NULL, 0); zephir_check_call_status(); diff --git a/ext/phalcon/datamapper/query/queryfactory.zep.c b/ext/phalcon/datamapper/query/queryfactory.zep.c index 99e6be5a988..3a38160097a 100644 --- a/ext/phalcon/datamapper/query/queryfactory.zep.c +++ b/ext/phalcon/datamapper/query/queryfactory.zep.c @@ -125,7 +125,7 @@ PHP_METHOD(Phalcon_DataMapper_Query_QueryFactory, newDelete) object_init_ex(return_value, phalcon_datamapper_query_delete_ce); ZEPHIR_CALL_METHOD(&_0, this_ptr, "newbind", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 206, connection, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 207, connection, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -155,7 +155,7 @@ PHP_METHOD(Phalcon_DataMapper_Query_QueryFactory, newInsert) object_init_ex(return_value, phalcon_datamapper_query_insert_ce); ZEPHIR_CALL_METHOD(&_0, this_ptr, "newbind", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 207, connection, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 208, connection, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -230,7 +230,7 @@ PHP_METHOD(Phalcon_DataMapper_Query_QueryFactory, newUpdate) object_init_ex(return_value, phalcon_datamapper_query_update_ce); ZEPHIR_CALL_METHOD(&_0, this_ptr, "newbind", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 208, connection, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 209, connection, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/datamapper/query/select.zep.c b/ext/phalcon/datamapper/query/select.zep.c index 1c5c92101b5..20d71cc39b8 100644 --- a/ext/phalcon/datamapper/query/select.zep.c +++ b/ext/phalcon/datamapper/query/select.zep.c @@ -894,7 +894,7 @@ PHP_METHOD(Phalcon_DataMapper_Query_Select, subSelect) object_init_ex(return_value, phalcon_datamapper_query_select_ce); zephir_read_property(&_0, this_ptr, ZEND_STRL("connection"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_1, this_ptr, ZEND_STRL("bind"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 209, &_0, &_1); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 210, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -1009,9 +1009,9 @@ PHP_METHOD(Phalcon_DataMapper_Query_Select, getCurrentStatement) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_2, this_ptr, "buildlimitearly", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "buildcolumns", NULL, 210); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "buildcolumns", NULL, 211); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "buildfrom", NULL, 211); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "buildfrom", NULL, 212); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_6); ZVAL_STRING(&_6, "WHERE"); diff --git a/ext/phalcon/datamapper/query/update.zep.c b/ext/phalcon/datamapper/query/update.zep.c index d130f467f09..41655cc797d 100644 --- a/ext/phalcon/datamapper/query/update.zep.c +++ b/ext/phalcon/datamapper/query/update.zep.c @@ -267,7 +267,7 @@ PHP_METHOD(Phalcon_DataMapper_Query_Update, getStatement) zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("store"), PH_NOISY_CC | PH_READONLY); zephir_array_fetch_string(&_2, &_1, SL("FROM"), PH_NOISY | PH_READONLY, "phalcon/DataMapper/Query/Update.zep", 101); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "buildcolumns", NULL, 212); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "buildcolumns", NULL, 213); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5); ZVAL_STRING(&_5, "WHERE"); diff --git a/ext/phalcon/db/adapter/pdo/mysql.zep.c b/ext/phalcon/db/adapter/pdo/mysql.zep.c index 5cc964bdcf0..21cdc19742a 100644 --- a/ext/phalcon/db/adapter/pdo/mysql.zep.c +++ b/ext/phalcon/db/adapter/pdo/mysql.zep.c @@ -601,7 +601,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) zephir_array_fetch_long(&columnName, &field, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 463); ZEPHIR_INIT_NVAR(&_63$$3); object_init_ex(&_63$$3, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_63$$3, "__construct", &_64, 213, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_63$$3, "__construct", &_64, 214, &columnName, &definition); zephir_check_call_status(); zephir_array_append(&columns, &_63$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Mysql.zep", 464); ZEPHIR_CPY_WRT(&oldColumn, &columnName); @@ -903,7 +903,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) zephir_array_fetch_long(&columnName, &field, 0, PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 463); ZEPHIR_INIT_NVAR(&_124$$49); object_init_ex(&_124$$49, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_124$$49, "__construct", &_64, 213, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_124$$49, "__construct", &_64, 214, &columnName, &definition); zephir_check_call_status(); zephir_array_append(&columns, &_124$$49, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Mysql.zep", 464); ZEPHIR_CPY_WRT(&oldColumn, &columnName); diff --git a/ext/phalcon/db/adapter/pdo/postgresql.zep.c b/ext/phalcon/db/adapter/pdo/postgresql.zep.c index c2130b76a2a..e4623248bd2 100644 --- a/ext/phalcon/db/adapter/pdo/postgresql.zep.c +++ b/ext/phalcon/db/adapter/pdo/postgresql.zep.c @@ -762,7 +762,7 @@ 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", 524); ZEPHIR_INIT_NVAR(&_61$$3); object_init_ex(&_61$$3, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_61$$3, "__construct", &_62, 213, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_61$$3, "__construct", &_62, 214, &columnName, &definition); zephir_check_call_status(); zephir_array_append(&columns, &_61$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Postgresql.zep", 525); ZEPHIR_CPY_WRT(&oldColumn, &columnName); @@ -1061,7 +1061,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Postgresql, describeColumns) zephir_array_fetch_long(&columnName, &field, 0, PH_NOISY, "phalcon/Db/Adapter/Pdo/Postgresql.zep", 524); ZEPHIR_INIT_NVAR(&_118$$41); object_init_ex(&_118$$41, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_118$$41, "__construct", &_62, 213, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_118$$41, "__construct", &_62, 214, &columnName, &definition); zephir_check_call_status(); zephir_array_append(&columns, &_118$$41, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Postgresql.zep", 525); ZEPHIR_CPY_WRT(&oldColumn, &columnName); diff --git a/ext/phalcon/db/adapter/pdo/sqlite.zep.c b/ext/phalcon/db/adapter/pdo/sqlite.zep.c index b0dc58a574f..df24b87775c 100644 --- a/ext/phalcon/db/adapter/pdo/sqlite.zep.c +++ b/ext/phalcon/db/adapter/pdo/sqlite.zep.c @@ -433,7 +433,7 @@ 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", 306); ZEPHIR_INIT_NVAR(&_33$$3); object_init_ex(&_33$$3, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_33$$3, "__construct", &_41, 213, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_33$$3, "__construct", &_41, 214, &columnName, &definition); zephir_check_call_status(); zephir_array_append(&columns, &_33$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 307); ZEPHIR_CPY_WRT(&oldColumn, &columnName); @@ -598,7 +598,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) zephir_array_fetch_long(&columnName, &field, 1, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 306); ZEPHIR_INIT_NVAR(&_71$$28); object_init_ex(&_71$$28, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_71$$28, "__construct", &_41, 213, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_71$$28, "__construct", &_41, 214, &columnName, &definition); zephir_check_call_status(); zephir_array_append(&columns, &_71$$28, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 307); ZEPHIR_CPY_WRT(&oldColumn, &columnName); diff --git a/ext/phalcon/db/adapter/pdofactory.zep.c b/ext/phalcon/db/adapter/pdofactory.zep.c index d682e8e4448..648556b6eb7 100644 --- a/ext/phalcon/db/adapter/pdofactory.zep.c +++ b/ext/phalcon/db/adapter/pdofactory.zep.c @@ -127,7 +127,7 @@ PHP_METHOD(Phalcon_Db_Adapter_PdoFactory, load) array_init(&_2); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "options"); - ZEPHIR_CALL_METHOD(&options, &_1, "__invoke", NULL, 159, config, &_3, &_2); + ZEPHIR_CALL_METHOD(&options, &_1, "__invoke", NULL, 160, config, &_3, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "newinstance", NULL, 0, &name, &options); zephir_check_call_status(); diff --git a/ext/phalcon/db/dialect/mysql.zep.c b/ext/phalcon/db/dialect/mysql.zep.c index 054c96f251c..661af8b5e25 100644 --- a/ext/phalcon/db/dialect/mysql.zep.c +++ b/ext/phalcon/db/dialect/mysql.zep.c @@ -137,7 +137,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, addColumn) } _8$$5 = _7$$5; if (!(_8$$5)) { - ZEPHIR_CALL_FUNCTION(&_9$$5, "is_float", NULL, 214, &defaultValue); + ZEPHIR_CALL_FUNCTION(&_9$$5, "is_float", NULL, 215, &defaultValue); zephir_check_call_status(); _8$$5 = zephir_is_true(&_9$$5); } @@ -148,7 +148,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, addColumn) } else { ZEPHIR_INIT_VAR(&_11$$7); ZVAL_STRING(&_11$$7, "\""); - ZEPHIR_CALL_FUNCTION(&_12$$7, "addcslashes", NULL, 215, &defaultValue, &_11$$7); + ZEPHIR_CALL_FUNCTION(&_12$$7, "addcslashes", NULL, 216, &defaultValue, &_11$$7); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_13$$7); ZEPHIR_CONCAT_SVS(&_13$$7, " DEFAULT \"", &_12$$7, "\""); @@ -612,7 +612,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) } _11$$10 = _10$$10; if (!(_11$$10)) { - ZEPHIR_CALL_FUNCTION(&_12$$10, "is_float", &_13, 214, &defaultValue); + ZEPHIR_CALL_FUNCTION(&_12$$10, "is_float", &_13, 215, &defaultValue); zephir_check_call_status(); _11$$10 = zephir_is_true(&_12$$10); } @@ -623,7 +623,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) } else { ZEPHIR_INIT_NVAR(&_15$$12); ZVAL_STRING(&_15$$12, "\""); - ZEPHIR_CALL_FUNCTION(&_16$$12, "addcslashes", &_17, 215, &defaultValue, &_15$$12); + ZEPHIR_CALL_FUNCTION(&_16$$12, "addcslashes", &_17, 216, &defaultValue, &_15$$12); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_18$$12); ZEPHIR_CONCAT_SVS(&_18$$12, " DEFAULT \"", &_16$$12, "\""); @@ -692,7 +692,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) } _30$$19 = _29$$19; if (!(_30$$19)) { - ZEPHIR_CALL_FUNCTION(&_31$$19, "is_float", &_13, 214, &defaultValue); + ZEPHIR_CALL_FUNCTION(&_31$$19, "is_float", &_13, 215, &defaultValue); zephir_check_call_status(); _30$$19 = zephir_is_true(&_31$$19); } @@ -703,7 +703,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) } else { ZEPHIR_INIT_NVAR(&_33$$21); ZVAL_STRING(&_33$$21, "\""); - ZEPHIR_CALL_FUNCTION(&_34$$21, "addcslashes", &_17, 215, &defaultValue, &_33$$21); + ZEPHIR_CALL_FUNCTION(&_34$$21, "addcslashes", &_17, 216, &defaultValue, &_33$$21); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_35$$21); ZEPHIR_CONCAT_SVS(&_35$$21, " DEFAULT \"", &_34$$21, "\""); @@ -1544,7 +1544,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) } ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "getcolumnsize", NULL, 0, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "checkcolumnunsigned", NULL, 216, column); + ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "checkcolumnunsigned", NULL, 217, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2$$3); ZEPHIR_CONCAT_VV(&_2$$3, &_0$$3, &_1$$3); @@ -1606,7 +1606,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) } ZEPHIR_CALL_METHOD(&_7$$18, this_ptr, "getcolumnsizeandscale", NULL, 0, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_8$$18, this_ptr, "checkcolumnunsigned", NULL, 216, column); + ZEPHIR_CALL_METHOD(&_8$$18, this_ptr, "checkcolumnunsigned", NULL, 217, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_9$$18); ZEPHIR_CONCAT_VV(&_9$$18, &_7$$18, &_8$$18); @@ -1617,9 +1617,9 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) if (ZEPHIR_IS_EMPTY(&columnSql)) { zephir_concat_self_str(&columnSql, SL("DOUBLE")); } - ZEPHIR_CALL_METHOD(&_10$$20, this_ptr, "checkcolumnsizeandscale", NULL, 217, column); + ZEPHIR_CALL_METHOD(&_10$$20, this_ptr, "checkcolumnsizeandscale", NULL, 218, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_11$$20, this_ptr, "checkcolumnunsigned", NULL, 216, column); + ZEPHIR_CALL_METHOD(&_11$$20, this_ptr, "checkcolumnunsigned", NULL, 217, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_12$$20); ZEPHIR_CONCAT_VV(&_12$$20, &_10$$20, &_11$$20); @@ -1639,9 +1639,9 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) if (ZEPHIR_IS_EMPTY(&columnSql)) { zephir_concat_self_str(&columnSql, SL("FLOAT")); } - ZEPHIR_CALL_METHOD(&_14$$24, this_ptr, "checkcolumnsizeandscale", NULL, 217, column); + ZEPHIR_CALL_METHOD(&_14$$24, this_ptr, "checkcolumnsizeandscale", NULL, 218, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_15$$24, this_ptr, "checkcolumnunsigned", NULL, 216, column); + ZEPHIR_CALL_METHOD(&_15$$24, this_ptr, "checkcolumnunsigned", NULL, 217, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_16$$24); ZEPHIR_CONCAT_VV(&_16$$24, &_14$$24, &_15$$24); @@ -1654,7 +1654,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) } ZEPHIR_CALL_METHOD(&_17$$26, this_ptr, "getcolumnsize", NULL, 0, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_18$$26, this_ptr, "checkcolumnunsigned", NULL, 216, column); + ZEPHIR_CALL_METHOD(&_18$$26, this_ptr, "checkcolumnunsigned", NULL, 217, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_19$$26); ZEPHIR_CONCAT_VV(&_19$$26, &_17$$26, &_18$$26); @@ -1691,7 +1691,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) } ZEPHIR_CALL_METHOD(&_20$$36, this_ptr, "getcolumnsize", NULL, 0, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_21$$36, this_ptr, "checkcolumnunsigned", NULL, 216, column); + ZEPHIR_CALL_METHOD(&_21$$36, this_ptr, "checkcolumnunsigned", NULL, 217, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_22$$36); ZEPHIR_CONCAT_VV(&_22$$36, &_20$$36, &_21$$36); @@ -1710,7 +1710,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) } ZEPHIR_CALL_METHOD(&_23$$40, this_ptr, "getcolumnsize", NULL, 0, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_24$$40, this_ptr, "checkcolumnunsigned", NULL, 216, column); + ZEPHIR_CALL_METHOD(&_24$$40, this_ptr, "checkcolumnunsigned", NULL, 217, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_25$$40); ZEPHIR_CONCAT_VV(&_25$$40, &_23$$40, &_24$$40); @@ -1761,7 +1761,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) } ZEPHIR_CALL_METHOD(&_30$$52, this_ptr, "getcolumnsize", NULL, 0, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_31$$52, this_ptr, "checkcolumnunsigned", NULL, 216, column); + ZEPHIR_CALL_METHOD(&_31$$52, this_ptr, "checkcolumnunsigned", NULL, 217, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_32$$52); ZEPHIR_CONCAT_VV(&_32$$52, &_30$$52, &_31$$52); @@ -1810,7 +1810,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) ZVAL_COPY(&value$$61, _37$$61); ZEPHIR_INIT_NVAR(&_39$$62); ZVAL_STRING(&_39$$62, "\""); - ZEPHIR_CALL_FUNCTION(&_40$$62, "addcslashes", &_41, 215, &value$$61, &_39$$62); + ZEPHIR_CALL_FUNCTION(&_40$$62, "addcslashes", &_41, 216, &value$$61, &_39$$62); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_42$$62); ZEPHIR_CONCAT_SVS(&_42$$62, "\"", &_40$$62, "\", "); @@ -1829,7 +1829,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_43$$63); ZVAL_STRING(&_43$$63, "\""); - ZEPHIR_CALL_FUNCTION(&_44$$63, "addcslashes", &_41, 215, &value$$61, &_43$$63); + ZEPHIR_CALL_FUNCTION(&_44$$63, "addcslashes", &_41, 216, &value$$61, &_43$$63); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_45$$63); ZEPHIR_CONCAT_SVS(&_45$$63, "\"", &_44$$63, "\", "); @@ -1849,7 +1849,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) } else { ZEPHIR_INIT_VAR(&_50$$64); ZVAL_STRING(&_50$$64, "\""); - ZEPHIR_CALL_FUNCTION(&_51$$64, "addcslashes", &_41, 215, &typeValues, &_50$$64); + ZEPHIR_CALL_FUNCTION(&_51$$64, "addcslashes", &_41, 216, &typeValues, &_50$$64); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_52$$64); ZEPHIR_CONCAT_SVS(&_52$$64, "(\"", &_51$$64, "\")"); @@ -2076,7 +2076,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, modifyColumn) } _13$$8 = _12$$8; if (!(_13$$8)) { - ZEPHIR_CALL_FUNCTION(&_14$$8, "is_float", NULL, 214, &defaultValue); + ZEPHIR_CALL_FUNCTION(&_14$$8, "is_float", NULL, 215, &defaultValue); zephir_check_call_status(); _13$$8 = zephir_is_true(&_14$$8); } @@ -2087,7 +2087,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, modifyColumn) } else { ZEPHIR_INIT_VAR(&_16$$10); ZVAL_STRING(&_16$$10, "\""); - ZEPHIR_CALL_FUNCTION(&_17$$10, "addcslashes", NULL, 215, &defaultValue, &_16$$10); + ZEPHIR_CALL_FUNCTION(&_17$$10, "addcslashes", NULL, 216, &defaultValue, &_16$$10); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_18$$10); ZEPHIR_CONCAT_SVS(&_18$$10, " DEFAULT \"", &_17$$10, "\""); diff --git a/ext/phalcon/db/dialect/postgresql.zep.c b/ext/phalcon/db/dialect/postgresql.zep.c index 10dfa2d83e5..877697bb704 100644 --- a/ext/phalcon/db/dialect/postgresql.zep.c +++ b/ext/phalcon/db/dialect/postgresql.zep.c @@ -1563,7 +1563,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Postgresql, getColumnDefinition) ZVAL_COPY(&value$$38, _8$$38); ZEPHIR_INIT_NVAR(&_10$$39); ZVAL_STRING(&_10$$39, "\'"); - ZEPHIR_CALL_FUNCTION(&_11$$39, "addcslashes", &_12, 215, &value$$38, &_10$$39); + ZEPHIR_CALL_FUNCTION(&_11$$39, "addcslashes", &_12, 216, &value$$38, &_10$$39); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_13$$39); ZEPHIR_CONCAT_SVS(&_13$$39, "'", &_11$$39, "', "); @@ -1582,7 +1582,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Postgresql, getColumnDefinition) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_14$$40); ZVAL_STRING(&_14$$40, "\'"); - ZEPHIR_CALL_FUNCTION(&_15$$40, "addcslashes", &_12, 215, &value$$38, &_14$$40); + ZEPHIR_CALL_FUNCTION(&_15$$40, "addcslashes", &_12, 216, &value$$38, &_14$$40); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_16$$40); ZEPHIR_CONCAT_SVS(&_16$$40, "'", &_15$$40, "', "); @@ -1602,7 +1602,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Postgresql, getColumnDefinition) } else { ZEPHIR_INIT_VAR(&_21$$41); ZVAL_STRING(&_21$$41, "\'"); - ZEPHIR_CALL_FUNCTION(&_22$$41, "addcslashes", &_12, 215, &typeValues, &_21$$41); + ZEPHIR_CALL_FUNCTION(&_22$$41, "addcslashes", &_12, 216, &typeValues, &_21$$41); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_23$$41); ZEPHIR_CONCAT_SVS(&_23$$41, "('", &_22$$41, "')"); @@ -2157,7 +2157,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Postgresql, castDefault) } else { ZEPHIR_INIT_VAR(&_7$$6); ZVAL_STRING(&_7$$6, "\'"); - ZEPHIR_CALL_FUNCTION(&_8$$6, "addcslashes", NULL, 215, &defaultValue, &_7$$6); + ZEPHIR_CALL_FUNCTION(&_8$$6, "addcslashes", NULL, 216, &defaultValue, &_7$$6); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_9$$6); ZEPHIR_CONCAT_SVS(&_9$$6, "'", &_8$$6, "'"); diff --git a/ext/phalcon/db/dialect/sqlite.zep.c b/ext/phalcon/db/dialect/sqlite.zep.c index c6aa6aca702..f7da7f970c1 100644 --- a/ext/phalcon/db/dialect/sqlite.zep.c +++ b/ext/phalcon/db/dialect/sqlite.zep.c @@ -123,7 +123,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Sqlite, addColumn) } else { ZEPHIR_INIT_VAR(&_7$$5); ZVAL_STRING(&_7$$5, "\""); - ZEPHIR_CALL_FUNCTION(&_8$$5, "addcslashes", NULL, 215, &defaultValue, &_7$$5); + ZEPHIR_CALL_FUNCTION(&_8$$5, "addcslashes", NULL, 216, &defaultValue, &_7$$5); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_9$$5); ZEPHIR_CONCAT_SVS(&_9$$5, " DEFAULT \"", &_8$$5, "\""); @@ -501,7 +501,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Sqlite, createTable) } else { ZEPHIR_INIT_NVAR(&_13$$12); ZVAL_STRING(&_13$$12, "\""); - ZEPHIR_CALL_FUNCTION(&_14$$12, "addcslashes", &_15, 215, &defaultValue, &_13$$12); + ZEPHIR_CALL_FUNCTION(&_14$$12, "addcslashes", &_15, 216, &defaultValue, &_13$$12); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_16$$12); ZEPHIR_CONCAT_SVS(&_16$$12, " DEFAULT \"", &_14$$12, "\""); @@ -565,7 +565,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Sqlite, createTable) } else { ZEPHIR_INIT_NVAR(&_26$$20); ZVAL_STRING(&_26$$20, "\""); - ZEPHIR_CALL_FUNCTION(&_27$$20, "addcslashes", &_15, 215, &defaultValue, &_26$$20); + ZEPHIR_CALL_FUNCTION(&_27$$20, "addcslashes", &_15, 216, &defaultValue, &_26$$20); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_28$$20); ZEPHIR_CONCAT_SVS(&_28$$20, " DEFAULT \"", &_27$$20, "\""); @@ -1501,7 +1501,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Sqlite, getColumnDefinition) ZVAL_COPY(&value$$40, _8$$40); ZEPHIR_INIT_NVAR(&_10$$41); ZVAL_STRING(&_10$$41, "\""); - ZEPHIR_CALL_FUNCTION(&_11$$41, "addcslashes", &_12, 215, &value$$40, &_10$$41); + ZEPHIR_CALL_FUNCTION(&_11$$41, "addcslashes", &_12, 216, &value$$40, &_10$$41); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_13$$41); ZEPHIR_CONCAT_SVS(&_13$$41, "\"", &_11$$41, "\", "); @@ -1520,7 +1520,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Sqlite, getColumnDefinition) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_14$$42); ZVAL_STRING(&_14$$42, "\""); - ZEPHIR_CALL_FUNCTION(&_15$$42, "addcslashes", &_12, 215, &value$$40, &_14$$42); + ZEPHIR_CALL_FUNCTION(&_15$$42, "addcslashes", &_12, 216, &value$$40, &_14$$42); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_16$$42); ZEPHIR_CONCAT_SVS(&_16$$42, "\"", &_15$$42, "\", "); @@ -1540,7 +1540,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Sqlite, getColumnDefinition) } else { ZEPHIR_INIT_VAR(&_21$$43); ZVAL_STRING(&_21$$43, "\""); - ZEPHIR_CALL_FUNCTION(&_22$$43, "addcslashes", &_12, 215, &typeValues, &_21$$43); + ZEPHIR_CALL_FUNCTION(&_22$$43, "addcslashes", &_12, 216, &typeValues, &_21$$43); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_23$$43); ZEPHIR_CONCAT_SVS(&_23$$43, "(\"", &_22$$43, "\")"); diff --git a/ext/phalcon/db/profiler.zep.c b/ext/phalcon/db/profiler.zep.c index 6893767a4fe..46e1ca2811c 100644 --- a/ext/phalcon/db/profiler.zep.c +++ b/ext/phalcon/db/profiler.zep.c @@ -246,15 +246,15 @@ PHP_METHOD(Phalcon_Db_Profiler, startProfile) zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlstatement", NULL, 218, &sqlStatement); + ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlstatement", NULL, 219, &sqlStatement); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlvariables", NULL, 219, &sqlVariables); + ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlvariables", NULL, 220, &sqlVariables); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlbindtypes", NULL, 220, &sqlBindTypes); + ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlbindtypes", NULL, 221, &sqlBindTypes); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_0, "hrtime", NULL, 203, &__$true); + ZEPHIR_CALL_FUNCTION(&_0, "hrtime", NULL, 204, &__$true); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setinitialtime", NULL, 221, &_0); + ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setinitialtime", NULL, 222, &_0); zephir_check_call_status(); if ((zephir_method_exists_ex(this_ptr, ZEND_STRL("beforestartprofile")) == SUCCESS)) { ZEPHIR_CALL_METHOD(NULL, this_ptr, "beforestartprofile", NULL, 0, &activeProfile); @@ -285,7 +285,7 @@ PHP_METHOD(Phalcon_Db_Profiler, stopProfile) zephir_read_property(&_0, this_ptr, ZEND_STRL("activeProfile"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&activeProfile, &_0); - ZEPHIR_CALL_FUNCTION(&_1, "hrtime", NULL, 203, &__$true); + ZEPHIR_CALL_FUNCTION(&_1, "hrtime", NULL, 204, &__$true); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setfinaltime", NULL, 0, &_1); zephir_check_call_status(); diff --git a/ext/phalcon/di/service.zep.c b/ext/phalcon/di/service.zep.c index 14cee526376..256bc3fceae 100644 --- a/ext/phalcon/di/service.zep.c +++ b/ext/phalcon/di/service.zep.c @@ -266,7 +266,7 @@ PHP_METHOD(Phalcon_Di_Service, resolve) zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&instance, &builder, "build", NULL, 222, container, &definition, parameters); + ZEPHIR_CALL_METHOD(&instance, &builder, "build", NULL, 223, container, &definition, parameters); zephir_check_call_status(); } else { found = 0; diff --git a/ext/phalcon/di/service/builder.zep.c b/ext/phalcon/di/service/builder.zep.c index aa20a7ac1b8..94e96abbda2 100644 --- a/ext/phalcon/di/service/builder.zep.c +++ b/ext/phalcon/di/service/builder.zep.c @@ -147,7 +147,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build) } else { zephir_memory_observe(&arguments); if (zephir_array_isset_string_fetch(&arguments, &definition, SL("arguments"), 0)) { - ZEPHIR_CALL_METHOD(&_0$$8, this_ptr, "buildparameters", NULL, 223, container, &arguments); + ZEPHIR_CALL_METHOD(&_0$$8, this_ptr, "buildparameters", NULL, 224, container, &arguments); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&instance); ZEPHIR_LAST_CALL_STATUS = zephir_create_instance_params(&instance, &className, &_0$$8); @@ -223,7 +223,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build) } if (zephir_fast_count_int(&arguments)) { ZEPHIR_INIT_NVAR(&_13$$18); - ZEPHIR_CALL_METHOD(&_14$$18, this_ptr, "buildparameters", NULL, 223, container, &arguments); + ZEPHIR_CALL_METHOD(&_14$$18, this_ptr, "buildparameters", NULL, 224, container, &arguments); zephir_check_call_status(); ZEPHIR_CALL_USER_FUNC_ARRAY(&_13$$18, &methodCall, &_14$$18); zephir_check_call_status(); @@ -291,7 +291,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build) } if (zephir_fast_count_int(&arguments)) { ZEPHIR_INIT_NVAR(&_24$$24); - ZEPHIR_CALL_METHOD(&_25$$24, this_ptr, "buildparameters", NULL, 223, container, &arguments); + ZEPHIR_CALL_METHOD(&_25$$24, this_ptr, "buildparameters", NULL, 224, container, &arguments); zephir_check_call_status(); ZEPHIR_CALL_USER_FUNC_ARRAY(&_24$$24, &methodCall, &_25$$24); zephir_check_call_status(); @@ -365,7 +365,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_37$$28, this_ptr, "buildparameter", &_38, 224, container, &propertyPosition, &propertyValue); + ZEPHIR_CALL_METHOD(&_37$$28, this_ptr, "buildparameter", &_38, 225, container, &propertyPosition, &propertyValue); zephir_check_call_status(); zephir_update_property_zval_zval(&instance, &propertyName, &_37$$28); } ZEND_HASH_FOREACH_END(); @@ -417,7 +417,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_45$$32, this_ptr, "buildparameter", &_38, 224, container, &propertyPosition, &propertyValue); + ZEPHIR_CALL_METHOD(&_45$$32, this_ptr, "buildparameter", &_38, 225, container, &propertyPosition, &propertyValue); zephir_check_call_status(); zephir_update_property_zval_zval(&instance, &propertyName, &_45$$32); ZEPHIR_CALL_METHOD(NULL, ¶mCalls, "next", NULL, 0); @@ -609,7 +609,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, buildParameters) } ZEPHIR_INIT_NVAR(&argument); ZVAL_COPY(&argument, _0); - ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "buildparameter", &_5, 224, container, &position, &argument); + ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "buildparameter", &_5, 225, container, &position, &argument); zephir_check_call_status(); zephir_array_append(&buildArguments, &_4$$3, PH_SEPARATE, "phalcon/Di/Service/Builder.zep", 298); } ZEND_HASH_FOREACH_END(); @@ -626,7 +626,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, buildParameters) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&argument, &arguments, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "buildparameter", &_5, 224, container, &position, &argument); + ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "buildparameter", &_5, 225, container, &position, &argument); zephir_check_call_status(); zephir_array_append(&buildArguments, &_6$$4, PH_SEPARATE, "phalcon/Di/Service/Builder.zep", 298); ZEPHIR_CALL_METHOD(NULL, &arguments, "next", NULL, 0); diff --git a/ext/phalcon/encryption/crypt.zep.c b/ext/phalcon/encryption/crypt.zep.c index 0d0798c9b02..354de361451 100644 --- a/ext/phalcon/encryption/crypt.zep.c +++ b/ext/phalcon/encryption/crypt.zep.c @@ -188,7 +188,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, __construct) if (Z_TYPE_P(padFactory) == IS_NULL) { ZEPHIR_INIT_NVAR(padFactory); object_init_ex(padFactory, phalcon_encryption_crypt_padfactory_ce); - ZEPHIR_CALL_METHOD(NULL, padFactory, "__construct", NULL, 225); + ZEPHIR_CALL_METHOD(NULL, padFactory, "__construct", NULL, 226); zephir_check_call_status(); } zephir_update_property_zval(this_ptr, ZEND_STRL("padFactory"), padFactory); @@ -292,14 +292,14 @@ PHP_METHOD(Phalcon_Encryption_Crypt, decrypt) ZVAL_STRING(&_1, "cipher"); ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkcipherhashisavailable", NULL, 0, &cipher, &_1); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&mode, this_ptr, "getmode", NULL, 226); + ZEPHIR_CALL_METHOD(&mode, this_ptr, "getmode", NULL, 227); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&blockSize, this_ptr, "getblocksize", NULL, 227, &mode); + ZEPHIR_CALL_METHOD(&blockSize, this_ptr, "getblocksize", NULL, 228, &mode); zephir_check_call_status(); ZVAL_LONG(&_0, 0); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "8bit"); - ZEPHIR_CALL_FUNCTION(&iv, "mb_substr", NULL, 228, &input, &_0, &ivLength, &_1); + ZEPHIR_CALL_FUNCTION(&iv, "mb_substr", NULL, 229, &input, &_0, &ivLength, &_1); zephir_check_call_status(); ZEPHIR_INIT_VAR(&digest); ZVAL_STRING(&digest, ""); @@ -315,18 +315,18 @@ PHP_METHOD(Phalcon_Encryption_Crypt, decrypt) ZVAL_LONG(&hashLength, zephir_fast_strlen_ev(&_3$$5)); ZEPHIR_INIT_NVAR(&_2$$5); ZVAL_STRING(&_2$$5, "8bit"); - ZEPHIR_CALL_FUNCTION(&digest, "mb_substr", NULL, 228, &input, &ivLength, &hashLength, &_2$$5); + ZEPHIR_CALL_FUNCTION(&digest, "mb_substr", NULL, 229, &input, &ivLength, &hashLength, &_2$$5); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4$$5); zephir_add_function(&_4$$5, &ivLength, &hashLength); ZEPHIR_INIT_NVAR(&_2$$5); ZVAL_STRING(&_2$$5, "8bit"); - ZEPHIR_CALL_FUNCTION(&cipherText, "mb_substr", NULL, 228, &input, &_4$$5, &__$null, &_2$$5); + ZEPHIR_CALL_FUNCTION(&cipherText, "mb_substr", NULL, 229, &input, &_4$$5, &__$null, &_2$$5); zephir_check_call_status(); } else { ZEPHIR_INIT_VAR(&_5$$6); ZVAL_STRING(&_5$$6, "8bit"); - ZEPHIR_CALL_FUNCTION(&cipherText, "mb_substr", NULL, 228, &input, &ivLength, &__$null, &_5$$6); + ZEPHIR_CALL_FUNCTION(&cipherText, "mb_substr", NULL, 229, &input, &ivLength, &__$null, &_5$$6); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(&decrypted, this_ptr, "decryptgcmccmauth", NULL, 0, &mode, &cipherText, &decryptKey, &iv); @@ -337,7 +337,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, decrypt) ZEPHIR_CPY_WRT(&decrypted, &_6); zephir_read_property(&_7, this_ptr, ZEND_STRL("useSigning"), PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_7)) { - ZEPHIR_CALL_FUNCTION(&_8$$7, "hash_hmac", NULL, 229, &hashAlgorithm, &padded, &decryptKey, &__$true); + ZEPHIR_CALL_FUNCTION(&_8$$7, "hash_hmac", NULL, 230, &hashAlgorithm, &padded, &decryptKey, &__$true); zephir_check_call_status(); if (!ZEPHIR_IS_IDENTICAL(&digest, &_8$$7)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_crypt_exception_mismatch_ce, "Hash does not match.", "phalcon/Encryption/Crypt.zep", 224); @@ -411,7 +411,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, decryptBase64) ZEPHIR_CONCAT_VV(&_4$$3, &_2$$3, &_1$$3); zephir_get_strval(&input, &_4$$3); } - ZEPHIR_CALL_FUNCTION(&_5, "base64_decode", NULL, 230, &input); + ZEPHIR_CALL_FUNCTION(&_5, "base64_decode", NULL, 231, &input); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "decrypt", NULL, 0, &_5, &key); zephir_check_call_status(); @@ -489,9 +489,9 @@ PHP_METHOD(Phalcon_Encryption_Crypt, encrypt) ZVAL_STRING(&_1, "cipher"); ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkcipherhashisavailable", NULL, 0, &cipher, &_1); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&mode, this_ptr, "getmode", NULL, 226); + ZEPHIR_CALL_METHOD(&mode, this_ptr, "getmode", NULL, 227); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&blockSize, this_ptr, "getblocksize", NULL, 227, &mode); + ZEPHIR_CALL_METHOD(&blockSize, this_ptr, "getblocksize", NULL, 228, &mode); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&iv, this_ptr, "phpopensslrandompseudobytes", NULL, 0, &ivLength); zephir_check_call_status(); @@ -507,7 +507,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, encrypt) if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { ZEPHIR_CALL_METHOD(&_2$$6, this_ptr, "gethashalgorithm", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&digest, "hash_hmac", NULL, 229, &_2$$6, &padded, &encryptKey, &__$true); + ZEPHIR_CALL_FUNCTION(&digest, "hash_hmac", NULL, 230, &_2$$6, &padded, &encryptKey, &__$true); zephir_check_call_status(); ZEPHIR_CONCAT_VVV(return_value, &iv, &digest, &encrypted); RETURN_MM(); @@ -566,7 +566,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, encryptBase64) if (safe) { ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "encrypt", NULL, 0, &input, &key); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1$$3, "base64_encode", NULL, 231, &_0$$3); + ZEPHIR_CALL_FUNCTION(&_1$$3, "base64_encode", NULL, 232, &_0$$3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "+/"); @@ -581,7 +581,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, encryptBase64) } ZEPHIR_CALL_METHOD(&_5, this_ptr, "encrypt", NULL, 0, &input, &key); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 231, &_5); + ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 232, &_5); zephir_check_call_status(); RETURN_MM(); } @@ -652,11 +652,11 @@ PHP_METHOD(Phalcon_Encryption_Crypt, getAvailableHashAlgorithms) ZEPHIR_CALL_METHOD(&_0, this_ptr, "phpfunctionexists", NULL, 0, &_1); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { - ZEPHIR_RETURN_CALL_FUNCTION("hash_hmac_algos", NULL, 232); + ZEPHIR_RETURN_CALL_FUNCTION("hash_hmac_algos", NULL, 233); zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_RETURN_CALL_FUNCTION("hash_algos", NULL, 233); + ZEPHIR_RETURN_CALL_FUNCTION("hash_algos", NULL, 234); zephir_check_call_status(); RETURN_MM(); } @@ -829,7 +829,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, setCipher) ZVAL_STRING(&_0, "cipher"); ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkcipherhashisavailable", NULL, 0, &cipher, &_0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "getivlength", NULL, 234, &cipher); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "getivlength", NULL, 235, &cipher); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("ivLength"), &_1); zephir_update_property_zval(this_ptr, ZEND_STRL("cipher"), &cipher); @@ -1009,7 +1009,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, checkCipherHashIsAvailable) object_init_ex(&_1$$5, phalcon_encryption_crypt_exception_exception_ce); ZEPHIR_INIT_VAR(&_2$$5); ZVAL_STRING(&_2$$5, "The %s algorithm '%s' is not supported on this system."); - ZEPHIR_CALL_FUNCTION(&_3$$5, "sprintf", NULL, 117, &_2$$5, &type, &cipher); + ZEPHIR_CALL_FUNCTION(&_3$$5, "sprintf", NULL, 118, &_2$$5, &type, &cipher); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$5, "__construct", NULL, 33, &_3$$5); zephir_check_call_status(); @@ -1077,7 +1077,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, cryptPadText) ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "ecb"); zephir_array_fast_append(&_1, &_2); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkismode", NULL, 235, &_1, &mode); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkismode", NULL, 236, &_1, &mode); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { paddingSize = (blockSize - (zephir_safe_mod_long_long(zephir_fast_strlen_ev(&input), blockSize))); @@ -1178,7 +1178,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, cryptUnpadText) ZEPHIR_INIT_NVAR(&_4); ZVAL_STRING(&_4, "ecb"); zephir_array_fast_append(&_3, &_4); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkismode", NULL, 235, &_3, &mode); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkismode", NULL, 236, &_3, &mode); zephir_check_call_status(); _1 = ZEPHIR_IS_TRUE_IDENTICAL(&_2); } @@ -1256,7 +1256,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, decryptGetUnpadded) ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "ecb"); zephir_array_fast_append(&_1, &_2); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkismode", NULL, 235, &_1, &mode); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkismode", NULL, 236, &_1, &mode); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { zephir_read_property(&_3$$3, this_ptr, ZEND_STRL("padding"), PH_NOISY_CC | PH_READONLY); @@ -1327,7 +1327,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, decryptGcmCcmAuth) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "gcm"); zephir_array_fast_append(&_2, &_3); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "checkismode", NULL, 235, &_2, &mode); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "checkismode", NULL, 236, &_2, &mode); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_1)) { zephir_read_property(&_4$$3, this_ptr, ZEND_STRL("authData"), PH_NOISY_CC | PH_READONLY); @@ -1342,11 +1342,11 @@ PHP_METHOD(Phalcon_Encryption_Crypt, decryptGcmCcmAuth) ZEPHIR_INIT_VAR(&encrypted); zephir_fast_str_replace(&encrypted, &authTag, &_5$$3, &cipherText); ZVAL_LONG(&_4$$3, 1); - ZEPHIR_CALL_FUNCTION(&decrypted, "openssl_decrypt", NULL, 236, &encrypted, &cipher, &decryptKey, &_4$$3, &iv, &authTag, &authData); + ZEPHIR_CALL_FUNCTION(&decrypted, "openssl_decrypt", NULL, 237, &encrypted, &cipher, &decryptKey, &_4$$3, &iv, &authTag, &authData); zephir_check_call_status(); } else { ZVAL_LONG(&_6$$4, 1); - ZEPHIR_CALL_FUNCTION(&decrypted, "openssl_decrypt", NULL, 236, &cipherText, &cipher, &decryptKey, &_6$$4, &iv); + ZEPHIR_CALL_FUNCTION(&decrypted, "openssl_decrypt", NULL, 237, &cipherText, &cipher, &decryptKey, &_6$$4, &iv); zephir_check_call_status(); } if (ZEPHIR_IS_FALSE_IDENTICAL(&decrypted)) { @@ -1403,7 +1403,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, encryptGetPadded) ZEPHIR_INIT_NVAR(&_4); ZVAL_STRING(&_4, "ecb"); zephir_array_fast_append(&_3, &_4); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkismode", NULL, 235, &_3, &mode); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkismode", NULL, 236, &_3, &mode); zephir_check_call_status(); _1 = ZEPHIR_IS_TRUE_IDENTICAL(&_2); } @@ -1475,7 +1475,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, encryptGcmCcm) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "gcm"); zephir_array_fast_append(&_2, &_3); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "checkismode", NULL, 235, &_2, &mode); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "checkismode", NULL, 236, &_2, &mode); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_1)) { zephir_read_property(&_4$$3, this_ptr, ZEND_STRL("authData"), PH_NOISY_CC | PH_READONLY); @@ -1490,13 +1490,13 @@ PHP_METHOD(Phalcon_Encryption_Crypt, encryptGcmCcm) ZEPHIR_CPY_WRT(&authTagLength, &_4$$3); ZVAL_LONG(&_4$$3, 1); ZEPHIR_MAKE_REF(&authTag); - ZEPHIR_CALL_FUNCTION(&encrypted, "openssl_encrypt", NULL, 237, &padded, &cipher, &encryptKey, &_4$$3, &iv, &authTag, &authData, &authTagLength); + ZEPHIR_CALL_FUNCTION(&encrypted, "openssl_encrypt", NULL, 238, &padded, &cipher, &encryptKey, &_4$$3, &iv, &authTag, &authData, &authTagLength); ZEPHIR_UNREF(&authTag); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("authTag"), &authTag); } else { ZVAL_LONG(&_5$$5, 1); - ZEPHIR_CALL_FUNCTION(&encrypted, "openssl_encrypt", NULL, 237, &padded, &cipher, &encryptKey, &_5$$5, &iv); + ZEPHIR_CALL_FUNCTION(&encrypted, "openssl_encrypt", NULL, 238, &padded, &cipher, &encryptKey, &_5$$5, &iv); zephir_check_call_status(); } if (ZEPHIR_IS_FALSE_IDENTICAL(&encrypted)) { @@ -1540,7 +1540,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, initializeAvailableCiphers) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_crypt_exception_exception_ce, "This class requires the openssl extension for PHP", "phalcon/Encryption/Crypt.zep", 892); return; } - ZEPHIR_CALL_FUNCTION(&available, "openssl_get_cipher_methods", NULL, 238, &__$true); + ZEPHIR_CALL_FUNCTION(&available, "openssl_get_cipher_methods", NULL, 239, &__$true); zephir_check_call_status(); ZEPHIR_INIT_VAR(&allowed); array_init(&allowed); @@ -1668,9 +1668,9 @@ PHP_METHOD(Phalcon_Encryption_Crypt, getBlockSize) zephir_read_property(&_2, this_ptr, ZEND_STRL("cipher"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, ""); - ZEPHIR_CALL_FUNCTION(&_4, "str_ireplace", NULL, 239, &_1, &_3, &_2); + ZEPHIR_CALL_FUNCTION(&_4, "str_ireplace", NULL, 240, &_1, &_3, &_2); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getivlength", NULL, 234, &_4); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getivlength", NULL, 235, &_4); zephir_check_call_status(); RETURN_MM(); } @@ -1699,7 +1699,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, getIvLength) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &cipher_param); zephir_get_strval(&cipher, cipher_param); - ZEPHIR_CALL_FUNCTION(&length, "openssl_cipher_iv_length", NULL, 240, &cipher); + ZEPHIR_CALL_FUNCTION(&length, "openssl_cipher_iv_length", NULL, 241, &cipher); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&length)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_crypt_exception_exception_ce, "Cannot calculate the initialization vector (IV) length of the cipher", "phalcon/Encryption/Crypt.zep", 962); @@ -1733,7 +1733,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, getMode) zephir_read_property(&_0, this_ptr, ZEND_STRL("cipher"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "-"); - ZEPHIR_CALL_FUNCTION(&_2, "strrpos", NULL, 241, &_0, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "strrpos", NULL, 242, &_0, &_1); zephir_check_call_status(); ZEPHIR_INIT_VAR(&position); ZVAL_LONG(&position, zephir_get_intval(&_2)); @@ -1782,7 +1782,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, phpOpensslCipherIvLength) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &cipher_param); zephir_get_strval(&cipher, cipher_param); - ZEPHIR_RETURN_CALL_FUNCTION("openssl_cipher_iv_length", NULL, 240, &cipher); + ZEPHIR_RETURN_CALL_FUNCTION("openssl_cipher_iv_length", NULL, 241, &cipher); zephir_check_call_status(); RETURN_MM(); } @@ -1801,7 +1801,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, phpOpensslRandomPseudoBytes) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &length_param); ZVAL_LONG(&_0, length); - ZEPHIR_RETURN_CALL_FUNCTION("openssl_random_pseudo_bytes", NULL, 242, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("openssl_random_pseudo_bytes", NULL, 243, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/encryption/crypt/padding/ansi.zep.c b/ext/phalcon/encryption/crypt/padding/ansi.zep.c index c05bf2ac7e0..d6f3723e1bb 100644 --- a/ext/phalcon/encryption/crypt/padding/ansi.zep.c +++ b/ext/phalcon/encryption/crypt/padding/ansi.zep.c @@ -63,13 +63,13 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Ansi, pad) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &paddingSize_param); ZVAL_LONG(&_0, 0); - ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 243, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 244, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, (paddingSize - 1)); ZEPHIR_CALL_FUNCTION(&_2, "str_repeat", NULL, 1, &_1, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, paddingSize); - ZEPHIR_CALL_FUNCTION(&_3, "chr", NULL, 243, &_0); + ZEPHIR_CALL_FUNCTION(&_3, "chr", NULL, 244, &_0); zephir_check_call_status(); ZEPHIR_CONCAT_VV(return_value, &_2, &_3); RETURN_MM(); @@ -117,7 +117,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Ansi, unpad) ZVAL_LONG(&_1, 1); ZEPHIR_INIT_VAR(&last); zephir_substr(&last, &input, zephir_get_intval(&_0), 1 , 0); - ZEPHIR_CALL_FUNCTION(&ord, "ord", NULL, 244, &last); + ZEPHIR_CALL_FUNCTION(&ord, "ord", NULL, 245, &last); zephir_check_call_status(); if (ZEPHIR_LE_LONG(&ord, blockSize)) { ZEPHIR_CPY_WRT(&paddingSize, &ord); @@ -125,7 +125,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Ansi, unpad) ZVAL_STRING(&repeat, ""); if (ZEPHIR_GT_LONG(&paddingSize, 1)) { ZVAL_LONG(&_2$$4, 0); - ZEPHIR_CALL_FUNCTION(&_3$$4, "chr", NULL, 243, &_2$$4); + ZEPHIR_CALL_FUNCTION(&_3$$4, "chr", NULL, 244, &_2$$4); zephir_check_call_status(); ZVAL_LONG(&_2$$4, (zephir_get_numberval(&paddingSize) - 1)); ZEPHIR_CALL_FUNCTION(&repeat, "str_repeat", NULL, 1, &_3$$4, &_2$$4); diff --git a/ext/phalcon/encryption/crypt/padding/iso10126.zep.c b/ext/phalcon/encryption/crypt/padding/iso10126.zep.c index 1b34e0a4694..fa9cc91c3aa 100644 --- a/ext/phalcon/encryption/crypt/padding/iso10126.zep.c +++ b/ext/phalcon/encryption/crypt/padding/iso10126.zep.c @@ -83,15 +83,15 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Iso10126, pad) } ZEPHIR_INIT_NVAR(&counter); ZVAL_LONG(&counter, _1); - ZEPHIR_CALL_FUNCTION(&_3$$3, "rand", &_4, 245); + ZEPHIR_CALL_FUNCTION(&_3$$3, "rand", &_4, 246); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_5$$3, "chr", &_6, 243, &_3$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "chr", &_6, 244, &_3$$3); zephir_check_call_status(); zephir_concat_self(&padding, &_5$$3); } } ZVAL_LONG(&_7, paddingSize); - ZEPHIR_CALL_FUNCTION(&_8, "chr", &_6, 243, &_7); + ZEPHIR_CALL_FUNCTION(&_8, "chr", &_6, 244, &_7); zephir_check_call_status(); zephir_concat_self(&padding, &_8); RETURN_CCTOR(&padding); @@ -129,7 +129,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Iso10126, unpad) ZVAL_LONG(&_1, 1); ZEPHIR_INIT_VAR(&last); zephir_substr(&last, &input, zephir_get_intval(&_0), 1 , 0); - ZEPHIR_RETURN_CALL_FUNCTION("ord", NULL, 244, &last); + ZEPHIR_RETURN_CALL_FUNCTION("ord", NULL, 245, &last); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/encryption/crypt/padding/isoiek.zep.c b/ext/phalcon/encryption/crypt/padding/isoiek.zep.c index c4442c1817f..5c2ca2d6d39 100644 --- a/ext/phalcon/encryption/crypt/padding/isoiek.zep.c +++ b/ext/phalcon/encryption/crypt/padding/isoiek.zep.c @@ -63,10 +63,10 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_IsoIek, pad) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &paddingSize_param); ZVAL_LONG(&_0, 0x80); - ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 243, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 244, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, 0); - ZEPHIR_CALL_FUNCTION(&_2, "chr", NULL, 243, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "chr", NULL, 244, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, (paddingSize - 1)); ZEPHIR_CALL_FUNCTION(&_3, "str_repeat", NULL, 1, &_2, &_0); @@ -107,7 +107,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_IsoIek, unpad) zephir_fetch_params(1, 2, 0, &input_param, &blockSize_param); zephir_get_strval(&input, input_param); paddingSize = 0; - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 246, &input); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 247, &input); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&inputArray, "str_split", NULL, 88, &input); zephir_check_call_status(); @@ -117,7 +117,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_IsoIek, unpad) if (_0) { zephir_array_fetch_long(&_1, &inputArray, counter, PH_NOISY | PH_READONLY, "phalcon/Encryption/Crypt/Padding/IsoIek.zep", 48); ZVAL_LONG(&_2, 0); - ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 243, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 244, &_2); zephir_check_call_status(); _0 = ZEPHIR_IS_IDENTICAL(&_1, &_3); } @@ -133,7 +133,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_IsoIek, unpad) } zephir_array_fetch_long(&_6, &inputArray, counter, PH_NOISY | PH_READONLY, "phalcon/Encryption/Crypt/Padding/IsoIek.zep", 55); ZVAL_LONG(&_2, 0x80); - ZEPHIR_CALL_FUNCTION(&_7, "chr", &_4, 243, &_2); + ZEPHIR_CALL_FUNCTION(&_7, "chr", &_4, 244, &_2); zephir_check_call_status(); if (ZEPHIR_IS_EQUAL(&_6, &_7)) { paddingSize++; diff --git a/ext/phalcon/encryption/crypt/padding/pkcs7.zep.c b/ext/phalcon/encryption/crypt/padding/pkcs7.zep.c index 2e20b5ec603..c415a7bbf5c 100644 --- a/ext/phalcon/encryption/crypt/padding/pkcs7.zep.c +++ b/ext/phalcon/encryption/crypt/padding/pkcs7.zep.c @@ -60,7 +60,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Pkcs7, pad) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &paddingSize_param); ZVAL_LONG(&_0, paddingSize); - ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 243, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 244, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, paddingSize); ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", NULL, 1, &_1, &_0); @@ -100,17 +100,17 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Pkcs7, unpad) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 2, 0, &input_param, &blockSize_param); zephir_get_strval(&input, input_param); - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 246, &input); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 247, &input); zephir_check_call_status(); ZVAL_LONG(&_0, (zephir_get_numberval(&length) - 1)); ZVAL_LONG(&_1, 1); ZEPHIR_INIT_VAR(&last); zephir_substr(&last, &input, zephir_get_intval(&_0), 1 , 0); - ZEPHIR_CALL_FUNCTION(&ord, "ord", NULL, 244, &last); + ZEPHIR_CALL_FUNCTION(&ord, "ord", NULL, 245, &last); zephir_check_call_status(); if (ZEPHIR_LE_LONG(&ord, blockSize)) { ZEPHIR_CPY_WRT(&paddingSize, &ord); - ZEPHIR_CALL_FUNCTION(&_2$$3, "chr", NULL, 243, &paddingSize); + ZEPHIR_CALL_FUNCTION(&_2$$3, "chr", NULL, 244, &paddingSize); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&padding, "str_repeat", NULL, 1, &_2$$3, &paddingSize); zephir_check_call_status(); diff --git a/ext/phalcon/encryption/crypt/padding/space.zep.c b/ext/phalcon/encryption/crypt/padding/space.zep.c index e82d29be182..42ae84f8f13 100644 --- a/ext/phalcon/encryption/crypt/padding/space.zep.c +++ b/ext/phalcon/encryption/crypt/padding/space.zep.c @@ -96,7 +96,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Space, unpad) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 2, 0, &input_param, &blockSize_param); zephir_get_strval(&input, input_param); - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 246, &input); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 247, &input); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&inputArray, "str_split", NULL, 88, &input); zephir_check_call_status(); @@ -107,7 +107,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Space, unpad) if (_0) { zephir_array_fetch_long(&_1, &inputArray, counter, PH_NOISY | PH_READONLY, "phalcon/Encryption/Crypt/Padding/Space.zep", 48); ZVAL_LONG(&_2, 32); - ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 243, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 244, &_2); zephir_check_call_status(); _0 = ZEPHIR_IS_EQUAL(&_1, &_3); } diff --git a/ext/phalcon/encryption/crypt/padding/zero.zep.c b/ext/phalcon/encryption/crypt/padding/zero.zep.c index b3a898ebd71..ea12d472bcd 100644 --- a/ext/phalcon/encryption/crypt/padding/zero.zep.c +++ b/ext/phalcon/encryption/crypt/padding/zero.zep.c @@ -60,7 +60,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Zero, pad) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &paddingSize_param); ZVAL_LONG(&_0, 0); - ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 243, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 244, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, paddingSize); ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", NULL, 1, &_1, &_0); @@ -97,7 +97,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Zero, unpad) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 2, 0, &input_param, &blockSize_param); zephir_get_strval(&input, input_param); - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 246, &input); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 247, &input); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&inputArray, "str_split", NULL, 88, &input); zephir_check_call_status(); @@ -108,7 +108,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Zero, unpad) if (_0) { zephir_array_fetch_long(&_1, &inputArray, counter, PH_NOISY | PH_READONLY, "phalcon/Encryption/Crypt/Padding/Zero.zep", 48); ZVAL_LONG(&_2, 0); - ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 243, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 244, &_2); zephir_check_call_status(); _0 = ZEPHIR_IS_EQUAL(&_1, &_3); } diff --git a/ext/phalcon/encryption/crypt/padfactory.zep.c b/ext/phalcon/encryption/crypt/padfactory.zep.c index a611f593644..76e35b799e2 100644 --- a/ext/phalcon/encryption/crypt/padfactory.zep.c +++ b/ext/phalcon/encryption/crypt/padfactory.zep.c @@ -153,7 +153,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_PadFactory, padNumberToService) ZVAL_LONG(&_1, number); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "noop"); - ZEPHIR_RETURN_CALL_METHOD(&_0, "__invoke", NULL, 159, &map, &_1, &_2); + ZEPHIR_RETURN_CALL_METHOD(&_0, "__invoke", NULL, 160, &map, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/encryption/security.zep.c b/ext/phalcon/encryption/security.zep.c index 620f3f57158..03f4a378702 100644 --- a/ext/phalcon/encryption/security.zep.c +++ b/ext/phalcon/encryption/security.zep.c @@ -214,7 +214,7 @@ PHP_METHOD(Phalcon_Encryption_Security, checkHash) if (_0) { RETURN_MM_BOOL(0); } - ZEPHIR_RETURN_CALL_FUNCTION("password_verify", NULL, 247, &password, &passwordHash); + ZEPHIR_RETURN_CALL_FUNCTION("password_verify", NULL, 248, &password, &passwordHash); zephir_check_call_status(); RETURN_MM(); } @@ -268,13 +268,13 @@ PHP_METHOD(Phalcon_Encryption_Security, checkToken) destroyIfValid = 1; } else { } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "processtokenkey", NULL, 248, &tokenKey); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "processtokenkey", NULL, 249, &tokenKey); zephir_check_call_status(); zephir_get_strval(&tokenKey, &_0); if (!(!(ZEPHIR_IS_EMPTY(&tokenKey)))) { RETURN_MM_BOOL(0); } - ZEPHIR_CALL_METHOD(&userToken, this_ptr, "processusertoken", NULL, 249, &tokenKey, tokenValue); + ZEPHIR_CALL_METHOD(&userToken, this_ptr, "processusertoken", NULL, 250, &tokenKey, tokenValue); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&knownToken, this_ptr, "getrequesttoken", NULL, 0); zephir_check_call_status(); @@ -344,14 +344,14 @@ PHP_METHOD(Phalcon_Encryption_Security, computeHmac) } else { } ZVAL_BOOL(&_0, (raw ? 1 : 0)); - ZEPHIR_CALL_FUNCTION(&hmac, "hash_hmac", NULL, 229, &algo, &data, &key, &_0); + ZEPHIR_CALL_FUNCTION(&hmac, "hash_hmac", NULL, 230, &algo, &data, &key, &_0); zephir_check_call_status(); if (UNEXPECTED(!zephir_is_true(&hmac))) { ZEPHIR_INIT_VAR(&_1$$3); object_init_ex(&_1$$3, phalcon_encryption_security_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "Unknown hashing algorithm: %s"); - ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 117, &_2$$3, &algo); + ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 118, &_2$$3, &algo); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 33, &_3$$3); zephir_check_call_status(); @@ -434,7 +434,7 @@ PHP_METHOD(Phalcon_Encryption_Security, getHashInformation) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &hash_param); zephir_get_strval(&hash, hash_param); - ZEPHIR_RETURN_CALL_FUNCTION("password_get_info", NULL, 250, &hash); + ZEPHIR_RETURN_CALL_FUNCTION("password_get_info", NULL, 251, &hash); zephir_check_call_status(); RETURN_MM(); } @@ -726,11 +726,11 @@ PHP_METHOD(Phalcon_Encryption_Security, hash) } else { zephir_get_arrval(&options, options_param); } - ZEPHIR_CALL_METHOD(&cost, this_ptr, "processcost", NULL, 251, &options); + ZEPHIR_CALL_METHOD(&cost, this_ptr, "processcost", NULL, 252, &options); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "%02s"); - ZEPHIR_CALL_FUNCTION(&formatted, "sprintf", NULL, 117, &_0, &cost); + ZEPHIR_CALL_FUNCTION(&formatted, "sprintf", NULL, 118, &_0, &cost); zephir_check_call_status(); ZEPHIR_INIT_VAR(&prefix); ZVAL_STRING(&prefix, ""); @@ -760,14 +760,14 @@ PHP_METHOD(Phalcon_Encryption_Security, hash) if (ZEPHIR_IS_LONG(&_1, 5)) { ZEPHIR_INIT_VAR(&_2$$6); ZVAL_STRING(&_2$$6, "$2a$%s$"); - ZEPHIR_CALL_FUNCTION(&prefix, "sprintf", NULL, 117, &_2$$6, &formatted); + ZEPHIR_CALL_FUNCTION(&prefix, "sprintf", NULL, 118, &_2$$6, &formatted); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(&_1, 6)) { ZEPHIR_INIT_VAR(&_3$$7); ZVAL_STRING(&_3$$7, "$2x$%s$"); - ZEPHIR_CALL_FUNCTION(&prefix, "sprintf", NULL, 117, &_3$$7, &formatted); + ZEPHIR_CALL_FUNCTION(&prefix, "sprintf", NULL, 118, &_3$$7, &formatted); zephir_check_call_status(); break; } @@ -781,7 +781,7 @@ PHP_METHOD(Phalcon_Encryption_Security, hash) zephir_check_call_status(); ZEPHIR_INIT_VAR(&salt); ZEPHIR_CONCAT_VVS(&salt, &prefix, &_4$$9, "$"); - ZEPHIR_RETURN_CALL_FUNCTION("crypt", NULL, 252, &password, &salt); + ZEPHIR_RETURN_CALL_FUNCTION("crypt", NULL, 253, &password, &salt); zephir_check_call_status(); RETURN_MM(); } @@ -789,11 +789,11 @@ PHP_METHOD(Phalcon_Encryption_Security, hash) zephir_create_array(&_6, 1, 0); zephir_array_update_string(&_6, SL("cost"), &cost, PH_COPY | PH_SEPARATE); ZEPHIR_CPY_WRT(&options, &_6); - ZEPHIR_CALL_METHOD(&algorithm, this_ptr, "processalgorithm", NULL, 253); + ZEPHIR_CALL_METHOD(&algorithm, this_ptr, "processalgorithm", NULL, 254); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&arguments, this_ptr, "processargonoptions", NULL, 254, &options); + ZEPHIR_CALL_METHOD(&arguments, this_ptr, "processargonoptions", NULL, 255, &options); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("password_hash", NULL, 255, &password, &algorithm, &arguments); + ZEPHIR_RETURN_CALL_FUNCTION("password_hash", NULL, 256, &password, &algorithm, &arguments); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/encryption/security/jwt/builder.zep.c b/ext/phalcon/encryption/security/jwt/builder.zep.c index 3c8fe06a9da..4f782160379 100644 --- a/ext/phalcon/encryption/security/jwt/builder.zep.c +++ b/ext/phalcon/encryption/security/jwt/builder.zep.c @@ -539,26 +539,26 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, getToken) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_2, &_1, "__invoke", NULL, 0, &_3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&encodedClaims, this_ptr, "encodeurl", NULL, 256, &_2); + ZEPHIR_CALL_METHOD(&encodedClaims, this_ptr, "encodeurl", NULL, 257, &_2); zephir_check_call_status(); ZEPHIR_INIT_VAR(&claims); object_init_ex(&claims, phalcon_encryption_security_jwt_token_item_ce); ZEPHIR_CALL_METHOD(&_4, this_ptr, "getclaims", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &claims, "__construct", NULL, 257, &_4, &encodedClaims); + ZEPHIR_CALL_METHOD(NULL, &claims, "__construct", NULL, 258, &_4, &encodedClaims); zephir_check_call_status(); zephir_read_property(&_5, this_ptr, ZEND_STRL("encode"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(&_7, this_ptr, "getheaders", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_6, &_5, "__invoke", NULL, 0, &_7); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&encodedHeaders, this_ptr, "encodeurl", NULL, 256, &_6); + ZEPHIR_CALL_METHOD(&encodedHeaders, this_ptr, "encodeurl", NULL, 257, &_6); zephir_check_call_status(); ZEPHIR_INIT_VAR(&headers); object_init_ex(&headers, phalcon_encryption_security_jwt_token_item_ce); ZEPHIR_CALL_METHOD(&_8, this_ptr, "getheaders", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &headers, "__construct", NULL, 257, &_8, &encodedHeaders); + ZEPHIR_CALL_METHOD(NULL, &headers, "__construct", NULL, 258, &_8, &encodedHeaders); zephir_check_call_status(); zephir_read_property(&_9, this_ptr, ZEND_STRL("signer"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_10); @@ -566,14 +566,14 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, getToken) zephir_read_property(&_11, this_ptr, ZEND_STRL("passphrase"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(&signatureHash, &_9, "sign", NULL, 0, &_10, &_11); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&encodedSignature, this_ptr, "encodeurl", NULL, 256, &signatureHash); + ZEPHIR_CALL_METHOD(&encodedSignature, this_ptr, "encodeurl", NULL, 257, &signatureHash); zephir_check_call_status(); ZEPHIR_INIT_VAR(&signature); object_init_ex(&signature, phalcon_encryption_security_jwt_token_signature_ce); - ZEPHIR_CALL_METHOD(NULL, &signature, "__construct", NULL, 258, &signatureHash, &encodedSignature); + ZEPHIR_CALL_METHOD(NULL, &signature, "__construct", NULL, 259, &signatureHash, &encodedSignature); zephir_check_call_status(); object_init_ex(return_value, phalcon_encryption_security_jwt_token_token_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 259, &headers, &claims, &signature); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 260, &headers, &claims, &signature); zephir_check_call_status(); RETURN_MM(); } @@ -1061,7 +1061,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, encodeUrl) } else { ZEPHIR_INIT_VAR(&input); } - ZEPHIR_CALL_FUNCTION(&_0, "base64_encode", NULL, 231, &input); + ZEPHIR_CALL_FUNCTION(&_0, "base64_encode", NULL, 232, &input); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "+/"); diff --git a/ext/phalcon/encryption/security/jwt/signer/hmac.zep.c b/ext/phalcon/encryption/security/jwt/signer/hmac.zep.c index 6d73c200702..42e9b7b11c6 100644 --- a/ext/phalcon/encryption/security/jwt/signer/hmac.zep.c +++ b/ext/phalcon/encryption/security/jwt/signer/hmac.zep.c @@ -164,7 +164,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Signer_Hmac, sign) } else { ZEPHIR_INIT_VAR(&passphrase); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethash", NULL, 260, &payload, &passphrase); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethash", NULL, 261, &payload, &passphrase); zephir_check_call_status(); RETURN_MM(); } @@ -201,7 +201,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Signer_Hmac, verify) zephir_get_strval(&source, source_param); zephir_get_strval(&payload, payload_param); zephir_get_strval(&passphrase, passphrase_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "gethash", NULL, 260, &payload, &passphrase); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "gethash", NULL, 261, &payload, &passphrase); zephir_check_call_status(); RETURN_MM_BOOL(zephir_hash_equals(&source, &_0)); } @@ -237,7 +237,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Signer_Hmac, getHash) zephir_get_strval(&passphrase, passphrase_param); ZEPHIR_CALL_METHOD(&_0, this_ptr, "getalgorithm", NULL, 0); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("hash_hmac", NULL, 229, &_0, &payload, &passphrase, &__$true); + ZEPHIR_RETURN_CALL_FUNCTION("hash_hmac", NULL, 230, &_0, &payload, &passphrase, &__$true); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/encryption/security/jwt/token/parser.zep.c b/ext/phalcon/encryption/security/jwt/token/parser.zep.c index ec6c05e36f5..bb1ad34cdac 100644 --- a/ext/phalcon/encryption/security/jwt/token/parser.zep.c +++ b/ext/phalcon/encryption/security/jwt/token/parser.zep.c @@ -122,7 +122,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, parse) } else { ZEPHIR_INIT_VAR(&token); } - ZEPHIR_CALL_METHOD(&results, this_ptr, "parsetoken", NULL, 261, &token); + ZEPHIR_CALL_METHOD(&results, this_ptr, "parsetoken", NULL, 262, &token); zephir_check_call_status(); zephir_memory_observe(&encodedHeaders); zephir_array_fetch_long(&encodedHeaders, &results, 0, PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 55); @@ -130,14 +130,14 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, parse) zephir_array_fetch_long(&encodedClaims, &results, 1, PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 56); zephir_memory_observe(&encodedSignature); zephir_array_fetch_long(&encodedSignature, &results, 2, PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 57); - ZEPHIR_CALL_METHOD(&headers, this_ptr, "decodeheaders", NULL, 262, &encodedHeaders); + ZEPHIR_CALL_METHOD(&headers, this_ptr, "decodeheaders", NULL, 263, &encodedHeaders); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&claims, this_ptr, "decodeclaims", NULL, 263, &encodedClaims); + ZEPHIR_CALL_METHOD(&claims, this_ptr, "decodeclaims", NULL, 264, &encodedClaims); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&signature, this_ptr, "decodesignature", NULL, 264, &headers, &encodedSignature); + ZEPHIR_CALL_METHOD(&signature, this_ptr, "decodesignature", NULL, 265, &headers, &encodedSignature); zephir_check_call_status(); object_init_ex(return_value, phalcon_encryption_security_jwt_token_token_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 259, &headers, &claims, &signature); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 260, &headers, &claims, &signature); zephir_check_call_status(); RETURN_MM(); } @@ -175,7 +175,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeClaims) zephir_fetch_params(1, 1, 0, &claims_param); zephir_get_strval(&claims, claims_param); zephir_read_property(&_0, this_ptr, ZEND_STRL("decode"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "decodeurl", NULL, 265, &claims); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "decodeurl", NULL, 266, &claims); zephir_check_call_status(); ZVAL_BOOL(&_2, 1); ZEPHIR_CALL_METHOD(&decoded, &_0, "__invoke", NULL, 0, &_1, &_2); @@ -199,7 +199,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeClaims) zephir_array_update_string(&decoded, SL("aud"), &_5$$4, PH_COPY | PH_SEPARATE); } object_init_ex(return_value, phalcon_encryption_security_jwt_token_item_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 257, &decoded, &claims); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 258, &decoded, &claims); zephir_check_call_status(); RETURN_MM(); } @@ -232,7 +232,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeHeaders) zephir_fetch_params(1, 1, 0, &headers_param); zephir_get_strval(&headers, headers_param); zephir_read_property(&_0, this_ptr, ZEND_STRL("decode"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "decodeurl", NULL, 265, &headers); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "decodeurl", NULL, 266, &headers); zephir_check_call_status(); ZVAL_BOOL(&_2, 1); ZEPHIR_CALL_METHOD(&decoded, &_0, "__invoke", NULL, 0, &_1, &_2); @@ -246,7 +246,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeHeaders) return; } object_init_ex(return_value, phalcon_encryption_security_jwt_token_item_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 257, &decoded, &headers); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 258, &decoded, &headers); zephir_check_call_status(); RETURN_MM(); } @@ -295,11 +295,11 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeSignature) ZVAL_STRING(&decoded, ""); ZEPHIR_INIT_NVAR(&signature); } else { - ZEPHIR_CALL_METHOD(&decoded, this_ptr, "decodeurl", NULL, 265, &signature); + ZEPHIR_CALL_METHOD(&decoded, this_ptr, "decodeurl", NULL, 266, &signature); zephir_check_call_status(); } object_init_ex(return_value, phalcon_encryption_security_jwt_token_signature_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 258, &decoded, &signature); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 259, &decoded, &signature); zephir_check_call_status(); RETURN_MM(); } @@ -391,7 +391,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeUrl) ZVAL_STRING(&_4, "+/"); ZEPHIR_CALL_FUNCTION(&_5, "strtr", NULL, 5, &input, &_3, &_4); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&data, "base64_decode", NULL, 230, &_5); + ZEPHIR_CALL_FUNCTION(&data, "base64_decode", NULL, 231, &_5); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&data)) { ZEPHIR_INIT_NVAR(&data); diff --git a/ext/phalcon/encryption/security/jwt/validator.zep.c b/ext/phalcon/encryption/security/jwt/validator.zep.c index 85863c757b7..159d3c1642f 100644 --- a/ext/phalcon/encryption/security/jwt/validator.zep.c +++ b/ext/phalcon/encryption/security/jwt/validator.zep.c @@ -348,7 +348,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateExpiration) _7 = zephir_is_true(&_6); if (_7) { ZVAL_LONG(&_9, timestamp); - ZEPHIR_CALL_METHOD(&_8, this_ptr, "gettimestamp", NULL, 266, &_9); + ZEPHIR_CALL_METHOD(&_8, this_ptr, "gettimestamp", NULL, 267, &_9); zephir_check_call_status(); _7 = ZEPHIR_GT_LONG(&_8, tokenExpirationTime); } @@ -447,7 +447,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateIssuedAt) zephir_check_call_status(); tokenIssuedAt = zephir_get_intval(&_2); ZVAL_LONG(&_5, timestamp); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "gettimestamp", NULL, 266, &_5); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "gettimestamp", NULL, 267, &_5); zephir_check_call_status(); if (ZEPHIR_LE_LONG(&_4, tokenIssuedAt)) { ZVAL_UNDEF(&_6$$3); @@ -552,7 +552,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateNotBefore) zephir_check_call_status(); tokenNotBefore = zephir_get_intval(&_2); ZVAL_LONG(&_5, timestamp); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "gettimestamp", NULL, 266, &_5); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "gettimestamp", NULL, 267, &_5); zephir_check_call_status(); if (ZEPHIR_LE_LONG(&_4, tokenNotBefore)) { ZVAL_UNDEF(&_6$$3); diff --git a/ext/phalcon/encryption/security/random.zep.c b/ext/phalcon/encryption/security/random.zep.c index 0df3c9a27b1..122e555e410 100644 --- a/ext/phalcon/encryption/security/random.zep.c +++ b/ext/phalcon/encryption/security/random.zep.c @@ -241,7 +241,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Random, base64) ZVAL_LONG(&_1, len); ZEPHIR_CALL_METHOD(&_0, this_ptr, "bytes", NULL, 0, &_1); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 231, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 232, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -302,7 +302,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Random, base64Safe) ZVAL_LONG(&_1, len); ZEPHIR_CALL_METHOD(&_0, this_ptr, "base64", NULL, 0, &_1); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_2, "base64_encode", NULL, 231, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "base64_encode", NULL, 232, &_0); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "+/"); @@ -367,7 +367,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Random, bytes) len = 16; } ZVAL_LONG(&_0, len); - ZEPHIR_RETURN_CALL_FUNCTION("random_bytes", NULL, 267, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("random_bytes", NULL, 268, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -414,7 +414,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Random, hex) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "H*"); - ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 268, &_2, &_0); + ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 269, &_2, &_0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&_3); ZEPHIR_RETURN_CALL_FUNCTION("array_shift", NULL, 22, &_3); @@ -456,7 +456,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Random, number) } ZVAL_LONG(&_0, 0); ZVAL_LONG(&_1, len); - ZEPHIR_RETURN_CALL_FUNCTION("random_int", NULL, 269, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("random_int", NULL, 270, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -507,7 +507,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Random, uuid) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "N1a/n1b/n1c/n1d/n1e/N1f"); - ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 268, &_2, &_0); + ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 269, &_2, &_0); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&ary, "array_values", NULL, 14, &_3); zephir_check_call_status(); @@ -522,7 +522,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Random, uuid) ZEPHIR_INIT_VAR(&_7); ZVAL_STRING(&_7, "%08x-%04x-%04x-%04x-%04x%08x"); ZEPHIR_MAKE_REF(&ary); - ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 270, &ary, &_7); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 271, &ary, &_7); ZEPHIR_UNREF(&ary); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_7); @@ -582,7 +582,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Random, base) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "C*"); - ZEPHIR_CALL_FUNCTION(&bytes, "unpack", NULL, 268, &_1, &_0); + ZEPHIR_CALL_FUNCTION(&bytes, "unpack", NULL, 269, &_1, &_0); zephir_check_call_status(); zephir_is_iterable(&bytes, 0, "phalcon/Encryption/Security/Random.zep", 351); if (Z_TYPE_P(&bytes) == IS_ARRAY) { diff --git a/ext/phalcon/events/manager.zep.c b/ext/phalcon/events/manager.zep.c index 717f39b2776..13d1b09ddf4 100644 --- a/ext/phalcon/events/manager.zep.c +++ b/ext/phalcon/events/manager.zep.c @@ -60,7 +60,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Events_Manager) */ zend_declare_property_null(phalcon_events_manager_ce, SL("responses"), ZEND_ACC_PROTECTED); phalcon_events_manager_ce->create_object = zephir_init_properties_Phalcon_Events_Manager; - zephir_declare_class_constant_long(phalcon_events_manager_ce, SL("DEFAULT_PRIORITY"), 100); zend_class_implements(phalcon_events_manager_ce, 1, phalcon_events_managerinterface_ce); return SUCCESS; @@ -117,7 +116,7 @@ PHP_METHOD(Phalcon_Events_Manager, attach) ZEPHIR_CALL_METHOD(&_0, this_ptr, "isvalidhandler", NULL, 0, handler); zephir_check_call_status(); if (UNEXPECTED(ZEPHIR_IS_FALSE_IDENTICAL(&_0))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_events_exception_ce, "Event handler must be an Object or Callable", "phalcon/Events/Manager.zep", 56); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_events_exception_ce, "Event handler must be an Object or Callable", "phalcon/Events/Manager.zep", 54); return; } zephir_memory_observe(&priorityQueue); @@ -131,7 +130,7 @@ PHP_METHOD(Phalcon_Events_Manager, attach) } ZVAL_LONG(&_2$$4, 1); - ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "setextractflags", NULL, 271, &_2$$4); + ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "setextractflags", NULL, 272, &_2$$4); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("events"), &eventType, &priorityQueue); } @@ -140,7 +139,7 @@ PHP_METHOD(Phalcon_Events_Manager, attach) priority = 100; } ZVAL_LONG(&_4, priority); - ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "insert", NULL, 272, handler, &_4); + ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "insert", NULL, 273, handler, &_4); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -222,7 +221,7 @@ PHP_METHOD(Phalcon_Events_Manager, detach) ZEPHIR_CALL_METHOD(&_0, this_ptr, "isvalidhandler", NULL, 0, handler); zephir_check_call_status(); if (UNEXPECTED(ZEPHIR_IS_FALSE_IDENTICAL(&_0))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_events_exception_ce, "Event handler must be an Object or Callable", "phalcon/Events/Manager.zep", 107); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_events_exception_ce, "Event handler must be an Object or Callable", "phalcon/Events/Manager.zep", 105); return; } zephir_memory_observe(&priorityQueue); @@ -236,7 +235,7 @@ PHP_METHOD(Phalcon_Events_Manager, detach) } ZVAL_LONG(&_2$$4, 1); - ZEPHIR_CALL_METHOD(NULL, &newPriorityQueue, "setextractflags", NULL, 271, &_2$$4); + ZEPHIR_CALL_METHOD(NULL, &newPriorityQueue, "setextractflags", NULL, 272, &_2$$4); zephir_check_call_status(); ZVAL_LONG(&_2$$4, 3); ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "setextractflags", NULL, 0, &_2$$4); @@ -253,11 +252,11 @@ PHP_METHOD(Phalcon_Events_Manager, detach) zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "next", &_5, 0); zephir_check_call_status(); - zephir_array_fetch_string(&_6$$5, &data, SL("data"), PH_NOISY | PH_READONLY, "phalcon/Events/Manager.zep", 132); + zephir_array_fetch_string(&_6$$5, &data, SL("data"), PH_NOISY | PH_READONLY, "phalcon/Events/Manager.zep", 130); if (!ZEPHIR_IS_IDENTICAL(&_6$$5, handler)) { - zephir_array_fetch_string(&_7$$6, &data, SL("data"), PH_NOISY | PH_READONLY, "phalcon/Events/Manager.zep", 134); - zephir_array_fetch_string(&_8$$6, &data, SL("priority"), PH_NOISY | PH_READONLY, "phalcon/Events/Manager.zep", 136); - ZEPHIR_CALL_METHOD(NULL, &newPriorityQueue, "insert", &_9, 272, &_7$$6, &_8$$6); + zephir_array_fetch_string(&_7$$6, &data, SL("data"), PH_NOISY | PH_READONLY, "phalcon/Events/Manager.zep", 132); + zephir_array_fetch_string(&_8$$6, &data, SL("priority"), PH_NOISY | PH_READONLY, "phalcon/Events/Manager.zep", 134); + ZEPHIR_CALL_METHOD(NULL, &newPriorityQueue, "insert", &_9, 273, &_7$$6, &_8$$6); zephir_check_call_status(); } } @@ -414,23 +413,23 @@ PHP_METHOD(Phalcon_Events_Manager, fire) if (ZEPHIR_IS_EMPTY(&events)) { RETURN_MM_NULL(); } - if (UNEXPECTED(!(zephir_memnstr_str(&eventType, SL(":"), "phalcon/Events/Manager.zep", 197)))) { + if (UNEXPECTED(!(zephir_memnstr_str(&eventType, SL(":"), "phalcon/Events/Manager.zep", 195)))) { ZEPHIR_INIT_VAR(&_1$$4); object_init_ex(&_1$$4, phalcon_events_exception_ce); ZEPHIR_INIT_VAR(&_2$$4); ZEPHIR_CONCAT_SV(&_2$$4, "Invalid event type ", &eventType); ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 33, &_2$$4); zephir_check_call_status(); - zephir_throw_exception_debug(&_1$$4, "phalcon/Events/Manager.zep", 198); + zephir_throw_exception_debug(&_1$$4, "phalcon/Events/Manager.zep", 196); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_INIT_VAR(&eventParts); zephir_fast_explode_str(&eventParts, SL(":"), &eventType, LONG_MAX); zephir_memory_observe(&type); - zephir_array_fetch_long(&type, &eventParts, 0, PH_NOISY, "phalcon/Events/Manager.zep", 202); + zephir_array_fetch_long(&type, &eventParts, 0, PH_NOISY, "phalcon/Events/Manager.zep", 200); zephir_memory_observe(&eventName); - zephir_array_fetch_long(&eventName, &eventParts, 1, PH_NOISY, "phalcon/Events/Manager.zep", 203); + zephir_array_fetch_long(&eventName, &eventParts, 1, PH_NOISY, "phalcon/Events/Manager.zep", 201); ZEPHIR_INIT_VAR(&status); ZVAL_NULL(&status); zephir_read_property(&_0, this_ptr, ZEND_STRL("collect"), PH_NOISY_CC | PH_READONLY); @@ -446,19 +445,19 @@ PHP_METHOD(Phalcon_Events_Manager, fire) } else { ZVAL_BOOL(&_4, 0); } - ZEPHIR_CALL_METHOD(NULL, &event, "__construct", NULL, 273, &eventName, source, data, &_4); + ZEPHIR_CALL_METHOD(NULL, &event, "__construct", NULL, 274, &eventName, source, data, &_4); zephir_check_call_status(); zephir_memory_observe(&fireEvents); if (zephir_array_isset_fetch(&fireEvents, &events, &type, 0)) { if (Z_TYPE_P(&fireEvents) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", NULL, 274, &fireEvents, &event); + ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", NULL, 275, &fireEvents, &event); zephir_check_call_status(); } } ZEPHIR_OBS_NVAR(&fireEvents); if (zephir_array_isset_fetch(&fireEvents, &events, &eventType, 0)) { if (Z_TYPE_P(&fireEvents) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", NULL, 274, &fireEvents, &event); + ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", NULL, 275, &fireEvents, &event); zephir_check_call_status(); } } @@ -505,7 +504,7 @@ PHP_METHOD(Phalcon_Events_Manager, fireQueue) ZEPHIR_CALL_METHOD(&eventName, event, "gettype", NULL, 0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&eventName) != IS_STRING)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_events_exception_ce, "The event type not valid", "phalcon/Events/Manager.zep", 250); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_events_exception_ce, "The event type not valid", "phalcon/Events/Manager.zep", 248); return; } ZEPHIR_CALL_METHOD(&source, event, "getsource", NULL, 0); @@ -630,7 +629,7 @@ PHP_METHOD(Phalcon_Events_Manager, getListeners) } ZEPHIR_CALL_METHOD(&_2$$4, &priorityQueue, "current", &_3, 0); zephir_check_call_status(); - zephir_array_append(&listeners, &_2$$4, PH_SEPARATE, "phalcon/Events/Manager.zep", 333); + zephir_array_append(&listeners, &_2$$4, PH_SEPARATE, "phalcon/Events/Manager.zep", 331); ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "next", &_4, 0); zephir_check_call_status(); } diff --git a/ext/phalcon/events/managerinterface.zep.c b/ext/phalcon/events/managerinterface.zep.c index 49758830bb6..369f78a895e 100644 --- a/ext/phalcon/events/managerinterface.zep.c +++ b/ext/phalcon/events/managerinterface.zep.c @@ -27,6 +27,8 @@ ZEPHIR_INIT_CLASS(Phalcon_Events_ManagerInterface) { ZEPHIR_REGISTER_INTERFACE(Phalcon\\Events, ManagerInterface, phalcon, events_managerinterface, phalcon_events_managerinterface_method_entry); + zephir_declare_class_constant_long(phalcon_events_managerinterface_ce, SL("DEFAULT_PRIORITY"), 100); + return SUCCESS; } diff --git a/ext/phalcon/events/managerinterface.zep.h b/ext/phalcon/events/managerinterface.zep.h index 3a5117c494e..292b0a7c4c3 100644 --- a/ext/phalcon/events/managerinterface.zep.h +++ b/ext/phalcon/events/managerinterface.zep.h @@ -7,6 +7,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_events_managerinterface_ ZEND_ARG_TYPE_INFO(0, eventType, IS_STRING, 0) ZEND_ARG_INFO(0, handler) + ZEND_ARG_TYPE_INFO(0, priority, IS_LONG, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_events_managerinterface_detach, 0, 2, IS_VOID, 0) diff --git a/ext/phalcon/filter/filter.zep.c b/ext/phalcon/filter/filter.zep.c index 37a50a37e9d..4b80c79b9f2 100644 --- a/ext/phalcon/filter/filter.zep.c +++ b/ext/phalcon/filter/filter.zep.c @@ -32,28 +32,29 @@ /** * Lazy loads, stores and exposes sanitizer objects * - * @method int absint(mixed $input) - * @method string alnum(mixed $input) - * @method string alpha(mixed $input) - * @method bool bool(mixed $input) - * @method string email(string $input) - * @method float float(mixed $input) - * @method int int(string $input) - * @method string lower(string $input) - * @method string lowerfirst(string $input) - * @method mixed regex(mixed $input, mixed $pattern, mixed $replace) - * @method mixed remove(mixed $input, mixed $replace) - * @method mixed replace(mixed $input, mixed $source, mixed $target) - * @method string special(string $input) - * @method string specialfull(string $input) - * @method string string(string $input) - * @method string stringlegacy(mixed $input) - * @method string striptags(string $input) - * @method string trim(string $input) - * @method string upper(string $input) - * @method string upperFirst(string $input) - * @method null upperWords(string $input): strin - * @method null url(string $input): strin + * @method int absint(mixed $input) + * @method string alnum(mixed $input) + * @method string alpha(mixed $input) + * @method bool bool(mixed $input) + * @method string email(string $input) + * @method float float(mixed $input) + * @method int int(string $input) + * @method string|false ip(string $input, int $filter = FILTER_FLAG_NONE) + * @method string lower(string $input) + * @method string lowerfirst(string $input) + * @method mixed regex(mixed $input, mixed $pattern, mixed $replace) + * @method mixed remove(mixed $input, mixed $replace) + * @method mixed replace(mixed $input, mixed $source, mixed $target) + * @method string special(string $input) + * @method string specialfull(string $input) + * @method string string(string $input) + * @method string stringlegacy(mixed $input) + * @method string striptags(string $input) + * @method string trim(string $input) + * @method string upper(string $input) + * @method string upperFirst(string $input) + * @method null upperWords(string $input): strin + * @method null url(string $input): strin * * @property array $mapper * @property array $services @@ -85,6 +86,8 @@ ZEPHIR_INIT_CLASS(Phalcon_Filter_Filter) zephir_declare_class_constant_string(phalcon_filter_filter_ce, SL("FILTER_INT"), "int"); + zephir_declare_class_constant_string(phalcon_filter_filter_ce, SL("FILTER_IP"), "ip"); + zephir_declare_class_constant_string(phalcon_filter_filter_ce, SL("FILTER_LOWER"), "lower"); zephir_declare_class_constant_string(phalcon_filter_filter_ce, SL("FILTER_LOWERFIRST"), "lowerfirst"); @@ -238,7 +241,7 @@ PHP_METHOD(Phalcon_Filter_Filter, get) ZEPHIR_CONCAT_SVS(&_2$$3, "Filter ", &name, " is not registered"); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 33, &_2$$3); zephir_check_call_status(); - zephir_throw_exception_debug(&_1$$3, "phalcon/Filter/Filter.zep", 121); + zephir_throw_exception_debug(&_1$$3, "phalcon/Filter/Filter.zep", 123); ZEPHIR_MM_RESTORE(); return; } @@ -246,13 +249,13 @@ PHP_METHOD(Phalcon_Filter_Filter, get) if (1 != zephir_array_isset(&_3, &name)) { zephir_read_property(&_4$$4, this_ptr, ZEND_STRL("mapper"), PH_NOISY_CC | PH_READONLY); zephir_memory_observe(&definition); - zephir_array_fetch(&definition, &_4$$4, &name, PH_NOISY, "phalcon/Filter/Filter.zep", 125); - ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "createinstance", NULL, 275, &definition); + zephir_array_fetch(&definition, &_4$$4, &name, PH_NOISY, "phalcon/Filter/Filter.zep", 127); + ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "createinstance", NULL, 276, &definition); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("services"), &name, &_5$$4); } zephir_read_property(&_6, this_ptr, ZEND_STRL("services"), PH_NOISY_CC | PH_READONLY); - zephir_array_fetch(&_7, &_6, &name, PH_NOISY | PH_READONLY, "phalcon/Filter/Filter.zep", 129); + zephir_array_fetch(&_7, &_6, &name, PH_NOISY | PH_READONLY, "phalcon/Filter/Filter.zep", 131); RETURN_CTOR(&_7); } @@ -323,7 +326,7 @@ PHP_METHOD(Phalcon_Filter_Filter, sanitize) } else { ZVAL_BOOL(&_0$$3, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processarraysanitizers", NULL, 276, sanitizers, value, &_0$$3); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processarraysanitizers", NULL, 277, sanitizers, value, &_0$$3); zephir_check_call_status(); RETURN_MM(); } @@ -332,11 +335,11 @@ PHP_METHOD(Phalcon_Filter_Filter, sanitize) _1 = !noRecursive; } if (_1) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processarrayvalues", NULL, 277, value, sanitizers); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processarrayvalues", NULL, 278, value, sanitizers); zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "sanitizer", NULL, 278, value, sanitizers); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "sanitizer", NULL, 279, value, sanitizers); zephir_check_call_status(); RETURN_MM(); } @@ -399,7 +402,7 @@ PHP_METHOD(Phalcon_Filter_Filter, init) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &mapper_param); zephir_get_arrval(&mapper, mapper_param); - zephir_is_iterable(&mapper, 0, "phalcon/Filter/Filter.zep", 231); + zephir_is_iterable(&mapper, 0, "phalcon/Filter/Filter.zep", 233); if (Z_TYPE_P(&mapper) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&mapper), _2, _3, _0) { @@ -514,7 +517,7 @@ PHP_METHOD(Phalcon_Filter_Filter, processArraySanitizers) RETVAL_ZVAL(value, 1, 0); RETURN_MM(); } - zephir_is_iterable(&sanitizers, 0, "phalcon/Filter/Filter.zep", 305); + zephir_is_iterable(&sanitizers, 0, "phalcon/Filter/Filter.zep", 307); if (Z_TYPE_P(&sanitizers) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&sanitizers), _2, _3, _0) { @@ -526,23 +529,23 @@ PHP_METHOD(Phalcon_Filter_Filter, processArraySanitizers) } ZEPHIR_INIT_NVAR(&sanitizer); ZVAL_COPY(&sanitizer, _0); - ZEPHIR_CALL_METHOD(&split, this_ptr, "splitsanitizerparameters", &_4, 279, &sanitizerKey, &sanitizer); + ZEPHIR_CALL_METHOD(&split, this_ptr, "splitsanitizerparameters", &_4, 280, &sanitizerKey, &sanitizer); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&sanitizerName); - zephir_array_fetch_long(&sanitizerName, &split, 0, PH_NOISY, "phalcon/Filter/Filter.zep", 281); + zephir_array_fetch_long(&sanitizerName, &split, 0, PH_NOISY, "phalcon/Filter/Filter.zep", 283); ZEPHIR_OBS_NVAR(&sanitizerParams); - zephir_array_fetch_long(&sanitizerParams, &split, 1, PH_NOISY, "phalcon/Filter/Filter.zep", 282); + zephir_array_fetch_long(&sanitizerParams, &split, 1, PH_NOISY, "phalcon/Filter/Filter.zep", 284); if (Z_TYPE_P(value) == IS_ARRAY) { if (noRecursive) { ZVAL_BOOL(&_6$$5, 1); } else { ZVAL_BOOL(&_6$$5, 0); } - ZEPHIR_CALL_METHOD(&_5$$5, this_ptr, "processvalueisarray", &_7, 280, value, &sanitizerName, &sanitizerParams, &_6$$5); + ZEPHIR_CALL_METHOD(&_5$$5, this_ptr, "processvalueisarray", &_7, 281, value, &sanitizerName, &sanitizerParams, &_6$$5); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_5$$5); } else { - ZEPHIR_CALL_METHOD(&_8$$6, this_ptr, "processvalueisnotarray", &_9, 281, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_8$$6, this_ptr, "processvalueisnotarray", &_9, 282, value, &sanitizerName, &sanitizerParams); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_8$$6); } @@ -560,23 +563,23 @@ PHP_METHOD(Phalcon_Filter_Filter, processArraySanitizers) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&sanitizer, &sanitizers, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&split, this_ptr, "splitsanitizerparameters", &_4, 279, &sanitizerKey, &sanitizer); + ZEPHIR_CALL_METHOD(&split, this_ptr, "splitsanitizerparameters", &_4, 280, &sanitizerKey, &sanitizer); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&sanitizerName); - zephir_array_fetch_long(&sanitizerName, &split, 0, PH_NOISY, "phalcon/Filter/Filter.zep", 281); + zephir_array_fetch_long(&sanitizerName, &split, 0, PH_NOISY, "phalcon/Filter/Filter.zep", 283); ZEPHIR_OBS_NVAR(&sanitizerParams); - zephir_array_fetch_long(&sanitizerParams, &split, 1, PH_NOISY, "phalcon/Filter/Filter.zep", 282); + zephir_array_fetch_long(&sanitizerParams, &split, 1, PH_NOISY, "phalcon/Filter/Filter.zep", 284); if (Z_TYPE_P(value) == IS_ARRAY) { if (noRecursive) { ZVAL_BOOL(&_11$$8, 1); } else { ZVAL_BOOL(&_11$$8, 0); } - ZEPHIR_CALL_METHOD(&_10$$8, this_ptr, "processvalueisarray", &_7, 280, value, &sanitizerName, &sanitizerParams, &_11$$8); + ZEPHIR_CALL_METHOD(&_10$$8, this_ptr, "processvalueisarray", &_7, 281, value, &sanitizerName, &sanitizerParams, &_11$$8); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_10$$8); } else { - ZEPHIR_CALL_METHOD(&_12$$9, this_ptr, "processvalueisnotarray", &_9, 281, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_12$$9, this_ptr, "processvalueisnotarray", &_9, 282, value, &sanitizerName, &sanitizerParams); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_12$$9); } @@ -640,7 +643,7 @@ PHP_METHOD(Phalcon_Filter_Filter, processArrayValues) } ZEPHIR_INIT_VAR(&arrayValues); array_init(&arrayValues); - zephir_is_iterable(&values, 0, "phalcon/Filter/Filter.zep", 334); + zephir_is_iterable(&values, 0, "phalcon/Filter/Filter.zep", 336); if (Z_TYPE_P(&values) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&values), _2, _3, _0) { @@ -652,7 +655,7 @@ PHP_METHOD(Phalcon_Filter_Filter, processArrayValues) } ZEPHIR_INIT_NVAR(&itemValue); ZVAL_COPY(&itemValue, _0); - ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "sanitizer", &_5, 278, &itemValue, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "sanitizer", &_5, 279, &itemValue, &sanitizerName, &sanitizerParams); zephir_check_call_status(); zephir_array_update_zval(&arrayValues, &itemKey, &_4$$3, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -669,7 +672,7 @@ PHP_METHOD(Phalcon_Filter_Filter, processArrayValues) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&itemValue, &values, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "sanitizer", &_5, 278, &itemValue, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "sanitizer", &_5, 279, &itemValue, &sanitizerName, &sanitizerParams); zephir_check_call_status(); zephir_array_update_zval(&arrayValues, &itemKey, &_6$$4, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &values, "next", NULL, 0); @@ -787,11 +790,11 @@ PHP_METHOD(Phalcon_Filter_Filter, processValueIsArray) zephir_get_strval(&sanitizerName, sanitizerName_param); zephir_get_arrval(&sanitizerParams, sanitizerParams_param); if (noRecursive) { - ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "sanitizer", NULL, 278, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "sanitizer", NULL, 279, value, &sanitizerName, &sanitizerParams); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_0$$3); } else { - ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "processarrayvalues", NULL, 277, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "processarrayvalues", NULL, 278, value, &sanitizerName, &sanitizerParams); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_1$$4); } @@ -832,7 +835,7 @@ PHP_METHOD(Phalcon_Filter_Filter, processValueIsNotArray) zephir_get_strval(&sanitizerName, sanitizerName_param); zephir_get_arrval(&sanitizerParams, sanitizerParams_param); if (Z_TYPE_P(value) != IS_ARRAY) { - ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "sanitizer", NULL, 278, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "sanitizer", NULL, 279, value, &sanitizerName, &sanitizerParams); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_0$$3); } diff --git a/ext/phalcon/filter/filterfactory.zep.c b/ext/phalcon/filter/filterfactory.zep.c index 984e3cd9c05..d4242aed5f1 100644 --- a/ext/phalcon/filter/filterfactory.zep.c +++ b/ext/phalcon/filter/filterfactory.zep.c @@ -58,7 +58,7 @@ PHP_METHOD(Phalcon_Filter_FilterFactory, newInstance) object_init_ex(return_value, phalcon_filter_filter_ce); ZEPHIR_CALL_METHOD(&_0, this_ptr, "getservices", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 282, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 283, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -71,7 +71,7 @@ PHP_METHOD(Phalcon_Filter_FilterFactory, newInstance) PHP_METHOD(Phalcon_Filter_FilterFactory, getServices) { - zephir_create_array(return_value, 22, 0); + zephir_create_array(return_value, 23, 0); add_assoc_stringl_ex(return_value, SL("absint"), SL("Phalcon\\Filter\\Sanitize\\AbsInt")); add_assoc_stringl_ex(return_value, SL("alnum"), SL("Phalcon\\Filter\\Sanitize\\Alnum")); add_assoc_stringl_ex(return_value, SL("alpha"), SL("Phalcon\\Filter\\Sanitize\\Alpha")); @@ -79,6 +79,7 @@ PHP_METHOD(Phalcon_Filter_FilterFactory, getServices) add_assoc_stringl_ex(return_value, SL("email"), SL("Phalcon\\Filter\\Sanitize\\Email")); add_assoc_stringl_ex(return_value, SL("float"), SL("Phalcon\\Filter\\Sanitize\\FloatVal")); add_assoc_stringl_ex(return_value, SL("int"), SL("Phalcon\\Filter\\Sanitize\\IntVal")); + add_assoc_stringl_ex(return_value, SL("ip"), SL("Phalcon\\Filter\\Sanitize\\Ip")); add_assoc_stringl_ex(return_value, SL("lower"), SL("Phalcon\\Filter\\Sanitize\\Lower")); add_assoc_stringl_ex(return_value, SL("lowerfirst"), SL("Phalcon\\Filter\\Sanitize\\LowerFirst")); add_assoc_stringl_ex(return_value, SL("regex"), SL("Phalcon\\Filter\\Sanitize\\Regex")); diff --git a/ext/phalcon/filter/sanitize/absint.zep.c b/ext/phalcon/filter/sanitize/absint.zep.c index 2f3dec16523..cfceff03bbf 100644 --- a/ext/phalcon/filter/sanitize/absint.zep.c +++ b/ext/phalcon/filter/sanitize/absint.zep.c @@ -59,10 +59,10 @@ PHP_METHOD(Phalcon_Filter_Sanitize_AbsInt, __invoke) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &input); ZVAL_LONG(&_0, 519); - ZEPHIR_CALL_FUNCTION(&_1, "filter_var", NULL, 283, input, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "filter_var", NULL, 284, input, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, zephir_get_intval(&_1)); - ZEPHIR_RETURN_CALL_FUNCTION("abs", NULL, 284, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("abs", NULL, 285, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/email.zep.c b/ext/phalcon/filter/sanitize/email.zep.c index 2c3bc317996..ae7c552540b 100644 --- a/ext/phalcon/filter/sanitize/email.zep.c +++ b/ext/phalcon/filter/sanitize/email.zep.c @@ -59,7 +59,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_Email, __invoke) zephir_fetch_params(1, 1, 0, &input); ZVAL_LONG(&_0, 517); ZVAL_LONG(&_1, 1048576); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 283, input, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 284, input, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/floatval.zep.c b/ext/phalcon/filter/sanitize/floatval.zep.c index 9657be336a5..dadb753de02 100644 --- a/ext/phalcon/filter/sanitize/floatval.zep.c +++ b/ext/phalcon/filter/sanitize/floatval.zep.c @@ -65,7 +65,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_FloatVal, __invoke) zephir_create_array(&_0, 1, 0); add_assoc_long_ex(&_0, SL("flags"), 4096); ZVAL_LONG(&_1, 520); - ZEPHIR_CALL_FUNCTION(&_2, "filter_var", NULL, 283, input, &_1, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "filter_var", NULL, 284, input, &_1, &_0); zephir_check_call_status(); RETURN_MM_DOUBLE(zephir_get_doubleval(&_2)); } diff --git a/ext/phalcon/filter/sanitize/intval.zep.c b/ext/phalcon/filter/sanitize/intval.zep.c index 39802cf91c9..c4a32658dda 100644 --- a/ext/phalcon/filter/sanitize/intval.zep.c +++ b/ext/phalcon/filter/sanitize/intval.zep.c @@ -59,7 +59,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_IntVal, __invoke) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &input); ZVAL_LONG(&_0, 519); - ZEPHIR_CALL_FUNCTION(&_1, "filter_var", NULL, 283, input, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "filter_var", NULL, 284, input, &_0); zephir_check_call_status(); RETURN_MM_LONG(zephir_get_intval(&_1)); } diff --git a/ext/phalcon/filter/sanitize/ip.zep.c b/ext/phalcon/filter/sanitize/ip.zep.c new file mode 100644 index 00000000000..7bc9b29f508 --- /dev/null +++ b/ext/phalcon/filter/sanitize/ip.zep.c @@ -0,0 +1,206 @@ + +#ifdef HAVE_CONFIG_H +#include "../../../ext_config.h" +#endif + +#include +#include "../../../php_ext.h" +#include "../../../ext.h" + +#include +#include +#include + +#include "kernel/main.h" +#include "kernel/fcall.h" +#include "kernel/operators.h" +#include "kernel/string.h" +#include "kernel/memory.h" +#include "kernel/array.h" +#include "kernel/concat.h" +#include "kernel/object.h" + + +/** + * This file is part of the Phalcon Framework. + * + * (c) Phalcon Team + * + * For the full copyright and license information, please view the LICENSE.txt + * file that was distributed with this source code. + */ +/** + * Phalcon\Filter\Sanitize\IP + * + * Sanitizes a value to an ip address or CIDR range + */ +ZEPHIR_INIT_CLASS(Phalcon_Filter_Sanitize_Ip) +{ + ZEPHIR_REGISTER_CLASS(Phalcon\\Filter\\Sanitize, Ip, phalcon, filter_sanitize_ip, phalcon_filter_sanitize_ip_method_entry, 0); + + return SUCCESS; +} + +/** + * @param string $input + * @param int $filter + * @return false|string + */ +PHP_METHOD(Phalcon_Filter_Sanitize_Ip, __invoke) +{ + zend_bool _2$$6, _3$$6, _6$$9, _7$$9; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long filter, ZEPHIR_LAST_CALL_STATUS; + zval *input_param = NULL, *filter_param = NULL, parts, ip, mask, protocol, filtered, _0$$5, _1$$5, _4$$8, _5$$8, _8$$12, _9$$12, _10$$13, _11$$13; + zval input; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&input); + ZVAL_UNDEF(&parts); + ZVAL_UNDEF(&ip); + ZVAL_UNDEF(&mask); + ZVAL_UNDEF(&protocol); + ZVAL_UNDEF(&filtered); + ZVAL_UNDEF(&_0$$5); + ZVAL_UNDEF(&_1$$5); + ZVAL_UNDEF(&_4$$8); + ZVAL_UNDEF(&_5$$8); + ZVAL_UNDEF(&_8$$12); + ZVAL_UNDEF(&_9$$12); + ZVAL_UNDEF(&_10$$13); + ZVAL_UNDEF(&_11$$13); + ZEND_PARSE_PARAMETERS_START(1, 2) + Z_PARAM_STR(input) + Z_PARAM_OPTIONAL + Z_PARAM_LONG(filter) + ZEND_PARSE_PARAMETERS_END(); + ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); + zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); + zephir_fetch_params(1, 1, 1, &input_param, &filter_param); + zephir_get_strval(&input, input_param); + if (!filter_param) { + filter = 0; + } else { + } + ZEPHIR_CALL_METHOD(&protocol, this_ptr, "getipaddressprotocolversion", NULL, 286, &input); + zephir_check_call_status(); + if (ZEPHIR_IS_FALSE_IDENTICAL(&protocol)) { + RETURN_MM_BOOL(0); + } + if (zephir_memnstr_str(&input, SL("/"), "phalcon/Filter/Sanitize/Ip.zep", 35)) { + ZEPHIR_INIT_VAR(&parts); + zephir_fast_explode_str(&parts, SL("/"), &input, 2 ); + zephir_memory_observe(&ip); + zephir_array_fetch_long(&ip, &parts, 0, PH_NOISY, "phalcon/Filter/Sanitize/Ip.zep", 37); + zephir_memory_observe(&mask); + zephir_array_fetch_long(&mask, &parts, 1, PH_NOISY, "phalcon/Filter/Sanitize/Ip.zep", 38); + if (ZEPHIR_IS_LONG_IDENTICAL(&protocol, 4)) { + ZVAL_LONG(&_0$$5, 275); + ZVAL_LONG(&_1$$5, (1048576 | filter)); + ZEPHIR_CALL_FUNCTION(&filtered, "filter_var", NULL, 284, &ip, &_0$$5, &_1$$5); + zephir_check_call_status(); + if (!ZEPHIR_IS_FALSE_IDENTICAL(&filtered)) { + _2$$6 = zephir_is_numeric(&mask); + if (_2$$6) { + _2$$6 = ZEPHIR_GE_LONG(&mask, 0); + } + _3$$6 = _2$$6; + if (_3$$6) { + _3$$6 = ZEPHIR_LE_LONG(&mask, 32); + } + if (_3$$6) { + ZEPHIR_CONCAT_VSV(return_value, &filtered, "/", &mask); + RETURN_MM(); + } + } + } + if (ZEPHIR_IS_LONG_IDENTICAL(&protocol, 6)) { + ZVAL_LONG(&_4$$8, 275); + ZVAL_LONG(&_5$$8, (2097152 | filter)); + ZEPHIR_CALL_FUNCTION(&filtered, "filter_var", NULL, 284, &ip, &_4$$8, &_5$$8); + zephir_check_call_status(); + if (zephir_is_true(&filtered)) { + _6$$9 = zephir_is_numeric(&mask); + if (_6$$9) { + _6$$9 = ZEPHIR_GE_LONG(&mask, 0); + } + _7$$9 = _6$$9; + if (_7$$9) { + _7$$9 = ZEPHIR_LE_LONG(&mask, 128); + } + if (_7$$9) { + ZEPHIR_CONCAT_VSV(return_value, &filtered, "/", &mask); + RETURN_MM(); + } + } + } + } else { + if (ZEPHIR_IS_LONG_IDENTICAL(&protocol, 4)) { + ZVAL_LONG(&_8$$12, 275); + ZVAL_LONG(&_9$$12, (1048576 | filter)); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 284, &input, &_8$$12, &_9$$12); + zephir_check_call_status(); + RETURN_MM(); + } + if (ZEPHIR_IS_LONG_IDENTICAL(&protocol, 6)) { + ZVAL_LONG(&_10$$13, 275); + ZVAL_LONG(&_11$$13, (2097152 | filter)); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 284, &input, &_10$$13, &_11$$13); + zephir_check_call_status(); + RETURN_MM(); + } + } + RETURN_MM_BOOL(0); +} + +/** + * Return the IP address protocol version + * + * @param $ip + * @return int|false + */ +PHP_METHOD(Phalcon_Filter_Sanitize_Ip, getIpAddressProtocolVersion) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *input_param = NULL, parts, ip, _0, _1, _2, _3; + zval input; + + ZVAL_UNDEF(&input); + ZVAL_UNDEF(&parts); + ZVAL_UNDEF(&ip); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_3); + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_STR(input) + ZEND_PARSE_PARAMETERS_END(); + ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); + zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); + zephir_fetch_params(1, 1, 0, &input_param); + zephir_get_strval(&input, input_param); + ZEPHIR_CPY_WRT(&ip, &input); + if (zephir_memnstr_str(&ip, SL("/"), "phalcon/Filter/Sanitize/Ip.zep", 85)) { + ZEPHIR_INIT_VAR(&parts); + zephir_fast_explode_str(&parts, SL("/"), &ip, 2 ); + ZEPHIR_OBS_NVAR(&ip); + zephir_array_fetch_long(&ip, &parts, 0, PH_NOISY, "phalcon/Filter/Sanitize/Ip.zep", 87); + } + ZVAL_LONG(&_0, 275); + ZVAL_LONG(&_1, 1048576); + ZEPHIR_CALL_FUNCTION(&_2, "filter_var", NULL, 284, &ip, &_0, &_1); + zephir_check_call_status(); + if (!ZEPHIR_IS_FALSE_IDENTICAL(&_2)) { + RETURN_MM_LONG(4); + } + ZVAL_LONG(&_0, 275); + ZVAL_LONG(&_1, 2097152); + ZEPHIR_CALL_FUNCTION(&_3, "filter_var", NULL, 284, &ip, &_0, &_1); + zephir_check_call_status(); + if (!ZEPHIR_IS_FALSE_IDENTICAL(&_3)) { + RETURN_MM_LONG(6); + } + RETURN_MM_BOOL(0); +} + diff --git a/ext/phalcon/filter/sanitize/ip.zep.h b/ext/phalcon/filter/sanitize/ip.zep.h new file mode 100644 index 00000000000..dbf70cd90c8 --- /dev/null +++ b/ext/phalcon/filter/sanitize/ip.zep.h @@ -0,0 +1,22 @@ + +extern zend_class_entry *phalcon_filter_sanitize_ip_ce; + +ZEPHIR_INIT_CLASS(Phalcon_Filter_Sanitize_Ip); + +PHP_METHOD(Phalcon_Filter_Sanitize_Ip, __invoke); +PHP_METHOD(Phalcon_Filter_Sanitize_Ip, getIpAddressProtocolVersion); + +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_filter_sanitize_ip___invoke, 0, 0, 1) + ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, filter, IS_LONG, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_phalcon_filter_sanitize_ip_getipaddressprotocolversion, 0, 1, MAY_BE_LONG|MAY_BE_FALSE) + ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0) +ZEND_END_ARG_INFO() + +ZEPHIR_INIT_FUNCS(phalcon_filter_sanitize_ip_method_entry) { + PHP_ME(Phalcon_Filter_Sanitize_Ip, __invoke, arginfo_phalcon_filter_sanitize_ip___invoke, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Filter_Sanitize_Ip, getIpAddressProtocolVersion, arginfo_phalcon_filter_sanitize_ip_getipaddressprotocolversion, ZEND_ACC_PRIVATE) + PHP_FE_END +}; diff --git a/ext/phalcon/filter/sanitize/lower.zep.c b/ext/phalcon/filter/sanitize/lower.zep.c index ac6bbf086b0..d73b1017bc6 100644 --- a/ext/phalcon/filter/sanitize/lower.zep.c +++ b/ext/phalcon/filter/sanitize/lower.zep.c @@ -80,7 +80,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_Lower, __invoke) zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 285, &input); + ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 287, &input); zephir_check_call_status(); zephir_fast_strtolower(return_value, &_2); RETURN_MM(); diff --git a/ext/phalcon/filter/sanitize/special.zep.c b/ext/phalcon/filter/sanitize/special.zep.c index 9619ebe74c8..414b22a657e 100644 --- a/ext/phalcon/filter/sanitize/special.zep.c +++ b/ext/phalcon/filter/sanitize/special.zep.c @@ -57,7 +57,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_Special, __invoke) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &input); ZVAL_LONG(&_0, 515); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 283, input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 284, input, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/specialfull.zep.c b/ext/phalcon/filter/sanitize/specialfull.zep.c index 52e6ff3c8aa..12c5d3c815f 100644 --- a/ext/phalcon/filter/sanitize/specialfull.zep.c +++ b/ext/phalcon/filter/sanitize/specialfull.zep.c @@ -57,7 +57,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_SpecialFull, __invoke) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &input); ZVAL_LONG(&_0, 522); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 283, input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 284, input, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/stringval.zep.c b/ext/phalcon/filter/sanitize/stringval.zep.c index 63513a7be1f..6e5994526b8 100644 --- a/ext/phalcon/filter/sanitize/stringval.zep.c +++ b/ext/phalcon/filter/sanitize/stringval.zep.c @@ -65,7 +65,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_StringVal, __invoke) } else { } ZVAL_LONG(&_0, flags); - ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 286, &input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 288, &input, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/stringvallegacy.zep.c b/ext/phalcon/filter/sanitize/stringvallegacy.zep.c index c8465f4f953..7238b8355e4 100644 --- a/ext/phalcon/filter/sanitize/stringvallegacy.zep.c +++ b/ext/phalcon/filter/sanitize/stringvallegacy.zep.c @@ -76,7 +76,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_StringValLegacy, __invoke) } if (_0) { ZVAL_LONG(&_2$$3, 513); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 283, input, &_2$$3); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 284, input, &_2$$3); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/striptags.zep.c b/ext/phalcon/filter/sanitize/striptags.zep.c index 4cbf3982115..f4691a559ec 100644 --- a/ext/phalcon/filter/sanitize/striptags.zep.c +++ b/ext/phalcon/filter/sanitize/striptags.zep.c @@ -68,7 +68,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_Striptags, __invoke) } else { ZEPHIR_INIT_VAR(&input); } - ZEPHIR_RETURN_CALL_FUNCTION("strip_tags", NULL, 287, &input); + ZEPHIR_RETURN_CALL_FUNCTION("strip_tags", NULL, 289, &input); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/upper.zep.c b/ext/phalcon/filter/sanitize/upper.zep.c index 6b7270ee518..141496c1747 100644 --- a/ext/phalcon/filter/sanitize/upper.zep.c +++ b/ext/phalcon/filter/sanitize/upper.zep.c @@ -80,7 +80,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_Upper, __invoke) zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 285, &input); + ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 287, &input); zephir_check_call_status(); zephir_fast_strtoupper(return_value, &_2); RETURN_MM(); diff --git a/ext/phalcon/filter/sanitize/upperwords.zep.c b/ext/phalcon/filter/sanitize/upperwords.zep.c index 041a9623689..9626af4c73d 100644 --- a/ext/phalcon/filter/sanitize/upperwords.zep.c +++ b/ext/phalcon/filter/sanitize/upperwords.zep.c @@ -79,9 +79,9 @@ PHP_METHOD(Phalcon_Filter_Sanitize_UpperWords, __invoke) zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 285, &input); + ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 287, &input); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("ucwords", NULL, 288, &_2); + ZEPHIR_RETURN_CALL_FUNCTION("ucwords", NULL, 290, &_2); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/url.zep.c b/ext/phalcon/filter/sanitize/url.zep.c index 83c075483ed..3eab684868b 100644 --- a/ext/phalcon/filter/sanitize/url.zep.c +++ b/ext/phalcon/filter/sanitize/url.zep.c @@ -57,7 +57,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_Url, __invoke) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &input); ZVAL_LONG(&_0, 518); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 283, input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 284, input, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/validation.zep.c b/ext/phalcon/filter/validation.zep.c index ec9ff884b3f..1ec78035626 100644 --- a/ext/phalcon/filter/validation.zep.c +++ b/ext/phalcon/filter/validation.zep.c @@ -18,8 +18,8 @@ #include "kernel/operators.h" #include "kernel/array.h" #include "kernel/exception.h" -#include "kernel/string.h" #include "kernel/concat.h" +#include "kernel/string.h" #include "ext/spl/spl_exceptions.h" @@ -54,6 +54,10 @@ ZEPHIR_INIT_CLASS(Phalcon_Filter_Validation) * @var array */ zend_declare_property_null(phalcon_filter_validation_ce, SL("filters"), ZEND_ACC_PROTECTED); + /** + * @var array + */ + zend_declare_property_null(phalcon_filter_validation_ce, SL("whitelist"), ZEND_ACC_PROTECTED); /** * @var array */ @@ -164,7 +168,7 @@ PHP_METHOD(Phalcon_Filter_Validation, add) zephir_array_fast_append(&_0$$4, validator); zephir_update_property_array_append(this_ptr, SL("combinedFieldsValidators"), &_0$$4); } else { - zephir_is_iterable(field, 0, "phalcon/Filter/Validation.zep", 120); + zephir_is_iterable(field, 0, "phalcon/Filter/Validation.zep", 125); if (Z_TYPE_P(field) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(field), _1$$5) { @@ -193,7 +197,7 @@ PHP_METHOD(Phalcon_Filter_Validation, add) } else if (Z_TYPE_P(field) == IS_STRING) { zephir_update_property_array_multi(this_ptr, SL("validators"), validator, SL("za"), 2, field); } else { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Field must be passed as array of fields or string", "phalcon/Filter/Validation.zep", 126); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Field must be passed as array of fields or string", "phalcon/Filter/Validation.zep", 131); return; } RETURN_THIS(); @@ -228,7 +232,7 @@ PHP_METHOD(Phalcon_Filter_Validation, appendMessage) ZEPHIR_CALL_METHOD(NULL, &messages, "__construct", NULL, 8); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, &messages, "appendmessage", NULL, 289, message); + ZEPHIR_CALL_METHOD(NULL, &messages, "appendmessage", NULL, 291, message); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("messages"), &messages); RETURN_THIS(); @@ -238,37 +242,205 @@ PHP_METHOD(Phalcon_Filter_Validation, appendMessage) * Assigns the data to an entity * The entity is used to obtain the validation values * - * @param object entity - * @param array|object data + * ```php + * $entity = new Author(); + * $fields = ['name', 'email', 'imageUrl']; + * $validation = new AuthorValidation(); + * $validation->bind($entity, $_POST, $fields); + * $validation->validate(); + * ``` + * + * @param object $entity the entity object to assign data to + * @param array|object $data the data that needs to be validated + * @param array $whitelist only allow these fields to be mutated when entity is used */ PHP_METHOD(Phalcon_Filter_Validation, bind) { - zend_bool _0; + zend_string *_9; + zend_ulong _8; + zend_bool _0, _1, _10$$8, _19$$14; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zephir_fcall_cache_entry *_12 = NULL, *_18 = NULL, *_21 = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *entity, entity_sub, *data, data_sub; + zval whitelist; + zval *entity, entity_sub, *data, data_sub, *whitelist_param = NULL, container, field, value, fieldFilters, filterService, filters, method, _2, _3, _5, *_6, _7, _4$$7, _13$$8, _14$$8, _15$$8, _16$$8, _17$$8, _11$$10, _22$$14, _23$$14, _24$$14, _25$$14, _26$$14, _20$$16; zval *this_ptr = getThis(); ZVAL_UNDEF(&entity_sub); ZVAL_UNDEF(&data_sub); - ZEND_PARSE_PARAMETERS_START(2, 2) + ZVAL_UNDEF(&container); + ZVAL_UNDEF(&field); + ZVAL_UNDEF(&value); + ZVAL_UNDEF(&fieldFilters); + ZVAL_UNDEF(&filterService); + ZVAL_UNDEF(&filters); + ZVAL_UNDEF(&method); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_3); + ZVAL_UNDEF(&_5); + ZVAL_UNDEF(&_7); + ZVAL_UNDEF(&_4$$7); + ZVAL_UNDEF(&_13$$8); + ZVAL_UNDEF(&_14$$8); + ZVAL_UNDEF(&_15$$8); + ZVAL_UNDEF(&_16$$8); + ZVAL_UNDEF(&_17$$8); + ZVAL_UNDEF(&_11$$10); + ZVAL_UNDEF(&_22$$14); + ZVAL_UNDEF(&_23$$14); + ZVAL_UNDEF(&_24$$14); + ZVAL_UNDEF(&_25$$14); + ZVAL_UNDEF(&_26$$14); + ZVAL_UNDEF(&_20$$16); + ZVAL_UNDEF(&whitelist); + ZEND_PARSE_PARAMETERS_START(2, 3) Z_PARAM_ZVAL(entity) Z_PARAM_ZVAL(data) + Z_PARAM_OPTIONAL + Z_PARAM_ARRAY(whitelist) ZEND_PARSE_PARAMETERS_END(); ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - zephir_fetch_params(1, 2, 0, &entity, &data); + zephir_fetch_params(1, 2, 1, &entity, &data, &whitelist_param); + if (!whitelist_param) { + ZEPHIR_INIT_VAR(&whitelist); + array_init(&whitelist); + } else { + zephir_get_arrval(&whitelist, whitelist_param); + } + zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data); ZEPHIR_CALL_METHOD(NULL, this_ptr, "setentity", NULL, 0, entity); zephir_check_call_status(); _0 = Z_TYPE_P(data) != IS_ARRAY; if (_0) { _0 = Z_TYPE_P(data) != IS_OBJECT; } - if (UNEXPECTED(_0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Data to validate must be an array or object", "phalcon/Filter/Validation.zep", 166); + _1 = _0; + if (!(_1)) { + _1 = (Z_TYPE_P(entity) == IS_NULL); + } + if (UNEXPECTED(_1)) { + RETURN_THIS(); + } + ZEPHIR_CALL_METHOD(&container, this_ptr, "getdi", NULL, 0); + zephir_check_call_status(); + if (Z_TYPE_P(&container) == IS_NULL) { + ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", NULL, 0); + zephir_check_call_status(); + if (Z_TYPE_P(&container) == IS_NULL) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "A dependency injection container is required to access the 'filter' service", "phalcon/Filter/Validation.zep", 194); + return; + } + } + ZEPHIR_INIT_VAR(&_3); + ZVAL_STRING(&_3, "filter"); + ZEPHIR_CALL_METHOD(&_2, &container, "getshared", NULL, 0, &_3); + zephir_check_call_status(); + ZEPHIR_CPY_WRT(&filterService, &_2); + if (UNEXPECTED(Z_TYPE_P(&filterService) != IS_OBJECT)) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Returned 'filter' service is invalid", "phalcon/Filter/Validation.zep", 199); return; } - zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data); + if (ZEPHIR_IS_EMPTY(&whitelist)) { + zephir_read_property(&_4$$7, this_ptr, ZEND_STRL("whitelist"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CPY_WRT(&whitelist, &_4$$7); + } + zephir_read_property(&_5, this_ptr, ZEND_STRL("filters"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CPY_WRT(&filters, &_5); + zephir_is_iterable(data, 0, "phalcon/Filter/Validation.zep", 233); + if (Z_TYPE_P(data) == IS_ARRAY) { + ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(data), _8, _9, _6) + { + ZEPHIR_INIT_NVAR(&field); + if (_9 != NULL) { + ZVAL_STR_COPY(&field, _9); + } else { + ZVAL_LONG(&field, _8); + } + ZEPHIR_INIT_NVAR(&value); + ZVAL_COPY(&value, _6); + _10$$8 = !(ZEPHIR_IS_EMPTY(&whitelist)); + if (_10$$8) { + _10$$8 = !(zephir_fast_in_array(&field, &whitelist)); + } + if (_10$$8) { + continue; + } + ZEPHIR_OBS_NVAR(&fieldFilters); + if (zephir_array_isset_fetch(&fieldFilters, &filters, &field, 0)) { + ZEPHIR_CALL_METHOD(&_11$$10, &filterService, "sanitize", &_12, 0, &value, &fieldFilters); + zephir_check_call_status(); + ZEPHIR_CPY_WRT(&value, &_11$$10); + } + ZEPHIR_INIT_NVAR(&_13$$8); + zephir_camelize(&_13$$8, &field, NULL ); + ZEPHIR_INIT_NVAR(&method); + ZEPHIR_CONCAT_SV(&method, "set", &_13$$8); + zephir_read_property(&_14$$8, this_ptr, ZEND_STRL("entity"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_15$$8, this_ptr, ZEND_STRL("entity"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_16$$8, this_ptr, ZEND_STRL("entity"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_FUNCTION(&_17$$8, "property_exists", &_18, 292, &_16$$8, &field); + zephir_check_call_status(); + if ((zephir_method_exists(&_14$$8, &method) == SUCCESS)) { + ZEPHIR_CALL_METHOD_ZVAL(NULL, entity, &method, NULL, 0, &value); + zephir_check_call_status(); + } else if ((zephir_method_exists_ex(&_15$$8, ZEND_STRL("writeattribute")) == SUCCESS)) { + ZEPHIR_CALL_METHOD(NULL, entity, "writeattribute", NULL, 0, &field, &value); + zephir_check_call_status(); + } else if (zephir_is_true(&_17$$8)) { + zephir_update_property_zval_zval(entity, &field, &value); + } + } ZEND_HASH_FOREACH_END(); + } else { + ZEPHIR_CALL_METHOD(NULL, data, "rewind", NULL, 0); + zephir_check_call_status(); + while (1) { + ZEPHIR_CALL_METHOD(&_7, data, "valid", NULL, 0); + zephir_check_call_status(); + if (!zend_is_true(&_7)) { + break; + } + ZEPHIR_CALL_METHOD(&field, data, "key", NULL, 0); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&value, data, "current", NULL, 0); + zephir_check_call_status(); + _19$$14 = !(ZEPHIR_IS_EMPTY(&whitelist)); + if (_19$$14) { + _19$$14 = !(zephir_fast_in_array(&field, &whitelist)); + } + if (_19$$14) { + continue; + } + ZEPHIR_OBS_NVAR(&fieldFilters); + if (zephir_array_isset_fetch(&fieldFilters, &filters, &field, 0)) { + ZEPHIR_CALL_METHOD(&_20$$16, &filterService, "sanitize", &_21, 0, &value, &fieldFilters); + zephir_check_call_status(); + ZEPHIR_CPY_WRT(&value, &_20$$16); + } + ZEPHIR_INIT_NVAR(&_22$$14); + zephir_camelize(&_22$$14, &field, NULL ); + ZEPHIR_INIT_NVAR(&method); + ZEPHIR_CONCAT_SV(&method, "set", &_22$$14); + zephir_read_property(&_23$$14, this_ptr, ZEND_STRL("entity"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_24$$14, this_ptr, ZEND_STRL("entity"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_25$$14, this_ptr, ZEND_STRL("entity"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_FUNCTION(&_26$$14, "property_exists", &_18, 292, &_25$$14, &field); + zephir_check_call_status(); + if ((zephir_method_exists(&_23$$14, &method) == SUCCESS)) { + ZEPHIR_CALL_METHOD_ZVAL(NULL, entity, &method, NULL, 0, &value); + zephir_check_call_status(); + } else if ((zephir_method_exists_ex(&_24$$14, ZEND_STRL("writeattribute")) == SUCCESS)) { + ZEPHIR_CALL_METHOD(NULL, entity, "writeattribute", NULL, 0, &field, &value); + zephir_check_call_status(); + } else if (zephir_is_true(&_26$$14)) { + zephir_update_property_zval_zval(entity, &field, &value); + } + ZEPHIR_CALL_METHOD(NULL, data, "next", NULL, 0); + zephir_check_call_status(); + } + } + ZEPHIR_INIT_NVAR(&value); + ZEPHIR_INIT_NVAR(&field); RETURN_THIS(); } @@ -469,7 +641,7 @@ PHP_METHOD(Phalcon_Filter_Validation, getValueByData) } if (Z_TYPE_P(data) == IS_ARRAY) { if (zephir_array_isset(data, &field)) { - zephir_array_fetch(&_1$$5, data, &field, PH_NOISY | PH_READONLY, "phalcon/Filter/Validation.zep", 296); + zephir_array_fetch(&_1$$5, data, &field, PH_NOISY | PH_READONLY, "phalcon/Filter/Validation.zep", 358); RETURN_CTOR(&_1$$5); } } @@ -537,7 +709,7 @@ PHP_METHOD(Phalcon_Filter_Validation, getValue) _1$$5 = Z_TYPE_P(&data) != IS_OBJECT; } if (UNEXPECTED(_1$$5)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "There is no data to validate", "phalcon/Filter/Validation.zep", 333); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "There is no data to validate", "phalcon/Filter/Validation.zep", 395); return; } ZEPHIR_CALL_METHOD(&value, this_ptr, "getvaluebydata", NULL, 0, &data, &field); @@ -557,7 +729,7 @@ PHP_METHOD(Phalcon_Filter_Validation, getValue) ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&container) == IS_NULL) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "A dependency injection container is required to access the 'filter' service", "phalcon/Filter/Validation.zep", 354); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "A dependency injection container is required to access the 'filter' service", "phalcon/Filter/Validation.zep", 416); return; } } @@ -567,7 +739,7 @@ PHP_METHOD(Phalcon_Filter_Validation, getValue) zephir_check_call_status(); ZEPHIR_CPY_WRT(&filterService, &_2$$9); if (UNEXPECTED(Z_TYPE_P(&filterService) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Returned 'filter' service is invalid", "phalcon/Filter/Validation.zep", 361); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Returned 'filter' service is invalid", "phalcon/Filter/Validation.zep", 423); return; } ZEPHIR_CALL_METHOD(&_2$$9, &filterService, "sanitize", NULL, 0, &value, &fieldFilters); @@ -582,7 +754,7 @@ PHP_METHOD(Phalcon_Filter_Validation, getValue) zephir_camelize(&_5$$13, &field, NULL ); ZEPHIR_INIT_VAR(&method); ZEPHIR_CONCAT_SV(&method, "set", &_5$$13); - ZEPHIR_CALL_FUNCTION(&_6$$13, "property_exists", NULL, 290, &entity, &field); + ZEPHIR_CALL_FUNCTION(&_6$$13, "property_exists", NULL, 292, &entity, &field); zephir_check_call_status(); if ((zephir_method_exists(&entity, &method) == SUCCESS)) { ZEPHIR_CALL_METHOD_ZVAL(NULL, &entity, &method, NULL, 0, &value); @@ -656,7 +828,7 @@ PHP_METHOD(Phalcon_Filter_Validation, rules) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 2, 0, &field, &validators_param); ZEPHIR_OBS_COPY_OR_DUP(&validators, validators_param); - zephir_is_iterable(&validators, 0, "phalcon/Filter/Validation.zep", 419); + zephir_is_iterable(&validators, 0, "phalcon/Filter/Validation.zep", 481); if (Z_TYPE_P(&validators) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&validators), _0) { @@ -706,7 +878,7 @@ PHP_METHOD(Phalcon_Filter_Validation, setEntity) ZEND_PARSE_PARAMETERS_END(); zephir_fetch_params_without_memory_grow(1, 0, &entity); if (UNEXPECTED(Z_TYPE_P(entity) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_filter_validation_exception_ce, "Entity must be an object", "phalcon/Filter/Validation.zep", 430); + ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_filter_validation_exception_ce, "Entity must be an object", "phalcon/Filter/Validation.zep", 492); return; } zephir_update_property_zval(this_ptr, ZEND_STRL("entity"), entity); @@ -737,7 +909,7 @@ PHP_METHOD(Phalcon_Filter_Validation, setFilters) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 2, 0, &field, &filters); if (Z_TYPE_P(field) == IS_ARRAY) { - zephir_is_iterable(field, 0, "phalcon/Filter/Validation.zep", 450); + zephir_is_iterable(field, 0, "phalcon/Filter/Validation.zep", 512); if (Z_TYPE_P(field) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(field), _0$$3) { @@ -765,7 +937,7 @@ PHP_METHOD(Phalcon_Filter_Validation, setFilters) } else if (Z_TYPE_P(field) == IS_STRING) { zephir_update_property_array(this_ptr, SL("filters"), field, filters); } else { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Field must be passed as array of fields or string.", "phalcon/Filter/Validation.zep", 455); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Field must be passed as array of fields or string.", "phalcon/Filter/Validation.zep", 517); return; } RETURN_THIS(); @@ -815,20 +987,38 @@ PHP_METHOD(Phalcon_Filter_Validation, setValidators) /** * Validate a set of data according to a set of rules * - * @param array|object data - * @param object entity + * You can use $validation->bind(entity, data, whitelist)->validate() + * When you use bind(), the this->data is already set, so you can reuse it here + * + * ```php + * // using bind() with $whitelist fields + * $entity = new Author(); + * $fields = ['name', 'email', 'imageUrl']; + * $validation = new AuthorValidation(); + * $validation->bind($entity, $_POST, $fields); + * $validation->validate(); + * + * // directly using validate + * $validation = new AuthorValidation(); + * $validation->validate($_POST, $entity, $fields); + * ``` + * + * @param array|object $data the data that needs to be validated + * @param object $entity the entity object to assign data to + * @param array $whitelist only allow these fields to be mutated when entity is used * * @return Messages|false */ PHP_METHOD(Phalcon_Filter_Validation, validate) { - zend_bool _4$$7; - zend_string *_8; - zend_ulong _7; + zend_bool _3$$4; + zend_string *_9; + zend_ulong _8; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zephir_fcall_cache_entry *_12 = NULL; + zephir_fcall_cache_entry *_13 = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *data = NULL, data_sub, *entity = NULL, entity_sub, __$null, combinedFieldsValidators, field, scope, status, validator, validatorData, validators, _0, _1, _2, *_5, _6, *_30, _31, _3$$5, *_9$$9, _10$$9, _11$$10, _13$$10, _14$$13, _15$$13, _16$$15, _17$$15, _18$$18, _19$$18, *_20$$20, _21$$20, _22$$21, _23$$21, _24$$24, _25$$24, _26$$26, _27$$26, _28$$29, _29$$29, _32$$31, _33$$31, _34$$35, _35$$35, _36$$37, _37$$37, _38$$41, _39$$41, _40$$43; + zval whitelist; + zval *data = NULL, data_sub, *entity = NULL, entity_sub, *whitelist_param = NULL, __$null, combinedFieldsValidators, field, scope, status, validator, validatorData, validators, inputData, _0, _1, _2, *_6, _7, *_31, _32, _4$$8, _5$$8, *_10$$10, _11$$10, _12$$11, _14$$11, _15$$14, _16$$14, _17$$16, _18$$16, _19$$19, _20$$19, *_21$$21, _22$$21, _23$$22, _24$$22, _25$$25, _26$$25, _27$$27, _28$$27, _29$$30, _30$$30, _33$$32, _34$$32, _35$$36, _36$$36, _37$$38, _38$$38, _39$$42, _40$$42, _41$$44, _42$$44; zval *this_ptr = getThis(); ZVAL_UNDEF(&data_sub); @@ -841,48 +1031,53 @@ PHP_METHOD(Phalcon_Filter_Validation, validate) ZVAL_UNDEF(&validator); ZVAL_UNDEF(&validatorData); ZVAL_UNDEF(&validators); + ZVAL_UNDEF(&inputData); ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1); ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_6); - ZVAL_UNDEF(&_31); - ZVAL_UNDEF(&_3$$5); - ZVAL_UNDEF(&_10$$9); + ZVAL_UNDEF(&_7); + ZVAL_UNDEF(&_32); + ZVAL_UNDEF(&_4$$8); + ZVAL_UNDEF(&_5$$8); ZVAL_UNDEF(&_11$$10); - ZVAL_UNDEF(&_13$$10); - ZVAL_UNDEF(&_14$$13); - ZVAL_UNDEF(&_15$$13); - ZVAL_UNDEF(&_16$$15); - ZVAL_UNDEF(&_17$$15); - ZVAL_UNDEF(&_18$$18); - ZVAL_UNDEF(&_19$$18); - ZVAL_UNDEF(&_21$$20); + ZVAL_UNDEF(&_12$$11); + ZVAL_UNDEF(&_14$$11); + ZVAL_UNDEF(&_15$$14); + ZVAL_UNDEF(&_16$$14); + ZVAL_UNDEF(&_17$$16); + ZVAL_UNDEF(&_18$$16); + ZVAL_UNDEF(&_19$$19); + ZVAL_UNDEF(&_20$$19); ZVAL_UNDEF(&_22$$21); - ZVAL_UNDEF(&_23$$21); - ZVAL_UNDEF(&_24$$24); - ZVAL_UNDEF(&_25$$24); - ZVAL_UNDEF(&_26$$26); - ZVAL_UNDEF(&_27$$26); - ZVAL_UNDEF(&_28$$29); - ZVAL_UNDEF(&_29$$29); - ZVAL_UNDEF(&_32$$31); - ZVAL_UNDEF(&_33$$31); - ZVAL_UNDEF(&_34$$35); - ZVAL_UNDEF(&_35$$35); - ZVAL_UNDEF(&_36$$37); - ZVAL_UNDEF(&_37$$37); - ZVAL_UNDEF(&_38$$41); - ZVAL_UNDEF(&_39$$41); - ZVAL_UNDEF(&_40$$43); + ZVAL_UNDEF(&_23$$22); + ZVAL_UNDEF(&_24$$22); + ZVAL_UNDEF(&_25$$25); + ZVAL_UNDEF(&_26$$25); + ZVAL_UNDEF(&_27$$27); + ZVAL_UNDEF(&_28$$27); + ZVAL_UNDEF(&_29$$30); + ZVAL_UNDEF(&_30$$30); + ZVAL_UNDEF(&_33$$32); + ZVAL_UNDEF(&_34$$32); + ZVAL_UNDEF(&_35$$36); + ZVAL_UNDEF(&_36$$36); + ZVAL_UNDEF(&_37$$38); + ZVAL_UNDEF(&_38$$38); + ZVAL_UNDEF(&_39$$42); + ZVAL_UNDEF(&_40$$42); + ZVAL_UNDEF(&_41$$44); + ZVAL_UNDEF(&_42$$44); + ZVAL_UNDEF(&whitelist); bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(0, 2) + ZEND_PARSE_PARAMETERS_START(0, 3) Z_PARAM_OPTIONAL Z_PARAM_ZVAL_OR_NULL(data) Z_PARAM_ZVAL_OR_NULL(entity) + Z_PARAM_ARRAY(whitelist) ZEND_PARSE_PARAMETERS_END(); ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - zephir_fetch_params(1, 0, 2, &data, &entity); + zephir_fetch_params(1, 0, 3, &data, &entity, &whitelist_param); if (!data) { data = &data_sub; data = &__$null; @@ -891,12 +1086,20 @@ PHP_METHOD(Phalcon_Filter_Validation, validate) entity = &entity_sub; entity = &__$null; } + if (!whitelist_param) { + ZEPHIR_INIT_VAR(&whitelist); + array_init(&whitelist); + } else { + zephir_get_arrval(&whitelist, whitelist_param); + } + ZEPHIR_INIT_VAR(&inputData); + ZVAL_NULL(&inputData); zephir_memory_observe(&validatorData); zephir_read_property(&validatorData, this_ptr, ZEND_STRL("validators"), PH_NOISY_CC); zephir_read_property(&_0, this_ptr, ZEND_STRL("combinedFieldsValidators"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&combinedFieldsValidators, &_0); if (UNEXPECTED(Z_TYPE_P(&validatorData) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "There are no validators to validate", "phalcon/Filter/Validation.zep", 493); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "There are no validators to validate", "phalcon/Filter/Validation.zep", 572); return; } ZEPHIR_INIT_VAR(&_1); @@ -907,64 +1110,70 @@ PHP_METHOD(Phalcon_Filter_Validation, validate) ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 8); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("messages"), &_2); + zephir_read_property(&_0, this_ptr, ZEND_STRL("data"), PH_NOISY_CC | PH_READONLY); + if (Z_TYPE_P(data) != IS_NULL) { + _3$$4 = Z_TYPE_P(data) != IS_ARRAY; + if (_3$$4) { + _3$$4 = Z_TYPE_P(data) != IS_OBJECT; + } + if (UNEXPECTED(_3$$4)) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Invalid data to validate", "phalcon/Filter/Validation.zep", 587); + return; + } + zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data); + ZEPHIR_CPY_WRT(&inputData, data); + } else if (!(ZEPHIR_IS_EMPTY(&_0))) { + ZEPHIR_OBS_NVAR(&inputData); + zephir_read_property(&inputData, this_ptr, ZEND_STRL("data"), PH_NOISY_CC); + } if (Z_TYPE_P(entity) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, this_ptr, "setentity", NULL, 0, entity); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "bind", NULL, 0, entity, &inputData, &whitelist); zephir_check_call_status(); } if ((zephir_method_exists_ex(this_ptr, ZEND_STRL("beforevalidation")) == SUCCESS)) { - zephir_read_property(&_3$$5, this_ptr, ZEND_STRL("messages"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&status, this_ptr, "beforevalidation", NULL, 0, data, entity, &_3$$5); + zephir_read_property(&_4$$8, this_ptr, ZEND_STRL("entity"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_5$$8, this_ptr, ZEND_STRL("messages"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(&status, this_ptr, "beforevalidation", NULL, 0, &inputData, &_4$$8, &_5$$8); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&status)) { RETURN_CCTOR(&status); } } - if (Z_TYPE_P(data) != IS_NULL) { - _4$$7 = Z_TYPE_P(data) != IS_ARRAY; - if (_4$$7) { - _4$$7 = Z_TYPE_P(data) != IS_OBJECT; - } - if (UNEXPECTED(_4$$7)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Invalid data to validate", "phalcon/Filter/Validation.zep", 523); - return; - } - zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data); - } - zephir_is_iterable(&validatorData, 0, "phalcon/Filter/Validation.zep", 554); + zephir_is_iterable(&validatorData, 0, "phalcon/Filter/Validation.zep", 637); if (Z_TYPE_P(&validatorData) == IS_ARRAY) { - ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&validatorData), _7, _8, _5) + ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&validatorData), _8, _9, _6) { ZEPHIR_INIT_NVAR(&field); - if (_8 != NULL) { - ZVAL_STR_COPY(&field, _8); + if (_9 != NULL) { + ZVAL_STR_COPY(&field, _9); } else { - ZVAL_LONG(&field, _7); + ZVAL_LONG(&field, _8); } ZEPHIR_INIT_NVAR(&validators); - ZVAL_COPY(&validators, _5); - zephir_is_iterable(&validators, 0, "phalcon/Filter/Validation.zep", 552); + ZVAL_COPY(&validators, _6); + zephir_is_iterable(&validators, 0, "phalcon/Filter/Validation.zep", 635); if (Z_TYPE_P(&validators) == IS_ARRAY) { - ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&validators), _9$$9) + ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&validators), _10$$10) { ZEPHIR_INIT_NVAR(&validator); - ZVAL_COPY(&validator, _9$$9); + ZVAL_COPY(&validator, _10$$10); if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 532); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 615); return; } - ZEPHIR_CALL_METHOD(&_11$$10, this_ptr, "prechecking", &_12, 0, &field, &validator); + ZEPHIR_CALL_METHOD(&_12$$11, this_ptr, "prechecking", &_13, 0, &field, &validator); zephir_check_call_status(); - if (zephir_is_true(&_11$$10)) { + if (zephir_is_true(&_12$$11)) { continue; } - ZEPHIR_CALL_METHOD(&_13$$10, &validator, "validate", NULL, 0, this_ptr, &field); + ZEPHIR_CALL_METHOD(&_14$$11, &validator, "validate", NULL, 0, this_ptr, &field); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(&_13$$10)) { - ZEPHIR_INIT_NVAR(&_15$$13); - ZVAL_STRING(&_15$$13, "cancelOnFail"); - ZEPHIR_CALL_METHOD(&_14$$13, &validator, "getoption", NULL, 0, &_15$$13); + if (ZEPHIR_IS_FALSE_IDENTICAL(&_14$$11)) { + ZEPHIR_INIT_NVAR(&_16$$14); + ZVAL_STRING(&_16$$14, "cancelOnFail"); + ZEPHIR_CALL_METHOD(&_15$$14, &validator, "getoption", NULL, 0, &_16$$14); zephir_check_call_status(); - if (zephir_is_true(&_14$$13)) { + if (zephir_is_true(&_15$$14)) { break; } } @@ -973,30 +1182,30 @@ PHP_METHOD(Phalcon_Filter_Validation, validate) ZEPHIR_CALL_METHOD(NULL, &validators, "rewind", NULL, 0); zephir_check_call_status(); while (1) { - ZEPHIR_CALL_METHOD(&_10$$9, &validators, "valid", NULL, 0); + ZEPHIR_CALL_METHOD(&_11$$10, &validators, "valid", NULL, 0); zephir_check_call_status(); - if (!zend_is_true(&_10$$9)) { + if (!zend_is_true(&_11$$10)) { break; } ZEPHIR_CALL_METHOD(&validator, &validators, "current", NULL, 0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 532); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 615); return; } - ZEPHIR_CALL_METHOD(&_16$$15, this_ptr, "prechecking", &_12, 0, &field, &validator); + ZEPHIR_CALL_METHOD(&_17$$16, this_ptr, "prechecking", &_13, 0, &field, &validator); zephir_check_call_status(); - if (zephir_is_true(&_16$$15)) { + if (zephir_is_true(&_17$$16)) { continue; } - ZEPHIR_CALL_METHOD(&_17$$15, &validator, "validate", NULL, 0, this_ptr, &field); + ZEPHIR_CALL_METHOD(&_18$$16, &validator, "validate", NULL, 0, this_ptr, &field); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(&_17$$15)) { - ZEPHIR_INIT_NVAR(&_19$$18); - ZVAL_STRING(&_19$$18, "cancelOnFail"); - ZEPHIR_CALL_METHOD(&_18$$18, &validator, "getoption", NULL, 0, &_19$$18); + if (ZEPHIR_IS_FALSE_IDENTICAL(&_18$$16)) { + ZEPHIR_INIT_NVAR(&_20$$19); + ZVAL_STRING(&_20$$19, "cancelOnFail"); + ZEPHIR_CALL_METHOD(&_19$$19, &validator, "getoption", NULL, 0, &_20$$19); zephir_check_call_status(); - if (zephir_is_true(&_18$$18)) { + if (zephir_is_true(&_19$$19)) { break; } } @@ -1010,38 +1219,38 @@ PHP_METHOD(Phalcon_Filter_Validation, validate) ZEPHIR_CALL_METHOD(NULL, &validatorData, "rewind", NULL, 0); zephir_check_call_status(); while (1) { - ZEPHIR_CALL_METHOD(&_6, &validatorData, "valid", NULL, 0); + ZEPHIR_CALL_METHOD(&_7, &validatorData, "valid", NULL, 0); zephir_check_call_status(); - if (!zend_is_true(&_6)) { + if (!zend_is_true(&_7)) { break; } ZEPHIR_CALL_METHOD(&field, &validatorData, "key", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&validators, &validatorData, "current", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&validators, 0, "phalcon/Filter/Validation.zep", 552); + zephir_is_iterable(&validators, 0, "phalcon/Filter/Validation.zep", 635); if (Z_TYPE_P(&validators) == IS_ARRAY) { - ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&validators), _20$$20) + ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&validators), _21$$21) { ZEPHIR_INIT_NVAR(&validator); - ZVAL_COPY(&validator, _20$$20); + ZVAL_COPY(&validator, _21$$21); if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 532); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 615); return; } - ZEPHIR_CALL_METHOD(&_22$$21, this_ptr, "prechecking", &_12, 0, &field, &validator); + ZEPHIR_CALL_METHOD(&_23$$22, this_ptr, "prechecking", &_13, 0, &field, &validator); zephir_check_call_status(); - if (zephir_is_true(&_22$$21)) { + if (zephir_is_true(&_23$$22)) { continue; } - ZEPHIR_CALL_METHOD(&_23$$21, &validator, "validate", NULL, 0, this_ptr, &field); + ZEPHIR_CALL_METHOD(&_24$$22, &validator, "validate", NULL, 0, this_ptr, &field); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(&_23$$21)) { - ZEPHIR_INIT_NVAR(&_25$$24); - ZVAL_STRING(&_25$$24, "cancelOnFail"); - ZEPHIR_CALL_METHOD(&_24$$24, &validator, "getoption", NULL, 0, &_25$$24); + if (ZEPHIR_IS_FALSE_IDENTICAL(&_24$$22)) { + ZEPHIR_INIT_NVAR(&_26$$25); + ZVAL_STRING(&_26$$25, "cancelOnFail"); + ZEPHIR_CALL_METHOD(&_25$$25, &validator, "getoption", NULL, 0, &_26$$25); zephir_check_call_status(); - if (zephir_is_true(&_24$$24)) { + if (zephir_is_true(&_25$$25)) { break; } } @@ -1050,30 +1259,30 @@ PHP_METHOD(Phalcon_Filter_Validation, validate) ZEPHIR_CALL_METHOD(NULL, &validators, "rewind", NULL, 0); zephir_check_call_status(); while (1) { - ZEPHIR_CALL_METHOD(&_21$$20, &validators, "valid", NULL, 0); + ZEPHIR_CALL_METHOD(&_22$$21, &validators, "valid", NULL, 0); zephir_check_call_status(); - if (!zend_is_true(&_21$$20)) { + if (!zend_is_true(&_22$$21)) { break; } ZEPHIR_CALL_METHOD(&validator, &validators, "current", NULL, 0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 532); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 615); return; } - ZEPHIR_CALL_METHOD(&_26$$26, this_ptr, "prechecking", &_12, 0, &field, &validator); + ZEPHIR_CALL_METHOD(&_27$$27, this_ptr, "prechecking", &_13, 0, &field, &validator); zephir_check_call_status(); - if (zephir_is_true(&_26$$26)) { + if (zephir_is_true(&_27$$27)) { continue; } - ZEPHIR_CALL_METHOD(&_27$$26, &validator, "validate", NULL, 0, this_ptr, &field); + ZEPHIR_CALL_METHOD(&_28$$27, &validator, "validate", NULL, 0, this_ptr, &field); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(&_27$$26)) { - ZEPHIR_INIT_NVAR(&_29$$29); - ZVAL_STRING(&_29$$29, "cancelOnFail"); - ZEPHIR_CALL_METHOD(&_28$$29, &validator, "getoption", NULL, 0, &_29$$29); + if (ZEPHIR_IS_FALSE_IDENTICAL(&_28$$27)) { + ZEPHIR_INIT_NVAR(&_30$$30); + ZVAL_STRING(&_30$$30, "cancelOnFail"); + ZEPHIR_CALL_METHOD(&_29$$30, &validator, "getoption", NULL, 0, &_30$$30); zephir_check_call_status(); - if (zephir_is_true(&_28$$29)) { + if (zephir_is_true(&_29$$30)) { break; } } @@ -1088,37 +1297,37 @@ PHP_METHOD(Phalcon_Filter_Validation, validate) } ZEPHIR_INIT_NVAR(&validators); ZEPHIR_INIT_NVAR(&field); - zephir_is_iterable(&combinedFieldsValidators, 0, "phalcon/Filter/Validation.zep", 587); + zephir_is_iterable(&combinedFieldsValidators, 0, "phalcon/Filter/Validation.zep", 670); if (Z_TYPE_P(&combinedFieldsValidators) == IS_ARRAY) { - ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&combinedFieldsValidators), _30) + ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&combinedFieldsValidators), _31) { ZEPHIR_INIT_NVAR(&scope); - ZVAL_COPY(&scope, _30); + ZVAL_COPY(&scope, _31); if (UNEXPECTED(Z_TYPE_P(&scope) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "The validator scope is not valid", "phalcon/Filter/Validation.zep", 556); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "The validator scope is not valid", "phalcon/Filter/Validation.zep", 639); return; } ZEPHIR_OBS_NVAR(&field); - zephir_array_fetch_long(&field, &scope, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 559); + zephir_array_fetch_long(&field, &scope, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 642); ZEPHIR_OBS_NVAR(&validator); - zephir_array_fetch_long(&validator, &scope, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 560); + zephir_array_fetch_long(&validator, &scope, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 643); if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 563); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 646); return; } - ZEPHIR_CALL_METHOD(&_32$$31, this_ptr, "prechecking", &_12, 0, &field, &validator); + ZEPHIR_CALL_METHOD(&_33$$32, this_ptr, "prechecking", &_13, 0, &field, &validator); zephir_check_call_status(); - if (zephir_is_true(&_32$$31)) { + if (zephir_is_true(&_33$$32)) { continue; } - ZEPHIR_CALL_METHOD(&_33$$31, &validator, "validate", NULL, 0, this_ptr, &field); + ZEPHIR_CALL_METHOD(&_34$$32, &validator, "validate", NULL, 0, this_ptr, &field); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(&_33$$31)) { - ZEPHIR_INIT_NVAR(&_35$$35); - ZVAL_STRING(&_35$$35, "cancelOnFail"); - ZEPHIR_CALL_METHOD(&_34$$35, &validator, "getoption", NULL, 0, &_35$$35); + if (ZEPHIR_IS_FALSE_IDENTICAL(&_34$$32)) { + ZEPHIR_INIT_NVAR(&_36$$36); + ZVAL_STRING(&_36$$36, "cancelOnFail"); + ZEPHIR_CALL_METHOD(&_35$$36, &validator, "getoption", NULL, 0, &_36$$36); zephir_check_call_status(); - if (zephir_is_true(&_34$$35)) { + if (zephir_is_true(&_35$$36)) { break; } } @@ -1127,38 +1336,38 @@ PHP_METHOD(Phalcon_Filter_Validation, validate) ZEPHIR_CALL_METHOD(NULL, &combinedFieldsValidators, "rewind", NULL, 0); zephir_check_call_status(); while (1) { - ZEPHIR_CALL_METHOD(&_31, &combinedFieldsValidators, "valid", NULL, 0); + ZEPHIR_CALL_METHOD(&_32, &combinedFieldsValidators, "valid", NULL, 0); zephir_check_call_status(); - if (!zend_is_true(&_31)) { + if (!zend_is_true(&_32)) { break; } ZEPHIR_CALL_METHOD(&scope, &combinedFieldsValidators, "current", NULL, 0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&scope) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "The validator scope is not valid", "phalcon/Filter/Validation.zep", 556); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "The validator scope is not valid", "phalcon/Filter/Validation.zep", 639); return; } ZEPHIR_OBS_NVAR(&field); - zephir_array_fetch_long(&field, &scope, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 559); + zephir_array_fetch_long(&field, &scope, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 642); ZEPHIR_OBS_NVAR(&validator); - zephir_array_fetch_long(&validator, &scope, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 560); + zephir_array_fetch_long(&validator, &scope, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 643); if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 563); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 646); return; } - ZEPHIR_CALL_METHOD(&_36$$37, this_ptr, "prechecking", &_12, 0, &field, &validator); + ZEPHIR_CALL_METHOD(&_37$$38, this_ptr, "prechecking", &_13, 0, &field, &validator); zephir_check_call_status(); - if (zephir_is_true(&_36$$37)) { + if (zephir_is_true(&_37$$38)) { continue; } - ZEPHIR_CALL_METHOD(&_37$$37, &validator, "validate", NULL, 0, this_ptr, &field); + ZEPHIR_CALL_METHOD(&_38$$38, &validator, "validate", NULL, 0, this_ptr, &field); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(&_37$$37)) { - ZEPHIR_INIT_NVAR(&_39$$41); - ZVAL_STRING(&_39$$41, "cancelOnFail"); - ZEPHIR_CALL_METHOD(&_38$$41, &validator, "getoption", NULL, 0, &_39$$41); + if (ZEPHIR_IS_FALSE_IDENTICAL(&_38$$38)) { + ZEPHIR_INIT_NVAR(&_40$$42); + ZVAL_STRING(&_40$$42, "cancelOnFail"); + ZEPHIR_CALL_METHOD(&_39$$42, &validator, "getoption", NULL, 0, &_40$$42); zephir_check_call_status(); - if (zephir_is_true(&_38$$41)) { + if (zephir_is_true(&_39$$42)) { break; } } @@ -1168,13 +1377,45 @@ PHP_METHOD(Phalcon_Filter_Validation, validate) } ZEPHIR_INIT_NVAR(&scope); if ((zephir_method_exists_ex(this_ptr, ZEND_STRL("aftervalidation")) == SUCCESS)) { - zephir_read_property(&_40$$43, this_ptr, ZEND_STRL("messages"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "aftervalidation", NULL, 0, data, entity, &_40$$43); + zephir_read_property(&_41$$44, this_ptr, ZEND_STRL("entity"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_42$$44, this_ptr, ZEND_STRL("messages"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "aftervalidation", NULL, 0, &inputData, &_41$$44, &_42$$44); zephir_check_call_status(); } RETURN_MM_MEMBER(getThis(), "messages"); } +/** + * Verify if validation fails by verifying if there are messages in the current validation + */ +PHP_METHOD(Phalcon_Filter_Validation, fails) +{ + zend_bool _1; + zval _0, _2, _3; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_3); + ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); + zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); + + zephir_read_property(&_0, this_ptr, ZEND_STRL("messages"), PH_NOISY_CC | PH_READONLY); + _1 = !(Z_TYPE_P(&_0) == IS_NULL); + if (_1) { + zephir_read_property(&_2, this_ptr, ZEND_STRL("messages"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(&_3, &_2, "count", NULL, 0); + zephir_check_call_status(); + _1 = ZEPHIR_GT_LONG(&_3, 0); + } + if (UNEXPECTED(_1)) { + RETURN_MM_BOOL(1); + } + RETURN_MM_BOOL(0); +} + /** * Internal validations, if it returns true, then skip the current validator * @@ -1214,15 +1455,15 @@ PHP_METHOD(Phalcon_Filter_Validation, preChecking) ZEPHIR_INIT_VAR(&results); array_init(&results); if (Z_TYPE_P(field) == IS_ARRAY) { - zephir_is_iterable(field, 0, "phalcon/Filter/Validation.zep", 615); + zephir_is_iterable(field, 0, "phalcon/Filter/Validation.zep", 710); if (Z_TYPE_P(field) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(field), _0$$3) { ZEPHIR_INIT_NVAR(&singleField); ZVAL_COPY(&singleField, _0$$3); - ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "prechecking", &_3, 291, &singleField, validator); + ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "prechecking", &_3, 293, &singleField, validator); zephir_check_call_status(); - zephir_array_append(&results, &_2$$4, PH_SEPARATE, "phalcon/Filter/Validation.zep", 607); + zephir_array_append(&results, &_2$$4, PH_SEPARATE, "phalcon/Filter/Validation.zep", 702); if (zephir_fast_in_array(&__$false, &results)) { RETURN_MM_BOOL(0); } @@ -1239,9 +1480,9 @@ PHP_METHOD(Phalcon_Filter_Validation, preChecking) } ZEPHIR_CALL_METHOD(&singleField, field, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "prechecking", &_3, 291, &singleField, validator); + ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "prechecking", &_3, 293, &singleField, validator); zephir_check_call_status(); - zephir_array_append(&results, &_4$$6, PH_SEPARATE, "phalcon/Filter/Validation.zep", 607); + zephir_array_append(&results, &_4$$6, PH_SEPARATE, "phalcon/Filter/Validation.zep", 702); if (zephir_fast_in_array(&__$false, &results)) { RETURN_MM_BOOL(0); } @@ -1266,7 +1507,7 @@ PHP_METHOD(Phalcon_Filter_Validation, preChecking) ZEPHIR_CALL_METHOD(&value, this_ptr, "getvalue", NULL, 0, field); zephir_check_call_status(); if (Z_TYPE_P(&allowEmpty) == IS_ARRAY) { - zephir_is_iterable(&allowEmpty, 0, "phalcon/Filter/Validation.zep", 632); + zephir_is_iterable(&allowEmpty, 0, "phalcon/Filter/Validation.zep", 727); if (Z_TYPE_P(&allowEmpty) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&allowEmpty), _7$$11) { @@ -1305,18 +1546,20 @@ PHP_METHOD(Phalcon_Filter_Validation, preChecking) zend_object *zephir_init_properties_Phalcon_Filter_Validation(zend_class_entry *class_type) { - zval _0, _2, _4, _6, _8, _1$$3, _3$$4, _5$$5, _7$$6, _9$$7; + zval _0, _2, _4, _6, _8, _10, _1$$3, _3$$4, _5$$5, _7$$6, _9$$7, _11$$8; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_2); ZVAL_UNDEF(&_4); ZVAL_UNDEF(&_6); ZVAL_UNDEF(&_8); + ZVAL_UNDEF(&_10); ZVAL_UNDEF(&_1$$3); ZVAL_UNDEF(&_3$$4); ZVAL_UNDEF(&_5$$5); ZVAL_UNDEF(&_7$$6); ZVAL_UNDEF(&_9$$7); + ZVAL_UNDEF(&_11$$8); ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); @@ -1343,17 +1586,23 @@ zend_object *zephir_init_properties_Phalcon_Filter_Validation(zend_class_entry * array_init(&_5$$5); zephir_update_property_zval_ex(this_ptr, ZEND_STRL("labels"), &_5$$5); } - zephir_read_property_ex(&_6, this_ptr, ZEND_STRL("filters"), PH_NOISY_CC | PH_READONLY); + zephir_read_property_ex(&_6, this_ptr, ZEND_STRL("whitelist"), PH_NOISY_CC | PH_READONLY); if (Z_TYPE_P(&_6) == IS_NULL) { ZEPHIR_INIT_VAR(&_7$$6); array_init(&_7$$6); - zephir_update_property_zval_ex(this_ptr, ZEND_STRL("filters"), &_7$$6); + zephir_update_property_zval_ex(this_ptr, ZEND_STRL("whitelist"), &_7$$6); } - zephir_read_property_ex(&_8, this_ptr, ZEND_STRL("combinedFieldsValidators"), PH_NOISY_CC | PH_READONLY); + zephir_read_property_ex(&_8, this_ptr, ZEND_STRL("filters"), PH_NOISY_CC | PH_READONLY); if (Z_TYPE_P(&_8) == IS_NULL) { ZEPHIR_INIT_VAR(&_9$$7); array_init(&_9$$7); - zephir_update_property_zval_ex(this_ptr, ZEND_STRL("combinedFieldsValidators"), &_9$$7); + zephir_update_property_zval_ex(this_ptr, ZEND_STRL("filters"), &_9$$7); + } + zephir_read_property_ex(&_10, this_ptr, ZEND_STRL("combinedFieldsValidators"), PH_NOISY_CC | PH_READONLY); + if (Z_TYPE_P(&_10) == IS_NULL) { + ZEPHIR_INIT_VAR(&_11$$8); + array_init(&_11$$8); + zephir_update_property_zval_ex(this_ptr, ZEND_STRL("combinedFieldsValidators"), &_11$$8); } ZEPHIR_MM_RESTORE(); return Z_OBJ_P(this_ptr); diff --git a/ext/phalcon/filter/validation.zep.h b/ext/phalcon/filter/validation.zep.h index 009a9c2b248..f70184a0638 100644 --- a/ext/phalcon/filter/validation.zep.h +++ b/ext/phalcon/filter/validation.zep.h @@ -23,6 +23,7 @@ PHP_METHOD(Phalcon_Filter_Validation, setFilters); PHP_METHOD(Phalcon_Filter_Validation, setLabels); PHP_METHOD(Phalcon_Filter_Validation, setValidators); PHP_METHOD(Phalcon_Filter_Validation, validate); +PHP_METHOD(Phalcon_Filter_Validation, fails); PHP_METHOD(Phalcon_Filter_Validation, preChecking); zend_object *zephir_init_properties_Phalcon_Filter_Validation(zend_class_entry *class_type); @@ -42,6 +43,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_filter_validation_bind, 0, 2, Phalcon\\Filter\\Validation\\ValidationInterface, 0) ZEND_ARG_INFO(0, entity) ZEND_ARG_INFO(0, data) +ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, whitelist, IS_ARRAY, 0, "[]") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_filter_validation_getdata, 0, 0, 0) @@ -110,6 +112,10 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_filter_validation_validate, 0, 0, 0) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(0, entity) +ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, whitelist, IS_ARRAY, 0, "[]") +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_fails, 0, 0, _IS_BOOL, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_prechecking, 0, 2, _IS_BOOL, 0) @@ -141,6 +147,7 @@ PHP_ME(Phalcon_Filter_Validation, getEntity, arginfo_phalcon_filter_validation_g PHP_ME(Phalcon_Filter_Validation, setLabels, arginfo_phalcon_filter_validation_setlabels, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Filter_Validation, setValidators, arginfo_phalcon_filter_validation_setvalidators, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Filter_Validation, validate, arginfo_phalcon_filter_validation_validate, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Filter_Validation, fails, arginfo_phalcon_filter_validation_fails, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Filter_Validation, preChecking, arginfo_phalcon_filter_validation_prechecking, ZEND_ACC_PROTECTED) PHP_FE_END }; diff --git a/ext/phalcon/filter/validation/validationinterface.zep.c b/ext/phalcon/filter/validation/validationinterface.zep.c index 6fb74e32903..43a4996f994 100644 --- a/ext/phalcon/filter/validation/validationinterface.zep.c +++ b/ext/phalcon/filter/validation/validationinterface.zep.c @@ -45,8 +45,9 @@ ZEPHIR_DOC_METHOD(Phalcon_Filter_Validation_ValidationInterface, appendMessage); * Assigns the data to an entity * The entity is used to obtain the validation values * - * @param object entity - * @param array|object data + * @param object $entity + * @param array|object $data + * @param array $whitelist */ ZEPHIR_DOC_METHOD(Phalcon_Filter_Validation_ValidationInterface, bind); /** @@ -99,8 +100,9 @@ ZEPHIR_DOC_METHOD(Phalcon_Filter_Validation_ValidationInterface, setLabels); /** * Validate a set of data according to a set of rules * - * @param array|object data - * @param object entity + * @param array|object $data + * @param object $entity + * @param array $whitelist * * @return Messages|false */ diff --git a/ext/phalcon/filter/validation/validationinterface.zep.h b/ext/phalcon/filter/validation/validationinterface.zep.h index 7f4897eb12a..2606b597898 100644 --- a/ext/phalcon/filter/validation/validationinterface.zep.h +++ b/ext/phalcon/filter/validation/validationinterface.zep.h @@ -15,6 +15,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_filter_validation_validationinterface_bind, 0, 2, Phalcon\\Filter\\Validation\\ValidationInterface, 0) ZEND_ARG_INFO(0, entity) ZEND_ARG_INFO(0, data) +ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, whitelist, IS_ARRAY, 0, "[]") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_filter_validation_validationinterface_getentity, 0, 0, 0) @@ -61,6 +62,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_filter_validation_validationinterface_validate, 0, 0, 0) ZEND_ARG_INFO(0, data) ZEND_ARG_INFO(0, entity) +ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, whitelist, IS_ARRAY, 0, "[]") ZEND_END_ARG_INFO() ZEPHIR_INIT_FUNCS(phalcon_filter_validation_validationinterface_method_entry) { diff --git a/ext/phalcon/filter/validation/validator/alnum.zep.c b/ext/phalcon/filter/validation/validator/alnum.zep.c index 03a5a71188e..314378281a2 100644 --- a/ext/phalcon/filter/validation/validator/alnum.zep.c +++ b/ext/phalcon/filter/validation/validator/alnum.zep.c @@ -138,7 +138,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Alnum, validate) RETURN_MM_BOOL(1); } zephir_cast_to_string(&_1, &value); - ZEPHIR_CALL_FUNCTION(&_2, "ctype_alnum", NULL, 292, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "ctype_alnum", NULL, 294, &_1); zephir_check_call_status(); if (!(zephir_is_true(&_2))) { ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "messagefactory", NULL, 0, validation, field); diff --git a/ext/phalcon/filter/validation/validator/callback.zep.c b/ext/phalcon/filter/validation/validator/callback.zep.c index 6838e947600..107de0438fe 100644 --- a/ext/phalcon/filter/validation/validator/callback.zep.c +++ b/ext/phalcon/filter/validation/validator/callback.zep.c @@ -151,7 +151,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Callback, validate) ZEPHIR_CALL_METHOD(&data, validation, "getdata", NULL, 0); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&returnedValue, "call_user_func", NULL, 188, &callback, &data); + ZEPHIR_CALL_FUNCTION(&returnedValue, "call_user_func", NULL, 189, &callback, &data); zephir_check_call_status(); _1$$3 = Z_TYPE_P(&returnedValue) == IS_OBJECT; if (_1$$3) { diff --git a/ext/phalcon/filter/validation/validator/confirmation.zep.c b/ext/phalcon/filter/validation/validator/confirmation.zep.c index 905fa2aca0e..2bddfc52b98 100644 --- a/ext/phalcon/filter/validation/validator/confirmation.zep.c +++ b/ext/phalcon/filter/validation/validator/confirmation.zep.c @@ -160,7 +160,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Confirmation, validate) zephir_check_call_status(); zephir_cast_to_string(&_3, &value); zephir_cast_to_string(&_4, &valueWith); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "compare", NULL, 293, &_3, &_4); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "compare", NULL, 295, &_3, &_4); zephir_check_call_status(); if (!(zephir_is_true(&_2))) { ZEPHIR_INIT_VAR(&_5$$4); @@ -237,7 +237,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Confirmation, compare) zephir_check_call_status(); zephir_get_strval(&b, &_5$$3); } - ZEPHIR_CALL_FUNCTION(&_6, "strcmp", NULL, 294, &a, &b); + ZEPHIR_CALL_FUNCTION(&_6, "strcmp", NULL, 296, &a, &b); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_LONG_IDENTICAL(&_6, 0)); } diff --git a/ext/phalcon/filter/validation/validator/creditcard.zep.c b/ext/phalcon/filter/validation/validator/creditcard.zep.c index b7f9d150fc1..a5c7b2e1038 100644 --- a/ext/phalcon/filter/validation/validator/creditcard.zep.c +++ b/ext/phalcon/filter/validation/validator/creditcard.zep.c @@ -138,7 +138,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_CreditCard, validate) RETURN_MM_BOOL(1); } zephir_cast_to_string(&_1, &value); - ZEPHIR_CALL_METHOD(&valid, this_ptr, "verifybyluhnalgorithm", NULL, 295, &_1); + ZEPHIR_CALL_METHOD(&valid, this_ptr, "verifybyluhnalgorithm", NULL, 297, &_1); zephir_check_call_status(); if (!(zephir_is_true(&valid))) { ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "messagefactory", NULL, 0, validation, field); @@ -184,14 +184,14 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_CreditCard, verifyByLuhnAlgorithm zephir_get_strval(&number, number_param); ZEPHIR_INIT_VAR(&hash); ZVAL_STRING(&hash, ""); - ZEPHIR_CALL_FUNCTION(&_0, "ctype_digit", NULL, 296, &number); + ZEPHIR_CALL_FUNCTION(&_0, "ctype_digit", NULL, 298, &number); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&_0)) { RETURN_MM_BOOL(0); } ZEPHIR_CALL_FUNCTION(&_1, "str_split", NULL, 88, &number); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&digits, "array_reverse", NULL, 297, &_1); + ZEPHIR_CALL_FUNCTION(&digits, "array_reverse", NULL, 299, &_1); zephir_check_call_status(); zephir_is_iterable(&digits, 0, "phalcon/Filter/Validation/Validator/CreditCard.zep", 112); if (Z_TYPE_P(&digits) == IS_ARRAY) { @@ -243,7 +243,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_CreditCard, verifyByLuhnAlgorithm ZEPHIR_INIT_NVAR(&position); ZEPHIR_CALL_FUNCTION(&_8, "str_split", NULL, 88, &hash); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&result, "array_sum", NULL, 298, &_8); + ZEPHIR_CALL_FUNCTION(&result, "array_sum", NULL, 300, &_8); zephir_check_call_status(); RETURN_MM_BOOL((zephir_safe_mod_zval_long(&result, 10) == 0)); } diff --git a/ext/phalcon/filter/validation/validator/date.zep.c b/ext/phalcon/filter/validation/validator/date.zep.c index 99a0ec04042..bd02303f000 100644 --- a/ext/phalcon/filter/validation/validator/date.zep.c +++ b/ext/phalcon/filter/validation/validator/date.zep.c @@ -157,7 +157,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Date, validate) ZEPHIR_INIT_NVAR(&format); ZVAL_STRING(&format, "Y-m-d"); } - ZEPHIR_CALL_METHOD(&_3, this_ptr, "checkdate", NULL, 299, &value, &format); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "checkdate", NULL, 301, &value, &format); zephir_check_call_status(); if (!(zephir_is_true(&_3))) { ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "messagefactory", NULL, 0, validation, field); diff --git a/ext/phalcon/filter/validation/validator/digit.zep.c b/ext/phalcon/filter/validation/validator/digit.zep.c index 99a87e8e44f..ecf74c1c8b0 100644 --- a/ext/phalcon/filter/validation/validator/digit.zep.c +++ b/ext/phalcon/filter/validation/validator/digit.zep.c @@ -141,7 +141,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Digit, validate) _1 = Z_TYPE_P(&value) == IS_LONG; if (!(_1)) { zephir_cast_to_string(&_2, &value); - ZEPHIR_CALL_FUNCTION(&_3, "ctype_digit", NULL, 296, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "ctype_digit", NULL, 298, &_2); zephir_check_call_status(); _1 = zephir_is_true(&_3); } diff --git a/ext/phalcon/filter/validation/validator/email.zep.c b/ext/phalcon/filter/validation/validator/email.zep.c index eb8db71e85c..ae02ac003d6 100644 --- a/ext/phalcon/filter/validation/validator/email.zep.c +++ b/ext/phalcon/filter/validation/validator/email.zep.c @@ -161,7 +161,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Email, validate) ZVAL_LONG(&flags, 1048576); } ZVAL_LONG(&_3, 274); - ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 283, &value, &_3, &flags); + ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 284, &value, &_3, &flags); zephir_check_call_status(); if (!(zephir_is_true(&_4))) { ZEPHIR_CALL_METHOD(&_5$$5, this_ptr, "messagefactory", NULL, 0, validation, field); diff --git a/ext/phalcon/filter/validation/validator/exclusionin.zep.c b/ext/phalcon/filter/validation/validator/exclusionin.zep.c index d88b7f288fe..65f3fa5ba67 100644 --- a/ext/phalcon/filter/validation/validator/exclusionin.zep.c +++ b/ext/phalcon/filter/validation/validator/exclusionin.zep.c @@ -193,7 +193,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_ExclusionIn, validate) return; } } - ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 300, &value, &domain, &strict); + ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 302, &value, &domain, &strict); zephir_check_call_status(); if (zephir_is_true(&_5)) { ZEPHIR_INIT_VAR(&replacePairs); diff --git a/ext/phalcon/filter/validation/validator/file.zep.c b/ext/phalcon/filter/validation/validator/file.zep.c index 3c8455670ae..58eeab76e13 100644 --- a/ext/phalcon/filter/validation/validator/file.zep.c +++ b/ext/phalcon/filter/validation/validator/file.zep.c @@ -236,21 +236,21 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) if (zephir_array_isset_string(&options, SL("messageFileEmpty"))) { ZEPHIR_INIT_VAR(&_0$$3); ZVAL_STRING(&_0$$3, "messageFileEmpty"); - ZEPHIR_CALL_METHOD(&messageFileEmpty, &helper, "__invoke", NULL, 159, &options, &_0$$3); + ZEPHIR_CALL_METHOD(&messageFileEmpty, &helper, "__invoke", NULL, 160, &options, &_0$$3); zephir_check_call_status(); zephir_array_unset_string(&options, SL("messageFileEmpty"), PH_SEPARATE); } if (zephir_array_isset_string(&options, SL("messageIniSize"))) { ZEPHIR_INIT_VAR(&_1$$4); ZVAL_STRING(&_1$$4, "messageIniSize"); - ZEPHIR_CALL_METHOD(&messageIniSize, &helper, "__invoke", NULL, 159, &options, &_1$$4); + ZEPHIR_CALL_METHOD(&messageIniSize, &helper, "__invoke", NULL, 160, &options, &_1$$4); zephir_check_call_status(); zephir_array_unset_string(&options, SL("messageIniSize"), PH_SEPARATE); } if (zephir_array_isset_string(&options, SL("messageValid"))) { ZEPHIR_INIT_VAR(&_2$$5); ZVAL_STRING(&_2$$5, "messageValid"); - ZEPHIR_CALL_METHOD(&messageValid, &helper, "__invoke", NULL, 159, &options, &_2$$5); + ZEPHIR_CALL_METHOD(&messageValid, &helper, "__invoke", NULL, 160, &options, &_2$$5); zephir_check_call_status(); zephir_array_unset_string(&options, SL("messageValid"), PH_SEPARATE); } @@ -297,11 +297,11 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) if (ZEPHIR_IS_LONG_IDENTICAL(&_8$$6, 0)) { ZEPHIR_INIT_NVAR(&_16$$7); ZVAL_STRING(&_16$$7, "messageMinSize"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 159, &options, &_16$$7); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 160, &options, &_16$$7); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_16$$7); ZVAL_STRING(&_16$$7, "includedMinSize"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 159, &options, &_16$$7); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 160, &options, &_16$$7); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_min_ce); @@ -310,18 +310,18 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_array_update_string(&_17$$7, SL("size"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_17$$7, SL("message"), &message, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_17$$7, SL("included"), &included, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_18, 301, &_17$$7); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_18, 303, &_17$$7); zephir_check_call_status(); zephir_array_unset_string(&options, SL("messageMinSize"), PH_SEPARATE); zephir_array_unset_string(&options, SL("includedMinSize"), PH_SEPARATE); } else if (ZEPHIR_IS_LONG_IDENTICAL(&_10$$6, 0)) { ZEPHIR_INIT_NVAR(&_19$$8); ZVAL_STRING(&_19$$8, "messageSize"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 159, &options, &_19$$8); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 160, &options, &_19$$8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_19$$8); ZVAL_STRING(&_19$$8, "includedSize"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 159, &options, &_19$$8); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 160, &options, &_19$$8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_max_ce); @@ -330,7 +330,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_array_update_string(&_20$$8, SL("size"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_20$$8, SL("message"), &message, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_20$$8, SL("included"), &included, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_18, 301, &_20$$8); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_18, 303, &_20$$8); zephir_check_call_status(); zephir_array_unset_string(&options, SL("maxSize"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageSize"), PH_SEPARATE); @@ -338,7 +338,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) } else if (ZEPHIR_IS_LONG_IDENTICAL(&_11$$6, 0)) { ZEPHIR_INIT_NVAR(&_21$$9); ZVAL_STRING(&_21$$9, "messageEqualSize"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 159, &options, &_21$$9); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 160, &options, &_21$$9); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_equal_ce); @@ -346,14 +346,14 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_create_array(&_22$$9, 2, 0); zephir_array_update_string(&_22$$9, SL("size"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_22$$9, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_18, 301, &_22$$9); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_18, 303, &_22$$9); zephir_check_call_status(); zephir_array_unset_string(&options, SL("equalSize"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageEqualSize"), PH_SEPARATE); } else if (ZEPHIR_IS_LONG_IDENTICAL(&_12$$6, 0)) { ZEPHIR_INIT_NVAR(&_23$$10); ZVAL_STRING(&_23$$10, "messageType"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 159, &options, &_23$$10); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 160, &options, &_23$$10); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_mimetype_ce); @@ -361,18 +361,18 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_create_array(&_24$$10, 2, 0); zephir_array_update_string(&_24$$10, SL("types"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_24$$10, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_18, 301, &_24$$10); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_18, 303, &_24$$10); zephir_check_call_status(); zephir_array_unset_string(&options, SL("allowedTypes"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageType"), PH_SEPARATE); } else if (ZEPHIR_IS_LONG_IDENTICAL(&_13$$6, 0)) { ZEPHIR_INIT_NVAR(&_25$$11); ZVAL_STRING(&_25$$11, "messageMaxResolution"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 159, &options, &_25$$11); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 160, &options, &_25$$11); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_25$$11); ZVAL_STRING(&_25$$11, "includedMaxResolution"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 159, &options, &_25$$11); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 160, &options, &_25$$11); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_max_ce); @@ -381,7 +381,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_array_update_string(&_26$$11, SL("resolution"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_26$$11, SL("included"), &included, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_26$$11, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_27, 302, &_26$$11); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_27, 304, &_26$$11); zephir_check_call_status(); zephir_array_unset_string(&options, SL("maxResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("includedMaxResolution"), PH_SEPARATE); @@ -389,11 +389,11 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) } else if (ZEPHIR_IS_LONG_IDENTICAL(&_14$$6, 0)) { ZEPHIR_INIT_NVAR(&_28$$12); ZVAL_STRING(&_28$$12, "messageMinResolution"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 159, &options, &_28$$12); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 160, &options, &_28$$12); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_28$$12); ZVAL_STRING(&_28$$12, "includedMinResolution"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 159, &options, &_28$$12); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 160, &options, &_28$$12); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_min_ce); @@ -402,7 +402,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_array_update_string(&_29$$12, SL("resolution"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_29$$12, SL("included"), &included, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_29$$12, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_30, 303, &_29$$12); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_30, 305, &_29$$12); zephir_check_call_status(); zephir_array_unset_string(&options, SL("minResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("includedMinResolution"), PH_SEPARATE); @@ -410,7 +410,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) } else if (ZEPHIR_IS_LONG_IDENTICAL(&_15$$6, 0)) { ZEPHIR_INIT_NVAR(&_31$$13); ZVAL_STRING(&_31$$13, "messageEqualResolution"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 159, &options, &_31$$13); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 160, &options, &_31$$13); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_equal_ce); @@ -418,7 +418,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_create_array(&_32$$13, 2, 0); zephir_array_update_string(&_32$$13, SL("resolution"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_32$$13, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 304, &_32$$13); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 306, &_32$$13); zephir_check_call_status(); zephir_array_unset_string(&options, SL("equalResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageEqualResolution"), PH_SEPARATE); @@ -426,15 +426,15 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) continue; } if (Z_TYPE_P(&messageFileEmpty) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagefileempty", &_34, 305, &messageFileEmpty); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagefileempty", &_34, 307, &messageFileEmpty); zephir_check_call_status(); } if (Z_TYPE_P(&messageIniSize) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessageinisize", &_35, 306, &messageIniSize); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessageinisize", &_35, 308, &messageIniSize); zephir_check_call_status(); } if (Z_TYPE_P(&messageValid) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagevalid", &_36, 307, &messageValid); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagevalid", &_36, 309, &messageValid); zephir_check_call_status(); } zephir_update_property_array_append(this_ptr, SL("validators"), &validator); @@ -483,11 +483,11 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) if (ZEPHIR_IS_LONG_IDENTICAL(&_38$$18, 0)) { ZEPHIR_INIT_NVAR(&_45$$19); ZVAL_STRING(&_45$$19, "messageMinSize"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 159, &options, &_45$$19); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 160, &options, &_45$$19); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_45$$19); ZVAL_STRING(&_45$$19, "includedMinSize"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 159, &options, &_45$$19); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 160, &options, &_45$$19); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_min_ce); @@ -496,18 +496,18 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_array_update_string(&_46$$19, SL("size"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_46$$19, SL("message"), &message, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_46$$19, SL("included"), &included, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 304, &_46$$19); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 306, &_46$$19); zephir_check_call_status(); zephir_array_unset_string(&options, SL("messageMinSize"), PH_SEPARATE); zephir_array_unset_string(&options, SL("includedMinSize"), PH_SEPARATE); } else if (ZEPHIR_IS_LONG_IDENTICAL(&_39$$18, 0)) { ZEPHIR_INIT_NVAR(&_47$$20); ZVAL_STRING(&_47$$20, "messageSize"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 159, &options, &_47$$20); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 160, &options, &_47$$20); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_47$$20); ZVAL_STRING(&_47$$20, "includedSize"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 159, &options, &_47$$20); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 160, &options, &_47$$20); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_max_ce); @@ -516,7 +516,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_array_update_string(&_48$$20, SL("size"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_48$$20, SL("message"), &message, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_48$$20, SL("included"), &included, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 304, &_48$$20); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 306, &_48$$20); zephir_check_call_status(); zephir_array_unset_string(&options, SL("maxSize"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageSize"), PH_SEPARATE); @@ -524,7 +524,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) } else if (ZEPHIR_IS_LONG_IDENTICAL(&_40$$18, 0)) { ZEPHIR_INIT_NVAR(&_49$$21); ZVAL_STRING(&_49$$21, "messageEqualSize"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 159, &options, &_49$$21); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 160, &options, &_49$$21); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_equal_ce); @@ -532,14 +532,14 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_create_array(&_50$$21, 2, 0); zephir_array_update_string(&_50$$21, SL("size"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_50$$21, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 304, &_50$$21); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 306, &_50$$21); zephir_check_call_status(); zephir_array_unset_string(&options, SL("equalSize"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageEqualSize"), PH_SEPARATE); } else if (ZEPHIR_IS_LONG_IDENTICAL(&_41$$18, 0)) { ZEPHIR_INIT_NVAR(&_51$$22); ZVAL_STRING(&_51$$22, "messageType"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 159, &options, &_51$$22); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 160, &options, &_51$$22); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_mimetype_ce); @@ -547,18 +547,18 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_create_array(&_52$$22, 2, 0); zephir_array_update_string(&_52$$22, SL("types"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_52$$22, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 304, &_52$$22); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 306, &_52$$22); zephir_check_call_status(); zephir_array_unset_string(&options, SL("allowedTypes"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageType"), PH_SEPARATE); } else if (ZEPHIR_IS_LONG_IDENTICAL(&_42$$18, 0)) { ZEPHIR_INIT_NVAR(&_53$$23); ZVAL_STRING(&_53$$23, "messageMaxResolution"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 159, &options, &_53$$23); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 160, &options, &_53$$23); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_53$$23); ZVAL_STRING(&_53$$23, "includedMaxResolution"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 159, &options, &_53$$23); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 160, &options, &_53$$23); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_max_ce); @@ -567,7 +567,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_array_update_string(&_54$$23, SL("resolution"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_54$$23, SL("included"), &included, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_54$$23, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 304, &_54$$23); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 306, &_54$$23); zephir_check_call_status(); zephir_array_unset_string(&options, SL("maxResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("includedMaxResolution"), PH_SEPARATE); @@ -575,11 +575,11 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) } else if (ZEPHIR_IS_LONG_IDENTICAL(&_43$$18, 0)) { ZEPHIR_INIT_NVAR(&_55$$24); ZVAL_STRING(&_55$$24, "messageMinResolution"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 159, &options, &_55$$24); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 160, &options, &_55$$24); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_55$$24); ZVAL_STRING(&_55$$24, "includedMinResolution"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 159, &options, &_55$$24); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 160, &options, &_55$$24); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_min_ce); @@ -588,7 +588,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_array_update_string(&_56$$24, SL("resolution"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_56$$24, SL("included"), &included, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_56$$24, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 304, &_56$$24); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 306, &_56$$24); zephir_check_call_status(); zephir_array_unset_string(&options, SL("minResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("includedMinResolution"), PH_SEPARATE); @@ -596,7 +596,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) } else if (ZEPHIR_IS_LONG_IDENTICAL(&_44$$18, 0)) { ZEPHIR_INIT_NVAR(&_57$$25); ZVAL_STRING(&_57$$25, "messageEqualResolution"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 159, &options, &_57$$25); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 160, &options, &_57$$25); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_equal_ce); @@ -604,7 +604,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_create_array(&_58$$25, 2, 0); zephir_array_update_string(&_58$$25, SL("resolution"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_58$$25, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 304, &_58$$25); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 306, &_58$$25); zephir_check_call_status(); zephir_array_unset_string(&options, SL("equalResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageEqualResolution"), PH_SEPARATE); @@ -612,15 +612,15 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) continue; } if (Z_TYPE_P(&messageFileEmpty) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagefileempty", &_34, 305, &messageFileEmpty); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagefileempty", &_34, 307, &messageFileEmpty); zephir_check_call_status(); } if (Z_TYPE_P(&messageIniSize) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessageinisize", &_35, 306, &messageIniSize); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessageinisize", &_35, 308, &messageIniSize); zephir_check_call_status(); } if (Z_TYPE_P(&messageValid) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagevalid", &_36, 307, &messageValid); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagevalid", &_36, 309, &messageValid); zephir_check_call_status(); } zephir_update_property_array_append(this_ptr, SL("validators"), &validator); diff --git a/ext/phalcon/filter/validation/validator/file/mimetype.zep.c b/ext/phalcon/filter/validation/validator/file/mimetype.zep.c index 1eb9bcbbd87..25cbd98b81f 100644 --- a/ext/phalcon/filter/validation/validator/file/mimetype.zep.c +++ b/ext/phalcon/filter/validation/validator/file/mimetype.zep.c @@ -141,13 +141,13 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_MimeType, validate) } if ((zephir_function_exists_ex(ZEND_STRL("finfo_open")) == SUCCESS)) { ZVAL_LONG(&_2$$6, 16); - ZEPHIR_CALL_FUNCTION(&tmp, "finfo_open", NULL, 308, &_2$$6); + ZEPHIR_CALL_FUNCTION(&tmp, "finfo_open", NULL, 310, &_2$$6); zephir_check_call_status(); if (zephir_is_true(&tmp)) { zephir_array_fetch_string(&_3$$7, &value, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/Validator/File/MimeType.zep", 102); - ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 309, &tmp, &_3$$7); + ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 311, &tmp, &_3$$7); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 310, &tmp); + ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 312, &tmp); zephir_check_call_status(); } } diff --git a/ext/phalcon/filter/validation/validator/file/resolution/equal.zep.c b/ext/phalcon/filter/validation/validator/file/resolution/equal.zep.c index 98152c2e59b..6716c631d56 100644 --- a/ext/phalcon/filter/validation/validator/file/resolution/equal.zep.c +++ b/ext/phalcon/filter/validation/validator/file/resolution/equal.zep.c @@ -155,7 +155,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_Resolution_Equal, validate) ZEPHIR_CALL_METHOD(&value, validation, "getvalue", NULL, 0, field); zephir_check_call_status(); zephir_array_fetch_string(&_1, &value, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/Validator/File/Resolution/Equal.zep", 88); - ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 311, &_1); + ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 313, &_1); zephir_check_call_status(); zephir_memory_observe(&width); zephir_array_fetch_long(&width, &tmp, 0, PH_NOISY, "phalcon/Filter/Validation/Validator/File/Resolution/Equal.zep", 89); diff --git a/ext/phalcon/filter/validation/validator/file/resolution/max.zep.c b/ext/phalcon/filter/validation/validator/file/resolution/max.zep.c index 7112480023e..799bb0b1820 100644 --- a/ext/phalcon/filter/validation/validator/file/resolution/max.zep.c +++ b/ext/phalcon/filter/validation/validator/file/resolution/max.zep.c @@ -166,7 +166,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_Resolution_Max, validate) ZEPHIR_CALL_METHOD(&value, validation, "getvalue", NULL, 0, field); zephir_check_call_status(); zephir_array_fetch_string(&_1, &value, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/Validator/File/Resolution/Max.zep", 94); - ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 311, &_1); + ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 313, &_1); zephir_check_call_status(); zephir_memory_observe(&width); zephir_array_fetch_long(&width, &tmp, 0, PH_NOISY, "phalcon/Filter/Validation/Validator/File/Resolution/Max.zep", 95); diff --git a/ext/phalcon/filter/validation/validator/file/resolution/min.zep.c b/ext/phalcon/filter/validation/validator/file/resolution/min.zep.c index 65f642ba54d..fa279b95e18 100644 --- a/ext/phalcon/filter/validation/validator/file/resolution/min.zep.c +++ b/ext/phalcon/filter/validation/validator/file/resolution/min.zep.c @@ -166,7 +166,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_Resolution_Min, validate) ZEPHIR_CALL_METHOD(&value, validation, "getvalue", NULL, 0, field); zephir_check_call_status(); zephir_array_fetch_string(&_1, &value, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/Validator/File/Resolution/Min.zep", 94); - ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 311, &_1); + ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 313, &_1); zephir_check_call_status(); zephir_memory_observe(&width); zephir_array_fetch_long(&width, &tmp, 0, PH_NOISY, "phalcon/Filter/Validation/Validator/File/Resolution/Min.zep", 95); diff --git a/ext/phalcon/filter/validation/validator/inclusionin.zep.c b/ext/phalcon/filter/validation/validator/inclusionin.zep.c index 4d80ba89a08..ef1c89bd8c1 100644 --- a/ext/phalcon/filter/validation/validator/inclusionin.zep.c +++ b/ext/phalcon/filter/validation/validator/inclusionin.zep.c @@ -187,7 +187,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_InclusionIn, validate) return; } } - ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 300, &value, &domain, &strict); + ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 302, &value, &domain, &strict); zephir_check_call_status(); if (!(zephir_is_true(&_5))) { ZEPHIR_INIT_VAR(&replacePairs); diff --git a/ext/phalcon/filter/validation/validator/ip.zep.c b/ext/phalcon/filter/validation/validator/ip.zep.c index 15612eea6d8..a4632568f05 100644 --- a/ext/phalcon/filter/validation/validator/ip.zep.c +++ b/ext/phalcon/filter/validation/validator/ip.zep.c @@ -226,7 +226,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Ip, validate) zephir_bitwise_or_function(&_10, &_9, &allowReserved); zephir_array_update_string(&options, SL("flags"), &_10, PH_COPY | PH_SEPARATE); ZVAL_LONG(&_2, 275); - ZEPHIR_CALL_FUNCTION(&_11, "filter_var", NULL, 283, &value, &_2, &options); + ZEPHIR_CALL_FUNCTION(&_11, "filter_var", NULL, 284, &value, &_2, &options); zephir_check_call_status(); if (!(zephir_is_true(&_11))) { ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "messagefactory", NULL, 0, validation, field); diff --git a/ext/phalcon/filter/validation/validator/stringlength.zep.c b/ext/phalcon/filter/validation/validator/stringlength.zep.c index 1e6bb238237..516ac1a7de4 100644 --- a/ext/phalcon/filter/validation/validator/stringlength.zep.c +++ b/ext/phalcon/filter/validation/validator/stringlength.zep.c @@ -199,7 +199,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength, __construct) zephir_array_update_string(&_8$$4, SL("min"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_8$$4, SL("message"), &message, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_8$$4, SL("included"), &included, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_9, 312, &_8$$4); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_9, 314, &_8$$4); zephir_check_call_status(); zephir_array_unset_string(&options, SL("min"), PH_SEPARATE); zephir_array_unset_string(&options, SL("message"), PH_SEPARATE); @@ -228,7 +228,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength, __construct) zephir_array_update_string(&_10$$9, SL("max"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_10$$9, SL("message"), &message, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_10$$9, SL("included"), &included, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_11, 313, &_10$$9); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_11, 315, &_10$$9); zephir_check_call_status(); zephir_array_unset_string(&options, SL("max"), PH_SEPARATE); zephir_array_unset_string(&options, SL("message"), PH_SEPARATE); @@ -283,7 +283,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength, __construct) zephir_array_update_string(&_15$$16, SL("min"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_15$$16, SL("message"), &message, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_15$$16, SL("included"), &included, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_11, 313, &_15$$16); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_11, 315, &_15$$16); zephir_check_call_status(); zephir_array_unset_string(&options, SL("min"), PH_SEPARATE); zephir_array_unset_string(&options, SL("message"), PH_SEPARATE); @@ -312,7 +312,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength, __construct) zephir_array_update_string(&_16$$21, SL("max"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_16$$21, SL("message"), &message, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_16$$21, SL("included"), &included, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_11, 313, &_16$$21); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_11, 315, &_16$$21); zephir_check_call_status(); zephir_array_unset_string(&options, SL("max"), PH_SEPARATE); zephir_array_unset_string(&options, SL("message"), PH_SEPARATE); diff --git a/ext/phalcon/filter/validation/validator/stringlength/max.zep.c b/ext/phalcon/filter/validation/validator/stringlength/max.zep.c index 3249b9bb9ec..d6162e5aff7 100644 --- a/ext/phalcon/filter/validation/validator/stringlength/max.zep.c +++ b/ext/phalcon/filter/validation/validator/stringlength/max.zep.c @@ -164,7 +164,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength_Max, validate) } if ((zephir_function_exists_ex(ZEND_STRL("mb_strlen")) == SUCCESS)) { zephir_cast_to_string(&_1$$4, &value); - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 246, &_1$$4); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 247, &_1$$4); zephir_check_call_status(); } else { zephir_cast_to_string(&_2$$5, &value); diff --git a/ext/phalcon/filter/validation/validator/stringlength/min.zep.c b/ext/phalcon/filter/validation/validator/stringlength/min.zep.c index e504be4d295..81a7ec5fad6 100644 --- a/ext/phalcon/filter/validation/validator/stringlength/min.zep.c +++ b/ext/phalcon/filter/validation/validator/stringlength/min.zep.c @@ -164,7 +164,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength_Min, validate) } if ((zephir_function_exists_ex(ZEND_STRL("mb_strlen")) == SUCCESS)) { zephir_cast_to_string(&_1$$4, &value); - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 246, &_1$$4); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 247, &_1$$4); zephir_check_call_status(); } else { zephir_cast_to_string(&_2$$5, &value); diff --git a/ext/phalcon/filter/validation/validator/uniqueness.zep.c b/ext/phalcon/filter/validation/validator/uniqueness.zep.c index 069d2cfd53c..bf9ee6a4dd7 100644 --- a/ext/phalcon/filter/validation/validator/uniqueness.zep.c +++ b/ext/phalcon/filter/validation/validator/uniqueness.zep.c @@ -616,7 +616,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Uniqueness, isUniquenessModel) zephir_array_keys(&_10$$6, &except); ZVAL_LONG(&_11$$6, 0); ZVAL_LONG(&_12$$6, (zephir_fast_count_int(&except) - 1)); - ZEPHIR_CALL_FUNCTION(&_13$$6, "range", &_14, 314, &_11$$6, &_12$$6); + ZEPHIR_CALL_FUNCTION(&_13$$6, "range", &_14, 316, &_11$$6, &_12$$6); zephir_check_call_status(); _9$$6 = !ZEPHIR_IS_IDENTICAL(&_10$$6, &_13$$6); } @@ -1020,7 +1020,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Uniqueness, isUniquenessModel) zephir_array_keys(&_88$$37, &except); ZVAL_LONG(&_89$$37, 0); ZVAL_LONG(&_90$$37, (zephir_fast_count_int(&except) - 1)); - ZEPHIR_CALL_FUNCTION(&_91$$37, "range", &_14, 314, &_89$$37, &_90$$37); + ZEPHIR_CALL_FUNCTION(&_91$$37, "range", &_14, 316, &_89$$37, &_90$$37); zephir_check_call_status(); _87$$37 = !ZEPHIR_IS_IDENTICAL(&_88$$37, &_91$$37); } diff --git a/ext/phalcon/filter/validation/validator/url.zep.c b/ext/phalcon/filter/validation/validator/url.zep.c index 44683cce3d2..2e8194a3217 100644 --- a/ext/phalcon/filter/validation/validator/url.zep.c +++ b/ext/phalcon/filter/validation/validator/url.zep.c @@ -145,11 +145,11 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Url, validate) zephir_read_property(&_1, this_ptr, ZEND_STRL("options"), PH_NOISY_CC | PH_READONLY); if (zephir_array_isset_string_fetch(&options, &_1, SL("options"), 0)) { ZVAL_LONG(&_2$$4, 273); - ZEPHIR_CALL_FUNCTION(&result, "filter_var", NULL, 283, &value, &_2$$4, &options); + ZEPHIR_CALL_FUNCTION(&result, "filter_var", NULL, 284, &value, &_2$$4, &options); zephir_check_call_status(); } else { ZVAL_LONG(&_3$$5, 273); - ZEPHIR_CALL_FUNCTION(&result, "filter_var", NULL, 283, &value, &_3$$5); + ZEPHIR_CALL_FUNCTION(&result, "filter_var", NULL, 284, &value, &_3$$5); zephir_check_call_status(); } if (!(zephir_is_true(&result))) { diff --git a/ext/phalcon/forms/form.zep.c b/ext/phalcon/forms/form.zep.c index d460601616e..cf6c6d6f2b4 100644 --- a/ext/phalcon/forms/form.zep.c +++ b/ext/phalcon/forms/form.zep.c @@ -425,7 +425,7 @@ PHP_METHOD(Phalcon_Forms_Form, bind) zephir_update_property_zval_zval(entity, &key, &filteredValue); continue; } - ZEPHIR_CALL_FUNCTION(&_13$$11, "property_exists", &_14, 290, entity, &key); + ZEPHIR_CALL_FUNCTION(&_13$$11, "property_exists", &_14, 292, entity, &key); zephir_check_call_status(); if (zephir_is_true(&_13$$11)) { zephir_update_property_zval_zval(entity, &key, &filteredValue); @@ -491,7 +491,7 @@ PHP_METHOD(Phalcon_Forms_Form, bind) zephir_update_property_zval_zval(entity, &key, &filteredValue); continue; } - ZEPHIR_CALL_FUNCTION(&_21$$21, "property_exists", &_14, 290, entity, &key); + ZEPHIR_CALL_FUNCTION(&_21$$21, "property_exists", &_14, 292, entity, &key); zephir_check_call_status(); if (zephir_is_true(&_21$$21)) { zephir_update_property_zval_zval(entity, &key, &filteredValue); @@ -1354,7 +1354,7 @@ PHP_METHOD(Phalcon_Forms_Form, isValid) if (_7) { ZEPHIR_INIT_NVAR(&validation); object_init_ex(&validation, phalcon_filter_validation_ce); - ZEPHIR_CALL_METHOD(NULL, &validation, "__construct", NULL, 315); + ZEPHIR_CALL_METHOD(NULL, &validation, "__construct", NULL, 317); zephir_check_call_status(); } zephir_read_property(&_8, this_ptr, ZEND_STRL("elements"), PH_NOISY_CC | PH_READONLY); @@ -1377,7 +1377,7 @@ PHP_METHOD(Phalcon_Forms_Form, isValid) { ZEPHIR_INIT_NVAR(&validator); ZVAL_COPY(&validator, _11$$10); - ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 316, &name, &validator); + ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 318, &name, &validator); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); } else { @@ -1391,7 +1391,7 @@ PHP_METHOD(Phalcon_Forms_Form, isValid) } ZEPHIR_CALL_METHOD(&validator, &validators, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 316, &name, &validator); + ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 318, &name, &validator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &validators, "next", NULL, 0); zephir_check_call_status(); @@ -1401,7 +1401,7 @@ PHP_METHOD(Phalcon_Forms_Form, isValid) ZEPHIR_CALL_METHOD(&filters, &element, "getfilters", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&filters) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(NULL, &validation, "setfilters", &_14, 317, &name, &filters); + ZEPHIR_CALL_METHOD(NULL, &validation, "setfilters", &_14, 319, &name, &filters); zephir_check_call_status(); } } ZEND_HASH_FOREACH_END(); @@ -1429,7 +1429,7 @@ PHP_METHOD(Phalcon_Forms_Form, isValid) { ZEPHIR_INIT_NVAR(&validator); ZVAL_COPY(&validator, _15$$15); - ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 316, &name, &validator); + ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 318, &name, &validator); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); } else { @@ -1443,7 +1443,7 @@ PHP_METHOD(Phalcon_Forms_Form, isValid) } ZEPHIR_CALL_METHOD(&validator, &validators, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 316, &name, &validator); + ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 318, &name, &validator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &validators, "next", NULL, 0); zephir_check_call_status(); @@ -1453,7 +1453,7 @@ PHP_METHOD(Phalcon_Forms_Form, isValid) ZEPHIR_CALL_METHOD(&filters, &element, "getfilters", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&filters) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(NULL, &validation, "setfilters", &_14, 317, &name, &filters); + ZEPHIR_CALL_METHOD(NULL, &validation, "setfilters", &_14, 319, &name, &filters); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(NULL, &_8, "next", NULL, 0); @@ -1461,9 +1461,9 @@ PHP_METHOD(Phalcon_Forms_Form, isValid) } } ZEPHIR_INIT_NVAR(&element); - ZEPHIR_CALL_METHOD(NULL, &validation, "validate", NULL, 318, data, entity); + ZEPHIR_CALL_METHOD(NULL, &validation, "validate", NULL, 320, data, entity); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&messages, &validation, "getmessages", NULL, 319); + ZEPHIR_CALL_METHOD(&messages, &validation, "getmessages", NULL, 321); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_17, &messages, "count", NULL, 0); zephir_check_call_status(); diff --git a/ext/phalcon/forms/manager.zep.c b/ext/phalcon/forms/manager.zep.c index 5e282cd98c1..af7c33a0f46 100644 --- a/ext/phalcon/forms/manager.zep.c +++ b/ext/phalcon/forms/manager.zep.c @@ -78,7 +78,7 @@ 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, 320, entity); + ZEPHIR_CALL_METHOD(NULL, &form, "__construct", NULL, 322, entity); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("forms"), &name, &form); RETURN_CCTOR(&form); diff --git a/ext/phalcon/html/attributes.zep.c b/ext/phalcon/html/attributes.zep.c index 55eab3c41f0..4c7f422184c 100644 --- a/ext/phalcon/html/attributes.zep.c +++ b/ext/phalcon/html/attributes.zep.c @@ -154,7 +154,7 @@ PHP_METHOD(Phalcon_Html_Attributes, renderAttributes) ZVAL_LONG(&_5$$4, 3); ZEPHIR_INIT_NVAR(&_6$$4); ZVAL_STRING(&_6$$4, "utf-8"); - ZEPHIR_CALL_FUNCTION(&_7$$4, "htmlspecialchars", &_8, 286, &value, &_5$$4, &_6$$4, &__$true); + ZEPHIR_CALL_FUNCTION(&_7$$4, "htmlspecialchars", &_8, 288, &value, &_5$$4, &_6$$4, &__$true); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_9$$4); ZEPHIR_CONCAT_VSVS(&_9$$4, &key, "=\"", &_7$$4, "\" "); @@ -182,7 +182,7 @@ PHP_METHOD(Phalcon_Html_Attributes, renderAttributes) ZVAL_LONG(&_11$$6, 3); ZEPHIR_INIT_NVAR(&_12$$6); ZVAL_STRING(&_12$$6, "utf-8"); - ZEPHIR_CALL_FUNCTION(&_13$$6, "htmlspecialchars", &_8, 286, &value, &_11$$6, &_12$$6, &__$true); + ZEPHIR_CALL_FUNCTION(&_13$$6, "htmlspecialchars", &_8, 288, &value, &_11$$6, &_12$$6, &__$true); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_14$$6); ZEPHIR_CONCAT_VSVS(&_14$$6, &key, "=\"", &_13$$6, "\" "); diff --git a/ext/phalcon/html/breadcrumbs.zep.c b/ext/phalcon/html/breadcrumbs.zep.c index c8fe7499d65..daf433f1419 100644 --- a/ext/phalcon/html/breadcrumbs.zep.c +++ b/ext/phalcon/html/breadcrumbs.zep.c @@ -227,7 +227,7 @@ PHP_METHOD(Phalcon_Html_Breadcrumbs, render) ZEPHIR_INIT_VAR(&urls); zephir_array_keys(&urls, &elements); ZEPHIR_MAKE_REF(&urls); - ZEPHIR_CALL_FUNCTION(&lastUrl, "end", NULL, 321, &urls); + ZEPHIR_CALL_FUNCTION(&lastUrl, "end", NULL, 323, &urls); ZEPHIR_UNREF(&urls); zephir_check_call_status(); zephir_memory_observe(&lastLabel); diff --git a/ext/phalcon/html/escaper.zep.c b/ext/phalcon/html/escaper.zep.c index 8d79c804226..a8d5613eb4f 100644 --- a/ext/phalcon/html/escaper.zep.c +++ b/ext/phalcon/html/escaper.zep.c @@ -245,9 +245,9 @@ PHP_METHOD(Phalcon_Html_Escaper, css) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &input_param); zephir_get_strval(&input, input_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 322, &input); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 324, &input); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "doescapecss", NULL, 323, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "doescapecss", NULL, 325, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -313,7 +313,7 @@ PHP_METHOD(Phalcon_Html_Escaper, detectEncoding) { ZEPHIR_INIT_NVAR(&charset); ZVAL_COPY(&charset, _2); - ZEPHIR_CALL_FUNCTION(&_4$$5, "mb_detect_encoding", &_5, 324, &input, &charset, &__$true); + ZEPHIR_CALL_FUNCTION(&_4$$5, "mb_detect_encoding", &_5, 326, &input, &charset, &__$true); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&_4$$5)) { RETURN_CCTOR(&charset); @@ -330,7 +330,7 @@ PHP_METHOD(Phalcon_Html_Escaper, detectEncoding) } ZEPHIR_CALL_METHOD(&charset, &_0, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_6$$7, "mb_detect_encoding", &_5, 324, &input, &charset, &__$true); + ZEPHIR_CALL_FUNCTION(&_6$$7, "mb_detect_encoding", &_5, 326, &input, &charset, &__$true); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&_6$$7)) { RETURN_CCTOR(&charset); @@ -340,7 +340,7 @@ PHP_METHOD(Phalcon_Html_Escaper, detectEncoding) } } ZEPHIR_INIT_NVAR(&charset); - ZEPHIR_RETURN_CALL_FUNCTION("mb_detect_encoding", &_5, 324, &input); + ZEPHIR_RETURN_CALL_FUNCTION("mb_detect_encoding", &_5, 326, &input); zephir_check_call_status(); RETURN_MM(); } @@ -564,7 +564,7 @@ PHP_METHOD(Phalcon_Html_Escaper, html) zephir_read_property(&_0, this_ptr, ZEND_STRL("flags"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_1, this_ptr, ZEND_STRL("encoding"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_2, this_ptr, ZEND_STRL("doubleEncode"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 286, &input, &_0, &_1, &_2); + ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 288, &input, &_0, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -594,9 +594,9 @@ PHP_METHOD(Phalcon_Html_Escaper, js) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &input_param); zephir_get_strval(&input, input_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 322, &input); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 324, &input); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "doescapejs", NULL, 325, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "doescapejs", NULL, 327, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -626,11 +626,11 @@ PHP_METHOD(Phalcon_Html_Escaper, normalizeEncoding) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &input_param); zephir_get_strval(&input, input_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "detectencoding", NULL, 326, &input); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "detectencoding", NULL, 328, &input); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "UTF-32"); - ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 327, &input, &_1, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 329, &input, &_1, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -770,7 +770,7 @@ PHP_METHOD(Phalcon_Html_Escaper, url) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &input_param); zephir_get_strval(&input, input_param); - ZEPHIR_RETURN_CALL_FUNCTION("rawurlencode", NULL, 328, &input); + ZEPHIR_RETURN_CALL_FUNCTION("rawurlencode", NULL, 330, &input); zephir_check_call_status(); RETURN_MM(); } @@ -804,7 +804,7 @@ PHP_METHOD(Phalcon_Html_Escaper, phpHtmlSpecialChars) zephir_read_property(&_0, this_ptr, ZEND_STRL("flags"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_1, this_ptr, ZEND_STRL("encoding"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_2, this_ptr, ZEND_STRL("doubleEncode"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 286, &input, &_0, &_1, &_2); + ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 288, &input, &_0, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/html/helper/breadcrumbs.zep.c b/ext/phalcon/html/helper/breadcrumbs.zep.c index 355663f3962..3849984947f 100644 --- a/ext/phalcon/html/helper/breadcrumbs.zep.c +++ b/ext/phalcon/html/helper/breadcrumbs.zep.c @@ -410,7 +410,7 @@ PHP_METHOD(Phalcon_Html_Helper_Breadcrumbs, render) ZVAL_COPY(&element, _5); zephir_read_property(&_8$$4, this_ptr, ZEND_STRL("template"), PH_NOISY_CC | PH_READONLY); zephir_array_fetch_string(&_9$$4, &_8$$4, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Html/Helper/Breadcrumbs.zep", 220); - ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "getlink", &_10, 329, &_9$$4, &element); + ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "getlink", &_10, 331, &_9$$4, &element); zephir_check_call_status(); zephir_array_append(&output, &_7$$4, PH_SEPARATE, "phalcon/Html/Helper/Breadcrumbs.zep", 220); } ZEND_HASH_FOREACH_END(); @@ -427,7 +427,7 @@ PHP_METHOD(Phalcon_Html_Helper_Breadcrumbs, render) zephir_check_call_status(); zephir_read_property(&_12$$5, this_ptr, ZEND_STRL("template"), PH_NOISY_CC | PH_READONLY); zephir_array_fetch_string(&_13$$5, &_12$$5, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Html/Helper/Breadcrumbs.zep", 220); - ZEPHIR_CALL_METHOD(&_11$$5, this_ptr, "getlink", &_10, 329, &_13$$5, &element); + ZEPHIR_CALL_METHOD(&_11$$5, this_ptr, "getlink", &_10, 331, &_13$$5, &element); zephir_check_call_status(); zephir_array_append(&output, &_11$$5, PH_SEPARATE, "phalcon/Html/Helper/Breadcrumbs.zep", 220); ZEPHIR_CALL_METHOD(NULL, &_4, "next", NULL, 0); @@ -437,7 +437,7 @@ PHP_METHOD(Phalcon_Html_Helper_Breadcrumbs, render) ZEPHIR_INIT_NVAR(&element); zephir_read_property(&_15, this_ptr, ZEND_STRL("template"), PH_NOISY_CC | PH_READONLY); zephir_array_fetch_string(&_16, &_15, SL("last"), PH_NOISY | PH_READONLY, "phalcon/Html/Helper/Breadcrumbs.zep", 226); - ZEPHIR_CALL_METHOD(&_14, this_ptr, "getlink", &_10, 329, &_16, &lastElement); + ZEPHIR_CALL_METHOD(&_14, this_ptr, "getlink", &_10, 331, &_16, &lastElement); zephir_check_call_status(); zephir_array_append(&output, &_14, PH_SEPARATE, "phalcon/Html/Helper/Breadcrumbs.zep", 226); zephir_read_property(&_17, this_ptr, ZEND_STRL("interpolator"), PH_NOISY_CC | PH_READONLY); @@ -446,7 +446,7 @@ PHP_METHOD(Phalcon_Html_Helper_Breadcrumbs, render) ZEPHIR_INIT_VAR(&_20); zephir_create_array(&_20, 4, 0); zephir_read_property(&_22, this_ptr, ZEND_STRL("attributes"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&_21, this_ptr, "processattributes", NULL, 330, &_22); + ZEPHIR_CALL_METHOD(&_21, this_ptr, "processattributes", NULL, 332, &_22); zephir_check_call_status(); zephir_array_update_string(&_20, SL("attributes"), &_21, PH_COPY | PH_SEPARATE); zephir_memory_observe(&_23); @@ -596,7 +596,7 @@ PHP_METHOD(Phalcon_Html_Helper_Breadcrumbs, getLink) ZEPHIR_INIT_VAR(&_3); zephir_create_array(&_3, 4, 0); zephir_array_fetch_string(&_5, &element, SL("attributes"), PH_NOISY | PH_READONLY, "phalcon/Html/Helper/Breadcrumbs.zep", 300); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "processattributes", NULL, 330, &_5); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "processattributes", NULL, 332, &_5); zephir_check_call_status(); zephir_array_update_string(&_3, SL("attributes"), &_4, PH_COPY | PH_SEPARATE); zephir_memory_observe(&_6); diff --git a/ext/phalcon/html/helper/input/select.zep.c b/ext/phalcon/html/helper/input/select.zep.c index d1916cffc4f..e0c389b116b 100644 --- a/ext/phalcon/html/helper/input/select.zep.c +++ b/ext/phalcon/html/helper/input/select.zep.c @@ -105,7 +105,7 @@ PHP_METHOD(Phalcon_Html_Helper_Input_Select, add) raw = 0; } else { } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "processvalue", NULL, 331, &attributes, &value); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "processvalue", NULL, 333, &attributes, &value); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attributes, &_0); ZEPHIR_INIT_VAR(&_1); diff --git a/ext/phalcon/html/helper/meta.zep.c b/ext/phalcon/html/helper/meta.zep.c index a8930cf5ec9..877071a3d12 100644 --- a/ext/phalcon/html/helper/meta.zep.c +++ b/ext/phalcon/html/helper/meta.zep.c @@ -118,7 +118,7 @@ PHP_METHOD(Phalcon_Html_Helper_Meta, addHttp) zephir_get_strval(&content, content_param); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "http-equiv"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addelement", NULL, 332, &_0, &httpEquiv, &content); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addelement", NULL, 334, &_0, &httpEquiv, &content); zephir_check_call_status(); RETURN_MM(); } @@ -152,7 +152,7 @@ PHP_METHOD(Phalcon_Html_Helper_Meta, addName) zephir_get_strval(&content, content_param); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "name"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "addelement", NULL, 332, &_0, &name, &content); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addelement", NULL, 334, &_0, &name, &content); zephir_check_call_status(); RETURN_THIS(); } @@ -186,7 +186,7 @@ PHP_METHOD(Phalcon_Html_Helper_Meta, addProperty) zephir_get_strval(&content, content_param); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "property"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "addelement", NULL, 332, &_0, &name, &content); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addelement", NULL, 334, &_0, &name, &content); zephir_check_call_status(); RETURN_THIS(); } diff --git a/ext/phalcon/html/helper/title.zep.c b/ext/phalcon/html/helper/title.zep.c index ffb75138670..bb6e0455d9b 100644 --- a/ext/phalcon/html/helper/title.zep.c +++ b/ext/phalcon/html/helper/title.zep.c @@ -152,7 +152,7 @@ PHP_METHOD(Phalcon_Html_Helper_Title, __toString) zephir_read_property(&_2, this_ptr, ZEND_STRL("title"), PH_NOISY_CC); zephir_array_fast_append(&_1, &_2); zephir_read_property(&_3, this_ptr, ZEND_STRL("append"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&items, "array_merge", NULL, 333, &_0, &_1, &_3); + ZEPHIR_CALL_FUNCTION(&items, "array_merge", NULL, 335, &_0, &_1, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); array_init(&_4); @@ -375,7 +375,7 @@ PHP_METHOD(Phalcon_Html_Helper_Title, prepend) zephir_read_property(&_2, this_ptr, ZEND_STRL("prepend"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&prepend, &_2); ZEPHIR_MAKE_REF(&prepend); - ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 270, &prepend, &text); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 271, &prepend, &text); ZEPHIR_UNREF(&prepend); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("prepend"), &prepend); diff --git a/ext/phalcon/http/cookie.zep.c b/ext/phalcon/http/cookie.zep.c index 6a62885a0a5..ca5f45df7ec 100644 --- a/ext/phalcon/http/cookie.zep.c +++ b/ext/phalcon/http/cookie.zep.c @@ -302,32 +302,32 @@ PHP_METHOD(Phalcon_Http_Cookie, delete) ZEPHIR_INIT_VAR(&_8); ZVAL_STRING(&_8, "expires"); ZVAL_LONG(&_0, (zephir_get_numberval(&_3) - 691200)); - ZEPHIR_CALL_METHOD(&_7, this_ptr, "getarrval", NULL, 334, &options, &_8, &_0); + ZEPHIR_CALL_METHOD(&_7, this_ptr, "getarrval", NULL, 336, &options, &_8, &_0); zephir_check_call_status(); zephir_array_update_string(&options, SL("expires"), &_7, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_8); ZVAL_STRING(&_8, "domain"); - ZEPHIR_CALL_METHOD(&_9, this_ptr, "getarrval", NULL, 334, &options, &_8, &domain); + ZEPHIR_CALL_METHOD(&_9, this_ptr, "getarrval", NULL, 336, &options, &_8, &domain); zephir_check_call_status(); zephir_array_update_string(&options, SL("domain"), &_9, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_8); ZVAL_STRING(&_8, "path"); - ZEPHIR_CALL_METHOD(&_10, this_ptr, "getarrval", NULL, 334, &options, &_8, &path); + ZEPHIR_CALL_METHOD(&_10, this_ptr, "getarrval", NULL, 336, &options, &_8, &path); zephir_check_call_status(); zephir_array_update_string(&options, SL("path"), &_10, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_8); ZVAL_STRING(&_8, "secure"); - ZEPHIR_CALL_METHOD(&_11, this_ptr, "getarrval", NULL, 334, &options, &_8, &secure); + ZEPHIR_CALL_METHOD(&_11, this_ptr, "getarrval", NULL, 336, &options, &_8, &secure); zephir_check_call_status(); zephir_array_update_string(&options, SL("secure"), &_11, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_8); ZVAL_STRING(&_8, "httponly"); - ZEPHIR_CALL_METHOD(&_12, this_ptr, "getarrval", NULL, 334, &options, &_8, &httpOnly); + ZEPHIR_CALL_METHOD(&_12, this_ptr, "getarrval", NULL, 336, &options, &_8, &httpOnly); zephir_check_call_status(); zephir_array_update_string(&options, SL("httponly"), &_12, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_8); ZVAL_STRING(&_8, ""); - ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 335, &name, &_8, &options); + ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 337, &name, &_8, &options); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -827,30 +827,30 @@ PHP_METHOD(Phalcon_Http_Cookie, send) } ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "expires"); - ZEPHIR_CALL_METHOD(&_13, this_ptr, "getarrval", NULL, 334, &options, &_3, &expire); + ZEPHIR_CALL_METHOD(&_13, this_ptr, "getarrval", NULL, 336, &options, &_3, &expire); zephir_check_call_status(); zephir_array_update_string(&options, SL("expires"), &_13, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "domain"); - ZEPHIR_CALL_METHOD(&_14, this_ptr, "getarrval", NULL, 334, &options, &_3, &domain); + ZEPHIR_CALL_METHOD(&_14, this_ptr, "getarrval", NULL, 336, &options, &_3, &domain); zephir_check_call_status(); zephir_array_update_string(&options, SL("domain"), &_14, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "path"); - ZEPHIR_CALL_METHOD(&_15, this_ptr, "getarrval", NULL, 334, &options, &_3, &path); + ZEPHIR_CALL_METHOD(&_15, this_ptr, "getarrval", NULL, 336, &options, &_3, &path); zephir_check_call_status(); zephir_array_update_string(&options, SL("path"), &_15, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "secure"); - ZEPHIR_CALL_METHOD(&_16, this_ptr, "getarrval", NULL, 334, &options, &_3, &secure); + ZEPHIR_CALL_METHOD(&_16, this_ptr, "getarrval", NULL, 336, &options, &_3, &secure); zephir_check_call_status(); zephir_array_update_string(&options, SL("secure"), &_16, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "httponly"); - ZEPHIR_CALL_METHOD(&_17, this_ptr, "getarrval", NULL, 334, &options, &_3, &httpOnly); + ZEPHIR_CALL_METHOD(&_17, this_ptr, "getarrval", NULL, 336, &options, &_3, &httpOnly); zephir_check_call_status(); zephir_array_update_string(&options, SL("httponly"), &_17, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 335, &name, &encryptValue, &options); + ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 337, &name, &encryptValue, &options); zephir_check_call_status(); RETURN_THIS(); } @@ -1168,14 +1168,14 @@ PHP_METHOD(Phalcon_Http_Cookie, assertSignKeyIsLongEnough) } else { ZEPHIR_INIT_VAR(&signKey); } - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 246, &signKey); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 247, &signKey); zephir_check_call_status(); if (UNEXPECTED(ZEPHIR_LT_LONG(&length, 32))) { ZEPHIR_INIT_VAR(&_0$$3); object_init_ex(&_0$$3, phalcon_http_cookie_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "The cookie's key should be at least 32 characters long. Current length is %d."); - ZEPHIR_CALL_FUNCTION(&_2$$3, "sprintf", NULL, 117, &_1$$3, &length); + ZEPHIR_CALL_FUNCTION(&_2$$3, "sprintf", NULL, 118, &_1$$3, &length); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 33, &_2$$3); zephir_check_call_status(); diff --git a/ext/phalcon/http/request.zep.c b/ext/phalcon/http/request.zep.c index c39906a058e..25975a1d8c8 100644 --- a/ext/phalcon/http/request.zep.c +++ b/ext/phalcon/http/request.zep.c @@ -22,6 +22,7 @@ #include "kernel/string.h" #include "kernel/concat.h" #include "kernel/file.h" +#include "kernel/math.h" /** @@ -65,31 +66,31 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Request) /** * @var FilterInterface|null */ - zend_declare_property_null(phalcon_http_request_ce, SL("filterService"), ZEND_ACC_PRIVATE); + zend_declare_property_null(phalcon_http_request_ce, SL("filterService"), ZEND_ACC_PROTECTED); /** * @var bool */ - zend_declare_property_bool(phalcon_http_request_ce, SL("httpMethodParameterOverride"), 0, ZEND_ACC_PRIVATE); + zend_declare_property_bool(phalcon_http_request_ce, SL("httpMethodParameterOverride"), 0, ZEND_ACC_PROTECTED); /** * @var array */ - zend_declare_property_null(phalcon_http_request_ce, SL("queryFilters"), ZEND_ACC_PRIVATE); + zend_declare_property_null(phalcon_http_request_ce, SL("queryFilters"), ZEND_ACC_PROTECTED); /** * @var array|null */ - zend_declare_property_null(phalcon_http_request_ce, SL("patchCache"), ZEND_ACC_PRIVATE); - /** - * @var array|null - */ - zend_declare_property_null(phalcon_http_request_ce, SL("putCache"), ZEND_ACC_PRIVATE); + zend_declare_property_null(phalcon_http_request_ce, SL("postCache"), ZEND_ACC_PROTECTED); /** * @var string */ - zend_declare_property_string(phalcon_http_request_ce, SL("rawBody"), "", ZEND_ACC_PRIVATE); + zend_declare_property_string(phalcon_http_request_ce, SL("rawBody"), "", ZEND_ACC_PROTECTED); /** * @var bool */ - zend_declare_property_bool(phalcon_http_request_ce, SL("strictHostCheck"), 0, ZEND_ACC_PRIVATE); + zend_declare_property_bool(phalcon_http_request_ce, SL("strictHostCheck"), 0, ZEND_ACC_PROTECTED); + /** + * @var array + */ + zend_declare_property_null(phalcon_http_request_ce, SL("trustedProxies"), ZEND_ACC_PROTECTED); phalcon_http_request_ce->create_object = zephir_init_properties_Phalcon_Http_Request; zend_class_implements(phalcon_http_request_ce, 1, phalcon_http_requestinterface_ce); @@ -177,7 +178,7 @@ PHP_METHOD(Phalcon_Http_Request, get) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 336, &_REQUEST, &name, filters, defaultValue, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 0, &_REQUEST, &name, filters, defaultValue, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -202,7 +203,7 @@ PHP_METHOD(Phalcon_Http_Request, getAcceptableContent) ZVAL_STRING(&_0, "HTTP_ACCEPT"); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "accept"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 337, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 0, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -265,7 +266,7 @@ PHP_METHOD(Phalcon_Http_Request, getBestAccept) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "accept"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 339, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 0, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -290,7 +291,7 @@ PHP_METHOD(Phalcon_Http_Request, getBestCharset) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "charset"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 339, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 0, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -315,7 +316,7 @@ PHP_METHOD(Phalcon_Http_Request, getBestLanguage) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "language"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 339, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 0, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -378,22 +379,46 @@ PHP_METHOD(Phalcon_Http_Request, getPreferredIsoLocaleVariant) } /** - * Gets most possible client IPv4 Address. This method searches in + * Gets most possible client IP Address. This method searches in * `$_SERVER["REMOTE_ADDR"]` and optionally in - * `$_SERVER["HTTP_X_FORWARDED_FOR"]` + * `$_SERVER["HTTP_X_FORWARDED_FOR"]` and returns the first non-private or non-reserved IP address + * + * @param bool $trustForwardedHeader + * + * @return string|false + * @throws \Exception */ PHP_METHOD(Phalcon_Http_Request, getClientAddress) { + zval _13$$32, _14$$32, _16$$34, _17$$34; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zephir_fcall_cache_entry *_8 = NULL, *_15 = NULL, *_18 = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *trustForwardedHeader_param = NULL, address, server, _0$$7, _1$$7; - zend_bool trustForwardedHeader; + zval *trustForwardedHeader_param = NULL, address, server, forwardedIps, forwardedIp, invertForwardedIp, trustedForwardedIp, filtered, trustedProxies, filterService, isIpAddressInCIDR, _1$$3, _2$$5, _3$$5, *_11$$5, _12$$5, *_4$$6, _5$$6, *_6$$7, _7$$7, *_9$$19, _10$$19; + zend_bool trustForwardedHeader, isTrusted = 0, _0$$3; zval *this_ptr = getThis(); ZVAL_UNDEF(&address); ZVAL_UNDEF(&server); - ZVAL_UNDEF(&_0$$7); - ZVAL_UNDEF(&_1$$7); + ZVAL_UNDEF(&forwardedIps); + ZVAL_UNDEF(&forwardedIp); + ZVAL_UNDEF(&invertForwardedIp); + ZVAL_UNDEF(&trustedForwardedIp); + ZVAL_UNDEF(&filtered); + ZVAL_UNDEF(&trustedProxies); + ZVAL_UNDEF(&filterService); + ZVAL_UNDEF(&isIpAddressInCIDR); + ZVAL_UNDEF(&_1$$3); + ZVAL_UNDEF(&_2$$5); + ZVAL_UNDEF(&_3$$5); + ZVAL_UNDEF(&_12$$5); + ZVAL_UNDEF(&_5$$6); + ZVAL_UNDEF(&_7$$7); + ZVAL_UNDEF(&_10$$19); + ZVAL_UNDEF(&_13$$32); + ZVAL_UNDEF(&_14$$32); + ZVAL_UNDEF(&_16$$34); + ZVAL_UNDEF(&_17$$34); ZEND_PARSE_PARAMETERS_START(0, 1) Z_PARAM_OPTIONAL Z_PARAM_BOOL(trustForwardedHeader) @@ -405,31 +430,218 @@ PHP_METHOD(Phalcon_Http_Request, getClientAddress) trustForwardedHeader = 0; } else { } - ZEPHIR_INIT_VAR(&address); - ZVAL_NULL(&address); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 340); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 339); zephir_check_call_status(); if (trustForwardedHeader) { - ZEPHIR_OBS_NVAR(&address); + zephir_memory_observe(&address); zephir_array_isset_string_fetch(&address, &server, SL("HTTP_X_FORWARDED_FOR"), 0); if (Z_TYPE_P(&address) == IS_NULL) { ZEPHIR_OBS_NVAR(&address); zephir_array_isset_string_fetch(&address, &server, SL("HTTP_CLIENT_IP"), 0); } - } - if (Z_TYPE_P(&address) == IS_NULL) { + _0$$3 = Z_TYPE_P(&address) != IS_NULL; + if (_0$$3) { + ZEPHIR_INIT_VAR(&_1$$3); + ZVAL_STRING(&_1$$3, ","); + _0$$3 = zephir_memnstr(&address, &_1$$3, "phalcon/Http/Request.zep", 227); + } + if (_0$$3) { + zephir_read_property(&_2$$5, this_ptr, ZEND_STRL("trustedProxies"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CPY_WRT(&trustedProxies, &_2$$5); + ZEPHIR_INIT_VAR(&_3$$5); + ZVAL_STRING(&_3$$5, ","); + ZEPHIR_INIT_VAR(&forwardedIps); + zephir_fast_explode(&forwardedIps, &_3$$5, &address, LONG_MAX); + if (!(ZEPHIR_IS_EMPTY(&trustedProxies))) { + isTrusted = 0; + zephir_is_iterable(&forwardedIps, 0, "phalcon/Http/Request.zep", 257); + if (Z_TYPE_P(&forwardedIps) == IS_ARRAY) { + ZEND_HASH_REVERSE_FOREACH_VAL(Z_ARRVAL_P(&forwardedIps), _4$$6) + { + ZEPHIR_INIT_NVAR(&invertForwardedIp); + ZVAL_COPY(&invertForwardedIp, _4$$6); + if (isTrusted == 1) { + break; + } + zephir_is_iterable(&trustedProxies, 0, "phalcon/Http/Request.zep", 255); + if (Z_TYPE_P(&trustedProxies) == IS_ARRAY) { + ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&trustedProxies), _6$$7) + { + ZEPHIR_INIT_NVAR(&trustedForwardedIp); + ZVAL_COPY(&trustedForwardedIp, _6$$7); + if (zephir_memnstr_str(&trustedForwardedIp, SL("/"), "phalcon/Http/Request.zep", 242)) { + ZEPHIR_CALL_METHOD(&isIpAddressInCIDR, this_ptr, "isipaddressincidr", &_8, 0, &invertForwardedIp, &trustedForwardedIp); + zephir_check_call_status(); + if (ZEPHIR_IS_TRUE_IDENTICAL(&isIpAddressInCIDR)) { + isTrusted = 1; + break; + } + } else { + if (ZEPHIR_IS_IDENTICAL(&invertForwardedIp, &trustedForwardedIp)) { + isTrusted = 1; + break; + } + } + } ZEND_HASH_FOREACH_END(); + } else { + ZEPHIR_CALL_METHOD(NULL, &trustedProxies, "rewind", NULL, 0); + zephir_check_call_status(); + while (1) { + ZEPHIR_CALL_METHOD(&_7$$7, &trustedProxies, "valid", NULL, 0); + zephir_check_call_status(); + if (!zend_is_true(&_7$$7)) { + break; + } + ZEPHIR_CALL_METHOD(&trustedForwardedIp, &trustedProxies, "current", NULL, 0); + zephir_check_call_status(); + if (zephir_memnstr_str(&trustedForwardedIp, SL("/"), "phalcon/Http/Request.zep", 242)) { + ZEPHIR_CALL_METHOD(&isIpAddressInCIDR, this_ptr, "isipaddressincidr", &_8, 0, &invertForwardedIp, &trustedForwardedIp); + zephir_check_call_status(); + if (ZEPHIR_IS_TRUE_IDENTICAL(&isIpAddressInCIDR)) { + isTrusted = 1; + break; + } + } else { + if (ZEPHIR_IS_IDENTICAL(&invertForwardedIp, &trustedForwardedIp)) { + isTrusted = 1; + break; + } + } + ZEPHIR_CALL_METHOD(NULL, &trustedProxies, "next", NULL, 0); + zephir_check_call_status(); + } + } + ZEPHIR_INIT_NVAR(&trustedForwardedIp); + } ZEND_HASH_FOREACH_END(); + } else { + ZEPHIR_CALL_METHOD(NULL, &forwardedIps, "rewind", NULL, 0); + zephir_check_call_status(); + while (1) { + ZEPHIR_CALL_METHOD(&_5$$6, &forwardedIps, "valid", NULL, 0); + zephir_check_call_status(); + if (!zend_is_true(&_5$$6)) { + break; + } + ZEPHIR_CALL_METHOD(&invertForwardedIp, &forwardedIps, "current", NULL, 0); + zephir_check_call_status(); + if (isTrusted == 1) { + break; + } + zephir_is_iterable(&trustedProxies, 0, "phalcon/Http/Request.zep", 255); + if (Z_TYPE_P(&trustedProxies) == IS_ARRAY) { + ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&trustedProxies), _9$$19) + { + ZEPHIR_INIT_NVAR(&trustedForwardedIp); + ZVAL_COPY(&trustedForwardedIp, _9$$19); + if (zephir_memnstr_str(&trustedForwardedIp, SL("/"), "phalcon/Http/Request.zep", 242)) { + ZEPHIR_CALL_METHOD(&isIpAddressInCIDR, this_ptr, "isipaddressincidr", &_8, 0, &invertForwardedIp, &trustedForwardedIp); + zephir_check_call_status(); + if (ZEPHIR_IS_TRUE_IDENTICAL(&isIpAddressInCIDR)) { + isTrusted = 1; + break; + } + } else { + if (ZEPHIR_IS_IDENTICAL(&invertForwardedIp, &trustedForwardedIp)) { + isTrusted = 1; + break; + } + } + } ZEND_HASH_FOREACH_END(); + } else { + ZEPHIR_CALL_METHOD(NULL, &trustedProxies, "rewind", NULL, 0); + zephir_check_call_status(); + while (1) { + ZEPHIR_CALL_METHOD(&_10$$19, &trustedProxies, "valid", NULL, 0); + zephir_check_call_status(); + if (!zend_is_true(&_10$$19)) { + break; + } + ZEPHIR_CALL_METHOD(&trustedForwardedIp, &trustedProxies, "current", NULL, 0); + zephir_check_call_status(); + if (zephir_memnstr_str(&trustedForwardedIp, SL("/"), "phalcon/Http/Request.zep", 242)) { + ZEPHIR_CALL_METHOD(&isIpAddressInCIDR, this_ptr, "isipaddressincidr", &_8, 0, &invertForwardedIp, &trustedForwardedIp); + zephir_check_call_status(); + if (ZEPHIR_IS_TRUE_IDENTICAL(&isIpAddressInCIDR)) { + isTrusted = 1; + break; + } + } else { + if (ZEPHIR_IS_IDENTICAL(&invertForwardedIp, &trustedForwardedIp)) { + isTrusted = 1; + break; + } + } + ZEPHIR_CALL_METHOD(NULL, &trustedProxies, "next", NULL, 0); + zephir_check_call_status(); + } + } + ZEPHIR_INIT_NVAR(&trustedForwardedIp); + ZEPHIR_CALL_METHOD(NULL, &forwardedIps, "next", NULL, 0); + zephir_check_call_status(); + } + } + ZEPHIR_INIT_NVAR(&invertForwardedIp); + if (!(isTrusted)) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(zend_ce_exception, "The forwarded proxy IP addresses are not trusted.", "phalcon/Http/Request.zep", 258); + return; + } + } + ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 340); + zephir_check_call_status(); + zephir_is_iterable(&forwardedIps, 0, "phalcon/Http/Request.zep", 275); + if (Z_TYPE_P(&forwardedIps) == IS_ARRAY) { + ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&forwardedIps), _11$$5) + { + ZEPHIR_INIT_NVAR(&forwardedIp); + ZVAL_COPY(&forwardedIp, _11$$5); + ZEPHIR_INIT_NVAR(&_13$$32); + zephir_create_array(&_13$$32, 1, 0); + ZEPHIR_INIT_NVAR(&_14$$32); + zephir_create_array(&_14$$32, 1, 0); + add_assoc_long_ex(&_14$$32, SL("filter"), (8388608 | 4194304)); + zephir_array_update_string(&_13$$32, SL("ip"), &_14$$32, PH_COPY | PH_SEPARATE); + ZEPHIR_CALL_METHOD(&filtered, &filterService, "sanitize", &_15, 0, &forwardedIp, &_13$$32); + zephir_check_call_status(); + if (zephir_is_true(&filtered)) { + RETURN_CCTOR(&filtered); + } + } ZEND_HASH_FOREACH_END(); + } else { + ZEPHIR_CALL_METHOD(NULL, &forwardedIps, "rewind", NULL, 0); + zephir_check_call_status(); + while (1) { + ZEPHIR_CALL_METHOD(&_12$$5, &forwardedIps, "valid", NULL, 0); + zephir_check_call_status(); + if (!zend_is_true(&_12$$5)) { + break; + } + ZEPHIR_CALL_METHOD(&forwardedIp, &forwardedIps, "current", NULL, 0); + zephir_check_call_status(); + ZEPHIR_INIT_NVAR(&_16$$34); + zephir_create_array(&_16$$34, 1, 0); + ZEPHIR_INIT_NVAR(&_17$$34); + zephir_create_array(&_17$$34, 1, 0); + add_assoc_long_ex(&_17$$34, SL("filter"), (8388608 | 4194304)); + zephir_array_update_string(&_16$$34, SL("ip"), &_17$$34, PH_COPY | PH_SEPARATE); + ZEPHIR_CALL_METHOD(&filtered, &filterService, "sanitize", &_18, 0, &forwardedIp, &_16$$34); + zephir_check_call_status(); + if (zephir_is_true(&filtered)) { + RETURN_CCTOR(&filtered); + } + ZEPHIR_CALL_METHOD(NULL, &forwardedIps, "next", NULL, 0); + zephir_check_call_status(); + } + } + ZEPHIR_INIT_NVAR(&forwardedIp); + RETURN_MM_BOOL(0); + } + } else { ZEPHIR_OBS_NVAR(&address); zephir_array_isset_string_fetch(&address, &server, SL("REMOTE_ADDR"), 0); } - if (Z_TYPE_P(&address) != IS_STRING) { + if (!(Z_TYPE_P(&address) == IS_STRING)) { RETURN_MM_BOOL(0); } - if (zephir_memnstr_str(&address, SL(","), "phalcon/Http/Request.zep", 232)) { - ZEPHIR_INIT_VAR(&_0$$7); - zephir_fast_explode_str(&_0$$7, SL(","), &address, LONG_MAX); - zephir_array_fetch_long(&_1$$7, &_0$$7, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 237); - RETURN_CTOR(&_1$$7); - } RETURN_CCTOR(&address); } @@ -453,7 +665,7 @@ PHP_METHOD(Phalcon_Http_Request, getClientCharsets) ZVAL_STRING(&_0, "HTTP_ACCEPT_CHARSET"); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "charset"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 337, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 0, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -473,7 +685,7 @@ PHP_METHOD(Phalcon_Http_Request, getContentType) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 340); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 339); zephir_check_call_status(); if (!(zephir_array_isset_string_fetch(&contentType, &server, SL("CONTENT_TYPE"), 1))) { RETURN_MM_NULL(); @@ -511,7 +723,7 @@ PHP_METHOD(Phalcon_Http_Request, getDigestAuth) ZEPHIR_INIT_VAR(&auth); array_init(&auth); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 340); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 339); zephir_check_call_status(); zephir_memory_observe(&digest); if (zephir_array_isset_string_fetch(&digest, &server, SL("PHP_AUTH_DIGEST"), 0)) { @@ -527,15 +739,15 @@ PHP_METHOD(Phalcon_Http_Request, getDigestAuth) RETURN_CTOR(&auth); } if (Z_TYPE_P(&matches) == IS_ARRAY) { - zephir_is_iterable(&matches, 0, "phalcon/Http/Request.zep", 291); + zephir_is_iterable(&matches, 0, "phalcon/Http/Request.zep", 336); if (Z_TYPE_P(&matches) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&matches), _3$$5) { ZEPHIR_INIT_NVAR(&match); ZVAL_COPY(&match, _3$$5); - zephir_array_fetch_long(&_5$$6, &match, 3, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 289); + zephir_array_fetch_long(&_5$$6, &match, 3, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 334); ZEPHIR_OBS_NVAR(&_6$$6); - zephir_array_fetch_long(&_6$$6, &match, 1, PH_NOISY, "phalcon/Http/Request.zep", 289); + zephir_array_fetch_long(&_6$$6, &match, 1, PH_NOISY, "phalcon/Http/Request.zep", 334); zephir_array_update_zval(&auth, &_6$$6, &_5$$6, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); } else { @@ -549,9 +761,9 @@ PHP_METHOD(Phalcon_Http_Request, getDigestAuth) } ZEPHIR_CALL_METHOD(&match, &matches, "current", NULL, 0); zephir_check_call_status(); - zephir_array_fetch_long(&_7$$7, &match, 3, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 289); + zephir_array_fetch_long(&_7$$7, &match, 3, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 334); ZEPHIR_OBS_NVAR(&_8$$7); - zephir_array_fetch_long(&_8$$7, &match, 1, PH_NOISY, "phalcon/Http/Request.zep", 289); + zephir_array_fetch_long(&_8$$7, &match, 1, PH_NOISY, "phalcon/Http/Request.zep", 334); zephir_array_update_zval(&auth, &_8$$7, &_7$$7, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &matches, "next", NULL, 0); zephir_check_call_status(); @@ -869,7 +1081,7 @@ PHP_METHOD(Phalcon_Http_Request, getHeader) zephir_check_call_status(); ZEPHIR_INIT_VAR(&name); zephir_fast_strtoupper(&name, &_2); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 340); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 339); zephir_check_call_status(); zephir_memory_observe(&value); if (zephir_array_isset_fetch(&value, &server, &name, 0)) { @@ -962,9 +1174,9 @@ PHP_METHOD(Phalcon_Http_Request, getHeaders) zephir_array_update_string(&contentHeaders, SL("CONTENT_TYPE"), &__$true, PH_COPY | PH_SEPARATE); zephir_array_update_string(&contentHeaders, SL("CONTENT_LENGTH"), &__$true, PH_COPY | PH_SEPARATE); zephir_array_update_string(&contentHeaders, SL("CONTENT_MD5"), &__$true, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 340); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 339); zephir_check_call_status(); - zephir_is_iterable(&server, 0, "phalcon/Http/Request.zep", 461); + zephir_is_iterable(&server, 0, "phalcon/Http/Request.zep", 506); if (Z_TYPE_P(&server) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&server), _2, _3, _0) { @@ -988,7 +1200,7 @@ PHP_METHOD(Phalcon_Http_Request, getHeaders) ZVAL_STRING(&_9$$4, " "); zephir_fast_str_replace(&_5$$4, &_8$$4, &_9$$4, &_7$$4); zephir_fast_strtolower(&_4$$4, &_5$$4); - ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 288, &_4$$4); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 290, &_4$$4); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_11$$4); ZEPHIR_INIT_NVAR(&_12$$4); @@ -1012,7 +1224,7 @@ PHP_METHOD(Phalcon_Http_Request, getHeaders) ZVAL_STRING(&_18$$5, " "); zephir_fast_str_replace(&_16$$5, &_17$$5, &_18$$5, &name); zephir_fast_strtolower(&_15$$5, &_16$$5); - ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 288, &_15$$5); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 290, &_15$$5); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_19$$5); ZEPHIR_INIT_NVAR(&_20$$5); @@ -1049,7 +1261,7 @@ PHP_METHOD(Phalcon_Http_Request, getHeaders) ZVAL_STRING(&_27$$7, " "); zephir_fast_str_replace(&_23$$7, &_26$$7, &_27$$7, &_25$$7); zephir_fast_strtolower(&_22$$7, &_23$$7); - ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 288, &_22$$7); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 290, &_22$$7); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_28$$7); ZEPHIR_INIT_NVAR(&_29$$7); @@ -1073,7 +1285,7 @@ PHP_METHOD(Phalcon_Http_Request, getHeaders) ZVAL_STRING(&_35$$8, " "); zephir_fast_str_replace(&_33$$8, &_34$$8, &_35$$8, &name); zephir_fast_strtolower(&_32$$8, &_33$$8); - ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 288, &_32$$8); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 290, &_32$$8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_36$$8); ZEPHIR_INIT_NVAR(&_37$$8); @@ -1188,7 +1400,7 @@ PHP_METHOD(Phalcon_Http_Request, getHttpHost) zephir_fast_trim(&_4$$5, &host, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_VAR(&cleanHost); zephir_fast_strtolower(&cleanHost, &_4$$5); - if (zephir_memnstr_str(&cleanHost, SL(":"), "phalcon/Http/Request.zep", 535)) { + if (zephir_memnstr_str(&cleanHost, SL(":"), "phalcon/Http/Request.zep", 580)) { ZEPHIR_INIT_VAR(&_5$$6); ZVAL_STRING(&_5$$6, "/:[[:digit:]]+$/"); ZEPHIR_INIT_VAR(&_6$$6); @@ -1212,7 +1424,7 @@ PHP_METHOD(Phalcon_Http_Request, getHttpHost) ZEPHIR_CONCAT_SV(&_13$$7, "Invalid host ", &host); ZEPHIR_CALL_METHOD(NULL, &_12$$7, "__construct", NULL, 341, &_13$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_12$$7, "phalcon/Http/Request.zep", 545); + zephir_throw_exception_debug(&_12$$7, "phalcon/Http/Request.zep", 590); ZEPHIR_MM_RESTORE(); return; } @@ -1238,7 +1450,7 @@ PHP_METHOD(Phalcon_Http_Request, getHTTPReferer) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 340); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 339); zephir_check_call_status(); if (!(zephir_array_isset_string_fetch(&httpReferer, &server, SL("HTTP_REFERER"), 1))) { RETURN_MM_STRING(""); @@ -1292,7 +1504,7 @@ PHP_METHOD(Phalcon_Http_Request, getJsonRawBody) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(&_0, "__invoke", NULL, 196, &rawBody, &_1); + ZEPHIR_RETURN_CALL_METHOD(&_0, "__invoke", NULL, 197, &rawBody, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -1317,7 +1529,7 @@ PHP_METHOD(Phalcon_Http_Request, getLanguages) ZVAL_STRING(&_0, "HTTP_ACCEPT_LANGUAGE"); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "language"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 337, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 0, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -1356,7 +1568,7 @@ PHP_METHOD(Phalcon_Http_Request, getMethod) zephir_get_global(&_REQUEST, SL("_REQUEST")); ZEPHIR_INIT_VAR(&returnMethod); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 340); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 339); zephir_check_call_status(); zephir_memory_observe(&requestMethod); if (EXPECTED(zephir_array_isset_string_fetch(&requestMethod, &server, SL("REQUEST_METHOD"), 0))) { @@ -1370,7 +1582,7 @@ PHP_METHOD(Phalcon_Http_Request, getMethod) if (ZEPHIR_IS_IDENTICAL(&_0, &returnMethod)) { ZEPHIR_INIT_VAR(&_1$$5); ZVAL_STRING(&_1$$5, "X-HTTP-METHOD-OVERRIDE"); - ZEPHIR_CALL_METHOD(&overridedMethod, this_ptr, "getheader", NULL, 342, &_1$$5); + ZEPHIR_CALL_METHOD(&overridedMethod, this_ptr, "getheader", NULL, 0, &_1$$5); zephir_check_call_status(); zephir_read_property(&_2$$5, this_ptr, ZEND_STRL("httpMethodParameterOverride"), PH_NOISY_CC | PH_READONLY); if (!(ZEPHIR_IS_EMPTY(&overridedMethod))) { @@ -1408,7 +1620,7 @@ PHP_METHOD(Phalcon_Http_Request, getPatch) zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zend_bool notAllowEmpty, noRecursive; - zval *name_param = NULL, *filters = NULL, filters_sub, *defaultValue = NULL, defaultValue_sub, *notAllowEmpty_param = NULL, *noRecursive_param = NULL, __$null, _0, _1, _2; + zval *name_param = NULL, *filters = NULL, filters_sub, *defaultValue = NULL, defaultValue_sub, *notAllowEmpty_param = NULL, *noRecursive_param = NULL, __$null, _0, _1, _2, _3, _4; zval name; zval *this_ptr = getThis(); @@ -1419,6 +1631,8 @@ PHP_METHOD(Phalcon_Http_Request, getPatch) ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1); ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_3); + ZVAL_UNDEF(&_4); bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 5) Z_PARAM_OPTIONAL @@ -1460,19 +1674,22 @@ PHP_METHOD(Phalcon_Http_Request, getPatch) noRecursive = 0; } else { } - ZEPHIR_INIT_VAR(&_0); - ZVAL_STRING(&_0, "patchCache"); + zephir_read_property(&_1, this_ptr, ZEND_STRL("postCache"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getpostdata", NULL, 342, &_1); + zephir_check_call_status(); + zephir_update_property_zval(this_ptr, ZEND_STRL("postCache"), &_0); + zephir_read_property(&_2, this_ptr, ZEND_STRL("postCache"), PH_NOISY_CC | PH_READONLY); if (notAllowEmpty) { - ZVAL_BOOL(&_1, 1); + ZVAL_BOOL(&_3, 1); } else { - ZVAL_BOOL(&_1, 0); + ZVAL_BOOL(&_3, 0); } if (noRecursive) { - ZVAL_BOOL(&_2, 1); + ZVAL_BOOL(&_4, 1); } else { - ZVAL_BOOL(&_2, 0); + ZVAL_BOOL(&_4, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getpatchput", NULL, 343, &_0, &name, filters, defaultValue, &_1, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 0, &_2, &name, filters, defaultValue, &_3, &_4); zephir_check_call_status(); RETURN_MM(); } @@ -1511,10 +1728,10 @@ PHP_METHOD(Phalcon_Http_Request, getPort) zephir_check_call_status(); RETURN_MM_LONG(zephir_get_intval(&_1$$3)); } - if (zephir_memnstr_str(&host, SL(":"), "phalcon/Http/Request.zep", 686)) { + if (zephir_memnstr_str(&host, SL(":"), "phalcon/Http/Request.zep", 733)) { ZEPHIR_INIT_VAR(&_3$$4); ZVAL_STRING(&_3$$4, ":"); - ZEPHIR_CALL_FUNCTION(&pos, "strrpos", NULL, 241, &host, &_3$$4); + ZEPHIR_CALL_FUNCTION(&pos, "strrpos", NULL, 242, &host, &_3$$4); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&pos)) { ZVAL_LONG(&_4$$5, (zephir_get_numberval(&pos) + 1)); @@ -1555,7 +1772,7 @@ PHP_METHOD(Phalcon_Http_Request, getPost) zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zend_bool notAllowEmpty, noRecursive; - zval *name_param = NULL, *filters = NULL, filters_sub, *defaultValue = NULL, defaultValue_sub, *notAllowEmpty_param = NULL, *noRecursive_param = NULL, _POST, __$null, _0, _1; + zval *name_param = NULL, *filters = NULL, filters_sub, *defaultValue = NULL, defaultValue_sub, *notAllowEmpty_param = NULL, *noRecursive_param = NULL, _POST, __$null, _0, _1, _2, _3; zval name; zval *this_ptr = getThis(); @@ -1566,6 +1783,8 @@ PHP_METHOD(Phalcon_Http_Request, getPost) ZVAL_NULL(&__$null); ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_3); bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 5) Z_PARAM_OPTIONAL @@ -1608,17 +1827,21 @@ PHP_METHOD(Phalcon_Http_Request, getPost) noRecursive = 0; } else { } + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getpostdata", NULL, 342, &_POST); + zephir_check_call_status(); + zephir_update_property_zval(this_ptr, ZEND_STRL("postCache"), &_0); + zephir_read_property(&_1, this_ptr, ZEND_STRL("postCache"), PH_NOISY_CC | PH_READONLY); if (notAllowEmpty) { - ZVAL_BOOL(&_0, 1); + ZVAL_BOOL(&_2, 1); } else { - ZVAL_BOOL(&_0, 0); + ZVAL_BOOL(&_2, 0); } if (noRecursive) { - ZVAL_BOOL(&_1, 1); + ZVAL_BOOL(&_3, 1); } else { - ZVAL_BOOL(&_1, 0); + ZVAL_BOOL(&_3, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 336, &_POST, &name, filters, defaultValue, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 0, &_1, &name, filters, defaultValue, &_2, &_3); zephir_check_call_status(); RETURN_MM(); } @@ -1639,7 +1862,7 @@ PHP_METHOD(Phalcon_Http_Request, getPut) zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zend_bool notAllowEmpty, noRecursive; - zval *name_param = NULL, *filters = NULL, filters_sub, *defaultValue = NULL, defaultValue_sub, *notAllowEmpty_param = NULL, *noRecursive_param = NULL, __$null, _0, _1, _2; + zval *name_param = NULL, *filters = NULL, filters_sub, *defaultValue = NULL, defaultValue_sub, *notAllowEmpty_param = NULL, *noRecursive_param = NULL, __$null, _0, _1, _2, _3, _4; zval name; zval *this_ptr = getThis(); @@ -1650,6 +1873,8 @@ PHP_METHOD(Phalcon_Http_Request, getPut) ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1); ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_3); + ZVAL_UNDEF(&_4); bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 5) Z_PARAM_OPTIONAL @@ -1691,19 +1916,22 @@ PHP_METHOD(Phalcon_Http_Request, getPut) noRecursive = 0; } else { } - ZEPHIR_INIT_VAR(&_0); - ZVAL_STRING(&_0, "putCache"); + zephir_read_property(&_1, this_ptr, ZEND_STRL("postCache"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getpostdata", NULL, 342, &_1); + zephir_check_call_status(); + zephir_update_property_zval(this_ptr, ZEND_STRL("postCache"), &_0); + zephir_read_property(&_2, this_ptr, ZEND_STRL("postCache"), PH_NOISY_CC | PH_READONLY); if (notAllowEmpty) { - ZVAL_BOOL(&_1, 1); + ZVAL_BOOL(&_3, 1); } else { - ZVAL_BOOL(&_1, 0); + ZVAL_BOOL(&_3, 0); } if (noRecursive) { - ZVAL_BOOL(&_2, 1); + ZVAL_BOOL(&_4, 1); } else { - ZVAL_BOOL(&_2, 0); + ZVAL_BOOL(&_4, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getpatchput", NULL, 343, &_0, &name, filters, defaultValue, &_1, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 0, &_2, &name, filters, defaultValue, &_3, &_4); zephir_check_call_status(); RETURN_MM(); } @@ -1791,7 +2019,7 @@ PHP_METHOD(Phalcon_Http_Request, getQuery) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 336, &_GET, &name, filters, defaultValue, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 0, &_GET, &name, filters, defaultValue, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -1884,7 +2112,7 @@ PHP_METHOD(Phalcon_Http_Request, getServer) } else { ZEPHIR_INIT_VAR(&name); } - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 340); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 339); zephir_check_call_status(); if (!(zephir_array_isset_fetch(&serverValue, &server, &name, 1))) { RETURN_MM_NULL(); @@ -1915,7 +2143,7 @@ PHP_METHOD(Phalcon_Http_Request, getServerAddress) if (Z_TYPE_P(&serverAddr) == IS_NULL) { ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "localhost"); - ZEPHIR_RETURN_CALL_FUNCTION("gethostbyname", NULL, 344, &_1$$3); + ZEPHIR_RETURN_CALL_FUNCTION("gethostbyname", NULL, 343, &_1$$3); zephir_check_call_status(); RETURN_MM(); } @@ -2043,7 +2271,7 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) array_init(&files); ZEPHIR_CPY_WRT(&superFiles, &_FILES); if (zephir_fast_count_int(&superFiles) > 0) { - zephir_is_iterable(&superFiles, 0, "phalcon/Http/Request.zep", 930); + zephir_is_iterable(&superFiles, 0, "phalcon/Http/Request.zep", 981); if (Z_TYPE_P(&superFiles) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&superFiles), _2$$3, _3$$3, _0$$3) { @@ -2056,16 +2284,16 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) ZEPHIR_INIT_NVAR(&input); ZVAL_COPY(&input, _0$$3); ZEPHIR_OBS_NVAR(&_4$$4); - zephir_array_fetch_string(&_4$$4, &input, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 887); + zephir_array_fetch_string(&_4$$4, &input, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 938); if (Z_TYPE_P(&_4$$4) == IS_ARRAY) { - zephir_array_fetch_string(&_5$$5, &input, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 889); - zephir_array_fetch_string(&_6$$5, &input, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 890); - zephir_array_fetch_string(&_7$$5, &input, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 891); - zephir_array_fetch_string(&_8$$5, &input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 892); - zephir_array_fetch_string(&_9$$5, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 893); - ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 345, &_5$$5, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &prefix); + zephir_array_fetch_string(&_5$$5, &input, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 940); + zephir_array_fetch_string(&_6$$5, &input, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 941); + zephir_array_fetch_string(&_7$$5, &input, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 942); + zephir_array_fetch_string(&_8$$5, &input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 943); + zephir_array_fetch_string(&_9$$5, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 944); + ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 0, &_5$$5, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &prefix); zephir_check_call_status(); - zephir_is_iterable(&smoothInput, 0, "phalcon/Http/Request.zep", 920); + zephir_is_iterable(&smoothInput, 0, "phalcon/Http/Request.zep", 971); if (Z_TYPE_P(&smoothInput) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&smoothInput), _11$$5) { @@ -2073,43 +2301,43 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) ZVAL_COPY(&file, _11$$5); _13$$6 = onlySuccessful == 0; if (!(_13$$6)) { - zephir_array_fetch_string(&_14$$6, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 898); + zephir_array_fetch_string(&_14$$6, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 949); _13$$6 = ZEPHIR_IS_LONG(&_14$$6, 0); } if (_13$$6) { ZEPHIR_INIT_NVAR(&dataFile); zephir_create_array(&dataFile, 5, 0); ZEPHIR_OBS_NVAR(&_15$$7); - zephir_array_fetch_string(&_15$$7, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 900); + zephir_array_fetch_string(&_15$$7, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 951); zephir_array_update_string(&dataFile, SL("name"), &_15$$7, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_15$$7); - zephir_array_fetch_string(&_15$$7, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 901); + zephir_array_fetch_string(&_15$$7, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 952); zephir_array_update_string(&dataFile, SL("type"), &_15$$7, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_15$$7); - zephir_array_fetch_string(&_15$$7, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 902); + zephir_array_fetch_string(&_15$$7, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 953); zephir_array_update_string(&dataFile, SL("tmp_name"), &_15$$7, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_15$$7); - zephir_array_fetch_string(&_15$$7, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 903); + zephir_array_fetch_string(&_15$$7, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 954); zephir_array_update_string(&dataFile, SL("size"), &_15$$7, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_15$$7); - zephir_array_fetch_string(&_15$$7, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 905); + zephir_array_fetch_string(&_15$$7, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 956); zephir_array_update_string(&dataFile, SL("error"), &_15$$7, PH_COPY | PH_SEPARATE); if (namedKeys == 1) { ZEPHIR_INIT_NVAR(&_16$$8); object_init_ex(&_16$$8, phalcon_http_request_file_ce); - zephir_array_fetch_string(&_17$$8, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 911); - ZEPHIR_CALL_METHOD(NULL, &_16$$8, "__construct", &_18, 346, &dataFile, &_17$$8); + zephir_array_fetch_string(&_17$$8, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 962); + ZEPHIR_CALL_METHOD(NULL, &_16$$8, "__construct", &_18, 344, &dataFile, &_17$$8); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&_19$$8); - zephir_array_fetch_string(&_19$$8, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 908); + zephir_array_fetch_string(&_19$$8, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 959); zephir_array_update_zval(&files, &_19$$8, &_16$$8, PH_COPY | PH_SEPARATE); } else { ZEPHIR_INIT_NVAR(&_20$$9); object_init_ex(&_20$$9, phalcon_http_request_file_ce); - zephir_array_fetch_string(&_21$$9, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 916); - ZEPHIR_CALL_METHOD(NULL, &_20$$9, "__construct", &_18, 346, &dataFile, &_21$$9); + zephir_array_fetch_string(&_21$$9, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 967); + ZEPHIR_CALL_METHOD(NULL, &_20$$9, "__construct", &_18, 344, &dataFile, &_21$$9); zephir_check_call_status(); - zephir_array_append(&files, &_20$$9, PH_SEPARATE, "phalcon/Http/Request.zep", 916); + zephir_array_append(&files, &_20$$9, PH_SEPARATE, "phalcon/Http/Request.zep", 967); } } } ZEND_HASH_FOREACH_END(); @@ -2126,44 +2354,44 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) zephir_check_call_status(); _22$$10 = onlySuccessful == 0; if (!(_22$$10)) { - zephir_array_fetch_string(&_23$$10, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 898); + zephir_array_fetch_string(&_23$$10, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 949); _22$$10 = ZEPHIR_IS_LONG(&_23$$10, 0); } if (_22$$10) { ZEPHIR_INIT_NVAR(&_24$$11); zephir_create_array(&_24$$11, 5, 0); ZEPHIR_OBS_NVAR(&_25$$11); - zephir_array_fetch_string(&_25$$11, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 900); + zephir_array_fetch_string(&_25$$11, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 951); zephir_array_update_string(&_24$$11, SL("name"), &_25$$11, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_25$$11); - zephir_array_fetch_string(&_25$$11, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 901); + zephir_array_fetch_string(&_25$$11, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 952); zephir_array_update_string(&_24$$11, SL("type"), &_25$$11, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_25$$11); - zephir_array_fetch_string(&_25$$11, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 902); + zephir_array_fetch_string(&_25$$11, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 953); zephir_array_update_string(&_24$$11, SL("tmp_name"), &_25$$11, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_25$$11); - zephir_array_fetch_string(&_25$$11, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 903); + zephir_array_fetch_string(&_25$$11, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 954); zephir_array_update_string(&_24$$11, SL("size"), &_25$$11, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_25$$11); - zephir_array_fetch_string(&_25$$11, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 905); + zephir_array_fetch_string(&_25$$11, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 956); zephir_array_update_string(&_24$$11, SL("error"), &_25$$11, PH_COPY | PH_SEPARATE); ZEPHIR_CPY_WRT(&dataFile, &_24$$11); if (namedKeys == 1) { ZEPHIR_INIT_NVAR(&_26$$12); object_init_ex(&_26$$12, phalcon_http_request_file_ce); - zephir_array_fetch_string(&_27$$12, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 911); - ZEPHIR_CALL_METHOD(NULL, &_26$$12, "__construct", &_18, 346, &dataFile, &_27$$12); + zephir_array_fetch_string(&_27$$12, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 962); + ZEPHIR_CALL_METHOD(NULL, &_26$$12, "__construct", &_18, 344, &dataFile, &_27$$12); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&_28$$12); - zephir_array_fetch_string(&_28$$12, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 908); + zephir_array_fetch_string(&_28$$12, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 959); zephir_array_update_zval(&files, &_28$$12, &_26$$12, PH_COPY | PH_SEPARATE); } else { ZEPHIR_INIT_NVAR(&_29$$13); object_init_ex(&_29$$13, phalcon_http_request_file_ce); - zephir_array_fetch_string(&_30$$13, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 916); - ZEPHIR_CALL_METHOD(NULL, &_29$$13, "__construct", &_18, 346, &dataFile, &_30$$13); + zephir_array_fetch_string(&_30$$13, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 967); + ZEPHIR_CALL_METHOD(NULL, &_29$$13, "__construct", &_18, 344, &dataFile, &_30$$13); zephir_check_call_status(); - zephir_array_append(&files, &_29$$13, PH_SEPARATE, "phalcon/Http/Request.zep", 916); + zephir_array_append(&files, &_29$$13, PH_SEPARATE, "phalcon/Http/Request.zep", 967); } } ZEPHIR_CALL_METHOD(NULL, &smoothInput, "next", NULL, 0); @@ -2174,22 +2402,22 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) } else { _31$$14 = onlySuccessful == 0; if (!(_31$$14)) { - zephir_array_fetch_string(&_32$$14, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 921); + zephir_array_fetch_string(&_32$$14, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 972); _31$$14 = ZEPHIR_IS_LONG(&_32$$14, 0); } if (_31$$14) { if (namedKeys == 1) { ZEPHIR_INIT_NVAR(&_33$$16); object_init_ex(&_33$$16, phalcon_http_request_file_ce); - ZEPHIR_CALL_METHOD(NULL, &_33$$16, "__construct", &_18, 346, &input, &prefix); + ZEPHIR_CALL_METHOD(NULL, &_33$$16, "__construct", &_18, 344, &input, &prefix); zephir_check_call_status(); zephir_array_update_zval(&files, &prefix, &_33$$16, PH_COPY | PH_SEPARATE); } else { ZEPHIR_INIT_NVAR(&_34$$17); object_init_ex(&_34$$17, phalcon_http_request_file_ce); - ZEPHIR_CALL_METHOD(NULL, &_34$$17, "__construct", &_18, 346, &input, &prefix); + ZEPHIR_CALL_METHOD(NULL, &_34$$17, "__construct", &_18, 344, &input, &prefix); zephir_check_call_status(); - zephir_array_append(&files, &_34$$17, PH_SEPARATE, "phalcon/Http/Request.zep", 925); + zephir_array_append(&files, &_34$$17, PH_SEPARATE, "phalcon/Http/Request.zep", 976); } } } @@ -2208,16 +2436,16 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) ZEPHIR_CALL_METHOD(&input, &superFiles, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&_35$$18); - zephir_array_fetch_string(&_35$$18, &input, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 887); + zephir_array_fetch_string(&_35$$18, &input, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 938); if (Z_TYPE_P(&_35$$18) == IS_ARRAY) { - zephir_array_fetch_string(&_36$$19, &input, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 889); - zephir_array_fetch_string(&_37$$19, &input, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 890); - zephir_array_fetch_string(&_38$$19, &input, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 891); - zephir_array_fetch_string(&_39$$19, &input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 892); - zephir_array_fetch_string(&_40$$19, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 893); - ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 345, &_36$$19, &_37$$19, &_38$$19, &_39$$19, &_40$$19, &prefix); + zephir_array_fetch_string(&_36$$19, &input, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 940); + zephir_array_fetch_string(&_37$$19, &input, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 941); + zephir_array_fetch_string(&_38$$19, &input, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 942); + zephir_array_fetch_string(&_39$$19, &input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 943); + zephir_array_fetch_string(&_40$$19, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 944); + ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 0, &_36$$19, &_37$$19, &_38$$19, &_39$$19, &_40$$19, &prefix); zephir_check_call_status(); - zephir_is_iterable(&smoothInput, 0, "phalcon/Http/Request.zep", 920); + zephir_is_iterable(&smoothInput, 0, "phalcon/Http/Request.zep", 971); if (Z_TYPE_P(&smoothInput) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&smoothInput), _41$$19) { @@ -2225,44 +2453,44 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) ZVAL_COPY(&file, _41$$19); _43$$20 = onlySuccessful == 0; if (!(_43$$20)) { - zephir_array_fetch_string(&_44$$20, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 898); + zephir_array_fetch_string(&_44$$20, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 949); _43$$20 = ZEPHIR_IS_LONG(&_44$$20, 0); } if (_43$$20) { ZEPHIR_INIT_NVAR(&_45$$21); zephir_create_array(&_45$$21, 5, 0); ZEPHIR_OBS_NVAR(&_46$$21); - zephir_array_fetch_string(&_46$$21, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 900); + zephir_array_fetch_string(&_46$$21, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 951); zephir_array_update_string(&_45$$21, SL("name"), &_46$$21, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_46$$21); - zephir_array_fetch_string(&_46$$21, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 901); + zephir_array_fetch_string(&_46$$21, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 952); zephir_array_update_string(&_45$$21, SL("type"), &_46$$21, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_46$$21); - zephir_array_fetch_string(&_46$$21, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 902); + zephir_array_fetch_string(&_46$$21, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 953); zephir_array_update_string(&_45$$21, SL("tmp_name"), &_46$$21, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_46$$21); - zephir_array_fetch_string(&_46$$21, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 903); + zephir_array_fetch_string(&_46$$21, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 954); zephir_array_update_string(&_45$$21, SL("size"), &_46$$21, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_46$$21); - zephir_array_fetch_string(&_46$$21, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 905); + zephir_array_fetch_string(&_46$$21, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 956); zephir_array_update_string(&_45$$21, SL("error"), &_46$$21, PH_COPY | PH_SEPARATE); ZEPHIR_CPY_WRT(&dataFile, &_45$$21); if (namedKeys == 1) { ZEPHIR_INIT_NVAR(&_47$$22); object_init_ex(&_47$$22, phalcon_http_request_file_ce); - zephir_array_fetch_string(&_48$$22, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 911); - ZEPHIR_CALL_METHOD(NULL, &_47$$22, "__construct", &_18, 346, &dataFile, &_48$$22); + zephir_array_fetch_string(&_48$$22, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 962); + ZEPHIR_CALL_METHOD(NULL, &_47$$22, "__construct", &_18, 344, &dataFile, &_48$$22); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&_49$$22); - zephir_array_fetch_string(&_49$$22, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 908); + zephir_array_fetch_string(&_49$$22, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 959); zephir_array_update_zval(&files, &_49$$22, &_47$$22, PH_COPY | PH_SEPARATE); } else { ZEPHIR_INIT_NVAR(&_50$$23); object_init_ex(&_50$$23, phalcon_http_request_file_ce); - zephir_array_fetch_string(&_51$$23, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 916); - ZEPHIR_CALL_METHOD(NULL, &_50$$23, "__construct", &_18, 346, &dataFile, &_51$$23); + zephir_array_fetch_string(&_51$$23, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 967); + ZEPHIR_CALL_METHOD(NULL, &_50$$23, "__construct", &_18, 344, &dataFile, &_51$$23); zephir_check_call_status(); - zephir_array_append(&files, &_50$$23, PH_SEPARATE, "phalcon/Http/Request.zep", 916); + zephir_array_append(&files, &_50$$23, PH_SEPARATE, "phalcon/Http/Request.zep", 967); } } } ZEND_HASH_FOREACH_END(); @@ -2279,44 +2507,44 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) zephir_check_call_status(); _52$$24 = onlySuccessful == 0; if (!(_52$$24)) { - zephir_array_fetch_string(&_53$$24, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 898); + zephir_array_fetch_string(&_53$$24, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 949); _52$$24 = ZEPHIR_IS_LONG(&_53$$24, 0); } if (_52$$24) { ZEPHIR_INIT_NVAR(&_54$$25); zephir_create_array(&_54$$25, 5, 0); ZEPHIR_OBS_NVAR(&_55$$25); - zephir_array_fetch_string(&_55$$25, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 900); + zephir_array_fetch_string(&_55$$25, &file, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 951); zephir_array_update_string(&_54$$25, SL("name"), &_55$$25, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_55$$25); - zephir_array_fetch_string(&_55$$25, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 901); + zephir_array_fetch_string(&_55$$25, &file, SL("type"), PH_NOISY, "phalcon/Http/Request.zep", 952); zephir_array_update_string(&_54$$25, SL("type"), &_55$$25, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_55$$25); - zephir_array_fetch_string(&_55$$25, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 902); + zephir_array_fetch_string(&_55$$25, &file, SL("tmp_name"), PH_NOISY, "phalcon/Http/Request.zep", 953); zephir_array_update_string(&_54$$25, SL("tmp_name"), &_55$$25, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_55$$25); - zephir_array_fetch_string(&_55$$25, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 903); + zephir_array_fetch_string(&_55$$25, &file, SL("size"), PH_NOISY, "phalcon/Http/Request.zep", 954); zephir_array_update_string(&_54$$25, SL("size"), &_55$$25, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_55$$25); - zephir_array_fetch_string(&_55$$25, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 905); + zephir_array_fetch_string(&_55$$25, &file, SL("error"), PH_NOISY, "phalcon/Http/Request.zep", 956); zephir_array_update_string(&_54$$25, SL("error"), &_55$$25, PH_COPY | PH_SEPARATE); ZEPHIR_CPY_WRT(&dataFile, &_54$$25); if (namedKeys == 1) { ZEPHIR_INIT_NVAR(&_56$$26); object_init_ex(&_56$$26, phalcon_http_request_file_ce); - zephir_array_fetch_string(&_57$$26, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 911); - ZEPHIR_CALL_METHOD(NULL, &_56$$26, "__construct", &_18, 346, &dataFile, &_57$$26); + zephir_array_fetch_string(&_57$$26, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 962); + ZEPHIR_CALL_METHOD(NULL, &_56$$26, "__construct", &_18, 344, &dataFile, &_57$$26); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&_58$$26); - zephir_array_fetch_string(&_58$$26, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 908); + zephir_array_fetch_string(&_58$$26, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 959); zephir_array_update_zval(&files, &_58$$26, &_56$$26, PH_COPY | PH_SEPARATE); } else { ZEPHIR_INIT_NVAR(&_59$$27); object_init_ex(&_59$$27, phalcon_http_request_file_ce); - zephir_array_fetch_string(&_60$$27, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 916); - ZEPHIR_CALL_METHOD(NULL, &_59$$27, "__construct", &_18, 346, &dataFile, &_60$$27); + zephir_array_fetch_string(&_60$$27, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 967); + ZEPHIR_CALL_METHOD(NULL, &_59$$27, "__construct", &_18, 344, &dataFile, &_60$$27); zephir_check_call_status(); - zephir_array_append(&files, &_59$$27, PH_SEPARATE, "phalcon/Http/Request.zep", 916); + zephir_array_append(&files, &_59$$27, PH_SEPARATE, "phalcon/Http/Request.zep", 967); } } ZEPHIR_CALL_METHOD(NULL, &smoothInput, "next", NULL, 0); @@ -2327,22 +2555,22 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) } else { _61$$28 = onlySuccessful == 0; if (!(_61$$28)) { - zephir_array_fetch_string(&_62$$28, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 921); + zephir_array_fetch_string(&_62$$28, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 972); _61$$28 = ZEPHIR_IS_LONG(&_62$$28, 0); } if (_61$$28) { if (namedKeys == 1) { ZEPHIR_INIT_NVAR(&_63$$30); object_init_ex(&_63$$30, phalcon_http_request_file_ce); - ZEPHIR_CALL_METHOD(NULL, &_63$$30, "__construct", &_18, 346, &input, &prefix); + ZEPHIR_CALL_METHOD(NULL, &_63$$30, "__construct", &_18, 344, &input, &prefix); zephir_check_call_status(); zephir_array_update_zval(&files, &prefix, &_63$$30, PH_COPY | PH_SEPARATE); } else { ZEPHIR_INIT_NVAR(&_64$$31); object_init_ex(&_64$$31, phalcon_http_request_file_ce); - ZEPHIR_CALL_METHOD(NULL, &_64$$31, "__construct", &_18, 346, &input, &prefix); + ZEPHIR_CALL_METHOD(NULL, &_64$$31, "__construct", &_18, 344, &input, &prefix); zephir_check_call_status(); - zephir_array_append(&files, &_64$$31, PH_SEPARATE, "phalcon/Http/Request.zep", 925); + zephir_array_append(&files, &_64$$31, PH_SEPARATE, "phalcon/Http/Request.zep", 976); } } } @@ -2406,7 +2634,7 @@ PHP_METHOD(Phalcon_Http_Request, getURI) ZEPHIR_INIT_VAR(&_2$$4); ZVAL_STRING(&_2$$4, "?"); zephir_fast_explode(&_1$$4, &_2$$4, &requestURI, LONG_MAX); - zephir_array_fetch_long(&_3$$4, &_1$$4, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 959); + zephir_array_fetch_long(&_3$$4, &_1$$4, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1010); ZEPHIR_CPY_WRT(&requestURI, &_3$$4); } RETURN_CCTOR(&requestURI); @@ -2583,17 +2811,18 @@ PHP_METHOD(Phalcon_Http_Request, hasPatch) PHP_METHOD(Phalcon_Http_Request, hasPost) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval *name_param = NULL, _POST; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *name_param = NULL, post; zval name; + zval *this_ptr = getThis(); ZVAL_UNDEF(&name); - ZVAL_UNDEF(&_POST); + ZVAL_UNDEF(&post); ZEND_PARSE_PARAMETERS_START(1, 1) Z_PARAM_STR(name) ZEND_PARSE_PARAMETERS_END(); ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - zephir_get_global(&_POST, SL("_POST")); zephir_fetch_params(1, 1, 0, &name_param); if (UNEXPECTED(Z_TYPE_P(name_param) != IS_STRING && Z_TYPE_P(name_param) != IS_NULL)) { zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'name' must be of the type string")); @@ -2604,7 +2833,9 @@ PHP_METHOD(Phalcon_Http_Request, hasPost) } else { ZEPHIR_INIT_VAR(&name); } - RETURN_MM_BOOL(zephir_array_isset(&_POST, &name)); + ZEPHIR_CALL_METHOD(&post, this_ptr, "getpost", NULL, 0); + zephir_check_call_status(); + RETURN_MM_BOOL(zephir_array_isset(&post, &name)); } /** @@ -2698,7 +2929,7 @@ PHP_METHOD(Phalcon_Http_Request, hasServer) } else { ZEPHIR_INIT_VAR(&name); } - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 340); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 339); zephir_check_call_status(); RETURN_MM_BOOL(zephir_array_isset(&server, &name)); } @@ -2735,6 +2966,45 @@ PHP_METHOD(Phalcon_Http_Request, isAjax) RETURN_MM_BOOL(_2); } +/** + * Checks whether request content type contains json data + * + * @return bool + */ +PHP_METHOD(Phalcon_Http_Request, isJson) +{ + zend_bool _2; + zval _0, _1, _3, _4; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_3); + ZVAL_UNDEF(&_4); + ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); + zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); + + ZEPHIR_INIT_VAR(&_1); + ZVAL_STRING(&_1, "CONTENT_TYPE"); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 338, &_1); + zephir_check_call_status(); + _2 = zephir_is_true(&_0); + if (_2) { + ZEPHIR_INIT_NVAR(&_1); + ZVAL_STRING(&_1, "CONTENT_TYPE"); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "getserver", NULL, 0, &_1); + zephir_check_call_status(); + ZEPHIR_INIT_NVAR(&_1); + ZVAL_STRING(&_1, "json"); + ZEPHIR_CALL_FUNCTION(&_4, "stripos", NULL, 345, &_3, &_1); + zephir_check_call_status(); + _2 = !ZEPHIR_IS_FALSE_IDENTICAL(&_4); + } + RETURN_MM_BOOL(_2); +} + /** * Checks whether HTTP method is CONNECT. * if _SERVER["REQUEST_METHOD"]==="CONNECT" @@ -2750,7 +3020,7 @@ PHP_METHOD(Phalcon_Http_Request, isConnect) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 347); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 0); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "CONNECT")); } @@ -2770,7 +3040,7 @@ PHP_METHOD(Phalcon_Http_Request, isDelete) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 347); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 0); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "DELETE")); } @@ -2790,7 +3060,7 @@ PHP_METHOD(Phalcon_Http_Request, isGet) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 347); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 0); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "GET")); } @@ -2810,7 +3080,7 @@ PHP_METHOD(Phalcon_Http_Request, isHead) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 347); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 0); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "HEAD")); } @@ -2851,7 +3121,7 @@ PHP_METHOD(Phalcon_Http_Request, isMethod) strict = 0; } else { } - ZEPHIR_CALL_METHOD(&httpMethod, this_ptr, "getmethod", NULL, 347); + ZEPHIR_CALL_METHOD(&httpMethod, this_ptr, "getmethod", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(methods) == IS_STRING) { _0$$3 = strict; @@ -2867,14 +3137,14 @@ PHP_METHOD(Phalcon_Http_Request, isMethod) ZEPHIR_CONCAT_SV(&_3$$4, "Invalid HTTP method: ", methods); ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 33, &_3$$4); zephir_check_call_status(); - zephir_throw_exception_debug(&_2$$4, "phalcon/Http/Request.zep", 1117); + zephir_throw_exception_debug(&_2$$4, "phalcon/Http/Request.zep", 1183); ZEPHIR_MM_RESTORE(); return; } RETURN_MM_BOOL(ZEPHIR_IS_EQUAL(methods, &httpMethod)); } if (Z_TYPE_P(methods) == IS_ARRAY) { - zephir_is_iterable(methods, 0, "phalcon/Http/Request.zep", 1130); + zephir_is_iterable(methods, 0, "phalcon/Http/Request.zep", 1196); if (Z_TYPE_P(methods) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(methods), _4$$5) { @@ -2885,7 +3155,7 @@ PHP_METHOD(Phalcon_Http_Request, isMethod) } else { ZVAL_BOOL(&_7$$6, 0); } - ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "ismethod", &_8, 348, &method, &_7$$6); + ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "ismethod", &_8, 346, &method, &_7$$6); zephir_check_call_status(); if (zephir_is_true(&_6$$6)) { RETURN_MM_BOOL(1); @@ -2907,7 +3177,7 @@ PHP_METHOD(Phalcon_Http_Request, isMethod) } else { ZVAL_BOOL(&_10$$8, 0); } - ZEPHIR_CALL_METHOD(&_9$$8, this_ptr, "ismethod", &_8, 348, &method, &_10$$8); + ZEPHIR_CALL_METHOD(&_9$$8, this_ptr, "ismethod", &_8, 346, &method, &_10$$8); zephir_check_call_status(); if (zephir_is_true(&_9$$8)) { RETURN_MM_BOOL(1); @@ -2920,7 +3190,7 @@ PHP_METHOD(Phalcon_Http_Request, isMethod) RETURN_MM_BOOL(0); } if (UNEXPECTED(strict)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_request_exception_ce, "Invalid HTTP method: non-string", "phalcon/Http/Request.zep", 1134); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_request_exception_ce, "Invalid HTTP method: non-string", "phalcon/Http/Request.zep", 1200); return; } RETURN_MM_BOOL(0); @@ -2941,7 +3211,7 @@ PHP_METHOD(Phalcon_Http_Request, isOptions) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 347); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 0); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "OPTIONS")); } @@ -2961,7 +3231,7 @@ PHP_METHOD(Phalcon_Http_Request, isPatch) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 347); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 0); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "PATCH")); } @@ -2981,7 +3251,7 @@ PHP_METHOD(Phalcon_Http_Request, isPost) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 347); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 0); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "POST")); } @@ -3001,7 +3271,7 @@ PHP_METHOD(Phalcon_Http_Request, isPut) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 347); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 0); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "PUT")); } @@ -3021,7 +3291,7 @@ PHP_METHOD(Phalcon_Http_Request, isPurge) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 347); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 0); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "PURGE")); } @@ -3083,7 +3353,7 @@ PHP_METHOD(Phalcon_Http_Request, isSoap) if (ZEPHIR_IS_EMPTY(&contentType)) { RETURN_MM_BOOL(0); } - RETURN_MM_BOOL(zephir_memnstr_str(&contentType, SL("application/soap+xml"), "phalcon/Http/Request.zep", 1219)); + RETURN_MM_BOOL(zephir_memnstr_str(&contentType, SL("application/soap+xml"), "phalcon/Http/Request.zep", 1285)); } /** @@ -3101,7 +3371,7 @@ PHP_METHOD(Phalcon_Http_Request, isTrace) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 347); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 0); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "TRACE")); } @@ -3173,7 +3443,7 @@ PHP_METHOD(Phalcon_Http_Request, numFiles) if (Z_TYPE_P(&files) != IS_ARRAY) { RETURN_MM_LONG(0); } - zephir_is_iterable(&files, 0, "phalcon/Http/Request.zep", 1284); + zephir_is_iterable(&files, 0, "phalcon/Http/Request.zep", 1350); if (Z_TYPE_P(&files) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&files), _0) { @@ -3196,7 +3466,7 @@ PHP_METHOD(Phalcon_Http_Request, numFiles) } else { ZVAL_BOOL(&_4$$8, 0); } - ZEPHIR_CALL_METHOD(&_3$$8, this_ptr, "hasfilehelper", &_5, 349, &error, &_4$$8); + ZEPHIR_CALL_METHOD(&_3$$8, this_ptr, "hasfilehelper", &_5, 0, &error, &_4$$8); zephir_check_call_status(); numberFiles += zephir_get_numberval(&_3$$8); } @@ -3230,7 +3500,7 @@ PHP_METHOD(Phalcon_Http_Request, numFiles) } else { ZVAL_BOOL(&_8$$13, 0); } - ZEPHIR_CALL_METHOD(&_7$$13, this_ptr, "hasfilehelper", &_5, 349, &error, &_8$$13); + ZEPHIR_CALL_METHOD(&_7$$13, this_ptr, "hasfilehelper", &_5, 0, &error, &_8$$13); zephir_check_call_status(); numberFiles += zephir_get_numberval(&_7$$13); } @@ -3341,13 +3611,13 @@ PHP_METHOD(Phalcon_Http_Request, setParameterFilters) ZEPHIR_CONCAT_SVS(&_1$$3, "Filters have not been defined for '", &name, "'"); ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 33, &_1$$3); zephir_check_call_status(); - zephir_throw_exception_debug(&_0$$3, "phalcon/Http/Request.zep", 1315); + zephir_throw_exception_debug(&_0$$3, "phalcon/Http/Request.zep", 1381); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 350); + ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 340); zephir_check_call_status(); - zephir_is_iterable(&filters, 0, "phalcon/Http/Request.zep", 1328); + zephir_is_iterable(&filters, 0, "phalcon/Http/Request.zep", 1394); if (Z_TYPE_P(&filters) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&filters), _2) { @@ -3362,7 +3632,7 @@ PHP_METHOD(Phalcon_Http_Request, setParameterFilters) ZEPHIR_CONCAT_SVS(&_7$$5, "Sanitizer '", &sanitizer, "' does not exist in the filter locator"); ZEPHIR_CALL_METHOD(NULL, &_6$$5, "__construct", NULL, 33, &_7$$5); zephir_check_call_status(); - zephir_throw_exception_debug(&_6$$5, "phalcon/Http/Request.zep", 1324); + zephir_throw_exception_debug(&_6$$5, "phalcon/Http/Request.zep", 1390); ZEPHIR_MM_RESTORE(); return; } @@ -3387,7 +3657,7 @@ PHP_METHOD(Phalcon_Http_Request, setParameterFilters) ZEPHIR_CONCAT_SVS(&_11$$7, "Sanitizer '", &sanitizer, "' does not exist in the filter locator"); ZEPHIR_CALL_METHOD(NULL, &_10$$7, "__construct", NULL, 33, &_11$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_10$$7, "phalcon/Http/Request.zep", 1324); + zephir_throw_exception_debug(&_10$$7, "phalcon/Http/Request.zep", 1390); ZEPHIR_MM_RESTORE(); return; } @@ -3414,7 +3684,7 @@ PHP_METHOD(Phalcon_Http_Request, setParameterFilters) } else { ZEPHIR_CPY_WRT(&localScope, &scope); } - zephir_is_iterable(&localScope, 0, "phalcon/Http/Request.zep", 1343); + zephir_is_iterable(&localScope, 0, "phalcon/Http/Request.zep", 1409); if (Z_TYPE_P(&localScope) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&localScope), _13) { @@ -3475,6 +3745,198 @@ PHP_METHOD(Phalcon_Http_Request, setStrictHostCheck) RETURN_THISW(); } +/** + * Set trusted proxy + * + * @param array $trustedProxies + * @return RequestInterface + * @throws Exception + */ +PHP_METHOD(Phalcon_Http_Request, setTrustedProxies) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zephir_fcall_cache_entry *_3 = NULL, *_5 = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *trustedProxies_param = NULL, filterService, trustedProxy, filtered, *_0, _1, _2$$3, _4$$5; + zval trustedProxies; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&trustedProxies); + ZVAL_UNDEF(&filterService); + ZVAL_UNDEF(&trustedProxy); + ZVAL_UNDEF(&filtered); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2$$3); + ZVAL_UNDEF(&_4$$5); + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_ARRAY(trustedProxies) + ZEND_PARSE_PARAMETERS_END(); + ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); + zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); + zephir_fetch_params(1, 1, 0, &trustedProxies_param); + zephir_get_arrval(&trustedProxies, trustedProxies_param); + ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 340); + zephir_check_call_status(); + zephir_is_iterable(&trustedProxies, 0, "phalcon/Http/Request.zep", 1444); + if (Z_TYPE_P(&trustedProxies) == IS_ARRAY) { + ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&trustedProxies), _0) + { + ZEPHIR_INIT_NVAR(&trustedProxy); + ZVAL_COPY(&trustedProxy, _0); + ZEPHIR_INIT_NVAR(&_2$$3); + ZVAL_STRING(&_2$$3, "ip"); + ZEPHIR_CALL_METHOD(&filtered, &filterService, "sanitize", &_3, 0, &trustedProxy, &_2$$3); + zephir_check_call_status(); + if (!ZEPHIR_IS_FALSE_IDENTICAL(&filtered)) { + zephir_update_property_array_append(this_ptr, SL("trustedProxies"), &filtered); + } + } ZEND_HASH_FOREACH_END(); + } else { + ZEPHIR_CALL_METHOD(NULL, &trustedProxies, "rewind", NULL, 0); + zephir_check_call_status(); + while (1) { + ZEPHIR_CALL_METHOD(&_1, &trustedProxies, "valid", NULL, 0); + zephir_check_call_status(); + if (!zend_is_true(&_1)) { + break; + } + ZEPHIR_CALL_METHOD(&trustedProxy, &trustedProxies, "current", NULL, 0); + zephir_check_call_status(); + ZEPHIR_INIT_NVAR(&_4$$5); + ZVAL_STRING(&_4$$5, "ip"); + ZEPHIR_CALL_METHOD(&filtered, &filterService, "sanitize", &_5, 0, &trustedProxy, &_4$$5); + zephir_check_call_status(); + if (!ZEPHIR_IS_FALSE_IDENTICAL(&filtered)) { + zephir_update_property_array_append(this_ptr, SL("trustedProxies"), &filtered); + } + ZEPHIR_CALL_METHOD(NULL, &trustedProxies, "next", NULL, 0); + zephir_check_call_status(); + } + } + ZEPHIR_INIT_NVAR(&trustedProxy); + RETURN_THIS(); +} + +/** + * Check if an IP address exists in CIDR range + * + * @param string $ip The IP address to check. + * @param string $cidr The CIDR range to compare against. + * @return bool True if the IP is in range, false otherwise. + */ +PHP_METHOD(Phalcon_Http_Request, isIpAddressInCIDR) +{ + zend_bool _1; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS, maskBytes = 0, tempMask = 0, remainingBits = 0; + zval *ip_param = NULL, *cidr_param = NULL, parts, mask, subnet, maskLength, ipBin, subnetBin, ipBits, subnetBits, ipByte, subnetByte, _0, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11; + zval ip, cidr; + + ZVAL_UNDEF(&ip); + ZVAL_UNDEF(&cidr); + ZVAL_UNDEF(&parts); + ZVAL_UNDEF(&mask); + ZVAL_UNDEF(&subnet); + ZVAL_UNDEF(&maskLength); + ZVAL_UNDEF(&ipBin); + ZVAL_UNDEF(&subnetBin); + ZVAL_UNDEF(&ipBits); + ZVAL_UNDEF(&subnetBits); + ZVAL_UNDEF(&ipByte); + ZVAL_UNDEF(&subnetByte); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_3); + ZVAL_UNDEF(&_4); + ZVAL_UNDEF(&_5); + ZVAL_UNDEF(&_6); + ZVAL_UNDEF(&_7); + ZVAL_UNDEF(&_8); + ZVAL_UNDEF(&_9); + ZVAL_UNDEF(&_10); + ZVAL_UNDEF(&_11); + ZEND_PARSE_PARAMETERS_START(2, 2) + Z_PARAM_STR(ip) + Z_PARAM_STR(cidr) + ZEND_PARSE_PARAMETERS_END(); + ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); + zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); + zephir_fetch_params(1, 2, 0, &ip_param, &cidr_param); + zephir_get_strval(&ip, ip_param); + zephir_get_strval(&cidr, cidr_param); + ZEPHIR_INIT_VAR(&_0); + ZVAL_STRING(&_0, "/"); + ZEPHIR_INIT_VAR(&parts); + zephir_fast_explode(&parts, &_0, &cidr, LONG_MAX); + zephir_memory_observe(&subnet); + zephir_array_fetch_long(&subnet, &parts, 0, PH_NOISY, "phalcon/Http/Request.zep", 1460); + zephir_memory_observe(&maskLength); + zephir_array_fetch_long(&maskLength, &parts, 1, PH_NOISY, "phalcon/Http/Request.zep", 1461); + ZEPHIR_CALL_FUNCTION(&ipBin, "inet_pton", NULL, 347, &ip); + zephir_check_call_status(); + ZEPHIR_CALL_FUNCTION(&subnetBin, "inet_pton", NULL, 347, &subnet); + zephir_check_call_status(); + _1 = ZEPHIR_IS_FALSE_IDENTICAL(&ipBin); + if (!(_1)) { + _1 = ZEPHIR_IS_FALSE_IDENTICAL(&subnetBin); + } + if (_1) { + RETURN_MM_BOOL(0); + } + ZEPHIR_INIT_VAR(&_2); + ZVAL_STRING(&_2, "H*"); + ZEPHIR_CALL_FUNCTION(&ipBits, "unpack", NULL, 269, &_2, &ipBin); + zephir_check_call_status(); + ZEPHIR_INIT_NVAR(&_2); + ZVAL_STRING(&_2, "H*"); + ZEPHIR_CALL_FUNCTION(&subnetBits, "unpack", NULL, 269, &_2, &subnetBin); + zephir_check_call_status(); + zephir_array_fetch_long(&_3, &ipBits, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1473); + ZEPHIR_CPY_WRT(&ipBits, &_3); + zephir_array_fetch_long(&_3, &subnetBits, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1474); + ZEPHIR_CPY_WRT(&subnetBits, &_3); + ZVAL_LONG(&_4, zephir_fast_strlen_ev(&ipBits)); + ZEPHIR_INIT_NVAR(&_2); + ZVAL_STRING(&_2, "0"); + ZEPHIR_CALL_FUNCTION(&_5, "str_pad", NULL, 348, &ipBits, &_4, &_2); + zephir_check_call_status(); + ZEPHIR_CALL_FUNCTION(&ipBits, "hex2bin", NULL, 349, &_5); + zephir_check_call_status(); + ZVAL_LONG(&_4, zephir_fast_strlen_ev(&subnetBits)); + ZEPHIR_INIT_NVAR(&_2); + ZVAL_STRING(&_2, "0"); + ZEPHIR_CALL_FUNCTION(&_6, "str_pad", NULL, 348, &subnetBits, &_4, &_2); + zephir_check_call_status(); + ZEPHIR_CALL_FUNCTION(&subnetBits, "hex2bin", NULL, 349, &_6); + zephir_check_call_status(); + ZVAL_DOUBLE(&_4, zephir_safe_div_zval_long(&maskLength, 8)); + maskBytes = (int) zephir_floor(&_4); + remainingBits = (long) (zephir_safe_mod_zval_long(&maskLength, 8)); + ZVAL_LONG(&_7, maskBytes); + ZEPHIR_CALL_FUNCTION(&_8, "strncmp", NULL, 191, &ipBits, &subnetBits, &_7); + zephir_check_call_status(); + if (!ZEPHIR_IS_LONG_IDENTICAL(&_8, 0)) { + RETURN_MM_BOOL(0); + } + if (remainingBits == 0) { + RETURN_MM_BOOL(1); + } + zephir_array_fetch_long(&_3, &ipBits, maskBytes, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1492); + ZEPHIR_CALL_FUNCTION(&ipByte, "ord", NULL, 245, &_3); + zephir_check_call_status(); + zephir_array_fetch_long(&_9, &subnetBits, maskBytes, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1493); + ZEPHIR_CALL_FUNCTION(&subnetByte, "ord", NULL, 245, &_9); + zephir_check_call_status(); + tempMask = (((1 << ((8 - remainingBits)))) - 1); + ZEPHIR_INIT_VAR(&mask); + ZVAL_LONG(&mask, (0xFF ^ tempMask)); + ZEPHIR_INIT_VAR(&_10); + zephir_bitwise_and_function(&_10, &ipByte, &mask); + ZEPHIR_INIT_VAR(&_11); + zephir_bitwise_and_function(&_11, &subnetByte, &mask); + RETURN_MM_BOOL(ZEPHIR_IS_IDENTICAL(&_10, &_11)); +} + /** * Process a request header and return the one with best quality */ @@ -3517,7 +3979,7 @@ PHP_METHOD(Phalcon_Http_Request, getBestQuality) quality = (0.0); ZEPHIR_INIT_VAR(&selectedName); ZVAL_STRING(&selectedName, ""); - zephir_is_iterable(&qualityParts, 0, "phalcon/Http/Request.zep", 1386); + zephir_is_iterable(&qualityParts, 0, "phalcon/Http/Request.zep", 1530); if (Z_TYPE_P(&qualityParts) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&qualityParts), _0) { @@ -3525,18 +3987,18 @@ PHP_METHOD(Phalcon_Http_Request, getBestQuality) ZVAL_COPY(&accept, _0); if (i == 0) { ZEPHIR_OBS_NVAR(&_2$$4); - zephir_array_fetch_string(&_2$$4, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1372); + zephir_array_fetch_string(&_2$$4, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1516); quality = (zephir_get_doubleval(&_2$$4)); ZEPHIR_OBS_NVAR(&selectedName); - zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1373); + zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1517); } else { ZEPHIR_OBS_NVAR(&_3$$5); - zephir_array_fetch_string(&_3$$5, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1375); + zephir_array_fetch_string(&_3$$5, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1519); acceptQuality = (zephir_get_doubleval(&_3$$5)); if (acceptQuality > quality) { quality = acceptQuality; ZEPHIR_OBS_NVAR(&selectedName); - zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1379); + zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1523); } } i++; @@ -3554,18 +4016,18 @@ PHP_METHOD(Phalcon_Http_Request, getBestQuality) zephir_check_call_status(); if (i == 0) { ZEPHIR_OBS_NVAR(&_4$$8); - zephir_array_fetch_string(&_4$$8, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1372); + zephir_array_fetch_string(&_4$$8, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1516); quality = (zephir_get_doubleval(&_4$$8)); ZEPHIR_OBS_NVAR(&selectedName); - zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1373); + zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1517); } else { ZEPHIR_OBS_NVAR(&_5$$9); - zephir_array_fetch_string(&_5$$9, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1375); + zephir_array_fetch_string(&_5$$9, &accept, SL("quality"), PH_NOISY, "phalcon/Http/Request.zep", 1519); acceptQuality = (zephir_get_doubleval(&_5$$9)); if (acceptQuality > quality) { quality = acceptQuality; ZEPHIR_OBS_NVAR(&selectedName); - zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1379); + zephir_array_fetch(&selectedName, &accept, &name, PH_NOISY, "phalcon/Http/Request.zep", 1523); } } i++; @@ -3664,7 +4126,7 @@ PHP_METHOD(Phalcon_Http_Request, getHelper) RETURN_MM(); } if (Z_TYPE_P(filters) != IS_NULL) { - ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 350); + ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 340); zephir_check_call_status(); if (noRecursive) { ZVAL_BOOL(&_3$$6, 1); @@ -3712,7 +4174,7 @@ PHP_METHOD(Phalcon_Http_Request, hasFileHelper) if (Z_TYPE_P(data) != IS_ARRAY) { RETURN_MM_LONG(1); } - zephir_is_iterable(data, 0, "phalcon/Http/Request.zep", 1455); + zephir_is_iterable(data, 0, "phalcon/Http/Request.zep", 1599); if (Z_TYPE_P(data) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(data), _0) { @@ -3733,7 +4195,7 @@ PHP_METHOD(Phalcon_Http_Request, hasFileHelper) } else { ZVAL_BOOL(&_4$$7, 0); } - ZEPHIR_CALL_METHOD(&_3$$7, this_ptr, "hasfilehelper", &_5, 349, &value, &_4$$7); + ZEPHIR_CALL_METHOD(&_3$$7, this_ptr, "hasfilehelper", &_5, 350, &value, &_4$$7); zephir_check_call_status(); numberFiles += zephir_get_numberval(&_3$$7); } @@ -3764,7 +4226,7 @@ PHP_METHOD(Phalcon_Http_Request, hasFileHelper) } else { ZVAL_BOOL(&_8$$11, 0); } - ZEPHIR_CALL_METHOD(&_7$$11, this_ptr, "hasfilehelper", &_5, 349, &value, &_8$$11); + ZEPHIR_CALL_METHOD(&_7$$11, this_ptr, "hasfilehelper", &_5, 350, &value, &_8$$11); zephir_check_call_status(); numberFiles += zephir_get_numberval(&_7$$11); } @@ -3887,7 +4349,7 @@ PHP_METHOD(Phalcon_Http_Request, getQualityHeader) ZVAL_LONG(&_3, 1); ZEPHIR_CALL_FUNCTION(&parts, "preg_split", NULL, 70, &_1, &serverValue, &_2, &_3); zephir_check_call_status(); - zephir_is_iterable(&parts, 0, "phalcon/Http/Request.zep", 1499); + zephir_is_iterable(&parts, 0, "phalcon/Http/Request.zep", 1643); if (Z_TYPE_P(&parts) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&parts), _4) { @@ -3903,7 +4365,7 @@ PHP_METHOD(Phalcon_Http_Request, getQualityHeader) ZVAL_LONG(&_9$$3, 1); ZEPHIR_CALL_FUNCTION(&headerSplit, "preg_split", NULL, 70, &_7$$3, &_6$$3, &_8$$3, &_9$$3); zephir_check_call_status(); - zephir_is_iterable(&headerSplit, 0, "phalcon/Http/Request.zep", 1496); + zephir_is_iterable(&headerSplit, 0, "phalcon/Http/Request.zep", 1640); if (Z_TYPE_P(&headerSplit) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&headerSplit), _10$$3) { @@ -3916,17 +4378,17 @@ PHP_METHOD(Phalcon_Http_Request, getQualityHeader) if (!ZEPHIR_IS_FALSE_IDENTICAL(&_13$$4)) { ZEPHIR_INIT_NVAR(&split); zephir_fast_explode_str(&split, SL("="), &headerPart, 2 ); - zephir_array_fetch_long(&_14$$5, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1485); + zephir_array_fetch_long(&_14$$5, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1629); if (ZEPHIR_IS_STRING_IDENTICAL(&_14$$5, "q")) { ZEPHIR_OBS_NVAR(&_15$$6); - zephir_array_fetch_long(&_15$$6, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1486); + zephir_array_fetch_long(&_15$$6, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1630); ZEPHIR_INIT_NVAR(&_16$$6); ZVAL_DOUBLE(&_16$$6, zephir_get_doubleval(&_15$$6)); zephir_array_update_string(&headerParts, SL("quality"), &_16$$6, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_long(&_17$$7, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1488); + zephir_array_fetch_long(&_17$$7, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1632); ZEPHIR_OBS_NVAR(&_18$$7); - zephir_array_fetch_long(&_18$$7, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1488); + zephir_array_fetch_long(&_18$$7, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1632); zephir_array_update_zval(&headerParts, &_18$$7, &_17$$7, PH_COPY | PH_SEPARATE); } } else { @@ -3954,17 +4416,17 @@ PHP_METHOD(Phalcon_Http_Request, getQualityHeader) if (!ZEPHIR_IS_FALSE_IDENTICAL(&_21$$9)) { ZEPHIR_INIT_NVAR(&split); zephir_fast_explode_str(&split, SL("="), &headerPart, 2 ); - zephir_array_fetch_long(&_22$$10, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1485); + zephir_array_fetch_long(&_22$$10, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1629); if (ZEPHIR_IS_STRING_IDENTICAL(&_22$$10, "q")) { ZEPHIR_OBS_NVAR(&_23$$11); - zephir_array_fetch_long(&_23$$11, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1486); + zephir_array_fetch_long(&_23$$11, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1630); ZEPHIR_INIT_NVAR(&_24$$11); ZVAL_DOUBLE(&_24$$11, zephir_get_doubleval(&_23$$11)); zephir_array_update_string(&headerParts, SL("quality"), &_24$$11, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_long(&_25$$12, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1488); + zephir_array_fetch_long(&_25$$12, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1632); ZEPHIR_OBS_NVAR(&_26$$12); - zephir_array_fetch_long(&_26$$12, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1488); + zephir_array_fetch_long(&_26$$12, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1632); zephir_array_update_zval(&headerParts, &_26$$12, &_25$$12, PH_COPY | PH_SEPARATE); } } else { @@ -3978,7 +4440,7 @@ PHP_METHOD(Phalcon_Http_Request, getQualityHeader) } } ZEPHIR_INIT_NVAR(&headerPart); - zephir_array_append(&returnedParts, &headerParts, PH_SEPARATE, "phalcon/Http/Request.zep", 1496); + zephir_array_append(&returnedParts, &headerParts, PH_SEPARATE, "phalcon/Http/Request.zep", 1640); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &parts, "rewind", NULL, 0); @@ -4001,7 +4463,7 @@ PHP_METHOD(Phalcon_Http_Request, getQualityHeader) ZVAL_LONG(&_31$$14, 1); ZEPHIR_CALL_FUNCTION(&headerSplit, "preg_split", NULL, 70, &_29$$14, &_28$$14, &_30$$14, &_31$$14); zephir_check_call_status(); - zephir_is_iterable(&headerSplit, 0, "phalcon/Http/Request.zep", 1496); + zephir_is_iterable(&headerSplit, 0, "phalcon/Http/Request.zep", 1640); if (Z_TYPE_P(&headerSplit) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&headerSplit), _32$$14) { @@ -4014,17 +4476,17 @@ PHP_METHOD(Phalcon_Http_Request, getQualityHeader) if (!ZEPHIR_IS_FALSE_IDENTICAL(&_35$$15)) { ZEPHIR_INIT_NVAR(&split); zephir_fast_explode_str(&split, SL("="), &headerPart, 2 ); - zephir_array_fetch_long(&_36$$16, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1485); + zephir_array_fetch_long(&_36$$16, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1629); if (ZEPHIR_IS_STRING_IDENTICAL(&_36$$16, "q")) { ZEPHIR_OBS_NVAR(&_37$$17); - zephir_array_fetch_long(&_37$$17, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1486); + zephir_array_fetch_long(&_37$$17, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1630); ZEPHIR_INIT_NVAR(&_38$$17); ZVAL_DOUBLE(&_38$$17, zephir_get_doubleval(&_37$$17)); zephir_array_update_string(&headerParts, SL("quality"), &_38$$17, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_long(&_39$$18, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1488); + zephir_array_fetch_long(&_39$$18, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1632); ZEPHIR_OBS_NVAR(&_40$$18); - zephir_array_fetch_long(&_40$$18, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1488); + zephir_array_fetch_long(&_40$$18, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1632); zephir_array_update_zval(&headerParts, &_40$$18, &_39$$18, PH_COPY | PH_SEPARATE); } } else { @@ -4052,17 +4514,17 @@ PHP_METHOD(Phalcon_Http_Request, getQualityHeader) if (!ZEPHIR_IS_FALSE_IDENTICAL(&_43$$20)) { ZEPHIR_INIT_NVAR(&split); zephir_fast_explode_str(&split, SL("="), &headerPart, 2 ); - zephir_array_fetch_long(&_44$$21, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1485); + zephir_array_fetch_long(&_44$$21, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1629); if (ZEPHIR_IS_STRING_IDENTICAL(&_44$$21, "q")) { ZEPHIR_OBS_NVAR(&_45$$22); - zephir_array_fetch_long(&_45$$22, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1486); + zephir_array_fetch_long(&_45$$22, &split, 1, PH_NOISY, "phalcon/Http/Request.zep", 1630); ZEPHIR_INIT_NVAR(&_46$$22); ZVAL_DOUBLE(&_46$$22, zephir_get_doubleval(&_45$$22)); zephir_array_update_string(&headerParts, SL("quality"), &_46$$22, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_long(&_47$$23, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1488); + zephir_array_fetch_long(&_47$$23, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1632); ZEPHIR_OBS_NVAR(&_48$$23); - zephir_array_fetch_long(&_48$$23, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1488); + zephir_array_fetch_long(&_48$$23, &split, 0, PH_NOISY, "phalcon/Http/Request.zep", 1632); zephir_array_update_zval(&headerParts, &_48$$23, &_47$$23, PH_COPY | PH_SEPARATE); } } else { @@ -4076,7 +4538,7 @@ PHP_METHOD(Phalcon_Http_Request, getQualityHeader) } } ZEPHIR_INIT_NVAR(&headerPart); - zephir_array_append(&returnedParts, &headerParts, PH_SEPARATE, "phalcon/Http/Request.zep", 1496); + zephir_array_append(&returnedParts, &headerParts, PH_SEPARATE, "phalcon/Http/Request.zep", 1640); ZEPHIR_CALL_METHOD(NULL, &parts, "next", NULL, 0); zephir_check_call_status(); } @@ -4151,7 +4613,7 @@ PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders) ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdi", NULL, 0); zephir_check_call_status(); ZEPHIR_CPY_WRT(&container, &_0); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 340); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 339); zephir_check_call_status(); if (Z_TYPE_P(&container) != IS_NULL) { ZEPHIR_INIT_VAR(&_1$$3); @@ -4230,11 +4692,11 @@ PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders) if (zephir_is_true(&authHeader)) { ZEPHIR_INIT_VAR(&_19$$11); ZVAL_STRING(&_19$$11, "basic "); - ZEPHIR_CALL_FUNCTION(&_20$$11, "stripos", NULL, 351, &authHeader, &_19$$11); + ZEPHIR_CALL_FUNCTION(&_20$$11, "stripos", NULL, 345, &authHeader, &_19$$11); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_19$$11); ZVAL_STRING(&_19$$11, "digest "); - ZEPHIR_CALL_FUNCTION(&_21$$11, "stripos", NULL, 351, &authHeader, &_19$$11); + ZEPHIR_CALL_FUNCTION(&_21$$11, "stripos", NULL, 345, &authHeader, &_19$$11); zephir_check_call_status(); _22$$11 = ZEPHIR_IS_LONG_IDENTICAL(&_21$$11, 0); if (_22$$11) { @@ -4246,20 +4708,20 @@ PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders) } ZEPHIR_INIT_NVAR(&_19$$11); ZVAL_STRING(&_19$$11, "bearer "); - ZEPHIR_CALL_FUNCTION(&_24$$11, "stripos", NULL, 351, &authHeader, &_19$$11); + ZEPHIR_CALL_FUNCTION(&_24$$11, "stripos", NULL, 345, &authHeader, &_19$$11); zephir_check_call_status(); if (ZEPHIR_IS_LONG_IDENTICAL(&_20$$11, 0)) { ZVAL_LONG(&_25$$12, 6); ZEPHIR_INIT_VAR(&_26$$12); zephir_substr(&_26$$12, &authHeader, 6 , 0, ZEPHIR_SUBSTR_NO_LENGTH); - ZEPHIR_CALL_FUNCTION(&_27$$12, "base64_decode", NULL, 230, &_26$$12); + ZEPHIR_CALL_FUNCTION(&_27$$12, "base64_decode", NULL, 231, &_26$$12); zephir_check_call_status(); ZEPHIR_INIT_VAR(&exploded); zephir_fast_explode_str(&exploded, SL(":"), &_27$$12, 2 ); if (zephir_fast_count_int(&exploded) == 2) { - zephir_array_fetch_long(&_28$$13, &exploded, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1558); + zephir_array_fetch_long(&_28$$13, &exploded, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1702); zephir_array_update_string(&headers, SL("Php-Auth-User"), &_28$$13, PH_COPY | PH_SEPARATE); - zephir_array_fetch_long(&_29$$13, &exploded, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1559); + zephir_array_fetch_long(&_29$$13, &exploded, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1703); zephir_array_update_string(&headers, SL("Php-Auth-Pw"), &_29$$13, PH_COPY | PH_SEPARATE); } } else if (_22$$11) { @@ -4272,11 +4734,11 @@ PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders) if (!(zephir_array_isset_string(&headers, SL("Authorization")))) { zephir_memory_observe(&digest); if (zephir_array_isset_string(&headers, SL("Php-Auth-User"))) { - zephir_array_fetch_string(&_30$$17, &headers, SL("Php-Auth-User"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1571); - zephir_array_fetch_string(&_31$$17, &headers, SL("Php-Auth-Pw"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1571); + zephir_array_fetch_string(&_30$$17, &headers, SL("Php-Auth-User"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1715); + zephir_array_fetch_string(&_31$$17, &headers, SL("Php-Auth-Pw"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1715); ZEPHIR_INIT_VAR(&_32$$17); ZEPHIR_CONCAT_VSV(&_32$$17, &_30$$17, ":", &_31$$17); - ZEPHIR_CALL_FUNCTION(&_33$$17, "base64_encode", NULL, 231, &_32$$17); + ZEPHIR_CALL_FUNCTION(&_33$$17, "base64_encode", NULL, 232, &_32$$17); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_34$$17); ZEPHIR_CONCAT_SV(&_34$$17, "Basic ", &_33$$17); @@ -4370,7 +4832,7 @@ PHP_METHOD(Phalcon_Http_Request, smoothFiles) zephir_get_strval(&prefix, prefix_param); ZEPHIR_INIT_VAR(&files); array_init(&files); - zephir_is_iterable(&names, 0, "phalcon/Http/Request.zep", 1635); + zephir_is_iterable(&names, 0, "phalcon/Http/Request.zep", 1779); if (Z_TYPE_P(&names) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&names), _2, _3, _0) { @@ -4389,35 +4851,35 @@ PHP_METHOD(Phalcon_Http_Request, smoothFiles) zephir_create_array(&_4$$4, 6, 0); zephir_array_update_string(&_4$$4, SL("name"), &name, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_5$$4); - zephir_array_fetch(&_5$$4, &types, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1611); + zephir_array_fetch(&_5$$4, &types, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1755); zephir_array_update_string(&_4$$4, SL("type"), &_5$$4, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_5$$4); - zephir_array_fetch(&_5$$4, &tmp_names, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1612); + zephir_array_fetch(&_5$$4, &tmp_names, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1756); zephir_array_update_string(&_4$$4, SL("tmp_name"), &_5$$4, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_5$$4); - zephir_array_fetch(&_5$$4, &sizes, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1613); + zephir_array_fetch(&_5$$4, &sizes, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1757); zephir_array_update_string(&_4$$4, SL("size"), &_5$$4, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_5$$4); - zephir_array_fetch(&_5$$4, &errors, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1614); + zephir_array_fetch(&_5$$4, &errors, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1758); zephir_array_update_string(&_4$$4, SL("error"), &_5$$4, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_4$$4, SL("key"), &p, PH_COPY | PH_SEPARATE); - zephir_array_append(&files, &_4$$4, PH_SEPARATE, "phalcon/Http/Request.zep", 1616); + zephir_array_append(&files, &_4$$4, PH_SEPARATE, "phalcon/Http/Request.zep", 1760); } if (Z_TYPE_P(&name) == IS_ARRAY) { - zephir_array_fetch(&_6$$5, &names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1621); - zephir_array_fetch(&_7$$5, &types, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1622); - zephir_array_fetch(&_8$$5, &tmp_names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1623); - zephir_array_fetch(&_9$$5, &sizes, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1624); - zephir_array_fetch(&_10$$5, &errors, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1625); - ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 345, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &_10$$5, &p); + zephir_array_fetch(&_6$$5, &names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1765); + zephir_array_fetch(&_7$$5, &types, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1766); + zephir_array_fetch(&_8$$5, &tmp_names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1767); + zephir_array_fetch(&_9$$5, &sizes, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1768); + zephir_array_fetch(&_10$$5, &errors, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1769); + ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 351, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &_10$$5, &p); zephir_check_call_status(); - zephir_is_iterable(&parentFiles, 0, "phalcon/Http/Request.zep", 1632); + zephir_is_iterable(&parentFiles, 0, "phalcon/Http/Request.zep", 1776); if (Z_TYPE_P(&parentFiles) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&parentFiles), _12$$5) { ZEPHIR_INIT_NVAR(&file); ZVAL_COPY(&file, _12$$5); - zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1630); + zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1774); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &parentFiles, "rewind", NULL, 0); @@ -4430,7 +4892,7 @@ PHP_METHOD(Phalcon_Http_Request, smoothFiles) } ZEPHIR_CALL_METHOD(&file, &parentFiles, "current", NULL, 0); zephir_check_call_status(); - zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1630); + zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1774); ZEPHIR_CALL_METHOD(NULL, &parentFiles, "next", NULL, 0); zephir_check_call_status(); } @@ -4458,35 +4920,35 @@ PHP_METHOD(Phalcon_Http_Request, smoothFiles) zephir_create_array(&_14$$9, 6, 0); zephir_array_update_string(&_14$$9, SL("name"), &name, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_15$$9); - zephir_array_fetch(&_15$$9, &types, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1611); + zephir_array_fetch(&_15$$9, &types, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1755); zephir_array_update_string(&_14$$9, SL("type"), &_15$$9, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_15$$9); - zephir_array_fetch(&_15$$9, &tmp_names, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1612); + zephir_array_fetch(&_15$$9, &tmp_names, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1756); zephir_array_update_string(&_14$$9, SL("tmp_name"), &_15$$9, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_15$$9); - zephir_array_fetch(&_15$$9, &sizes, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1613); + zephir_array_fetch(&_15$$9, &sizes, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1757); zephir_array_update_string(&_14$$9, SL("size"), &_15$$9, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_15$$9); - zephir_array_fetch(&_15$$9, &errors, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1614); + zephir_array_fetch(&_15$$9, &errors, &idx, PH_NOISY, "phalcon/Http/Request.zep", 1758); zephir_array_update_string(&_14$$9, SL("error"), &_15$$9, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_14$$9, SL("key"), &p, PH_COPY | PH_SEPARATE); - zephir_array_append(&files, &_14$$9, PH_SEPARATE, "phalcon/Http/Request.zep", 1616); + zephir_array_append(&files, &_14$$9, PH_SEPARATE, "phalcon/Http/Request.zep", 1760); } if (Z_TYPE_P(&name) == IS_ARRAY) { - zephir_array_fetch(&_16$$10, &names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1621); - zephir_array_fetch(&_17$$10, &types, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1622); - zephir_array_fetch(&_18$$10, &tmp_names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1623); - zephir_array_fetch(&_19$$10, &sizes, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1624); - zephir_array_fetch(&_20$$10, &errors, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1625); - ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 345, &_16$$10, &_17$$10, &_18$$10, &_19$$10, &_20$$10, &p); + zephir_array_fetch(&_16$$10, &names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1765); + zephir_array_fetch(&_17$$10, &types, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1766); + zephir_array_fetch(&_18$$10, &tmp_names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1767); + zephir_array_fetch(&_19$$10, &sizes, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1768); + zephir_array_fetch(&_20$$10, &errors, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1769); + ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 351, &_16$$10, &_17$$10, &_18$$10, &_19$$10, &_20$$10, &p); zephir_check_call_status(); - zephir_is_iterable(&parentFiles, 0, "phalcon/Http/Request.zep", 1632); + zephir_is_iterable(&parentFiles, 0, "phalcon/Http/Request.zep", 1776); if (Z_TYPE_P(&parentFiles) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&parentFiles), _21$$10) { ZEPHIR_INIT_NVAR(&file); ZVAL_COPY(&file, _21$$10); - zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1630); + zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1774); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &parentFiles, "rewind", NULL, 0); @@ -4499,7 +4961,7 @@ PHP_METHOD(Phalcon_Http_Request, smoothFiles) } ZEPHIR_CALL_METHOD(&file, &parentFiles, "current", NULL, 0); zephir_check_call_status(); - zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1630); + zephir_array_append(&files, &file, PH_SEPARATE, "phalcon/Http/Request.zep", 1774); ZEPHIR_CALL_METHOD(NULL, &parentFiles, "next", NULL, 0); zephir_check_call_status(); } @@ -4540,7 +5002,7 @@ PHP_METHOD(Phalcon_Http_Request, getFilterService) zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&container, &_1$$3); if (Z_TYPE_P(&container) == IS_NULL) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_request_exception_ce, "A dependency injection container is required to access the 'filter' service", "phalcon/Http/Request.zep", 1653); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_request_exception_ce, "A dependency injection container is required to access the 'filter' service", "phalcon/Http/Request.zep", 1797); return; } ZEPHIR_INIT_VAR(&_3$$3); @@ -4624,7 +5086,7 @@ PHP_METHOD(Phalcon_Http_Request, getFilteredData) } zephir_memory_observe(&filters); zephir_read_property(&_0, this_ptr, ZEND_STRL("queryFilters"), PH_NOISY_CC | PH_READONLY); - zephir_array_fetch(&_1, &_0, &methodKey, PH_READONLY, "phalcon/Http/Request.zep", 1685); + zephir_array_fetch(&_1, &_0, &methodKey, PH_READONLY, "phalcon/Http/Request.zep", 1829); if (!(zephir_array_isset_fetch(&filters, &_1, &name, 0))) { ZEPHIR_INIT_NVAR(&filters); array_init(&filters); @@ -4645,145 +5107,74 @@ PHP_METHOD(Phalcon_Http_Request, getFilteredData) } /** - * Gets a variable from put request + * Return post data from rawBody, form data, or urlencoded form data * - *```php - * // Returns value from $_PATCH["user_email"] without sanitizing - * $userEmail = $request->getPatch("user_email"); - * - * // Returns value from $_PATCH["user_email"] with sanitizing - * $userEmail = $request->getPatch("user_email", "email"); - *``` + * @param array|null $data + * @return array */ -PHP_METHOD(Phalcon_Http_Request, getPatchPut) +PHP_METHOD(Phalcon_Http_Request, getPostData) { + zend_bool _2$$3; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zend_bool notAllowEmpty, noRecursive, _0$$3, _3$$3; - zval *collection_param = NULL, *name_param = NULL, *filters = NULL, filters_sub, *defaultValue = NULL, defaultValue_sub, *notAllowEmpty_param = NULL, *noRecursive_param = NULL, __$null, cached, contentType, _10, _11, _1$$3, _2$$3, _4$$3, _5$$4, _6$$4, _8$$4, _7$$5, _9$$8; - zval collection, name; + zval *data, data_sub, result, _0$$3, _1$$3, _3$$3, _4$$3, _5$$3, _6$$4, _7$$6; zval *this_ptr = getThis(); - ZVAL_UNDEF(&collection); - ZVAL_UNDEF(&name); - ZVAL_UNDEF(&filters_sub); - ZVAL_UNDEF(&defaultValue_sub); - ZVAL_NULL(&__$null); - ZVAL_UNDEF(&cached); - ZVAL_UNDEF(&contentType); - ZVAL_UNDEF(&_10); - ZVAL_UNDEF(&_11); + ZVAL_UNDEF(&data_sub); + ZVAL_UNDEF(&result); + ZVAL_UNDEF(&_0$$3); ZVAL_UNDEF(&_1$$3); - ZVAL_UNDEF(&_2$$3); + ZVAL_UNDEF(&_3$$3); ZVAL_UNDEF(&_4$$3); - ZVAL_UNDEF(&_5$$4); + ZVAL_UNDEF(&_5$$3); ZVAL_UNDEF(&_6$$4); - ZVAL_UNDEF(&_8$$4); - ZVAL_UNDEF(&_7$$5); - ZVAL_UNDEF(&_9$$8); - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 6) - Z_PARAM_STR(collection) - Z_PARAM_OPTIONAL - Z_PARAM_STR_OR_NULL(name) - Z_PARAM_ZVAL_OR_NULL(filters) - Z_PARAM_ZVAL_OR_NULL(defaultValue) - Z_PARAM_BOOL(notAllowEmpty) - Z_PARAM_BOOL(noRecursive) + ZVAL_UNDEF(&_7$$6); + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_ZVAL(data) ZEND_PARSE_PARAMETERS_END(); ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); - zephir_fetch_params(1, 1, 5, &collection_param, &name_param, &filters, &defaultValue, ¬AllowEmpty_param, &noRecursive_param); - zephir_get_strval(&collection, collection_param); - if (!name_param) { - ZEPHIR_INIT_VAR(&name); - } else { - zephir_get_strval(&name, name_param); - } - if (!filters) { - filters = &filters_sub; - filters = &__$null; - } - if (!defaultValue) { - defaultValue = &defaultValue_sub; - defaultValue = &__$null; - } - if (!notAllowEmpty_param) { - notAllowEmpty = 0; - } else { - } - if (!noRecursive_param) { - noRecursive = 0; - } else { - } - zephir_memory_observe(&cached); - zephir_read_property_zval(&cached, this_ptr, &collection, PH_NOISY_CC); - if (Z_TYPE_P(&cached) == IS_NULL) { - ZEPHIR_CALL_METHOD(&contentType, this_ptr, "getcontenttype", NULL, 0); + zephir_fetch_params(1, 1, 0, &data); + if (ZEPHIR_IS_EMPTY(data)) { + ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "isjson", NULL, 0); zephir_check_call_status(); - _0$$3 = Z_TYPE_P(&contentType) == IS_STRING; - if (_0$$3) { - ZEPHIR_INIT_VAR(&_1$$3); - ZVAL_STRING(&_1$$3, "json"); - ZEPHIR_CALL_FUNCTION(&_2$$3, "stripos", NULL, 351, &contentType, &_1$$3); + ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "getcontenttype", NULL, 0); + zephir_check_call_status(); + _2$$3 = zephir_is_true(&_1$$3); + if (_2$$3) { + ZEPHIR_CALL_METHOD(&_3$$3, this_ptr, "getcontenttype", NULL, 0); zephir_check_call_status(); - _3$$3 = !ZEPHIR_IS_FALSE(&_2$$3); - if (!(_3$$3)) { - ZEPHIR_INIT_NVAR(&_1$$3); - ZVAL_STRING(&_1$$3, "multipart/form-data"); - ZEPHIR_CALL_FUNCTION(&_4$$3, "stripos", NULL, 351, &contentType, &_1$$3); - zephir_check_call_status(); - _3$$3 = !ZEPHIR_IS_FALSE_IDENTICAL(&_4$$3); - } - _0$$3 = _3$$3; + ZEPHIR_INIT_VAR(&_4$$3); + ZVAL_STRING(&_4$$3, "multipart/form-data"); + ZEPHIR_CALL_FUNCTION(&_5$$3, "stripos", NULL, 345, &_3$$3, &_4$$3); + zephir_check_call_status(); + _2$$3 = !ZEPHIR_IS_FALSE_IDENTICAL(&_5$$3); } - if (_0$$3) { - ZEPHIR_INIT_VAR(&_5$$4); - ZVAL_STRING(&_5$$4, "json"); - ZEPHIR_CALL_FUNCTION(&_6$$4, "stripos", NULL, 351, &contentType, &_5$$4); + if (zephir_is_true(&_0$$3)) { + ZVAL_BOOL(&_6$$4, 1); + ZEPHIR_CALL_METHOD(&result, this_ptr, "getjsonrawbody", NULL, 0, &_6$$4); zephir_check_call_status(); - if (!ZEPHIR_IS_FALSE(&_6$$4)) { - ZVAL_BOOL(&_7$$5, 1); - ZEPHIR_CALL_METHOD(&cached, this_ptr, "getjsonrawbody", NULL, 0, &_7$$5); - zephir_check_call_status(); - } - ZEPHIR_INIT_NVAR(&_5$$4); - ZVAL_STRING(&_5$$4, "multipart/form-data"); - ZEPHIR_CALL_FUNCTION(&_8$$4, "stripos", NULL, 351, &contentType, &_5$$4); + } else if (_2$$3) { + ZEPHIR_CALL_METHOD(&result, this_ptr, "getformdata", NULL, 352); zephir_check_call_status(); - if (!ZEPHIR_IS_FALSE_IDENTICAL(&_8$$4)) { - ZEPHIR_CALL_METHOD(&cached, this_ptr, "getformdata", NULL, 352); - zephir_check_call_status(); - } - if (Z_TYPE_P(&cached) != IS_ARRAY) { - ZEPHIR_INIT_NVAR(&cached); - array_init(&cached); - } } else { - ZEPHIR_INIT_NVAR(&cached); - array_init(&cached); - ZEPHIR_CALL_METHOD(&_9$$8, this_ptr, "getrawbody", NULL, 0); + ZEPHIR_INIT_NVAR(&result); + array_init(&result); + ZEPHIR_CALL_METHOD(&_7$$6, this_ptr, "getrawbody", NULL, 0); zephir_check_call_status(); - ZEPHIR_MAKE_REF(&cached); - ZEPHIR_CALL_FUNCTION(NULL, "parse_str", NULL, 353, &_9$$8, &cached); - ZEPHIR_UNREF(&cached); + ZEPHIR_MAKE_REF(&result); + ZEPHIR_CALL_FUNCTION(NULL, "parse_str", NULL, 353, &_7$$6, &result); + ZEPHIR_UNREF(&result); zephir_check_call_status(); } - zephir_update_property_zval_zval(this_ptr, &collection, &cached); - } - if (notAllowEmpty) { - ZVAL_BOOL(&_10, 1); } else { - ZVAL_BOOL(&_10, 0); + ZEPHIR_CPY_WRT(&result, data); } - if (noRecursive) { - ZVAL_BOOL(&_11, 1); - } else { - ZVAL_BOOL(&_11, 0); + if (Z_TYPE_P(&result) != IS_ARRAY) { + ZEPHIR_INIT_NVAR(&result); + array_init(&result); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 336, &cached, &name, filters, defaultValue, &_10, &_11); - zephir_check_call_status(); - RETURN_MM(); + RETURN_CCTOR(&result); } /** @@ -4988,7 +5379,7 @@ PHP_METHOD(Phalcon_Http_Request, getFormData) ZVAL_STRING(&_3, "/boundary=(.*)$/is"); zephir_preg_match(&_2, &_3, &_0, &matches, 0, 0 , 0 ); zephir_memory_observe(&boundary); - zephir_array_fetch_long(&boundary, &matches, 1, PH_NOISY, "phalcon/Http/Request.zep", 1771); + zephir_array_fetch_long(&boundary, &matches, 1, PH_NOISY, "phalcon/Http/Request.zep", 1884); ZEPHIR_INIT_VAR(&_4); ZVAL_STRING(&_4, "/"); ZEPHIR_CALL_FUNCTION(&_5, "preg_quote", NULL, 354, &boundary, &_4); @@ -5005,7 +5396,7 @@ PHP_METHOD(Phalcon_Http_Request, getFormData) zephir_check_call_status(); ZEPHIR_INIT_VAR(&dataset); array_init(&dataset); - zephir_is_iterable(&bodyParts, 0, "phalcon/Http/Request.zep", 1832); + zephir_is_iterable(&bodyParts, 0, "phalcon/Http/Request.zep", 1945); if (Z_TYPE_P(&bodyParts) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&bodyParts), _8) { @@ -5021,14 +5412,14 @@ PHP_METHOD(Phalcon_Http_Request, getFormData) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&headers$$3); array_init(&headers$$3); - zephir_array_fetch_long(&_12$$3, &splited$$3, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1793); + zephir_array_fetch_long(&_12$$3, &splited$$3, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1906); ZEPHIR_INIT_NVAR(&_10$$3); ZVAL_STRING(&_10$$3, "/\\R/s"); ZVAL_LONG(&_11$$3, -1); ZVAL_LONG(&_13$$3, 1); ZEPHIR_CALL_FUNCTION(&headerParts$$3, "preg_split", NULL, 70, &_10$$3, &_12$$3, &_11$$3, &_13$$3); zephir_check_call_status(); - zephir_is_iterable(&headerParts$$3, 0, "phalcon/Http/Request.zep", 1829); + zephir_is_iterable(&headerParts$$3, 0, "phalcon/Http/Request.zep", 1942); if (Z_TYPE_P(&headerParts$$3) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&headerParts$$3), _14$$3) { @@ -5044,11 +5435,11 @@ PHP_METHOD(Phalcon_Http_Request, getFormData) ZEPHIR_INIT_NVAR(&exploded$$5); zephir_fast_explode_str(&exploded$$5, SL(":"), &headerPart$$3, 2 ); ZEPHIR_INIT_NVAR(&_18$$5); - zephir_array_fetch_long(&_19$$5, &exploded$$5, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1803); + zephir_array_fetch_long(&_19$$5, &exploded$$5, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1916); zephir_fast_trim(&_18$$5, &_19$$5, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&headerName$$5); zephir_fast_strtolower(&headerName$$5, &_18$$5); - zephir_array_fetch_long(&_20$$5, &exploded$$5, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1804); + zephir_array_fetch_long(&_20$$5, &exploded$$5, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1917); ZEPHIR_INIT_NVAR(&headerValue$$5); zephir_fast_trim(&headerValue$$5, &_20$$5, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&_21$$5); @@ -5058,7 +5449,7 @@ PHP_METHOD(Phalcon_Http_Request, getFormData) if (!ZEPHIR_IS_FALSE_IDENTICAL(&_22$$5)) { ZEPHIR_INIT_NVAR(&explodedHeader$$7); zephir_fast_explode_str(&explodedHeader$$7, SL(";"), &headerValue$$5, LONG_MAX); - zephir_is_iterable(&explodedHeader$$7, 0, "phalcon/Http/Request.zep", 1824); + zephir_is_iterable(&explodedHeader$$7, 0, "phalcon/Http/Request.zep", 1937); if (Z_TYPE_P(&explodedHeader$$7) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&explodedHeader$$7), _23$$7) { @@ -5080,12 +5471,12 @@ PHP_METHOD(Phalcon_Http_Request, getFormData) ZEPHIR_INIT_NVAR(&explodedPart$$9); zephir_fast_explode_str(&explodedPart$$9, SL("="), &part$$7, 2 ); ZEPHIR_INIT_NVAR(&_29$$9); - zephir_array_fetch_long(&_30$$9, &explodedPart$$9, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1816); + zephir_array_fetch_long(&_30$$9, &explodedPart$$9, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1929); zephir_fast_trim(&_29$$9, &_30$$9, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&namePart$$9); zephir_fast_strtolower(&namePart$$9, &_29$$9); ZEPHIR_INIT_NVAR(&_31$$9); - zephir_array_fetch_long(&_32$$9, &explodedPart$$9, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1817); + zephir_array_fetch_long(&_32$$9, &explodedPart$$9, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1930); zephir_fast_trim(&_31$$9, &_32$$9, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&_33$$9); ZVAL_STRING(&_33$$9, "\""); @@ -5123,12 +5514,12 @@ PHP_METHOD(Phalcon_Http_Request, getFormData) ZEPHIR_INIT_NVAR(&explodedPart$$12); zephir_fast_explode_str(&explodedPart$$12, SL("="), &part$$7, 2 ); ZEPHIR_INIT_NVAR(&_37$$12); - zephir_array_fetch_long(&_38$$12, &explodedPart$$12, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1816); + zephir_array_fetch_long(&_38$$12, &explodedPart$$12, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1929); zephir_fast_trim(&_37$$12, &_38$$12, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&namePart$$12); zephir_fast_strtolower(&namePart$$12, &_37$$12); ZEPHIR_INIT_NVAR(&_39$$12); - zephir_array_fetch_long(&_40$$12, &explodedPart$$12, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1817); + zephir_array_fetch_long(&_40$$12, &explodedPart$$12, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1930); zephir_fast_trim(&_39$$12, &_40$$12, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&_41$$12); ZVAL_STRING(&_41$$12, "\""); @@ -5168,11 +5559,11 @@ PHP_METHOD(Phalcon_Http_Request, getFormData) ZEPHIR_INIT_NVAR(&exploded$$15); zephir_fast_explode_str(&exploded$$15, SL(":"), &headerPart$$3, 2 ); ZEPHIR_INIT_NVAR(&_44$$15); - zephir_array_fetch_long(&_45$$15, &exploded$$15, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1803); + zephir_array_fetch_long(&_45$$15, &exploded$$15, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1916); zephir_fast_trim(&_44$$15, &_45$$15, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&headerName$$15); zephir_fast_strtolower(&headerName$$15, &_44$$15); - zephir_array_fetch_long(&_46$$15, &exploded$$15, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1804); + zephir_array_fetch_long(&_46$$15, &exploded$$15, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1917); ZEPHIR_INIT_NVAR(&headerValue$$15); zephir_fast_trim(&headerValue$$15, &_46$$15, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&_47$$15); @@ -5182,7 +5573,7 @@ PHP_METHOD(Phalcon_Http_Request, getFormData) if (!ZEPHIR_IS_FALSE_IDENTICAL(&_48$$15)) { ZEPHIR_INIT_NVAR(&explodedHeader$$17); zephir_fast_explode_str(&explodedHeader$$17, SL(";"), &headerValue$$15, LONG_MAX); - zephir_is_iterable(&explodedHeader$$17, 0, "phalcon/Http/Request.zep", 1824); + zephir_is_iterable(&explodedHeader$$17, 0, "phalcon/Http/Request.zep", 1937); if (Z_TYPE_P(&explodedHeader$$17) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&explodedHeader$$17), _49$$17) { @@ -5204,12 +5595,12 @@ PHP_METHOD(Phalcon_Http_Request, getFormData) ZEPHIR_INIT_NVAR(&explodedPart$$19); zephir_fast_explode_str(&explodedPart$$19, SL("="), &part$$17, 2 ); ZEPHIR_INIT_NVAR(&_54$$19); - zephir_array_fetch_long(&_55$$19, &explodedPart$$19, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1816); + zephir_array_fetch_long(&_55$$19, &explodedPart$$19, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1929); zephir_fast_trim(&_54$$19, &_55$$19, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&namePart$$19); zephir_fast_strtolower(&namePart$$19, &_54$$19); ZEPHIR_INIT_NVAR(&_56$$19); - zephir_array_fetch_long(&_57$$19, &explodedPart$$19, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1817); + zephir_array_fetch_long(&_57$$19, &explodedPart$$19, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1930); zephir_fast_trim(&_56$$19, &_57$$19, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&_58$$19); ZVAL_STRING(&_58$$19, "\""); @@ -5247,12 +5638,12 @@ PHP_METHOD(Phalcon_Http_Request, getFormData) ZEPHIR_INIT_NVAR(&explodedPart$$22); zephir_fast_explode_str(&explodedPart$$22, SL("="), &part$$17, 2 ); ZEPHIR_INIT_NVAR(&_62$$22); - zephir_array_fetch_long(&_63$$22, &explodedPart$$22, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1816); + zephir_array_fetch_long(&_63$$22, &explodedPart$$22, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1929); zephir_fast_trim(&_62$$22, &_63$$22, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&namePart$$22); zephir_fast_strtolower(&namePart$$22, &_62$$22); ZEPHIR_INIT_NVAR(&_64$$22); - zephir_array_fetch_long(&_65$$22, &explodedPart$$22, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1817); + zephir_array_fetch_long(&_65$$22, &explodedPart$$22, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1930); zephir_fast_trim(&_64$$22, &_65$$22, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&_66$$22); ZVAL_STRING(&_66$$22, "\""); @@ -5275,10 +5666,10 @@ PHP_METHOD(Phalcon_Http_Request, getFormData) } } ZEPHIR_INIT_NVAR(&headerPart$$3); - zephir_array_fetch_long(&_67$$3, &splited$$3, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1829); - zephir_array_fetch_string(&_68$$3, &headers$$3, SL("content-disposition"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1829); + zephir_array_fetch_long(&_67$$3, &splited$$3, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1942); + zephir_array_fetch_string(&_68$$3, &headers$$3, SL("content-disposition"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1942); ZEPHIR_OBS_NVAR(&_69$$3); - zephir_array_fetch_string(&_69$$3, &_68$$3, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 1829); + zephir_array_fetch_string(&_69$$3, &_68$$3, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 1942); zephir_array_update_zval(&dataset, &_69$$3, &_67$$3, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); } else { @@ -5302,14 +5693,14 @@ PHP_METHOD(Phalcon_Http_Request, getFormData) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&headers$$25); array_init(&headers$$25); - zephir_array_fetch_long(&_72$$25, &splited$$25, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1793); + zephir_array_fetch_long(&_72$$25, &splited$$25, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1906); ZEPHIR_INIT_NVAR(&_70$$25); ZVAL_STRING(&_70$$25, "/\\R/s"); ZVAL_LONG(&_71$$25, -1); ZVAL_LONG(&_73$$25, 1); ZEPHIR_CALL_FUNCTION(&headerParts$$25, "preg_split", NULL, 70, &_70$$25, &_72$$25, &_71$$25, &_73$$25); zephir_check_call_status(); - zephir_is_iterable(&headerParts$$25, 0, "phalcon/Http/Request.zep", 1829); + zephir_is_iterable(&headerParts$$25, 0, "phalcon/Http/Request.zep", 1942); if (Z_TYPE_P(&headerParts$$25) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&headerParts$$25), _74$$25) { @@ -5325,11 +5716,11 @@ PHP_METHOD(Phalcon_Http_Request, getFormData) ZEPHIR_INIT_NVAR(&exploded$$27); zephir_fast_explode_str(&exploded$$27, SL(":"), &headerPart$$25, 2 ); ZEPHIR_INIT_NVAR(&_78$$27); - zephir_array_fetch_long(&_79$$27, &exploded$$27, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1803); + zephir_array_fetch_long(&_79$$27, &exploded$$27, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1916); zephir_fast_trim(&_78$$27, &_79$$27, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&headerName$$27); zephir_fast_strtolower(&headerName$$27, &_78$$27); - zephir_array_fetch_long(&_80$$27, &exploded$$27, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1804); + zephir_array_fetch_long(&_80$$27, &exploded$$27, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1917); ZEPHIR_INIT_NVAR(&headerValue$$27); zephir_fast_trim(&headerValue$$27, &_80$$27, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&_81$$27); @@ -5339,7 +5730,7 @@ PHP_METHOD(Phalcon_Http_Request, getFormData) if (!ZEPHIR_IS_FALSE_IDENTICAL(&_82$$27)) { ZEPHIR_INIT_NVAR(&explodedHeader$$29); zephir_fast_explode_str(&explodedHeader$$29, SL(";"), &headerValue$$27, LONG_MAX); - zephir_is_iterable(&explodedHeader$$29, 0, "phalcon/Http/Request.zep", 1824); + zephir_is_iterable(&explodedHeader$$29, 0, "phalcon/Http/Request.zep", 1937); if (Z_TYPE_P(&explodedHeader$$29) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&explodedHeader$$29), _83$$29) { @@ -5361,12 +5752,12 @@ PHP_METHOD(Phalcon_Http_Request, getFormData) ZEPHIR_INIT_NVAR(&explodedPart$$31); zephir_fast_explode_str(&explodedPart$$31, SL("="), &part$$29, 2 ); ZEPHIR_INIT_NVAR(&_88$$31); - zephir_array_fetch_long(&_89$$31, &explodedPart$$31, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1816); + zephir_array_fetch_long(&_89$$31, &explodedPart$$31, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1929); zephir_fast_trim(&_88$$31, &_89$$31, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&namePart$$31); zephir_fast_strtolower(&namePart$$31, &_88$$31); ZEPHIR_INIT_NVAR(&_90$$31); - zephir_array_fetch_long(&_91$$31, &explodedPart$$31, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1817); + zephir_array_fetch_long(&_91$$31, &explodedPart$$31, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1930); zephir_fast_trim(&_90$$31, &_91$$31, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&_92$$31); ZVAL_STRING(&_92$$31, "\""); @@ -5404,12 +5795,12 @@ PHP_METHOD(Phalcon_Http_Request, getFormData) ZEPHIR_INIT_NVAR(&explodedPart$$34); zephir_fast_explode_str(&explodedPart$$34, SL("="), &part$$29, 2 ); ZEPHIR_INIT_NVAR(&_96$$34); - zephir_array_fetch_long(&_97$$34, &explodedPart$$34, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1816); + zephir_array_fetch_long(&_97$$34, &explodedPart$$34, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1929); zephir_fast_trim(&_96$$34, &_97$$34, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&namePart$$34); zephir_fast_strtolower(&namePart$$34, &_96$$34); ZEPHIR_INIT_NVAR(&_98$$34); - zephir_array_fetch_long(&_99$$34, &explodedPart$$34, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1817); + zephir_array_fetch_long(&_99$$34, &explodedPart$$34, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1930); zephir_fast_trim(&_98$$34, &_99$$34, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&_100$$34); ZVAL_STRING(&_100$$34, "\""); @@ -5449,11 +5840,11 @@ PHP_METHOD(Phalcon_Http_Request, getFormData) ZEPHIR_INIT_NVAR(&exploded$$37); zephir_fast_explode_str(&exploded$$37, SL(":"), &headerPart$$25, 2 ); ZEPHIR_INIT_NVAR(&_103$$37); - zephir_array_fetch_long(&_104$$37, &exploded$$37, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1803); + zephir_array_fetch_long(&_104$$37, &exploded$$37, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1916); zephir_fast_trim(&_103$$37, &_104$$37, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&headerName$$37); zephir_fast_strtolower(&headerName$$37, &_103$$37); - zephir_array_fetch_long(&_105$$37, &exploded$$37, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1804); + zephir_array_fetch_long(&_105$$37, &exploded$$37, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1917); ZEPHIR_INIT_NVAR(&headerValue$$37); zephir_fast_trim(&headerValue$$37, &_105$$37, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&_106$$37); @@ -5463,7 +5854,7 @@ PHP_METHOD(Phalcon_Http_Request, getFormData) if (!ZEPHIR_IS_FALSE_IDENTICAL(&_107$$37)) { ZEPHIR_INIT_NVAR(&explodedHeader$$39); zephir_fast_explode_str(&explodedHeader$$39, SL(";"), &headerValue$$37, LONG_MAX); - zephir_is_iterable(&explodedHeader$$39, 0, "phalcon/Http/Request.zep", 1824); + zephir_is_iterable(&explodedHeader$$39, 0, "phalcon/Http/Request.zep", 1937); if (Z_TYPE_P(&explodedHeader$$39) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&explodedHeader$$39), _108$$39) { @@ -5485,12 +5876,12 @@ PHP_METHOD(Phalcon_Http_Request, getFormData) ZEPHIR_INIT_NVAR(&explodedPart$$41); zephir_fast_explode_str(&explodedPart$$41, SL("="), &part$$39, 2 ); ZEPHIR_INIT_NVAR(&_113$$41); - zephir_array_fetch_long(&_114$$41, &explodedPart$$41, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1816); + zephir_array_fetch_long(&_114$$41, &explodedPart$$41, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1929); zephir_fast_trim(&_113$$41, &_114$$41, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&namePart$$41); zephir_fast_strtolower(&namePart$$41, &_113$$41); ZEPHIR_INIT_NVAR(&_115$$41); - zephir_array_fetch_long(&_116$$41, &explodedPart$$41, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1817); + zephir_array_fetch_long(&_116$$41, &explodedPart$$41, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1930); zephir_fast_trim(&_115$$41, &_116$$41, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&_117$$41); ZVAL_STRING(&_117$$41, "\""); @@ -5528,12 +5919,12 @@ PHP_METHOD(Phalcon_Http_Request, getFormData) ZEPHIR_INIT_NVAR(&explodedPart$$44); zephir_fast_explode_str(&explodedPart$$44, SL("="), &part$$39, 2 ); ZEPHIR_INIT_NVAR(&_121$$44); - zephir_array_fetch_long(&_122$$44, &explodedPart$$44, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1816); + zephir_array_fetch_long(&_122$$44, &explodedPart$$44, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1929); zephir_fast_trim(&_121$$44, &_122$$44, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&namePart$$44); zephir_fast_strtolower(&namePart$$44, &_121$$44); ZEPHIR_INIT_NVAR(&_123$$44); - zephir_array_fetch_long(&_124$$44, &explodedPart$$44, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1817); + zephir_array_fetch_long(&_124$$44, &explodedPart$$44, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1930); zephir_fast_trim(&_123$$44, &_124$$44, NULL , ZEPHIR_TRIM_BOTH); ZEPHIR_INIT_NVAR(&_125$$44); ZVAL_STRING(&_125$$44, "\""); @@ -5556,10 +5947,10 @@ PHP_METHOD(Phalcon_Http_Request, getFormData) } } ZEPHIR_INIT_NVAR(&headerPart$$25); - zephir_array_fetch_long(&_126$$25, &splited$$25, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1829); - zephir_array_fetch_string(&_127$$25, &headers$$25, SL("content-disposition"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1829); + zephir_array_fetch_long(&_126$$25, &splited$$25, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1942); + zephir_array_fetch_string(&_127$$25, &headers$$25, SL("content-disposition"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1942); ZEPHIR_OBS_NVAR(&_128$$25); - zephir_array_fetch_string(&_128$$25, &_127$$25, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 1829); + zephir_array_fetch_string(&_128$$25, &_127$$25, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 1942); zephir_array_update_zval(&dataset, &_128$$25, &_126$$25, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &bodyParts, "next", NULL, 0); zephir_check_call_status(); @@ -5571,10 +5962,12 @@ PHP_METHOD(Phalcon_Http_Request, getFormData) zend_object *zephir_init_properties_Phalcon_Http_Request(zend_class_entry *class_type) { - zval _0, _1$$3; + zval _0, _2, _1$$3, _3$$4; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_2); ZVAL_UNDEF(&_1$$3); + ZVAL_UNDEF(&_3$$4); ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); @@ -5583,11 +5976,17 @@ zend_object *zephir_init_properties_Phalcon_Http_Request(zend_class_entry *class { zval local_this_ptr, *this_ptr = &local_this_ptr; ZEPHIR_CREATE_OBJECT(this_ptr, class_type); - zephir_read_property_ex(&_0, this_ptr, ZEND_STRL("queryFilters"), PH_NOISY_CC | PH_READONLY); + zephir_read_property_ex(&_0, this_ptr, ZEND_STRL("trustedProxies"), PH_NOISY_CC | PH_READONLY); if (Z_TYPE_P(&_0) == IS_NULL) { ZEPHIR_INIT_VAR(&_1$$3); array_init(&_1$$3); - zephir_update_property_zval_ex(this_ptr, ZEND_STRL("queryFilters"), &_1$$3); + zephir_update_property_zval_ex(this_ptr, ZEND_STRL("trustedProxies"), &_1$$3); + } + zephir_read_property_ex(&_2, this_ptr, ZEND_STRL("queryFilters"), PH_NOISY_CC | PH_READONLY); + if (Z_TYPE_P(&_2) == IS_NULL) { + ZEPHIR_INIT_VAR(&_3$$4); + array_init(&_3$$4); + zephir_update_property_zval_ex(this_ptr, ZEND_STRL("queryFilters"), &_3$$4); } ZEPHIR_MM_RESTORE(); return Z_OBJ_P(this_ptr); diff --git a/ext/phalcon/http/request.zep.h b/ext/phalcon/http/request.zep.h index 880095e6bdb..d0d0c6cb0f7 100644 --- a/ext/phalcon/http/request.zep.h +++ b/ext/phalcon/http/request.zep.h @@ -48,6 +48,7 @@ PHP_METHOD(Phalcon_Http_Request, hasPut); PHP_METHOD(Phalcon_Http_Request, hasQuery); PHP_METHOD(Phalcon_Http_Request, hasServer); PHP_METHOD(Phalcon_Http_Request, isAjax); +PHP_METHOD(Phalcon_Http_Request, isJson); PHP_METHOD(Phalcon_Http_Request, isConnect); PHP_METHOD(Phalcon_Http_Request, isDelete); PHP_METHOD(Phalcon_Http_Request, isGet); @@ -67,6 +68,8 @@ PHP_METHOD(Phalcon_Http_Request, numFiles); PHP_METHOD(Phalcon_Http_Request, setHttpMethodParameterOverride); PHP_METHOD(Phalcon_Http_Request, setParameterFilters); PHP_METHOD(Phalcon_Http_Request, setStrictHostCheck); +PHP_METHOD(Phalcon_Http_Request, setTrustedProxies); +PHP_METHOD(Phalcon_Http_Request, isIpAddressInCIDR); PHP_METHOD(Phalcon_Http_Request, getBestQuality); PHP_METHOD(Phalcon_Http_Request, getHelper); PHP_METHOD(Phalcon_Http_Request, hasFileHelper); @@ -76,7 +79,7 @@ PHP_METHOD(Phalcon_Http_Request, smoothFiles); PHP_METHOD(Phalcon_Http_Request, getFilterService); PHP_METHOD(Phalcon_Http_Request, getServerArray); PHP_METHOD(Phalcon_Http_Request, getFilteredData); -PHP_METHOD(Phalcon_Http_Request, getPatchPut); +PHP_METHOD(Phalcon_Http_Request, getPostData); PHP_METHOD(Phalcon_Http_Request, getFormData); zend_object *zephir_init_properties_Phalcon_Http_Request(zend_class_entry *class_type); @@ -270,6 +273,9 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_request_isajax, 0, 0, _IS_BOOL, 0) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_request_isjson, 0, 0, _IS_BOOL, 0) +ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_request_isconnect, 0, 0, _IS_BOOL, 0) ZEND_END_ARG_INFO() @@ -336,6 +342,15 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_request_setstricthos ZEND_ARG_TYPE_INFO(0, flag, _IS_BOOL, 0) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_http_request_settrustedproxies, 0, 1, Phalcon\\Http\\RequestInterface, 0) + ZEND_ARG_ARRAY_INFO(0, trustedProxies, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_request_isipaddressincidr, 0, 2, _IS_BOOL, 0) + ZEND_ARG_TYPE_INFO(0, ip, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, cidr, IS_STRING, 0) +ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_request_getbestquality, 0, 2, IS_STRING, 0) ZEND_ARG_ARRAY_INFO(0, qualityParts, 0) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) @@ -387,13 +402,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_request_getfiltereddata, 0, 0, 2) ZEND_ARG_TYPE_INFO(0, noRecursive, _IS_BOOL, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_http_request_getpatchput, 0, 0, 1) - ZEND_ARG_TYPE_INFO(0, collection, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 1) - ZEND_ARG_INFO(0, filters) - ZEND_ARG_INFO(0, defaultValue) - ZEND_ARG_TYPE_INFO(0, notAllowEmpty, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, noRecursive, _IS_BOOL, 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_request_getpostdata, 0, 1, IS_ARRAY, 0) + ZEND_ARG_INFO(0, data) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_http_request_getformdata, 0, 0, IS_ARRAY, 0) @@ -419,13 +429,13 @@ ZEPHIR_INIT_FUNCS(phalcon_http_request_method_entry) { PHP_ME(Phalcon_Http_Request, getFilteredPatch, arginfo_phalcon_http_request_getfilteredpatch, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, getFilteredPost, arginfo_phalcon_http_request_getfilteredpost, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, getFilteredPut, arginfo_phalcon_http_request_getfilteredput, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Request, getHeader, arginfo_phalcon_http_request_getheader, ZEND_ACC_FINAL|ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Http_Request, getHeader, arginfo_phalcon_http_request_getheader, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, getHeaders, arginfo_phalcon_http_request_getheaders, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, getHttpHost, arginfo_phalcon_http_request_gethttphost, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, getHTTPReferer, arginfo_phalcon_http_request_gethttpreferer, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, getJsonRawBody, arginfo_phalcon_http_request_getjsonrawbody, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, getLanguages, arginfo_phalcon_http_request_getlanguages, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Request, getMethod, arginfo_phalcon_http_request_getmethod, ZEND_ACC_FINAL|ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Http_Request, getMethod, arginfo_phalcon_http_request_getmethod, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, getPatch, arginfo_phalcon_http_request_getpatch, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, getPort, arginfo_phalcon_http_request_getport, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, getPost, arginfo_phalcon_http_request_getpost, ZEND_ACC_PUBLIC) @@ -437,7 +447,7 @@ ZEPHIR_INIT_FUNCS(phalcon_http_request_method_entry) { PHP_ME(Phalcon_Http_Request, getServerAddress, arginfo_phalcon_http_request_getserveraddress, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, getServerName, arginfo_phalcon_http_request_getservername, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, getUploadedFiles, arginfo_phalcon_http_request_getuploadedfiles, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Request, getURI, arginfo_phalcon_http_request_geturi, ZEND_ACC_FINAL|ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Http_Request, getURI, arginfo_phalcon_http_request_geturi, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, getUserAgent, arginfo_phalcon_http_request_getuseragent, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, has, arginfo_phalcon_http_request_has, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, hasFiles, arginfo_phalcon_http_request_hasfiles, ZEND_ACC_PUBLIC) @@ -448,6 +458,7 @@ ZEPHIR_INIT_FUNCS(phalcon_http_request_method_entry) { PHP_ME(Phalcon_Http_Request, hasQuery, arginfo_phalcon_http_request_hasquery, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, hasServer, arginfo_phalcon_http_request_hasserver, ZEND_ACC_FINAL|ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, isAjax, arginfo_phalcon_http_request_isajax, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Http_Request, isJson, arginfo_phalcon_http_request_isjson, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, isConnect, arginfo_phalcon_http_request_isconnect, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, isDelete, arginfo_phalcon_http_request_isdelete, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, isGet, arginfo_phalcon_http_request_isget, ZEND_ACC_PUBLIC) @@ -467,16 +478,18 @@ ZEPHIR_INIT_FUNCS(phalcon_http_request_method_entry) { PHP_ME(Phalcon_Http_Request, setHttpMethodParameterOverride, arginfo_phalcon_http_request_sethttpmethodparameteroverride, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, setParameterFilters, arginfo_phalcon_http_request_setparameterfilters, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Http_Request, setStrictHostCheck, arginfo_phalcon_http_request_setstricthostcheck, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Request, getBestQuality, arginfo_phalcon_http_request_getbestquality, ZEND_ACC_FINAL|ZEND_ACC_PROTECTED) - PHP_ME(Phalcon_Http_Request, getHelper, arginfo_phalcon_http_request_gethelper, ZEND_ACC_FINAL|ZEND_ACC_PROTECTED) - PHP_ME(Phalcon_Http_Request, hasFileHelper, arginfo_phalcon_http_request_hasfilehelper, ZEND_ACC_FINAL|ZEND_ACC_PROTECTED) - PHP_ME(Phalcon_Http_Request, getQualityHeader, arginfo_phalcon_http_request_getqualityheader, ZEND_ACC_FINAL|ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Http_Request, setTrustedProxies, arginfo_phalcon_http_request_settrustedproxies, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Http_Request, isIpAddressInCIDR, arginfo_phalcon_http_request_isipaddressincidr, ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Http_Request, getBestQuality, arginfo_phalcon_http_request_getbestquality, ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Http_Request, getHelper, arginfo_phalcon_http_request_gethelper, ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Http_Request, hasFileHelper, arginfo_phalcon_http_request_hasfilehelper, ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Http_Request, getQualityHeader, arginfo_phalcon_http_request_getqualityheader, ZEND_ACC_PROTECTED) PHP_ME(Phalcon_Http_Request, resolveAuthorizationHeaders, arginfo_phalcon_http_request_resolveauthorizationheaders, ZEND_ACC_PROTECTED) - PHP_ME(Phalcon_Http_Request, smoothFiles, arginfo_phalcon_http_request_smoothfiles, ZEND_ACC_FINAL|ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Http_Request, smoothFiles, arginfo_phalcon_http_request_smoothfiles, ZEND_ACC_PROTECTED) PHP_ME(Phalcon_Http_Request, getFilterService, arginfo_phalcon_http_request_getfilterservice, ZEND_ACC_PRIVATE) PHP_ME(Phalcon_Http_Request, getServerArray, arginfo_phalcon_http_request_getserverarray, ZEND_ACC_PRIVATE) PHP_ME(Phalcon_Http_Request, getFilteredData, arginfo_phalcon_http_request_getfiltereddata, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Http_Request, getPatchPut, arginfo_phalcon_http_request_getpatchput, ZEND_ACC_PRIVATE) + PHP_ME(Phalcon_Http_Request, getPostData, arginfo_phalcon_http_request_getpostdata, ZEND_ACC_PRIVATE) PHP_ME(Phalcon_Http_Request, getFormData, arginfo_phalcon_http_request_getformdata, ZEND_ACC_PRIVATE) PHP_FE_END }; diff --git a/ext/phalcon/http/request/file.zep.c b/ext/phalcon/http/request/file.zep.c index 2a32d1fa146..6f42b652690 100644 --- a/ext/phalcon/http/request/file.zep.c +++ b/ext/phalcon/http/request/file.zep.c @@ -135,7 +135,7 @@ PHP_METHOD(Phalcon_Http_Request_File, __construct) zephir_update_property_zval(this_ptr, ZEND_STRL("name"), &name); ZEPHIR_INIT_VAR(&_0$$3); ZVAL_STRING(&_0$$3, "PATHINFO_EXTENSION"); - ZEPHIR_CALL_FUNCTION(&_1$$3, "defined", NULL, 118, &_0$$3); + ZEPHIR_CALL_FUNCTION(&_1$$3, "defined", NULL, 119, &_0$$3); zephir_check_call_status(); if (zephir_is_true(&_1$$3)) { ZVAL_LONG(&_2$$4, 4); @@ -223,15 +223,15 @@ PHP_METHOD(Phalcon_Http_Request_File, getRealType) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); ZVAL_LONG(&_0, 16); - ZEPHIR_CALL_FUNCTION(&finfo, "finfo_open", NULL, 308, &_0); + ZEPHIR_CALL_FUNCTION(&finfo, "finfo_open", NULL, 310, &_0); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&finfo)) { RETURN_MM_STRING(""); } zephir_read_property(&_0, this_ptr, ZEND_STRL("tmp"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 309, &finfo, &_0); + ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 311, &finfo, &_0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 310, &finfo); + ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 312, &finfo); zephir_check_call_status(); RETURN_CCTOR(&mime); } diff --git a/ext/phalcon/http/response.zep.c b/ext/phalcon/http/response.zep.c index 41de04c0b91..7a4bab95ffa 100644 --- a/ext/phalcon/http/response.zep.c +++ b/ext/phalcon/http/response.zep.c @@ -85,7 +85,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Http_Response) /** * @var Encode */ - zend_declare_property_null(phalcon_http_response_ce, SL("encode"), ZEND_ACC_PRIVATE); + zend_declare_property_null(phalcon_http_response_ce, SL("encode"), ZEND_ACC_PROTECTED); phalcon_http_response_ce->create_object = zephir_init_properties_Phalcon_Http_Response; zend_class_implements(phalcon_http_response_ce, 1, phalcon_http_responseinterface_ce); @@ -1071,7 +1071,7 @@ PHP_METHOD(Phalcon_Http_Response, setFileToSend) if ((zephir_function_exists_ex(ZEND_STRL("mb_detect_encoding")) == SUCCESS)) { ZEPHIR_CALL_FUNCTION(&_0$$6, "mb_detect_order", NULL, 361); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&basePathEncoding, "mb_detect_encoding", NULL, 324, &basePath, &_0$$6, &__$true); + ZEPHIR_CALL_FUNCTION(&basePathEncoding, "mb_detect_encoding", NULL, 326, &basePath, &_0$$6, &__$true); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_1$$5); @@ -1087,7 +1087,7 @@ PHP_METHOD(Phalcon_Http_Response, setFileToSend) ZEPHIR_CALL_METHOD(NULL, this_ptr, "setrawheader", NULL, 0, &_1$$5); zephir_check_call_status(); if (!ZEPHIR_IS_STRING(&basePathEncoding, "ASCII")) { - ZEPHIR_CALL_FUNCTION(&_2$$7, "rawurlencode", NULL, 328, &basePath); + ZEPHIR_CALL_FUNCTION(&_2$$7, "rawurlencode", NULL, 330, &basePath); zephir_check_call_status(); ZEPHIR_CPY_WRT(&basePath, &_2$$7); ZEPHIR_INIT_VAR(&_3$$7); @@ -1099,7 +1099,7 @@ PHP_METHOD(Phalcon_Http_Response, setFileToSend) } else { ZEPHIR_INIT_VAR(&_5$$8); ZVAL_STRING(&_5$$8, "\15\17\\\""); - ZEPHIR_CALL_FUNCTION(&_6$$8, "addcslashes", NULL, 215, &basePath, &_5$$8); + ZEPHIR_CALL_FUNCTION(&_6$$8, "addcslashes", NULL, 216, &basePath, &_5$$8); zephir_check_call_status(); ZEPHIR_CPY_WRT(&basePath, &_6$$8); ZEPHIR_INIT_VAR(&_7$$8); diff --git a/ext/phalcon/image/adapter/gd.zep.c b/ext/phalcon/image/adapter/gd.zep.c index 94bf1744c26..522a4543f69 100644 --- a/ext/phalcon/image/adapter/gd.zep.c +++ b/ext/phalcon/image/adapter/gd.zep.c @@ -125,7 +125,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("realpath"), &_2$$3); zephir_read_property(&_3$$3, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&imageInfo, "getimagesize", NULL, 311, &_3$$3); + ZEPHIR_CALL_FUNCTION(&imageInfo, "getimagesize", NULL, 313, &_3$$3); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&imageInfo)) { zephir_array_fetch_long(&_4$$4, &imageInfo, 0, PH_NOISY | PH_READONLY, "phalcon/Image/Adapter/Gd.zep", 42); @@ -305,7 +305,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, getVersion) ZVAL_NULL(&version); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "GD_VERSION"); - ZEPHIR_CALL_FUNCTION(&_1, "defined", NULL, 118, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "defined", NULL, 119, &_0); zephir_check_call_status(); if (zephir_is_true(&_1)) { ZEPHIR_INIT_NVAR(&version); @@ -371,7 +371,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processBackground) zephir_fetch_params(1, 4, 0, &red_param, &green_param, &blue_param, &opacity_param); ZEPHIR_INIT_VAR(&_0); ZVAL_DOUBLE(&_1, ((zephir_safe_div_long_long((opacity * 127), 100)) - (double) (127))); - ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 284, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 285, &_1); zephir_check_call_status(); zephir_round(&_0, &_2, NULL, NULL); opacity = zephir_get_intval(&_0); @@ -871,7 +871,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processReflection) zephir_fetch_params(1, 3, 0, &height_param, &opacity_param, &fadeIn_param); ZEPHIR_INIT_VAR(&_0); ZVAL_DOUBLE(&_1, ((zephir_safe_div_long_long((opacity * 127), 100)) - (double) (127))); - ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 284, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 285, &_1); zephir_check_call_status(); zephir_round(&_0, &_2, NULL, NULL); opacity = zephir_get_intval(&_0); @@ -1337,7 +1337,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processSharpen) zephir_fetch_params(1, 1, 0, &amount_param); ZEPHIR_INIT_VAR(&_0); ZVAL_LONG(&_1, (-18 + ((amount * 0.08)))); - ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 284, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 285, &_1); zephir_check_call_status(); ZVAL_LONG(&_1, 2); zephir_round(&_0, &_2, &_1, NULL); @@ -1496,7 +1496,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processText) ZVAL_LONG(offsetY, _1); ZEPHIR_INIT_VAR(&_2); ZVAL_DOUBLE(&_3, ((zephir_safe_div_long_long((opacity * 127), 100)) - (double) (127))); - ZEPHIR_CALL_FUNCTION(&_4, "abs", NULL, 284, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "abs", NULL, 285, &_3); zephir_check_call_status(); zephir_round(&_2, &_4, NULL, NULL); opacity = zephir_get_intval(&_2); @@ -1525,11 +1525,11 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processText) topRightY = zephir_get_intval(&_10$$5); } ZVAL_LONG(&_5$$3, (topRightX - bottomLeftX)); - ZEPHIR_CALL_FUNCTION(&_11$$3, "abs", NULL, 284, &_5$$3); + ZEPHIR_CALL_FUNCTION(&_11$$3, "abs", NULL, 285, &_5$$3); zephir_check_call_status(); ZVAL_LONG(&width, (zephir_get_numberval(&_11$$3) + 10)); ZVAL_LONG(&_5$$3, (topRightY - bottomLeftY)); - ZEPHIR_CALL_FUNCTION(&_12$$3, "abs", NULL, 284, &_5$$3); + ZEPHIR_CALL_FUNCTION(&_12$$3, "abs", NULL, 285, &_5$$3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&height); ZVAL_LONG(&height, (zephir_get_numberval(&_12$$3) + 10)); @@ -1654,7 +1654,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processWatermark) if (opacity < 100) { ZEPHIR_INIT_VAR(&_3$$3); ZVAL_DOUBLE(&_4$$3, ((zephir_safe_div_long_long((opacity * 127), 100)) - (double) (127))); - ZEPHIR_CALL_FUNCTION(&_5$$3, "abs", NULL, 284, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "abs", NULL, 285, &_4$$3); zephir_check_call_status(); zephir_round(&_3$$3, &_5$$3, NULL, NULL); opacity = zephir_get_intval(&_3$$3); @@ -1721,7 +1721,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, check) ZVAL_STRING(&_0, "2.0.1"); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, ">="); - ZEPHIR_CALL_FUNCTION(&_2, "version_compare", NULL, 134, &version, &_0, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "version_compare", NULL, 135, &version, &_0, &_1); zephir_check_call_status(); if (!ZEPHIR_IS_TRUE_IDENTICAL(&_2)) { ZEPHIR_INIT_VAR(&_3$$3); diff --git a/ext/phalcon/image/adapter/imagick.zep.c b/ext/phalcon/image/adapter/imagick.zep.c index 60327b211d9..1a2ab96e709 100644 --- a/ext/phalcon/image/adapter/imagick.zep.c +++ b/ext/phalcon/image/adapter/imagick.zep.c @@ -173,7 +173,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, __construct) zephir_read_property(&_12$$5, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_13$$5); ZVAL_STRING(&_13$$5, "Imagick::ALPHACHANNEL_SET"); - ZEPHIR_CALL_FUNCTION(&_14$$5, "constant", NULL, 119, &_13$$5); + ZEPHIR_CALL_FUNCTION(&_14$$5, "constant", NULL, 120, &_13$$5); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_12$$5, "setimagealphachannel", NULL, 0, &_14$$5); zephir_check_call_status(); @@ -480,7 +480,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processBackground) ZVAL_LONG(&_1, red); ZVAL_LONG(&_2, green); ZVAL_LONG(&_3, blue); - ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 117, &_0, &_1, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 118, &_0, &_1, &_2, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&pixel1); object_init_ex(&pixel1, zephir_get_internal_ce(SL("imagickpixel"))); @@ -513,7 +513,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processBackground) if (!ZEPHIR_IS_TRUE_IDENTICAL(&_7$$3)) { ZEPHIR_INIT_NVAR(&_9$$4); ZVAL_STRING(&_9$$4, "Imagick::ALPHACHANNEL_SET"); - ZEPHIR_CALL_FUNCTION(&_10$$4, "constant", &_11, 119, &_9$$4); + ZEPHIR_CALL_FUNCTION(&_10$$4, "constant", &_11, 120, &_9$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &background, "setimagealphachannel", &_12, 0, &_10$$4); zephir_check_call_status(); @@ -522,11 +522,11 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processBackground) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_14$$3); ZVAL_STRING(&_14$$3, "Imagick::EVALUATE_MULTIPLY"); - ZEPHIR_CALL_FUNCTION(&_15$$3, "constant", &_11, 119, &_14$$3); + ZEPHIR_CALL_FUNCTION(&_15$$3, "constant", &_11, 120, &_14$$3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_14$$3); ZVAL_STRING(&_14$$3, "Imagick::CHANNEL_ALPHA"); - ZEPHIR_CALL_FUNCTION(&_16$$3, "constant", &_11, 119, &_14$$3); + ZEPHIR_CALL_FUNCTION(&_16$$3, "constant", &_11, 120, &_14$$3); zephir_check_call_status(); ZVAL_LONG(&_17$$3, opacity); ZEPHIR_CALL_METHOD(NULL, &background, "evaluateimage", &_18, 0, &_15$$3, &_17$$3, &_16$$3); @@ -539,7 +539,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processBackground) zephir_read_property(&_21$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_14$$3); ZVAL_STRING(&_14$$3, "Imagick::COMPOSITE_DISSOLVE"); - ZEPHIR_CALL_FUNCTION(&_22$$3, "constant", &_11, 119, &_14$$3); + ZEPHIR_CALL_FUNCTION(&_22$$3, "constant", &_11, 120, &_14$$3); zephir_check_call_status(); ZVAL_LONG(&_23$$3, 0); ZVAL_LONG(&_24$$3, 0); @@ -803,7 +803,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processMask) zephir_read_property(&_4$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_5$$3); ZVAL_STRING(&_5$$3, "Imagick::COMPOSITE_DSTIN"); - ZEPHIR_CALL_FUNCTION(&_6$$3, "constant", &_7, 119, &_5$$3); + ZEPHIR_CALL_FUNCTION(&_6$$3, "constant", &_7, 120, &_5$$3); zephir_check_call_status(); ZVAL_LONG(&_8$$3, 0); ZVAL_LONG(&_9$$3, 0); @@ -1043,7 +1043,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) } ZEPHIR_INIT_NVAR(&_18$$7); ZVAL_STRING(&_18$$7, "Imagick::COMPOSITE_DSTOUT"); - ZEPHIR_CALL_FUNCTION(&_19$$7, "constant", &_20, 119, &_18$$7); + ZEPHIR_CALL_FUNCTION(&_19$$7, "constant", &_20, 120, &_18$$7); zephir_check_call_status(); ZVAL_LONG(&_21$$7, 0); ZVAL_LONG(&_22$$7, 0); @@ -1055,11 +1055,11 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) } ZEPHIR_INIT_NVAR(&_18$$7); ZVAL_STRING(&_18$$7, "Imagick::EVALUATE_MULTIPLY"); - ZEPHIR_CALL_FUNCTION(&_24$$7, "constant", &_20, 119, &_18$$7); + ZEPHIR_CALL_FUNCTION(&_24$$7, "constant", &_20, 120, &_18$$7); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_18$$7); ZVAL_STRING(&_18$$7, "Imagick::CHANNEL_ALPHA"); - ZEPHIR_CALL_FUNCTION(&_25$$7, "constant", &_20, 119, &_18$$7); + ZEPHIR_CALL_FUNCTION(&_25$$7, "constant", &_20, 120, &_18$$7); zephir_check_call_status(); ZVAL_LONG(&_21$$7, opacity); ZEPHIR_CALL_METHOD(NULL, &reflection, "evaluateimage", &_26, 0, &_24$$7, &_21$$7, &_25$$7); @@ -1099,7 +1099,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_34$$10); ZVAL_STRING(&_34$$10, "Imagick::ALPHACHANNEL_SET"); - ZEPHIR_CALL_FUNCTION(&_35$$10, "constant", &_20, 119, &_34$$10); + ZEPHIR_CALL_FUNCTION(&_35$$10, "constant", &_20, 120, &_34$$10); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &image, "setimagealphachannel", &_36, 0, &_35$$10); zephir_check_call_status(); @@ -1116,7 +1116,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) zephir_read_property(&_42$$10, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_34$$10); ZVAL_STRING(&_34$$10, "Imagick::COMPOSITE_SRC"); - ZEPHIR_CALL_FUNCTION(&_43$$10, "constant", &_20, 119, &_34$$10); + ZEPHIR_CALL_FUNCTION(&_43$$10, "constant", &_20, 120, &_34$$10); zephir_check_call_status(); ZVAL_LONG(&_44$$10, 0); ZVAL_LONG(&_45$$10, 0); @@ -1145,7 +1145,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) } ZEPHIR_INIT_NVAR(&_48$$13); ZVAL_STRING(&_48$$13, "Imagick::COMPOSITE_OVER"); - ZEPHIR_CALL_FUNCTION(&_49$$13, "constant", &_20, 119, &_48$$13); + ZEPHIR_CALL_FUNCTION(&_49$$13, "constant", &_20, 120, &_48$$13); zephir_check_call_status(); zephir_read_property(&_50$$13, this_ptr, ZEND_STRL("height"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_51$$13, 0); @@ -1250,7 +1250,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processRender) if (ZEPHIR_IS_STRING(&extension, "jpg") || ZEPHIR_IS_STRING(&extension, "jpeg")) { ZEPHIR_INIT_VAR(&_5$$4); ZVAL_STRING(&_5$$4, "Imagick::COMPRESSION_JPEG"); - ZEPHIR_CALL_FUNCTION(&_6$$4, "constant", NULL, 119, &_5$$4); + ZEPHIR_CALL_FUNCTION(&_6$$4, "constant", NULL, 120, &_5$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &image, "setimagecompression", NULL, 0, &_6$$4); zephir_check_call_status(); @@ -1474,7 +1474,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processSave) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_9$$3); ZVAL_STRING(&_9$$3, "w"); - ZEPHIR_CALL_FUNCTION(&fp, "fopen", NULL, 140, &file, &_9$$3); + ZEPHIR_CALL_FUNCTION(&fp, "fopen", NULL, 141, &file, &_9$$3); zephir_check_call_status(); zephir_read_property(&_10$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(NULL, &_10$$3, "writeimagesfile", NULL, 0, &fp); @@ -1486,7 +1486,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processSave) zephir_read_property(&_11$$4, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_12$$4); ZVAL_STRING(&_12$$4, "Imagick::COMPRESSION_JPEG"); - ZEPHIR_CALL_FUNCTION(&_13$$4, "constant", NULL, 119, &_12$$4); + ZEPHIR_CALL_FUNCTION(&_13$$4, "constant", NULL, 120, &_12$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_11$$4, "setimagecompression", NULL, 0, &_13$$4); zephir_check_call_status(); @@ -1654,7 +1654,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) ZVAL_LONG(&_1, red); ZVAL_LONG(&_2, green); ZVAL_LONG(&_3, blue); - ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 117, &_0, &_1, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 118, &_0, &_1, &_2, &_3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_0); object_init_ex(&_0, zephir_get_internal_ce(SL("imagickpixel"))); @@ -1686,7 +1686,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) ZVAL_LONG(offsetY, 0); ZEPHIR_INIT_VAR(&_6$$7); ZVAL_STRING(&_6$$7, "Imagick::GRAVITY_CENTER"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 119, &_6$$7); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 120, &_6$$7); zephir_check_call_status(); } else if (Z_TYPE_P(offsetY) == IS_LONG) { ZEPHIR_INIT_VAR(&y); @@ -1698,7 +1698,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (_7$$8) { ZEPHIR_INIT_VAR(&_8$$8); ZVAL_STRING(&_8$$8, "Imagick::GRAVITY_SOUTHEAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 119, &_8$$8); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 120, &_8$$8); zephir_check_call_status(); } else { } @@ -1709,7 +1709,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (_9$$8) { ZEPHIR_INIT_NVAR(&_8$$8); ZVAL_STRING(&_8$$8, "Imagick::GRAVITY_NORTHEAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 119, &_8$$8); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 120, &_8$$8); zephir_check_call_status(); } else { } @@ -1720,7 +1720,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (_10$$8) { ZEPHIR_INIT_NVAR(&_8$$8); ZVAL_STRING(&_8$$8, "Imagick::GRAVITY_SOUTH"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 119, &_8$$8); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 120, &_8$$8); zephir_check_call_status(); } else { } @@ -1731,7 +1731,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (_11$$8) { ZEPHIR_INIT_NVAR(&_8$$8); ZVAL_STRING(&_8$$8, "Imagick::GRAVITY_NORTH"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 119, &_8$$8); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 120, &_8$$8); zephir_check_call_status(); } else { } @@ -1755,7 +1755,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (_12$$11) { ZEPHIR_INIT_VAR(&_13$$11); ZVAL_STRING(&_13$$11, "Imagick::GRAVITY_SOUTHEAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 119, &_13$$11); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 120, &_13$$11); zephir_check_call_status(); } else { } @@ -1766,7 +1766,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (_14$$11) { ZEPHIR_INIT_NVAR(&_13$$11); ZVAL_STRING(&_13$$11, "Imagick::GRAVITY_SOUTH"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 119, &_13$$11); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 120, &_13$$11); zephir_check_call_status(); } else { } @@ -1777,7 +1777,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (_15$$11) { ZEPHIR_INIT_NVAR(&_13$$11); ZVAL_STRING(&_13$$11, "Imagick::GRAVITY_EAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 119, &_13$$11); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 120, &_13$$11); zephir_check_call_status(); } else { } @@ -1788,7 +1788,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (_16$$11) { ZEPHIR_INIT_NVAR(&_13$$11); ZVAL_STRING(&_13$$11, "Imagick::GRAVITY_WEST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 119, &_13$$11); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 120, &_13$$11); zephir_check_call_status(); } else { } @@ -1817,14 +1817,14 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) if (ZEPHIR_LT_LONG(&y, 0)) { ZEPHIR_INIT_VAR(&_17$$12); ZVAL_STRING(&_17$$12, "Imagick::GRAVITY_SOUTHEAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 119, &_17$$12); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 120, &_17$$12); zephir_check_call_status(); } else { } if (ZEPHIR_GE_LONG(&y, 0)) { ZEPHIR_INIT_NVAR(&_17$$12); ZVAL_STRING(&_17$$12, "Imagick::GRAVITY_NORTHEAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 119, &_17$$12); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 120, &_17$$12); zephir_check_call_status(); } else { } @@ -1913,11 +1913,11 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processWatermark) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "Imagick::EVALUATE_MULTIPLY"); - ZEPHIR_CALL_FUNCTION(&_2, "constant", NULL, 119, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "constant", NULL, 120, &_1); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "Imagick::CHANNEL_ALPHA"); - ZEPHIR_CALL_FUNCTION(&_3, "constant", NULL, 119, &_1); + ZEPHIR_CALL_FUNCTION(&_3, "constant", NULL, 120, &_1); zephir_check_call_status(); ZVAL_LONG(&_4, opacity); ZEPHIR_CALL_METHOD(NULL, &watermark, "evaluateimage", NULL, 0, &_2, &_4, &_3); @@ -1933,7 +1933,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processWatermark) zephir_read_property(&_6$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_7$$3); ZVAL_STRING(&_7$$3, "Imagick::COMPOSITE_OVER"); - ZEPHIR_CALL_FUNCTION(&_8$$3, "constant", NULL, 119, &_7$$3); + ZEPHIR_CALL_FUNCTION(&_8$$3, "constant", NULL, 120, &_7$$3); zephir_check_call_status(); ZVAL_LONG(&_9$$3, offsetX); ZVAL_LONG(&_10$$3, offsetY); @@ -1986,12 +1986,12 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, check) } ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "Imagick::IMAGICK_EXTNUM"); - ZEPHIR_CALL_FUNCTION(&_2, "defined", NULL, 118, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "defined", NULL, 119, &_1); zephir_check_call_status(); if (zephir_is_true(&_2)) { ZEPHIR_INIT_VAR(&_3$$4); ZVAL_STRING(&_3$$4, "Imagick::IMAGICK_EXTNUM"); - ZEPHIR_CALL_FUNCTION(&_4$$4, "constant", NULL, 119, &_3$$4); + ZEPHIR_CALL_FUNCTION(&_4$$4, "constant", NULL, 120, &_3$$4); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("version"), &_4$$4); } diff --git a/ext/phalcon/logger/adapter/stream.zep.c b/ext/phalcon/logger/adapter/stream.zep.c index 2412134214a..d2c487e5aae 100644 --- a/ext/phalcon/logger/adapter/stream.zep.c +++ b/ext/phalcon/logger/adapter/stream.zep.c @@ -200,7 +200,7 @@ PHP_METHOD(Phalcon_Logger_Adapter_Stream, process) return; } ZVAL_LONG(&_6, 2); - ZEPHIR_CALL_FUNCTION(NULL, "flock", NULL, 132, &handler, &_6); + ZEPHIR_CALL_FUNCTION(NULL, "flock", NULL, 133, &handler, &_6); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_7, this_ptr, "getformatteditem", NULL, 0, item); zephir_check_call_status(); @@ -234,7 +234,7 @@ PHP_METHOD(Phalcon_Logger_Adapter_Stream, phpFopen) zephir_fetch_params(1, 2, 0, &filename_param, &mode_param); zephir_get_strval(&filename, filename_param); zephir_get_strval(&mode, mode_param); - ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 140, &filename, &mode); + ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 141, &filename, &mode); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/logger/adapter/syslog.zep.c b/ext/phalcon/logger/adapter/syslog.zep.c index cbc775ed495..1b17122d4e7 100644 --- a/ext/phalcon/logger/adapter/syslog.zep.c +++ b/ext/phalcon/logger/adapter/syslog.zep.c @@ -194,7 +194,7 @@ PHP_METHOD(Phalcon_Logger_Adapter_Syslog, process) zephir_cast_to_string(&_6$$3, &_5$$3); ZEPHIR_INIT_VAR(&_7$$3); ZVAL_STRING(&_7$$3, "Cannot open syslog for name [%s] and facility [%s]"); - ZEPHIR_CALL_FUNCTION(&_8$$3, "sprintf", NULL, 117, &_7$$3, &_4$$3, &_6$$3); + ZEPHIR_CALL_FUNCTION(&_8$$3, "sprintf", NULL, 118, &_7$$3, &_4$$3, &_6$$3); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 412, &_8$$3); zephir_check_call_status(); diff --git a/ext/phalcon/mvc/model.zep.c b/ext/phalcon/mvc/model.zep.c index 4d3b29d08df..78b384abc82 100644 --- a/ext/phalcon/mvc/model.zep.c +++ b/ext/phalcon/mvc/model.zep.c @@ -735,7 +735,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __set) RETVAL_ZVAL(value, 1, 0); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_15, "property_exists", NULL, 290, this_ptr, &property); + ZEPHIR_CALL_FUNCTION(&_15, "property_exists", NULL, 292, this_ptr, &property); zephir_check_call_status(); if (zephir_is_true(&_15)) { ZEPHIR_CALL_METHOD(&manager, this_ptr, "getmodelsmanager", NULL, 0); diff --git a/ext/phalcon/mvc/model/binder.zep.c b/ext/phalcon/mvc/model/binder.zep.c index 52c3aae14d0..1b28d32c9fb 100644 --- a/ext/phalcon/mvc/model/binder.zep.c +++ b/ext/phalcon/mvc/model/binder.zep.c @@ -400,12 +400,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection) zephir_check_call_status(); } else { object_init_ex(&reflection, zephir_get_internal_ce(SL("reflectionfunction"))); - ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 151, handler); + ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 152, handler); zephir_check_call_status(); } zephir_read_property(&_0, this_ptr, ZEND_STRL("cache"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&cache, &_0); - ZEPHIR_CALL_METHOD(&methodParams, &reflection, "getparameters", NULL, 152); + ZEPHIR_CALL_METHOD(&methodParams, &reflection, "getparameters", NULL, 153); zephir_check_call_status(); ZEPHIR_INIT_VAR(¶msKeys); zephir_array_keys(¶msKeys, ¶ms); diff --git a/ext/phalcon/mvc/model/criteria.zep.c b/ext/phalcon/mvc/model/criteria.zep.c index 5f39e2cf337..bc28d165ff9 100644 --- a/ext/phalcon/mvc/model/criteria.zep.c +++ b/ext/phalcon/mvc/model/criteria.zep.c @@ -1398,11 +1398,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, limit) } else { } ZVAL_LONG(&_0, limit); - ZEPHIR_CALL_FUNCTION(&_1, "abs", NULL, 284, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "abs", NULL, 285, &_0); zephir_check_call_status(); limit = zephir_get_numberval(&_1); ZVAL_LONG(&_0, offset); - ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 284, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 285, &_0); zephir_check_call_status(); offset = zephir_get_numberval(&_2); if (UNEXPECTED(limit == 0)) { diff --git a/ext/phalcon/mvc/model/manager.zep.c b/ext/phalcon/mvc/model/manager.zep.c index 82e2e17e0d4..54fa4379646 100644 --- a/ext/phalcon/mvc/model/manager.zep.c +++ b/ext/phalcon/mvc/model/manager.zep.c @@ -3266,10 +3266,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, isVisibleModelProperty) array_init(&publicProperties); ZEPHIR_INIT_VAR(&classReflection); object_init_ex(&classReflection, zephir_get_internal_ce(SL("reflectionclass"))); - ZEPHIR_CALL_METHOD(NULL, &classReflection, "__construct", NULL, 154, &className); + ZEPHIR_CALL_METHOD(NULL, &classReflection, "__construct", NULL, 155, &className); zephir_check_call_status(); ZVAL_LONG(&_1$$3, 1); - ZEPHIR_CALL_METHOD(&reflectionProperties, &classReflection, "getproperties", NULL, 165, &_1$$3); + ZEPHIR_CALL_METHOD(&reflectionProperties, &classReflection, "getproperties", NULL, 166, &_1$$3); zephir_check_call_status(); zephir_is_iterable(&reflectionProperties, 0, "phalcon/Mvc/Model/Manager.zep", 1915); if (Z_TYPE_P(&reflectionProperties) == IS_ARRAY) { diff --git a/ext/phalcon/mvc/model/query.zep.c b/ext/phalcon/mvc/model/query.zep.c index 4713c08b58c..292b4889abb 100644 --- a/ext/phalcon/mvc/model/query.zep.c +++ b/ext/phalcon/mvc/model/query.zep.c @@ -622,8 +622,16 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleResult) } /** - * Returns the SQL to be generated by the internal PHQL (only works in - * SELECT statements) + * Returns an associative array with the SQL to be generated by the internal PHQL, + * and arrays with bound parameters and their types (only works in SELECT statements). + * + *```php + * [ + * 'sql' => 'SELECT * FROM parts WHERE robot = :robot', + * 'bind' => ['robot' => 123], + * 'bindTypes => ['robot' => 1] // 1 corresponds to int + * ] + *``` */ PHP_METHOD(Phalcon_Mvc_Model_Query, getSql) { @@ -651,7 +659,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSql) zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "This type of statement generates multiple SQL statements", "phalcon/Mvc/Model/Query.zep", 521); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "This type of statement generates multiple SQL statements", "phalcon/Mvc/Model/Query.zep", 529); return; } @@ -733,7 +741,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, parse) zephir_read_static_property_ce(&_1$$5, phalcon_mvc_model_query_ce, SL("internalPhqlCache"), PH_NOISY_CC | PH_READONLY); if (zephir_array_isset_fetch(&irPhql, &_1$$5, &uniqueId, 0)) { if (Z_TYPE_P(&irPhql) == IS_ARRAY) { - zephir_array_fetch_string(&_2$$7, &ast, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 586); + zephir_array_fetch_string(&_2$$7, &ast, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 594); zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &_2$$7); RETURN_CCTOR(&irPhql); } @@ -770,7 +778,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, parse) ZEPHIR_CONCAT_SVSV(&_4$$13, "Unknown statement ", &type, ", when preparing: ", &phql); ZEPHIR_CALL_METHOD(NULL, &_3$$13, "__construct", NULL, 33, &_4$$13); zephir_check_call_status(); - zephir_throw_exception_debug(&_3$$13, "phalcon/Mvc/Model/Query.zep", 620); + zephir_throw_exception_debug(&_3$$13, "phalcon/Mvc/Model/Query.zep", 628); ZEPHIR_MM_RESTORE(); return; } while(0); @@ -778,7 +786,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, parse) } } if (UNEXPECTED(Z_TYPE_P(&irPhql) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted AST", "phalcon/Mvc/Model/Query.zep", 626); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted AST", "phalcon/Mvc/Model/Query.zep", 634); return; } if (Z_TYPE_P(&uniqueId) == IS_LONG) { @@ -895,7 +903,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, setDI) ZEPHIR_CALL_METHOD(&manager, container, "getshared", NULL, 0, &_0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&manager) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Injected service 'modelsManager' is invalid", "phalcon/Mvc/Model/Query.zep", 690); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Injected service 'modelsManager' is invalid", "phalcon/Mvc/Model/Query.zep", 698); return; } ZEPHIR_INIT_NVAR(&_0); @@ -903,7 +911,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, setDI) ZEPHIR_CALL_METHOD(&metaData, container, "getshared", NULL, 0, &_0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&metaData) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Injected service 'modelsMetaData' is invalid", "phalcon/Mvc/Model/Query.zep", 696); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Injected service 'modelsMetaData' is invalid", "phalcon/Mvc/Model/Query.zep", 704); return; } zephir_update_property_zval(this_ptr, ZEND_STRL("manager"), &manager); @@ -1066,13 +1074,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeDelete) zephir_get_arrval(&bindParams, bindParams_param); zephir_get_arrval(&bindTypes, bindTypes_param); zephir_memory_observe(&models); - zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 764); + zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 772); if (UNEXPECTED(zephir_array_isset_long(&models, 1))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Delete from several models at the same time is still not supported", "phalcon/Mvc/Model/Query.zep", 769); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Delete from several models at the same time is still not supported", "phalcon/Mvc/Model/Query.zep", 777); return; } zephir_memory_observe(&modelName); - zephir_array_fetch_long(&modelName, &models, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 772); + zephir_array_fetch_long(&modelName, &models, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 780); zephir_memory_observe(&model); zephir_read_property(&_0, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset_fetch(&model, &_0, &modelName, 0))) { @@ -1131,7 +1139,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeDelete) ZEPHIR_CPY_WRT(&exception, &_9$$6); ZEPHIR_CALL_METHOD(NULL, &connection, "rollback", &_10, 0); zephir_check_call_status(); - zephir_throw_exception_debug(&exception, "phalcon/Mvc/Model/Query.zep", 831); + zephir_throw_exception_debug(&exception, "phalcon/Mvc/Model/Query.zep", 839); ZEPHIR_MM_RESTORE(); return; } @@ -1218,7 +1226,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) zephir_get_arrval(&bindParams, bindParams_param); zephir_get_arrval(&bindTypes, bindTypes_param); zephir_memory_observe(&modelName); - zephir_array_fetch_string(&modelName, &intermediate, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 859); + zephir_array_fetch_string(&modelName, &intermediate, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 867); zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&manager, &_0); zephir_memory_observe(&model); @@ -1247,16 +1255,16 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) } } zephir_memory_observe(&values); - zephir_array_fetch_string(&values, &intermediate, SL("values"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 894); + zephir_array_fetch_string(&values, &intermediate, SL("values"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 902); if (UNEXPECTED(zephir_fast_count_int(&fields) != zephir_fast_count_int(&values))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The column count does not match the values count", "phalcon/Mvc/Model/Query.zep", 903); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The column count does not match the values count", "phalcon/Mvc/Model/Query.zep", 911); return; } ZEPHIR_CALL_METHOD(&dialect, &connection, "getdialect", NULL, 0); zephir_check_call_status(); ZEPHIR_INIT_VAR(&insertValues); array_init(&insertValues); - zephir_is_iterable(&values, 0, "phalcon/Mvc/Model/Query.zep", 974); + zephir_is_iterable(&values, 0, "phalcon/Mvc/Model/Query.zep", 982); if (Z_TYPE_P(&values) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&values), _4, _5, _2) { @@ -1269,8 +1277,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_INIT_NVAR(&value); ZVAL_COPY(&value, _2); ZEPHIR_OBS_NVAR(&exprValue); - zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 913); - zephir_array_fetch_string(&_6$$8, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 915); + zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 921); + zephir_array_fetch_string(&_6$$8, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 923); do { if (ZEPHIR_IS_LONG(&_6$$8, 260) || ZEPHIR_IS_LONG(&_6$$8, 258) || ZEPHIR_IS_LONG(&_6$$8, 259)) { ZEPHIR_CALL_METHOD(&insertValue, &dialect, "getsqlexpression", &_7, 0, &exprValue); @@ -1299,7 +1307,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_CONCAT_SVS(&_13$$12, "Bound parameter '", &wildcard, "' cannot be replaced because it isn't in the placeholders list"); ZEPHIR_CALL_METHOD(NULL, &_12$$12, "__construct", &_14, 33, &_13$$12); zephir_check_call_status(); - zephir_throw_exception_debug(&_12$$12, "phalcon/Mvc/Model/Query.zep", 939); + zephir_throw_exception_debug(&_12$$12, "phalcon/Mvc/Model/Query.zep", 947); ZEPHIR_MM_RESTORE(); return; } @@ -1315,7 +1323,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) } while(0); ZEPHIR_OBS_NVAR(&fieldName); - zephir_array_fetch(&fieldName, &fields, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 952); + zephir_array_fetch(&fieldName, &fields, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 960); _18$$8 = automaticFields; if (_18$$8) { _18$$8 = Z_TYPE_P(&columnMap) == IS_ARRAY; @@ -1329,7 +1337,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_CONCAT_SVS(&_20$$15, "Column '", &fieldName, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_19$$15, "__construct", &_14, 33, &_20$$15); zephir_check_call_status(); - zephir_throw_exception_debug(&_19$$15, "phalcon/Mvc/Model/Query.zep", 962); + zephir_throw_exception_debug(&_19$$15, "phalcon/Mvc/Model/Query.zep", 970); ZEPHIR_MM_RESTORE(); return; } @@ -1352,8 +1360,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_CALL_METHOD(&value, &values, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&exprValue); - zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 913); - zephir_array_fetch_string(&_21$$17, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 915); + zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 921); + zephir_array_fetch_string(&_21$$17, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 923); do { if (ZEPHIR_IS_LONG(&_21$$17, 260) || ZEPHIR_IS_LONG(&_21$$17, 258) || ZEPHIR_IS_LONG(&_21$$17, 259)) { ZEPHIR_CALL_METHOD(&insertValue, &dialect, "getsqlexpression", &_22, 0, &exprValue); @@ -1382,7 +1390,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_CONCAT_SVS(&_28$$21, "Bound parameter '", &wildcard, "' cannot be replaced because it isn't in the placeholders list"); ZEPHIR_CALL_METHOD(NULL, &_27$$21, "__construct", &_14, 33, &_28$$21); zephir_check_call_status(); - zephir_throw_exception_debug(&_27$$21, "phalcon/Mvc/Model/Query.zep", 939); + zephir_throw_exception_debug(&_27$$21, "phalcon/Mvc/Model/Query.zep", 947); ZEPHIR_MM_RESTORE(); return; } @@ -1398,7 +1406,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) } while(0); ZEPHIR_OBS_NVAR(&fieldName); - zephir_array_fetch(&fieldName, &fields, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 952); + zephir_array_fetch(&fieldName, &fields, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 960); _31$$17 = automaticFields; if (_31$$17) { _31$$17 = Z_TYPE_P(&columnMap) == IS_ARRAY; @@ -1412,7 +1420,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_CONCAT_SVS(&_33$$24, "Column '", &fieldName, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_32$$24, "__construct", &_14, 33, &_33$$24); zephir_check_call_status(); - zephir_throw_exception_debug(&_32$$24, "phalcon/Mvc/Model/Query.zep", 962); + zephir_throw_exception_debug(&_32$$24, "phalcon/Mvc/Model/Query.zep", 970); ZEPHIR_MM_RESTORE(); return; } @@ -1582,8 +1590,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_VAR(&connectionTypes); array_init(&connectionTypes); zephir_memory_observe(&models); - zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1011); - zephir_is_iterable(&models, 0, "phalcon/Mvc/Model/Query.zep", 1039); + zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1019); + zephir_is_iterable(&models, 0, "phalcon/Mvc/Model/Query.zep", 1047); if (Z_TYPE_P(&models) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&models), _1) { @@ -1603,7 +1611,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_check_call_status(); zephir_array_update_zval(&connectionTypes, &_6$$5, &__$true, PH_COPY | PH_SEPARATE); if (UNEXPECTED(zephir_fast_count_int(&connectionTypes) == 2)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cannot use models of different database systems in the same query", "phalcon/Mvc/Model/Query.zep", 1034); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cannot use models of different database systems in the same query", "phalcon/Mvc/Model/Query.zep", 1042); return; } } @@ -1633,7 +1641,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_check_call_status(); zephir_array_update_zval(&connectionTypes, &_9$$9, &__$true, PH_COPY | PH_SEPARATE); if (UNEXPECTED(zephir_fast_count_int(&connectionTypes) == 2)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cannot use models of different database systems in the same query", "phalcon/Mvc/Model/Query.zep", 1034); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cannot use models of different database systems in the same query", "phalcon/Mvc/Model/Query.zep", 1042); return; } } @@ -1643,23 +1651,23 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) } ZEPHIR_INIT_NVAR(&modelName); zephir_memory_observe(&columns); - zephir_array_fetch_string(&columns, &intermediate, SL("columns"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1039); + zephir_array_fetch_string(&columns, &intermediate, SL("columns"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1047); haveObjects = 0; haveScalars = 0; isComplex = 0; numberObjects = 0; ZEPHIR_CPY_WRT(&columns1, &columns); - zephir_is_iterable(&columns, 0, "phalcon/Mvc/Model/Query.zep", 1067); + zephir_is_iterable(&columns, 0, "phalcon/Mvc/Model/Query.zep", 1075); if (Z_TYPE_P(&columns) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&columns), _10) { ZEPHIR_INIT_NVAR(&column); ZVAL_COPY(&column, _10); if (UNEXPECTED(Z_TYPE_P(&column) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid column definition", "phalcon/Mvc/Model/Query.zep", 1051); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid column definition", "phalcon/Mvc/Model/Query.zep", 1059); return; } - zephir_array_fetch_string(&_12$$11, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1054); + zephir_array_fetch_string(&_12$$11, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1062); if (ZEPHIR_IS_STRING(&_12$$11, "scalar")) { if (!(zephir_array_isset_string(&column, SL("balias")))) { isComplex = 1; @@ -1682,10 +1690,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_CALL_METHOD(&column, &columns, "current", NULL, 0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&column) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid column definition", "phalcon/Mvc/Model/Query.zep", 1051); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid column definition", "phalcon/Mvc/Model/Query.zep", 1059); return; } - zephir_array_fetch_string(&_13$$16, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1054); + zephir_array_fetch_string(&_13$$16, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1062); if (ZEPHIR_IS_STRING(&_13$$16, "scalar")) { if (!(zephir_array_isset_string(&column, SL("balias")))) { isComplex = 1; @@ -1723,7 +1731,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) array_init(&simpleColumnMap); zephir_read_property(&_0, this_ptr, ZEND_STRL("metaData"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&metaData, &_0); - zephir_is_iterable(&columns, 0, "phalcon/Mvc/Model/Query.zep", 1173); + zephir_is_iterable(&columns, 0, "phalcon/Mvc/Model/Query.zep", 1181); if (Z_TYPE_P(&columns) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&columns), _16, _17, _14) { @@ -1736,11 +1744,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&column); ZVAL_COPY(&column, _14); ZEPHIR_OBS_NVAR(&sqlColumn); - zephir_array_fetch_string(&sqlColumn, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1090); - zephir_array_fetch_string(&_18$$28, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1093); + zephir_array_fetch_string(&sqlColumn, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1098); + zephir_array_fetch_string(&_18$$28, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1101); if (ZEPHIR_IS_STRING(&_18$$28, "object")) { ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &column, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1094); + zephir_array_fetch_string(&modelName, &column, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1102); ZEPHIR_OBS_NVAR(&instance); zephir_read_property(&_19$$29, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset_fetch(&instance, &_19$$29, &modelName, 0))) { @@ -1758,7 +1766,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&columnMap); ZVAL_NULL(&columnMap); } - zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1130); + zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1138); if (Z_TYPE_P(&attributes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _23$$31) { @@ -1771,7 +1779,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&_26$$34); ZEPHIR_CONCAT_SVSV(&_26$$34, "_", &sqlColumn, "_", &attribute); zephir_array_fast_append(&_25$$34, &_26$$34); - zephir_array_append(&selectColumns, &_25$$34, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1123); + zephir_array_append(&selectColumns, &_25$$34, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1131); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &attributes, "rewind", NULL, 0); @@ -1791,7 +1799,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&_28$$35); ZEPHIR_CONCAT_SVSV(&_28$$35, "_", &sqlColumn, "_", &attribute); zephir_array_fast_append(&_27$$35, &_28$$35); - zephir_array_append(&selectColumns, &_27$$35, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1123); + zephir_array_append(&selectColumns, &_27$$35, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1131); ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0); zephir_check_call_status(); } @@ -1809,7 +1817,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_array_update_multi(&columns1, &_31$$36, SL("zs"), 3, &aliasCopy, SL("keepSnapshots")); } } else { - zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1147); + zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1155); if (Z_TYPE_P(&attributes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _32$$37) { @@ -1819,7 +1827,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_34$$38, 2, 0); zephir_array_fast_append(&_34$$38, &attribute); zephir_array_fast_append(&_34$$38, &sqlColumn); - zephir_array_append(&selectColumns, &_34$$38, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1145); + zephir_array_append(&selectColumns, &_34$$38, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1153); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &attributes, "rewind", NULL, 0); @@ -1836,7 +1844,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_35$$39, 2, 0); zephir_array_fast_append(&_35$$39, &attribute); zephir_array_fast_append(&_35$$39, &sqlColumn); - zephir_array_append(&selectColumns, &_35$$39, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1145); + zephir_array_append(&selectColumns, &_35$$39, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1153); ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0); zephir_check_call_status(); } @@ -1859,7 +1867,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_array_fast_append(&_37$$42, &aliasCopy); ZEPHIR_CPY_WRT(&columnAlias, &_37$$42); } - zephir_array_append(&selectColumns, &columnAlias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1158); + zephir_array_append(&selectColumns, &columnAlias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1166); } _38$$28 = !isComplex; if (_38$$28) { @@ -1888,11 +1896,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_CALL_METHOD(&column, &columns, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&sqlColumn); - zephir_array_fetch_string(&sqlColumn, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1090); - zephir_array_fetch_string(&_39$$46, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1093); + zephir_array_fetch_string(&sqlColumn, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1098); + zephir_array_fetch_string(&_39$$46, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1101); if (ZEPHIR_IS_STRING(&_39$$46, "object")) { ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &column, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1094); + zephir_array_fetch_string(&modelName, &column, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1102); ZEPHIR_OBS_NVAR(&instance); zephir_read_property(&_40$$47, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset_fetch(&instance, &_40$$47, &modelName, 0))) { @@ -1910,7 +1918,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&columnMap); ZVAL_NULL(&columnMap); } - zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1130); + zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1138); if (Z_TYPE_P(&attributes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _44$$49) { @@ -1923,7 +1931,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&_47$$52); ZEPHIR_CONCAT_SVSV(&_47$$52, "_", &sqlColumn, "_", &attribute); zephir_array_fast_append(&_46$$52, &_47$$52); - zephir_array_append(&selectColumns, &_46$$52, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1123); + zephir_array_append(&selectColumns, &_46$$52, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1131); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &attributes, "rewind", NULL, 0); @@ -1943,7 +1951,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&_49$$53); ZEPHIR_CONCAT_SVSV(&_49$$53, "_", &sqlColumn, "_", &attribute); zephir_array_fast_append(&_48$$53, &_49$$53); - zephir_array_append(&selectColumns, &_48$$53, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1123); + zephir_array_append(&selectColumns, &_48$$53, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1131); ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0); zephir_check_call_status(); } @@ -1961,7 +1969,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_array_update_multi(&columns1, &_52$$54, SL("zs"), 3, &aliasCopy, SL("keepSnapshots")); } } else { - zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1147); + zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1155); if (Z_TYPE_P(&attributes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _53$$55) { @@ -1971,7 +1979,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_55$$56, 2, 0); zephir_array_fast_append(&_55$$56, &attribute); zephir_array_fast_append(&_55$$56, &sqlColumn); - zephir_array_append(&selectColumns, &_55$$56, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1145); + zephir_array_append(&selectColumns, &_55$$56, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1153); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &attributes, "rewind", NULL, 0); @@ -1988,7 +1996,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_56$$57, 2, 0); zephir_array_fast_append(&_56$$57, &attribute); zephir_array_fast_append(&_56$$57, &sqlColumn); - zephir_array_append(&selectColumns, &_56$$57, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1145); + zephir_array_append(&selectColumns, &_56$$57, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1153); ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0); zephir_check_call_status(); } @@ -2010,7 +2018,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_array_fast_append(&_58$$60, &aliasCopy); ZEPHIR_CPY_WRT(&columnAlias, &_58$$60); } - zephir_array_append(&selectColumns, &columnAlias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1158); + zephir_array_append(&selectColumns, &columnAlias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1166); } _59$$46 = !isComplex; if (_59$$46) { @@ -2035,7 +2043,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_VAR(&bindCounts); array_init(&bindCounts); zephir_array_update_string(&intermediate, SL("columns"), &selectColumns, PH_COPY | PH_SEPARATE); - zephir_is_iterable(&bindParams, 0, "phalcon/Mvc/Model/Query.zep", 1194); + zephir_is_iterable(&bindParams, 0, "phalcon/Mvc/Model/Query.zep", 1202); if (Z_TYPE_P(&bindParams) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&bindParams), _62, _63, _60) { @@ -2093,7 +2101,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&wildcard); ZEPHIR_INIT_VAR(&processedTypes); array_init(&processedTypes); - zephir_is_iterable(&bindTypes, 0, "phalcon/Mvc/Model/Query.zep", 1207); + zephir_is_iterable(&bindTypes, 0, "phalcon/Mvc/Model/Query.zep", 1215); if (Z_TYPE_P(&bindTypes) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&bindTypes), _68, _69, _66) { @@ -2198,7 +2206,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) array_init(&simpleColumnMap); ZEPHIR_CALL_METHOD(&_74$$90, &metaData, "getattributes", NULL, 0, &resultObject); zephir_check_call_status(); - zephir_is_iterable(&_74$$90, 0, "phalcon/Mvc/Model/Query.zep", 1295); + zephir_is_iterable(&_74$$90, 0, "phalcon/Mvc/Model/Query.zep", 1303); if (Z_TYPE_P(&_74$$90) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_74$$90), _75$$90) { @@ -2208,7 +2216,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_77$$91, 2, 0); zephir_array_fast_append(&_77$$91, &attribute); ZEPHIR_OBS_NVAR(&_78$$91); - zephir_array_fetch(&_78$$91, &typesColumnMap, &attribute, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1293); + zephir_array_fetch(&_78$$91, &typesColumnMap, &attribute, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1301); zephir_array_fast_append(&_77$$91, &_78$$91); zephir_array_update_zval(&simpleColumnMap, &attribute, &_77$$91, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -2227,7 +2235,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_79$$92, 2, 0); zephir_array_fast_append(&_79$$92, &attribute); ZEPHIR_OBS_NVAR(&_80$$92); - zephir_array_fetch(&_80$$92, &typesColumnMap, &attribute, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1293); + zephir_array_fetch(&_80$$92, &typesColumnMap, &attribute, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1301); zephir_array_fast_append(&_79$$92, &_80$$92); zephir_array_update_zval(&simpleColumnMap, &attribute, &_79$$92, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &_74$$90, "next", NULL, 0); @@ -2237,7 +2245,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&attribute); } else { array_init(&simpleColumnMap); - zephir_is_iterable(&columnMap, 0, "phalcon/Mvc/Model/Query.zep", 1304); + zephir_is_iterable(&columnMap, 0, "phalcon/Mvc/Model/Query.zep", 1312); if (Z_TYPE_P(&columnMap) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&columnMap), _83$$93, _84$$93, _81$$93) { @@ -2253,7 +2261,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_85$$94, 2, 0); zephir_array_fast_append(&_85$$94, &attribute); ZEPHIR_OBS_NVAR(&_86$$94); - zephir_array_fetch(&_86$$94, &typesColumnMap, &column, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1302); + zephir_array_fetch(&_86$$94, &typesColumnMap, &column, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1310); zephir_array_fast_append(&_85$$94, &_86$$94); zephir_array_update_zval(&simpleColumnMap, &column, &_85$$94, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -2274,7 +2282,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_87$$95, 2, 0); zephir_array_fast_append(&_87$$95, &attribute); ZEPHIR_OBS_NVAR(&_88$$95); - zephir_array_fetch(&_88$$95, &typesColumnMap, &column, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1302); + zephir_array_fetch(&_88$$95, &typesColumnMap, &column, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1310); zephir_array_fast_append(&_87$$95, &_88$$95); zephir_array_update_zval(&simpleColumnMap, &column, &_87$$95, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &columnMap, "next", NULL, 0); @@ -2304,7 +2312,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_CONCAT_SVS(&_92$$98, "Resultset class \"", &resultsetClassName, "\" not found"); ZEPHIR_CALL_METHOD(NULL, &_91$$98, "__construct", NULL, 33, &_92$$98); zephir_check_call_status(); - zephir_throw_exception_debug(&_91$$98, "phalcon/Mvc/Model/Query.zep", 1320); + zephir_throw_exception_debug(&_91$$98, "phalcon/Mvc/Model/Query.zep", 1328); ZEPHIR_MM_RESTORE(); return; } @@ -2319,7 +2327,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_CONCAT_SVS(&_96$$99, "Resultset class \"", &resultsetClassName, "\" must be an implementation of Phalcon\\Mvc\\Model\\ResultsetInterface"); ZEPHIR_CALL_METHOD(NULL, &_95$$99, "__construct", NULL, 33, &_96$$99); zephir_check_call_status(); - zephir_throw_exception_debug(&_95$$99, "phalcon/Mvc/Model/Query.zep", 1326); + zephir_throw_exception_debug(&_95$$99, "phalcon/Mvc/Model/Query.zep", 1334); ZEPHIR_MM_RESTORE(); return; } @@ -2426,13 +2434,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) zephir_get_arrval(&bindParams, bindParams_param); zephir_get_arrval(&bindTypes, bindTypes_param); zephir_memory_observe(&models); - zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1375); + zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1383); if (UNEXPECTED(zephir_array_isset_long(&models, 1))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Updating several models at the same time is still not supported", "phalcon/Mvc/Model/Query.zep", 1380); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Updating several models at the same time is still not supported", "phalcon/Mvc/Model/Query.zep", 1388); return; } zephir_memory_observe(&modelName); - zephir_array_fetch_long(&modelName, &models, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1383); + zephir_array_fetch_long(&modelName, &models, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1391); zephir_memory_observe(&model); zephir_read_property(&_0, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset_fetch(&model, &_0, &modelName, 0))) { @@ -2445,14 +2453,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) ZEPHIR_CALL_METHOD(&dialect, &connection, "getdialect", NULL, 0); zephir_check_call_status(); zephir_memory_observe(&fields); - zephir_array_fetch_string(&fields, &intermediate, SL("fields"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1402); + zephir_array_fetch_string(&fields, &intermediate, SL("fields"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1410); zephir_memory_observe(&values); - zephir_array_fetch_string(&values, &intermediate, SL("values"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1403); + zephir_array_fetch_string(&values, &intermediate, SL("values"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1411); ZEPHIR_INIT_VAR(&updateValues); array_init(&updateValues); ZEPHIR_CPY_WRT(&selectBindParams, &bindParams); ZEPHIR_CPY_WRT(&selectBindTypes, &bindTypes); - zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 1475); + zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 1483); if (Z_TYPE_P(&fields) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _4, _5, _2) { @@ -2465,17 +2473,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) ZEPHIR_INIT_NVAR(&field); ZVAL_COPY(&field, _2); ZEPHIR_OBS_NVAR(&value); - zephir_array_fetch(&value, &values, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1418); + zephir_array_fetch(&value, &values, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1426); ZEPHIR_OBS_NVAR(&exprValue); - zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1419); + zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1427); if (zephir_array_isset_string(&field, SL("balias"))) { ZEPHIR_OBS_NVAR(&fieldName); - zephir_array_fetch_string(&fieldName, &field, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1422); + zephir_array_fetch_string(&fieldName, &field, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1430); } else { ZEPHIR_OBS_NVAR(&fieldName); - zephir_array_fetch_string(&fieldName, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1424); + zephir_array_fetch_string(&fieldName, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1432); } - zephir_array_fetch_string(&_6$$5, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1427); + zephir_array_fetch_string(&_6$$5, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1435); do { if (ZEPHIR_IS_LONG(&_6$$5, 260) || ZEPHIR_IS_LONG(&_6$$5, 258) || ZEPHIR_IS_LONG(&_6$$5, 259)) { ZEPHIR_CALL_METHOD(&updateValue, &dialect, "getsqlexpression", &_7, 0, &exprValue); @@ -2504,7 +2512,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) ZEPHIR_CONCAT_SVS(&_13$$11, "Bound parameter '", &wildcard, "' cannot be replaced because it's not in the placeholders list"); ZEPHIR_CALL_METHOD(NULL, &_12$$11, "__construct", &_14, 33, &_13$$11); zephir_check_call_status(); - zephir_throw_exception_debug(&_12$$11, "phalcon/Mvc/Model/Query.zep", 1450); + zephir_throw_exception_debug(&_12$$11, "phalcon/Mvc/Model/Query.zep", 1458); ZEPHIR_MM_RESTORE(); return; } @@ -2513,7 +2521,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) break; } if (ZEPHIR_IS_LONG(&_6$$5, 277)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not supported", "phalcon/Mvc/Model/Query.zep", 1459); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not supported", "phalcon/Mvc/Model/Query.zep", 1467); return; } ZEPHIR_INIT_NVAR(&updateValue); @@ -2541,17 +2549,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) ZEPHIR_CALL_METHOD(&field, &fields, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&value); - zephir_array_fetch(&value, &values, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1418); + zephir_array_fetch(&value, &values, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1426); ZEPHIR_OBS_NVAR(&exprValue); - zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1419); + zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1427); if (zephir_array_isset_string(&field, SL("balias"))) { ZEPHIR_OBS_NVAR(&fieldName); - zephir_array_fetch_string(&fieldName, &field, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1422); + zephir_array_fetch_string(&fieldName, &field, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1430); } else { ZEPHIR_OBS_NVAR(&fieldName); - zephir_array_fetch_string(&fieldName, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1424); + zephir_array_fetch_string(&fieldName, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1432); } - zephir_array_fetch_string(&_18$$14, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1427); + zephir_array_fetch_string(&_18$$14, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1435); do { if (ZEPHIR_IS_LONG(&_18$$14, 260) || ZEPHIR_IS_LONG(&_18$$14, 258) || ZEPHIR_IS_LONG(&_18$$14, 259)) { ZEPHIR_CALL_METHOD(&updateValue, &dialect, "getsqlexpression", &_19, 0, &exprValue); @@ -2580,7 +2588,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) ZEPHIR_CONCAT_SVS(&_25$$20, "Bound parameter '", &wildcard, "' cannot be replaced because it's not in the placeholders list"); ZEPHIR_CALL_METHOD(NULL, &_24$$20, "__construct", &_14, 33, &_25$$20); zephir_check_call_status(); - zephir_throw_exception_debug(&_24$$20, "phalcon/Mvc/Model/Query.zep", 1450); + zephir_throw_exception_debug(&_24$$20, "phalcon/Mvc/Model/Query.zep", 1458); ZEPHIR_MM_RESTORE(); return; } @@ -2589,7 +2597,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) break; } if (ZEPHIR_IS_LONG(&_18$$14, 277)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not supported", "phalcon/Mvc/Model/Query.zep", 1459); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not supported", "phalcon/Mvc/Model/Query.zep", 1467); return; } ZEPHIR_INIT_NVAR(&updateValue); @@ -2661,7 +2669,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) ZEPHIR_CPY_WRT(&exception, &_35$$24); ZEPHIR_CALL_METHOD(NULL, &connection, "rollback", &_36, 0); zephir_check_call_status(); - zephir_throw_exception_debug(&exception, "phalcon/Mvc/Model/Query.zep", 1525); + zephir_throw_exception_debug(&exception, "phalcon/Mvc/Model/Query.zep", 1533); ZEPHIR_MM_RESTORE(); return; } @@ -2696,7 +2704,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getCallArgument) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &argument_param); ZEPHIR_OBS_COPY_OR_DUP(&argument, argument_param); - zephir_array_fetch_string(&_0, &argument, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1542); + zephir_array_fetch_string(&_0, &argument, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1550); if (ZEPHIR_IS_LONG(&_0, 352)) { zephir_create_array(return_value, 1, 0); add_assoc_stringl_ex(return_value, SL("type"), SL("all")); @@ -2749,8 +2757,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression) ZEPHIR_OBS_COPY_OR_DUP(&expr, expr_param); ZEPHIR_INIT_VAR(&whenClauses); array_init(&whenClauses); - zephir_array_fetch_string(&_0, &expr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1560); - zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model/Query.zep", 1575); + zephir_array_fetch_string(&_0, &expr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1568); + zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model/Query.zep", 1583); if (Z_TYPE_P(&_0) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _1) { @@ -2760,24 +2768,24 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression) ZEPHIR_INIT_NVAR(&_3$$4); zephir_create_array(&_3$$4, 3, 0); add_assoc_stringl_ex(&_3$$4, SL("type"), SL("when")); - zephir_array_fetch_string(&_5$$4, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1564); + zephir_array_fetch_string(&_5$$4, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1572); ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "getexpression", &_6, 461, &_5$$4); zephir_check_call_status(); zephir_array_update_string(&_3$$4, SL("expr"), &_4$$4, PH_COPY | PH_SEPARATE); - zephir_array_fetch_string(&_7$$4, &whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1565); + zephir_array_fetch_string(&_7$$4, &whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1573); ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "getexpression", &_6, 461, &_7$$4); zephir_check_call_status(); zephir_array_update_string(&_3$$4, SL("then"), &_4$$4, PH_COPY | PH_SEPARATE); - zephir_array_append(&whenClauses, &_3$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1566); + zephir_array_append(&whenClauses, &_3$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1574); } else { ZEPHIR_INIT_NVAR(&_8$$5); zephir_create_array(&_8$$5, 2, 0); add_assoc_stringl_ex(&_8$$5, SL("type"), SL("else")); - zephir_array_fetch_string(&_10$$5, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1570); + zephir_array_fetch_string(&_10$$5, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1578); ZEPHIR_CALL_METHOD(&_9$$5, this_ptr, "getexpression", &_6, 461, &_10$$5); zephir_check_call_status(); zephir_array_update_string(&_8$$5, SL("expr"), &_9$$5, PH_COPY | PH_SEPARATE); - zephir_array_append(&whenClauses, &_8$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1571); + zephir_array_append(&whenClauses, &_8$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1579); } } ZEND_HASH_FOREACH_END(); } else { @@ -2795,24 +2803,24 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression) ZEPHIR_INIT_NVAR(&_11$$7); zephir_create_array(&_11$$7, 3, 0); add_assoc_stringl_ex(&_11$$7, SL("type"), SL("when")); - zephir_array_fetch_string(&_13$$7, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1564); + zephir_array_fetch_string(&_13$$7, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1572); ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "getexpression", &_6, 461, &_13$$7); zephir_check_call_status(); zephir_array_update_string(&_11$$7, SL("expr"), &_12$$7, PH_COPY | PH_SEPARATE); - zephir_array_fetch_string(&_14$$7, &whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1565); + zephir_array_fetch_string(&_14$$7, &whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1573); ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "getexpression", &_6, 461, &_14$$7); zephir_check_call_status(); zephir_array_update_string(&_11$$7, SL("then"), &_12$$7, PH_COPY | PH_SEPARATE); - zephir_array_append(&whenClauses, &_11$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1566); + zephir_array_append(&whenClauses, &_11$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1574); } else { ZEPHIR_INIT_NVAR(&_15$$8); zephir_create_array(&_15$$8, 2, 0); add_assoc_stringl_ex(&_15$$8, SL("type"), SL("else")); - zephir_array_fetch_string(&_17$$8, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1570); + zephir_array_fetch_string(&_17$$8, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1578); ZEPHIR_CALL_METHOD(&_16$$8, this_ptr, "getexpression", &_6, 461, &_17$$8); zephir_check_call_status(); zephir_array_update_string(&_15$$8, SL("expr"), &_16$$8, PH_COPY | PH_SEPARATE); - zephir_array_append(&whenClauses, &_15$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1571); + zephir_array_append(&whenClauses, &_15$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1579); } ZEPHIR_CALL_METHOD(NULL, &_0, "next", NULL, 0); zephir_check_call_status(); @@ -2821,7 +2829,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression) ZEPHIR_INIT_NVAR(&whenExpr); zephir_create_array(return_value, 3, 0); add_assoc_stringl_ex(return_value, SL("type"), SL("case")); - zephir_array_fetch_string(&_19, &expr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1577); + zephir_array_fetch_string(&_19, &expr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1585); ZEPHIR_CALL_METHOD(&_18, this_ptr, "getexpression", &_6, 461, &_19); zephir_check_call_status(); zephir_array_update_string(return_value, SL("expr"), &_18, PH_COPY | PH_SEPARATE); @@ -3165,7 +3173,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) zephir_create_array(&_18$$25, 2, 0); add_assoc_stringl_ex(&_18$$25, SL("type"), SL("literal")); zephir_memory_observe(&_19$$25); - zephir_array_fetch_string(&_19$$25, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1793); + zephir_array_fetch_string(&_19$$25, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1801); zephir_array_update_string(&_18$$25, SL("value"), &_19$$25, PH_COPY | PH_SEPARATE); ZEPHIR_CPY_WRT(&exprReturn, &_18$$25); break; @@ -3188,9 +3196,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) } if (ZEPHIR_IS_LONG(&exprType, 260)) { zephir_memory_observe(&value); - zephir_array_fetch_string(&value, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1814); + zephir_array_fetch_string(&value, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1822); if (quoting) { - if (zephir_memnstr_str(&value, SL("'"), "phalcon/Mvc/Model/Query.zep", 1821)) { + if (zephir_memnstr_str(&value, SL("'"), "phalcon/Mvc/Model/Query.zep", 1829)) { ZEPHIR_INIT_VAR(&escapedValue); phalcon_orm_singlequotes(&escapedValue, &value); } else { @@ -3213,7 +3221,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) zephir_create_array(&_23$$33, 2, 0); add_assoc_stringl_ex(&_23$$33, SL("type"), SL("placeholder")); ZEPHIR_INIT_VAR(&_24$$33); - zephir_array_fetch_string(&_25$$33, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1842); + zephir_array_fetch_string(&_25$$33, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1850); ZEPHIR_INIT_VAR(&_26$$33); ZVAL_STRING(&_26$$33, "?"); ZEPHIR_INIT_VAR(&_27$$33); @@ -3227,7 +3235,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZEPHIR_INIT_VAR(&_28$$34); zephir_create_array(&_28$$34, 2, 0); add_assoc_stringl_ex(&_28$$34, SL("type"), SL("placeholder")); - zephir_array_fetch_string(&_29$$34, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1851); + zephir_array_fetch_string(&_29$$34, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1859); ZEPHIR_INIT_VAR(&_30$$34); ZEPHIR_CONCAT_SV(&_30$$34, ":", &_29$$34); zephir_array_update_string(&_28$$34, SL("value"), &_30$$34, PH_COPY | PH_SEPARATE); @@ -3236,14 +3244,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) } if (ZEPHIR_IS_LONG(&exprType, 277)) { ZEPHIR_OBS_NVAR(&value); - zephir_array_fetch_string(&value, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1856); - if (zephir_memnstr_str(&value, SL(":"), "phalcon/Mvc/Model/Query.zep", 1858)) { + zephir_array_fetch_string(&value, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1864); + if (zephir_memnstr_str(&value, SL(":"), "phalcon/Mvc/Model/Query.zep", 1866)) { ZEPHIR_INIT_VAR(&valueParts); zephir_fast_explode_str(&valueParts, SL(":"), &value, LONG_MAX); zephir_memory_observe(&name); - zephir_array_fetch_long(&name, &valueParts, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1860); + zephir_array_fetch_long(&name, &valueParts, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1868); zephir_memory_observe(&bindType); - zephir_array_fetch_long(&bindType, &valueParts, 1, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1861); + zephir_array_fetch_long(&bindType, &valueParts, 1, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1869); do { if (ZEPHIR_IS_STRING(&bindType, "str")) { ZEPHIR_INIT_VAR(&_31$$37); @@ -3333,7 +3341,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZEPHIR_CONCAT_SV(&_51$$44, "Bind value is required for array type placeholder: ", &name); ZEPHIR_CALL_METHOD(NULL, &_50$$44, "__construct", NULL, 33, &_51$$44); zephir_check_call_status(); - zephir_throw_exception_debug(&_50$$44, "phalcon/Mvc/Model/Query.zep", 1931); + zephir_throw_exception_debug(&_50$$44, "phalcon/Mvc/Model/Query.zep", 1939); ZEPHIR_MM_RESTORE(); return; } @@ -3344,7 +3352,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZEPHIR_CONCAT_SV(&_53$$45, "Bind type requires an array in placeholder: ", &name); ZEPHIR_CALL_METHOD(NULL, &_52$$45, "__construct", NULL, 33, &_53$$45); zephir_check_call_status(); - zephir_throw_exception_debug(&_52$$45, "phalcon/Mvc/Model/Query.zep", 1937); + zephir_throw_exception_debug(&_52$$45, "phalcon/Mvc/Model/Query.zep", 1945); ZEPHIR_MM_RESTORE(); return; } @@ -3355,7 +3363,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZEPHIR_CONCAT_SV(&_55$$46, "At least one value must be bound in placeholder: ", &name); ZEPHIR_CALL_METHOD(NULL, &_54$$46, "__construct", NULL, 33, &_55$$46); zephir_check_call_status(); - zephir_throw_exception_debug(&_54$$46, "phalcon/Mvc/Model/Query.zep", 1943); + zephir_throw_exception_debug(&_54$$46, "phalcon/Mvc/Model/Query.zep", 1951); ZEPHIR_MM_RESTORE(); return; } @@ -3376,7 +3384,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZEPHIR_CONCAT_SV(&_59$$47, "Unknown bind type: ", &bindType); ZEPHIR_CALL_METHOD(NULL, &_58$$47, "__construct", NULL, 33, &_59$$47); zephir_check_call_status(); - zephir_throw_exception_debug(&_58$$47, "phalcon/Mvc/Model/Query.zep", 1958); + zephir_throw_exception_debug(&_58$$47, "phalcon/Mvc/Model/Query.zep", 1966); ZEPHIR_MM_RESTORE(); return; } while(0); @@ -3558,7 +3566,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) zephir_create_array(&_79$$66, 2, 0); add_assoc_stringl_ex(&_79$$66, SL("type"), SL("literal")); zephir_memory_observe(&_80$$66); - zephir_array_fetch_string(&_80$$66, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2134); + zephir_array_fetch_string(&_80$$66, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2142); zephir_array_update_string(&_79$$66, SL("value"), &_80$$66, PH_COPY | PH_SEPARATE); ZEPHIR_CPY_WRT(&exprReturn, &_79$$66); break; @@ -3590,7 +3598,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZEPHIR_CONCAT_SV(&_85$$70, "Unknown expression type ", &exprType); ZEPHIR_CALL_METHOD(NULL, &_84$$70, "__construct", NULL, 33, &_85$$70); zephir_check_call_status(); - zephir_throw_exception_debug(&_84$$70, "phalcon/Mvc/Model/Query.zep", 2157); + zephir_throw_exception_debug(&_84$$70, "phalcon/Mvc/Model/Query.zep", 2165); ZEPHIR_MM_RESTORE(); return; } while(0); @@ -3605,7 +3613,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) if (zephir_array_isset_long(&expr, 0)) { ZEPHIR_INIT_VAR(&listItems); array_init(&listItems); - zephir_is_iterable(&expr, 0, "phalcon/Mvc/Model/Query.zep", 2180); + zephir_is_iterable(&expr, 0, "phalcon/Mvc/Model/Query.zep", 2188); if (Z_TYPE_P(&expr) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&expr), _86$$72) { @@ -3613,7 +3621,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZVAL_COPY(&exprListItem, _86$$72); ZEPHIR_CALL_METHOD(&_88$$73, this_ptr, "getexpression", NULL, 461, &exprListItem); zephir_check_call_status(); - zephir_array_append(&listItems, &_88$$73, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2177); + zephir_array_append(&listItems, &_88$$73, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2185); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &expr, "rewind", NULL, 0); @@ -3628,7 +3636,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_89$$74, this_ptr, "getexpression", NULL, 461, &exprListItem); zephir_check_call_status(); - zephir_array_append(&listItems, &_89$$74, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2177); + zephir_array_append(&listItems, &_89$$74, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2185); ZEPHIR_CALL_METHOD(NULL, &expr, "next", NULL, 0); zephir_check_call_status(); } @@ -3639,7 +3647,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) zephir_array_fast_append(return_value, &listItems); RETURN_MM(); } - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Unknown expression", "phalcon/Mvc/Model/Query.zep", 2186); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Unknown expression", "phalcon/Mvc/Model/Query.zep", 2194); return; } @@ -3685,7 +3693,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) if (zephir_array_isset_long(&arguments, 0)) { ZEPHIR_INIT_VAR(&functionArgs); array_init(&functionArgs); - zephir_is_iterable(&arguments, 0, "phalcon/Mvc/Model/Query.zep", 2212); + zephir_is_iterable(&arguments, 0, "phalcon/Mvc/Model/Query.zep", 2220); if (Z_TYPE_P(&arguments) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&arguments), _0$$6) { @@ -3693,7 +3701,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) ZVAL_COPY(&argument, _0$$6); ZEPHIR_CALL_METHOD(&_2$$7, this_ptr, "getcallargument", &_3, 465, &argument); zephir_check_call_status(); - zephir_array_append(&functionArgs, &_2$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2210); + zephir_array_append(&functionArgs, &_2$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2218); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &arguments, "rewind", NULL, 0); @@ -3708,7 +3716,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_4$$8, this_ptr, "getcallargument", &_3, 465, &argument); zephir_check_call_status(); - zephir_array_append(&functionArgs, &_4$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2210); + zephir_array_append(&functionArgs, &_4$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2218); ZEPHIR_CALL_METHOD(NULL, &arguments, "next", NULL, 0); zephir_check_call_status(); } @@ -3726,7 +3734,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) zephir_create_array(return_value, 4, 0); add_assoc_stringl_ex(return_value, SL("type"), SL("functionCall")); zephir_memory_observe(&_7$$10); - zephir_array_fetch_string(&_7$$10, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2222); + zephir_array_fetch_string(&_7$$10, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2230); zephir_array_update_string(return_value, SL("name"), &_7$$10, PH_COPY | PH_SEPARATE); zephir_array_update_string(return_value, SL("arguments"), &functionArgs, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_VAR(&_8$$10); @@ -3737,7 +3745,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) zephir_create_array(return_value, 3, 0); add_assoc_stringl_ex(return_value, SL("type"), SL("functionCall")); zephir_memory_observe(&_9$$11); - zephir_array_fetch_string(&_9$$11, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2229); + zephir_array_fetch_string(&_9$$11, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2237); zephir_array_update_string(return_value, SL("name"), &_9$$11, PH_COPY | PH_SEPARATE); zephir_array_update_string(return_value, SL("arguments"), &functionArgs, PH_COPY | PH_SEPARATE); RETURN_MM(); @@ -3746,7 +3754,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) zephir_create_array(return_value, 2, 0); add_assoc_stringl_ex(return_value, SL("type"), SL("functionCall")); zephir_memory_observe(&_10); - zephir_array_fetch_string(&_10, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2238); + zephir_array_fetch_string(&_10, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2246); zephir_array_update_string(return_value, SL("name"), &_10, PH_COPY | PH_SEPARATE); RETURN_MM(); } @@ -3781,7 +3789,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getGroupClause) if (zephir_array_isset_long(&group, 0)) { ZEPHIR_INIT_VAR(&groupParts); array_init(&groupParts); - zephir_is_iterable(&group, 0, "phalcon/Mvc/Model/Query.zep", 2258); + zephir_is_iterable(&group, 0, "phalcon/Mvc/Model/Query.zep", 2266); if (Z_TYPE_P(&group) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&group), _0$$3) { @@ -3789,7 +3797,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getGroupClause) ZVAL_COPY(&groupItem, _0$$3); ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "getexpression", &_3, 461, &groupItem); zephir_check_call_status(); - zephir_array_append(&groupParts, &_2$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2256); + zephir_array_append(&groupParts, &_2$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2264); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &group, "rewind", NULL, 0); @@ -3804,7 +3812,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getGroupClause) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_4$$5, this_ptr, "getexpression", &_3, 461, &groupItem); zephir_check_call_status(); - zephir_array_append(&groupParts, &_4$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2256); + zephir_array_append(&groupParts, &_4$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2264); ZEPHIR_CALL_METHOD(NULL, &group, "next", NULL, 0); zephir_check_call_status(); } @@ -3890,10 +3898,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoin) zephir_get_arrval(&join, join_param); zephir_memory_observe(&qualified); if (zephir_array_isset_string_fetch(&qualified, &join, SL("qualified"), 0)) { - zephir_array_fetch_string(&_0$$3, &qualified, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2294); + zephir_array_fetch_string(&_0$$3, &qualified, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2302); if (ZEPHIR_IS_LONG(&_0$$3, 355)) { zephir_memory_observe(&modelName); - zephir_array_fetch_string(&modelName, &qualified, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2295); + zephir_array_fetch_string(&modelName, &qualified, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2303); ZEPHIR_CALL_METHOD(&model, manager, "load", NULL, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0); @@ -3908,7 +3916,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoin) RETURN_MM(); } } - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 2310); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 2318); return; } @@ -3937,7 +3945,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoinType) zephir_get_arrval(&join, join_param); zephir_memory_observe(&type); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&type, &join, SL("type"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 2321); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 2329); return; } do { @@ -3965,7 +3973,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoinType) ZEPHIR_CONCAT_SVSV(&_2, "Unknown join type ", &type, ", when preparing: ", &_1); ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 33, &_2); zephir_check_call_status(); - zephir_throw_exception_debug(&_0, "phalcon/Mvc/Model/Query.zep", 2343); + zephir_throw_exception_debug(&_0, "phalcon/Mvc/Model/Query.zep", 2351); ZEPHIR_MM_RESTORE(); return; } @@ -4133,7 +4141,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&manager, &_0); zephir_memory_observe(&tables); - zephir_array_fetch_string(&tables, &select, SL("tables"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2379); + zephir_array_fetch_string(&tables, &select, SL("tables"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2387); if (!(zephir_array_isset_long(&tables, 0))) { ZEPHIR_INIT_VAR(&selectTables); zephir_create_array(&selectTables, 1, 0); @@ -4142,7 +4150,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CPY_WRT(&selectTables, &tables); } zephir_memory_observe(&joins); - zephir_array_fetch_string(&joins, &select, SL("joins"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2387); + zephir_array_fetch_string(&joins, &select, SL("joins"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2395); if (!(zephir_array_isset_long(&joins, 0))) { ZEPHIR_INIT_VAR(&selectJoins); zephir_create_array(&selectJoins, 1, 0); @@ -4150,7 +4158,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } else { ZEPHIR_CPY_WRT(&selectJoins, &joins); } - zephir_is_iterable(&selectJoins, 0, "phalcon/Mvc/Model/Query.zep", 2538); + zephir_is_iterable(&selectJoins, 0, "phalcon/Mvc/Model/Query.zep", 2546); if (Z_TYPE_P(&selectJoins) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&selectJoins), _1) { @@ -4159,13 +4167,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CALL_METHOD(&joinData, this_ptr, "getjoin", &_3, 466, &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", 2401); + zephir_array_fetch_string(&source, &joinData, SL("source"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2409); ZEPHIR_OBS_NVAR(&schema); - zephir_array_fetch_string(&schema, &joinData, SL("schema"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2402); + zephir_array_fetch_string(&schema, &joinData, SL("schema"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2410); ZEPHIR_OBS_NVAR(&model); - zephir_array_fetch_string(&model, &joinData, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2403); + zephir_array_fetch_string(&model, &joinData, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2411); ZEPHIR_OBS_NVAR(&realModelName); - zephir_array_fetch_string(&realModelName, &joinData, SL("modelName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2404); + zephir_array_fetch_string(&realModelName, &joinData, SL("modelName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2412); ZEPHIR_INIT_NVAR(&completeSource); zephir_create_array(&completeSource, 2, 0); zephir_array_fast_append(&completeSource, &source); @@ -4175,7 +4183,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_OBS_NVAR(&aliasExpr); if (zephir_array_isset_string_fetch(&aliasExpr, &joinItem, SL("alias"), 0)) { ZEPHIR_OBS_NVAR(&alias); - zephir_array_fetch_string(&alias, &aliasExpr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2416); + zephir_array_fetch_string(&alias, &aliasExpr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2424); if (UNEXPECTED(zephir_array_isset(&joinModels, &alias))) { ZEPHIR_INIT_NVAR(&_5$$9); object_init_ex(&_5$$9, phalcon_mvc_model_exception_ce); @@ -4184,11 +4192,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSV(&_7$$9, "Cannot use '", &alias, "' as join alias because it was already used, when preparing: ", &_6$$9); ZEPHIR_CALL_METHOD(NULL, &_5$$9, "__construct", &_8, 33, &_7$$9); zephir_check_call_status(); - zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/Model/Query.zep", 2424); + zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/Model/Query.zep", 2432); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2430); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2438); zephir_array_update_zval(&joinTypes, &alias, &joinType, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&joinModels, &alias, &realModelName, PH_COPY | PH_SEPARATE); @@ -4207,7 +4215,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSV(&_11$$11, "Cannot use '", &realModelName, "' as join alias because it was already used, when preparing: ", &_10$$11); ZEPHIR_CALL_METHOD(NULL, &_9$$11, "__construct", &_8, 33, &_11$$11); zephir_check_call_status(); - zephir_throw_exception_debug(&_9$$11, "phalcon/Mvc/Model/Query.zep", 2483); + zephir_throw_exception_debug(&_9$$11, "phalcon/Mvc/Model/Query.zep", 2491); ZEPHIR_MM_RESTORE(); return; } @@ -4237,13 +4245,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CALL_METHOD(&joinData, this_ptr, "getjoin", &_3, 466, &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", 2401); + zephir_array_fetch_string(&source, &joinData, SL("source"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2409); ZEPHIR_OBS_NVAR(&schema); - zephir_array_fetch_string(&schema, &joinData, SL("schema"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2402); + zephir_array_fetch_string(&schema, &joinData, SL("schema"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2410); ZEPHIR_OBS_NVAR(&model); - zephir_array_fetch_string(&model, &joinData, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2403); + zephir_array_fetch_string(&model, &joinData, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2411); ZEPHIR_OBS_NVAR(&realModelName); - zephir_array_fetch_string(&realModelName, &joinData, SL("modelName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2404); + zephir_array_fetch_string(&realModelName, &joinData, SL("modelName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2412); ZEPHIR_INIT_NVAR(&_12$$12); zephir_create_array(&_12$$12, 2, 0); zephir_array_fast_append(&_12$$12, &source); @@ -4254,7 +4262,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_OBS_NVAR(&aliasExpr); if (zephir_array_isset_string_fetch(&aliasExpr, &joinItem, SL("alias"), 0)) { ZEPHIR_OBS_NVAR(&alias); - zephir_array_fetch_string(&alias, &aliasExpr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2416); + zephir_array_fetch_string(&alias, &aliasExpr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2424); if (UNEXPECTED(zephir_array_isset(&joinModels, &alias))) { ZEPHIR_INIT_NVAR(&_13$$14); object_init_ex(&_13$$14, phalcon_mvc_model_exception_ce); @@ -4263,11 +4271,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSV(&_15$$14, "Cannot use '", &alias, "' as join alias because it was already used, when preparing: ", &_14$$14); ZEPHIR_CALL_METHOD(NULL, &_13$$14, "__construct", &_8, 33, &_15$$14); zephir_check_call_status(); - zephir_throw_exception_debug(&_13$$14, "phalcon/Mvc/Model/Query.zep", 2424); + zephir_throw_exception_debug(&_13$$14, "phalcon/Mvc/Model/Query.zep", 2432); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2430); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2438); zephir_array_update_zval(&joinTypes, &alias, &joinType, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&joinModels, &alias, &realModelName, PH_COPY | PH_SEPARATE); @@ -4286,7 +4294,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSV(&_18$$16, "Cannot use '", &realModelName, "' as join alias because it was already used, when preparing: ", &_17$$16); ZEPHIR_CALL_METHOD(NULL, &_16$$16, "__construct", &_8, 33, &_18$$16); zephir_check_call_status(); - zephir_throw_exception_debug(&_16$$16, "phalcon/Mvc/Model/Query.zep", 2483); + zephir_throw_exception_debug(&_16$$16, "phalcon/Mvc/Model/Query.zep", 2491); ZEPHIR_MM_RESTORE(); return; } @@ -4312,7 +4320,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_update_property_zval(this_ptr, ZEND_STRL("sqlModelsAliases"), &sqlModelsAliases); zephir_update_property_zval(this_ptr, ZEND_STRL("sqlAliasesModelsInstances"), &sqlAliasesModelsInstances); zephir_update_property_zval(this_ptr, ZEND_STRL("modelsInstances"), &modelsInstances); - zephir_is_iterable(&joinPrepared, 0, "phalcon/Mvc/Model/Query.zep", 2558); + zephir_is_iterable(&joinPrepared, 0, "phalcon/Mvc/Model/Query.zep", 2566); if (Z_TYPE_P(&joinPrepared) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&joinPrepared), _21, _22, _19) { @@ -4359,7 +4367,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_read_property(&_0, this_ptr, ZEND_STRL("enableImplicitJoins"), PH_NOISY_CC | PH_READONLY); if (!(zephir_is_true(&_0))) { ZEPHIR_INIT_VAR(&_26$$21); - zephir_is_iterable(&joinPrepared, 0, "phalcon/Mvc/Model/Query.zep", 2570); + zephir_is_iterable(&joinPrepared, 0, "phalcon/Mvc/Model/Query.zep", 2578); if (Z_TYPE_P(&joinPrepared) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&joinPrepared), _29$$21, _30$$21, _27$$21) { @@ -4372,11 +4380,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&_26$$21); ZVAL_COPY(&_26$$21, _27$$21); ZEPHIR_OBS_NVAR(&joinType); - zephir_array_fetch(&joinType, &joinTypes, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2560); + zephir_array_fetch(&joinType, &joinTypes, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2568); ZEPHIR_OBS_NVAR(&joinSource); - zephir_array_fetch(&joinSource, &joinSources, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2561); + zephir_array_fetch(&joinSource, &joinSources, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2569); ZEPHIR_OBS_NVAR(&preCondition); - zephir_array_fetch(&preCondition, &joinPreCondition, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2562); + zephir_array_fetch(&preCondition, &joinPreCondition, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2570); ZEPHIR_INIT_NVAR(&_31$$22); zephir_create_array(&_31$$22, 3, 0); zephir_array_update_string(&_31$$22, SL("type"), &joinType, PH_COPY | PH_SEPARATE); @@ -4385,7 +4393,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_create_array(&_32$$22, 1, 0); zephir_array_fast_append(&_32$$22, &preCondition); zephir_array_update_string(&_31$$22, SL("conditions"), &_32$$22, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_31$$22, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2567); + zephir_array_append(&sqlJoins, &_31$$22, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2575); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &joinPrepared, "rewind", NULL, 0); @@ -4401,11 +4409,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CALL_METHOD(&_26$$21, &joinPrepared, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&joinType); - zephir_array_fetch(&joinType, &joinTypes, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2560); + zephir_array_fetch(&joinType, &joinTypes, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2568); ZEPHIR_OBS_NVAR(&joinSource); - zephir_array_fetch(&joinSource, &joinSources, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2561); + zephir_array_fetch(&joinSource, &joinSources, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2569); ZEPHIR_OBS_NVAR(&preCondition); - zephir_array_fetch(&preCondition, &joinPreCondition, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2562); + zephir_array_fetch(&preCondition, &joinPreCondition, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2570); ZEPHIR_INIT_NVAR(&_33$$23); zephir_create_array(&_33$$23, 3, 0); zephir_array_update_string(&_33$$23, SL("type"), &joinType, PH_COPY | PH_SEPARATE); @@ -4414,7 +4422,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_create_array(&_34$$23, 1, 0); zephir_array_fast_append(&_34$$23, &preCondition); zephir_array_update_string(&_33$$23, SL("conditions"), &_34$$23, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_33$$23, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2567); + zephir_array_append(&sqlJoins, &_33$$23, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2575); ZEPHIR_CALL_METHOD(NULL, &joinPrepared, "next", NULL, 0); zephir_check_call_status(); } @@ -4425,15 +4433,15 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_INIT_NVAR(&fromModels); array_init(&fromModels); - zephir_is_iterable(&selectTables, 0, "phalcon/Mvc/Model/Query.zep", 2585); + zephir_is_iterable(&selectTables, 0, "phalcon/Mvc/Model/Query.zep", 2593); if (Z_TYPE_P(&selectTables) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&selectTables), _35) { ZEPHIR_INIT_NVAR(&tableItem); ZVAL_COPY(&tableItem, _35); - zephir_array_fetch_string(&_37$$24, &tableItem, SL("qualifiedName"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2579); + zephir_array_fetch_string(&_37$$24, &tableItem, SL("qualifiedName"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2587); ZEPHIR_OBS_NVAR(&_38$$24); - zephir_array_fetch_string(&_38$$24, &_37$$24, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2579); + zephir_array_fetch_string(&_38$$24, &_37$$24, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2587); zephir_array_update_zval(&fromModels, &_38$$24, &__$true, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); } else { @@ -4447,9 +4455,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_CALL_METHOD(&tableItem, &selectTables, "current", NULL, 0); zephir_check_call_status(); - zephir_array_fetch_string(&_39$$25, &tableItem, SL("qualifiedName"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2579); + zephir_array_fetch_string(&_39$$25, &tableItem, SL("qualifiedName"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2587); ZEPHIR_OBS_NVAR(&_40$$25); - zephir_array_fetch_string(&_40$$25, &_39$$25, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2579); + zephir_array_fetch_string(&_40$$25, &_39$$25, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2587); zephir_array_update_zval(&fromModels, &_40$$25, &__$true, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &selectTables, "next", NULL, 0); zephir_check_call_status(); @@ -4457,7 +4465,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_INIT_NVAR(&tableItem); ZEPHIR_INIT_VAR(&_41); - zephir_is_iterable(&fromModels, 0, "phalcon/Mvc/Model/Query.zep", 2705); + zephir_is_iterable(&fromModels, 0, "phalcon/Mvc/Model/Query.zep", 2713); if (Z_TYPE_P(&fromModels) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fromModels), _44, _45, _42) { @@ -4469,7 +4477,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_INIT_NVAR(&_41); ZVAL_COPY(&_41, _42); - zephir_is_iterable(&joinModels, 0, "phalcon/Mvc/Model/Query.zep", 2703); + zephir_is_iterable(&joinModels, 0, "phalcon/Mvc/Model/Query.zep", 2711); if (Z_TYPE_P(&joinModels) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&joinModels), _48$$26, _49$$26, _46$$26) { @@ -4482,13 +4490,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&joinModel); ZVAL_COPY(&joinModel, _46$$26); ZEPHIR_OBS_NVAR(&joinSource); - zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2590); + zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2598); ZEPHIR_OBS_NVAR(&joinType); - zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2595); + zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2603); ZEPHIR_OBS_NVAR(&preCondition); if (!(zephir_array_isset_fetch(&preCondition, &joinPreCondition, &joinAlias, 0))) { ZEPHIR_OBS_NVAR(&modelNameAlias); - zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2604); + zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2612); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_50, 0, &fromModelName, &modelNameAlias); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&relation)) { @@ -4503,17 +4511,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSVSV(&_54$$31, "There is more than one relation between models '", &fromModelName, "' and '", &joinModel, "', the join must be done using an alias, when preparing: ", &_53$$31); ZEPHIR_CALL_METHOD(NULL, &_52$$31, "__construct", &_8, 33, &_54$$31); zephir_check_call_status(); - zephir_throw_exception_debug(&_52$$31, "phalcon/Mvc/Model/Query.zep", 2630); + zephir_throw_exception_debug(&_52$$31, "phalcon/Mvc/Model/Query.zep", 2638); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&relation); - zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2636); + zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2644); } } if (Z_TYPE_P(&relation) == IS_OBJECT) { ZEPHIR_OBS_NVAR(&modelAlias); - zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2647); + zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2655); ZEPHIR_CALL_METHOD(&_55$$32, &relation, "isthrough", NULL, 0); zephir_check_call_status(); if (!(zephir_is_true(&_55$$32))) { @@ -4524,13 +4532,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_check_call_status(); } if (zephir_array_isset_long(&sqlJoin, 0)) { - zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2677); + zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2685); if (Z_TYPE_P(&sqlJoin) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&sqlJoin), _58$$35) { ZEPHIR_INIT_NVAR(&sqlJoinItem); ZVAL_COPY(&sqlJoinItem, _58$$35); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2675); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2683); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "rewind", NULL, 0); @@ -4543,14 +4551,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_CALL_METHOD(&sqlJoinItem, &sqlJoin, "current", NULL, 0); zephir_check_call_status(); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2675); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2683); ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "next", NULL, 0); zephir_check_call_status(); } } ZEPHIR_INIT_NVAR(&sqlJoinItem); } else { - zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2678); + zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2686); } } else { ZEPHIR_INIT_NVAR(&_60$$39); @@ -4560,7 +4568,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&_61$$39); array_init(&_61$$39); zephir_array_update_string(&_60$$39, SL("conditions"), &_61$$39, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_60$$39, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2689); + zephir_array_append(&sqlJoins, &_60$$39, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2697); } } else { ZEPHIR_INIT_NVAR(&_62$$40); @@ -4571,7 +4579,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_create_array(&_63$$40, 1, 0); zephir_array_fast_append(&_63$$40, &preCondition); zephir_array_update_string(&_62$$40, SL("conditions"), &_63$$40, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_62$$40, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2700); + zephir_array_append(&sqlJoins, &_62$$40, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2708); } } ZEND_HASH_FOREACH_END(); } else { @@ -4588,13 +4596,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CALL_METHOD(&joinModel, &joinModels, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&joinSource); - zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2590); + zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2598); ZEPHIR_OBS_NVAR(&joinType); - zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2595); + zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2603); ZEPHIR_OBS_NVAR(&preCondition); if (!(zephir_array_isset_fetch(&preCondition, &joinPreCondition, &joinAlias, 0))) { ZEPHIR_OBS_NVAR(&modelNameAlias); - zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2604); + zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2612); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_64, 0, &fromModelName, &modelNameAlias); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&relation)) { @@ -4609,17 +4617,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSVSV(&_68$$45, "There is more than one relation between models '", &fromModelName, "' and '", &joinModel, "', the join must be done using an alias, when preparing: ", &_67$$45); ZEPHIR_CALL_METHOD(NULL, &_66$$45, "__construct", &_8, 33, &_68$$45); zephir_check_call_status(); - zephir_throw_exception_debug(&_66$$45, "phalcon/Mvc/Model/Query.zep", 2630); + zephir_throw_exception_debug(&_66$$45, "phalcon/Mvc/Model/Query.zep", 2638); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&relation); - zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2636); + zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2644); } } if (Z_TYPE_P(&relation) == IS_OBJECT) { ZEPHIR_OBS_NVAR(&modelAlias); - zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2647); + zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2655); ZEPHIR_CALL_METHOD(&_69$$46, &relation, "isthrough", NULL, 0); zephir_check_call_status(); if (!(zephir_is_true(&_69$$46))) { @@ -4630,13 +4638,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_check_call_status(); } if (zephir_array_isset_long(&sqlJoin, 0)) { - zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2677); + zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2685); if (Z_TYPE_P(&sqlJoin) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&sqlJoin), _70$$49) { ZEPHIR_INIT_NVAR(&sqlJoinItem); ZVAL_COPY(&sqlJoinItem, _70$$49); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2675); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2683); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "rewind", NULL, 0); @@ -4649,14 +4657,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_CALL_METHOD(&sqlJoinItem, &sqlJoin, "current", NULL, 0); zephir_check_call_status(); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2675); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2683); ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "next", NULL, 0); zephir_check_call_status(); } } ZEPHIR_INIT_NVAR(&sqlJoinItem); } else { - zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2678); + zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2686); } } else { ZEPHIR_INIT_NVAR(&_72$$53); @@ -4666,7 +4674,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&_73$$53); array_init(&_73$$53); zephir_array_update_string(&_72$$53, SL("conditions"), &_73$$53, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_72$$53, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2689); + zephir_array_append(&sqlJoins, &_72$$53, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2697); } } else { ZEPHIR_INIT_NVAR(&_74$$54); @@ -4677,7 +4685,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_create_array(&_75$$54, 1, 0); zephir_array_fast_append(&_75$$54, &preCondition); zephir_array_update_string(&_74$$54, SL("conditions"), &_75$$54, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_74$$54, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2700); + zephir_array_append(&sqlJoins, &_74$$54, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2708); } ZEPHIR_CALL_METHOD(NULL, &joinModels, "next", NULL, 0); zephir_check_call_status(); @@ -4699,7 +4707,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_41, &fromModels, "current", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&joinModels, 0, "phalcon/Mvc/Model/Query.zep", 2703); + zephir_is_iterable(&joinModels, 0, "phalcon/Mvc/Model/Query.zep", 2711); if (Z_TYPE_P(&joinModels) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&joinModels), _78$$55, _79$$55, _76$$55) { @@ -4712,13 +4720,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&joinModel); ZVAL_COPY(&joinModel, _76$$55); ZEPHIR_OBS_NVAR(&joinSource); - zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2590); + zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2598); ZEPHIR_OBS_NVAR(&joinType); - zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2595); + zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2603); ZEPHIR_OBS_NVAR(&preCondition); if (!(zephir_array_isset_fetch(&preCondition, &joinPreCondition, &joinAlias, 0))) { ZEPHIR_OBS_NVAR(&modelNameAlias); - zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2604); + zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2612); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_80, 0, &fromModelName, &modelNameAlias); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&relation)) { @@ -4733,17 +4741,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSVSV(&_84$$60, "There is more than one relation between models '", &fromModelName, "' and '", &joinModel, "', the join must be done using an alias, when preparing: ", &_83$$60); ZEPHIR_CALL_METHOD(NULL, &_82$$60, "__construct", &_8, 33, &_84$$60); zephir_check_call_status(); - zephir_throw_exception_debug(&_82$$60, "phalcon/Mvc/Model/Query.zep", 2630); + zephir_throw_exception_debug(&_82$$60, "phalcon/Mvc/Model/Query.zep", 2638); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&relation); - zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2636); + zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2644); } } if (Z_TYPE_P(&relation) == IS_OBJECT) { ZEPHIR_OBS_NVAR(&modelAlias); - zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2647); + zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2655); ZEPHIR_CALL_METHOD(&_85$$61, &relation, "isthrough", NULL, 0); zephir_check_call_status(); if (!(zephir_is_true(&_85$$61))) { @@ -4754,13 +4762,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_check_call_status(); } if (zephir_array_isset_long(&sqlJoin, 0)) { - zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2677); + zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2685); if (Z_TYPE_P(&sqlJoin) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&sqlJoin), _86$$64) { ZEPHIR_INIT_NVAR(&sqlJoinItem); ZVAL_COPY(&sqlJoinItem, _86$$64); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2675); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2683); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "rewind", NULL, 0); @@ -4773,14 +4781,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_CALL_METHOD(&sqlJoinItem, &sqlJoin, "current", NULL, 0); zephir_check_call_status(); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2675); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2683); ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "next", NULL, 0); zephir_check_call_status(); } } ZEPHIR_INIT_NVAR(&sqlJoinItem); } else { - zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2678); + zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2686); } } else { ZEPHIR_INIT_NVAR(&_88$$68); @@ -4790,7 +4798,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&_89$$68); array_init(&_89$$68); zephir_array_update_string(&_88$$68, SL("conditions"), &_89$$68, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_88$$68, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2689); + zephir_array_append(&sqlJoins, &_88$$68, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2697); } } else { ZEPHIR_INIT_NVAR(&_90$$69); @@ -4801,7 +4809,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_create_array(&_91$$69, 1, 0); zephir_array_fast_append(&_91$$69, &preCondition); zephir_array_update_string(&_90$$69, SL("conditions"), &_91$$69, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_90$$69, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2700); + zephir_array_append(&sqlJoins, &_90$$69, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2708); } } ZEND_HASH_FOREACH_END(); } else { @@ -4818,13 +4826,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CALL_METHOD(&joinModel, &joinModels, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&joinSource); - zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2590); + zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2598); ZEPHIR_OBS_NVAR(&joinType); - zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2595); + zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2603); ZEPHIR_OBS_NVAR(&preCondition); if (!(zephir_array_isset_fetch(&preCondition, &joinPreCondition, &joinAlias, 0))) { ZEPHIR_OBS_NVAR(&modelNameAlias); - zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2604); + zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2612); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_92, 0, &fromModelName, &modelNameAlias); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&relation)) { @@ -4839,17 +4847,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSVSV(&_96$$74, "There is more than one relation between models '", &fromModelName, "' and '", &joinModel, "', the join must be done using an alias, when preparing: ", &_95$$74); ZEPHIR_CALL_METHOD(NULL, &_94$$74, "__construct", &_8, 33, &_96$$74); zephir_check_call_status(); - zephir_throw_exception_debug(&_94$$74, "phalcon/Mvc/Model/Query.zep", 2630); + zephir_throw_exception_debug(&_94$$74, "phalcon/Mvc/Model/Query.zep", 2638); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&relation); - zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2636); + zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2644); } } if (Z_TYPE_P(&relation) == IS_OBJECT) { ZEPHIR_OBS_NVAR(&modelAlias); - zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2647); + zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2655); ZEPHIR_CALL_METHOD(&_97$$75, &relation, "isthrough", NULL, 0); zephir_check_call_status(); if (!(zephir_is_true(&_97$$75))) { @@ -4860,13 +4868,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_check_call_status(); } if (zephir_array_isset_long(&sqlJoin, 0)) { - zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2677); + zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2685); if (Z_TYPE_P(&sqlJoin) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&sqlJoin), _98$$78) { ZEPHIR_INIT_NVAR(&sqlJoinItem); ZVAL_COPY(&sqlJoinItem, _98$$78); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2675); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2683); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "rewind", NULL, 0); @@ -4879,14 +4887,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_CALL_METHOD(&sqlJoinItem, &sqlJoin, "current", NULL, 0); zephir_check_call_status(); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2675); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2683); ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "next", NULL, 0); zephir_check_call_status(); } } ZEPHIR_INIT_NVAR(&sqlJoinItem); } else { - zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2678); + zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2686); } } else { ZEPHIR_INIT_NVAR(&_100$$82); @@ -4896,7 +4904,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&_101$$82); array_init(&_101$$82); zephir_array_update_string(&_100$$82, SL("conditions"), &_101$$82, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_100$$82, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2689); + zephir_array_append(&sqlJoins, &_100$$82, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2697); } } else { ZEPHIR_INIT_NVAR(&_102$$83); @@ -4907,7 +4915,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_create_array(&_103$$83, 1, 0); zephir_array_fast_append(&_103$$83, &preCondition); zephir_array_update_string(&_102$$83, SL("conditions"), &_103$$83, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_102$$83, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2700); + zephir_array_append(&sqlJoins, &_102$$83, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2708); } ZEPHIR_CALL_METHOD(NULL, &joinModels, "next", NULL, 0); zephir_check_call_status(); @@ -5031,7 +5039,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin) ZEPHIR_CALL_METHOD(&referencedModelName, relation, "getreferencedmodel", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&fields) == IS_ARRAY) { - zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 2822); + zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 2830); if (Z_TYPE_P(&fields) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _3$$3, _4$$3, _1$$3) { @@ -5051,12 +5059,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin) ZEPHIR_CONCAT_SVSVSV(&_7$$5, "The number of fields must be equal to the number of referenced fields in join ", &modelAlias, "-", &joinAlias, ", when preparing: ", &_6$$5); ZEPHIR_CALL_METHOD(NULL, &_5$$5, "__construct", &_8, 33, &_7$$5); zephir_check_call_status(); - zephir_throw_exception_debug(&_5$$5, "phalcon/Mvc/Model/Query.zep", 2789); + zephir_throw_exception_debug(&_5$$5, "phalcon/Mvc/Model/Query.zep", 2797); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&intermediateField); - zephir_array_fetch(&intermediateField, &intermediateFields, &position, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2795); + zephir_array_fetch(&intermediateField, &intermediateFields, &position, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2803); ZEPHIR_INIT_NVAR(&sqlEqualsJoinCondition); zephir_create_array(&sqlEqualsJoinCondition, 4, 0); add_assoc_stringl_ex(&sqlEqualsJoinCondition, SL("type"), SL("binary-op")); @@ -5099,12 +5107,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin) ZEPHIR_CONCAT_SVSVSV(&_15$$7, "The number of fields must be equal to the number of referenced fields in join ", &modelAlias, "-", &joinAlias, ", when preparing: ", &_14$$7); ZEPHIR_CALL_METHOD(NULL, &_13$$7, "__construct", &_8, 33, &_15$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_13$$7, "phalcon/Mvc/Model/Query.zep", 2789); + zephir_throw_exception_debug(&_13$$7, "phalcon/Mvc/Model/Query.zep", 2797); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&intermediateField); - zephir_array_fetch(&intermediateField, &intermediateFields, &position, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2795); + zephir_array_fetch(&intermediateField, &intermediateFields, &position, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2803); ZEPHIR_INIT_NVAR(&_16$$6); zephir_create_array(&_16$$6, 4, 0); add_assoc_stringl_ex(&_16$$6, SL("type"), SL("binary-op")); @@ -5250,13 +5258,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getOrderClause) } ZEPHIR_INIT_VAR(&orderParts); array_init(&orderParts); - zephir_is_iterable(&orderColumns, 0, "phalcon/Mvc/Model/Query.zep", 2931); + zephir_is_iterable(&orderColumns, 0, "phalcon/Mvc/Model/Query.zep", 2939); if (Z_TYPE_P(&orderColumns) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&orderColumns), _0) { ZEPHIR_INIT_NVAR(&orderItem); ZVAL_COPY(&orderItem, _0); - zephir_array_fetch_string(&_2$$5, &orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2913); + zephir_array_fetch_string(&_2$$5, &orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2921); ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "getexpression", &_3, 461, &_2$$5); zephir_check_call_status(); if (zephir_array_isset_string_fetch(&orderSort, &orderItem, SL("sort"), 1)) { @@ -5282,7 +5290,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getOrderClause) zephir_array_fast_append(&_7$$9, &orderPartExpr); ZEPHIR_CPY_WRT(&orderPartSort, &_7$$9); } - zephir_array_append(&orderParts, &orderPartSort, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2928); + zephir_array_append(&orderParts, &orderPartSort, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2936); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &orderColumns, "rewind", NULL, 0); @@ -5295,7 +5303,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getOrderClause) } ZEPHIR_CALL_METHOD(&orderItem, &orderColumns, "current", NULL, 0); zephir_check_call_status(); - zephir_array_fetch_string(&_8$$10, &orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2913); + zephir_array_fetch_string(&_8$$10, &orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2921); ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "getexpression", &_3, 461, &_8$$10); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&orderSort); @@ -5323,7 +5331,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getOrderClause) zephir_array_fast_append(&_13$$14, &orderPartExpr); ZEPHIR_CPY_WRT(&orderPartSort, &_13$$14); } - zephir_array_append(&orderParts, &orderPartSort, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2928); + zephir_array_append(&orderParts, &orderPartSort, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2936); ZEPHIR_CALL_METHOD(NULL, &orderColumns, "next", NULL, 0); zephir_check_call_status(); } @@ -5405,13 +5413,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) zephir_fetch_params(1, 1, 0, &expr_param); ZEPHIR_OBS_COPY_OR_DUP(&expr, expr_param); zephir_memory_observe(&columnName); - zephir_array_fetch_string(&columnName, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2945); + zephir_array_fetch_string(&columnName, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2953); zephir_read_property(&_0, this_ptr, ZEND_STRL("nestingLevel"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&nestingLevel, &_0); zephir_read_property(&_0, this_ptr, ZEND_STRL("sqlColumnAliases"), PH_NOISY_CC | PH_READONLY); if (zephir_array_isset(&_0, &nestingLevel)) { zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("sqlColumnAliases"), PH_NOISY_CC | PH_READONLY); - zephir_array_fetch(&_2$$3, &_1$$3, &nestingLevel, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2953); + zephir_array_fetch(&_2$$3, &_1$$3, &nestingLevel, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2961); ZEPHIR_CPY_WRT(&sqlColumnAliases, &_2$$3); } else { ZEPHIR_INIT_NVAR(&sqlColumnAliases); @@ -5421,7 +5429,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) if (_3) { _4 = !(zephir_array_isset_string(&expr, SL("domain"))); if (!(_4)) { - zephir_array_fetch_string(&_5, &expr, SL("domain"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2958); + zephir_array_fetch_string(&_5, &expr, SL("domain"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2966); _4 = ZEPHIR_IS_EMPTY(&_5); } _3 = _4; @@ -5447,7 +5455,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_10$$7, "Unknown model or alias '", &columnDomain, "' (11), when preparing: ", &_9$$7); ZEPHIR_CALL_METHOD(NULL, &_8$$7, "__construct", NULL, 33, &_10$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_8$$7, "phalcon/Mvc/Model/Query.zep", 2979); + zephir_throw_exception_debug(&_8$$7, "phalcon/Mvc/Model/Query.zep", 2987); ZEPHIR_MM_RESTORE(); return; } @@ -5463,7 +5471,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_14$$9, "There is no model related to model or alias '", &columnDomain, "', when executing: ", &_13$$9); ZEPHIR_CALL_METHOD(NULL, &_12$$9, "__construct", NULL, 33, &_14$$9); zephir_check_call_status(); - zephir_throw_exception_debug(&_12$$9, "phalcon/Mvc/Model/Query.zep", 2998); + zephir_throw_exception_debug(&_12$$9, "phalcon/Mvc/Model/Query.zep", 3006); ZEPHIR_MM_RESTORE(); return; } @@ -5483,7 +5491,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSVSV(&_17$$12, "Column '", &columnName, "' doesn't belong to the model or alias '", &columnDomain, "', when executing: ", &_16$$12); ZEPHIR_CALL_METHOD(NULL, &_15$$12, "__construct", NULL, 33, &_17$$12); zephir_check_call_status(); - zephir_throw_exception_debug(&_15$$12, "phalcon/Mvc/Model/Query.zep", 3010); + zephir_throw_exception_debug(&_15$$12, "phalcon/Mvc/Model/Query.zep", 3018); ZEPHIR_MM_RESTORE(); return; } @@ -5495,7 +5503,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_INIT_VAR(&hasModel); ZVAL_BOOL(&hasModel, 0); zephir_read_property(&_18$$14, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY); - zephir_is_iterable(&_18$$14, 0, "phalcon/Mvc/Model/Query.zep", 3044); + zephir_is_iterable(&_18$$14, 0, "phalcon/Mvc/Model/Query.zep", 3052); if (Z_TYPE_P(&_18$$14) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_18$$14), _19$$14) { @@ -5513,7 +5521,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_25$$17, "The column '", &columnName, "' is ambiguous, when preparing: ", &_24$$17); ZEPHIR_CALL_METHOD(NULL, &_23$$17, "__construct", NULL, 33, &_25$$17); zephir_check_call_status(); - zephir_throw_exception_debug(&_23$$17, "phalcon/Mvc/Model/Query.zep", 3033); + zephir_throw_exception_debug(&_23$$17, "phalcon/Mvc/Model/Query.zep", 3041); ZEPHIR_MM_RESTORE(); return; } @@ -5543,7 +5551,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_30$$20, "The column '", &columnName, "' is ambiguous, when preparing: ", &_29$$20); ZEPHIR_CALL_METHOD(NULL, &_28$$20, "__construct", NULL, 33, &_30$$20); zephir_check_call_status(); - zephir_throw_exception_debug(&_28$$20, "phalcon/Mvc/Model/Query.zep", 3033); + zephir_throw_exception_debug(&_28$$20, "phalcon/Mvc/Model/Query.zep", 3041); ZEPHIR_MM_RESTORE(); return; } @@ -5562,14 +5570,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_33$$21, "Column '", &columnName, "' doesn't belong to any of the selected models (1), when preparing: ", &_32$$21); ZEPHIR_CALL_METHOD(NULL, &_31$$21, "__construct", NULL, 33, &_33$$21); zephir_check_call_status(); - zephir_throw_exception_debug(&_31$$21, "phalcon/Mvc/Model/Query.zep", 3047); + zephir_throw_exception_debug(&_31$$21, "phalcon/Mvc/Model/Query.zep", 3055); ZEPHIR_MM_RESTORE(); return; } zephir_read_property(&_34$$14, this_ptr, ZEND_STRL("models"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&models, &_34$$14); if (UNEXPECTED(Z_TYPE_P(&models) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The models list was not loaded correctly", "phalcon/Mvc/Model/Query.zep", 3058); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The models list was not loaded correctly", "phalcon/Mvc/Model/Query.zep", 3066); return; } ZEPHIR_INIT_VAR(&className); @@ -5583,7 +5591,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_37$$23, "Can't obtain model's source from models list: '", &className, "', when preparing: ", &_36$$23); ZEPHIR_CALL_METHOD(NULL, &_35$$23, "__construct", NULL, 33, &_37$$23); zephir_check_call_status(); - zephir_throw_exception_debug(&_35$$23, "phalcon/Mvc/Model/Query.zep", 3069); + zephir_throw_exception_debug(&_35$$23, "phalcon/Mvc/Model/Query.zep", 3077); ZEPHIR_MM_RESTORE(); return; } @@ -5604,7 +5612,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_40$$27, "Column '", &columnName, "' doesn't belong to any of the selected models (3), when preparing: ", &_39$$27); ZEPHIR_CALL_METHOD(NULL, &_38$$27, "__construct", NULL, 33, &_40$$27); zephir_check_call_status(); - zephir_throw_exception_debug(&_38$$27, "phalcon/Mvc/Model/Query.zep", 3088); + zephir_throw_exception_debug(&_38$$27, "phalcon/Mvc/Model/Query.zep", 3096); ZEPHIR_MM_RESTORE(); return; } @@ -5685,7 +5693,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getReadConnection) ZEPHIR_CALL_METHOD(&connection, model, "selectreadconnection", NULL, 0, &intermediate, &bindParams, &bindTypes); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&connection) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "selectReadConnection did not return a connection", "phalcon/Mvc/Model/Query.zep", 3132); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "selectReadConnection did not return a connection", "phalcon/Mvc/Model/Query.zep", 3140); return; } RETURN_CCTOR(&connection); @@ -5751,10 +5759,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getRelatedRecords) zephir_array_fast_append(&_0, &_1); zephir_array_update_string(&selectIr, SL("columns"), &_0, PH_COPY | PH_SEPARATE); zephir_memory_observe(&_4); - zephir_array_fetch_string(&_4, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3162); + zephir_array_fetch_string(&_4, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3170); zephir_array_update_string(&selectIr, SL("models"), &_4, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_4); - zephir_array_fetch_string(&_4, &intermediate, SL("tables"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3164); + zephir_array_fetch_string(&_4, &intermediate, SL("tables"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3172); zephir_array_update_string(&selectIr, SL("tables"), &_4, PH_COPY | PH_SEPARATE); zephir_memory_observe(&whereConditions); if (zephir_array_isset_string_fetch(&whereConditions, &intermediate, SL("where"), 0)) { @@ -5837,7 +5845,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) ZEPHIR_OBS_COPY_OR_DUP(&column, column_param); zephir_memory_observe(&columnType); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&columnType, &column, SL("type"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3204); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3212); return; } ZEPHIR_INIT_VAR(&sqlColumns); @@ -5846,7 +5854,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) zephir_array_isset_string_fetch(&eager, &column, SL("eager"), 0); if (ZEPHIR_IS_LONG(&columnType, 352)) { zephir_read_property(&_0$$4, this_ptr, ZEND_STRL("models"), PH_NOISY_CC | PH_READONLY); - zephir_is_iterable(&_0$$4, 0, "phalcon/Mvc/Model/Query.zep", 3234); + zephir_is_iterable(&_0$$4, 0, "phalcon/Mvc/Model/Query.zep", 3242); if (Z_TYPE_P(&_0$$4) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_0$$4), _3$$4, _4$$4, _1$$4) { @@ -5868,10 +5876,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) zephir_array_update_string(&sqlColumn, SL("balias"), &_5$$5, PH_COPY | PH_SEPARATE); if (Z_TYPE_P(&eager) != IS_NULL) { zephir_array_update_string(&sqlColumn, SL("eager"), &eager, PH_COPY | PH_SEPARATE); - zephir_array_fetch_string(&_7$$6, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3228); + zephir_array_fetch_string(&_7$$6, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3236); zephir_array_update_string(&sqlColumn, SL("eagerType"), &_7$$6, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3231); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3239); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &_0$$4, "rewind", NULL, 0); @@ -5897,10 +5905,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) ZEPHIR_CPY_WRT(&sqlColumn, &_8$$7); if (Z_TYPE_P(&eager) != IS_NULL) { zephir_array_update_string(&sqlColumn, SL("eager"), &eager, PH_COPY | PH_SEPARATE); - zephir_array_fetch_string(&_10$$8, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3228); + zephir_array_fetch_string(&_10$$8, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3236); zephir_array_update_string(&sqlColumn, SL("eagerType"), &_10$$8, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3231); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3239); ZEPHIR_CALL_METHOD(NULL, &_0$$4, "next", NULL, 0); zephir_check_call_status(); } @@ -5910,14 +5918,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) RETURN_CTOR(&sqlColumns); } if (UNEXPECTED(!(zephir_array_isset_string(&column, SL("column"))))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3238); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3246); return; } if (ZEPHIR_IS_LONG(&columnType, 353)) { zephir_read_property(&_11$$10, this_ptr, ZEND_STRL("sqlAliases"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&sqlAliases, &_11$$10); zephir_memory_observe(&columnDomain); - zephir_array_fetch_string(&columnDomain, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3250); + zephir_array_fetch_string(&columnDomain, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3258); ZEPHIR_OBS_NVAR(&source); if (UNEXPECTED(!(zephir_array_isset_fetch(&source, &sqlAliases, &columnDomain, 0)))) { ZEPHIR_INIT_VAR(&_12$$11); @@ -5927,7 +5935,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) ZEPHIR_CONCAT_SVSV(&_14$$11, "Unknown model or alias '", &columnDomain, "' (2), when preparing: ", &_13$$11); ZEPHIR_CALL_METHOD(NULL, &_12$$11, "__construct", NULL, 33, &_14$$11); zephir_check_call_status(); - zephir_throw_exception_debug(&_12$$11, "phalcon/Mvc/Model/Query.zep", 3255); + zephir_throw_exception_debug(&_12$$11, "phalcon/Mvc/Model/Query.zep", 3263); ZEPHIR_MM_RESTORE(); return; } @@ -5937,7 +5945,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) zephir_read_property(&_11$$10, this_ptr, ZEND_STRL("sqlAliasesModels"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&sqlAliasesModels, &_11$$10); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch(&modelName, &sqlAliasesModels, &columnDomain, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3269); + zephir_array_fetch(&modelName, &sqlAliasesModels, &columnDomain, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3277); if (Z_TYPE_P(&preparedAlias) != IS_STRING) { if (ZEPHIR_IS_EQUAL(&columnDomain, &modelName)) { ZEPHIR_CALL_FUNCTION(&preparedAlias, "lcfirst", &_6, 76, &modelName); @@ -5955,10 +5963,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) ZEPHIR_CPY_WRT(&sqlColumn, &_15$$10); if (Z_TYPE_P(&eager) != IS_NULL) { zephir_array_update_string(&sqlColumn, SL("eager"), &eager, PH_COPY | PH_SEPARATE); - zephir_array_fetch_string(&_16$$15, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3296); + zephir_array_fetch_string(&_16$$15, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3304); zephir_array_update_string(&sqlColumn, SL("eagerType"), &_16$$15, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3299); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3307); RETURN_CTOR(&sqlColumns); } if (ZEPHIR_IS_LONG(&columnType, 354)) { @@ -5967,7 +5975,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) add_assoc_stringl_ex(&_17$$16, SL("type"), SL("scalar")); ZEPHIR_CPY_WRT(&sqlColumn, &_17$$16); zephir_memory_observe(&columnData); - zephir_array_fetch_string(&columnData, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3313); + zephir_array_fetch_string(&columnData, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3321); ZEPHIR_CALL_METHOD(&sqlExprColumn, this_ptr, "getexpression", NULL, 461, &columnData); zephir_check_call_status(); zephir_memory_observe(&balias); @@ -5977,11 +5985,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) } if (Z_TYPE_P(&eager) != IS_NULL) { zephir_array_update_string(&sqlColumn, SL("eager"), &eager, PH_COPY | PH_SEPARATE); - zephir_array_fetch_string(&_18$$18, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3326); + zephir_array_fetch_string(&_18$$18, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3334); zephir_array_update_string(&sqlColumn, SL("eagerType"), &_18$$18, PH_COPY | PH_SEPARATE); } zephir_array_update_string(&sqlColumn, SL("column"), &sqlExprColumn, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3330); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3338); RETURN_CTOR(&sqlColumns); } ZEPHIR_INIT_VAR(&_19); @@ -5990,7 +5998,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) ZEPHIR_CONCAT_SV(&_20, "Unknown type of column ", &columnType); ZEPHIR_CALL_METHOD(NULL, &_19, "__construct", NULL, 33, &_20); zephir_check_call_status(); - zephir_throw_exception_debug(&_19, "phalcon/Mvc/Model/Query.zep", 3335); + zephir_throw_exception_debug(&_19, "phalcon/Mvc/Model/Query.zep", 3343); ZEPHIR_MM_RESTORE(); return; } @@ -6099,7 +6107,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) } else { ZEPHIR_INIT_VAR(&sqlJoinPartialConditions); array_init(&sqlJoinPartialConditions); - zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 3425); + zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 3433); if (Z_TYPE_P(&fields) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _7$$4, _8$$4, _5$$4) { @@ -6120,7 +6128,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) ZEPHIR_CONCAT_SVSVSV(&_11$$6, "The number of fields must be equal to the number of referenced fields in join ", &modelAlias, "-", &joinAlias, ", when preparing: ", &_10$$6); ZEPHIR_CALL_METHOD(NULL, &_9$$6, "__construct", &_12, 33, &_11$$6); zephir_check_call_status(); - zephir_throw_exception_debug(&_9$$6, "phalcon/Mvc/Model/Query.zep", 3397); + zephir_throw_exception_debug(&_9$$6, "phalcon/Mvc/Model/Query.zep", 3405); ZEPHIR_MM_RESTORE(); return; } @@ -6144,7 +6152,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) ZEPHIR_CALL_METHOD(&_14$$5, this_ptr, "getqualified", NULL, 462, &_16$$5); zephir_check_call_status(); zephir_array_update_string(&_13$$5, SL("right"), &_14$$5, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoinPartialConditions, &_13$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3422); + zephir_array_append(&sqlJoinPartialConditions, &_13$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3430); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &fields, "rewind", NULL, 0); @@ -6168,7 +6176,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) ZEPHIR_CONCAT_SVSVSV(&_19$$8, "The number of fields must be equal to the number of referenced fields in join ", &modelAlias, "-", &joinAlias, ", when preparing: ", &_18$$8); ZEPHIR_CALL_METHOD(NULL, &_17$$8, "__construct", &_12, 33, &_19$$8); zephir_check_call_status(); - zephir_throw_exception_debug(&_17$$8, "phalcon/Mvc/Model/Query.zep", 3397); + zephir_throw_exception_debug(&_17$$8, "phalcon/Mvc/Model/Query.zep", 3405); ZEPHIR_MM_RESTORE(); return; } @@ -6192,7 +6200,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) ZEPHIR_CALL_METHOD(&_21$$7, this_ptr, "getqualified", NULL, 462, &_23$$7); zephir_check_call_status(); zephir_array_update_string(&_20$$7, SL("right"), &_21$$7, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoinPartialConditions, &_20$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3422); + zephir_array_append(&sqlJoinPartialConditions, &_20$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3430); ZEPHIR_CALL_METHOD(NULL, &fields, "next", NULL, 0); zephir_check_call_status(); } @@ -6235,7 +6243,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getTable) zephir_get_arrval(&qualifiedName, qualifiedName_param); zephir_memory_observe(&modelName); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&modelName, &qualifiedName, SL("name"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3447); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3455); return; } ZEPHIR_CALL_METHOD(&model, manager, "load", NULL, 0, &modelName); @@ -6318,7 +6326,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getWriteConnection) ZEPHIR_CALL_METHOD(&connection, model, "selectwriteconnection", NULL, 0, &intermediate, &bindParams, &bindTypes); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&connection) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "selectWriteConnection did not return a connection", "phalcon/Mvc/Model/Query.zep", 3485); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "selectWriteConnection did not return a connection", "phalcon/Mvc/Model/Query.zep", 3493); return; } RETURN_CCTOR(&connection); @@ -6379,12 +6387,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete) ZEPHIR_CPY_WRT(&ast, &_0); zephir_memory_observe(&delete); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&delete, &ast, SL("delete"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted DELETE AST", "phalcon/Mvc/Model/Query.zep", 3507); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted DELETE AST", "phalcon/Mvc/Model/Query.zep", 3515); return; } zephir_memory_observe(&tables); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&tables, &delete, SL("tables"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted DELETE AST", "phalcon/Mvc/Model/Query.zep", 3511); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted DELETE AST", "phalcon/Mvc/Model/Query.zep", 3519); return; } ZEPHIR_INIT_VAR(&models); @@ -6408,16 +6416,16 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete) } zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&manager, &_0); - zephir_is_iterable(&deleteTables, 0, "phalcon/Mvc/Model/Query.zep", 3571); + zephir_is_iterable(&deleteTables, 0, "phalcon/Mvc/Model/Query.zep", 3579); if (Z_TYPE_P(&deleteTables) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&deleteTables), _1) { ZEPHIR_INIT_NVAR(&table); ZVAL_COPY(&table, _1); ZEPHIR_OBS_NVAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3535); + zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3543); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3536); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3544); ZEPHIR_CALL_METHOD(&model, &manager, "load", &_3, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0); @@ -6441,17 +6449,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete) ZEPHIR_OBS_NVAR(&alias); if (zephir_array_isset_string_fetch(&alias, &table, SL("alias"), 0)) { zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE); - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3553); - zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3554); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3561); + zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3562); zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&models, &alias, &modelName, PH_COPY | PH_SEPARATE); } else { zephir_array_update_zval(&sqlAliases, &modelName, &source, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliasesModelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3560); + zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3568); zephir_array_update_zval(&models, &modelName, &source, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3564); + zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3572); zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); } else { @@ -6466,9 +6474,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete) ZEPHIR_CALL_METHOD(&table, &deleteTables, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3535); + zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3543); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3536); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3544); ZEPHIR_CALL_METHOD(&model, &manager, "load", &_6, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0); @@ -6491,17 +6499,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete) ZEPHIR_OBS_NVAR(&alias); if (zephir_array_isset_string_fetch(&alias, &table, SL("alias"), 0)) { zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE); - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3553); - zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3554); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3561); + zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3562); zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&models, &alias, &modelName, PH_COPY | PH_SEPARATE); } else { zephir_array_update_zval(&sqlAliases, &modelName, &source, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliasesModelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3560); + zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3568); zephir_array_update_zval(&models, &modelName, &source, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3564); + zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3572); zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &deleteTables, "next", NULL, 0); zephir_check_call_status(); @@ -6588,23 +6596,23 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) zephir_read_property(&_0, this_ptr, ZEND_STRL("ast"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&ast, &_0); if (UNEXPECTED(!(zephir_array_isset_string(&ast, SL("qualifiedName"))))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3605); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3613); return; } if (UNEXPECTED(!(zephir_array_isset_string(&ast, SL("values"))))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3609); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3617); return; } zephir_memory_observe(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &ast, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3612); + zephir_array_fetch_string(&qualifiedName, &ast, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3620); if (UNEXPECTED(!(zephir_array_isset_string(&qualifiedName, SL("name"))))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3616); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3624); return; } zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&manager, &_0); zephir_memory_observe(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3620); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3628); ZEPHIR_CALL_METHOD(&model, &manager, "load", NULL, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0); @@ -6621,8 +6629,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) notQuoting = 0; ZEPHIR_INIT_VAR(&exprValues); array_init(&exprValues); - zephir_array_fetch_string(&_2, &ast, SL("values"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3633); - zephir_is_iterable(&_2, 0, "phalcon/Mvc/Model/Query.zep", 3641); + zephir_array_fetch_string(&_2, &ast, SL("values"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3641); + zephir_is_iterable(&_2, 0, "phalcon/Mvc/Model/Query.zep", 3649); if (Z_TYPE_P(&_2) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_2), _3) { @@ -6631,7 +6639,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_INIT_NVAR(&_5$$7); zephir_create_array(&_5$$7, 2, 0); ZEPHIR_OBS_NVAR(&_6$$7); - zephir_array_fetch_string(&_6$$7, &exprValue, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3636); + zephir_array_fetch_string(&_6$$7, &exprValue, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3644); zephir_array_update_string(&_5$$7, SL("type"), &_6$$7, PH_COPY | PH_SEPARATE); if (notQuoting) { ZVAL_BOOL(&_8$$7, 1); @@ -6641,7 +6649,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_CALL_METHOD(&_7$$7, this_ptr, "getexpression", &_9, 461, &exprValue, &_8$$7); zephir_check_call_status(); zephir_array_update_string(&_5$$7, SL("value"), &_7$$7, PH_COPY | PH_SEPARATE); - zephir_array_append(&exprValues, &_5$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3638); + zephir_array_append(&exprValues, &_5$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3646); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &_2, "rewind", NULL, 0); @@ -6657,7 +6665,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_INIT_NVAR(&_10$$8); zephir_create_array(&_10$$8, 2, 0); ZEPHIR_OBS_NVAR(&_11$$8); - zephir_array_fetch_string(&_11$$8, &exprValue, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3636); + zephir_array_fetch_string(&_11$$8, &exprValue, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3644); zephir_array_update_string(&_10$$8, SL("type"), &_11$$8, PH_COPY | PH_SEPARATE); if (notQuoting) { ZVAL_BOOL(&_13$$8, 1); @@ -6667,7 +6675,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_CALL_METHOD(&_12$$8, this_ptr, "getexpression", &_9, 461, &exprValue, &_13$$8); zephir_check_call_status(); zephir_array_update_string(&_10$$8, SL("value"), &_12$$8, PH_COPY | PH_SEPARATE); - zephir_array_append(&exprValues, &_10$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3638); + zephir_array_append(&exprValues, &_10$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3646); ZEPHIR_CALL_METHOD(NULL, &_2, "next", NULL, 0); zephir_check_call_status(); } @@ -6683,14 +6691,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) if (zephir_array_isset_string_fetch(&fields, &ast, SL("fields"), 0)) { ZEPHIR_INIT_VAR(&sqlFields); array_init(&sqlFields); - zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 3665); + zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 3673); if (Z_TYPE_P(&fields) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&fields), _14$$9) { ZEPHIR_INIT_NVAR(&field); ZVAL_COPY(&field, _14$$9); ZEPHIR_OBS_NVAR(&name); - zephir_array_fetch_string(&name, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3652); + zephir_array_fetch_string(&name, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3660); ZEPHIR_CALL_METHOD(&_16$$10, &metaData, "hasattribute", &_17, 0, &model, &name); zephir_check_call_status(); if (UNEXPECTED(!zephir_is_true(&_16$$10))) { @@ -6701,11 +6709,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_CONCAT_SVSVSV(&_20$$11, "The model '", &modelName, "' doesn't have the attribute '", &name, "', when preparing: ", &_19$$11); ZEPHIR_CALL_METHOD(NULL, &_18$$11, "__construct", &_21, 33, &_20$$11); zephir_check_call_status(); - zephir_throw_exception_debug(&_18$$11, "phalcon/Mvc/Model/Query.zep", 3658); + zephir_throw_exception_debug(&_18$$11, "phalcon/Mvc/Model/Query.zep", 3666); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&sqlFields, &name, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3662); + zephir_array_append(&sqlFields, &name, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3670); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &fields, "rewind", NULL, 0); @@ -6719,7 +6727,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_CALL_METHOD(&field, &fields, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&name); - zephir_array_fetch_string(&name, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3652); + zephir_array_fetch_string(&name, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3660); ZEPHIR_CALL_METHOD(&_22$$12, &metaData, "hasattribute", &_23, 0, &model, &name); zephir_check_call_status(); if (UNEXPECTED(!zephir_is_true(&_22$$12))) { @@ -6730,11 +6738,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_CONCAT_SVSVSV(&_26$$13, "The model '", &modelName, "' doesn't have the attribute '", &name, "', when preparing: ", &_25$$13); ZEPHIR_CALL_METHOD(NULL, &_24$$13, "__construct", &_21, 33, &_26$$13); zephir_check_call_status(); - zephir_throw_exception_debug(&_24$$13, "phalcon/Mvc/Model/Query.zep", 3658); + zephir_throw_exception_debug(&_24$$13, "phalcon/Mvc/Model/Query.zep", 3666); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&sqlFields, &name, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3662); + zephir_array_append(&sqlFields, &name, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3670); ZEPHIR_CALL_METHOD(NULL, &fields, "next", NULL, 0); zephir_check_call_status(); } @@ -6934,12 +6942,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) } zephir_memory_observe(&tables); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&tables, &select, SL("tables"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3701); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3709); return; } zephir_memory_observe(&columns); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&columns, &select, SL("columns"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3705); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3713); return; } RETURN_ON_FAILURE(zephir_property_incr(this_ptr, SL("nestingLevel"))); @@ -6980,26 +6988,26 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_read_property(&_1, this_ptr, ZEND_STRL("metaData"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&metaData, &_1); if (UNEXPECTED(Z_TYPE_P(&manager) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A models-manager is required to execute the query", "phalcon/Mvc/Model/Query.zep", 3772); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A models-manager is required to execute the query", "phalcon/Mvc/Model/Query.zep", 3780); return; } if (UNEXPECTED(Z_TYPE_P(&metaData) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A meta-data is required to execute the query", "phalcon/Mvc/Model/Query.zep", 3778); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A meta-data is required to execute the query", "phalcon/Mvc/Model/Query.zep", 3786); return; } number = 0; ZEPHIR_INIT_VAR(&automaticJoins); array_init(&automaticJoins); - zephir_is_iterable(&selectedModels, 0, "phalcon/Mvc/Model/Query.zep", 3908); + zephir_is_iterable(&selectedModels, 0, "phalcon/Mvc/Model/Query.zep", 3916); if (Z_TYPE_P(&selectedModels) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&selectedModels), _2) { ZEPHIR_INIT_NVAR(&selectedModel); ZVAL_COPY(&selectedModel, _2); ZEPHIR_OBS_NVAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &selectedModel, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3786); + zephir_array_fetch_string(&qualifiedName, &selectedModel, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3794); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3787); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3795); ZEPHIR_CALL_METHOD(&model, &manager, "load", &_4, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&schema, &model, "getschema", NULL, 0); @@ -7024,7 +7032,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SVSV(&_7$$17, "Alias '", &alias, "' is used more than once, when preparing: ", &_6$$17); ZEPHIR_CALL_METHOD(NULL, &_5$$17, "__construct", &_8, 33, &_7$$17); zephir_check_call_status(); - zephir_throw_exception_debug(&_5$$17, "phalcon/Mvc/Model/Query.zep", 3812); + zephir_throw_exception_debug(&_5$$17, "phalcon/Mvc/Model/Query.zep", 3820); ZEPHIR_MM_RESTORE(); return; } @@ -7033,7 +7041,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_array_update_zval(&sqlModelsAliases, &modelName, &alias, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE); if (Z_TYPE_P(&completeSource) == IS_ARRAY) { - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3824); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3832); } else { ZEPHIR_INIT_NVAR(&_9$$19); zephir_create_array(&_9$$19, 3, 0); @@ -7060,7 +7068,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) } else { ZEPHIR_CPY_WRT(&withs, &with); } - zephir_is_iterable(&withs, 0, "phalcon/Mvc/Model/Query.zep", 3900); + zephir_is_iterable(&withs, 0, "phalcon/Mvc/Model/Query.zep", 3908); if (Z_TYPE_P(&withs) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&withs), _10$$21) { @@ -7072,7 +7080,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_13$$24, "AA", &_12$$24); ZEPHIR_CPY_WRT(&joinAlias, &_13$$24); ZEPHIR_OBS_NVAR(&relationModel); - zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3850); + zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3858); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_14, 0, &modelName, &relationModel); zephir_check_call_status(); if (Z_TYPE_P(&relation) == IS_OBJECT) { @@ -7095,7 +7103,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SVSVSV(&_19$$27, "Can't find a relationship between '", &modelName, "' and '", &relationModel, "' when preparing: ", &_18$$27); ZEPHIR_CALL_METHOD(NULL, &_17$$27, "__construct", &_8, 33, &_19$$27); zephir_check_call_status(); - zephir_throw_exception_debug(&_17$$27, "phalcon/Mvc/Model/Query.zep", 3870); + zephir_throw_exception_debug(&_17$$27, "phalcon/Mvc/Model/Query.zep", 3878); ZEPHIR_MM_RESTORE(); return; } @@ -7115,7 +7123,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_array_update_string(&_21$$24, SL("eager"), &alias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_21$$24, SL("eagerType"), &eagerType, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_21$$24, SL("balias"), &bestAlias, PH_COPY | PH_SEPARATE); - zephir_array_append(&selectColumns, &_21$$24, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3884); + zephir_array_append(&selectColumns, &_21$$24, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3892); ZEPHIR_INIT_NVAR(&_22$$24); zephir_create_array(&_22$$24, 3, 0); add_assoc_long_ex(&_22$$24, SL("type"), 360); @@ -7129,7 +7137,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) add_assoc_long_ex(&_23$$24, SL("type"), 355); zephir_array_update_string(&_23$$24, SL("name"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_22$$24, SL("alias"), &_23$$24, PH_COPY | PH_SEPARATE); - zephir_array_append(&automaticJoins, &_22$$24, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3896); + zephir_array_append(&automaticJoins, &_22$$24, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3904); number++; } ZEND_HASH_FOREACH_END(); } else { @@ -7149,7 +7157,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_25$$28, "AA", &_24$$28); ZEPHIR_CPY_WRT(&joinAlias, &_25$$28); ZEPHIR_OBS_NVAR(&relationModel); - zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3850); + zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3858); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_26, 0, &modelName, &relationModel); zephir_check_call_status(); if (Z_TYPE_P(&relation) == IS_OBJECT) { @@ -7172,7 +7180,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SVSVSV(&_31$$31, "Can't find a relationship between '", &modelName, "' and '", &relationModel, "' when preparing: ", &_30$$31); ZEPHIR_CALL_METHOD(NULL, &_29$$31, "__construct", &_8, 33, &_31$$31); zephir_check_call_status(); - zephir_throw_exception_debug(&_29$$31, "phalcon/Mvc/Model/Query.zep", 3870); + zephir_throw_exception_debug(&_29$$31, "phalcon/Mvc/Model/Query.zep", 3878); ZEPHIR_MM_RESTORE(); return; } @@ -7192,7 +7200,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_array_update_string(&_33$$28, SL("eager"), &alias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_33$$28, SL("eagerType"), &eagerType, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_33$$28, SL("balias"), &bestAlias, PH_COPY | PH_SEPARATE); - zephir_array_append(&selectColumns, &_33$$28, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3884); + zephir_array_append(&selectColumns, &_33$$28, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3892); ZEPHIR_INIT_NVAR(&_34$$28); zephir_create_array(&_34$$28, 3, 0); add_assoc_long_ex(&_34$$28, SL("type"), 360); @@ -7206,7 +7214,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) add_assoc_long_ex(&_35$$28, SL("type"), 355); zephir_array_update_string(&_35$$28, SL("name"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_34$$28, SL("alias"), &_35$$28, PH_COPY | PH_SEPARATE); - zephir_array_append(&automaticJoins, &_34$$28, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3896); + zephir_array_append(&automaticJoins, &_34$$28, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3904); number++; ZEPHIR_CALL_METHOD(NULL, &withs, "next", NULL, 0); zephir_check_call_status(); @@ -7214,8 +7222,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) } ZEPHIR_INIT_NVAR(&withItem); } - zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3902); - zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3903); + zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3910); + zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3911); zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); } else { @@ -7230,9 +7238,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CALL_METHOD(&selectedModel, &selectedModels, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &selectedModel, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3786); + zephir_array_fetch_string(&qualifiedName, &selectedModel, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3794); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3787); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3795); ZEPHIR_CALL_METHOD(&model, &manager, "load", &_36, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&schema, &model, "getschema", NULL, 0); @@ -7258,7 +7266,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SVSV(&_40$$36, "Alias '", &alias, "' is used more than once, when preparing: ", &_39$$36); ZEPHIR_CALL_METHOD(NULL, &_38$$36, "__construct", &_8, 33, &_40$$36); zephir_check_call_status(); - zephir_throw_exception_debug(&_38$$36, "phalcon/Mvc/Model/Query.zep", 3812); + zephir_throw_exception_debug(&_38$$36, "phalcon/Mvc/Model/Query.zep", 3820); ZEPHIR_MM_RESTORE(); return; } @@ -7267,7 +7275,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_array_update_zval(&sqlModelsAliases, &modelName, &alias, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE); if (Z_TYPE_P(&completeSource) == IS_ARRAY) { - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3824); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3832); } else { ZEPHIR_INIT_NVAR(&_41$$38); zephir_create_array(&_41$$38, 3, 0); @@ -7295,7 +7303,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) } else { ZEPHIR_CPY_WRT(&withs, &with); } - zephir_is_iterable(&withs, 0, "phalcon/Mvc/Model/Query.zep", 3900); + zephir_is_iterable(&withs, 0, "phalcon/Mvc/Model/Query.zep", 3908); if (Z_TYPE_P(&withs) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&withs), _43$$40) { @@ -7307,7 +7315,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_46$$43, "AA", &_45$$43); ZEPHIR_CPY_WRT(&joinAlias, &_46$$43); ZEPHIR_OBS_NVAR(&relationModel); - zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3850); + zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3858); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_47, 0, &modelName, &relationModel); zephir_check_call_status(); if (Z_TYPE_P(&relation) == IS_OBJECT) { @@ -7330,7 +7338,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SVSVSV(&_52$$46, "Can't find a relationship between '", &modelName, "' and '", &relationModel, "' when preparing: ", &_51$$46); ZEPHIR_CALL_METHOD(NULL, &_50$$46, "__construct", &_8, 33, &_52$$46); zephir_check_call_status(); - zephir_throw_exception_debug(&_50$$46, "phalcon/Mvc/Model/Query.zep", 3870); + zephir_throw_exception_debug(&_50$$46, "phalcon/Mvc/Model/Query.zep", 3878); ZEPHIR_MM_RESTORE(); return; } @@ -7350,7 +7358,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_array_update_string(&_54$$43, SL("eager"), &alias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_54$$43, SL("eagerType"), &eagerType, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_54$$43, SL("balias"), &bestAlias, PH_COPY | PH_SEPARATE); - zephir_array_append(&selectColumns, &_54$$43, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3884); + zephir_array_append(&selectColumns, &_54$$43, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3892); ZEPHIR_INIT_NVAR(&_55$$43); zephir_create_array(&_55$$43, 3, 0); add_assoc_long_ex(&_55$$43, SL("type"), 360); @@ -7364,7 +7372,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) add_assoc_long_ex(&_56$$43, SL("type"), 355); zephir_array_update_string(&_56$$43, SL("name"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_55$$43, SL("alias"), &_56$$43, PH_COPY | PH_SEPARATE); - zephir_array_append(&automaticJoins, &_55$$43, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3896); + zephir_array_append(&automaticJoins, &_55$$43, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3904); number++; } ZEND_HASH_FOREACH_END(); } else { @@ -7384,7 +7392,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_58$$47, "AA", &_57$$47); ZEPHIR_CPY_WRT(&joinAlias, &_58$$47); ZEPHIR_OBS_NVAR(&relationModel); - zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3850); + zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3858); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_59, 0, &modelName, &relationModel); zephir_check_call_status(); if (Z_TYPE_P(&relation) == IS_OBJECT) { @@ -7407,7 +7415,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SVSVSV(&_64$$50, "Can't find a relationship between '", &modelName, "' and '", &relationModel, "' when preparing: ", &_63$$50); ZEPHIR_CALL_METHOD(NULL, &_62$$50, "__construct", &_8, 33, &_64$$50); zephir_check_call_status(); - zephir_throw_exception_debug(&_62$$50, "phalcon/Mvc/Model/Query.zep", 3870); + zephir_throw_exception_debug(&_62$$50, "phalcon/Mvc/Model/Query.zep", 3878); ZEPHIR_MM_RESTORE(); return; } @@ -7427,7 +7435,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_array_update_string(&_66$$47, SL("eager"), &alias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_66$$47, SL("eagerType"), &eagerType, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_66$$47, SL("balias"), &bestAlias, PH_COPY | PH_SEPARATE); - zephir_array_append(&selectColumns, &_66$$47, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3884); + zephir_array_append(&selectColumns, &_66$$47, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3892); ZEPHIR_INIT_NVAR(&_67$$47); zephir_create_array(&_67$$47, 3, 0); add_assoc_long_ex(&_67$$47, SL("type"), 360); @@ -7441,7 +7449,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) add_assoc_long_ex(&_68$$47, SL("type"), 355); zephir_array_update_string(&_68$$47, SL("name"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_67$$47, SL("alias"), &_68$$47, PH_COPY | PH_SEPARATE); - zephir_array_append(&automaticJoins, &_67$$47, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3896); + zephir_array_append(&automaticJoins, &_67$$47, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3904); number++; ZEPHIR_CALL_METHOD(NULL, &withs, "next", NULL, 0); zephir_check_call_status(); @@ -7449,8 +7457,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) } ZEPHIR_INIT_NVAR(&withItem); } - zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3902); - zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3903); + zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3910); + zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3911); zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &selectedModels, "next", NULL, 0); zephir_check_call_status(); @@ -7511,7 +7519,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_fast_array_merge(&_81$$55, &joins, &automaticJoins); zephir_array_update_string(&select, SL("joins"), &_81$$55, PH_COPY | PH_SEPARATE); } else { - zephir_array_append(&automaticJoins, &joins, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3939); + zephir_array_append(&automaticJoins, &joins, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3947); zephir_array_update_string(&select, SL("joins"), &automaticJoins, PH_COPY | PH_SEPARATE); } } @@ -7530,7 +7538,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) position = 0; ZEPHIR_INIT_VAR(&sqlColumnAliases); array_init(&sqlColumnAliases); - zephir_is_iterable(&selectColumns, 0, "phalcon/Mvc/Model/Query.zep", 3990); + zephir_is_iterable(&selectColumns, 0, "phalcon/Mvc/Model/Query.zep", 3998); if (Z_TYPE_P(&selectColumns) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&selectColumns), _82) { @@ -7538,7 +7546,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZVAL_COPY(&column, _82); ZEPHIR_CALL_METHOD(&_84$$60, this_ptr, "getselectcolumn", &_85, 477, &column); zephir_check_call_status(); - zephir_is_iterable(&_84$$60, 0, "phalcon/Mvc/Model/Query.zep", 3988); + zephir_is_iterable(&_84$$60, 0, "phalcon/Mvc/Model/Query.zep", 3996); if (Z_TYPE_P(&_84$$60) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_84$$60), _86$$60) { @@ -7555,7 +7563,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) if (zephir_array_isset_string_fetch(&alias, &sqlColumn, SL("balias"), 0)) { zephir_array_update_zval(&sqlColumns, &alias, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_string(&_88$$65, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3978); + zephir_array_fetch_string(&_88$$65, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3986); if (ZEPHIR_IS_STRING(&_88$$65, "scalar")) { ZEPHIR_INIT_NVAR(&_89$$66); ZVAL_LONG(&_89$$66, position); @@ -7563,7 +7571,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_90$$66, "_", &_89$$66); zephir_array_update_zval(&sqlColumns, &_90$$66, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3981); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3989); } } } @@ -7591,7 +7599,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) if (zephir_array_isset_string_fetch(&alias, &sqlColumn, SL("balias"), 0)) { zephir_array_update_zval(&sqlColumns, &alias, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_string(&_91$$72, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3978); + zephir_array_fetch_string(&_91$$72, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3986); if (ZEPHIR_IS_STRING(&_91$$72, "scalar")) { ZEPHIR_INIT_NVAR(&_92$$73); ZVAL_LONG(&_92$$73, position); @@ -7599,7 +7607,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_93$$73, "_", &_92$$73); zephir_array_update_zval(&sqlColumns, &_93$$73, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3981); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3989); } } } @@ -7623,7 +7631,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_94$$75, this_ptr, "getselectcolumn", &_85, 477, &column); zephir_check_call_status(); - zephir_is_iterable(&_94$$75, 0, "phalcon/Mvc/Model/Query.zep", 3988); + zephir_is_iterable(&_94$$75, 0, "phalcon/Mvc/Model/Query.zep", 3996); if (Z_TYPE_P(&_94$$75) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_94$$75), _95$$75) { @@ -7640,7 +7648,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) if (zephir_array_isset_string_fetch(&alias, &sqlColumn, SL("balias"), 0)) { zephir_array_update_zval(&sqlColumns, &alias, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_string(&_97$$80, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3978); + zephir_array_fetch_string(&_97$$80, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3986); if (ZEPHIR_IS_STRING(&_97$$80, "scalar")) { ZEPHIR_INIT_NVAR(&_98$$81); ZVAL_LONG(&_98$$81, position); @@ -7648,7 +7656,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_99$$81, "_", &_98$$81); zephir_array_update_zval(&sqlColumns, &_99$$81, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3981); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3989); } } } @@ -7676,7 +7684,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) if (zephir_array_isset_string_fetch(&alias, &sqlColumn, SL("balias"), 0)) { zephir_array_update_zval(&sqlColumns, &alias, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_string(&_100$$87, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3978); + zephir_array_fetch_string(&_100$$87, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3986); if (ZEPHIR_IS_STRING(&_100$$87, "scalar")) { ZEPHIR_INIT_NVAR(&_101$$88); ZVAL_LONG(&_101$$88, position); @@ -7684,7 +7692,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_102$$88, "_", &_101$$88); zephir_array_update_zval(&sqlColumns, &_102$$88, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3981); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3989); } } } @@ -7833,17 +7841,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_CPY_WRT(&ast, &_0); zephir_memory_observe(&update); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&update, &ast, SL("update"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4067); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4075); return; } zephir_memory_observe(&tables); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&tables, &update, SL("tables"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4071); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4079); return; } zephir_memory_observe(&values); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&values, &update, SL("values"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4075); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4083); return; } ZEPHIR_INIT_VAR(&models); @@ -7867,16 +7875,16 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) } zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&manager, &_0); - zephir_is_iterable(&updateTables, 0, "phalcon/Mvc/Model/Query.zep", 4141); + zephir_is_iterable(&updateTables, 0, "phalcon/Mvc/Model/Query.zep", 4149); if (Z_TYPE_P(&updateTables) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&updateTables), _1) { ZEPHIR_INIT_NVAR(&table); ZVAL_COPY(&table, _1); ZEPHIR_OBS_NVAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4099); + zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4107); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4100); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4108); ZEPHIR_CALL_METHOD(&model, &manager, "load", &_3, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0); @@ -7900,17 +7908,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_OBS_NVAR(&alias); if (zephir_array_isset_string_fetch(&alias, &table, SL("alias"), 0)) { zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE); - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4123); - zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4124); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4131); + zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4132); zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&models, &alias, &modelName, PH_COPY | PH_SEPARATE); } else { zephir_array_update_zval(&sqlAliases, &modelName, &source, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliasesModelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4130); + zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4138); zephir_array_update_zval(&models, &modelName, &source, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4134); + zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4142); zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); } else { @@ -7925,9 +7933,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_CALL_METHOD(&table, &updateTables, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4099); + zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4107); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4100); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4108); ZEPHIR_CALL_METHOD(&model, &manager, "load", &_6, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0); @@ -7950,17 +7958,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_OBS_NVAR(&alias); if (zephir_array_isset_string_fetch(&alias, &table, SL("alias"), 0)) { zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE); - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4123); - zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4124); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4131); + zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4132); zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&models, &alias, &modelName, PH_COPY | PH_SEPARATE); } else { zephir_array_update_zval(&sqlAliases, &modelName, &source, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliasesModelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4130); + zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4138); zephir_array_update_zval(&models, &modelName, &source, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4134); + zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4142); zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &updateTables, "next", NULL, 0); zephir_check_call_status(); @@ -7983,13 +7991,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_CPY_WRT(&updateValues, &values); } notQuoting = 0; - zephir_is_iterable(&updateValues, 0, "phalcon/Mvc/Model/Query.zep", 4165); + zephir_is_iterable(&updateValues, 0, "phalcon/Mvc/Model/Query.zep", 4173); if (Z_TYPE_P(&updateValues) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&updateValues), _9) { ZEPHIR_INIT_NVAR(&updateValue); ZVAL_COPY(&updateValue, _9); - zephir_array_fetch_string(&_12$$20, &updateValue, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 4157); + zephir_array_fetch_string(&_12$$20, &updateValue, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 4165); if (notQuoting) { ZVAL_BOOL(&_13$$20, 1); } else { @@ -7997,13 +8005,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) } ZEPHIR_CALL_METHOD(&_11$$20, this_ptr, "getexpression", &_14, 461, &_12$$20, &_13$$20); zephir_check_call_status(); - zephir_array_append(&sqlFields, &_11$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4157); + zephir_array_append(&sqlFields, &_11$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4165); ZEPHIR_OBS_NVAR(&exprColumn); - zephir_array_fetch_string(&exprColumn, &updateValue, SL("expr"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4158); + zephir_array_fetch_string(&exprColumn, &updateValue, SL("expr"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4166); ZEPHIR_INIT_NVAR(&_15$$20); zephir_create_array(&_15$$20, 2, 0); ZEPHIR_OBS_NVAR(&_16$$20); - zephir_array_fetch_string(&_16$$20, &exprColumn, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4160); + zephir_array_fetch_string(&_16$$20, &exprColumn, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4168); zephir_array_update_string(&_15$$20, SL("type"), &_16$$20, PH_COPY | PH_SEPARATE); if (notQuoting) { ZVAL_BOOL(&_18$$20, 1); @@ -8013,7 +8021,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_CALL_METHOD(&_17$$20, this_ptr, "getexpression", &_14, 461, &exprColumn, &_18$$20); zephir_check_call_status(); zephir_array_update_string(&_15$$20, SL("value"), &_17$$20, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlValues, &_15$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4162); + zephir_array_append(&sqlValues, &_15$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4170); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &updateValues, "rewind", NULL, 0); @@ -8026,7 +8034,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) } ZEPHIR_CALL_METHOD(&updateValue, &updateValues, "current", NULL, 0); zephir_check_call_status(); - zephir_array_fetch_string(&_20$$21, &updateValue, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 4157); + zephir_array_fetch_string(&_20$$21, &updateValue, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 4165); if (notQuoting) { ZVAL_BOOL(&_21$$21, 1); } else { @@ -8034,13 +8042,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) } ZEPHIR_CALL_METHOD(&_19$$21, this_ptr, "getexpression", &_14, 461, &_20$$21, &_21$$21); zephir_check_call_status(); - zephir_array_append(&sqlFields, &_19$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4157); + zephir_array_append(&sqlFields, &_19$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4165); ZEPHIR_OBS_NVAR(&exprColumn); - zephir_array_fetch_string(&exprColumn, &updateValue, SL("expr"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4158); + zephir_array_fetch_string(&exprColumn, &updateValue, SL("expr"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4166); ZEPHIR_INIT_NVAR(&_22$$21); zephir_create_array(&_22$$21, 2, 0); ZEPHIR_OBS_NVAR(&_23$$21); - zephir_array_fetch_string(&_23$$21, &exprColumn, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4160); + zephir_array_fetch_string(&_23$$21, &exprColumn, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4168); zephir_array_update_string(&_22$$21, SL("type"), &_23$$21, PH_COPY | PH_SEPARATE); if (notQuoting) { ZVAL_BOOL(&_25$$21, 1); @@ -8050,7 +8058,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_CALL_METHOD(&_24$$21, this_ptr, "getexpression", &_14, 461, &exprColumn, &_25$$21); zephir_check_call_status(); zephir_array_update_string(&_22$$21, SL("value"), &_24$$21, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlValues, &_22$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4162); + zephir_array_append(&sqlValues, &_22$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4170); ZEPHIR_CALL_METHOD(NULL, &updateValues, "next", NULL, 0); zephir_check_call_status(); } diff --git a/ext/phalcon/mvc/model/query/builder.zep.c b/ext/phalcon/mvc/model/query/builder.zep.c index 06c05cc5ab2..ba8bcc0a140 100644 --- a/ext/phalcon/mvc/model/query/builder.zep.c +++ b/ext/phalcon/mvc/model/query/builder.zep.c @@ -2365,7 +2365,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, limit) offset = &__$null; } ZVAL_LONG(&_0, limit); - ZEPHIR_CALL_FUNCTION(&_1, "abs", NULL, 284, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "abs", NULL, 285, &_0); zephir_check_call_status(); limit = zephir_get_numberval(&_1); if (UNEXPECTED(limit == 0)) { @@ -2376,7 +2376,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, limit) zephir_update_property_zval(this_ptr, ZEND_STRL("limit"), &_0); if (zephir_is_numeric(offset)) { ZVAL_LONG(&_2$$4, zephir_get_intval(offset)); - ZEPHIR_CALL_FUNCTION(&_3$$4, "abs", NULL, 284, &_2$$4); + ZEPHIR_CALL_FUNCTION(&_3$$4, "abs", NULL, 285, &_2$$4); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("offset"), &_3$$4); } @@ -3134,7 +3134,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, conditionBetween) object_init_ex(&_1$$3, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "Operator % is not available."); - ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 117, &_2$$3, &operator); + ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 118, &_2$$3, &operator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 33, &_3$$3); zephir_check_call_status(); @@ -3250,7 +3250,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, conditionIn) object_init_ex(&_1$$3, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "Operator % is not available."); - ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 117, &_2$$3, &operator); + ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 118, &_2$$3, &operator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 33, &_3$$3); zephir_check_call_status(); @@ -3405,7 +3405,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, conditionNotBetween) object_init_ex(&_1$$3, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "Operator % is not available."); - ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 117, &_2$$3, &operator); + ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 118, &_2$$3, &operator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 33, &_3$$3); zephir_check_call_status(); @@ -3521,7 +3521,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, conditionNotIn) object_init_ex(&_1$$3, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "Operator % is not available."); - ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 117, &_2$$3, &operator); + ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 118, &_2$$3, &operator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 33, &_3$$3); zephir_check_call_status(); diff --git a/ext/phalcon/mvc/model/resultset.zep.c b/ext/phalcon/mvc/model/resultset.zep.c index 7d0abfa4ed2..60a5b46df6b 100644 --- a/ext/phalcon/mvc/model/resultset.zep.c +++ b/ext/phalcon/mvc/model/resultset.zep.c @@ -75,6 +75,7 @@ * @template TKey * @template TValue * @implements Iterator + * @implements ArrayAccess */ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Model_Resultset) { @@ -217,7 +218,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset, __construct) ZEPHIR_CONCAT_SS(&_7$$5, "Cache service must be an object implementing ", "Phalcon\\Cache\\CacheInterface or Psr\\SimpleCache\\CacheInterface"); ZEPHIR_CALL_METHOD(NULL, &_6$$5, "__construct", NULL, 33, &_7$$5); zephir_check_call_status(); - zephir_throw_exception_debug(&_6$$5, "phalcon/Mvc/Model/Resultset.zep", 168); + zephir_throw_exception_debug(&_6$$5, "phalcon/Mvc/Model/Resultset.zep", 169); ZEPHIR_MM_RESTORE(); return; } @@ -316,7 +317,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset, delete) zephir_check_call_status(); if (transaction == 0) { if (UNEXPECTED(!((zephir_method_exists_ex(&record, ZEND_STRL("getwriteconnection")) == SUCCESS)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The returned record is not valid", "phalcon/Mvc/Model/Resultset.zep", 242); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The returned record is not valid", "phalcon/Mvc/Model/Resultset.zep", 243); return; } ZEPHIR_CALL_METHOD(&connection, &record, "getwriteconnection", NULL, 0); @@ -422,7 +423,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset, filter) zephir_check_call_status(); continue; } - zephir_array_append(&records, &processedRecord, PH_SEPARATE, "phalcon/Mvc/Model/Resultset.zep", 336); + zephir_array_append(&records, &processedRecord, PH_SEPARATE, "phalcon/Mvc/Model/Resultset.zep", 337); ZEPHIR_CALL_METHOD(NULL, this_ptr, "next", &_5, 0); zephir_check_call_status(); } @@ -615,9 +616,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset, jsonSerialize) if (_3$$3) { ZEPHIR_CALL_METHOD(&_4$$4, ¤t, "jsonserialize", NULL, 0); zephir_check_call_status(); - zephir_array_append(&records, &_4$$4, PH_SEPARATE, "phalcon/Mvc/Model/Resultset.zep", 461); + zephir_array_append(&records, &_4$$4, PH_SEPARATE, "phalcon/Mvc/Model/Resultset.zep", 462); } else { - zephir_array_append(&records, ¤t, PH_SEPARATE, "phalcon/Mvc/Model/Resultset.zep", 463); + zephir_array_append(&records, ¤t, PH_SEPARATE, "phalcon/Mvc/Model/Resultset.zep", 464); } ZEPHIR_CALL_METHOD(NULL, this_ptr, "next", &_5, 0); zephir_check_call_status(); @@ -692,7 +693,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset, offsetGet) zephir_fetch_params(1, 1, 0, &index); zephir_read_property(&_0, this_ptr, ZEND_STRL("count"), PH_NOISY_CC | PH_READONLY); if (UNEXPECTED(ZEPHIR_GE(index, &_0))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The index does not exist in the cursor", "phalcon/Mvc/Model/Resultset.zep", 503); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The index does not exist in the cursor", "phalcon/Mvc/Model/Resultset.zep", 504); return; } ZEPHIR_CALL_METHOD(NULL, this_ptr, "seek", NULL, 93, index); @@ -737,7 +738,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset, offsetSet) Z_PARAM_ZVAL(value) ZEND_PARSE_PARAMETERS_END(); zephir_fetch_params_without_memory_grow(2, 0, &offset, &value); - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_model_exception_ce, "Cursor is an immutable ArrayAccess object", "phalcon/Mvc/Model/Resultset.zep", 530); + ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_model_exception_ce, "Cursor is an immutable ArrayAccess object", "phalcon/Mvc/Model/Resultset.zep", 531); return; } @@ -753,7 +754,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset, offsetUnset) Z_PARAM_ZVAL(offset) ZEND_PARSE_PARAMETERS_END(); zephir_fetch_params_without_memory_grow(1, 0, &offset); - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_model_exception_ce, "Cursor is an immutable ArrayAccess object", "phalcon/Mvc/Model/Resultset.zep", 538); + ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_model_exception_ce, "Cursor is an immutable ArrayAccess object", "phalcon/Mvc/Model/Resultset.zep", 539); return; } @@ -964,7 +965,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset, update) zephir_check_call_status(); if (transaction == 0) { if (UNEXPECTED(!((zephir_method_exists_ex(&record, ZEND_STRL("getwriteconnection")) == SUCCESS)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The returned record is not valid", "phalcon/Mvc/Model/Resultset.zep", 655); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The returned record is not valid", "phalcon/Mvc/Model/Resultset.zep", 656); return; } ZEPHIR_CALL_METHOD(&connection, &record, "getwriteconnection", NULL, 0); diff --git a/ext/phalcon/mvc/router/annotations.zep.c b/ext/phalcon/mvc/router/annotations.zep.c index 7d20cfa50e1..dd220cc9b51 100644 --- a/ext/phalcon/mvc/router/annotations.zep.c +++ b/ext/phalcon/mvc/router/annotations.zep.c @@ -861,7 +861,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Annotations, processActionAnnotation) zephir_read_property(&_2, this_ptr, ZEND_STRL("actionPreformatCallback"), PH_NOISY_CC | PH_READONLY); if (Z_TYPE_P(&_2) != IS_NULL) { zephir_read_property(&_3$$6, this_ptr, ZEND_STRL("actionPreformatCallback"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_4$$6, "call_user_func", NULL, 188, &_3$$6, &proxyActionName); + ZEPHIR_CALL_FUNCTION(&_4$$6, "call_user_func", NULL, 189, &_3$$6, &proxyActionName); zephir_check_call_status(); ZEPHIR_CPY_WRT(&proxyActionName, &_4$$6); } diff --git a/ext/phalcon/mvc/view.zep.c b/ext/phalcon/mvc/view.zep.c index 1ff206f1bb3..11efd0e1ff0 100644 --- a/ext/phalcon/mvc/view.zep.c +++ b/ext/phalcon/mvc/view.zep.c @@ -2343,7 +2343,7 @@ PHP_METHOD(Phalcon_Mvc_View, loadTemplateEngines) ZEPHIR_CALL_CE_STATIC(&_7$$9, _8$$9, "bind", &_9, 0, &engineService, &di); zephir_check_call_status(); ZEPHIR_CPY_WRT(&engineService, &_7$$9); - ZEPHIR_CALL_FUNCTION(&_7$$9, "call_user_func", &_10, 188, &engineService, this_ptr); + ZEPHIR_CALL_FUNCTION(&_7$$9, "call_user_func", &_10, 189, &engineService, this_ptr); zephir_check_call_status(); zephir_array_update_zval(&engines, &extension, &_7$$9, PH_COPY | PH_SEPARATE); } else { @@ -2388,7 +2388,7 @@ PHP_METHOD(Phalcon_Mvc_View, loadTemplateEngines) ZEPHIR_CALL_CE_STATIC(&_16$$15, _17$$15, "bind", &_9, 0, &engineService, &di); zephir_check_call_status(); ZEPHIR_CPY_WRT(&engineService, &_16$$15); - ZEPHIR_CALL_FUNCTION(&_16$$15, "call_user_func", &_10, 188, &engineService, this_ptr); + ZEPHIR_CALL_FUNCTION(&_16$$15, "call_user_func", &_10, 189, &engineService, this_ptr); zephir_check_call_status(); zephir_array_update_zval(&engines, &extension, &_16$$15, PH_COPY | PH_SEPARATE); } else { diff --git a/ext/phalcon/mvc/view/engine/volt.zep.c b/ext/phalcon/mvc/view/engine/volt.zep.c index 6817fc8258b..285bccd8ce6 100644 --- a/ext/phalcon/mvc/view/engine/volt.zep.c +++ b/ext/phalcon/mvc/view/engine/volt.zep.c @@ -120,7 +120,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, callMacro) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_RETURN_CALL_FUNCTION("call_user_func", NULL, 188, ¯o, &arguments); + ZEPHIR_RETURN_CALL_FUNCTION("call_user_func", NULL, 189, ¯o, &arguments); zephir_check_call_status(); RETURN_MM(); } @@ -182,12 +182,12 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, convertEncoding) _1 = ZEPHIR_IS_STRING_IDENTICAL(&from, "utf8"); } if (_1) { - ZEPHIR_RETURN_CALL_FUNCTION("utf8_decode", NULL, 285, &text); + ZEPHIR_RETURN_CALL_FUNCTION("utf8_decode", NULL, 287, &text); zephir_check_call_status(); RETURN_MM(); } if ((zephir_function_exists_ex(ZEND_STRL("mb_convert_encoding")) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 327, &text, &from, &to); + ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 329, &text, &from, &to); zephir_check_call_status(); RETURN_MM(); } @@ -344,7 +344,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, length) RETURN_MM_LONG(zephir_fast_count_int(item)); } if ((zephir_function_exists_ex(ZEND_STRL("mb_strlen")) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("mb_strlen", NULL, 246, item); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strlen", NULL, 247, item); zephir_check_call_status(); RETURN_MM(); } @@ -732,12 +732,12 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, slice) if ((zephir_function_exists_ex(ZEND_STRL("mb_substr")) == SUCCESS)) { if (Z_TYPE_P(&length) != IS_NULL) { ZVAL_LONG(&_6$$11, start); - ZEPHIR_RETURN_CALL_FUNCTION("mb_substr", NULL, 228, value, &_6$$11, &length); + ZEPHIR_RETURN_CALL_FUNCTION("mb_substr", NULL, 229, value, &_6$$11, &length); zephir_check_call_status(); RETURN_MM(); } ZVAL_LONG(&_7$$10, start); - ZEPHIR_RETURN_CALL_FUNCTION("mb_substr", NULL, 228, value, &_7$$10); + ZEPHIR_RETURN_CALL_FUNCTION("mb_substr", NULL, 229, value, &_7$$10); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/mvc/view/engine/volt/compiler.zep.c b/ext/phalcon/mvc/view/engine/volt/compiler.zep.c index 0bc809d718d..47076b0920e 100644 --- a/ext/phalcon/mvc/view/engine/volt/compiler.zep.c +++ b/ext/phalcon/mvc/view/engine/volt/compiler.zep.c @@ -3892,7 +3892,7 @@ 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, 270, &funcArguments, &_4$$7); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 271, &funcArguments, &_4$$7); ZEPHIR_UNREF(&funcArguments); zephir_check_call_status(); } diff --git a/ext/phalcon/mvc/view/simple.zep.c b/ext/phalcon/mvc/view/simple.zep.c index 81d3c7fbdf3..d26c47e147c 100644 --- a/ext/phalcon/mvc/view/simple.zep.c +++ b/ext/phalcon/mvc/view/simple.zep.c @@ -784,7 +784,7 @@ PHP_METHOD(Phalcon_Mvc_View_Simple, loadTemplateEngines) ZEPHIR_CALL_CE_STATIC(&_7$$9, _8$$9, "bind", &_9, 0, &engineService, &di); zephir_check_call_status(); ZEPHIR_CPY_WRT(&engineService, &_7$$9); - ZEPHIR_CALL_FUNCTION(&engineObject, "call_user_func", &_10, 188, &engineService, this_ptr); + ZEPHIR_CALL_FUNCTION(&engineObject, "call_user_func", &_10, 189, &engineService, this_ptr); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&engineObject, &engineService); @@ -827,7 +827,7 @@ PHP_METHOD(Phalcon_Mvc_View_Simple, loadTemplateEngines) ZEPHIR_CALL_CE_STATIC(&_15$$15, _16$$15, "bind", &_9, 0, &engineService, &di); zephir_check_call_status(); ZEPHIR_CPY_WRT(&engineService, &_15$$15); - ZEPHIR_CALL_FUNCTION(&engineObject, "call_user_func", &_10, 188, &engineService, this_ptr); + ZEPHIR_CALL_FUNCTION(&engineObject, "call_user_func", &_10, 189, &engineService, this_ptr); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&engineObject, &engineService); diff --git a/ext/phalcon/paginator/adapter/model.zep.c b/ext/phalcon/paginator/adapter/model.zep.c index 1de534fe7a3..a0cadde6c71 100644 --- a/ext/phalcon/paginator/adapter/model.zep.c +++ b/ext/phalcon/paginator/adapter/model.zep.c @@ -165,7 +165,7 @@ PHP_METHOD(Phalcon_Paginator_Adapter_Model, paginate) ZEPHIR_INIT_VAR(&_6); ZVAL_STRING(&_6, "count"); zephir_array_fast_append(&_5, &_6); - ZEPHIR_CALL_FUNCTION(&rowCountResult, "call_user_func", NULL, 188, &_5, ¶meters); + ZEPHIR_CALL_FUNCTION(&rowCountResult, "call_user_func", NULL, 189, &_5, ¶meters); zephir_check_call_status(); if (Z_TYPE_P(&rowCountResult) == IS_OBJECT) { ZEPHIR_CALL_METHOD(&_7$$6, &rowCountResult, "count", NULL, 0); @@ -192,7 +192,7 @@ PHP_METHOD(Phalcon_Paginator_Adapter_Model, paginate) ZEPHIR_INIT_VAR(&_11$$10); ZVAL_STRING(&_11$$10, "find"); zephir_array_fast_append(&_10$$10, &_11$$10); - ZEPHIR_CALL_FUNCTION(&_12$$10, "call_user_func", NULL, 188, &_10$$10, ¶meters); + ZEPHIR_CALL_FUNCTION(&_12$$10, "call_user_func", NULL, 189, &_10$$10, ¶meters); zephir_check_call_status(); ZEPHIR_CPY_WRT(&pageItems, &_12$$10); } diff --git a/ext/phalcon/session/adapter/stream.zep.c b/ext/phalcon/session/adapter/stream.zep.c index ffd513e252b..99a20f7299b 100644 --- a/ext/phalcon/session/adapter/stream.zep.c +++ b/ext/phalcon/session/adapter/stream.zep.c @@ -169,7 +169,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, destroy) _2 = zephir_is_true(&_3); } if (_2) { - ZEPHIR_CALL_FUNCTION(NULL, "unlink", NULL, 123, &file); + ZEPHIR_CALL_FUNCTION(NULL, "unlink", NULL, 124, &file); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -259,7 +259,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, gc) _10$$7 = ZEPHIR_LT(&_11$$7, &time); } if (_10$$7) { - ZEPHIR_CALL_FUNCTION(NULL, "unlink", &_12, 123, &file); + ZEPHIR_CALL_FUNCTION(NULL, "unlink", &_12, 124, &file); zephir_check_call_status(); } } ZEND_HASH_FOREACH_END(); @@ -287,7 +287,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, gc) _15$$9 = ZEPHIR_LT(&_16$$9, &time); } if (_15$$9) { - ZEPHIR_CALL_FUNCTION(NULL, "unlink", &_12, 123, &file); + ZEPHIR_CALL_FUNCTION(NULL, "unlink", &_12, 124, &file); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(NULL, &glob, "next", NULL, 0); @@ -359,7 +359,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, read) ZEPHIR_CALL_METHOD(&pointer, this_ptr, "phpfopen", NULL, 0, &name, &_3$$3); zephir_check_call_status(); ZVAL_LONG(&_4$$3, 1); - ZEPHIR_CALL_FUNCTION(&_5$$3, "flock", NULL, 132, &pointer, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "flock", NULL, 133, &pointer, &_4$$3); zephir_check_call_status(); if (zephir_is_true(&_5$$3)) { ZEPHIR_CALL_METHOD(&data, this_ptr, "phpfilegetcontents", NULL, 0, &name); @@ -626,7 +626,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, phpFilePutContents) context = &__$null; } ZVAL_LONG(&_0, flags); - ZEPHIR_RETURN_CALL_FUNCTION("file_put_contents", NULL, 139, &filename, data, &_0, context); + ZEPHIR_RETURN_CALL_FUNCTION("file_put_contents", NULL, 140, &filename, data, &_0, context); zephir_check_call_status(); RETURN_MM(); } @@ -657,7 +657,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, phpFopen) zephir_fetch_params(1, 2, 0, &filename_param, &mode_param); zephir_get_strval(&filename, filename_param); zephir_get_strval(&mode, mode_param); - ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 140, &filename, &mode); + ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 141, &filename, &mode); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/storage/adapter/libmemcached.zep.c b/ext/phalcon/storage/adapter/libmemcached.zep.c index ad08cf9ba9c..5c428b077d8 100644 --- a/ext/phalcon/storage/adapter/libmemcached.zep.c +++ b/ext/phalcon/storage/adapter/libmemcached.zep.c @@ -329,22 +329,22 @@ PHP_METHOD(Phalcon_Storage_Adapter_Libmemcached, getAdapter) zephir_check_call_status(); ZEPHIR_INIT_VAR(&failover); zephir_create_array(&failover, 5, 0); - add_index_long(&failover, 14, 10); + add_index_long(&failover, 14, 50); add_index_long(&failover, 9, 1); add_index_long(&failover, 21, 2); zephir_array_update_long(&failover, 35, &__$true, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY); add_index_long(&failover, 15, 1); - ZEPHIR_INIT_NVAR(&_7$$4); - zephir_fast_array_merge(&_7$$4, &failover, &client); - ZEPHIR_CPY_WRT(&client, &_7$$4); - ZEPHIR_CALL_METHOD(&_9$$4, this_ptr, "setoptions", NULL, 109, &connection, &client); + ZEPHIR_CALL_FUNCTION(&_9$$4, "array_replace", NULL, 109, &failover, &client); + zephir_check_call_status(); + ZEPHIR_CPY_WRT(&client, &_9$$4); + ZEPHIR_CALL_METHOD(&_9$$4, this_ptr, "setoptions", NULL, 110, &connection, &client); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_10$$4, &_9$$4, "setservers", NULL, 110, &connection, &servers); + ZEPHIR_CALL_METHOD(&_10$$4, &_9$$4, "setservers", NULL, 111, &connection, &servers); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_10$$4, "setsasl", NULL, 111, &connection, &saslUser, &saslPass); + ZEPHIR_CALL_METHOD(NULL, &_10$$4, "setsasl", NULL, 112, &connection, &saslUser, &saslPass); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "setserializer", NULL, 112, &connection); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setserializer", NULL, 113, &connection); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("adapter"), &connection); } diff --git a/ext/phalcon/storage/adapter/redis.zep.c b/ext/phalcon/storage/adapter/redis.zep.c index f2d1a1dbf28..9d4a864e471 100644 --- a/ext/phalcon/storage/adapter/redis.zep.c +++ b/ext/phalcon/storage/adapter/redis.zep.c @@ -369,17 +369,17 @@ PHP_METHOD(Phalcon_Storage_Adapter_Redis, getAdapter) object_init_ex(&connection, zephir_get_internal_ce(SL("redis"))); ZEPHIR_CALL_METHOD(NULL, &connection, "__construct", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "checkconnect", NULL, 113, &connection); + ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "checkconnect", NULL, 114, &connection); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_2$$3, &_1$$3, "checkauth", NULL, 114, &connection); + ZEPHIR_CALL_METHOD(&_2$$3, &_1$$3, "checkauth", NULL, 115, &connection); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "checkindex", NULL, 115, &connection); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "checkindex", NULL, 116, &connection); zephir_check_call_status(); zephir_read_property(&_3$$3, this_ptr, ZEND_STRL("prefix"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_4$$3, 2); ZEPHIR_CALL_METHOD(NULL, &connection, "setoption", NULL, 0, &_4$$3, &_3$$3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "setserializer", NULL, 116, &connection); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setserializer", NULL, 117, &connection); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("adapter"), &connection); } @@ -871,7 +871,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Redis, checkConnect) object_init_ex(&_4$$8, phalcon_storage_exception_ce); ZEPHIR_INIT_VAR(&_5$$8); ZVAL_STRING(&_5$$8, "Could not connect to the Redisd server [%s:%s]"); - ZEPHIR_CALL_FUNCTION(&_6$$8, "sprintf", NULL, 117, &_5$$8, &host, &port); + ZEPHIR_CALL_FUNCTION(&_6$$8, "sprintf", NULL, 118, &_5$$8, &host, &port); zephir_check_call_status_or_jump(try_end_1); ZEPHIR_CALL_METHOD(NULL, &_4$$8, "__construct", NULL, 33, &_6$$8); zephir_check_call_status_or_jump(try_end_1); @@ -986,34 +986,34 @@ PHP_METHOD(Phalcon_Storage_Adapter_Redis, setSerializer) add_assoc_long_ex(&map, SL("redis_php"), 1); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "\\Redis::SERIALIZER_IGBINARY"); - ZEPHIR_CALL_FUNCTION(&_1, "defined", NULL, 118, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "defined", NULL, 119, &_0); zephir_check_call_status(); if (zephir_is_true(&_1)) { ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "\\Redis::SERIALIZER_IGBINARY"); - ZEPHIR_CALL_FUNCTION(&_3$$3, "constant", NULL, 119, &_2$$3); + ZEPHIR_CALL_FUNCTION(&_3$$3, "constant", NULL, 120, &_2$$3); zephir_check_call_status(); zephir_array_update_string(&map, SL("redis_igbinary"), &_3$$3, PH_COPY | PH_SEPARATE); } ZEPHIR_INIT_NVAR(&_0); ZVAL_STRING(&_0, "\\Redis::SERIALIZER_MSGPACK"); - ZEPHIR_CALL_FUNCTION(&_4, "defined", NULL, 118, &_0); + ZEPHIR_CALL_FUNCTION(&_4, "defined", NULL, 119, &_0); zephir_check_call_status(); if (zephir_is_true(&_4)) { ZEPHIR_INIT_VAR(&_5$$4); ZVAL_STRING(&_5$$4, "\\Redis::SERIALIZER_MSGPACK"); - ZEPHIR_CALL_FUNCTION(&_6$$4, "constant", NULL, 119, &_5$$4); + ZEPHIR_CALL_FUNCTION(&_6$$4, "constant", NULL, 120, &_5$$4); zephir_check_call_status(); zephir_array_update_string(&map, SL("redis_msgpack"), &_6$$4, PH_COPY | PH_SEPARATE); } ZEPHIR_INIT_NVAR(&_0); ZVAL_STRING(&_0, "\\Redis::SERIALIZER_JSON"); - ZEPHIR_CALL_FUNCTION(&_7, "defined", NULL, 118, &_0); + ZEPHIR_CALL_FUNCTION(&_7, "defined", NULL, 119, &_0); zephir_check_call_status(); if (zephir_is_true(&_7)) { ZEPHIR_INIT_VAR(&_8$$5); ZVAL_STRING(&_8$$5, "\\Redis::SERIALIZER_JSON"); - ZEPHIR_CALL_FUNCTION(&_9$$5, "constant", NULL, 119, &_8$$5); + ZEPHIR_CALL_FUNCTION(&_9$$5, "constant", NULL, 120, &_8$$5); zephir_check_call_status(); zephir_array_update_string(&map, SL("redis_json"), &_9$$5, PH_COPY | PH_SEPARATE); } diff --git a/ext/phalcon/storage/adapter/stream.zep.c b/ext/phalcon/storage/adapter/stream.zep.c index 52bd7cb76a6..edc67990087 100644 --- a/ext/phalcon/storage/adapter/stream.zep.c +++ b/ext/phalcon/storage/adapter/stream.zep.c @@ -107,7 +107,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, __construct) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_storage_exception_ce, "The 'storageDir' must be specified in the options", "phalcon/Storage/Adapter/Stream.zep", 60); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "getdirseparator", NULL, 120, &storageDir); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "getdirseparator", NULL, 121, &storageDir); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("storageDir"), &_2); ZEPHIR_CALL_PARENT(NULL, phalcon_storage_adapter_stream_ce, getThis(), "__construct", NULL, 0, factory, &options); @@ -145,9 +145,9 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, clear) result = 1; zephir_read_property(&_0, this_ptr, ZEND_STRL("storageDir"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdirseparator", NULL, 120, &_0); + ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdirseparator", NULL, 121, &_0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&iterator, this_ptr, "getiterator", NULL, 121, &directory); + ZEPHIR_CALL_METHOD(&iterator, this_ptr, "getiterator", NULL, 122, &directory); zephir_check_call_status(); zephir_is_iterable(&iterator, 0, "phalcon/Storage/Adapter/Stream.zep", 91); if (Z_TYPE_P(&iterator) == IS_ARRAY) { @@ -336,9 +336,9 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, delete) zephir_check_call_status(); RETURN_MM_BOOL(0); } - ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 122, &key); + ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 123, &key); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&result, "unlink", NULL, 123, &filepath); + ZEPHIR_CALL_FUNCTION(&result, "unlink", NULL, 124, &filepath); zephir_check_call_status(); zephir_read_property(&_5, this_ptr, ZEND_STRL("eventType"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_6); @@ -407,7 +407,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, get) ZEPHIR_CONCAT_VS(&_1, &_0, ":beforeGet"); ZEPHIR_CALL_METHOD(NULL, this_ptr, "fire", NULL, 0, &_1, &key); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 122, &key); + ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 123, &key); zephir_check_call_status(); if (1 != (zephir_file_exists(&filepath) == SUCCESS)) { zephir_read_property(&_2$$3, this_ptr, ZEND_STRL("eventType"), PH_NOISY_CC | PH_READONLY); @@ -418,11 +418,11 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, get) RETVAL_ZVAL(defaultValue, 1, 0); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&payload, this_ptr, "getpayload", NULL, 124, &filepath); + ZEPHIR_CALL_METHOD(&payload, this_ptr, "getpayload", NULL, 125, &filepath); zephir_check_call_status(); _4 = ZEPHIR_IS_EMPTY(&payload); if (!(_4)) { - ZEPHIR_CALL_METHOD(&_5, this_ptr, "isexpired", NULL, 125, &payload); + ZEPHIR_CALL_METHOD(&_5, this_ptr, "isexpired", NULL, 126, &payload); zephir_check_call_status(); _4 = zephir_is_true(&_5); } @@ -498,7 +498,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getKeys) } ZEPHIR_INIT_VAR(&files); array_init(&files); - ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 126); + ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 127); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_0, this_ptr, "phpfileexists", NULL, 0, &directory); zephir_check_call_status(); @@ -506,7 +506,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getKeys) array_init(return_value); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&iterator, this_ptr, "getiterator", NULL, 121, &directory); + ZEPHIR_CALL_METHOD(&iterator, this_ptr, "getiterator", NULL, 122, &directory); zephir_check_call_status(); zephir_is_iterable(&iterator, 0, "phalcon/Storage/Adapter/Stream.zep", 219); if (Z_TYPE_P(&iterator) == IS_ARRAY) { @@ -605,7 +605,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, has) ZEPHIR_CONCAT_VS(&_1, &_0, ":beforeHas"); ZEPHIR_CALL_METHOD(NULL, this_ptr, "fire", NULL, 0, &_1, &key); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 122, &key); + ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 123, &key); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_2, this_ptr, "phpfileexists", NULL, 0, &filepath); zephir_check_call_status(); @@ -617,7 +617,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, has) zephir_check_call_status(); RETURN_MM_BOOL(0); } - ZEPHIR_CALL_METHOD(&payload, this_ptr, "getpayload", NULL, 124, &filepath); + ZEPHIR_CALL_METHOD(&payload, this_ptr, "getpayload", NULL, 125, &filepath); zephir_check_call_status(); if (UNEXPECTED(ZEPHIR_IS_EMPTY(&payload))) { zephir_read_property(&_5$$4, this_ptr, ZEND_STRL("eventType"), PH_NOISY_CC | PH_READONLY); @@ -627,7 +627,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, has) zephir_check_call_status(); RETURN_MM_BOOL(0); } - ZEPHIR_CALL_METHOD(&_7, this_ptr, "isexpired", NULL, 125, &payload); + ZEPHIR_CALL_METHOD(&_7, this_ptr, "isexpired", NULL, 126, &payload); zephir_check_call_status(); result = !zephir_is_true(&_7); zephir_read_property(&_8, this_ptr, ZEND_STRL("eventType"), PH_NOISY_CC | PH_READONLY); @@ -808,7 +808,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, set) ZEPHIR_CALL_METHOD(&_6, this_ptr, "getserializeddata", NULL, 0, value); zephir_check_call_status(); zephir_array_update_string(&payload, SL("content"), &_6, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&result, this_ptr, "storepayload", NULL, 127, &payload, &key); + ZEPHIR_CALL_METHOD(&result, this_ptr, "storepayload", NULL, 128, &payload, &key); zephir_check_call_status(); zephir_read_property(&_7, this_ptr, ZEND_STRL("eventType"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_8); @@ -866,7 +866,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, setForever) ZEPHIR_CALL_METHOD(&_1, this_ptr, "getserializeddata", NULL, 0, value); zephir_check_call_status(); zephir_array_update_string(&payload, SL("content"), &_1, PH_COPY | PH_SEPARATE); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "storepayload", NULL, 127, &payload, &key); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "storepayload", NULL, 128, &payload, &key); zephir_check_call_status(); RETURN_MM(); } @@ -919,15 +919,15 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getDir) zephir_read_property(&_1, this_ptr, ZEND_STRL("prefix"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_2); ZEPHIR_CONCAT_VV(&_2, &_0, &_1); - ZEPHIR_CALL_METHOD(&dirPrefix, this_ptr, "getdirseparator", NULL, 120, &_2); + ZEPHIR_CALL_METHOD(&dirPrefix, this_ptr, "getdirseparator", NULL, 121, &_2); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "getkeywithoutprefix", NULL, 128, &key); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "getkeywithoutprefix", NULL, 129, &key); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&dirFromFile, this_ptr, "getdirfromfile", NULL, 129, &_3); + ZEPHIR_CALL_METHOD(&dirFromFile, this_ptr, "getdirfromfile", NULL, 130, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); ZEPHIR_CONCAT_VV(&_4, &dirPrefix, &dirFromFile); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getdirseparator", NULL, 120, &_4); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getdirseparator", NULL, 121, &_4); zephir_check_call_status(); RETURN_MM(); } @@ -957,9 +957,9 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getFilepath) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &key_param); zephir_get_strval(&key, key_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdir", NULL, 126, &key); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdir", NULL, 127, &key); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "getkeywithoutprefix", NULL, 128, &key); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "getkeywithoutprefix", NULL, 129, &key); zephir_check_call_status(); ZEPHIR_CONCAT_VV(return_value, &_0, &_1); RETURN_MM(); @@ -1037,10 +1037,10 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getIterator) ZEPHIR_INIT_VAR(&_0); object_init_ex(&_0, spl_ce_RecursiveDirectoryIterator); ZVAL_LONG(&_1, 4096); - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 130, &dir, &_1); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 131, &dir, &_1); zephir_check_call_status(); ZVAL_LONG(&_1, 2); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 131, &_0, &_1); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 132, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -1095,7 +1095,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getPayload) RETURN_MM(); } ZVAL_LONG(&_1, 1); - ZEPHIR_CALL_FUNCTION(&_2, "flock", NULL, 132, &pointer, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "flock", NULL, 133, &pointer, &_1); zephir_check_call_status(); if (EXPECTED(ZEPHIR_IS_TRUE_IDENTICAL(&_2))) { ZEPHIR_CALL_METHOD(&payload, this_ptr, "phpfilegetcontents", NULL, 0, &filepath); @@ -1106,34 +1106,34 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getPayload) array_init(return_value); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 133); + ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 134); zephir_check_call_status(); ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$false); ZEPHIR_INIT_NVAR(&_0); ZVAL_STRING(&_0, "8.0"); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, ">="); - ZEPHIR_CALL_FUNCTION(&_4, "version_compare", NULL, 134, &version, &_0, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "version_compare", NULL, 135, &version, &_0, &_3); zephir_check_call_status(); if (zephir_is_true(&_4)) { ZEPHIR_INIT_VAR(&_5$$6); ZEPHIR_INIT_NVAR(&_5$$6); zephir_create_closure_ex(&_5$$6, NULL, phalcon_1__closure_ce, SL("__invoke")); ZVAL_LONG(&_6$$6, 8); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 135, &_5$$6, &_6$$6); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 136, &_5$$6, &_6$$6); zephir_check_call_status(); } else { ZEPHIR_INIT_VAR(&_7$$7); ZEPHIR_INIT_NVAR(&_7$$7); zephir_create_closure_ex(&_7$$7, NULL, phalcon_2__closure_ce, SL("__invoke")); ZVAL_LONG(&_8$$7, 8); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 135, &_7$$7, &_8$$7); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 136, &_7$$7, &_8$$7); zephir_check_call_status(); } ZEPHIR_CALL_FUNCTION(&_9, "unserialize", NULL, 16, &payload); zephir_check_call_status(); ZEPHIR_CPY_WRT(&payload, &_9); - ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 136); + ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 137); zephir_check_call_status(); _10 = ZEPHIR_GLOBAL(warning).enable; if (!(_10)) { @@ -1236,13 +1236,13 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, storePayload) ZEPHIR_CALL_FUNCTION(&_0, "serialize", NULL, 15, &payload); zephir_check_call_status(); ZEPHIR_CPY_WRT(&payload, &_0); - ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 126, &key); + ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 127, &key); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_0, "is_dir", NULL, 137, &directory); + ZEPHIR_CALL_FUNCTION(&_0, "is_dir", NULL, 138, &directory); zephir_check_call_status(); if (!(zephir_is_true(&_0))) { ZVAL_LONG(&_1$$3, 0777); - ZEPHIR_CALL_FUNCTION(NULL, "mkdir", NULL, 138, &directory, &_1$$3, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "mkdir", NULL, 139, &directory, &_1$$3, &__$true); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_3); @@ -1324,7 +1324,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, phpFilePutContents) context = &__$null; } ZVAL_LONG(&_0, flags); - ZEPHIR_RETURN_CALL_FUNCTION("file_put_contents", NULL, 139, &filename, data, &_0, context); + ZEPHIR_RETURN_CALL_FUNCTION("file_put_contents", NULL, 140, &filename, data, &_0, context); zephir_check_call_status(); RETURN_MM(); } @@ -1347,7 +1347,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, phpFopen) zephir_fetch_params(1, 2, 0, &filename_param, &mode_param); zephir_get_strval(&filename, filename_param); zephir_get_strval(&mode, mode_param); - ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 140, &filename, &mode); + ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 141, &filename, &mode); zephir_check_call_status(); RETURN_MM(); } @@ -1367,7 +1367,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, phpUnlink) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &filename_param); zephir_get_strval(&filename, filename_param); - ZEPHIR_RETURN_CALL_FUNCTION("unlink", NULL, 123, &filename); + ZEPHIR_RETURN_CALL_FUNCTION("unlink", NULL, 124, &filename); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/storage/serializer/base64.zep.c b/ext/phalcon/storage/serializer/base64.zep.c index 4c6a1b3d49d..ed5230bb185 100644 --- a/ext/phalcon/storage/serializer/base64.zep.c +++ b/ext/phalcon/storage/serializer/base64.zep.c @@ -59,7 +59,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Base64, serialize) return; } zephir_read_property(&_1, this_ptr, ZEND_STRL("data"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 231, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 232, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -151,7 +151,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Base64, phpBase64Decode) } else { } ZVAL_BOOL(&_0, (strict ? 1 : 0)); - ZEPHIR_RETURN_CALL_FUNCTION("base64_decode", NULL, 230, &input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("base64_decode", NULL, 231, &input, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/storage/serializer/igbinary.zep.c b/ext/phalcon/storage/serializer/igbinary.zep.c index 8cc7d8194b9..fa975fbd48c 100644 --- a/ext/phalcon/storage/serializer/igbinary.zep.c +++ b/ext/phalcon/storage/serializer/igbinary.zep.c @@ -121,33 +121,33 @@ PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, unserialize) if (!ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data); } else { - ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 133); + ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 134); zephir_check_call_status(); ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$false); ZEPHIR_INIT_VAR(&_1$$4); ZVAL_STRING(&_1$$4, "8.0"); ZEPHIR_INIT_VAR(&_2$$4); ZVAL_STRING(&_2$$4, ">="); - ZEPHIR_CALL_FUNCTION(&_3$$4, "version_compare", NULL, 134, &version, &_1$$4, &_2$$4); + ZEPHIR_CALL_FUNCTION(&_3$$4, "version_compare", NULL, 135, &version, &_1$$4, &_2$$4); zephir_check_call_status(); if (zephir_is_true(&_3$$4)) { ZEPHIR_INIT_VAR(&_4$$5); ZEPHIR_INIT_NVAR(&_4$$5); zephir_create_closure_ex(&_4$$5, NULL, phalcon_3__closure_ce, SL("__invoke")); ZVAL_LONG(&_5$$5, 2); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 135, &_4$$5, &_5$$5); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 136, &_4$$5, &_5$$5); zephir_check_call_status(); } else { ZEPHIR_INIT_VAR(&_6$$6); ZEPHIR_INIT_NVAR(&_6$$6); zephir_create_closure_ex(&_6$$6, NULL, phalcon_4__closure_ce, SL("__invoke")); ZVAL_LONG(&_7$$6, 2); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 135, &_6$$6, &_7$$6); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 136, &_6$$6, &_7$$6); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(&result, this_ptr, "dounserialize", NULL, 0, data); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 136); + ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 137); zephir_check_call_status(); _8$$4 = ZEPHIR_GLOBAL(warning).enable; if (!(_8$$4)) { @@ -193,7 +193,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, phpIgbinarySerialize) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &value); - ZEPHIR_RETURN_CALL_FUNCTION("igbinary_serialize", NULL, 141, value); + ZEPHIR_RETURN_CALL_FUNCTION("igbinary_serialize", NULL, 142, value); zephir_check_call_status(); RETURN_MM(); } @@ -244,7 +244,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, doUnserialize) ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &value); - ZEPHIR_RETURN_CALL_FUNCTION("igbinary_unserialize", NULL, 142, value); + ZEPHIR_RETURN_CALL_FUNCTION("igbinary_unserialize", NULL, 143, value); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/storage/serializer/json.zep.c b/ext/phalcon/storage/serializer/json.zep.c index 87c8eee1e9f..9b721737e51 100644 --- a/ext/phalcon/storage/serializer/json.zep.c +++ b/ext/phalcon/storage/serializer/json.zep.c @@ -131,7 +131,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Json, serialize) object_init_ex(&_3$$3, spl_ce_InvalidArgumentException); ZEPHIR_INIT_VAR(&_4$$3); ZEPHIR_CONCAT_SS(&_4$$3, "Data for the JSON serializer cannot be of type 'object' ", "without implementing 'JsonSerializable'"); - ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 200, &_4$$3); + ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 201, &_4$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_3$$3, "phalcon/Storage/Serializer/Json.zep", 54); ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/storage/serializer/php.zep.c b/ext/phalcon/storage/serializer/php.zep.c index 2a7572aa58b..681d6a25492 100644 --- a/ext/phalcon/storage/serializer/php.zep.c +++ b/ext/phalcon/storage/serializer/php.zep.c @@ -102,33 +102,33 @@ PHP_METHOD(Phalcon_Storage_Serializer_Php, unserialize) zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data); RETURN_MM_NULL(); } - ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 133); + ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 134); zephir_check_call_status(); ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$false); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "8.0"); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, ">="); - ZEPHIR_CALL_FUNCTION(&_3, "version_compare", NULL, 134, &version, &_1, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "version_compare", NULL, 135, &version, &_1, &_2); zephir_check_call_status(); if (zephir_is_true(&_3)) { ZEPHIR_INIT_VAR(&_4$$4); ZEPHIR_INIT_NVAR(&_4$$4); zephir_create_closure_ex(&_4$$4, NULL, phalcon_11__closure_ce, SL("__invoke")); ZVAL_LONG(&_5$$4, 8); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 135, &_4$$4, &_5$$4); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 136, &_4$$4, &_5$$4); zephir_check_call_status(); } else { ZEPHIR_INIT_VAR(&_6$$5); ZEPHIR_INIT_NVAR(&_6$$5); zephir_create_closure_ex(&_6$$5, NULL, phalcon_12__closure_ce, SL("__invoke")); ZVAL_LONG(&_7$$5, 8); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 135, &_6$$5, &_7$$5); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 136, &_6$$5, &_7$$5); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(&result, this_ptr, "phpunserialize", NULL, 0, data); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 136); + ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 137); zephir_check_call_status(); _8 = ZEPHIR_GLOBAL(warning).enable; if (!(_8)) { diff --git a/ext/phalcon/support/debug.zep.c b/ext/phalcon/support/debug.zep.c index 3e290f2ce02..405133b096d 100644 --- a/ext/phalcon/support/debug.zep.c +++ b/ext/phalcon/support/debug.zep.c @@ -338,7 +338,7 @@ PHP_METHOD(Phalcon_Support_Debug, listenLowSeverity) ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "onUncaughtLowSeverity"); zephir_array_fast_append(&_0, &_1); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 135, &_0); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 136, &_0); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); zephir_create_array(&_2, 2, 0); @@ -1475,7 +1475,7 @@ PHP_METHOD(Phalcon_Support_Debug, showTraceItem) } else { ZEPHIR_INIT_VAR(&classReflection); object_init_ex(&classReflection, zephir_get_internal_ce(SL("reflectionclass"))); - ZEPHIR_CALL_METHOD(NULL, &classReflection, "__construct", NULL, 154, &className); + ZEPHIR_CALL_METHOD(NULL, &classReflection, "__construct", NULL, 155, &className); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_11$$5, &classReflection, "isinternal", NULL, 0); zephir_check_call_status(); @@ -1508,7 +1508,7 @@ PHP_METHOD(Phalcon_Support_Debug, showTraceItem) if ((zephir_function_exists(&functionName) == SUCCESS)) { ZEPHIR_INIT_VAR(&functionReflection); object_init_ex(&functionReflection, zephir_get_internal_ce(SL("reflectionfunction"))); - ZEPHIR_CALL_METHOD(NULL, &functionReflection, "__construct", NULL, 151, &functionName); + ZEPHIR_CALL_METHOD(NULL, &functionReflection, "__construct", NULL, 152, &functionName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_17$$10, &functionReflection, "isinternal", NULL, 0); zephir_check_call_status(); diff --git a/ext/phalcon/support/debug/dump.zep.c b/ext/phalcon/support/debug/dump.zep.c index ca1acfc678f..6709bc82ce6 100644 --- a/ext/phalcon/support/debug/dump.zep.c +++ b/ext/phalcon/support/debug/dump.zep.c @@ -938,10 +938,10 @@ PHP_METHOD(Phalcon_Support_Debug_Dump, output) } else { ZEPHIR_INIT_VAR(&reflect$$15); object_init_ex(&reflect$$15, zephir_get_internal_ce(SL("reflectionclass"))); - ZEPHIR_CALL_METHOD(NULL, &reflect$$15, "__construct", NULL, 154, variable); + ZEPHIR_CALL_METHOD(NULL, &reflect$$15, "__construct", NULL, 155, variable); zephir_check_call_status(); ZVAL_LONG(&_67$$15, ((1 | 2) | 4)); - ZEPHIR_CALL_METHOD(&props$$15, &reflect$$15, "getproperties", NULL, 165, &_67$$15); + ZEPHIR_CALL_METHOD(&props$$15, &reflect$$15, "getproperties", NULL, 166, &_67$$15); zephir_check_call_status(); zephir_is_iterable(&props$$15, 0, "phalcon/Support/Debug/Dump.zep", 306); if (Z_TYPE_P(&props$$15) == IS_ARRAY) { @@ -1219,7 +1219,7 @@ PHP_METHOD(Phalcon_Support_Debug_Dump, output) ZEPHIR_CONCAT_VV(return_value, &output, &_145$$26); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_147, "is_float", NULL, 214, variable); + ZEPHIR_CALL_FUNCTION(&_147, "is_float", NULL, 215, variable); zephir_check_call_status(); if (zephir_is_true(&_147)) { ZEPHIR_INIT_VAR(&_148$$27); diff --git a/ext/phalcon/support/helper/arr/group.zep.c b/ext/phalcon/support/helper/arr/group.zep.c index 6b5c7da4eb4..0c1335a311a 100644 --- a/ext/phalcon/support/helper/arr/group.zep.c +++ b/ext/phalcon/support/helper/arr/group.zep.c @@ -173,7 +173,7 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_Group, processCallable) ZEPHIR_CALL_METHOD(&_0, this_ptr, "iscallable", NULL, 0, method); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { - ZEPHIR_CALL_FUNCTION(&key, "call_user_func", NULL, 188, method, element); + ZEPHIR_CALL_FUNCTION(&key, "call_user_func", NULL, 189, method, element); zephir_check_call_status(); zephir_array_update_multi(&output, element, SL("za"), 2, &key); } diff --git a/ext/phalcon/support/helper/arr/isunique.zep.c b/ext/phalcon/support/helper/arr/isunique.zep.c index aa4a725ee75..1fb2bd368a5 100644 --- a/ext/phalcon/support/helper/arr/isunique.zep.c +++ b/ext/phalcon/support/helper/arr/isunique.zep.c @@ -58,7 +58,7 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_IsUnique, __invoke) zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); zephir_fetch_params(1, 1, 0, &collection_param); zephir_get_arrval(&collection, collection_param); - ZEPHIR_CALL_FUNCTION(&_0, "array_unique", NULL, 180, &collection); + ZEPHIR_CALL_FUNCTION(&_0, "array_unique", NULL, 181, &collection); zephir_check_call_status(); RETURN_MM_BOOL(zephir_fast_count_int(&collection) == zephir_fast_count_int(&_0)); } diff --git a/ext/phalcon/support/helper/arr/last.zep.c b/ext/phalcon/support/helper/arr/last.zep.c index aa2cb3bb5fc..5a69d0271bf 100644 --- a/ext/phalcon/support/helper/arr/last.zep.c +++ b/ext/phalcon/support/helper/arr/last.zep.c @@ -72,7 +72,7 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_Last, __invoke) ZEPHIR_CALL_METHOD(&filtered, this_ptr, "tofilter", NULL, 0, &collection, method); zephir_check_call_status(); ZEPHIR_MAKE_REF(&filtered); - ZEPHIR_RETURN_CALL_FUNCTION("end", NULL, 321, &filtered); + ZEPHIR_RETURN_CALL_FUNCTION("end", NULL, 323, &filtered); ZEPHIR_UNREF(&filtered); zephir_check_call_status(); RETURN_MM(); diff --git a/ext/phalcon/support/helper/json/decode.zep.c b/ext/phalcon/support/helper/json/decode.zep.c index 88d2b3c8c6f..5374401161c 100644 --- a/ext/phalcon/support/helper/json/decode.zep.c +++ b/ext/phalcon/support/helper/json/decode.zep.c @@ -117,7 +117,7 @@ PHP_METHOD(Phalcon_Support_Helper_Json_Decode, __invoke) zephir_json_encode(&_3$$3, &__$null, 0 ); ZEPHIR_INIT_VAR(&_4$$3); object_init_ex(&_4$$3, spl_ce_InvalidArgumentException); - ZEPHIR_CALL_METHOD(NULL, &_4$$3, "__construct", NULL, 200, &message, &error); + ZEPHIR_CALL_METHOD(NULL, &_4$$3, "__construct", NULL, 201, &message, &error); zephir_check_call_status(); zephir_throw_exception_debug(&_4$$3, "phalcon/Support/Helper/Json/Decode.zep", 64); ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/support/helper/json/encode.zep.c b/ext/phalcon/support/helper/json/encode.zep.c index 027cbec54b2..7bef0b5bae1 100644 --- a/ext/phalcon/support/helper/json/encode.zep.c +++ b/ext/phalcon/support/helper/json/encode.zep.c @@ -110,7 +110,7 @@ PHP_METHOD(Phalcon_Support_Helper_Json_Encode, __invoke) zephir_json_encode(&_2$$3, &__$null, 0 ); ZEPHIR_INIT_VAR(&_3$$3); object_init_ex(&_3$$3, spl_ce_InvalidArgumentException); - ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 200, &message, &error); + ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 201, &message, &error); zephir_check_call_status(); zephir_throw_exception_debug(&_3$$3, "phalcon/Support/Helper/Json/Encode.zep", 64); ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/support/helper/str/concat.zep.c b/ext/phalcon/support/helper/str/concat.zep.c index cc17c5d9744..19a7dfbb4d6 100644 --- a/ext/phalcon/support/helper/str/concat.zep.c +++ b/ext/phalcon/support/helper/str/concat.zep.c @@ -91,7 +91,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Concat, __invoke) ZEPHIR_UNREF(&arguments); zephir_check_call_status(); ZEPHIR_MAKE_REF(&arguments); - ZEPHIR_CALL_FUNCTION(&last, "end", NULL, 321, &arguments); + ZEPHIR_CALL_FUNCTION(&last, "end", NULL, 323, &arguments); ZEPHIR_UNREF(&arguments); zephir_check_call_status(); ZEPHIR_INIT_VAR(&prefix); diff --git a/ext/phalcon/support/helper/str/decapitalize.zep.c b/ext/phalcon/support/helper/str/decapitalize.zep.c index 54199ceeaeb..8dde6bd38c7 100644 --- a/ext/phalcon/support/helper/str/decapitalize.zep.c +++ b/ext/phalcon/support/helper/str/decapitalize.zep.c @@ -84,7 +84,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Decapitalize, __invoke) zephir_get_strval(&encoding, encoding_param); } ZVAL_LONG(&_0, 1); - ZEPHIR_CALL_FUNCTION(&substr, "mb_substr", NULL, 228, &text, &_0); + ZEPHIR_CALL_FUNCTION(&substr, "mb_substr", NULL, 229, &text, &_0); zephir_check_call_status(); if (upperRest) { ZEPHIR_CALL_METHOD(&suffix, this_ptr, "toupper", NULL, 0, &substr, &encoding); @@ -94,7 +94,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Decapitalize, __invoke) } ZVAL_LONG(&_0, 0); ZVAL_LONG(&_2, 1); - ZEPHIR_CALL_FUNCTION(&_3, "mb_substr", NULL, 228, &text, &_0, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "mb_substr", NULL, 229, &text, &_0, &_2); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_1, this_ptr, "tolower", NULL, 0, &_3, &encoding); zephir_check_call_status(); diff --git a/ext/phalcon/support/helper/str/dirfromfile.zep.c b/ext/phalcon/support/helper/str/dirfromfile.zep.c index e9106b32d75..de18ba64557 100644 --- a/ext/phalcon/support/helper/str/dirfromfile.zep.c +++ b/ext/phalcon/support/helper/str/dirfromfile.zep.c @@ -72,12 +72,12 @@ PHP_METHOD(Phalcon_Support_Helper_Str_DirFromFile, __invoke) zephir_check_call_status(); ZVAL_LONG(&_0, 0); ZVAL_LONG(&_1, -2); - ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 228, &name, &_0, &_1); + ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 229, &name, &_0, &_1); zephir_check_call_status(); if (!zephir_is_true(&start)) { ZVAL_LONG(&_2$$3, 0); ZVAL_LONG(&_3$$3, 1); - ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 228, &name, &_2$$3, &_3$$3); + ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 229, &name, &_2$$3, &_3$$3); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_4); diff --git a/ext/phalcon/support/helper/str/dynamic.zep.c b/ext/phalcon/support/helper/str/dynamic.zep.c index af5ccdbb6f4..5036454b209 100644 --- a/ext/phalcon/support/helper/str/dynamic.zep.c +++ b/ext/phalcon/support/helper/str/dynamic.zep.c @@ -167,7 +167,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Dynamic, __invoke) ZEPHIR_INIT_NVAR(&words); zephir_fast_explode(&words, &separator, &_9$$6, LONG_MAX); ZEPHIR_OBS_NVAR(&word); - ZEPHIR_CALL_FUNCTION(&_10$$6, "array_rand", &_11, 202, &words); + ZEPHIR_CALL_FUNCTION(&_10$$6, "array_rand", &_11, 203, &words); zephir_check_call_status(); zephir_array_fetch(&word, &words, &_10$$6, PH_NOISY, "phalcon/Support/Helper/Str/Dynamic.zep", 62); zephir_array_fetch_long(&_12$$6, &match, 0, PH_NOISY | PH_READONLY, "phalcon/Support/Helper/Str/Dynamic.zep", 63); @@ -202,7 +202,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Dynamic, __invoke) ZEPHIR_INIT_NVAR(&words); zephir_fast_explode(&words, &separator, &_18$$8, LONG_MAX); ZEPHIR_OBS_NVAR(&word); - ZEPHIR_CALL_FUNCTION(&_19$$8, "array_rand", &_11, 202, &words); + ZEPHIR_CALL_FUNCTION(&_19$$8, "array_rand", &_11, 203, &words); zephir_check_call_status(); zephir_array_fetch(&word, &words, &_19$$8, PH_NOISY, "phalcon/Support/Helper/Str/Dynamic.zep", 62); zephir_array_fetch_long(&_20$$8, &match, 0, PH_NOISY | PH_READONLY, "phalcon/Support/Helper/Str/Dynamic.zep", 63); diff --git a/ext/phalcon/support/helper/str/len.zep.c b/ext/phalcon/support/helper/str/len.zep.c index 2117cf11a97..4836a7038da 100644 --- a/ext/phalcon/support/helper/str/len.zep.c +++ b/ext/phalcon/support/helper/str/len.zep.c @@ -66,7 +66,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Len, __invoke) } else { zephir_get_strval(&encoding, encoding_param); } - ZEPHIR_RETURN_CALL_FUNCTION("mb_strlen", NULL, 246, &text, &encoding); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strlen", NULL, 247, &text, &encoding); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/support/helper/str/random.zep.c b/ext/phalcon/support/helper/str/random.zep.c index da4e012dc4a..e2cb68d01e6 100644 --- a/ext/phalcon/support/helper/str/random.zep.c +++ b/ext/phalcon/support/helper/str/random.zep.c @@ -125,37 +125,37 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Random, __invoke) ZVAL_STRING(&_3, "a"); ZEPHIR_INIT_VAR(&_4); ZVAL_STRING(&_4, "z"); - ZEPHIR_CALL_FUNCTION(&_5, "range", NULL, 314, &_3, &_4); + ZEPHIR_CALL_FUNCTION(&_5, "range", NULL, 316, &_3, &_4); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "A"); ZEPHIR_INIT_NVAR(&_4); ZVAL_STRING(&_4, "Z"); - ZEPHIR_CALL_FUNCTION(&_6, "range", NULL, 314, &_3, &_4); + ZEPHIR_CALL_FUNCTION(&_6, "range", NULL, 316, &_3, &_4); zephir_check_call_status(); zephir_fast_array_merge(&_2, &_5, &_6); zephir_array_update_long(&pools, 1, &_2, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY); ZEPHIR_INIT_NVAR(&_2); ZVAL_LONG(&_7, 0); ZVAL_LONG(&_8, 9); - ZEPHIR_CALL_FUNCTION(&_9, "range", NULL, 314, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&_9, "range", NULL, 316, &_7, &_8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "a"); ZEPHIR_INIT_NVAR(&_4); ZVAL_STRING(&_4, "f"); - ZEPHIR_CALL_FUNCTION(&_10, "range", NULL, 314, &_3, &_4); + ZEPHIR_CALL_FUNCTION(&_10, "range", NULL, 316, &_3, &_4); zephir_check_call_status(); zephir_fast_array_merge(&_2, &_9, &_10); zephir_array_update_long(&pools, 2, &_2, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY); ZVAL_LONG(&_7, 0); ZVAL_LONG(&_8, 9); - ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 314, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 316, &_7, &_8); zephir_check_call_status(); zephir_array_update_long(&pools, 3, &_11, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY); ZVAL_LONG(&_7, 1); ZVAL_LONG(&_8, 9); - ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 314, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 316, &_7, &_8); zephir_check_call_status(); zephir_array_update_long(&pools, 4, &_11, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY); ZEPHIR_INIT_NVAR(&_2); @@ -165,21 +165,21 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Random, __invoke) zephir_array_update_long(&pools, 5, &_11, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY); ZVAL_LONG(&_7, 0); ZVAL_LONG(&_8, 9); - ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 314, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 316, &_7, &_8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "a"); ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "z"); - ZEPHIR_CALL_FUNCTION(&_12, "range", NULL, 314, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&_12, "range", NULL, 316, &_2, &_3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "A"); ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Z"); - ZEPHIR_CALL_FUNCTION(&_13, "range", NULL, 314, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&_13, "range", NULL, 316, &_2, &_3); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_14, "array_merge", NULL, 333, &_11, &_12, &_13); + ZEPHIR_CALL_FUNCTION(&_14, "array_merge", NULL, 335, &_11, &_12, &_13); zephir_check_call_status(); zephir_array_update_long(&pools, 0, &_14, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY); zephir_array_fetch_long(&_15, &pools, type, PH_NOISY | PH_READONLY, "phalcon/Support/Helper/Str/Random.zep", 66); diff --git a/ext/phalcon/support/version.zep.c b/ext/phalcon/support/version.zep.c index da52c46f34f..2392df665d4 100644 --- a/ext/phalcon/support/version.zep.c +++ b/ext/phalcon/support/version.zep.c @@ -115,7 +115,7 @@ PHP_METHOD(Phalcon_Support_Version, getVersion) ZVAL_LONG(&_0, 9); zephir_array_fast_append(return_value, &_0); ZEPHIR_INIT_NVAR(&_0); - ZVAL_LONG(&_0, 3); + ZVAL_LONG(&_0, 4); zephir_array_fast_append(return_value, &_0); ZEPHIR_INIT_NVAR(&_0); ZVAL_LONG(&_0, 4); @@ -259,11 +259,11 @@ PHP_METHOD(Phalcon_Support_Version, getId) zephir_array_fetch_long(&specialNumber, &version, 4, PH_NOISY, "phalcon/Support/Version.zep", 164); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "%02s"); - ZEPHIR_CALL_FUNCTION(&_1, "sprintf", NULL, 117, &_0, &medium); + ZEPHIR_CALL_FUNCTION(&_1, "sprintf", NULL, 118, &_0, &medium); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_0); ZVAL_STRING(&_0, "%02s"); - ZEPHIR_CALL_FUNCTION(&_2, "sprintf", NULL, 117, &_0, &minor); + ZEPHIR_CALL_FUNCTION(&_2, "sprintf", NULL, 118, &_0, &minor); zephir_check_call_status(); ZEPHIR_CONCAT_VVVVV(return_value, &major, &_1, &_2, &special, &specialNumber); RETURN_MM(); diff --git a/ext/phalcon/tag.zep.c b/ext/phalcon/tag.zep.c index 101c40a6e09..483086ffe72 100644 --- a/ext/phalcon/tag.zep.c +++ b/ext/phalcon/tag.zep.c @@ -856,7 +856,7 @@ PHP_METHOD(Phalcon_Tag, getTitle) zephir_read_static_property_ce(&_6$$3, phalcon_tag_ce, SL("documentPrependTitle"), PH_NOISY_CC); ZEPHIR_CPY_WRT(&documentPrependTitle, &_6$$3); if (!(ZEPHIR_IS_EMPTY(&documentPrependTitle))) { - ZEPHIR_CALL_FUNCTION(&tmp$$5, "array_reverse", NULL, 297, &documentPrependTitle); + ZEPHIR_CALL_FUNCTION(&tmp$$5, "array_reverse", NULL, 299, &documentPrependTitle); zephir_check_call_status(); zephir_is_iterable(&tmp$$5, 0, "phalcon/Tag.zep", 443); if (Z_TYPE_P(&tmp$$5) == IS_ARRAY) { @@ -2763,7 +2763,7 @@ PHP_METHOD(Phalcon_Tag, textArea) ZVAL_STRING(&_1, "", &_2, ""); diff --git a/ext/phalcon/tag/select.zep.c b/ext/phalcon/tag/select.zep.c index 8c992a655a2..8017c5c8c77 100644 --- a/ext/phalcon/tag/select.zep.c +++ b/ext/phalcon/tag/select.zep.c @@ -279,7 +279,7 @@ PHP_METHOD(Phalcon_Tag_Select, optionsFromArray) } ZEPHIR_INIT_NVAR(&optionText); ZVAL_COPY(&optionText, _0); - ZEPHIR_CALL_FUNCTION(&escaped, "htmlspecialchars", &_4, 286, &optionValue); + ZEPHIR_CALL_FUNCTION(&escaped, "htmlspecialchars", &_4, 288, &optionValue); zephir_check_call_status(); if (Z_TYPE_P(&optionText) == IS_ARRAY) { ZEPHIR_INIT_NVAR(&_5$$4); @@ -332,7 +332,7 @@ PHP_METHOD(Phalcon_Tag_Select, optionsFromArray) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&optionText, &data, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&escaped, "htmlspecialchars", &_4, 286, &optionValue); + ZEPHIR_CALL_FUNCTION(&escaped, "htmlspecialchars", &_4, 288, &optionValue); zephir_check_call_status(); if (Z_TYPE_P(&optionText) == IS_ARRAY) { ZEPHIR_INIT_NVAR(&_16$$12); diff --git a/ext/phalcon/translate/adapter/csv.zep.c b/ext/phalcon/translate/adapter/csv.zep.c index b8c3c5f38e8..5508c78555b 100644 --- a/ext/phalcon/translate/adapter/csv.zep.c +++ b/ext/phalcon/translate/adapter/csv.zep.c @@ -370,7 +370,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_Csv, phpFopen) zephir_fetch_params(1, 2, 0, &filename_param, &mode_param); zephir_get_strval(&filename, filename_param); zephir_get_strval(&mode, mode_param); - ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 140, &filename, &mode); + ZEPHIR_RETURN_CALL_FUNCTION("fopen", NULL, 141, &filename, &mode); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/translate/interpolator/indexedarray.zep.c b/ext/phalcon/translate/interpolator/indexedarray.zep.c index 467ac6bd778..c579e9f1898 100644 --- a/ext/phalcon/translate/interpolator/indexedarray.zep.c +++ b/ext/phalcon/translate/interpolator/indexedarray.zep.c @@ -85,7 +85,7 @@ PHP_METHOD(Phalcon_Translate_Interpolator_IndexedArray, replacePlaceholders) } if (1 != ZEPHIR_IS_EMPTY(&placeholders)) { ZEPHIR_MAKE_REF(&placeholders); - ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 270, &placeholders, &translation); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 271, &placeholders, &translation); ZEPHIR_UNREF(&placeholders); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_0$$3); diff --git a/ext/php_phalcon.h b/ext/php_phalcon.h index 5e96787c75d..18447b7e992 100644 --- a/ext/php_phalcon.h +++ b/ext/php_phalcon.h @@ -11,10 +11,10 @@ #include "kernel/globals.h" #define PHP_PHALCON_NAME "phalcon" -#define PHP_PHALCON_VERSION "5.9.3" +#define PHP_PHALCON_VERSION "5.9.4" #define PHP_PHALCON_EXTNAME "phalcon" #define PHP_PHALCON_AUTHOR "Phalcon Team and contributors" -#define PHP_PHALCON_ZEPVERSION "0.18.0-$Id$" +#define PHP_PHALCON_ZEPVERSION "0.19.0-$Id$" #define PHP_PHALCON_DESCRIPTION "Phalcon is a full stack PHP framework, delivered as a PHP extension, offering lower resource consumption and high performance." typedef struct _zephir_struct_db { @@ -43,7 +43,7 @@ typedef struct _zephir_struct_orm { zend_bool late_state_binding; zend_bool not_null_validations; HashTable* parser_cache; - zend_string* resultset_prefetch_records; + char * resultset_prefetch_records; int unique_cache_id; zend_bool update_snapshot_on_save; zend_bool virtual_foreign_keys; diff --git a/package.xml b/package.xml index 21944fb97ab..5c3404b910a 100644 --- a/package.xml +++ b/package.xml @@ -22,11 +22,11 @@ nikos@phalcon.io yes - 2025-04-19 + 2025-11-21 - 5.9.3 - 5.9.3 + 5.9.4 + 5.9.4 stable @@ -37,19 +37,23 @@ Full changelog can be found at: https://github.com/phalcon/cphalcon/blob/master/CHANGELOG-5.0.md ### Changed - - Added Multi-Stage Dockerfile and Github action for release Docker images to ghcr.io and Docker Hub. [#16752](https://github.com/phalcon/cphalcon/issues/16752) + + - Changed `bind()` and `validate()` method in `Phalcon\Filter\Validation` and `Phalcon\Filter\Validation\ValidationInterface` to accept `$whitelist` array of only allowed fields to be mutated when using entity [#16800](https://github.com/phalcon/cphalcon/issues/16800) + - Changed `Phalcon\Storage\Adapters\Libmemcached::getAdapter()` to use 50ms for `\Memcached::OPT_CONNECT_TIMEOUT` [#16818](https://github.com/phalcon/cphalcon/issues/16818) ### Added - - Added `Phalcon\Mvc\Router::setUriSource()` to allow URI processing from `$_GET['url']` or `$_SERVER['REQUEST_URI']` as it was in v3 [#16741](https://github.com/phalcon/cphalcon/issues/16741) + - Added `fails()` method helper to `Phalcon\Filter\Validation` useful for standalone validation [#16798](https://github.com/phalcon/cphalcon/issues/16798) ### Fixed - - Fixed `Phalcon\Mvc\Router` to correctly handle numeric URI parts as it was in v3 [#16741](https://github.com/phalcon/cphalcon/issues/16741) - - Fixed `Phalcon\Mvc\Model\Binder` to use ReflectionParameter::getType() instead of deprecated method, PHP 8.0 or higher issue. [#16742](https://github.com/phalcon/cphalcon/issues/16742) - - Fixed `Phalcon\Mvc\Model\Query` to check if cache entry exists. [#16747](https://github.com/phalcon/cphalcon/issues/16747) - - Fixed `Phalcon\Mvc\Router` to correctly match route when using query string URIs. [#16749](https://github.com/phalcon/cphalcon/issues/16749) - - Fixed `Phalcon\Mvc\Model::cloneResultset` to properly parse fields that do not accept `null` values [#16736](https://github.com/phalcon/cphalcon/issues/16736) + - Fixed `Phalcon\Config\Adapter\Yaml` constructor to handle `null` return values from `yaml_parse_file()`, ensuring empty configuration files are treated as empty arrays instead of throwing errors. + - Fixed `Phalcon\Http\Request` method `getClientAddress(true)` to return correct IP address from trusted forwarded proxy. [#16777](https://github.com/phalcon/cphalcon/issues/16777) + - Fixed `Phalcon\Http\Request` method `getPost()` to correctly return json data as well and unified both `getPut()` and `getPatch()` to go through the same parsing method. [#16792](https://github.com/phalcon/cphalcon/issues/16792) + - Fixed `Phalcon\Filter\Validation` method `bind()` and `validate()` to correctly bind data when using entity as well as skip binding of fields not included in `$whitelist` [#16800](https://github.com/phalcon/cphalcon/issues/16800) + - Fixed `Phalcon\Http\Request` method `getPostData()` when `Content-Type` header is not set [#16804](https://github.com/phalcon/cphalcon/issues/16804) + - Fixed `Phalcon\Events\ManagerInterface` adding priority property [#16817](https://github.com/phalcon/cphalcon/issues/16817) + - Fixed `Phalcon\Storage\Adapters\Libmemcached::getAdapter()` to correctly merge adapter options [#16818](https://github.com/phalcon/cphalcon/issues/16818) diff --git a/phalcon/Http/Request.zep b/phalcon/Http/Request.zep index 71250c81b3c..aa68dd5cb19 100644 --- a/phalcon/Http/Request.zep +++ b/phalcon/Http/Request.zep @@ -53,32 +53,32 @@ class Request extends AbstractInjectionAware implements RequestInterface, Reques /** * @var FilterInterface|null */ - private filterService = null; + protected filterService = null; /** * @var bool */ - private httpMethodParameterOverride = false; + protected httpMethodParameterOverride = false; /** * @var array */ - private queryFilters = []; + protected queryFilters = []; /** * @var array|null */ - private postCache = null; + protected postCache = null; /** * @var string */ - private rawBody = ""; + protected rawBody = ""; /** * @var bool */ - private strictHostCheck = false; + protected strictHostCheck = false; /** * @var array @@ -418,7 +418,7 @@ class Request extends AbstractInjectionAware implements RequestInterface, Reques /** * Gets HTTP header from request data */ - final public function getHeader(string! header) -> string + public function getHeader(string! header) -> string { var value, name, server; @@ -652,7 +652,7 @@ class Request extends AbstractInjectionAware implements RequestInterface, Reques * * The method is always an uppercased string. */ - final public function getMethod() -> string + public function getMethod() -> string { var overridedMethod, spoofedMethod, requestMethod, server; string returnMethod = ""; @@ -997,7 +997,7 @@ class Request extends AbstractInjectionAware implements RequestInterface, Reques * @param bool onlyPath If true, query part will be omitted * @return string */ - final public function getURI(bool onlyPath = false) -> string + public function getURI(bool onlyPath = false) -> string { var requestURI; @@ -1501,7 +1501,7 @@ class Request extends AbstractInjectionAware implements RequestInterface, Reques /** * Process a request header and return the one with best quality */ - final protected function getBestQuality(array qualityParts, string! name) -> string + protected function getBestQuality(array qualityParts, string! name) -> string { int i; double quality, acceptQuality; @@ -1534,7 +1534,7 @@ class Request extends AbstractInjectionAware implements RequestInterface, Reques * Helper to get data from superglobals, applying filters if needed. * If no parameters are given the superglobal is returned. */ - final protected function getHelper( + protected function getHelper( array source, string! name = null, var filters = null, @@ -1575,7 +1575,7 @@ class Request extends AbstractInjectionAware implements RequestInterface, Reques /** * Recursively counts file in an array of files */ - final protected function hasFileHelper(var data, bool onlySuccessful) -> long + protected function hasFileHelper(var data, bool onlySuccessful) -> long { var value; int numberFiles = 0; @@ -1602,7 +1602,7 @@ class Request extends AbstractInjectionAware implements RequestInterface, Reques /** * Process a request header and return an array of values with their qualities */ - final protected function getQualityHeader(string! serverIndex, string! name) -> array + protected function getQualityHeader(string! serverIndex, string! name) -> array { var headerPart, headerParts, headerSplit, part, parts, returnedParts, serverValue, split; @@ -1740,7 +1740,7 @@ class Request extends AbstractInjectionAware implements RequestInterface, Reques /** * Smooth out $_FILES to have plain array with all files uploaded */ - final protected function smoothFiles(array! names, array! types, array! tmp_names, array! sizes, array! errors, string prefix) -> array + protected function smoothFiles(array! names, array! types, array! tmp_names, array! sizes, array! errors, string prefix) -> array { var idx, name, file, files, parentFiles, p; diff --git a/phalcon/Http/Response.zep b/phalcon/Http/Response.zep index 623ca7f7df8..66412ef0bd0 100644 --- a/phalcon/Http/Response.zep +++ b/phalcon/Http/Response.zep @@ -85,7 +85,7 @@ class Response implements ResponseInterface, InjectionAwareInterface, EventsAwar /** * @var Encode */ - private encode; + protected encode; /** * Phalcon\Http\Response constructor diff --git a/phalcon/Storage/Adapter/Libmemcached.zep b/phalcon/Storage/Adapter/Libmemcached.zep index 1524c15eda3..95b211ee769 100644 --- a/phalcon/Storage/Adapter/Libmemcached.zep +++ b/phalcon/Storage/Adapter/Libmemcached.zep @@ -130,7 +130,7 @@ class Libmemcached extends AbstractAdapter saslUser = this->getArrVal(sasl, "user", ""), saslPass = this->getArrVal(sasl, "pass", ""), failover = [ - \Memcached::OPT_CONNECT_TIMEOUT : 10, + \Memcached::OPT_CONNECT_TIMEOUT : 50, \Memcached::OPT_DISTRIBUTION : \Memcached::DISTRIBUTION_CONSISTENT, \Memcached::OPT_SERVER_FAILURE_LIMIT : 2, \Memcached::OPT_REMOVE_FAILED_SERVERS : true, diff --git a/phalcon/Support/Version.zep b/phalcon/Support/Version.zep index 61f5d80b92a..6b2f729e8fb 100644 --- a/phalcon/Support/Version.zep +++ b/phalcon/Support/Version.zep @@ -77,7 +77,7 @@ class Version */ protected function getVersion() -> array { - return [5, 9, 3, 4, 0]; + return [5, 9, 4, 4, 0]; } /**