From f28e1e6a7e35c3d061a200bfae74420a46fc8c68 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev <1695147@gmail.com> Date: Tue, 12 Sep 2023 10:43:46 +0100 Subject: [PATCH] Regenerate `ext/` directory --- ext/phalcon/mvc/model.zep.c | 698 ++++++++++-------- ext/phalcon/mvc/model.zep.h | 12 +- .../mvc/model/behavior/timestampable.zep.c | 4 +- ext/phalcon/mvc/model/binder.zep.c | 6 +- ext/phalcon/mvc/model/criteria.zep.c | 4 +- ext/phalcon/mvc/model/manager.zep.c | 30 +- ext/phalcon/mvc/model/metadata.zep.c | 4 +- ext/phalcon/mvc/model/metadata/stream.zep.c | 4 +- ext/phalcon/mvc/model/query.zep.c | 202 ++--- ext/phalcon/mvc/model/query/builder.zep.c | 60 +- ext/phalcon/mvc/model/resultset/complex.zep.c | 2 +- ext/phalcon/mvc/model/transaction.zep.c | 4 +- .../mvc/model/transaction/manager.zep.c | 6 +- ext/phalcon/mvc/router.zep.c | 553 +++++++------- ext/phalcon/mvc/router/annotations.zep.c | 4 +- ext/phalcon/mvc/router/group.zep.c | 2 +- ext/phalcon/mvc/router/route.zep.c | 12 +- ext/phalcon/mvc/router/route.zep.h | 2 +- ext/phalcon/mvc/url.zep.c | 2 +- ext/phalcon/mvc/view.zep.c | 18 +- ext/phalcon/mvc/view/engine/php.zep.c | 4 +- ext/phalcon/mvc/view/engine/volt.zep.c | 20 +- .../mvc/view/engine/volt/compiler.zep.c | 152 ++-- ext/phalcon/mvc/view/simple.zep.c | 10 +- .../paginator/adapter/nativearray.zep.c | 2 +- ext/phalcon/support/debug.zep.c | 2 +- ext/phalcon/support/helper/arr/first.zep.c | 2 +- .../support/helper/arr/sliceleft.zep.c | 2 +- .../support/helper/arr/sliceright.zep.c | 2 +- ext/phalcon/support/helper/str/concat.zep.c | 6 +- ext/phalcon/support/version.zep.c | 2 +- ext/phalcon/tag.zep.c | 4 +- ext/php_phalcon.h | 2 +- 33 files changed, 925 insertions(+), 914 deletions(-) diff --git a/ext/phalcon/mvc/model.zep.c b/ext/phalcon/mvc/model.zep.c index 3914fa28ca7..5f7767b12b6 100644 --- a/ext/phalcon/mvc/model.zep.c +++ b/ext/phalcon/mvc/model.zep.c @@ -222,7 +222,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __construct) ZEPHIR_CONCAT_SVS(&_3$$4, "A dependency injection container is required to access the services related to the ODM in '", &_2$$4, "'"); ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 32, &_3$$4); zephir_check_call_status(); - zephir_throw_exception_debug(&_1$$4, "phalcon/Mvc/Model.zep", 182); + zephir_throw_exception_debug(&_1$$4, "phalcon/Mvc/Model.zep", 184); ZEPHIR_MM_RESTORE(); return; } @@ -242,7 +242,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __construct) ZEPHIR_CONCAT_SVS(&_8$$6, "The injected service 'modelsManager' is not valid in '", &_7$$6, "'"); ZEPHIR_CALL_METHOD(NULL, &_6$$6, "__construct", NULL, 32, &_8$$6); zephir_check_call_status(); - zephir_throw_exception_debug(&_6$$6, "phalcon/Mvc/Model.zep", 195); + zephir_throw_exception_debug(&_6$$6, "phalcon/Mvc/Model.zep", 197); ZEPHIR_MM_RESTORE(); return; } @@ -324,7 +324,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __call) ZEPHIR_CONCAT_SVSVS(&_3, "The method '", &method, "' doesn't exist on model '", &modelName, "'"); ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 32, &_3); zephir_check_call_status(); - zephir_throw_exception_debug(&_2, "phalcon/Mvc/Model.zep", 264); + zephir_throw_exception_debug(&_2, "phalcon/Mvc/Model.zep", 266); ZEPHIR_MM_RESTORE(); return; } @@ -379,7 +379,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __callStatic) ZEPHIR_CONCAT_SVSVS(&_2, "The method '", &method, "' doesn't exist on model '", &modelName, "'"); ZEPHIR_CALL_METHOD(NULL, &_1, "__construct", NULL, 32, &_2); zephir_check_call_status(); - zephir_throw_exception_debug(&_1, "phalcon/Mvc/Model.zep", 290); + zephir_throw_exception_debug(&_1, "phalcon/Mvc/Model.zep", 292); ZEPHIR_MM_RESTORE(); return; } @@ -445,7 +445,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __get) zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("dirtyRelated"), PH_NOISY_CC | PH_READONLY); if (zephir_array_isset(&_1$$3, &lowerProperty)) { zephir_read_property(&_2$$4, this_ptr, ZEND_STRL("dirtyRelated"), PH_NOISY_CC | PH_READONLY); - zephir_array_fetch(&_3$$4, &_2$$4, &lowerProperty, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 322); + zephir_array_fetch(&_3$$4, &_2$$4, &lowerProperty, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 324); RETURN_CTOR(&_3$$4); } ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getrelated", NULL, 0, &lowerProperty); @@ -711,7 +711,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __set) if (ZEPHIR_IS_LONG(&_5$$7, 2) || ZEPHIR_IS_LONG(&_5$$7, 4)) { ZEPHIR_INIT_VAR(&related); array_init(&related); - zephir_is_iterable(value, 0, "phalcon/Mvc/Model.zep", 493); + zephir_is_iterable(value, 0, "phalcon/Mvc/Model.zep", 495); if (Z_TYPE_P(value) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(value), _9$$10) { @@ -719,7 +719,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __set) ZVAL_COPY(&item, _9$$10); if (Z_TYPE_P(&item) == IS_OBJECT) { if (zephir_instance_of_ev(&item, phalcon_mvc_modelinterface_ce)) { - zephir_array_append(&related, &item, PH_SEPARATE, "phalcon/Mvc/Model.zep", 488); + zephir_array_append(&related, &item, PH_SEPARATE, "phalcon/Mvc/Model.zep", 490); } } } ZEND_HASH_FOREACH_END(); @@ -736,7 +736,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __set) zephir_check_call_status(); if (Z_TYPE_P(&item) == IS_OBJECT) { if (zephir_instance_of_ev(&item, phalcon_mvc_modelinterface_ce)) { - zephir_array_append(&related, &item, PH_SEPARATE, "phalcon/Mvc/Model.zep", 488); + zephir_array_append(&related, &item, PH_SEPARATE, "phalcon/Mvc/Model.zep", 490); } } ZEPHIR_CALL_METHOD(NULL, value, "next", NULL, 0); @@ -786,7 +786,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __set) ZEPHIR_CONCAT_SVSVS(&_19$$21, "Cannot access property '", &property, "' (not public) in '", &_18$$21, "'"); ZEPHIR_CALL_METHOD(NULL, &_17$$21, "__construct", NULL, 32, &_19$$21); zephir_check_call_status(); - zephir_throw_exception_debug(&_17$$21, "phalcon/Mvc/Model.zep", 522); + zephir_throw_exception_debug(&_17$$21, "phalcon/Mvc/Model.zep", 524); ZEPHIR_MM_RESTORE(); return; } @@ -858,7 +858,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __unserialize) ZEPHIR_CONCAT_SVS(&_4$$4, "A dependency injection container is required to access the services related to the ODM in '", &_3$$4, "'"); ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 32, &_4$$4); zephir_check_call_status(); - zephir_throw_exception_debug(&_2$$4, "phalcon/Mvc/Model.zep", 551); + zephir_throw_exception_debug(&_2$$4, "phalcon/Mvc/Model.zep", 553); ZEPHIR_MM_RESTORE(); return; } @@ -877,7 +877,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __unserialize) ZEPHIR_CONCAT_SVS(&_9$$5, "The injected service 'modelsManager' is not valid in '", &_8$$5, "'"); ZEPHIR_CALL_METHOD(NULL, &_7$$5, "__construct", NULL, 32, &_9$$5); zephir_check_call_status(); - zephir_throw_exception_debug(&_7$$5, "phalcon/Mvc/Model.zep", 566); + zephir_throw_exception_debug(&_7$$5, "phalcon/Mvc/Model.zep", 568); ZEPHIR_MM_RESTORE(); return; } @@ -886,7 +886,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __unserialize) zephir_check_call_status(); ZEPHIR_OBS_VAR(&properties); if (zephir_array_isset_string_fetch(&properties, &data, SL("attributes"), 0)) { - zephir_is_iterable(&properties, 0, "phalcon/Mvc/Model.zep", 589); + zephir_is_iterable(&properties, 0, "phalcon/Mvc/Model.zep", 591); if (Z_TYPE_P(&properties) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&properties), _12$$6, _13$$6, _10$$6) { @@ -1163,7 +1163,7 @@ PHP_METHOD(Phalcon_Mvc_Model, assign) if (Z_TYPE_P(dataColumnMap) == IS_ARRAY) { ZEPHIR_INIT_VAR(&dataMapped); array_init(&dataMapped); - zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 749); + zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 751); if (Z_TYPE_P(&data) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&data), _2$$3, _3$$3, _0$$3) { @@ -1220,7 +1220,7 @@ PHP_METHOD(Phalcon_Mvc_Model, assign) } ZEPHIR_CALL_METHOD(&_4, &metaData, "getattributes", NULL, 0, this_ptr); zephir_check_call_status(); - zephir_is_iterable(&_4, 0, "phalcon/Mvc/Model.zep", 806); + zephir_is_iterable(&_4, 0, "phalcon/Mvc/Model.zep", 808); if (Z_TYPE_P(&_4) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_4), _5) { @@ -1247,7 +1247,7 @@ PHP_METHOD(Phalcon_Mvc_Model, assign) ZEPHIR_CONCAT_SVSVS(&_12$$16, "Column '", &attribute, "' doesn't make part of the column map in '", &_11$$16, "'"); ZEPHIR_CALL_METHOD(NULL, &_10$$16, "__construct", &_13, 32, &_12$$16); zephir_check_call_status(); - zephir_throw_exception_debug(&_10$$16, "phalcon/Mvc/Model.zep", 780); + zephir_throw_exception_debug(&_10$$16, "phalcon/Mvc/Model.zep", 782); ZEPHIR_MM_RESTORE(); return; } @@ -1306,7 +1306,7 @@ PHP_METHOD(Phalcon_Mvc_Model, assign) ZEPHIR_CONCAT_SVSVS(&_21$$26, "Column '", &attribute, "' doesn't make part of the column map in '", &_20$$26, "'"); ZEPHIR_CALL_METHOD(NULL, &_19$$26, "__construct", &_13, 32, &_21$$26); zephir_check_call_status(); - zephir_throw_exception_debug(&_19$$26, "phalcon/Mvc/Model.zep", 780); + zephir_throw_exception_debug(&_19$$26, "phalcon/Mvc/Model.zep", 782); ZEPHIR_MM_RESTORE(); return; } @@ -1482,7 +1482,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResult) ZVAL_LONG(&_0, dirtyState); ZEPHIR_CALL_METHOD(NULL, &instance, "setdirtystate", NULL, 0, &_0); zephir_check_call_status(); - zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 896); + zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 898); if (Z_TYPE_P(&data) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&data), _3, _4, _1) { @@ -1503,7 +1503,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResult) ZEPHIR_CONCAT_SVS(&_7$$4, "Invalid key in array data provided to dumpResult() in '", &_6$$4, "'"); ZEPHIR_CALL_METHOD(NULL, &_5$$4, "__construct", &_8, 32, &_7$$4); zephir_check_call_status(); - zephir_throw_exception_debug(&_5$$4, "phalcon/Mvc/Model.zep", 886); + zephir_throw_exception_debug(&_5$$4, "phalcon/Mvc/Model.zep", 888); ZEPHIR_MM_RESTORE(); return; } @@ -1531,7 +1531,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResult) ZEPHIR_CONCAT_SVS(&_11$$6, "Invalid key in array data provided to dumpResult() in '", &_10$$6, "'"); ZEPHIR_CALL_METHOD(NULL, &_9$$6, "__construct", &_8, 32, &_11$$6); zephir_check_call_status(); - zephir_throw_exception_debug(&_9$$6, "phalcon/Mvc/Model.zep", 886); + zephir_throw_exception_debug(&_9$$6, "phalcon/Mvc/Model.zep", 888); ZEPHIR_MM_RESTORE(); return; } @@ -1649,7 +1649,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap) ZVAL_LONG(&_0, dirtyState); ZEPHIR_CALL_METHOD(NULL, &instance, "setdirtystate", NULL, 0, &_0); zephir_check_call_status(); - zephir_is_iterable(&data, 1, "phalcon/Mvc/Model.zep", 1029); + zephir_is_iterable(&data, 1, "phalcon/Mvc/Model.zep", 1031); if (Z_TYPE_P(&data) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&data), _3, _4, _1) { @@ -1690,7 +1690,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap) ZEPHIR_CONCAT_SVSVS(&_8$$9, "Column '", &key, "' doesn't make part of the column map in '", &_7$$9, "'"); ZEPHIR_CALL_METHOD(NULL, &_6$$9, "__construct", &_9, 32, &_8$$9); zephir_check_call_status(); - zephir_throw_exception_debug(&_6$$9, "phalcon/Mvc/Model.zep", 956); + zephir_throw_exception_debug(&_6$$9, "phalcon/Mvc/Model.zep", 958); ZEPHIR_MM_RESTORE(); return; } @@ -1706,7 +1706,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap) ZEPHIR_CONCAT_SVSVS(&_12$$11, "Column '", &key, "' doesn't make part of the column map in '", &_11$$11, "'"); ZEPHIR_CALL_METHOD(NULL, &_10$$11, "__construct", &_9, 32, &_12$$11); zephir_check_call_status(); - zephir_throw_exception_debug(&_10$$11, "phalcon/Mvc/Model.zep", 965); + zephir_throw_exception_debug(&_10$$11, "phalcon/Mvc/Model.zep", 967); ZEPHIR_MM_RESTORE(); return; } @@ -1722,7 +1722,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap) _13$$3 = Z_TYPE_P(&value) != IS_NULL; } if (_13$$3) { - zephir_array_fetch_long(&_14$$13, &attribute, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 979); + zephir_array_fetch_long(&_14$$13, &attribute, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 981); do { if (ZEPHIR_IS_LONG(&_14$$13, 0) || ZEPHIR_IS_LONG(&_14$$13, 21) || ZEPHIR_IS_LONG(&_14$$13, 22) || ZEPHIR_IS_LONG(&_14$$13, 26)) { ZVAL_LONG(&_15$$14, 10); @@ -1745,7 +1745,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap) } while(0); } else { - zephir_array_fetch_long(&_17$$18, &attribute, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 1002); + zephir_array_fetch_long(&_17$$18, &attribute, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 1004); do { if (ZEPHIR_IS_LONG(&_17$$18, 14) || ZEPHIR_IS_LONG(&_17$$18, 8) || ZEPHIR_IS_LONG(&_17$$18, 3) || ZEPHIR_IS_LONG(&_17$$18, 9) || ZEPHIR_IS_LONG(&_17$$18, 7) || ZEPHIR_IS_LONG(&_17$$18, 0) || ZEPHIR_IS_LONG(&_17$$18, 21) || ZEPHIR_IS_LONG(&_17$$18, 22) || ZEPHIR_IS_LONG(&_17$$18, 26)) { ZEPHIR_INIT_NVAR(&castValue); @@ -1758,7 +1758,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap) } ZEPHIR_OBS_NVAR(&attributeName); - zephir_array_fetch_long(&attributeName, &attribute, 0, PH_NOISY, "phalcon/Mvc/Model.zep", 1021); + zephir_array_fetch_long(&attributeName, &attribute, 0, PH_NOISY, "phalcon/Mvc/Model.zep", 1023); zephir_update_property_zval_zval(&instance, &attributeName, &castValue); zephir_array_update_zval(&data, &key, &castValue, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -1804,7 +1804,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap) ZEPHIR_CONCAT_SVSVS(&_21$$27, "Column '", &key, "' doesn't make part of the column map in '", &_20$$27, "'"); ZEPHIR_CALL_METHOD(NULL, &_19$$27, "__construct", &_9, 32, &_21$$27); zephir_check_call_status(); - zephir_throw_exception_debug(&_19$$27, "phalcon/Mvc/Model.zep", 956); + zephir_throw_exception_debug(&_19$$27, "phalcon/Mvc/Model.zep", 958); ZEPHIR_MM_RESTORE(); return; } @@ -1820,7 +1820,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap) ZEPHIR_CONCAT_SVSVS(&_24$$29, "Column '", &key, "' doesn't make part of the column map in '", &_23$$29, "'"); ZEPHIR_CALL_METHOD(NULL, &_22$$29, "__construct", &_9, 32, &_24$$29); zephir_check_call_status(); - zephir_throw_exception_debug(&_22$$29, "phalcon/Mvc/Model.zep", 965); + zephir_throw_exception_debug(&_22$$29, "phalcon/Mvc/Model.zep", 967); ZEPHIR_MM_RESTORE(); return; } @@ -1836,7 +1836,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap) _25$$21 = Z_TYPE_P(&value) != IS_NULL; } if (_25$$21) { - zephir_array_fetch_long(&_26$$31, &attribute, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 979); + zephir_array_fetch_long(&_26$$31, &attribute, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 981); do { if (ZEPHIR_IS_LONG(&_26$$31, 0) || ZEPHIR_IS_LONG(&_26$$31, 21) || ZEPHIR_IS_LONG(&_26$$31, 22) || ZEPHIR_IS_LONG(&_26$$31, 26)) { ZVAL_LONG(&_27$$32, 10); @@ -1859,7 +1859,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap) } while(0); } else { - zephir_array_fetch_long(&_28$$36, &attribute, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 1002); + zephir_array_fetch_long(&_28$$36, &attribute, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 1004); do { if (ZEPHIR_IS_LONG(&_28$$36, 14) || ZEPHIR_IS_LONG(&_28$$36, 8) || ZEPHIR_IS_LONG(&_28$$36, 3) || ZEPHIR_IS_LONG(&_28$$36, 9) || ZEPHIR_IS_LONG(&_28$$36, 7) || ZEPHIR_IS_LONG(&_28$$36, 0) || ZEPHIR_IS_LONG(&_28$$36, 21) || ZEPHIR_IS_LONG(&_28$$36, 22) || ZEPHIR_IS_LONG(&_28$$36, 26)) { ZEPHIR_INIT_NVAR(&castValue); @@ -1872,7 +1872,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMap) } ZEPHIR_OBS_NVAR(&attributeName); - zephir_array_fetch_long(&attributeName, &attribute, 0, PH_NOISY, "phalcon/Mvc/Model.zep", 1021); + zephir_array_fetch_long(&attributeName, &attribute, 0, PH_NOISY, "phalcon/Mvc/Model.zep", 1023); zephir_update_property_zval_zval(&instance, &attributeName, &castValue); zephir_array_update_zval(&data, &key, &castValue, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &data, "next", NULL, 0); @@ -1954,7 +1954,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate) } ZEPHIR_INIT_VAR(&hydrateArray); array_init(&hydrateArray); - zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 1116); + zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 1118); if (Z_TYPE_P(&data) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&data), _2, _3, _0) { @@ -1988,7 +1988,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate) ZEPHIR_CONCAT_SVS(&_8$$10, "Column '", &key, "' doesn't make part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_7$$10, "__construct", &_9, 32, &_8$$10); zephir_check_call_status(); - zephir_throw_exception_debug(&_7$$10, "phalcon/Mvc/Model.zep", 1095); + zephir_throw_exception_debug(&_7$$10, "phalcon/Mvc/Model.zep", 1097); ZEPHIR_MM_RESTORE(); return; } @@ -1996,7 +1996,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate) } if (Z_TYPE_P(&attribute) == IS_ARRAY) { ZEPHIR_OBS_NVAR(&attributeName); - zephir_array_fetch_long(&attributeName, &attribute, 0, PH_NOISY, "phalcon/Mvc/Model.zep", 1105); + zephir_array_fetch_long(&attributeName, &attribute, 0, PH_NOISY, "phalcon/Mvc/Model.zep", 1107); } else { ZEPHIR_CPY_WRT(&attributeName, &attribute); } @@ -2040,7 +2040,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate) ZEPHIR_CONCAT_SVS(&_13$$19, "Column '", &key, "' doesn't make part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_12$$19, "__construct", &_9, 32, &_13$$19); zephir_check_call_status(); - zephir_throw_exception_debug(&_12$$19, "phalcon/Mvc/Model.zep", 1095); + zephir_throw_exception_debug(&_12$$19, "phalcon/Mvc/Model.zep", 1097); ZEPHIR_MM_RESTORE(); return; } @@ -2048,7 +2048,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate) } if (Z_TYPE_P(&attribute) == IS_ARRAY) { ZEPHIR_OBS_NVAR(&attributeName); - zephir_array_fetch_long(&attributeName, &attribute, 0, PH_NOISY, "phalcon/Mvc/Model.zep", 1105); + zephir_array_fetch_long(&attributeName, &attribute, 0, PH_NOISY, "phalcon/Mvc/Model.zep", 1107); } else { ZEPHIR_CPY_WRT(&attributeName, &attribute); } @@ -2103,7 +2103,7 @@ PHP_METHOD(Phalcon_Mvc_Model, collectRelatedToSave) ZEPHIR_CPY_WRT(&related, &_0); zephir_read_property(&_1, this_ptr, ZEND_STRL("dirtyRelated"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&dirtyRelated, &_1); - zephir_is_iterable(&related, 0, "phalcon/Mvc/Model.zep", 1157); + zephir_is_iterable(&related, 0, "phalcon/Mvc/Model.zep", 1159); if (Z_TYPE_P(&related) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&related), _4, _5, _2) { @@ -2438,11 +2438,11 @@ PHP_METHOD(Phalcon_Mvc_Model, delete) ZEPHIR_CONCAT_SVS(&_5$$7, "A primary key must be defined in the model in order to perform the operation in '", &_4$$7, "'"); ZEPHIR_CALL_METHOD(NULL, &_3$$7, "__construct", NULL, 32, &_5$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model.zep", 1314); + zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model.zep", 1316); ZEPHIR_MM_RESTORE(); return; } - zephir_is_iterable(&primaryKeys, 0, "phalcon/Mvc/Model.zep", 1363); + zephir_is_iterable(&primaryKeys, 0, "phalcon/Mvc/Model.zep", 1365); if (Z_TYPE_P(&primaryKeys) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&primaryKeys), _6) { @@ -2458,7 +2458,7 @@ PHP_METHOD(Phalcon_Mvc_Model, delete) ZEPHIR_CONCAT_SVSVS(&_10$$9, "Column '", &primaryKey, "' have not defined a bind data type in '", &_9$$9, "'"); ZEPHIR_CALL_METHOD(NULL, &_8$$9, "__construct", NULL, 32, &_10$$9); zephir_check_call_status(); - zephir_throw_exception_debug(&_8$$9, "phalcon/Mvc/Model.zep", 1328); + zephir_throw_exception_debug(&_8$$9, "phalcon/Mvc/Model.zep", 1330); ZEPHIR_MM_RESTORE(); return; } @@ -2473,7 +2473,7 @@ PHP_METHOD(Phalcon_Mvc_Model, delete) ZEPHIR_CONCAT_SVSVS(&_13$$11, "Column '", &primaryKey, "' isn't part of the column map in '", &_12$$11, "'"); ZEPHIR_CALL_METHOD(NULL, &_11$$11, "__construct", NULL, 32, &_13$$11); zephir_check_call_status(); - zephir_throw_exception_debug(&_11$$11, "phalcon/Mvc/Model.zep", 1338); + zephir_throw_exception_debug(&_11$$11, "phalcon/Mvc/Model.zep", 1340); ZEPHIR_MM_RESTORE(); return; } @@ -2490,17 +2490,17 @@ PHP_METHOD(Phalcon_Mvc_Model, delete) ZEPHIR_CONCAT_SVSVS(&_16$$13, "Cannot delete the record because the primary key attribute: '", &attributeField, "' was not set in '", &_15$$13, "'"); ZEPHIR_CALL_METHOD(NULL, &_14$$13, "__construct", NULL, 32, &_16$$13); zephir_check_call_status(); - zephir_throw_exception_debug(&_14$$13, "phalcon/Mvc/Model.zep", 1352); + zephir_throw_exception_debug(&_14$$13, "phalcon/Mvc/Model.zep", 1354); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1358); + zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1360); ZEPHIR_CALL_METHOD(&_17$$8, &writeConnection, "escapeidentifier", &_18, 0, &primaryKey); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_19$$8); ZEPHIR_CONCAT_VS(&_19$$8, &_17$$8, " = ?"); - zephir_array_append(&conditions, &_19$$8, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1359); - zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1360); + zephir_array_append(&conditions, &_19$$8, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1361); + zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1362); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &primaryKeys, "rewind", NULL, 0); @@ -2523,7 +2523,7 @@ PHP_METHOD(Phalcon_Mvc_Model, delete) ZEPHIR_CONCAT_SVSVS(&_22$$15, "Column '", &primaryKey, "' have not defined a bind data type in '", &_21$$15, "'"); ZEPHIR_CALL_METHOD(NULL, &_20$$15, "__construct", NULL, 32, &_22$$15); zephir_check_call_status(); - zephir_throw_exception_debug(&_20$$15, "phalcon/Mvc/Model.zep", 1328); + zephir_throw_exception_debug(&_20$$15, "phalcon/Mvc/Model.zep", 1330); ZEPHIR_MM_RESTORE(); return; } @@ -2538,7 +2538,7 @@ PHP_METHOD(Phalcon_Mvc_Model, delete) ZEPHIR_CONCAT_SVSVS(&_25$$17, "Column '", &primaryKey, "' isn't part of the column map in '", &_24$$17, "'"); ZEPHIR_CALL_METHOD(NULL, &_23$$17, "__construct", NULL, 32, &_25$$17); zephir_check_call_status(); - zephir_throw_exception_debug(&_23$$17, "phalcon/Mvc/Model.zep", 1338); + zephir_throw_exception_debug(&_23$$17, "phalcon/Mvc/Model.zep", 1340); ZEPHIR_MM_RESTORE(); return; } @@ -2555,17 +2555,17 @@ PHP_METHOD(Phalcon_Mvc_Model, delete) ZEPHIR_CONCAT_SVSVS(&_28$$19, "Cannot delete the record because the primary key attribute: '", &attributeField, "' was not set in '", &_27$$19, "'"); ZEPHIR_CALL_METHOD(NULL, &_26$$19, "__construct", NULL, 32, &_28$$19); zephir_check_call_status(); - zephir_throw_exception_debug(&_26$$19, "phalcon/Mvc/Model.zep", 1352); + zephir_throw_exception_debug(&_26$$19, "phalcon/Mvc/Model.zep", 1354); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1358); + zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1360); ZEPHIR_CALL_METHOD(&_29$$14, &writeConnection, "escapeidentifier", &_30, 0, &primaryKey); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_31$$14); ZEPHIR_CONCAT_VS(&_31$$14, &_29$$14, " = ?"); - zephir_array_append(&conditions, &_31$$14, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1359); - zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1360); + zephir_array_append(&conditions, &_31$$14, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1361); + zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1362); ZEPHIR_CALL_METHOD(NULL, &primaryKeys, "next", NULL, 0); zephir_check_call_status(); } @@ -2871,7 +2871,7 @@ PHP_METHOD(Phalcon_Mvc_Model, find) ZEPHIR_INIT_VAR(¶ms); array_init(¶ms); if (Z_TYPE_P(parameters) != IS_NULL) { - zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1633); + zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1635); } } else { ZEPHIR_CPY_WRT(¶ms, parameters); @@ -3034,7 +3034,7 @@ PHP_METHOD(Phalcon_Mvc_Model, findFirst) ZEPHIR_CONCAT_SVS(&_4$$6, "Parameters passed must be of type array, string, numeric or null in '", &_3$$6, "'"); ZEPHIR_CALL_METHOD(NULL, &_2$$6, "__construct", NULL, 32, &_4$$6); zephir_check_call_status(); - zephir_throw_exception_debug(&_2$$6, "phalcon/Mvc/Model.zep", 1757); + zephir_throw_exception_debug(&_2$$6, "phalcon/Mvc/Model.zep", 1759); ZEPHIR_MM_RESTORE(); return; } @@ -3197,7 +3197,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getChangedFields) ZEPHIR_CONCAT_SVS(&_3$$3, "The 'keepSnapshots' option must be enabled to track changes in '", &_2$$3, "'"); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 32, &_3$$3); zephir_check_call_status(); - zephir_throw_exception_debug(&_1$$3, "phalcon/Mvc/Model.zep", 1843); + zephir_throw_exception_debug(&_1$$3, "phalcon/Mvc/Model.zep", 1845); ZEPHIR_MM_RESTORE(); return; } @@ -3214,7 +3214,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getChangedFields) ZEPHIR_INIT_VAR(&changed); array_init(&changed); ZEPHIR_INIT_VAR(&_4); - zephir_is_iterable(&allAttributes, 0, "phalcon/Mvc/Model.zep", 1901); + zephir_is_iterable(&allAttributes, 0, "phalcon/Mvc/Model.zep", 1903); if (Z_TYPE_P(&allAttributes) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&allAttributes), _7, _8, _5) { @@ -3227,17 +3227,17 @@ PHP_METHOD(Phalcon_Mvc_Model, getChangedFields) ZEPHIR_INIT_NVAR(&_4); ZVAL_COPY(&_4, _5); if (!(zephir_array_isset(&snapshot, &name))) { - zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1876); + zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1878); continue; } ZEPHIR_OBS_NVAR(&value); if (!(zephir_fetch_property_zval(&value, this_ptr, &name, PH_SILENT_CC))) { - zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1886); + zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1888); continue; } - zephir_array_fetch(&_9$$6, &snapshot, &name, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 1894); + zephir_array_fetch(&_9$$6, &snapshot, &name, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 1896); if (!ZEPHIR_IS_IDENTICAL(&value, &_9$$6)) { - zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1895); + zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1897); continue; } } ZEND_HASH_FOREACH_END(); @@ -3255,17 +3255,17 @@ PHP_METHOD(Phalcon_Mvc_Model, getChangedFields) ZEPHIR_CALL_METHOD(&_4, &allAttributes, "current", NULL, 0); zephir_check_call_status(); if (!(zephir_array_isset(&snapshot, &name))) { - zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1876); + zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1878); continue; } ZEPHIR_OBS_NVAR(&value); if (!(zephir_fetch_property_zval(&value, this_ptr, &name, PH_SILENT_CC))) { - zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1886); + zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1888); continue; } - zephir_array_fetch(&_10$$10, &snapshot, &name, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 1894); + zephir_array_fetch(&_10$$10, &snapshot, &name, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 1896); if (!ZEPHIR_IS_IDENTICAL(&value, &_10$$10)) { - zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1895); + zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1897); continue; } ZEPHIR_CALL_METHOD(NULL, &allAttributes, "next", NULL, 0); @@ -3376,7 +3376,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getMessages) ZEPHIR_INIT_VAR(&filtered); array_init(&filtered); zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("errorMessages"), PH_NOISY_CC | PH_READONLY); - zephir_is_iterable(&_1$$3, 0, "phalcon/Mvc/Model.zep", 1958); + zephir_is_iterable(&_1$$3, 0, "phalcon/Mvc/Model.zep", 1960); if (Z_TYPE_P(&_1$$3) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_1$$3), _2$$3) { @@ -3385,7 +3385,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getMessages) ZEPHIR_CALL_METHOD(&_4$$4, &message, "getfield", NULL, 0); zephir_check_call_status(); if (ZEPHIR_IS_EQUAL(&_4$$4, filter)) { - zephir_array_append(&filtered, &message, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1954); + zephir_array_append(&filtered, &message, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1956); } } ZEND_HASH_FOREACH_END(); } else { @@ -3402,7 +3402,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getMessages) ZEPHIR_CALL_METHOD(&_5$$6, &message, "getfield", NULL, 0); zephir_check_call_status(); if (ZEPHIR_IS_EQUAL(&_5$$6, filter)) { - zephir_array_append(&filtered, &message, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1954); + zephir_array_append(&filtered, &message, PH_SEPARATE, "phalcon/Mvc/Model.zep", 1956); } ZEPHIR_CALL_METHOD(NULL, &_1$$3, "next", NULL, 0); zephir_check_call_status(); @@ -3467,7 +3467,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getModelsMetaData) ZEPHIR_CONCAT_SVS(&_5$$4, "The injected service 'modelsMetadata' is not valid in '", &_4$$4, "'"); ZEPHIR_CALL_METHOD(NULL, &_3$$4, "__construct", NULL, 32, &_5$$4); zephir_check_call_status(); - zephir_throw_exception_debug(&_3$$4, "phalcon/Mvc/Model.zep", 1992); + zephir_throw_exception_debug(&_3$$4, "phalcon/Mvc/Model.zep", 1994); ZEPHIR_MM_RESTORE(); return; } @@ -3614,7 +3614,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getRelated) ZEPHIR_CONCAT_SVSVS(&_3$$3, "There is no defined relations for the model '", &className, "' using alias '", &alias, "'"); ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 32, &_3$$3); zephir_check_call_status(); - zephir_throw_exception_debug(&_2$$3, "phalcon/Mvc/Model.zep", 2068); + zephir_throw_exception_debug(&_2$$3, "phalcon/Mvc/Model.zep", 2070); ZEPHIR_MM_RESTORE(); return; } @@ -3791,12 +3791,12 @@ PHP_METHOD(Phalcon_Mvc_Model, getUpdatedFields) ZEPHIR_CONCAT_SVS(&_3$$3, "The 'updateSnapshotOnSave' option must be enabled for this method to work properly in '", &_2$$3, "'"); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 32, &_3$$3); zephir_check_call_status(); - zephir_throw_exception_debug(&_1$$3, "phalcon/Mvc/Model.zep", 2192); + zephir_throw_exception_debug(&_1$$3, "phalcon/Mvc/Model.zep", 2194); ZEPHIR_MM_RESTORE(); return; } if (UNEXPECTED(Z_TYPE_P(&snapshot) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The 'keepSnapshots' option must be enabled to track changes", "phalcon/Mvc/Model.zep", 2198); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The 'keepSnapshots' option must be enabled to track changes", "phalcon/Mvc/Model.zep", 2200); return; } zephir_read_property(&_0, this_ptr, ZEND_STRL("dirtyState"), PH_NOISY_CC | PH_READONLY); @@ -3809,13 +3809,13 @@ PHP_METHOD(Phalcon_Mvc_Model, getUpdatedFields) ZEPHIR_CONCAT_SVS(&_6$$5, "Change checking cannot be performed because the object has not been persisted or is deleted in '", &_5$$5, "'"); ZEPHIR_CALL_METHOD(NULL, &_4$$5, "__construct", NULL, 32, &_6$$5); zephir_check_call_status(); - zephir_throw_exception_debug(&_4$$5, "phalcon/Mvc/Model.zep", 2207); + zephir_throw_exception_debug(&_4$$5, "phalcon/Mvc/Model.zep", 2209); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_INIT_VAR(&updated); array_init(&updated); - zephir_is_iterable(&snapshot, 0, "phalcon/Mvc/Model.zep", 2222); + zephir_is_iterable(&snapshot, 0, "phalcon/Mvc/Model.zep", 2224); if (Z_TYPE_P(&snapshot) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&snapshot), _9, _10, _7) { @@ -3829,11 +3829,11 @@ PHP_METHOD(Phalcon_Mvc_Model, getUpdatedFields) ZVAL_COPY(&value, _7); _11$$6 = !(zephir_array_isset(&oldSnapshot, &name)); if (!(_11$$6)) { - zephir_array_fetch(&_12$$6, &oldSnapshot, &name, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 2217); + zephir_array_fetch(&_12$$6, &oldSnapshot, &name, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 2219); _11$$6 = !ZEPHIR_IS_IDENTICAL(&value, &_12$$6); } if (_11$$6) { - zephir_array_append(&updated, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 2218); + zephir_array_append(&updated, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 2220); } } ZEND_HASH_FOREACH_END(); } else { @@ -3851,11 +3851,11 @@ PHP_METHOD(Phalcon_Mvc_Model, getUpdatedFields) zephir_check_call_status(); _13$$8 = !(zephir_array_isset(&oldSnapshot, &name)); if (!(_13$$8)) { - zephir_array_fetch(&_14$$8, &oldSnapshot, &name, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 2217); + zephir_array_fetch(&_14$$8, &oldSnapshot, &name, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 2219); _13$$8 = !ZEPHIR_IS_IDENTICAL(&value, &_14$$8); } if (_13$$8) { - zephir_array_append(&updated, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 2218); + zephir_array_append(&updated, &name, PH_SEPARATE, "phalcon/Mvc/Model.zep", 2220); } ZEPHIR_CALL_METHOD(NULL, &snapshot, "next", NULL, 0); zephir_check_call_status(); @@ -4387,7 +4387,7 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh) ZEPHIR_CONCAT_SVS(&_3$$3, "The record cannot be refreshed because it does not exist or is deleted in '", &_2$$3, "'"); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 32, &_3$$3); zephir_check_call_status(); - zephir_throw_exception_debug(&_1$$3, "phalcon/Mvc/Model.zep", 2473); + zephir_throw_exception_debug(&_1$$3, "phalcon/Mvc/Model.zep", 2475); ZEPHIR_MM_RESTORE(); return; } @@ -4423,7 +4423,7 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh) ZEPHIR_CONCAT_SVS(&_8$$7, "The record cannot be refreshed because it does not exist or is deleted in '", &_7$$7, "'"); ZEPHIR_CALL_METHOD(NULL, &_6$$7, "__construct", NULL, 32, &_8$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_6$$7, "phalcon/Mvc/Model.zep", 2498); + zephir_throw_exception_debug(&_6$$7, "phalcon/Mvc/Model.zep", 2500); ZEPHIR_MM_RESTORE(); return; } @@ -4441,7 +4441,7 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh) ZEPHIR_CONCAT_SVS(&_12$$8, "The record cannot be refreshed because it does not exist or is deleted in '", &_11$$8, "'"); ZEPHIR_CALL_METHOD(NULL, &_10$$8, "__construct", NULL, 32, &_12$$8); zephir_check_call_status(); - zephir_throw_exception_debug(&_10$$8, "phalcon/Mvc/Model.zep", 2509); + zephir_throw_exception_debug(&_10$$8, "phalcon/Mvc/Model.zep", 2511); ZEPHIR_MM_RESTORE(); return; } @@ -4449,7 +4449,7 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh) array_init(&fields); ZEPHIR_CALL_METHOD(&_13, &metaData, "getattributes", NULL, 0, this_ptr); zephir_check_call_status(); - zephir_is_iterable(&_13, 0, "phalcon/Mvc/Model.zep", 2524); + zephir_is_iterable(&_13, 0, "phalcon/Mvc/Model.zep", 2526); if (Z_TYPE_P(&_13) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_13), _14) { @@ -4458,7 +4458,7 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh) ZEPHIR_INIT_NVAR(&_16$$9); zephir_create_array(&_16$$9, 1, 0); zephir_array_fast_append(&_16$$9, &attribute); - zephir_array_append(&fields, &_16$$9, PH_SEPARATE, "phalcon/Mvc/Model.zep", 2518); + zephir_array_append(&fields, &_16$$9, PH_SEPARATE, "phalcon/Mvc/Model.zep", 2520); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &_13, "rewind", NULL, 0); @@ -4474,7 +4474,7 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh) ZEPHIR_INIT_NVAR(&_17$$10); zephir_create_array(&_17$$10, 1, 0); zephir_array_fast_append(&_17$$10, &attribute); - zephir_array_append(&fields, &_17$$10, PH_SEPARATE, "phalcon/Mvc/Model.zep", 2518); + zephir_array_append(&fields, &_17$$10, PH_SEPARATE, "phalcon/Mvc/Model.zep", 2520); ZEPHIR_CALL_METHOD(NULL, &_13, "next", NULL, 0); zephir_check_call_status(); } @@ -4540,13 +4540,42 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh) *``` */ PHP_METHOD(Phalcon_Mvc_Model, save) +{ + zval visited; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&visited); + + + ZEPHIR_MM_GROW(); + + ZEPHIR_INIT_VAR(&visited); + object_init_ex(&visited, phalcon_support_collection_ce); + ZEPHIR_CALL_METHOD(NULL, &visited, "__construct", NULL, 22); + zephir_check_call_status(); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "dosave", NULL, 0, &visited); + zephir_check_call_status(); + RETURN_MM(); +} + +/** + * Inserted or updates model instance, expects a visited list of objects. + * + * @param CollectionInterface $visited + * + * @return bool + */ +PHP_METHOD(Phalcon_Mvc_Model, doSave) { zend_bool hasRelatedToSave = 0; - zval metaData, schema, writeConnection, readConnection, source, table, identityField, exists, success, relatedToSave, _0, _4, _1$$3, _2$$7, _3$$8, _5$$10, _6$$11, _7$$11, _8$$14, _9$$16, _10$$18, _11$$21, _12$$20; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; + zval *visited, visited_sub, metaData, schema, writeConnection, readConnection, source, table, identityField, exists, success, relatedToSave, objId, _0, _1, _5, _2$$4, _3$$8, _4$$9, _6$$11, _7$$12, _8$$12, _9$$15, _10$$17, _11$$19, _12$$22, _13$$21; zval *this_ptr = getThis(); + ZVAL_UNDEF(&visited_sub); ZVAL_UNDEF(&metaData); ZVAL_UNDEF(&schema); ZVAL_UNDEF(&writeConnection); @@ -4557,38 +4586,57 @@ PHP_METHOD(Phalcon_Mvc_Model, save) ZVAL_UNDEF(&exists); ZVAL_UNDEF(&success); ZVAL_UNDEF(&relatedToSave); + ZVAL_UNDEF(&objId); ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_4); - ZVAL_UNDEF(&_1$$3); - ZVAL_UNDEF(&_2$$7); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_5); + ZVAL_UNDEF(&_2$$4); ZVAL_UNDEF(&_3$$8); - ZVAL_UNDEF(&_5$$10); + ZVAL_UNDEF(&_4$$9); ZVAL_UNDEF(&_6$$11); - ZVAL_UNDEF(&_7$$11); - ZVAL_UNDEF(&_8$$14); - ZVAL_UNDEF(&_9$$16); - ZVAL_UNDEF(&_10$$18); - ZVAL_UNDEF(&_11$$21); - ZVAL_UNDEF(&_12$$20); + ZVAL_UNDEF(&_7$$12); + ZVAL_UNDEF(&_8$$12); + ZVAL_UNDEF(&_9$$15); + ZVAL_UNDEF(&_10$$17); + ZVAL_UNDEF(&_11$$19); + ZVAL_UNDEF(&_12$$22); + ZVAL_UNDEF(&_13$$21); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_OBJECT_OF_CLASS(visited, phalcon_support_collection_collectioninterface_ce) + ZEND_PARSE_PARAMETERS_END(); +#endif ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &visited); + + ZEPHIR_CALL_FUNCTION(&objId, "spl_object_id", NULL, 434, this_ptr); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&_0, visited, "has", NULL, 0, &objId); + zephir_check_call_status(); + if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { + RETURN_MM_BOOL(1); + } + ZEPHIR_CALL_METHOD(NULL, visited, "set", NULL, 0, &objId, this_ptr); + zephir_check_call_status(); ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&writeConnection, this_ptr, "getwriteconnection", NULL, 423); zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_0); - ZVAL_STRING(&_0, "prepareSave"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "fireevent", NULL, 0, &_0); + ZEPHIR_INIT_VAR(&_1); + ZVAL_STRING(&_1, "prepareSave"); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "fireevent", NULL, 0, &_1); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&relatedToSave, this_ptr, "collectrelatedtosave", NULL, 0); zephir_check_call_status(); hasRelatedToSave = zephir_fast_count_int(&relatedToSave) > 0; if (hasRelatedToSave) { - ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "presaverelatedrecords", NULL, 0, &writeConnection, &relatedToSave); + ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "presaverelatedrecords", NULL, 0, &writeConnection, &relatedToSave, visited); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(&_1$$3)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(&_2$$4)) { RETURN_MM_BOOL(0); } } @@ -4609,35 +4657,35 @@ PHP_METHOD(Phalcon_Mvc_Model, save) ZEPHIR_CALL_METHOD(&exists, this_ptr, "has", NULL, 0, &metaData, &readConnection); zephir_check_call_status(); if (zephir_is_true(&exists)) { - ZEPHIR_INIT_ZVAL_NREF(_2$$7); - ZVAL_LONG(&_2$$7, 2); - zephir_update_property_zval(this_ptr, ZEND_STRL("operationMade"), &_2$$7); - } else { ZEPHIR_INIT_ZVAL_NREF(_3$$8); - ZVAL_LONG(&_3$$8, 1); + ZVAL_LONG(&_3$$8, 2); zephir_update_property_zval(this_ptr, ZEND_STRL("operationMade"), &_3$$8); + } else { + ZEPHIR_INIT_ZVAL_NREF(_4$$9); + ZVAL_LONG(&_4$$9, 1); + zephir_update_property_zval(this_ptr, ZEND_STRL("operationMade"), &_4$$9); } - ZEPHIR_INIT_NVAR(&_0); - array_init(&_0); - zephir_update_property_zval(this_ptr, ZEND_STRL("errorMessages"), &_0); + ZEPHIR_INIT_NVAR(&_1); + array_init(&_1); + zephir_update_property_zval(this_ptr, ZEND_STRL("errorMessages"), &_1); ZEPHIR_CALL_METHOD(&identityField, &metaData, "getidentityfield", NULL, 0, this_ptr); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "presave", NULL, 0, &metaData, &exists, &identityField); + ZEPHIR_CALL_METHOD(&_5, this_ptr, "presave", NULL, 0, &metaData, &exists, &identityField); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(&_4)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(&_5)) { if (hasRelatedToSave) { - ZVAL_BOOL(&_5$$10, 0); - ZEPHIR_CALL_METHOD(NULL, &writeConnection, "rollback", NULL, 0, &_5$$10); + ZVAL_BOOL(&_6$$11, 0); + ZEPHIR_CALL_METHOD(NULL, &writeConnection, "rollback", NULL, 0, &_6$$11); zephir_check_call_status(); } if (UNEXPECTED(ZEPHIR_GLOBAL(orm).exception_on_failed_save)) { - ZEPHIR_INIT_VAR(&_6$$11); - object_init_ex(&_6$$11, phalcon_mvc_model_validationfailed_ce); - ZEPHIR_CALL_METHOD(&_7$$11, this_ptr, "getmessages", NULL, 0); + ZEPHIR_INIT_VAR(&_7$$12); + object_init_ex(&_7$$12, phalcon_mvc_model_validationfailed_ce); + ZEPHIR_CALL_METHOD(&_8$$12, this_ptr, "getmessages", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_6$$11, "__construct", NULL, 434, this_ptr, &_7$$11); + ZEPHIR_CALL_METHOD(NULL, &_7$$12, "__construct", NULL, 435, this_ptr, &_8$$12); zephir_check_call_status(); - zephir_throw_exception_debug(&_6$$11, "phalcon/Mvc/Model.zep", 2675); + zephir_throw_exception_debug(&_7$$12, "phalcon/Mvc/Model.zep", 2700); ZEPHIR_MM_RESTORE(); return; } @@ -4650,38 +4698,38 @@ PHP_METHOD(Phalcon_Mvc_Model, save) ZEPHIR_CALL_METHOD(&success, this_ptr, "dolowinsert", NULL, 0, &metaData, &writeConnection, &table, &identityField); zephir_check_call_status(); } - if (zephir_is_true(&success)) { - ZEPHIR_INIT_ZVAL_NREF(_8$$14); - ZVAL_LONG(&_8$$14, 0); - zephir_update_property_zval(this_ptr, ZEND_STRL("dirtyState"), &_8$$14); + if (ZEPHIR_IS_TRUE_IDENTICAL(&success)) { + ZEPHIR_INIT_ZVAL_NREF(_9$$15); + ZVAL_LONG(&_9$$15, 0); + zephir_update_property_zval(this_ptr, ZEND_STRL("dirtyState"), &_9$$15); } if (hasRelatedToSave) { if (ZEPHIR_IS_FALSE_IDENTICAL(&success)) { - ZVAL_BOOL(&_9$$16, 0); - ZEPHIR_CALL_METHOD(NULL, &writeConnection, "rollback", NULL, 0, &_9$$16); + ZVAL_BOOL(&_10$$17, 0); + ZEPHIR_CALL_METHOD(NULL, &writeConnection, "rollback", NULL, 0, &_10$$17); zephir_check_call_status(); } else { - ZEPHIR_CALL_METHOD(&success, this_ptr, "postsaverelatedrecords", NULL, 0, &writeConnection, &relatedToSave); + ZEPHIR_CALL_METHOD(&success, this_ptr, "postsaverelatedrecords", NULL, 0, &writeConnection, &relatedToSave, visited); zephir_check_call_status(); } } if (ZEPHIR_GLOBAL(orm).events) { - ZEPHIR_CALL_METHOD(&_10$$18, this_ptr, "postsave", NULL, 0, &success, &exists); + ZEPHIR_CALL_METHOD(&_11$$19, this_ptr, "postsave", NULL, 0, &success, &exists); zephir_check_call_status(); - ZEPHIR_CPY_WRT(&success, &_10$$18); + ZEPHIR_CPY_WRT(&success, &_11$$19); } if (ZEPHIR_IS_FALSE_IDENTICAL(&success)) { ZEPHIR_CALL_METHOD(NULL, this_ptr, "canceloperation", NULL, 0); zephir_check_call_status(); } else { if (hasRelatedToSave) { - ZEPHIR_INIT_VAR(&_11$$21); - array_init(&_11$$21); - zephir_update_property_zval(this_ptr, ZEND_STRL("dirtyRelated"), &_11$$21); + ZEPHIR_INIT_VAR(&_12$$22); + array_init(&_12$$22); + zephir_update_property_zval(this_ptr, ZEND_STRL("dirtyRelated"), &_12$$22); } - ZEPHIR_INIT_VAR(&_12$$20); - ZVAL_STRING(&_12$$20, "afterSave"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "fireevent", NULL, 0, &_12$$20); + ZEPHIR_INIT_VAR(&_13$$21); + ZVAL_STRING(&_13$$21, "afterSave"); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "fireevent", NULL, 0, &_13$$21); zephir_check_call_status(); } RETURN_CCTOR(&success); @@ -4812,7 +4860,7 @@ PHP_METHOD(Phalcon_Mvc_Model, unserialize) ZEPHIR_CONCAT_SVS(&_4$$5, "A dependency injection container is required to access the services related to the ODM in '", &_3$$5, "'"); ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 32, &_4$$5); zephir_check_call_status(); - zephir_throw_exception_debug(&_2$$5, "phalcon/Mvc/Model.zep", 2794); + zephir_throw_exception_debug(&_2$$5, "phalcon/Mvc/Model.zep", 2820); ZEPHIR_MM_RESTORE(); return; } @@ -4831,7 +4879,7 @@ PHP_METHOD(Phalcon_Mvc_Model, unserialize) ZEPHIR_CONCAT_SVS(&_9$$6, "The injected service 'modelsManager' is not valid in '", &_8$$6, "'"); ZEPHIR_CALL_METHOD(NULL, &_7$$6, "__construct", NULL, 32, &_9$$6); zephir_check_call_status(); - zephir_throw_exception_debug(&_7$$6, "phalcon/Mvc/Model.zep", 2810); + zephir_throw_exception_debug(&_7$$6, "phalcon/Mvc/Model.zep", 2836); ZEPHIR_MM_RESTORE(); return; } @@ -4840,7 +4888,7 @@ PHP_METHOD(Phalcon_Mvc_Model, unserialize) zephir_check_call_status(); ZEPHIR_OBS_VAR(&properties); if (zephir_array_isset_string_fetch(&properties, &attributes, SL("attributes"), 0)) { - zephir_is_iterable(&properties, 0, "phalcon/Mvc/Model.zep", 2833); + zephir_is_iterable(&properties, 0, "phalcon/Mvc/Model.zep", 2859); if (Z_TYPE_P(&properties) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&properties), _12$$7, _13$$7, _10$$7) { @@ -5094,7 +5142,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData) if (Z_TYPE_P(columnMap) == IS_ARRAY) { ZEPHIR_INIT_VAR(&snapshot); array_init(&snapshot); - zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 2951); + zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 2977); if (Z_TYPE_P(&data) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&data), _2$$3, _3$$3, _0$$3) { @@ -5120,7 +5168,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData) ZEPHIR_CONCAT_SVSVS(&_6$$7, "Column '", &key, "' doesn't make part of the column map in '", &_5$$7, "'"); ZEPHIR_CALL_METHOD(NULL, &_4$$7, "__construct", &_7, 32, &_6$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_4$$7, "phalcon/Mvc/Model.zep", 2931); + zephir_throw_exception_debug(&_4$$7, "phalcon/Mvc/Model.zep", 2957); ZEPHIR_MM_RESTORE(); return; } @@ -5138,7 +5186,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData) ZEPHIR_CONCAT_SVSVS(&_10$$10, "Column '", &key, "' doesn't make part of the column map in '", &_9$$10, "'"); ZEPHIR_CALL_METHOD(NULL, &_8$$10, "__construct", &_7, 32, &_10$$10); zephir_check_call_status(); - zephir_throw_exception_debug(&_8$$10, "phalcon/Mvc/Model.zep", 2942); + zephir_throw_exception_debug(&_8$$10, "phalcon/Mvc/Model.zep", 2968); ZEPHIR_MM_RESTORE(); return; } @@ -5174,7 +5222,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData) ZEPHIR_CONCAT_SVSVS(&_13$$14, "Column '", &key, "' doesn't make part of the column map in '", &_12$$14, "'"); ZEPHIR_CALL_METHOD(NULL, &_11$$14, "__construct", &_7, 32, &_13$$14); zephir_check_call_status(); - zephir_throw_exception_debug(&_11$$14, "phalcon/Mvc/Model.zep", 2931); + zephir_throw_exception_debug(&_11$$14, "phalcon/Mvc/Model.zep", 2957); ZEPHIR_MM_RESTORE(); return; } @@ -5192,7 +5240,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData) ZEPHIR_CONCAT_SVSVS(&_16$$17, "Column '", &key, "' doesn't make part of the column map in '", &_15$$17, "'"); ZEPHIR_CALL_METHOD(NULL, &_14$$17, "__construct", &_7, 32, &_16$$17); zephir_check_call_status(); - zephir_throw_exception_debug(&_14$$17, "phalcon/Mvc/Model.zep", 2942); + zephir_throw_exception_debug(&_14$$17, "phalcon/Mvc/Model.zep", 2968); ZEPHIR_MM_RESTORE(); return; } @@ -5276,7 +5324,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) if (Z_TYPE_P(columnMap) == IS_ARRAY) { ZEPHIR_INIT_VAR(&snapshot); array_init(&snapshot); - zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 3016); + zephir_is_iterable(&data, 0, "phalcon/Mvc/Model.zep", 3042); if (Z_TYPE_P(&data) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&data), _2$$3, _3$$3, _0$$3) { @@ -5311,7 +5359,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) ZEPHIR_CONCAT_SVSVS(&_9$$8, "Column '", &key, "' doesn't make part of the column map in '", &_8$$8, "'"); ZEPHIR_CALL_METHOD(NULL, &_7$$8, "__construct", &_10, 32, &_9$$8); zephir_check_call_status(); - zephir_throw_exception_debug(&_7$$8, "phalcon/Mvc/Model.zep", 2996); + zephir_throw_exception_debug(&_7$$8, "phalcon/Mvc/Model.zep", 3022); ZEPHIR_MM_RESTORE(); return; } @@ -5329,7 +5377,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) ZEPHIR_CONCAT_SVSVS(&_13$$11, "Column '", &key, "' doesn't make part of the column map in '", &_12$$11, "'"); ZEPHIR_CALL_METHOD(NULL, &_11$$11, "__construct", &_10, 32, &_13$$11); zephir_check_call_status(); - zephir_throw_exception_debug(&_11$$11, "phalcon/Mvc/Model.zep", 3007); + zephir_throw_exception_debug(&_11$$11, "phalcon/Mvc/Model.zep", 3033); ZEPHIR_MM_RESTORE(); return; } @@ -5374,7 +5422,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) ZEPHIR_CONCAT_SVSVS(&_18$$16, "Column '", &key, "' doesn't make part of the column map in '", &_17$$16, "'"); ZEPHIR_CALL_METHOD(NULL, &_16$$16, "__construct", &_10, 32, &_18$$16); zephir_check_call_status(); - zephir_throw_exception_debug(&_16$$16, "phalcon/Mvc/Model.zep", 2996); + zephir_throw_exception_debug(&_16$$16, "phalcon/Mvc/Model.zep", 3022); ZEPHIR_MM_RESTORE(); return; } @@ -5392,7 +5440,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) ZEPHIR_CONCAT_SVSVS(&_21$$19, "Column '", &key, "' doesn't make part of the column map in '", &_20$$19, "'"); ZEPHIR_CALL_METHOD(NULL, &_19$$19, "__construct", &_10, 32, &_21$$19); zephir_check_call_status(); - zephir_throw_exception_debug(&_19$$19, "phalcon/Mvc/Model.zep", 3007); + zephir_throw_exception_debug(&_19$$19, "phalcon/Mvc/Model.zep", 3033); ZEPHIR_MM_RESTORE(); return; } @@ -5783,7 +5831,7 @@ PHP_METHOD(Phalcon_Mvc_Model, toArray) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_0, &metaData, "getattributes", NULL, 0, this_ptr); zephir_check_call_status(); - zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model.zep", 3293); + zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model.zep", 3319); if (Z_TYPE_P(&_0) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _1) { @@ -5810,7 +5858,7 @@ PHP_METHOD(Phalcon_Mvc_Model, toArray) ZEPHIR_CONCAT_SVSVS(&_8$$7, "Column '", &attribute, "' doesn't make part of the column map in '", &_7$$7, "'"); ZEPHIR_CALL_METHOD(NULL, &_6$$7, "__construct", &_9, 32, &_8$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_6$$7, "phalcon/Mvc/Model.zep", 3271); + zephir_throw_exception_debug(&_6$$7, "phalcon/Mvc/Model.zep", 3297); ZEPHIR_MM_RESTORE(); return; } @@ -5863,7 +5911,7 @@ PHP_METHOD(Phalcon_Mvc_Model, toArray) ZEPHIR_CONCAT_SVSVS(&_14$$17, "Column '", &attribute, "' doesn't make part of the column map in '", &_13$$17, "'"); ZEPHIR_CALL_METHOD(NULL, &_12$$17, "__construct", &_9, 32, &_14$$17); zephir_check_call_status(); - zephir_throw_exception_debug(&_12$$17, "phalcon/Mvc/Model.zep", 3271); + zephir_throw_exception_debug(&_12$$17, "phalcon/Mvc/Model.zep", 3297); ZEPHIR_MM_RESTORE(); return; } @@ -6084,7 +6132,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict) ZEPHIR_CALL_METHOD(&belongsTo, &manager, "getbelongsto", NULL, 0, this_ptr); zephir_check_call_status(); error = 0; - zephir_is_iterable(&belongsTo, 0, "phalcon/Mvc/Model.zep", 3513); + zephir_is_iterable(&belongsTo, 0, "phalcon/Mvc/Model.zep", 3539); if (Z_TYPE_P(&belongsTo) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&belongsTo), _1) { @@ -6099,7 +6147,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict) action = 1; if (zephir_array_isset_string(&foreignKey, SL("action"))) { ZEPHIR_OBS_NVAR(&_3$$5); - zephir_array_fetch_string(&_3$$5, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3399); + zephir_array_fetch_string(&_3$$5, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3425); action = zephir_get_intval(&_3$$5); } if (action != 1) { @@ -6119,7 +6167,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict) ZEPHIR_CALL_METHOD(&referencedFields, &relation, "getreferencedfields", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&fields) == IS_ARRAY) { - zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model.zep", 3442); + zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model.zep", 3468); if (Z_TYPE_P(&fields) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _8$$7, _9$$7, _6$$7) { @@ -6133,11 +6181,11 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict) ZVAL_COPY(&field, _6$$7); ZEPHIR_OBS_NVAR(&value); zephir_fetch_property_zval(&value, this_ptr, &field, PH_SILENT_CC); - zephir_array_fetch(&_10$$8, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3434); + zephir_array_fetch(&_10$$8, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3460); ZEPHIR_INIT_NVAR(&_11$$8); ZEPHIR_CONCAT_SVSV(&_11$$8, "[", &_10$$8, "] = ?", &position); - zephir_array_append(&conditions, &_11$$8, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3434); - zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3435); + zephir_array_append(&conditions, &_11$$8, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3460); + zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3461); if (Z_TYPE_P(&value) == IS_NULL) { numberNull++; } @@ -6157,11 +6205,11 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict) zephir_check_call_status(); ZEPHIR_OBS_NVAR(&value); zephir_fetch_property_zval(&value, this_ptr, &field, PH_SILENT_CC); - zephir_array_fetch(&_12$$10, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3434); + zephir_array_fetch(&_12$$10, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3460); ZEPHIR_INIT_NVAR(&_13$$10); ZEPHIR_CONCAT_SVSV(&_13$$10, "[", &_12$$10, "] = ?", &position); - zephir_array_append(&conditions, &_13$$10, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3434); - zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3435); + zephir_array_append(&conditions, &_13$$10, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3460); + zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3461); if (Z_TYPE_P(&value) == IS_NULL) { numberNull++; } @@ -6177,15 +6225,15 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict) zephir_fetch_property_zval(&value, this_ptr, &fields, PH_SILENT_CC); ZEPHIR_INIT_NVAR(&_14$$12); ZEPHIR_CONCAT_SVS(&_14$$12, "[", &referencedFields, "] = ?0"); - zephir_array_append(&conditions, &_14$$12, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3446); - zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3447); + zephir_array_append(&conditions, &_14$$12, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3472); + zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3473); if (Z_TYPE_P(&value) == IS_NULL) { validateWithNulls = 1; } } ZEPHIR_OBS_NVAR(&extraConditions); if (zephir_array_isset_string_fetch(&extraConditions, &foreignKey, SL("conditions"), 0)) { - zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3458); + zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3484); } if (validateWithNulls) { ZEPHIR_OBS_NVAR(&allowNulls); @@ -6260,7 +6308,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict) action = 1; if (zephir_array_isset_string(&foreignKey, SL("action"))) { ZEPHIR_OBS_NVAR(&_27$$24); - zephir_array_fetch_string(&_27$$24, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3399); + zephir_array_fetch_string(&_27$$24, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3425); action = zephir_get_intval(&_27$$24); } if (action != 1) { @@ -6280,7 +6328,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict) ZEPHIR_CALL_METHOD(&referencedFields, &relation, "getreferencedfields", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&fields) == IS_ARRAY) { - zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model.zep", 3442); + zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model.zep", 3468); if (Z_TYPE_P(&fields) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _32$$26, _33$$26, _30$$26) { @@ -6294,11 +6342,11 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict) ZVAL_COPY(&field, _30$$26); ZEPHIR_OBS_NVAR(&value); zephir_fetch_property_zval(&value, this_ptr, &field, PH_SILENT_CC); - zephir_array_fetch(&_34$$27, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3434); + zephir_array_fetch(&_34$$27, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3460); ZEPHIR_INIT_NVAR(&_35$$27); ZEPHIR_CONCAT_SVSV(&_35$$27, "[", &_34$$27, "] = ?", &position); - zephir_array_append(&conditions, &_35$$27, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3434); - zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3435); + zephir_array_append(&conditions, &_35$$27, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3460); + zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3461); if (Z_TYPE_P(&value) == IS_NULL) { numberNull++; } @@ -6318,11 +6366,11 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict) zephir_check_call_status(); ZEPHIR_OBS_NVAR(&value); zephir_fetch_property_zval(&value, this_ptr, &field, PH_SILENT_CC); - zephir_array_fetch(&_36$$29, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3434); + zephir_array_fetch(&_36$$29, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3460); ZEPHIR_INIT_NVAR(&_37$$29); ZEPHIR_CONCAT_SVSV(&_37$$29, "[", &_36$$29, "] = ?", &position); - zephir_array_append(&conditions, &_37$$29, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3434); - zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3435); + zephir_array_append(&conditions, &_37$$29, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3460); + zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3461); if (Z_TYPE_P(&value) == IS_NULL) { numberNull++; } @@ -6338,15 +6386,15 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict) zephir_fetch_property_zval(&value, this_ptr, &fields, PH_SILENT_CC); ZEPHIR_INIT_NVAR(&_38$$31); ZEPHIR_CONCAT_SVS(&_38$$31, "[", &referencedFields, "] = ?0"); - zephir_array_append(&conditions, &_38$$31, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3446); - zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3447); + zephir_array_append(&conditions, &_38$$31, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3472); + zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3473); if (Z_TYPE_P(&value) == IS_NULL) { validateWithNulls = 1; } } ZEPHIR_OBS_NVAR(&extraConditions); if (zephir_array_isset_string_fetch(&extraConditions, &foreignKey, SL("conditions"), 0)) { - zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3458); + zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3484); } if (validateWithNulls) { ZEPHIR_OBS_NVAR(&allowNulls); @@ -6451,7 +6499,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysReverseCascade) ZEPHIR_CPY_WRT(&manager, &_0); ZEPHIR_CALL_METHOD(&relations, &manager, "gethasoneandhasmany", NULL, 0, this_ptr); zephir_check_call_status(); - zephir_is_iterable(&relations, 0, "phalcon/Mvc/Model.zep", 3589); + zephir_is_iterable(&relations, 0, "phalcon/Mvc/Model.zep", 3615); if (Z_TYPE_P(&relations) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relations), _1) { @@ -6469,7 +6517,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysReverseCascade) } if (_3$$3) { ZEPHIR_OBS_NVAR(&_4$$5); - zephir_array_fetch_string(&_4$$5, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3563); + zephir_array_fetch_string(&_4$$5, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3589); action = zephir_get_intval(&_4$$5); } if (action != 2) { @@ -6508,7 +6556,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysReverseCascade) } if (_7$$9) { ZEPHIR_OBS_NVAR(&_8$$11); - zephir_array_fetch_string(&_8$$11, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3563); + zephir_array_fetch_string(&_8$$11, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3589); action = zephir_get_intval(&_8$$11); } if (action != 2) { @@ -6580,7 +6628,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysReverseRestrict) ZEPHIR_CALL_METHOD(&relations, &manager, "gethasoneandhasmany", NULL, 0, this_ptr); zephir_check_call_status(); error = 0; - zephir_is_iterable(&relations, 0, "phalcon/Mvc/Model.zep", 3680); + zephir_is_iterable(&relations, 0, "phalcon/Mvc/Model.zep", 3706); if (Z_TYPE_P(&relations) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relations), _1) { @@ -6598,7 +6646,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysReverseRestrict) } if (_3$$3) { ZEPHIR_OBS_NVAR(&_4$$5); - zephir_array_fetch_string(&_4$$5, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3634); + zephir_array_fetch_string(&_4$$5, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3660); action = zephir_get_intval(&_4$$5); } if (action != 1) { @@ -6661,7 +6709,7 @@ PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysReverseRestrict) } if (_15$$9) { ZEPHIR_OBS_NVAR(&_16$$11); - zephir_array_fetch_string(&_16$$11, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3634); + zephir_array_fetch_string(&_16$$11, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3660); action = zephir_get_intval(&_16$$11); } if (action != 1) { @@ -6851,7 +6899,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert) ZEPHIR_INIT_NVAR(&columnMap); ZVAL_NULL(&columnMap); } - zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 3802); + zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 3828); if (Z_TYPE_P(&attributes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _1) { @@ -6868,7 +6916,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert) ZEPHIR_CONCAT_SVSVS(&_5$$7, "Column '", &field, "' in '", &_4$$7, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_3$$7, "__construct", &_6, 32, &_5$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model.zep", 3736); + zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model.zep", 3762); ZEPHIR_MM_RESTORE(); return; } @@ -6884,9 +6932,9 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert) _7$$11 = zephir_array_isset(&defaultValues, &field); } if (_7$$11) { - zephir_array_fetch(&_8$$12, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3753); + zephir_array_fetch(&_8$$12, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3779); zephir_array_update_zval(&snapshot, &attributeField, &_8$$12, PH_COPY | PH_SEPARATE); - zephir_array_fetch(&_9$$12, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3754); + zephir_array_fetch(&_9$$12, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3780); zephir_array_update_zval(&unsetDefaultValues, &attributeField, &_9$$12, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(&_10$$12, connection, "supportsdefaultvalue", &_11, 0); zephir_check_call_status(); @@ -6908,18 +6956,18 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert) ZEPHIR_CONCAT_SVSVS(&_15$$15, "Column '", &field, "' in '", &_14$$15, "' have not defined a bind data type"); ZEPHIR_CALL_METHOD(NULL, &_13$$15, "__construct", &_6, 32, &_15$$15); zephir_check_call_status(); - zephir_throw_exception_debug(&_13$$15, "phalcon/Mvc/Model.zep", 3771); + zephir_throw_exception_debug(&_13$$15, "phalcon/Mvc/Model.zep", 3797); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3774); - zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3775); - zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3776); + zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3800); + zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3801); + zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3802); } else { if (zephir_array_isset(&defaultValues, &field)) { - zephir_array_fetch(&_16$$17, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3779); + zephir_array_fetch(&_16$$17, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3805); zephir_array_update_zval(&snapshot, &attributeField, &_16$$17, PH_COPY | PH_SEPARATE); - zephir_array_fetch(&_17$$17, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3780); + zephir_array_fetch(&_17$$17, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3806); zephir_array_update_zval(&unsetDefaultValues, &attributeField, &_17$$17, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(&_18$$17, connection, "supportsdefaultvalue", &_19, 0); zephir_check_call_status(); @@ -6928,13 +6976,13 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert) } ZEPHIR_CALL_METHOD(&_20$$17, connection, "getdefaultvalue", &_21, 0); zephir_check_call_status(); - zephir_array_append(&values, &_20$$17, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3786); + zephir_array_append(&values, &_20$$17, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3812); } else { - zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3788); + zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3814); zephir_array_update_zval(&snapshot, &attributeField, &value, PH_COPY | PH_SEPARATE); } - zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3792); - zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3793); + zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3818); + zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3819); } } } @@ -6961,7 +7009,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert) ZEPHIR_CONCAT_SVSVS(&_24$$22, "Column '", &field, "' in '", &_23$$22, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_22$$22, "__construct", &_6, 32, &_24$$22); zephir_check_call_status(); - zephir_throw_exception_debug(&_22$$22, "phalcon/Mvc/Model.zep", 3736); + zephir_throw_exception_debug(&_22$$22, "phalcon/Mvc/Model.zep", 3762); ZEPHIR_MM_RESTORE(); return; } @@ -6977,9 +7025,9 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert) _25$$26 = zephir_array_isset(&defaultValues, &field); } if (_25$$26) { - zephir_array_fetch(&_26$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3753); + zephir_array_fetch(&_26$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3779); zephir_array_update_zval(&snapshot, &attributeField, &_26$$27, PH_COPY | PH_SEPARATE); - zephir_array_fetch(&_27$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3754); + zephir_array_fetch(&_27$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3780); zephir_array_update_zval(&unsetDefaultValues, &attributeField, &_27$$27, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(&_28$$27, connection, "supportsdefaultvalue", &_29, 0); zephir_check_call_status(); @@ -7001,18 +7049,18 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert) ZEPHIR_CONCAT_SVSVS(&_33$$30, "Column '", &field, "' in '", &_32$$30, "' have not defined a bind data type"); ZEPHIR_CALL_METHOD(NULL, &_31$$30, "__construct", &_6, 32, &_33$$30); zephir_check_call_status(); - zephir_throw_exception_debug(&_31$$30, "phalcon/Mvc/Model.zep", 3771); + zephir_throw_exception_debug(&_31$$30, "phalcon/Mvc/Model.zep", 3797); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3774); - zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3775); - zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3776); + zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3800); + zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3801); + zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3802); } else { if (zephir_array_isset(&defaultValues, &field)) { - zephir_array_fetch(&_34$$32, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3779); + zephir_array_fetch(&_34$$32, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3805); zephir_array_update_zval(&snapshot, &attributeField, &_34$$32, PH_COPY | PH_SEPARATE); - zephir_array_fetch(&_35$$32, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3780); + zephir_array_fetch(&_35$$32, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3806); zephir_array_update_zval(&unsetDefaultValues, &attributeField, &_35$$32, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(&_36$$32, connection, "supportsdefaultvalue", &_37, 0); zephir_check_call_status(); @@ -7021,13 +7069,13 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert) } ZEPHIR_CALL_METHOD(&_38$$32, connection, "getdefaultvalue", &_39, 0); zephir_check_call_status(); - zephir_array_append(&values, &_38$$32, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3786); + zephir_array_append(&values, &_38$$32, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3812); } else { - zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3788); + zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3814); zephir_array_update_zval(&snapshot, &attributeField, &value, PH_COPY | PH_SEPARATE); } - zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3792); - zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3793); + zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3818); + zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3819); } } } @@ -7043,7 +7091,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert) zephir_check_call_status(); useExplicitIdentity = zephir_get_boolval(&_40$$35); if (useExplicitIdentity) { - zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3812); + zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3838); } if (Z_TYPE_P(&columnMap) == IS_ARRAY) { ZEPHIR_OBS_NVAR(&attributeField); @@ -7056,7 +7104,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert) ZEPHIR_CONCAT_SVSVS(&_43$$38, "Identity column '", identityField, "' isn't part of the column map in '", &_42$$38, "'"); ZEPHIR_CALL_METHOD(NULL, &_41$$38, "__construct", &_6, 32, &_43$$38); zephir_check_call_status(); - zephir_throw_exception_debug(&_41$$38, "phalcon/Mvc/Model.zep", 3822); + zephir_throw_exception_debug(&_41$$38, "phalcon/Mvc/Model.zep", 3848); ZEPHIR_MM_RESTORE(); return; } @@ -7071,12 +7119,12 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert) } if (_44$$40) { if (useExplicitIdentity) { - zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3834); - zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3834); + zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3860); + zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3860); } } else { if (!(useExplicitIdentity)) { - zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3842); + zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3868); } ZEPHIR_OBS_NVAR(&bindType); if (UNEXPECTED(!(zephir_array_isset_fetch(&bindType, &bindDataTypes, identityField, 0)))) { @@ -7088,23 +7136,23 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert) ZEPHIR_CONCAT_SVSVS(&_47$$45, "Identity column '", identityField, "' isn\'t part of the table columns in '", &_46$$45, "'"); ZEPHIR_CALL_METHOD(NULL, &_45$$45, "__construct", &_6, 32, &_47$$45); zephir_check_call_status(); - zephir_throw_exception_debug(&_45$$45, "phalcon/Mvc/Model.zep", 3851); + zephir_throw_exception_debug(&_45$$45, "phalcon/Mvc/Model.zep", 3877); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3854); - zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3855); + zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3880); + zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3881); } } else { if (useExplicitIdentity) { - zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3859); - zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3860); + zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3885); + zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3886); } } } if (Z_TYPE_P(table) == IS_ARRAY) { - zephir_array_fetch_long(&_48$$48, table, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3869); - zephir_array_fetch_long(&_49$$48, table, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3869); + zephir_array_fetch_long(&_48$$48, table, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3895); + zephir_array_fetch_long(&_49$$48, table, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3895); ZEPHIR_INIT_VAR(&_50$$48); ZEPHIR_CONCAT_VSV(&_50$$48, &_48$$48, ".", &_49$$48); ZEPHIR_CPY_WRT(table, &_50$$48); @@ -7150,7 +7198,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert) zephir_update_property_zval(this_ptr, ZEND_STRL("uniqueParams"), &__$null); } if (zephir_is_true(&success)) { - zephir_is_iterable(&unsetDefaultValues, 0, "phalcon/Mvc/Model.zep", 3930); + zephir_is_iterable(&unsetDefaultValues, 0, "phalcon/Mvc/Model.zep", 3956); if (Z_TYPE_P(&unsetDefaultValues) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&unsetDefaultValues), _57$$56, _58$$56, _55$$56) { @@ -7353,7 +7401,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate) _2 = Z_TYPE_P(&snapshot) == IS_ARRAY; } if (EXPECTED(_2)) { - zephir_is_iterable(&nonPrimary, 0, "phalcon/Mvc/Model.zep", 4090); + zephir_is_iterable(&nonPrimary, 0, "phalcon/Mvc/Model.zep", 4116); if (Z_TYPE_P(&nonPrimary) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&nonPrimary), _3$$5) { @@ -7372,7 +7420,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate) ZEPHIR_CONCAT_SVSVS(&_7$$9, "Column '", &field, "' in '", &_6$$9, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_5$$9, "__construct", &_8, 32, &_7$$9); zephir_check_call_status(); - zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/Model.zep", 3984); + zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/Model.zep", 4010); ZEPHIR_MM_RESTORE(); return; } @@ -7391,7 +7439,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate) ZEPHIR_CONCAT_SVSVS(&_11$$12, "Column '", &field, "' in '", &_10$$12, "' have not defined a bind data type"); ZEPHIR_CALL_METHOD(NULL, &_9$$12, "__construct", &_8, 32, &_11$$12); zephir_check_call_status(); - zephir_throw_exception_debug(&_9$$12, "phalcon/Mvc/Model.zep", 3997); + zephir_throw_exception_debug(&_9$$12, "phalcon/Mvc/Model.zep", 4023); ZEPHIR_MM_RESTORE(); return; } @@ -7417,7 +7465,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate) ZEPHIR_CONCAT_SVSVS(&_14$$20, "Column '", &field, "' in '", &_13$$20, "' have not defined a data type"); ZEPHIR_CALL_METHOD(NULL, &_12$$20, "__construct", &_8, 32, &_14$$20); zephir_check_call_status(); - zephir_throw_exception_debug(&_12$$20, "phalcon/Mvc/Model.zep", 4027); + zephir_throw_exception_debug(&_12$$20, "phalcon/Mvc/Model.zep", 4053); ZEPHIR_MM_RESTORE(); return; } @@ -7465,9 +7513,9 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate) } } if (changed) { - zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4077); - zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4078); - zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4079); + zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4103); + zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4104); + zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4105); } zephir_array_update_zval(&newSnapshot, &attributeField, &value, PH_COPY | PH_SEPARATE); } else { @@ -7499,7 +7547,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate) ZEPHIR_CONCAT_SVSVS(&_25$$32, "Column '", &field, "' in '", &_24$$32, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_23$$32, "__construct", &_8, 32, &_25$$32); zephir_check_call_status(); - zephir_throw_exception_debug(&_23$$32, "phalcon/Mvc/Model.zep", 3984); + zephir_throw_exception_debug(&_23$$32, "phalcon/Mvc/Model.zep", 4010); ZEPHIR_MM_RESTORE(); return; } @@ -7518,7 +7566,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate) ZEPHIR_CONCAT_SVSVS(&_28$$35, "Column '", &field, "' in '", &_27$$35, "' have not defined a bind data type"); ZEPHIR_CALL_METHOD(NULL, &_26$$35, "__construct", &_8, 32, &_28$$35); zephir_check_call_status(); - zephir_throw_exception_debug(&_26$$35, "phalcon/Mvc/Model.zep", 3997); + zephir_throw_exception_debug(&_26$$35, "phalcon/Mvc/Model.zep", 4023); ZEPHIR_MM_RESTORE(); return; } @@ -7544,7 +7592,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate) ZEPHIR_CONCAT_SVSVS(&_31$$43, "Column '", &field, "' in '", &_30$$43, "' have not defined a data type"); ZEPHIR_CALL_METHOD(NULL, &_29$$43, "__construct", &_8, 32, &_31$$43); zephir_check_call_status(); - zephir_throw_exception_debug(&_29$$43, "phalcon/Mvc/Model.zep", 4027); + zephir_throw_exception_debug(&_29$$43, "phalcon/Mvc/Model.zep", 4053); ZEPHIR_MM_RESTORE(); return; } @@ -7592,9 +7640,9 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate) } } if (changed) { - zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4077); - zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4078); - zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4079); + zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4103); + zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4104); + zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4105); } zephir_array_update_zval(&newSnapshot, &attributeField, &value, PH_COPY | PH_SEPARATE); } else { @@ -7611,7 +7659,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate) RETURN_MM_BOOL(1); } } else { - zephir_is_iterable(&nonPrimary, 0, "phalcon/Mvc/Model.zep", 4145); + zephir_is_iterable(&nonPrimary, 0, "phalcon/Mvc/Model.zep", 4171); if (Z_TYPE_P(&nonPrimary) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&nonPrimary), _39$$53) { @@ -7629,7 +7677,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate) ZEPHIR_CONCAT_SVSVS(&_43$$57, "Column '", &field, "' in '", &_42$$57, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_41$$57, "__construct", &_8, 32, &_43$$57); zephir_check_call_status(); - zephir_throw_exception_debug(&_41$$57, "phalcon/Mvc/Model.zep", 4108); + zephir_throw_exception_debug(&_41$$57, "phalcon/Mvc/Model.zep", 4134); ZEPHIR_MM_RESTORE(); return; } @@ -7648,21 +7696,21 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate) ZEPHIR_CONCAT_SVSVS(&_46$$60, "Column '", &field, "' in '", &_45$$60, "' have not defined a bind data type"); ZEPHIR_CALL_METHOD(NULL, &_44$$60, "__construct", &_8, 32, &_46$$60); zephir_check_call_status(); - zephir_throw_exception_debug(&_44$$60, "phalcon/Mvc/Model.zep", 4122); + zephir_throw_exception_debug(&_44$$60, "phalcon/Mvc/Model.zep", 4148); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&value); if (zephir_fetch_property_zval(&value, this_ptr, &attributeField, PH_SILENT_CC)) { - zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4133); - zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4134); - zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4135); + zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4159); + zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4160); + zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4161); zephir_array_update_zval(&newSnapshot, &attributeField, &value, PH_COPY | PH_SEPARATE); } else { zephir_array_update_zval(&newSnapshot, &attributeField, &__$null, PH_COPY | PH_SEPARATE); - zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4139); - zephir_array_append(&values, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4140); - zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4141); + zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4165); + zephir_array_append(&values, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4166); + zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4167); } } } ZEND_HASH_FOREACH_END(); @@ -7689,7 +7737,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate) ZEPHIR_CONCAT_SVSVS(&_49$$66, "Column '", &field, "' in '", &_48$$66, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_47$$66, "__construct", &_8, 32, &_49$$66); zephir_check_call_status(); - zephir_throw_exception_debug(&_47$$66, "phalcon/Mvc/Model.zep", 4108); + zephir_throw_exception_debug(&_47$$66, "phalcon/Mvc/Model.zep", 4134); ZEPHIR_MM_RESTORE(); return; } @@ -7708,21 +7756,21 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate) ZEPHIR_CONCAT_SVSVS(&_52$$69, "Column '", &field, "' in '", &_51$$69, "' have not defined a bind data type"); ZEPHIR_CALL_METHOD(NULL, &_50$$69, "__construct", &_8, 32, &_52$$69); zephir_check_call_status(); - zephir_throw_exception_debug(&_50$$69, "phalcon/Mvc/Model.zep", 4122); + zephir_throw_exception_debug(&_50$$69, "phalcon/Mvc/Model.zep", 4148); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&value); if (zephir_fetch_property_zval(&value, this_ptr, &attributeField, PH_SILENT_CC)) { - zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4133); - zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4134); - zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4135); + zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4159); + zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4160); + zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4161); zephir_array_update_zval(&newSnapshot, &attributeField, &value, PH_COPY | PH_SEPARATE); } else { zephir_array_update_zval(&newSnapshot, &attributeField, &__$null, PH_COPY | PH_SEPARATE); - zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4139); - zephir_array_append(&values, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4140); - zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4141); + zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4165); + zephir_array_append(&values, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4166); + zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4167); } } ZEPHIR_CALL_METHOD(NULL, &nonPrimary, "next", NULL, 0); @@ -7750,13 +7798,13 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate) ZEPHIR_CONCAT_SVS(&_55$$74, "A primary key must be defined in the model in order to perform the operation in '", &_54$$74, "'"); ZEPHIR_CALL_METHOD(NULL, &_53$$74, "__construct", &_8, 32, &_55$$74); zephir_check_call_status(); - zephir_throw_exception_debug(&_53$$74, "phalcon/Mvc/Model.zep", 4168); + zephir_throw_exception_debug(&_53$$74, "phalcon/Mvc/Model.zep", 4194); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_INIT_NVAR(&uniqueParams); array_init(&uniqueParams); - zephir_is_iterable(&primaryKeys, 0, "phalcon/Mvc/Model.zep", 4195); + zephir_is_iterable(&primaryKeys, 0, "phalcon/Mvc/Model.zep", 4221); if (Z_TYPE_P(&primaryKeys) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&primaryKeys), _56$$73) { @@ -7773,7 +7821,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate) ZEPHIR_CONCAT_SVSVS(&_60$$77, "Column '", &field, "' in '", &_59$$77, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_58$$77, "__construct", &_8, 32, &_60$$77); zephir_check_call_status(); - zephir_throw_exception_debug(&_58$$77, "phalcon/Mvc/Model.zep", 4181); + zephir_throw_exception_debug(&_58$$77, "phalcon/Mvc/Model.zep", 4207); ZEPHIR_MM_RESTORE(); return; } @@ -7783,10 +7831,10 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate) ZEPHIR_OBS_NVAR(&value); if (zephir_fetch_property_zval(&value, this_ptr, &attributeField, PH_SILENT_CC)) { zephir_array_update_zval(&newSnapshot, &attributeField, &value, PH_COPY | PH_SEPARATE); - zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4189); + zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4215); } else { zephir_array_update_zval(&newSnapshot, &attributeField, &__$null, PH_COPY | PH_SEPARATE); - zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4192); + zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4218); } } ZEND_HASH_FOREACH_END(); } else { @@ -7811,7 +7859,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate) ZEPHIR_CONCAT_SVSVS(&_63$$83, "Column '", &field, "' in '", &_62$$83, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_61$$83, "__construct", &_8, 32, &_63$$83); zephir_check_call_status(); - zephir_throw_exception_debug(&_61$$83, "phalcon/Mvc/Model.zep", 4181); + zephir_throw_exception_debug(&_61$$83, "phalcon/Mvc/Model.zep", 4207); ZEPHIR_MM_RESTORE(); return; } @@ -7821,10 +7869,10 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate) ZEPHIR_OBS_NVAR(&value); if (zephir_fetch_property_zval(&value, this_ptr, &attributeField, PH_SILENT_CC)) { zephir_array_update_zval(&newSnapshot, &attributeField, &value, PH_COPY | PH_SEPARATE); - zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4189); + zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4215); } else { zephir_array_update_zval(&newSnapshot, &attributeField, &__$null, PH_COPY | PH_SEPARATE); - zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4192); + zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4218); } ZEPHIR_CALL_METHOD(NULL, &primaryKeys, "next", NULL, 0); zephir_check_call_status(); @@ -7833,8 +7881,8 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate) ZEPHIR_INIT_NVAR(&field); } if (Z_TYPE_P(table) == IS_ARRAY) { - zephir_array_fetch_long(&_64$$87, table, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4201); - zephir_array_fetch_long(&_65$$87, table, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4201); + zephir_array_fetch_long(&_64$$87, table, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4227); + zephir_array_fetch_long(&_65$$87, table, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4227); ZEPHIR_INIT_VAR(&_66$$87); ZEPHIR_CONCAT_VSV(&_66$$87, &_64$$87, ".", &_65$$87); ZEPHIR_CPY_WRT(table, &_66$$87); @@ -7976,7 +8024,7 @@ PHP_METHOD(Phalcon_Mvc_Model, has) array_init(&uniqueParams); ZEPHIR_INIT_NVAR(&uniqueTypes); array_init(&uniqueTypes); - zephir_is_iterable(&primaryKeys, 0, "phalcon/Mvc/Model.zep", 4325); + zephir_is_iterable(&primaryKeys, 0, "phalcon/Mvc/Model.zep", 4351); if (Z_TYPE_P(&primaryKeys) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&primaryKeys), _1$$3) { @@ -7993,7 +8041,7 @@ PHP_METHOD(Phalcon_Mvc_Model, has) ZEPHIR_CONCAT_SVSVS(&_5$$9, "Column '", &field, "' in '", &_4$$9, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_3$$9, "__construct", &_6, 32, &_5$$9); zephir_check_call_status(); - zephir_throw_exception_debug(&_3$$9, "phalcon/Mvc/Model.zep", 4284); + zephir_throw_exception_debug(&_3$$9, "phalcon/Mvc/Model.zep", 4310); ZEPHIR_MM_RESTORE(); return; } @@ -8011,9 +8059,9 @@ PHP_METHOD(Phalcon_Mvc_Model, has) if (_7$$11) { numberEmpty++; } - zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4305); + zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4331); } else { - zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4307); + zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4333); numberEmpty++; } ZEPHIR_OBS_NVAR(&type); @@ -8026,16 +8074,16 @@ PHP_METHOD(Phalcon_Mvc_Model, has) ZEPHIR_CONCAT_SVSVS(&_10$$14, "Column '", &field, "' in '", &_9$$14, "' isn't part of the table columns"); ZEPHIR_CALL_METHOD(NULL, &_8$$14, "__construct", &_6, 32, &_10$$14); zephir_check_call_status(); - zephir_throw_exception_debug(&_8$$14, "phalcon/Mvc/Model.zep", 4314); + zephir_throw_exception_debug(&_8$$14, "phalcon/Mvc/Model.zep", 4340); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&uniqueTypes, &type, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4317); + zephir_array_append(&uniqueTypes, &type, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4343); ZEPHIR_CALL_METHOD(&_11$$7, connection, "escapeidentifier", &_12, 0, &field); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_13$$7); ZEPHIR_CONCAT_VS(&_13$$7, &_11$$7, " = ?"); - zephir_array_append(&wherePk, &_13$$7, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4318); + zephir_array_append(&wherePk, &_13$$7, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4344); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &primaryKeys, "rewind", NULL, 0); @@ -8059,7 +8107,7 @@ PHP_METHOD(Phalcon_Mvc_Model, has) ZEPHIR_CONCAT_SVSVS(&_16$$17, "Column '", &field, "' in '", &_15$$17, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_14$$17, "__construct", &_6, 32, &_16$$17); zephir_check_call_status(); - zephir_throw_exception_debug(&_14$$17, "phalcon/Mvc/Model.zep", 4284); + zephir_throw_exception_debug(&_14$$17, "phalcon/Mvc/Model.zep", 4310); ZEPHIR_MM_RESTORE(); return; } @@ -8077,9 +8125,9 @@ PHP_METHOD(Phalcon_Mvc_Model, has) if (_17$$19) { numberEmpty++; } - zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4305); + zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4331); } else { - zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4307); + zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4333); numberEmpty++; } ZEPHIR_OBS_NVAR(&type); @@ -8092,16 +8140,16 @@ PHP_METHOD(Phalcon_Mvc_Model, has) ZEPHIR_CONCAT_SVSVS(&_20$$22, "Column '", &field, "' in '", &_19$$22, "' isn't part of the table columns"); ZEPHIR_CALL_METHOD(NULL, &_18$$22, "__construct", &_6, 32, &_20$$22); zephir_check_call_status(); - zephir_throw_exception_debug(&_18$$22, "phalcon/Mvc/Model.zep", 4314); + zephir_throw_exception_debug(&_18$$22, "phalcon/Mvc/Model.zep", 4340); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&uniqueTypes, &type, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4317); + zephir_array_append(&uniqueTypes, &type, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4343); ZEPHIR_CALL_METHOD(&_21$$15, connection, "escapeidentifier", &_22, 0, &field); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_23$$15); ZEPHIR_CONCAT_VS(&_23$$15, &_21$$15, " = ?"); - zephir_array_append(&wherePk, &_23$$15, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4318); + zephir_array_append(&wherePk, &_23$$15, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4344); ZEPHIR_CALL_METHOD(NULL, &primaryKeys, "next", NULL, 0); zephir_check_call_status(); } @@ -8152,7 +8200,7 @@ PHP_METHOD(Phalcon_Mvc_Model, has) ZVAL_NULL(&_29); ZEPHIR_CALL_METHOD(&num, connection, "fetchone", NULL, 0, &_28, &_29, &uniqueParams, &uniqueTypes); zephir_check_call_status(); - zephir_array_fetch_string(&_30, &num, SL("rowcount"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4379); + zephir_array_fetch_string(&_30, &num, SL("rowcount"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4405); if (zephir_is_true(&_30)) { ZEPHIR_INIT_ZVAL_NREF(_31$$30); ZVAL_LONG(&_31$$30, 0); @@ -8365,7 +8413,7 @@ PHP_METHOD(Phalcon_Mvc_Model, groupResult) ZEPHIR_INIT_VAR(¶ms); array_init(¶ms); if (Z_TYPE_P(parameters) != IS_NULL) { - zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4484); + zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4510); } } else { ZEPHIR_CPY_WRT(¶ms, parameters); @@ -8409,10 +8457,10 @@ PHP_METHOD(Phalcon_Mvc_Model, groupResult) } if (zephir_array_isset_string(¶ms, SL("bind"))) { ZEPHIR_OBS_NVAR(&bindParams); - zephir_array_fetch_string(&bindParams, ¶ms, SL("bind"), PH_NOISY, "phalcon/Mvc/Model.zep", 4527); + zephir_array_fetch_string(&bindParams, ¶ms, SL("bind"), PH_NOISY, "phalcon/Mvc/Model.zep", 4553); if (zephir_array_isset_string(¶ms, SL("bindTypes"))) { ZEPHIR_OBS_NVAR(&bindTypes); - zephir_array_fetch_string(&bindTypes, ¶ms, SL("bindTypes"), PH_NOISY, "phalcon/Mvc/Model.zep", 4530); + zephir_array_fetch_string(&bindTypes, ¶ms, SL("bindTypes"), PH_NOISY, "phalcon/Mvc/Model.zep", 4556); } } ZEPHIR_OBS_VAR(&cache); @@ -8524,7 +8572,7 @@ PHP_METHOD(Phalcon_Mvc_Model, invokeFinder) ZEPHIR_CONCAT_SVSVS(&_5$$7, "The static method '", &method, "' in '", &_4$$7, "' requires one argument"); ZEPHIR_CALL_METHOD(NULL, &_3$$7, "__construct", NULL, 32, &_5$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model.zep", 4609); + zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model.zep", 4635); ZEPHIR_MM_RESTORE(); return; } @@ -8558,7 +8606,7 @@ PHP_METHOD(Phalcon_Mvc_Model, invokeFinder) ZEPHIR_CONCAT_SVSVS(&_8$$13, "Cannot resolve attribute '", &extraMethod, "' in the model '", &_7$$13, "'"); ZEPHIR_CALL_METHOD(NULL, &_6$$13, "__construct", NULL, 32, &_8$$13); zephir_check_call_status(); - zephir_throw_exception_debug(&_6$$13, "phalcon/Mvc/Model.zep", 4646); + zephir_throw_exception_debug(&_6$$13, "phalcon/Mvc/Model.zep", 4672); ZEPHIR_MM_RESTORE(); return; } @@ -8755,7 +8803,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSave) } } if (ZEPHIR_GLOBAL(orm).virtual_foreign_keys) { - ZEPHIR_CALL_METHOD(&_3$$8, this_ptr, "checkforeignkeysrestrict", NULL, 435); + ZEPHIR_CALL_METHOD(&_3$$8, this_ptr, "checkforeignkeysrestrict", NULL, 436); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&_3$$8)) { RETURN_MM_BOOL(0); @@ -8786,7 +8834,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSave) ZEPHIR_CALL_METHOD(&emptyStringValues, metaData, "getemptystringattributes", NULL, 0, this_ptr); zephir_check_call_status(); error = 0; - zephir_is_iterable(¬Null, 0, "phalcon/Mvc/Model.zep", 4887); + zephir_is_iterable(¬Null, 0, "phalcon/Mvc/Model.zep", 4913); if (Z_TYPE_P(¬Null) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(¬Null), _4$$11) { @@ -8804,7 +8852,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSave) ZEPHIR_CONCAT_SVSVS(&_8$$19, "Column '", &field, "' in '", &_7$$19, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_6$$19, "__construct", &_9, 32, &_8$$19); zephir_check_call_status(); - zephir_throw_exception_debug(&_6$$19, "phalcon/Mvc/Model.zep", 4807); + zephir_throw_exception_debug(&_6$$19, "phalcon/Mvc/Model.zep", 4833); ZEPHIR_MM_RESTORE(); return; } @@ -8829,7 +8877,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSave) if (_11$$27) { _12$$27 = !(zephir_array_isset(&defaultValues, &field)); if (!(_12$$27)) { - zephir_array_fetch(&_13$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4837); + zephir_array_fetch(&_13$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4863); _12$$27 = !ZEPHIR_IS_IDENTICAL(&value, &_13$$27); } _11$$27 = _12$$27; @@ -8900,7 +8948,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSave) ZEPHIR_CONCAT_SVSVS(&_22$$39, "Column '", &field, "' in '", &_21$$39, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_20$$39, "__construct", &_9, 32, &_22$$39); zephir_check_call_status(); - zephir_throw_exception_debug(&_20$$39, "phalcon/Mvc/Model.zep", 4807); + zephir_throw_exception_debug(&_20$$39, "phalcon/Mvc/Model.zep", 4833); ZEPHIR_MM_RESTORE(); return; } @@ -8925,7 +8973,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSave) if (_24$$47) { _25$$47 = !(zephir_array_isset(&defaultValues, &field)); if (!(_25$$47)) { - zephir_array_fetch(&_26$$47, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4837); + zephir_array_fetch(&_26$$47, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4863); _25$$47 = !ZEPHIR_IS_IDENTICAL(&value, &_26$$47); } _24$$47 = _25$$47; @@ -9059,6 +9107,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSave) * Saves related records that must be stored prior to save the master record * * @param ModelInterface[] related + * @param CollectionInterface visited * @return bool */ PHP_METHOD(Phalcon_Mvc_Model, preSaveRelatedRecords) @@ -9069,11 +9118,12 @@ PHP_METHOD(Phalcon_Mvc_Model, preSaveRelatedRecords) zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zephir_fcall_cache_entry *_7 = NULL, *_9 = NULL, *_13 = NULL, *_15 = NULL, *_22 = NULL, *_24 = NULL, *_27 = NULL, *_29 = NULL, *_34 = NULL, *_42 = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *connection, connection_sub, *related, related_sub, className, manager, type, relation, columns, referencedFields, name, record, _0, _1, *_2, _3, _6$$3, _8$$6, _10$$6, _11$$6, _12$$6, _14$$7, _16$$7, _17$$7, _18$$7, _19$$5, _21$$5, _25$$5, _23$$8, _26$$9, _28$$12, _30$$12, _31$$12, _32$$12, _33$$13, _35$$13, _36$$13, _37$$13, _38$$11, _40$$11, _43$$11, _41$$14; + zval *connection, connection_sub, *related, related_sub, *visited, visited_sub, className, manager, type, relation, columns, referencedFields, name, record, _0, _1, *_2, _3, _6$$3, _8$$6, _10$$6, _11$$6, _12$$6, _14$$7, _16$$7, _17$$7, _18$$7, _19$$5, _21$$5, _25$$5, _23$$8, _26$$9, _28$$12, _30$$12, _31$$12, _32$$12, _33$$13, _35$$13, _36$$13, _37$$13, _38$$11, _40$$11, _43$$11, _41$$14; zval *this_ptr = getThis(); ZVAL_UNDEF(&connection_sub); ZVAL_UNDEF(&related_sub); + ZVAL_UNDEF(&visited_sub); ZVAL_UNDEF(&className); ZVAL_UNDEF(&manager); ZVAL_UNDEF(&type); @@ -9113,15 +9163,16 @@ PHP_METHOD(Phalcon_Mvc_Model, preSaveRelatedRecords) ZVAL_UNDEF(&_41$$14); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(2, 2) + ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_OBJECT_OF_CLASS(connection, phalcon_db_adapter_adapterinterface_ce) Z_PARAM_ZVAL(related) + Z_PARAM_OBJECT_OF_CLASS(visited, phalcon_support_collection_collectioninterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 2, 0, &connection, &related); + zephir_fetch_params(1, 3, 0, &connection, &related, &visited); nesting = 0; @@ -9137,7 +9188,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSaveRelatedRecords) ZEPHIR_CALL_METHOD(&_1, this_ptr, "getmodelsmanager", NULL, 0); zephir_check_call_status(); ZEPHIR_CPY_WRT(&manager, &_1); - zephir_is_iterable(related, 0, "phalcon/Mvc/Model.zep", 5050); + zephir_is_iterable(related, 0, "phalcon/Mvc/Model.zep", 5077); if (Z_TYPE_P(related) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(related), _4, _5, _2) { @@ -9172,7 +9223,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSaveRelatedRecords) ZEPHIR_CONCAT_SVSV(&_12$$6, "Only objects can be stored as part of belongs-to relations in '", &_11$$6, "' Relation ", &name); ZEPHIR_CALL_METHOD(NULL, &_10$$6, "__construct", &_13, 32, &_12$$6); zephir_check_call_status(); - zephir_throw_exception_debug(&_10$$6, "phalcon/Mvc/Model.zep", 5007); + zephir_throw_exception_debug(&_10$$6, "phalcon/Mvc/Model.zep", 5035); ZEPHIR_MM_RESTORE(); return; } @@ -9196,14 +9247,14 @@ PHP_METHOD(Phalcon_Mvc_Model, preSaveRelatedRecords) ZEPHIR_CONCAT_SVSV(&_18$$7, "Not implemented in '", &_17$$7, "' Relation ", &name); ZEPHIR_CALL_METHOD(NULL, &_16$$7, "__construct", &_13, 32, &_18$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_16$$7, "phalcon/Mvc/Model.zep", 5019); + zephir_throw_exception_debug(&_16$$7, "phalcon/Mvc/Model.zep", 5046); ZEPHIR_MM_RESTORE(); return; } zephir_read_property(&_19$$5, &record, ZEND_STRL("dirtyState"), PH_NOISY_CC | PH_READONLY); _20$$5 = !ZEPHIR_IS_LONG_IDENTICAL(&_19$$5, 0); if (_20$$5) { - ZEPHIR_CALL_METHOD(&_21$$5, &record, "save", NULL, 0); + ZEPHIR_CALL_METHOD(&_21$$5, &record, "dosave", NULL, 0, visited); zephir_check_call_status(); _20$$5 = !zephir_is_true(&_21$$5); } @@ -9261,7 +9312,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSaveRelatedRecords) ZEPHIR_CONCAT_SVSV(&_32$$12, "Only objects can be stored as part of belongs-to relations in '", &_31$$12, "' Relation ", &name); ZEPHIR_CALL_METHOD(NULL, &_30$$12, "__construct", &_13, 32, &_32$$12); zephir_check_call_status(); - zephir_throw_exception_debug(&_30$$12, "phalcon/Mvc/Model.zep", 5007); + zephir_throw_exception_debug(&_30$$12, "phalcon/Mvc/Model.zep", 5035); ZEPHIR_MM_RESTORE(); return; } @@ -9285,14 +9336,14 @@ PHP_METHOD(Phalcon_Mvc_Model, preSaveRelatedRecords) ZEPHIR_CONCAT_SVSV(&_37$$13, "Not implemented in '", &_36$$13, "' Relation ", &name); ZEPHIR_CALL_METHOD(NULL, &_35$$13, "__construct", &_13, 32, &_37$$13); zephir_check_call_status(); - zephir_throw_exception_debug(&_35$$13, "phalcon/Mvc/Model.zep", 5019); + zephir_throw_exception_debug(&_35$$13, "phalcon/Mvc/Model.zep", 5046); ZEPHIR_MM_RESTORE(); return; } zephir_read_property(&_38$$11, &record, ZEND_STRL("dirtyState"), PH_NOISY_CC | PH_READONLY); _39$$11 = !ZEPHIR_IS_LONG_IDENTICAL(&_38$$11, 0); if (_39$$11) { - ZEPHIR_CALL_METHOD(&_40$$11, &record, "save", NULL, 0); + ZEPHIR_CALL_METHOD(&_40$$11, &record, "dosave", NULL, 0, visited); zephir_check_call_status(); _39$$11 = !zephir_is_true(&_40$$11); } @@ -9372,6 +9423,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSave) * Save the related records assigned in the has-one/has-many relations * * @param ModelInterface[] related + * @param CollectionInterface visited * @return bool */ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords) @@ -9383,11 +9435,12 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords) zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zephir_fcall_cache_entry *_6 = NULL, *_10 = NULL, *_13 = NULL, *_15 = NULL, *_19 = NULL, *_26 = NULL, *_28 = NULL, *_30 = NULL, *_31 = NULL, *_37 = NULL, *_40 = NULL, *_42 = NULL, *_43 = NULL, *_49 = NULL, *_54 = NULL, *_57 = NULL, *_59 = NULL, *_63 = NULL, *_67 = NULL, *_71 = NULL, *_76 = NULL, *_84 = NULL, *_86 = NULL, *_87 = NULL, *_93 = NULL, *_96 = NULL, *_98 = NULL, *_99 = NULL, *_105 = NULL, *_110 = NULL, *_113 = NULL, *_115 = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *connection, connection_sub, *related, related_sub, className, manager, relation, name, record, columns, referencedModel, referencedFields, relatedRecords, value, recordAfter, intermediateModel, intermediateFields, intermediateValue, intermediateModelName, intermediateReferencedFields, existingIntermediateModel, _0, *_1, _2, _118, _5$$3, _7$$4, _22$$4, _9$$6, _11$$6, _12$$6, _14$$7, _16$$7, _17$$7, _18$$10, _20$$10, _21$$10, *_23$$11, _24$$11, _25$$12, _29$$12, _35$$12, _27$$13, _33$$14, _36$$16, _38$$17, _41$$17, _47$$17, _39$$18, _45$$19, _48$$21, *_50$$22, _51$$22, _52$$23, _53$$24, _55$$25, _56$$26, _58$$28, _60$$28, _61$$28, _62$$29, _64$$30, _79$$30, _66$$32, _68$$32, _69$$32, _70$$33, _72$$33, _73$$33, _74$$34, _75$$36, _77$$36, _78$$36, *_80$$37, _81$$37, _82$$38, _85$$38, _91$$38, _83$$39, _89$$40, _92$$42, _94$$43, _97$$43, _103$$43, _95$$44, _101$$45, _104$$47, *_106$$48, _107$$48, _108$$49, _109$$50, _111$$51, _112$$52, _114$$54, _116$$54, _117$$54; + zval *connection, connection_sub, *related, related_sub, *visited, visited_sub, className, manager, relation, name, record, columns, referencedModel, referencedFields, relatedRecords, value, recordAfter, intermediateModel, intermediateFields, intermediateValue, intermediateModelName, intermediateReferencedFields, existingIntermediateModel, _0, *_1, _2, _118, _5$$3, _7$$4, _22$$4, _9$$6, _11$$6, _12$$6, _14$$7, _16$$7, _17$$7, _18$$10, _20$$10, _21$$10, *_23$$11, _24$$11, _25$$12, _29$$12, _35$$12, _27$$13, _33$$14, _36$$16, _38$$17, _41$$17, _47$$17, _39$$18, _45$$19, _48$$21, *_50$$22, _51$$22, _52$$23, _53$$24, _55$$25, _56$$26, _58$$28, _60$$28, _61$$28, _62$$29, _64$$30, _79$$30, _66$$32, _68$$32, _69$$32, _70$$33, _72$$33, _73$$33, _74$$34, _75$$36, _77$$36, _78$$36, *_80$$37, _81$$37, _82$$38, _85$$38, _91$$38, _83$$39, _89$$40, _92$$42, _94$$43, _97$$43, _103$$43, _95$$44, _101$$45, _104$$47, *_106$$48, _107$$48, _108$$49, _109$$50, _111$$51, _112$$52, _114$$54, _116$$54, _117$$54; zval *this_ptr = getThis(); ZVAL_UNDEF(&connection_sub); ZVAL_UNDEF(&related_sub); + ZVAL_UNDEF(&visited_sub); ZVAL_UNDEF(&className); ZVAL_UNDEF(&manager); ZVAL_UNDEF(&relation); @@ -9485,15 +9538,16 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords) ZVAL_UNDEF(&_102$$45); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(2, 2) + ZEND_PARSE_PARAMETERS_START(3, 3) Z_PARAM_OBJECT_OF_CLASS(connection, phalcon_db_adapter_adapterinterface_ce) Z_PARAM_ZVAL(related) + Z_PARAM_OBJECT_OF_CLASS(visited, phalcon_support_collection_collectioninterface_ce) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 2, 0, &connection, &related); + zephir_fetch_params(1, 3, 0, &connection, &related, &visited); nesting = 0; @@ -9502,7 +9556,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords) ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmodelsmanager", NULL, 0); zephir_check_call_status(); ZEPHIR_CPY_WRT(&manager, &_0); - zephir_is_iterable(related, 0, "phalcon/Mvc/Model.zep", 5277); + zephir_is_iterable(related, 0, "phalcon/Mvc/Model.zep", 5305); if (Z_TYPE_P(related) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(related), _3, _4, _1) { @@ -9541,7 +9595,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords) ZEPHIR_CONCAT_SVSV(&_12$$6, "Only objects/arrays can be stored as part of has-many/has-one/has-one-through/has-many-to-many relations on model ", &className, " on Relation ", &name); ZEPHIR_CALL_METHOD(NULL, &_11$$6, "__construct", &_13, 32, &_12$$6); zephir_check_call_status(); - zephir_throw_exception_debug(&_11$$6, "phalcon/Mvc/Model.zep", 5112); + zephir_throw_exception_debug(&_11$$6, "phalcon/Mvc/Model.zep", 5140); ZEPHIR_MM_RESTORE(); return; } @@ -9565,7 +9619,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords) ZEPHIR_CONCAT_SVSV(&_17$$7, "Not implemented in '", &className, "' on Relation ", &name); ZEPHIR_CALL_METHOD(NULL, &_16$$7, "__construct", &_13, 32, &_17$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_16$$7, "phalcon/Mvc/Model.zep", 5122); + zephir_throw_exception_debug(&_16$$7, "phalcon/Mvc/Model.zep", 5150); ZEPHIR_MM_RESTORE(); return; } @@ -9591,7 +9645,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords) ZEPHIR_CONCAT_SVSVS(&_21$$10, "The column '", &columns, "' needs to be present in the model '", &className, "'"); ZEPHIR_CALL_METHOD(NULL, &_20$$10, "__construct", &_13, 32, &_21$$10); zephir_check_call_status(); - zephir_throw_exception_debug(&_20$$10, "phalcon/Mvc/Model.zep", 5139); + zephir_throw_exception_debug(&_20$$10, "phalcon/Mvc/Model.zep", 5167); ZEPHIR_MM_RESTORE(); return; } @@ -9605,13 +9659,13 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&intermediateReferencedFields, &relation, "getintermediatereferencedfields", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&relatedRecords, 0, "phalcon/Mvc/Model.zep", 5238); + zephir_is_iterable(&relatedRecords, 0, "phalcon/Mvc/Model.zep", 5266); if (Z_TYPE_P(&relatedRecords) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relatedRecords), _23$$11) { ZEPHIR_INIT_NVAR(&recordAfter); ZVAL_COPY(&recordAfter, _23$$11); - ZEPHIR_CALL_METHOD(&_25$$12, &recordAfter, "save", NULL, 0); + ZEPHIR_CALL_METHOD(&_25$$12, &recordAfter, "dosave", NULL, 0, visited); zephir_check_call_status(); if (!(zephir_is_true(&_25$$12))) { ZEPHIR_CALL_METHOD(NULL, this_ptr, "appendmessagesfrom", &_26, 0, &recordAfter); @@ -9652,7 +9706,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords) zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &intermediateModel, "writeattribute", NULL, 0, &intermediateReferencedFields, &intermediateValue); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_35$$12, &intermediateModel, "save", NULL, 0); + ZEPHIR_CALL_METHOD(&_35$$12, &intermediateModel, "dosave", NULL, 0, visited); zephir_check_call_status(); if (!(zephir_is_true(&_35$$12))) { ZEPHIR_CALL_METHOD(NULL, this_ptr, "appendmessagesfrom", &_26, 0, &intermediateModel); @@ -9678,7 +9732,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords) } ZEPHIR_CALL_METHOD(&recordAfter, &relatedRecords, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_38$$17, &recordAfter, "save", NULL, 0); + ZEPHIR_CALL_METHOD(&_38$$17, &recordAfter, "dosave", NULL, 0, visited); zephir_check_call_status(); if (!(zephir_is_true(&_38$$17))) { ZEPHIR_CALL_METHOD(NULL, this_ptr, "appendmessagesfrom", &_26, 0, &recordAfter); @@ -9719,7 +9773,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords) zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &intermediateModel, "writeattribute", NULL, 0, &intermediateReferencedFields, &intermediateValue); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_47$$17, &intermediateModel, "save", NULL, 0); + ZEPHIR_CALL_METHOD(&_47$$17, &intermediateModel, "dosave", NULL, 0, visited); zephir_check_call_status(); if (!(zephir_is_true(&_47$$17))) { ZEPHIR_CALL_METHOD(NULL, this_ptr, "appendmessagesfrom", &_26, 0, &intermediateModel); @@ -9739,7 +9793,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords) } ZEPHIR_INIT_NVAR(&recordAfter); } else { - zephir_is_iterable(&relatedRecords, 0, "phalcon/Mvc/Model.zep", 5262); + zephir_is_iterable(&relatedRecords, 0, "phalcon/Mvc/Model.zep", 5290); if (Z_TYPE_P(&relatedRecords) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relatedRecords), _50$$22) { @@ -9747,7 +9801,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords) ZVAL_COPY(&recordAfter, _50$$22); ZEPHIR_CALL_METHOD(NULL, &recordAfter, "writeattribute", NULL, 0, &referencedFields, &value); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_52$$23, &recordAfter, "save", NULL, 0); + ZEPHIR_CALL_METHOD(&_52$$23, &recordAfter, "dosave", NULL, 0, visited); zephir_check_call_status(); if (!(zephir_is_true(&_52$$23))) { ZEPHIR_CALL_METHOD(NULL, this_ptr, "appendmessagesfrom", &_26, 0, &recordAfter); @@ -9775,7 +9829,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords) zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &recordAfter, "writeattribute", NULL, 0, &referencedFields, &value); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_55$$25, &recordAfter, "save", NULL, 0); + ZEPHIR_CALL_METHOD(&_55$$25, &recordAfter, "dosave", NULL, 0, visited); zephir_check_call_status(); if (!(zephir_is_true(&_55$$25))) { ZEPHIR_CALL_METHOD(NULL, this_ptr, "appendmessagesfrom", &_26, 0, &recordAfter); @@ -9810,7 +9864,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords) ZEPHIR_CONCAT_SVSVS(&_61$$28, "There are no defined relations for the model '", &className, "' using alias '", &name, "'"); ZEPHIR_CALL_METHOD(NULL, &_60$$28, "__construct", &_13, 32, &_61$$28); zephir_check_call_status(); - zephir_throw_exception_debug(&_60$$28, "phalcon/Mvc/Model.zep", 5269); + zephir_throw_exception_debug(&_60$$28, "phalcon/Mvc/Model.zep", 5297); ZEPHIR_MM_RESTORE(); return; } @@ -9856,7 +9910,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords) ZEPHIR_CONCAT_SVSV(&_69$$32, "Only objects/arrays can be stored as part of has-many/has-one/has-one-through/has-many-to-many relations on model ", &className, " on Relation ", &name); ZEPHIR_CALL_METHOD(NULL, &_68$$32, "__construct", &_13, 32, &_69$$32); zephir_check_call_status(); - zephir_throw_exception_debug(&_68$$32, "phalcon/Mvc/Model.zep", 5112); + zephir_throw_exception_debug(&_68$$32, "phalcon/Mvc/Model.zep", 5140); ZEPHIR_MM_RESTORE(); return; } @@ -9880,7 +9934,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords) ZEPHIR_CONCAT_SVSV(&_73$$33, "Not implemented in '", &className, "' on Relation ", &name); ZEPHIR_CALL_METHOD(NULL, &_72$$33, "__construct", &_13, 32, &_73$$33); zephir_check_call_status(); - zephir_throw_exception_debug(&_72$$33, "phalcon/Mvc/Model.zep", 5122); + zephir_throw_exception_debug(&_72$$33, "phalcon/Mvc/Model.zep", 5150); ZEPHIR_MM_RESTORE(); return; } @@ -9907,7 +9961,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords) ZEPHIR_CONCAT_SVSVS(&_78$$36, "The column '", &columns, "' needs to be present in the model '", &className, "'"); ZEPHIR_CALL_METHOD(NULL, &_77$$36, "__construct", &_13, 32, &_78$$36); zephir_check_call_status(); - zephir_throw_exception_debug(&_77$$36, "phalcon/Mvc/Model.zep", 5139); + zephir_throw_exception_debug(&_77$$36, "phalcon/Mvc/Model.zep", 5167); ZEPHIR_MM_RESTORE(); return; } @@ -9921,13 +9975,13 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&intermediateReferencedFields, &relation, "getintermediatereferencedfields", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&relatedRecords, 0, "phalcon/Mvc/Model.zep", 5238); + zephir_is_iterable(&relatedRecords, 0, "phalcon/Mvc/Model.zep", 5266); if (Z_TYPE_P(&relatedRecords) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relatedRecords), _80$$37) { ZEPHIR_INIT_NVAR(&recordAfter); ZVAL_COPY(&recordAfter, _80$$37); - ZEPHIR_CALL_METHOD(&_82$$38, &recordAfter, "save", NULL, 0); + ZEPHIR_CALL_METHOD(&_82$$38, &recordAfter, "dosave", NULL, 0, visited); zephir_check_call_status(); if (!(zephir_is_true(&_82$$38))) { ZEPHIR_CALL_METHOD(NULL, this_ptr, "appendmessagesfrom", &_26, 0, &recordAfter); @@ -9968,7 +10022,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords) zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &intermediateModel, "writeattribute", NULL, 0, &intermediateReferencedFields, &intermediateValue); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_91$$38, &intermediateModel, "save", NULL, 0); + ZEPHIR_CALL_METHOD(&_91$$38, &intermediateModel, "dosave", NULL, 0, visited); zephir_check_call_status(); if (!(zephir_is_true(&_91$$38))) { ZEPHIR_CALL_METHOD(NULL, this_ptr, "appendmessagesfrom", &_26, 0, &intermediateModel); @@ -9994,7 +10048,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords) } ZEPHIR_CALL_METHOD(&recordAfter, &relatedRecords, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_94$$43, &recordAfter, "save", NULL, 0); + ZEPHIR_CALL_METHOD(&_94$$43, &recordAfter, "dosave", NULL, 0, visited); zephir_check_call_status(); if (!(zephir_is_true(&_94$$43))) { ZEPHIR_CALL_METHOD(NULL, this_ptr, "appendmessagesfrom", &_26, 0, &recordAfter); @@ -10035,7 +10089,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords) zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &intermediateModel, "writeattribute", NULL, 0, &intermediateReferencedFields, &intermediateValue); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_103$$43, &intermediateModel, "save", NULL, 0); + ZEPHIR_CALL_METHOD(&_103$$43, &intermediateModel, "dosave", NULL, 0, visited); zephir_check_call_status(); if (!(zephir_is_true(&_103$$43))) { ZEPHIR_CALL_METHOD(NULL, this_ptr, "appendmessagesfrom", &_26, 0, &intermediateModel); @@ -10055,7 +10109,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords) } ZEPHIR_INIT_NVAR(&recordAfter); } else { - zephir_is_iterable(&relatedRecords, 0, "phalcon/Mvc/Model.zep", 5262); + zephir_is_iterable(&relatedRecords, 0, "phalcon/Mvc/Model.zep", 5290); if (Z_TYPE_P(&relatedRecords) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relatedRecords), _106$$48) { @@ -10063,7 +10117,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords) ZVAL_COPY(&recordAfter, _106$$48); ZEPHIR_CALL_METHOD(NULL, &recordAfter, "writeattribute", NULL, 0, &referencedFields, &value); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_108$$49, &recordAfter, "save", NULL, 0); + ZEPHIR_CALL_METHOD(&_108$$49, &recordAfter, "dosave", NULL, 0, visited); zephir_check_call_status(); if (!(zephir_is_true(&_108$$49))) { ZEPHIR_CALL_METHOD(NULL, this_ptr, "appendmessagesfrom", &_26, 0, &recordAfter); @@ -10091,7 +10145,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords) zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &recordAfter, "writeattribute", NULL, 0, &referencedFields, &value); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_111$$51, &recordAfter, "save", NULL, 0); + ZEPHIR_CALL_METHOD(&_111$$51, &recordAfter, "dosave", NULL, 0, visited); zephir_check_call_status(); if (!(zephir_is_true(&_111$$51))) { ZEPHIR_CALL_METHOD(NULL, this_ptr, "appendmessagesfrom", &_26, 0, &recordAfter); @@ -10126,7 +10180,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords) ZEPHIR_CONCAT_SVSVS(&_117$$54, "There are no defined relations for the model '", &className, "' using alias '", &name, "'"); ZEPHIR_CALL_METHOD(NULL, &_116$$54, "__construct", &_13, 32, &_117$$54); zephir_check_call_status(); - zephir_throw_exception_debug(&_116$$54, "phalcon/Mvc/Model.zep", 5269); + zephir_throw_exception_debug(&_116$$54, "phalcon/Mvc/Model.zep", 5297); ZEPHIR_MM_RESTORE(); return; } @@ -10194,7 +10248,7 @@ PHP_METHOD(Phalcon_Mvc_Model, allowEmptyStringValues) ZEPHIR_INIT_VAR(&keysAttributes); array_init(&keysAttributes); - zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5310); + zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5338); if (Z_TYPE_P(&attributes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _0) { @@ -11077,7 +11131,7 @@ PHP_METHOD(Phalcon_Mvc_Model, skipAttributesOnCreate) ZEPHIR_INIT_VAR(&keysAttributes); array_init(&keysAttributes); - zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5769); + zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5797); if (Z_TYPE_P(&attributes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _0) { @@ -11156,7 +11210,7 @@ PHP_METHOD(Phalcon_Mvc_Model, skipAttributesOnUpdate) ZEPHIR_INIT_VAR(&keysAttributes); array_init(&keysAttributes); - zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5804); + zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5832); if (Z_TYPE_P(&attributes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _0) { @@ -11410,7 +11464,7 @@ PHP_METHOD(Phalcon_Mvc_Model, caseInsensitiveColumnMap) ZEPHIR_INIT_VAR(&_0); zephir_array_keys(&_0, columnMap); - zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model.zep", 5941); + zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model.zep", 5969); if (Z_TYPE_P(&_0) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _1) { @@ -11484,7 +11538,7 @@ PHP_METHOD(Phalcon_Mvc_Model, appendMessagesFrom) ZEPHIR_CALL_METHOD(&messages, model, "getmessages", NULL, 0); zephir_check_call_status(); if (0 == ZEPHIR_IS_EMPTY(&messages)) { - zephir_is_iterable(&messages, 0, "phalcon/Mvc/Model.zep", 5965); + zephir_is_iterable(&messages, 0, "phalcon/Mvc/Model.zep", 5993); if (Z_TYPE_P(&messages) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&messages), _0$$3) { diff --git a/ext/phalcon/mvc/model.zep.h b/ext/phalcon/mvc/model.zep.h index 123cbcc58ba..f787d12b09c 100644 --- a/ext/phalcon/mvc/model.zep.h +++ b/ext/phalcon/mvc/model.zep.h @@ -55,6 +55,7 @@ PHP_METHOD(Phalcon_Mvc_Model, query); PHP_METHOD(Phalcon_Mvc_Model, readAttribute); PHP_METHOD(Phalcon_Mvc_Model, refresh); PHP_METHOD(Phalcon_Mvc_Model, save); +PHP_METHOD(Phalcon_Mvc_Model, doSave); PHP_METHOD(Phalcon_Mvc_Model, serialize); PHP_METHOD(Phalcon_Mvc_Model, unserialize); PHP_METHOD(Phalcon_Mvc_Model, setConnectionService); @@ -315,6 +316,10 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_save, 0, 0, _IS_BOOL, 0) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_dosave, 0, 1, _IS_BOOL, 0) + ZEND_ARG_OBJ_INFO(0, visited, Phalcon\\Support\\Collection\\CollectionInterface, 0) +ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_serialize, 0, 0, IS_STRING, 0) ZEND_END_ARG_INFO() @@ -451,9 +456,10 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_presave, 0, 3, ZEND_ARG_INFO(0, identityField) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_presaverelatedrecords, 0, 2, _IS_BOOL, 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_presaverelatedrecords, 0, 3, _IS_BOOL, 0) ZEND_ARG_OBJ_INFO(0, connection, Phalcon\\Db\\Adapter\\AdapterInterface, 0) ZEND_ARG_INFO(0, related) + ZEND_ARG_OBJ_INFO(0, visited, Phalcon\\Support\\Collection\\CollectionInterface, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_postsave, 0, 2, _IS_BOOL, 0) @@ -461,9 +467,10 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_postsave, 0, 2 ZEND_ARG_TYPE_INFO(0, exists, _IS_BOOL, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_postsaverelatedrecords, 0, 2, _IS_BOOL, 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_postsaverelatedrecords, 0, 3, _IS_BOOL, 0) ZEND_ARG_OBJ_INFO(0, connection, Phalcon\\Db\\Adapter\\AdapterInterface, 0) ZEND_ARG_INFO(0, related) + ZEND_ARG_OBJ_INFO(0, visited, Phalcon\\Support\\Collection\\CollectionInterface, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_allowemptystringvalues, 0, 1, IS_VOID, 0) @@ -646,6 +653,7 @@ ZEPHIR_INIT_FUNCS(phalcon_mvc_model_method_entry) { PHP_ME(Phalcon_Mvc_Model, readAttribute, arginfo_phalcon_mvc_model_readattribute, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model, refresh, arginfo_phalcon_mvc_model_refresh, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model, save, arginfo_phalcon_mvc_model_save, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Mvc_Model, doSave, arginfo_phalcon_mvc_model_dosave, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model, serialize, arginfo_phalcon_mvc_model_serialize, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model, unserialize, arginfo_phalcon_mvc_model_unserialize, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Mvc_Model, setConnectionService, arginfo_phalcon_mvc_model_setconnectionservice, ZEND_ACC_FINAL|ZEND_ACC_PUBLIC) diff --git a/ext/phalcon/mvc/model/behavior/timestampable.zep.c b/ext/phalcon/mvc/model/behavior/timestampable.zep.c index 1f1262deea1..2772ffc26d9 100644 --- a/ext/phalcon/mvc/model/behavior/timestampable.zep.c +++ b/ext/phalcon/mvc/model/behavior/timestampable.zep.c @@ -101,7 +101,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Behavior_Timestampable, notify) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The option 'field' is required", "phalcon/Mvc/Model/Behavior/Timestampable.zep", 50); return; } - ZEPHIR_CALL_METHOD(×tamp, this_ptr, "gettimestamp", NULL, 436, &options); + ZEPHIR_CALL_METHOD(×tamp, this_ptr, "gettimestamp", NULL, 437, &options); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&field) == IS_ARRAY)) { zephir_is_iterable(&field, 0, "phalcon/Mvc/Model/Behavior/Timestampable.zep", 63); @@ -165,7 +165,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Behavior_Timestampable, getTimestamp) ZEPHIR_OBS_VAR(&format); if (zephir_array_isset_string_fetch(&format, &options, SL("format"), 0)) { - ZEPHIR_RETURN_CALL_FUNCTION("date", NULL, 437, &format); + ZEPHIR_RETURN_CALL_FUNCTION("date", NULL, 438, &format); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/mvc/model/binder.zep.c b/ext/phalcon/mvc/model/binder.zep.c index 3c663798953..69e90e1d81a 100644 --- a/ext/phalcon/mvc/model/binder.zep.c +++ b/ext/phalcon/mvc/model/binder.zep.c @@ -435,7 +435,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection) ZEPHIR_INIT_VAR(&reflection); if (!ZEPHIR_IS_NULL(&methodName)) { object_init_ex(&reflection, zephir_get_internal_ce(SL("reflectionmethod"))); - ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 438, handler, &methodName); + ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 439, handler, &methodName); zephir_check_call_status(); } else { object_init_ex(&reflection, zephir_get_internal_ce(SL("reflectionfunction"))); @@ -477,7 +477,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection) zephir_array_fetch(¶mValue, ¶ms, ¶mKey, PH_NOISY, "phalcon/Mvc/Model/Binder.zep", 199); ZEPHIR_INIT_NVAR(&_6$$5); ZVAL_STRING(&_6$$5, "Phalcon\\Mvc\\Model"); - ZEPHIR_CALL_FUNCTION(&_7$$5, "is_subclass_of", &_8, 439, &className, &_6$$5); + ZEPHIR_CALL_FUNCTION(&_7$$5, "is_subclass_of", &_8, 440, &className, &_6$$5); zephir_check_call_status(); if (ZEPHIR_IS_STRING(&className, "Phalcon\\Mvc\\Model")) { if (Z_TYPE_P(&realClasses) == IS_NULL) { @@ -559,7 +559,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection) zephir_array_fetch(¶mValue, ¶ms, ¶mKey, PH_NOISY, "phalcon/Mvc/Model/Binder.zep", 199); ZEPHIR_INIT_NVAR(&_15$$19); ZVAL_STRING(&_15$$19, "Phalcon\\Mvc\\Model"); - ZEPHIR_CALL_FUNCTION(&_16$$19, "is_subclass_of", &_8, 439, &className, &_15$$19); + ZEPHIR_CALL_FUNCTION(&_16$$19, "is_subclass_of", &_8, 440, &className, &_15$$19); zephir_check_call_status(); if (ZEPHIR_IS_STRING(&className, "Phalcon\\Mvc\\Model")) { if (Z_TYPE_P(&realClasses) == IS_NULL) { diff --git a/ext/phalcon/mvc/model/criteria.zep.c b/ext/phalcon/mvc/model/criteria.zep.c index d6c071a38fa..3baa75aef19 100644 --- a/ext/phalcon/mvc/model/criteria.zep.c +++ b/ext/phalcon/mvc/model/criteria.zep.c @@ -790,9 +790,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, fromInput) ZEPHIR_INIT_VAR(&_17$$16); ZEPHIR_CONCAT_SVS(&_17$$16, " ", &operator, " "); zephir_fast_join(&_16$$16, &_17$$16, &conditions); - ZEPHIR_CALL_METHOD(NULL, &criteria, "where", NULL, 440, &_16$$16); + ZEPHIR_CALL_METHOD(NULL, &criteria, "where", NULL, 441, &_16$$16); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &criteria, "bind", NULL, 441, &bind); + ZEPHIR_CALL_METHOD(NULL, &criteria, "bind", NULL, 442, &bind); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 432, &modelName); diff --git a/ext/phalcon/mvc/model/manager.zep.c b/ext/phalcon/mvc/model/manager.zep.c index f83cb9856c7..1f3b51e83b9 100644 --- a/ext/phalcon/mvc/model/manager.zep.c +++ b/ext/phalcon/mvc/model/manager.zep.c @@ -366,7 +366,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, addBelongsTo) ZEPHIR_INIT_VAR(&relation); object_init_ex(&relation, phalcon_mvc_model_relation_ce); ZVAL_LONG(&_2, 0); - ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 442, &_2, &referencedModel, fields, referencedFields, &options); + ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 443, &_2, &referencedModel, fields, referencedFields, &options); zephir_check_call_status(); ZEPHIR_OBS_VAR(&alias); if (zephir_array_isset_string_fetch(&alias, &options, SL("alias"), 0)) { @@ -487,7 +487,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasMany) ZEPHIR_INIT_VAR(&relation); object_init_ex(&relation, phalcon_mvc_model_relation_ce); ZVAL_LONG(&_1, 2); - ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 442, &_1, &referencedModel, fields, referencedFields, &options); + ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 443, &_1, &referencedModel, fields, referencedFields, &options); zephir_check_call_status(); ZEPHIR_OBS_VAR(&alias); if (zephir_array_isset_string_fetch(&alias, &options, SL("alias"), 0)) { @@ -635,9 +635,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasManyToMany) ZEPHIR_INIT_VAR(&relation); object_init_ex(&relation, phalcon_mvc_model_relation_ce); ZVAL_LONG(&_1, 4); - ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 442, &_1, &referencedModel, fields, referencedFields, &options); + ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 443, &_1, &referencedModel, fields, referencedFields, &options); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &relation, "setintermediaterelation", NULL, 443, intermediateFields, &intermediateModel, intermediateReferencedFields); + ZEPHIR_CALL_METHOD(NULL, &relation, "setintermediaterelation", NULL, 444, intermediateFields, &intermediateModel, intermediateReferencedFields); zephir_check_call_status(); ZEPHIR_OBS_VAR(&alias); if (zephir_array_isset_string_fetch(&alias, &options, SL("alias"), 0)) { @@ -757,7 +757,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasOne) ZEPHIR_INIT_VAR(&relation); object_init_ex(&relation, phalcon_mvc_model_relation_ce); ZVAL_LONG(&_2, 1); - ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 442, &_2, &referencedModel, fields, referencedFields, &options); + ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 443, &_2, &referencedModel, fields, referencedFields, &options); zephir_check_call_status(); ZEPHIR_OBS_VAR(&alias); if (zephir_array_isset_string_fetch(&alias, &options, SL("alias"), 0)) { @@ -905,9 +905,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasOneThrough) ZEPHIR_INIT_VAR(&relation); object_init_ex(&relation, phalcon_mvc_model_relation_ce); ZVAL_LONG(&_1, 3); - ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 442, &_1, &referencedModel, fields, referencedFields, &options); + ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 443, &_1, &referencedModel, fields, referencedFields, &options); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &relation, "setintermediaterelation", NULL, 443, intermediateFields, &intermediateModel, intermediateReferencedFields); + ZEPHIR_CALL_METHOD(NULL, &relation, "setintermediaterelation", NULL, 444, intermediateFields, &intermediateModel, intermediateReferencedFields); zephir_check_call_status(); ZEPHIR_OBS_VAR(&alias); if (zephir_array_isset_string_fetch(&alias, &options, SL("alias"), 0)) { @@ -2402,7 +2402,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getRelationRecords) ZEPHIR_INIT_VAR(&_4$$3); ZEPHIR_CONCAT_SVSVSVSVS(&_4$$3, "[", &intermediateModel, "].[", &intermediateFields, "] = [", &referencedModel, "].[", &_3$$3, "]"); zephir_array_append(&joinConditions, &_4$$3, PH_SEPARATE, "phalcon/Mvc/Model/Manager.zep", 1401); - ZEPHIR_CALL_METHOD(&_5$$3, this_ptr, "mergefindparameters", NULL, 444, &extraParameters, parameters); + ZEPHIR_CALL_METHOD(&_5$$3, this_ptr, "mergefindparameters", NULL, 445, &extraParameters, parameters); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&builder, this_ptr, "createbuilder", NULL, 0, &_5$$3); zephir_check_call_status(); @@ -2533,10 +2533,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getRelationRecords) ZEPHIR_CALL_METHOD(&_32, record, "getdi", NULL, 0); zephir_check_call_status(); zephir_array_update_string(&findParams, SL("di"), &_32, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&findArguments, this_ptr, "mergefindparameters", NULL, 444, &findParams, parameters); + ZEPHIR_CALL_METHOD(&findArguments, this_ptr, "mergefindparameters", NULL, 445, &findParams, parameters); zephir_check_call_status(); if (Z_TYPE_P(&extraParameters) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&findParams, this_ptr, "mergefindparameters", NULL, 444, &extraParameters, &findArguments); + ZEPHIR_CALL_METHOD(&findParams, this_ptr, "mergefindparameters", NULL, 445, &extraParameters, &findArguments); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&findParams, &findArguments); @@ -3073,7 +3073,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, hasBelongsTo) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "belongsTo"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 445, &_0, &modelName, &modelRelation); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 446, &_0, &modelName, &modelRelation); zephir_check_call_status(); RETURN_MM(); } @@ -3130,7 +3130,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, hasHasMany) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "hasMany"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 445, &_0, &modelName, &modelRelation); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 446, &_0, &modelName, &modelRelation); zephir_check_call_status(); RETURN_MM(); } @@ -3187,7 +3187,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, hasHasManyToMany) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "hasManyToMany"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 445, &_0, &modelName, &modelRelation); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 446, &_0, &modelName, &modelRelation); zephir_check_call_status(); RETURN_MM(); } @@ -3244,7 +3244,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, hasHasOne) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "hasOne"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 445, &_0, &modelName, &modelRelation); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 446, &_0, &modelName, &modelRelation); zephir_check_call_status(); RETURN_MM(); } @@ -3301,7 +3301,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, hasHasOneThrough) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "hasOneThrough"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 445, &_0, &modelName, &modelRelation); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkhasrelationship", NULL, 446, &_0, &modelName, &modelRelation); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/mvc/model/metadata.zep.c b/ext/phalcon/mvc/model/metadata.zep.c index 85304eda532..b14b9c23631 100644 --- a/ext/phalcon/mvc/model/metadata.zep.c +++ b/ext/phalcon/mvc/model/metadata.zep.c @@ -1574,7 +1574,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, initializeColumnMap) } zephir_read_property(&_0, this_ptr, ZEND_STRL("columnMap"), PH_NOISY_CC | PH_READONLY); if (1 == zephir_array_isset(&_0, key)) { - RETURN_MM_BOOL(0); + RETURN_MM_BOOL(1); } ZEPHIR_INIT_VAR(&_1); ZEPHIR_CONCAT_SV(&_1, "map-", key); @@ -1583,7 +1583,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData, initializeColumnMap) zephir_check_call_status(); if (Z_TYPE_P(&data) != IS_NULL) { zephir_update_property_array(this_ptr, SL("columnMap"), key, &data); - RETURN_MM_BOOL(0); + RETURN_MM_BOOL(1); } ZEPHIR_CALL_METHOD(&container, this_ptr, "getdi", NULL, 0); zephir_check_call_status(); diff --git a/ext/phalcon/mvc/model/metadata/stream.zep.c b/ext/phalcon/mvc/model/metadata/stream.zep.c index af1ad511ef7..e8eec8646d3 100644 --- a/ext/phalcon/mvc/model/metadata/stream.zep.c +++ b/ext/phalcon/mvc/model/metadata/stream.zep.c @@ -217,7 +217,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData_Stream, write) ZEPHIR_CONCAT_SVS(&_5$$3, "= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -1627,8 +1617,6 @@ PHP_METHOD(Phalcon_Mvc_Router, handle) ZEPHIR_INIT_NVAR(&handledUri); ZVAL_STRING(&handledUri, "/"); } - ZEPHIR_INIT_VAR(&request); - ZVAL_NULL(&request); ZEPHIR_INIT_VAR(¤tHostName); ZVAL_NULL(¤tHostName); ZEPHIR_INIT_VAR(&routeFound); @@ -1653,13 +1641,24 @@ PHP_METHOD(Phalcon_Mvc_Router, handle) ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_5$$6, this_ptr); zephir_check_call_status(); } + zephir_read_property(&_4, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CPY_WRT(&container, &_4); + if (Z_TYPE_P(&container) == IS_NULL) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/Mvc/Router.zep", 724); + return; + } + ZEPHIR_INIT_VAR(&_7); + ZVAL_STRING(&_7, "request"); + ZEPHIR_CALL_METHOD(&_6, &container, "get", NULL, 0, &_7); + zephir_check_call_status(); + ZEPHIR_CPY_WRT(&request, &_6); zephir_read_property(&_4, this_ptr, ZEND_STRL("routes"), PH_NOISY_CC | PH_READONLY); - zephir_is_iterable(&_4, 0, "phalcon/Mvc/Router.zep", 948); + zephir_is_iterable(&_4, 0, "phalcon/Mvc/Router.zep", 930); if (Z_TYPE_P(&_4) == IS_ARRAY) { - ZEND_HASH_REVERSE_FOREACH_VAL(Z_ARRVAL_P(&_4), _6) + ZEND_HASH_REVERSE_FOREACH_VAL(Z_ARRVAL_P(&_4), _8) { ZEPHIR_INIT_NVAR(&route); - ZVAL_COPY(&route, _6); + ZVAL_COPY(&route, _8); ZEPHIR_INIT_NVAR(¶ms); array_init(¶ms); ZEPHIR_INIT_NVAR(&matches); @@ -1667,63 +1666,37 @@ PHP_METHOD(Phalcon_Mvc_Router, handle) ZEPHIR_CALL_METHOD(&methods, &route, "gethttpmethods", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&methods) != IS_NULL) { - if (Z_TYPE_P(&request) == IS_NULL) { - zephir_read_property(&_8$$9, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CPY_WRT(&container, &_8$$9); - if (Z_TYPE_P(&container) == IS_NULL) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/Mvc/Router.zep", 739); - return; - } - ZEPHIR_INIT_NVAR(&_10$$9); - ZVAL_STRING(&_10$$9, "request"); - ZEPHIR_CALL_METHOD(&_9$$9, &container, "getshared", NULL, 0, &_10$$9); - zephir_check_call_status(); - ZEPHIR_CPY_WRT(&request, &_9$$9); - } - ZVAL_BOOL(&_12$$8, 1); - ZEPHIR_CALL_METHOD(&_11$$8, &request, "ismethod", NULL, 0, &methods, &_12$$8); + ZVAL_BOOL(&_11$$9, 1); + ZEPHIR_CALL_METHOD(&_10$$9, &request, "ismethod", &_12, 0, &methods, &_11$$9); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(&_11$$8)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(&_10$$9)) { continue; } } ZEPHIR_CALL_METHOD(&hostname, &route, "gethostname", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&hostname) != IS_NULL) { - if (Z_TYPE_P(&request) == IS_NULL) { - zephir_read_property(&_13$$13, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CPY_WRT(&container, &_13$$13); - if (Z_TYPE_P(&container) == IS_NULL) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/Mvc/Router.zep", 766); - return; - } - ZEPHIR_INIT_NVAR(&_15$$13); - ZVAL_STRING(&_15$$13, "request"); - ZEPHIR_CALL_METHOD(&_14$$13, &container, "getshared", NULL, 0, &_15$$13); - zephir_check_call_status(); - ZEPHIR_CPY_WRT(&request, &_14$$13); - } if (Z_TYPE_P(¤tHostName) == IS_NULL) { - ZEPHIR_CALL_METHOD(¤tHostName, &request, "gethttphost", NULL, 0); + ZEPHIR_CALL_METHOD(¤tHostName, &request, "gethttphost", &_13, 0); zephir_check_call_status(); } if (!(zephir_is_true(¤tHostName))) { continue; } - if (zephir_memnstr_str(&hostname, SL("("), "phalcon/Mvc/Router.zep", 790)) { - if (!(zephir_memnstr_str(&hostname, SL("#"), "phalcon/Mvc/Router.zep", 791))) { + if (zephir_memnstr_str(&hostname, SL("("), "phalcon/Mvc/Router.zep", 772)) { + if (!(zephir_memnstr_str(&hostname, SL("#"), "phalcon/Mvc/Router.zep", 773))) { ZEPHIR_INIT_NVAR(®exHostName); ZEPHIR_CONCAT_SV(®exHostName, "#^", &hostname); - if (!(zephir_memnstr_str(&hostname, SL(":"), "phalcon/Mvc/Router.zep", 794))) { + if (!(zephir_memnstr_str(&hostname, SL(":"), "phalcon/Mvc/Router.zep", 776))) { zephir_concat_self_str(®exHostName, SL("(:[[:digit:]]+)?")); } zephir_concat_self_str(®exHostName, SL("$#i")); } else { ZEPHIR_CPY_WRT(®exHostName, &hostname); } - ZEPHIR_INIT_NVAR(&_16$$17); + ZEPHIR_INIT_NVAR(&_14$$14); ZEPHIR_INIT_NVAR(&matched); - zephir_preg_match(&matched, ®exHostName, ¤tHostName, &_16$$17, 0, 0 , 0 ); + zephir_preg_match(&matched, ®exHostName, ¤tHostName, &_14$$14, 0, 0 , 0 ); } else { ZEPHIR_INIT_NVAR(&matched); ZVAL_BOOL(&matched, ZEPHIR_IS_EQUAL(¤tHostName, &hostname)); @@ -1733,14 +1706,14 @@ PHP_METHOD(Phalcon_Mvc_Router, handle) } } if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_NVAR(&_17$$23); - ZVAL_STRING(&_17$$23, "router:beforeCheckRoute"); - ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", &_18, 0, &_17$$23, this_ptr, &route); + ZEPHIR_INIT_NVAR(&_15$$20); + ZVAL_STRING(&_15$$20, "router:beforeCheckRoute"); + ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", &_16, 0, &_15$$20, this_ptr, &route); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(&pattern, &route, "getcompiledpattern", NULL, 0); zephir_check_call_status(); - if (zephir_memnstr_str(&pattern, SL("^"), "phalcon/Mvc/Router.zep", 822)) { + if (zephir_memnstr_str(&pattern, SL("^"), "phalcon/Mvc/Router.zep", 804)) { ZEPHIR_INIT_NVAR(&routeFound); zephir_preg_match(&routeFound, &pattern, &handledUri, &matches, 0, 0 , 0 ); } else { @@ -1749,32 +1722,32 @@ PHP_METHOD(Phalcon_Mvc_Router, handle) } if (zephir_is_true(&routeFound)) { if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_NVAR(&_19$$27); - ZVAL_STRING(&_19$$27, "router:matchedRoute"); - ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", &_20, 0, &_19$$27, this_ptr, &route); + ZEPHIR_INIT_NVAR(&_17$$24); + ZVAL_STRING(&_17$$24, "router:matchedRoute"); + ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", &_18, 0, &_17$$24, this_ptr, &route); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(&beforeMatch, &route, "getbeforematch", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&beforeMatch) != IS_NULL) { if (UNEXPECTED(!(zephir_is_callable(&beforeMatch)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "Before-Match callback is not callable in matched route", "phalcon/Mvc/Router.zep", 844); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "Before-Match callback is not callable in matched route", "phalcon/Mvc/Router.zep", 826); return; } - ZEPHIR_INIT_NVAR(&_21$$28); - zephir_create_array(&_21$$28, 3, 0); - zephir_array_fast_append(&_21$$28, &handledUri); - zephir_array_fast_append(&_21$$28, &route); - zephir_array_fast_append(&_21$$28, this_ptr); + ZEPHIR_INIT_NVAR(&_19$$25); + zephir_create_array(&_19$$25, 3, 0); + zephir_array_fast_append(&_19$$25, &handledUri); + zephir_array_fast_append(&_19$$25, &route); + zephir_array_fast_append(&_19$$25, this_ptr); ZEPHIR_INIT_NVAR(&routeFound); - ZEPHIR_CALL_USER_FUNC_ARRAY(&routeFound, &beforeMatch, &_21$$28); + ZEPHIR_CALL_USER_FUNC_ARRAY(&routeFound, &beforeMatch, &_19$$25); zephir_check_call_status(); } } else { if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_NVAR(&_22$$31); - ZVAL_STRING(&_22$$31, "router:notMatchedRoute"); - ZEPHIR_CALL_METHOD(&routeFound, &eventsManager, "fire", &_23, 0, &_22$$31, this_ptr, &route); + ZEPHIR_INIT_NVAR(&_20$$28); + ZVAL_STRING(&_20$$28, "router:notMatchedRoute"); + ZEPHIR_CALL_METHOD(&routeFound, &eventsManager, "fire", &_21, 0, &_20$$28, this_ptr, &route); zephir_check_call_status(); } } @@ -1785,34 +1758,34 @@ PHP_METHOD(Phalcon_Mvc_Router, handle) if (Z_TYPE_P(&matches) == IS_ARRAY) { ZEPHIR_CALL_METHOD(&converters, &route, "getconverters", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&paths, 0, "phalcon/Mvc/Router.zep", 936); + zephir_is_iterable(&paths, 0, "phalcon/Mvc/Router.zep", 918); if (Z_TYPE_P(&paths) == IS_ARRAY) { - ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&paths), _26$$33, _27$$33, _24$$33) + ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&paths), _24$$30, _25$$30, _22$$30) { ZEPHIR_INIT_NVAR(&part); - if (_27$$33 != NULL) { - ZVAL_STR_COPY(&part, _27$$33); + if (_25$$30 != NULL) { + ZVAL_STR_COPY(&part, _25$$30); } else { - ZVAL_LONG(&part, _26$$33); + ZVAL_LONG(&part, _24$$30); } ZEPHIR_INIT_NVAR(&position); - ZVAL_COPY(&position, _24$$33); + ZVAL_COPY(&position, _22$$30); if (UNEXPECTED(Z_TYPE_P(&part) != IS_STRING)) { - ZEPHIR_INIT_NVAR(&_28$$35); - object_init_ex(&_28$$35, phalcon_mvc_router_exception_ce); - ZEPHIR_INIT_NVAR(&_29$$35); - ZEPHIR_CONCAT_SV(&_29$$35, "Wrong key in paths: ", &part); - ZEPHIR_CALL_METHOD(NULL, &_28$$35, "__construct", &_30, 32, &_29$$35); + ZEPHIR_INIT_NVAR(&_26$$32); + object_init_ex(&_26$$32, phalcon_mvc_router_exception_ce); + ZEPHIR_INIT_NVAR(&_27$$32); + ZEPHIR_CONCAT_SV(&_27$$32, "Wrong key in paths: ", &part); + ZEPHIR_CALL_METHOD(NULL, &_26$$32, "__construct", &_28, 32, &_27$$32); zephir_check_call_status(); - zephir_throw_exception_debug(&_28$$35, "phalcon/Mvc/Router.zep", 884); + zephir_throw_exception_debug(&_26$$32, "phalcon/Mvc/Router.zep", 866); ZEPHIR_MM_RESTORE(); return; } - _31$$34 = Z_TYPE_P(&position) != IS_STRING; - if (_31$$34) { - _31$$34 = Z_TYPE_P(&position) != IS_LONG; + _29$$31 = Z_TYPE_P(&position) != IS_STRING; + if (_29$$31) { + _29$$31 = Z_TYPE_P(&position) != IS_LONG; } - if (_31$$34) { + if (_29$$31) { continue; } ZEPHIR_OBS_NVAR(&matchPosition); @@ -1820,13 +1793,13 @@ PHP_METHOD(Phalcon_Mvc_Router, handle) if (Z_TYPE_P(&converters) == IS_ARRAY) { ZEPHIR_OBS_NVAR(&converter); if (zephir_array_isset_fetch(&converter, &converters, &part, 0)) { - ZEPHIR_INIT_NVAR(&_32$$39); - ZEPHIR_INIT_NVAR(&_33$$39); - zephir_create_array(&_33$$39, 1, 0); - zephir_array_fast_append(&_33$$39, &matchPosition); - ZEPHIR_CALL_USER_FUNC_ARRAY(&_32$$39, &converter, &_33$$39); + ZEPHIR_INIT_NVAR(&_30$$36); + ZEPHIR_INIT_NVAR(&_31$$36); + zephir_create_array(&_31$$36, 1, 0); + zephir_array_fast_append(&_31$$36, &matchPosition); + ZEPHIR_CALL_USER_FUNC_ARRAY(&_30$$36, &converter, &_31$$36); zephir_check_call_status(); - zephir_array_update_zval(&parts, &part, &_32$$39, PH_COPY | PH_SEPARATE); + zephir_array_update_zval(&parts, &part, &_30$$36, PH_COPY | PH_SEPARATE); continue; } } @@ -1835,13 +1808,13 @@ PHP_METHOD(Phalcon_Mvc_Router, handle) if (Z_TYPE_P(&converters) == IS_ARRAY) { ZEPHIR_OBS_NVAR(&converter); if (zephir_array_isset_fetch(&converter, &converters, &part, 0)) { - ZEPHIR_INIT_NVAR(&_34$$42); - ZEPHIR_INIT_NVAR(&_35$$42); - zephir_create_array(&_35$$42, 1, 0); - zephir_array_fast_append(&_35$$42, &position); - ZEPHIR_CALL_USER_FUNC_ARRAY(&_34$$42, &converter, &_35$$42); + ZEPHIR_INIT_NVAR(&_32$$39); + ZEPHIR_INIT_NVAR(&_33$$39); + zephir_create_array(&_33$$39, 1, 0); + zephir_array_fast_append(&_33$$39, &position); + ZEPHIR_CALL_USER_FUNC_ARRAY(&_32$$39, &converter, &_33$$39); zephir_check_call_status(); - zephir_array_update_zval(&parts, &part, &_34$$42, PH_COPY | PH_SEPARATE); + zephir_array_update_zval(&parts, &part, &_32$$39, PH_COPY | PH_SEPARATE); } } else { if (Z_TYPE_P(&position) == IS_LONG) { @@ -1854,9 +1827,9 @@ PHP_METHOD(Phalcon_Mvc_Router, handle) ZEPHIR_CALL_METHOD(NULL, &paths, "rewind", NULL, 0); zephir_check_call_status(); while (1) { - ZEPHIR_CALL_METHOD(&_25$$33, &paths, "valid", NULL, 0); + ZEPHIR_CALL_METHOD(&_23$$30, &paths, "valid", NULL, 0); zephir_check_call_status(); - if (!zend_is_true(&_25$$33)) { + if (!zend_is_true(&_23$$30)) { break; } ZEPHIR_CALL_METHOD(&part, &paths, "key", NULL, 0); @@ -1864,21 +1837,21 @@ PHP_METHOD(Phalcon_Mvc_Router, handle) ZEPHIR_CALL_METHOD(&position, &paths, "current", NULL, 0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&part) != IS_STRING)) { - ZEPHIR_INIT_NVAR(&_36$$46); - object_init_ex(&_36$$46, phalcon_mvc_router_exception_ce); - ZEPHIR_INIT_NVAR(&_37$$46); - ZEPHIR_CONCAT_SV(&_37$$46, "Wrong key in paths: ", &part); - ZEPHIR_CALL_METHOD(NULL, &_36$$46, "__construct", &_30, 32, &_37$$46); + ZEPHIR_INIT_NVAR(&_34$$43); + object_init_ex(&_34$$43, phalcon_mvc_router_exception_ce); + ZEPHIR_INIT_NVAR(&_35$$43); + ZEPHIR_CONCAT_SV(&_35$$43, "Wrong key in paths: ", &part); + ZEPHIR_CALL_METHOD(NULL, &_34$$43, "__construct", &_28, 32, &_35$$43); zephir_check_call_status(); - zephir_throw_exception_debug(&_36$$46, "phalcon/Mvc/Router.zep", 884); + zephir_throw_exception_debug(&_34$$43, "phalcon/Mvc/Router.zep", 866); ZEPHIR_MM_RESTORE(); return; } - _38$$45 = Z_TYPE_P(&position) != IS_STRING; - if (_38$$45) { - _38$$45 = Z_TYPE_P(&position) != IS_LONG; + _36$$42 = Z_TYPE_P(&position) != IS_STRING; + if (_36$$42) { + _36$$42 = Z_TYPE_P(&position) != IS_LONG; } - if (_38$$45) { + if (_36$$42) { continue; } ZEPHIR_OBS_NVAR(&matchPosition); @@ -1886,13 +1859,13 @@ PHP_METHOD(Phalcon_Mvc_Router, handle) if (Z_TYPE_P(&converters) == IS_ARRAY) { ZEPHIR_OBS_NVAR(&converter); if (zephir_array_isset_fetch(&converter, &converters, &part, 0)) { - ZEPHIR_INIT_NVAR(&_39$$50); - ZEPHIR_INIT_NVAR(&_40$$50); - zephir_create_array(&_40$$50, 1, 0); - zephir_array_fast_append(&_40$$50, &matchPosition); - ZEPHIR_CALL_USER_FUNC_ARRAY(&_39$$50, &converter, &_40$$50); + ZEPHIR_INIT_NVAR(&_37$$47); + ZEPHIR_INIT_NVAR(&_38$$47); + zephir_create_array(&_38$$47, 1, 0); + zephir_array_fast_append(&_38$$47, &matchPosition); + ZEPHIR_CALL_USER_FUNC_ARRAY(&_37$$47, &converter, &_38$$47); zephir_check_call_status(); - zephir_array_update_zval(&parts, &part, &_39$$50, PH_COPY | PH_SEPARATE); + zephir_array_update_zval(&parts, &part, &_37$$47, PH_COPY | PH_SEPARATE); continue; } } @@ -1901,13 +1874,13 @@ PHP_METHOD(Phalcon_Mvc_Router, handle) if (Z_TYPE_P(&converters) == IS_ARRAY) { ZEPHIR_OBS_NVAR(&converter); if (zephir_array_isset_fetch(&converter, &converters, &part, 0)) { - ZEPHIR_INIT_NVAR(&_41$$53); - ZEPHIR_INIT_NVAR(&_42$$53); - zephir_create_array(&_42$$53, 1, 0); - zephir_array_fast_append(&_42$$53, &position); - ZEPHIR_CALL_USER_FUNC_ARRAY(&_41$$53, &converter, &_42$$53); + ZEPHIR_INIT_NVAR(&_39$$50); + ZEPHIR_INIT_NVAR(&_40$$50); + zephir_create_array(&_40$$50, 1, 0); + zephir_array_fast_append(&_40$$50, &position); + ZEPHIR_CALL_USER_FUNC_ARRAY(&_39$$50, &converter, &_40$$50); zephir_check_call_status(); - zephir_array_update_zval(&parts, &part, &_41$$53, PH_COPY | PH_SEPARATE); + zephir_array_update_zval(&parts, &part, &_39$$50, PH_COPY | PH_SEPARATE); } } else { if (Z_TYPE_P(&position) == IS_LONG) { @@ -1931,9 +1904,9 @@ PHP_METHOD(Phalcon_Mvc_Router, handle) ZEPHIR_CALL_METHOD(NULL, &_4, "rewind", NULL, 0); zephir_check_call_status(); while (1) { - ZEPHIR_CALL_METHOD(&_7, &_4, "valid", NULL, 0); + ZEPHIR_CALL_METHOD(&_9, &_4, "valid", NULL, 0); zephir_check_call_status(); - if (!zend_is_true(&_7)) { + if (!zend_is_true(&_9)) { break; } ZEPHIR_CALL_METHOD(&route, &_4, "current", NULL, 0); @@ -1945,63 +1918,37 @@ PHP_METHOD(Phalcon_Mvc_Router, handle) ZEPHIR_CALL_METHOD(&methods, &route, "gethttpmethods", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&methods) != IS_NULL) { - if (Z_TYPE_P(&request) == IS_NULL) { - zephir_read_property(&_43$$58, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CPY_WRT(&container, &_43$$58); - if (Z_TYPE_P(&container) == IS_NULL) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/Mvc/Router.zep", 739); - return; - } - ZEPHIR_INIT_NVAR(&_45$$58); - ZVAL_STRING(&_45$$58, "request"); - ZEPHIR_CALL_METHOD(&_44$$58, &container, "getshared", NULL, 0, &_45$$58); - zephir_check_call_status(); - ZEPHIR_CPY_WRT(&request, &_44$$58); - } - ZVAL_BOOL(&_47$$57, 1); - ZEPHIR_CALL_METHOD(&_46$$57, &request, "ismethod", NULL, 0, &methods, &_47$$57); + ZVAL_BOOL(&_42$$54, 1); + ZEPHIR_CALL_METHOD(&_41$$54, &request, "ismethod", &_43, 0, &methods, &_42$$54); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(&_46$$57)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(&_41$$54)) { continue; } } ZEPHIR_CALL_METHOD(&hostname, &route, "gethostname", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&hostname) != IS_NULL) { - if (Z_TYPE_P(&request) == IS_NULL) { - zephir_read_property(&_48$$62, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CPY_WRT(&container, &_48$$62); - if (Z_TYPE_P(&container) == IS_NULL) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "A dependency injection container is required to access the 'request' service", "phalcon/Mvc/Router.zep", 766); - return; - } - ZEPHIR_INIT_NVAR(&_50$$62); - ZVAL_STRING(&_50$$62, "request"); - ZEPHIR_CALL_METHOD(&_49$$62, &container, "getshared", NULL, 0, &_50$$62); - zephir_check_call_status(); - ZEPHIR_CPY_WRT(&request, &_49$$62); - } if (Z_TYPE_P(¤tHostName) == IS_NULL) { - ZEPHIR_CALL_METHOD(¤tHostName, &request, "gethttphost", NULL, 0); + ZEPHIR_CALL_METHOD(¤tHostName, &request, "gethttphost", &_44, 0); zephir_check_call_status(); } if (!(zephir_is_true(¤tHostName))) { continue; } - if (zephir_memnstr_str(&hostname, SL("("), "phalcon/Mvc/Router.zep", 790)) { - if (!(zephir_memnstr_str(&hostname, SL("#"), "phalcon/Mvc/Router.zep", 791))) { + if (zephir_memnstr_str(&hostname, SL("("), "phalcon/Mvc/Router.zep", 772)) { + if (!(zephir_memnstr_str(&hostname, SL("#"), "phalcon/Mvc/Router.zep", 773))) { ZEPHIR_INIT_NVAR(®exHostName); ZEPHIR_CONCAT_SV(®exHostName, "#^", &hostname); - if (!(zephir_memnstr_str(&hostname, SL(":"), "phalcon/Mvc/Router.zep", 794))) { + if (!(zephir_memnstr_str(&hostname, SL(":"), "phalcon/Mvc/Router.zep", 776))) { zephir_concat_self_str(®exHostName, SL("(:[[:digit:]]+)?")); } zephir_concat_self_str(®exHostName, SL("$#i")); } else { ZEPHIR_CPY_WRT(®exHostName, &hostname); } - ZEPHIR_INIT_NVAR(&_51$$66); + ZEPHIR_INIT_NVAR(&_45$$59); ZEPHIR_INIT_NVAR(&matched); - zephir_preg_match(&matched, ®exHostName, ¤tHostName, &_51$$66, 0, 0 , 0 ); + zephir_preg_match(&matched, ®exHostName, ¤tHostName, &_45$$59, 0, 0 , 0 ); } else { ZEPHIR_INIT_NVAR(&matched); ZVAL_BOOL(&matched, ZEPHIR_IS_EQUAL(¤tHostName, &hostname)); @@ -2011,14 +1958,14 @@ PHP_METHOD(Phalcon_Mvc_Router, handle) } } if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_NVAR(&_52$$72); - ZVAL_STRING(&_52$$72, "router:beforeCheckRoute"); - ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", &_53, 0, &_52$$72, this_ptr, &route); + ZEPHIR_INIT_NVAR(&_46$$65); + ZVAL_STRING(&_46$$65, "router:beforeCheckRoute"); + ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", &_47, 0, &_46$$65, this_ptr, &route); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(&pattern, &route, "getcompiledpattern", NULL, 0); zephir_check_call_status(); - if (zephir_memnstr_str(&pattern, SL("^"), "phalcon/Mvc/Router.zep", 822)) { + if (zephir_memnstr_str(&pattern, SL("^"), "phalcon/Mvc/Router.zep", 804)) { ZEPHIR_INIT_NVAR(&routeFound); zephir_preg_match(&routeFound, &pattern, &handledUri, &matches, 0, 0 , 0 ); } else { @@ -2027,32 +1974,32 @@ PHP_METHOD(Phalcon_Mvc_Router, handle) } if (zephir_is_true(&routeFound)) { if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_NVAR(&_54$$76); - ZVAL_STRING(&_54$$76, "router:matchedRoute"); - ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", &_55, 0, &_54$$76, this_ptr, &route); + ZEPHIR_INIT_NVAR(&_48$$69); + ZVAL_STRING(&_48$$69, "router:matchedRoute"); + ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", &_49, 0, &_48$$69, this_ptr, &route); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(&beforeMatch, &route, "getbeforematch", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&beforeMatch) != IS_NULL) { if (UNEXPECTED(!(zephir_is_callable(&beforeMatch)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "Before-Match callback is not callable in matched route", "phalcon/Mvc/Router.zep", 844); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "Before-Match callback is not callable in matched route", "phalcon/Mvc/Router.zep", 826); return; } - ZEPHIR_INIT_NVAR(&_56$$77); - zephir_create_array(&_56$$77, 3, 0); - zephir_array_fast_append(&_56$$77, &handledUri); - zephir_array_fast_append(&_56$$77, &route); - zephir_array_fast_append(&_56$$77, this_ptr); + ZEPHIR_INIT_NVAR(&_50$$70); + zephir_create_array(&_50$$70, 3, 0); + zephir_array_fast_append(&_50$$70, &handledUri); + zephir_array_fast_append(&_50$$70, &route); + zephir_array_fast_append(&_50$$70, this_ptr); ZEPHIR_INIT_NVAR(&routeFound); - ZEPHIR_CALL_USER_FUNC_ARRAY(&routeFound, &beforeMatch, &_56$$77); + ZEPHIR_CALL_USER_FUNC_ARRAY(&routeFound, &beforeMatch, &_50$$70); zephir_check_call_status(); } } else { if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_NVAR(&_57$$80); - ZVAL_STRING(&_57$$80, "router:notMatchedRoute"); - ZEPHIR_CALL_METHOD(&routeFound, &eventsManager, "fire", &_58, 0, &_57$$80, this_ptr, &route); + ZEPHIR_INIT_NVAR(&_51$$73); + ZVAL_STRING(&_51$$73, "router:notMatchedRoute"); + ZEPHIR_CALL_METHOD(&routeFound, &eventsManager, "fire", &_52, 0, &_51$$73, this_ptr, &route); zephir_check_call_status(); } } @@ -2063,34 +2010,34 @@ PHP_METHOD(Phalcon_Mvc_Router, handle) if (Z_TYPE_P(&matches) == IS_ARRAY) { ZEPHIR_CALL_METHOD(&converters, &route, "getconverters", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&paths, 0, "phalcon/Mvc/Router.zep", 936); + zephir_is_iterable(&paths, 0, "phalcon/Mvc/Router.zep", 918); if (Z_TYPE_P(&paths) == IS_ARRAY) { - ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&paths), _61$$82, _62$$82, _59$$82) + ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&paths), _55$$75, _56$$75, _53$$75) { ZEPHIR_INIT_NVAR(&part); - if (_62$$82 != NULL) { - ZVAL_STR_COPY(&part, _62$$82); + if (_56$$75 != NULL) { + ZVAL_STR_COPY(&part, _56$$75); } else { - ZVAL_LONG(&part, _61$$82); + ZVAL_LONG(&part, _55$$75); } ZEPHIR_INIT_NVAR(&position); - ZVAL_COPY(&position, _59$$82); + ZVAL_COPY(&position, _53$$75); if (UNEXPECTED(Z_TYPE_P(&part) != IS_STRING)) { - ZEPHIR_INIT_NVAR(&_63$$84); - object_init_ex(&_63$$84, phalcon_mvc_router_exception_ce); - ZEPHIR_INIT_NVAR(&_64$$84); - ZEPHIR_CONCAT_SV(&_64$$84, "Wrong key in paths: ", &part); - ZEPHIR_CALL_METHOD(NULL, &_63$$84, "__construct", &_30, 32, &_64$$84); + ZEPHIR_INIT_NVAR(&_57$$77); + object_init_ex(&_57$$77, phalcon_mvc_router_exception_ce); + ZEPHIR_INIT_NVAR(&_58$$77); + ZEPHIR_CONCAT_SV(&_58$$77, "Wrong key in paths: ", &part); + ZEPHIR_CALL_METHOD(NULL, &_57$$77, "__construct", &_28, 32, &_58$$77); zephir_check_call_status(); - zephir_throw_exception_debug(&_63$$84, "phalcon/Mvc/Router.zep", 884); + zephir_throw_exception_debug(&_57$$77, "phalcon/Mvc/Router.zep", 866); ZEPHIR_MM_RESTORE(); return; } - _65$$83 = Z_TYPE_P(&position) != IS_STRING; - if (_65$$83) { - _65$$83 = Z_TYPE_P(&position) != IS_LONG; + _59$$76 = Z_TYPE_P(&position) != IS_STRING; + if (_59$$76) { + _59$$76 = Z_TYPE_P(&position) != IS_LONG; } - if (_65$$83) { + if (_59$$76) { continue; } ZEPHIR_OBS_NVAR(&matchPosition); @@ -2098,13 +2045,13 @@ PHP_METHOD(Phalcon_Mvc_Router, handle) if (Z_TYPE_P(&converters) == IS_ARRAY) { ZEPHIR_OBS_NVAR(&converter); if (zephir_array_isset_fetch(&converter, &converters, &part, 0)) { - ZEPHIR_INIT_NVAR(&_66$$88); - ZEPHIR_INIT_NVAR(&_67$$88); - zephir_create_array(&_67$$88, 1, 0); - zephir_array_fast_append(&_67$$88, &matchPosition); - ZEPHIR_CALL_USER_FUNC_ARRAY(&_66$$88, &converter, &_67$$88); + ZEPHIR_INIT_NVAR(&_60$$81); + ZEPHIR_INIT_NVAR(&_61$$81); + zephir_create_array(&_61$$81, 1, 0); + zephir_array_fast_append(&_61$$81, &matchPosition); + ZEPHIR_CALL_USER_FUNC_ARRAY(&_60$$81, &converter, &_61$$81); zephir_check_call_status(); - zephir_array_update_zval(&parts, &part, &_66$$88, PH_COPY | PH_SEPARATE); + zephir_array_update_zval(&parts, &part, &_60$$81, PH_COPY | PH_SEPARATE); continue; } } @@ -2113,13 +2060,13 @@ PHP_METHOD(Phalcon_Mvc_Router, handle) if (Z_TYPE_P(&converters) == IS_ARRAY) { ZEPHIR_OBS_NVAR(&converter); if (zephir_array_isset_fetch(&converter, &converters, &part, 0)) { - ZEPHIR_INIT_NVAR(&_68$$91); - ZEPHIR_INIT_NVAR(&_69$$91); - zephir_create_array(&_69$$91, 1, 0); - zephir_array_fast_append(&_69$$91, &position); - ZEPHIR_CALL_USER_FUNC_ARRAY(&_68$$91, &converter, &_69$$91); + ZEPHIR_INIT_NVAR(&_62$$84); + ZEPHIR_INIT_NVAR(&_63$$84); + zephir_create_array(&_63$$84, 1, 0); + zephir_array_fast_append(&_63$$84, &position); + ZEPHIR_CALL_USER_FUNC_ARRAY(&_62$$84, &converter, &_63$$84); zephir_check_call_status(); - zephir_array_update_zval(&parts, &part, &_68$$91, PH_COPY | PH_SEPARATE); + zephir_array_update_zval(&parts, &part, &_62$$84, PH_COPY | PH_SEPARATE); } } else { if (Z_TYPE_P(&position) == IS_LONG) { @@ -2132,9 +2079,9 @@ PHP_METHOD(Phalcon_Mvc_Router, handle) ZEPHIR_CALL_METHOD(NULL, &paths, "rewind", NULL, 0); zephir_check_call_status(); while (1) { - ZEPHIR_CALL_METHOD(&_60$$82, &paths, "valid", NULL, 0); + ZEPHIR_CALL_METHOD(&_54$$75, &paths, "valid", NULL, 0); zephir_check_call_status(); - if (!zend_is_true(&_60$$82)) { + if (!zend_is_true(&_54$$75)) { break; } ZEPHIR_CALL_METHOD(&part, &paths, "key", NULL, 0); @@ -2142,21 +2089,21 @@ PHP_METHOD(Phalcon_Mvc_Router, handle) ZEPHIR_CALL_METHOD(&position, &paths, "current", NULL, 0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&part) != IS_STRING)) { - ZEPHIR_INIT_NVAR(&_70$$95); - object_init_ex(&_70$$95, phalcon_mvc_router_exception_ce); - ZEPHIR_INIT_NVAR(&_71$$95); - ZEPHIR_CONCAT_SV(&_71$$95, "Wrong key in paths: ", &part); - ZEPHIR_CALL_METHOD(NULL, &_70$$95, "__construct", &_30, 32, &_71$$95); + ZEPHIR_INIT_NVAR(&_64$$88); + object_init_ex(&_64$$88, phalcon_mvc_router_exception_ce); + ZEPHIR_INIT_NVAR(&_65$$88); + ZEPHIR_CONCAT_SV(&_65$$88, "Wrong key in paths: ", &part); + ZEPHIR_CALL_METHOD(NULL, &_64$$88, "__construct", &_28, 32, &_65$$88); zephir_check_call_status(); - zephir_throw_exception_debug(&_70$$95, "phalcon/Mvc/Router.zep", 884); + zephir_throw_exception_debug(&_64$$88, "phalcon/Mvc/Router.zep", 866); ZEPHIR_MM_RESTORE(); return; } - _72$$94 = Z_TYPE_P(&position) != IS_STRING; - if (_72$$94) { - _72$$94 = Z_TYPE_P(&position) != IS_LONG; + _66$$87 = Z_TYPE_P(&position) != IS_STRING; + if (_66$$87) { + _66$$87 = Z_TYPE_P(&position) != IS_LONG; } - if (_72$$94) { + if (_66$$87) { continue; } ZEPHIR_OBS_NVAR(&matchPosition); @@ -2164,13 +2111,13 @@ PHP_METHOD(Phalcon_Mvc_Router, handle) if (Z_TYPE_P(&converters) == IS_ARRAY) { ZEPHIR_OBS_NVAR(&converter); if (zephir_array_isset_fetch(&converter, &converters, &part, 0)) { - ZEPHIR_INIT_NVAR(&_73$$99); - ZEPHIR_INIT_NVAR(&_74$$99); - zephir_create_array(&_74$$99, 1, 0); - zephir_array_fast_append(&_74$$99, &matchPosition); - ZEPHIR_CALL_USER_FUNC_ARRAY(&_73$$99, &converter, &_74$$99); + ZEPHIR_INIT_NVAR(&_67$$92); + ZEPHIR_INIT_NVAR(&_68$$92); + zephir_create_array(&_68$$92, 1, 0); + zephir_array_fast_append(&_68$$92, &matchPosition); + ZEPHIR_CALL_USER_FUNC_ARRAY(&_67$$92, &converter, &_68$$92); zephir_check_call_status(); - zephir_array_update_zval(&parts, &part, &_73$$99, PH_COPY | PH_SEPARATE); + zephir_array_update_zval(&parts, &part, &_67$$92, PH_COPY | PH_SEPARATE); continue; } } @@ -2179,13 +2126,13 @@ PHP_METHOD(Phalcon_Mvc_Router, handle) if (Z_TYPE_P(&converters) == IS_ARRAY) { ZEPHIR_OBS_NVAR(&converter); if (zephir_array_isset_fetch(&converter, &converters, &part, 0)) { - ZEPHIR_INIT_NVAR(&_75$$102); - ZEPHIR_INIT_NVAR(&_76$$102); - zephir_create_array(&_76$$102, 1, 0); - zephir_array_fast_append(&_76$$102, &position); - ZEPHIR_CALL_USER_FUNC_ARRAY(&_75$$102, &converter, &_76$$102); + ZEPHIR_INIT_NVAR(&_69$$95); + ZEPHIR_INIT_NVAR(&_70$$95); + zephir_create_array(&_70$$95, 1, 0); + zephir_array_fast_append(&_70$$95, &position); + ZEPHIR_CALL_USER_FUNC_ARRAY(&_69$$95, &converter, &_70$$95); zephir_check_call_status(); - zephir_array_update_zval(&parts, &part, &_75$$102, PH_COPY | PH_SEPARATE); + zephir_array_update_zval(&parts, &part, &_69$$95, PH_COPY | PH_SEPARATE); } } else { if (Z_TYPE_P(&position) == IS_LONG) { @@ -2223,25 +2170,25 @@ PHP_METHOD(Phalcon_Mvc_Router, handle) } } if (!(zephir_is_true(&routeFound))) { - zephir_read_property(&_77$$107, this_ptr, ZEND_STRL("notFoundPaths"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CPY_WRT(¬FoundPaths, &_77$$107); + zephir_read_property(&_71$$100, this_ptr, ZEND_STRL("notFoundPaths"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CPY_WRT(¬FoundPaths, &_71$$100); if (Z_TYPE_P(¬FoundPaths) != IS_NULL) { - ZEPHIR_CALL_CE_STATIC(&parts, phalcon_mvc_router_route_ce, "getroutepaths", &_78, 0, ¬FoundPaths); + ZEPHIR_CALL_CE_STATIC(&parts, phalcon_mvc_router_route_ce, "getroutepaths", &_72, 0, ¬FoundPaths); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&routeFound); ZVAL_BOOL(&routeFound, 1); } } - zephir_read_property(&_79, this_ptr, ZEND_STRL("defaultNamespace"), PH_NOISY_CC | PH_READONLY); - zephir_update_property_zval(this_ptr, ZEND_STRL("namespaceName"), &_79); - zephir_read_property(&_80, this_ptr, ZEND_STRL("defaultModule"), PH_NOISY_CC | PH_READONLY); - zephir_update_property_zval(this_ptr, ZEND_STRL("module"), &_80); - zephir_read_property(&_81, this_ptr, ZEND_STRL("defaultController"), PH_NOISY_CC | PH_READONLY); - zephir_update_property_zval(this_ptr, ZEND_STRL("controller"), &_81); - zephir_read_property(&_82, this_ptr, ZEND_STRL("defaultAction"), PH_NOISY_CC | PH_READONLY); - zephir_update_property_zval(this_ptr, ZEND_STRL("action"), &_82); - zephir_read_property(&_83, this_ptr, ZEND_STRL("defaultParams"), PH_NOISY_CC | PH_READONLY); - zephir_update_property_zval(this_ptr, ZEND_STRL("params"), &_83); + zephir_read_property(&_73, this_ptr, ZEND_STRL("defaultNamespace"), PH_NOISY_CC | PH_READONLY); + zephir_update_property_zval(this_ptr, ZEND_STRL("namespaceName"), &_73); + zephir_read_property(&_74, this_ptr, ZEND_STRL("defaultModule"), PH_NOISY_CC | PH_READONLY); + zephir_update_property_zval(this_ptr, ZEND_STRL("module"), &_74); + zephir_read_property(&_75, this_ptr, ZEND_STRL("defaultController"), PH_NOISY_CC | PH_READONLY); + zephir_update_property_zval(this_ptr, ZEND_STRL("controller"), &_75); + zephir_read_property(&_76, this_ptr, ZEND_STRL("defaultAction"), PH_NOISY_CC | PH_READONLY); + zephir_update_property_zval(this_ptr, ZEND_STRL("action"), &_76); + zephir_read_property(&_77, this_ptr, ZEND_STRL("defaultParams"), PH_NOISY_CC | PH_READONLY); + zephir_update_property_zval(this_ptr, ZEND_STRL("params"), &_77); if (zephir_is_true(&routeFound)) { ZEPHIR_OBS_VAR(&vnamespace); if (zephir_array_isset_string_fetch(&vnamespace, &parts, SL("namespace"), 0)) { @@ -2266,10 +2213,10 @@ PHP_METHOD(Phalcon_Mvc_Router, handle) ZEPHIR_OBS_VAR(¶msStr); if (zephir_array_isset_string_fetch(¶msStr, &parts, SL("params"), 0)) { if (Z_TYPE_P(¶msStr) == IS_STRING) { - ZEPHIR_INIT_VAR(&_84$$115); - ZVAL_STRING(&_84$$115, "/"); + ZEPHIR_INIT_VAR(&_78$$108); + ZVAL_STRING(&_78$$108, "/"); ZEPHIR_INIT_VAR(&strParams); - zephir_fast_trim(&strParams, ¶msStr, &_84$$115, ZEPHIR_TRIM_BOTH); + zephir_fast_trim(&strParams, ¶msStr, &_78$$108, ZEPHIR_TRIM_BOTH); if (!ZEPHIR_IS_STRING_IDENTICAL(&strParams, "")) { ZEPHIR_INIT_NVAR(¶ms); zephir_fast_explode_str(¶ms, SL("/"), &strParams, LONG_MAX); @@ -2278,17 +2225,17 @@ PHP_METHOD(Phalcon_Mvc_Router, handle) zephir_array_unset_string(&parts, SL("params"), PH_SEPARATE); } if (zephir_fast_count_int(¶ms)) { - ZEPHIR_INIT_VAR(&_85$$117); - zephir_fast_array_merge(&_85$$117, ¶ms, &parts); - zephir_update_property_zval(this_ptr, ZEND_STRL("params"), &_85$$117); + ZEPHIR_INIT_VAR(&_79$$110); + zephir_fast_array_merge(&_79$$110, ¶ms, &parts); + zephir_update_property_zval(this_ptr, ZEND_STRL("params"), &_79$$110); } else { zephir_update_property_zval(this_ptr, ZEND_STRL("params"), &parts); } } if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_VAR(&_86$$119); - ZVAL_STRING(&_86$$119, "router:afterCheckRoutes"); - ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_86$$119, this_ptr); + ZEPHIR_INIT_VAR(&_80$$112); + ZVAL_STRING(&_80$$112, "router:afterCheckRoutes"); + ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_80$$112, this_ptr); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -2355,13 +2302,13 @@ PHP_METHOD(Phalcon_Mvc_Router, mount) ZEPHIR_CALL_METHOD(&groupRoutes, group, "getroutes", NULL, 0); zephir_check_call_status(); if (UNEXPECTED(!(zephir_fast_count_int(&groupRoutes)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "The group of routes does not contain any routes", "phalcon/Mvc/Router.zep", 1069); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_router_exception_ce, "The group of routes does not contain any routes", "phalcon/Mvc/Router.zep", 1051); return; } ZEPHIR_CALL_METHOD(&beforeMatch, group, "getbeforematch", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&beforeMatch) != IS_NULL) { - zephir_is_iterable(&groupRoutes, 0, "phalcon/Mvc/Router.zep", 1081); + zephir_is_iterable(&groupRoutes, 0, "phalcon/Mvc/Router.zep", 1063); if (Z_TYPE_P(&groupRoutes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&groupRoutes), _2$$5) { @@ -2392,7 +2339,7 @@ PHP_METHOD(Phalcon_Mvc_Router, mount) ZEPHIR_CALL_METHOD(&hostname, group, "gethostname", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&hostname) != IS_NULL) { - zephir_is_iterable(&groupRoutes, 0, "phalcon/Mvc/Router.zep", 1090); + zephir_is_iterable(&groupRoutes, 0, "phalcon/Mvc/Router.zep", 1072); if (Z_TYPE_P(&groupRoutes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&groupRoutes), _4$$8) { @@ -2459,7 +2406,7 @@ PHP_METHOD(Phalcon_Mvc_Router, notFound) _0 = Z_TYPE_P(paths) != IS_STRING; } if (UNEXPECTED(_0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_router_exception_ce, "The not-found paths must be an array or string", "phalcon/Mvc/Router.zep", 1112); + ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_router_exception_ce, "The not-found paths must be an array or string", "phalcon/Mvc/Router.zep", 1094); return; } zephir_update_property_zval(this_ptr, ZEND_STRL("notFoundPaths"), paths); diff --git a/ext/phalcon/mvc/router/annotations.zep.c b/ext/phalcon/mvc/router/annotations.zep.c index a444a70d9a4..132872e6249 100644 --- a/ext/phalcon/mvc/router/annotations.zep.c +++ b/ext/phalcon/mvc/router/annotations.zep.c @@ -342,7 +342,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) object_init_ex(&route, phalcon_mvc_router_route_ce); ZEPHIR_CALL_METHOD(NULL, &route, "__construct", &_4, 100, &prefix); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_5$$6, &route, "getcompiledpattern", &_6, 487); + ZEPHIR_CALL_METHOD(&_5$$6, &route, "getcompiledpattern", &_6, 488); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_7$$6); ZVAL_STRING(&_7$$6, "$#"); @@ -556,7 +556,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) object_init_ex(&route, phalcon_mvc_router_route_ce); ZEPHIR_CALL_METHOD(NULL, &route, "__construct", &_4, 100, &prefix); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_28$$29, &route, "getcompiledpattern", &_6, 487); + ZEPHIR_CALL_METHOD(&_28$$29, &route, "getcompiledpattern", &_6, 488); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_29$$29); ZVAL_STRING(&_29$$29, "$#"); diff --git a/ext/phalcon/mvc/router/group.zep.c b/ext/phalcon/mvc/router/group.zep.c index 0d2f5fe3f1d..8152b64020a 100644 --- a/ext/phalcon/mvc/router/group.zep.c +++ b/ext/phalcon/mvc/router/group.zep.c @@ -1104,7 +1104,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Group, addRoute) ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 100, &_2, &mergedPaths, httpMethods); zephir_check_call_status(); zephir_update_property_array_append(this_ptr, SL("routes"), &route); - ZEPHIR_CALL_METHOD(NULL, &route, "setgroup", NULL, 488, this_ptr); + ZEPHIR_CALL_METHOD(NULL, &route, "setgroup", NULL, 489, this_ptr); zephir_check_call_status(); RETURN_CCTOR(&route); } diff --git a/ext/phalcon/mvc/router/route.zep.c b/ext/phalcon/mvc/router/route.zep.c index 64a7d502185..ff891df3584 100644 --- a/ext/phalcon/mvc/router/route.zep.c +++ b/ext/phalcon/mvc/router/route.zep.c @@ -61,9 +61,9 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Router_Route) */ zend_declare_property_null(phalcon_mvc_router_route_ce, SL("hostname"), ZEND_ACC_PROTECTED); /** - * @var string|null + * @var string */ - zend_declare_property_null(phalcon_mvc_router_route_ce, SL("id"), ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_mvc_router_route_ce, SL("id"), "", ZEND_ACC_PROTECTED); /** * @var array|string */ @@ -102,10 +102,11 @@ PHP_METHOD(Phalcon_Mvc_Router_Route, __construct) zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zval *pattern_param = NULL, *paths = NULL, paths_sub, *httpMethods = NULL, httpMethods_sub, __$null, routeId, uniqueId, _0; - zval pattern; + zval pattern, _1; zval *this_ptr = getThis(); ZVAL_UNDEF(&pattern); + ZVAL_UNDEF(&_1); ZVAL_UNDEF(&paths_sub); ZVAL_UNDEF(&httpMethods_sub); ZVAL_NULL(&__$null); @@ -152,7 +153,8 @@ PHP_METHOD(Phalcon_Mvc_Router_Route, __construct) zephir_read_static_property_ce(&_0, phalcon_mvc_router_route_ce, SL("uniqueId"), PH_NOISY_CC); ZEPHIR_CPY_WRT(&uniqueId, &_0); ZEPHIR_CPY_WRT(&routeId, &uniqueId); - zephir_update_property_zval(this_ptr, ZEND_STRL("id"), &routeId); + zephir_cast_to_string(&_1, &routeId); + zephir_update_property_zval(this_ptr, ZEND_STRL("id"), &_1); ZEPHIR_INIT_ZVAL_NREF(_0); ZVAL_LONG(&_0, (zephir_get_numberval(&uniqueId) + 1)); zephir_update_static_property_ce(phalcon_mvc_router_route_ce, ZEND_STRL("uniqueId"), &_0); @@ -684,7 +686,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Route, getHostname) } /** - * @return string | null + * @return string */ PHP_METHOD(Phalcon_Mvc_Router_Route, getId) { diff --git a/ext/phalcon/mvc/router/route.zep.h b/ext/phalcon/mvc/router/route.zep.h index e7f56808098..2c8c362178a 100644 --- a/ext/phalcon/mvc/router/route.zep.h +++ b/ext/phalcon/mvc/router/route.zep.h @@ -73,7 +73,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_router_route_gethostname, 0, 0, IS_STRING, 1) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_router_route_getid, 0, 0, IS_STRING, 1) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_router_route_getid, 0, 0, IS_STRING, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_router_route_getmatch, 0, 0, 0) diff --git a/ext/phalcon/mvc/url.zep.c b/ext/phalcon/mvc/url.zep.c index 2e6bf472211..c8818a24f55 100644 --- a/ext/phalcon/mvc/url.zep.c +++ b/ext/phalcon/mvc/url.zep.c @@ -309,7 +309,7 @@ PHP_METHOD(Phalcon_Mvc_Url, get) zephir_check_call_status(); } if (zephir_is_true(args)) { - ZEPHIR_CALL_FUNCTION(&queryString, "http_build_query", NULL, 489, args); + ZEPHIR_CALL_FUNCTION(&queryString, "http_build_query", NULL, 490, args); zephir_check_call_status(); _20$$16 = Z_TYPE_P(&queryString) == IS_STRING; if (_20$$16) { diff --git a/ext/phalcon/mvc/view.zep.c b/ext/phalcon/mvc/view.zep.c index ed21245c4b1..9408c9b711d 100644 --- a/ext/phalcon/mvc/view.zep.c +++ b/ext/phalcon/mvc/view.zep.c @@ -522,7 +522,7 @@ PHP_METHOD(Phalcon_Mvc_View, finish) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 490); + ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 491); zephir_check_call_status(); RETURN_THIS(); } @@ -1972,7 +1972,7 @@ PHP_METHOD(Phalcon_Mvc_View, setViewsDir) return; } if (Z_TYPE_P(viewsDir) == IS_STRING) { - ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "getdirseparator", NULL, 491, viewsDir); + ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "getdirseparator", NULL, 492, viewsDir); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("viewsDirs"), &_1$$4); } else { @@ -1994,7 +1994,7 @@ PHP_METHOD(Phalcon_Mvc_View, setViewsDir) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Views directory item must be a string", "phalcon/Mvc/View.zep", 994); return; } - ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "getdirseparator", NULL, 491, &directory); + ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "getdirseparator", NULL, 492, &directory); zephir_check_call_status(); zephir_array_update_zval(&newViewsDir, &position, &_6$$6, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -2015,7 +2015,7 @@ PHP_METHOD(Phalcon_Mvc_View, setViewsDir) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Views directory item must be a string", "phalcon/Mvc/View.zep", 994); return; } - ZEPHIR_CALL_METHOD(&_7$$8, this_ptr, "getdirseparator", NULL, 491, &directory); + ZEPHIR_CALL_METHOD(&_7$$8, this_ptr, "getdirseparator", NULL, 492, &directory); zephir_check_call_status(); zephir_array_update_zval(&newViewsDir, &position, &_7$$8, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, viewsDir, "next", NULL, 0); @@ -2218,7 +2218,7 @@ PHP_METHOD(Phalcon_Mvc_View, engineRender) { ZEPHIR_INIT_NVAR(&viewsDir); ZVAL_COPY(&viewsDir, _2); - ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "isabsolutepath", &_5, 492, &viewPath); + ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "isabsolutepath", &_5, 493, &viewPath); zephir_check_call_status(); if (!(zephir_is_true(&_4$$3))) { ZEPHIR_INIT_NVAR(&viewsDirPath); @@ -2334,7 +2334,7 @@ PHP_METHOD(Phalcon_Mvc_View, engineRender) } ZEPHIR_CALL_METHOD(&viewsDir, &_1, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_24$$16, this_ptr, "isabsolutepath", &_5, 492, &viewPath); + ZEPHIR_CALL_METHOD(&_24$$16, this_ptr, "isabsolutepath", &_5, 493, &viewPath); zephir_check_call_status(); if (!(zephir_is_true(&_24$$16))) { ZEPHIR_INIT_NVAR(&viewsDirPath); @@ -2565,7 +2565,7 @@ PHP_METHOD(Phalcon_Mvc_View, loadTemplateEngines) if (ZEPHIR_IS_EMPTY(®isteredEngines)) { ZEPHIR_INIT_VAR(&_2$$4); object_init_ex(&_2$$4, phalcon_mvc_view_engine_php_ce); - ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 493, this_ptr, &di); + ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 494, this_ptr, &di); zephir_check_call_status(); zephir_array_update_string(&engines, SL(".phtml"), &_2$$4, PH_COPY | PH_SEPARATE); } else { @@ -2780,7 +2780,7 @@ PHP_METHOD(Phalcon_Mvc_View, processRender) zephir_update_property_zval(this_ptr, ZEND_STRL("currentRenderLevel"), &_0); zephir_read_property(&_0, this_ptr, ZEND_STRL("disabled"), PH_NOISY_CC | PH_READONLY); if (!ZEPHIR_IS_FALSE_IDENTICAL(&_0)) { - ZEPHIR_CALL_FUNCTION(&_1$$3, "ob_get_contents", NULL, 494); + ZEPHIR_CALL_FUNCTION(&_1$$3, "ob_get_contents", NULL, 495); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("content"), &_1$$3); RETURN_MM_BOOL(0); @@ -2838,7 +2838,7 @@ PHP_METHOD(Phalcon_Mvc_View, processRender) RETURN_MM_BOOL(0); } } - ZEPHIR_CALL_FUNCTION(&_8, "ob_get_contents", NULL, 494); + ZEPHIR_CALL_FUNCTION(&_8, "ob_get_contents", NULL, 495); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("content"), &_8); silence = 1; diff --git a/ext/phalcon/mvc/view/engine/php.zep.c b/ext/phalcon/mvc/view/engine/php.zep.c index 3389e387fb5..018257d5f2f 100644 --- a/ext/phalcon/mvc/view/engine/php.zep.c +++ b/ext/phalcon/mvc/view/engine/php.zep.c @@ -92,7 +92,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Php, render) if (mustClean) { - ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 495); + ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 496); zephir_check_call_status(); } if (Z_TYPE_P(params) == IS_ARRAY) { @@ -142,7 +142,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Php, render) } if (mustClean) { zephir_read_property(&_6$$7, this_ptr, ZEND_STRL("view"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_7$$7, "ob_get_contents", NULL, 494); + ZEPHIR_CALL_FUNCTION(&_7$$7, "ob_get_contents", NULL, 495); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_6$$7, "setcontent", NULL, 0, &_7$$7); zephir_check_call_status(); diff --git a/ext/phalcon/mvc/view/engine/volt.zep.c b/ext/phalcon/mvc/view/engine/volt.zep.c index 416e1c0c1cd..fd6c193902f 100644 --- a/ext/phalcon/mvc/view/engine/volt.zep.c +++ b/ext/phalcon/mvc/view/engine/volt.zep.c @@ -186,7 +186,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, convertEncoding) _0 = ZEPHIR_IS_STRING_IDENTICAL(&to, "utf8"); } if (_0) { - ZEPHIR_RETURN_CALL_FUNCTION("utf8_encode", NULL, 496, &text); + ZEPHIR_RETURN_CALL_FUNCTION("utf8_encode", NULL, 497, &text); zephir_check_call_status(); RETURN_MM(); } @@ -236,18 +236,18 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, getCompiler) ZEPHIR_INIT_NVAR(&compiler); object_init_ex(&compiler, phalcon_mvc_view_engine_volt_compiler_ce); zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("view"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(NULL, &compiler, "__construct", NULL, 497, &_1$$3); + ZEPHIR_CALL_METHOD(NULL, &compiler, "__construct", NULL, 498, &_1$$3); zephir_check_call_status(); zephir_read_property(&_2$$3, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&container, &_2$$3); if (Z_TYPE_P(&container) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(NULL, &compiler, "setdi", NULL, 498, &container); + ZEPHIR_CALL_METHOD(NULL, &compiler, "setdi", NULL, 499, &container); zephir_check_call_status(); } zephir_read_property(&_2$$3, this_ptr, ZEND_STRL("options"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&options, &_2$$3); if (Z_TYPE_P(&options) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(NULL, &compiler, "setoptions", NULL, 499, &options); + ZEPHIR_CALL_METHOD(NULL, &compiler, "setoptions", NULL, 500, &options); zephir_check_call_status(); } zephir_update_property_zval(this_ptr, ZEND_STRL("compiler"), &compiler); @@ -470,7 +470,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, preload) zephir_fast_str_replace(&_5$$5, &_6$$5, &_7$$5, &href); ZEPHIR_INIT_VAR(&_8$$5); ZVAL_STRING(&_8$$5, "preload"); - ZEPHIR_CALL_METHOD(NULL, &link, "__construct", NULL, 500, &_8$$5, &_5$$5, &attributes); + ZEPHIR_CALL_METHOD(NULL, &link, "__construct", NULL, 501, &_8$$5, &_5$$5, &attributes); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_8$$5); object_init_ex(&_8$$5, phalcon_html_link_serializer_header_ce); @@ -482,7 +482,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, preload) ZEPHIR_INIT_VAR(&_10$$5); zephir_create_array(&_10$$5, 1, 0); zephir_array_fast_append(&_10$$5, &link); - ZEPHIR_CALL_METHOD(&_9$$5, &_8$$5, "serialize", NULL, 501, &_10$$5); + ZEPHIR_CALL_METHOD(&_9$$5, &_8$$5, "serialize", NULL, 502, &_10$$5); zephir_check_call_status(); ZEPHIR_INIT_VAR(&header); ZEPHIR_CONCAT_SV(&header, "Link: ", &_9$$5); @@ -559,7 +559,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, render) if (mustClean) { - ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 495); + ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 496); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(&compiler, this_ptr, "getcompiler", NULL, 0); @@ -635,7 +635,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, render) } if (mustClean) { zephir_read_property(&_11$$11, this_ptr, ZEND_STRL("view"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_12$$11, "ob_get_contents", NULL, 494); + ZEPHIR_CALL_FUNCTION(&_12$$11, "ob_get_contents", NULL, 495); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_11$$11, "setcontent", NULL, 0, &_12$$11); zephir_check_call_status(); @@ -792,7 +792,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, slice) } if (Z_TYPE_P(value) == IS_ARRAY) { ZVAL_LONG(&_5$$9, start); - ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 502, value, &_5$$9, &length); + ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 503, value, &_5$$9, &length); zephir_check_call_status(); RETURN_MM(); } @@ -844,7 +844,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, sort) ZEPHIR_MAKE_REF(&value); - ZEPHIR_CALL_FUNCTION(NULL, "asort", NULL, 503, &value); + ZEPHIR_CALL_FUNCTION(NULL, "asort", NULL, 504, &value); ZEPHIR_UNREF(&value); zephir_check_call_status(); RETURN_CTOR(&value); diff --git a/ext/phalcon/mvc/view/engine/volt/compiler.zep.c b/ext/phalcon/mvc/view/engine/volt/compiler.zep.c index da61cdc2fe2..13bfb6a3ebd 100644 --- a/ext/phalcon/mvc/view/engine/volt/compiler.zep.c +++ b/ext/phalcon/mvc/view/engine/volt/compiler.zep.c @@ -385,7 +385,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, attributeReader) } } } else { - ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", NULL, 504, &left); + ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", NULL, 505, &left); zephir_check_call_status(); ZEPHIR_OBS_VAR(&leftType); zephir_array_fetch_string(&leftType, &left, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 244); @@ -407,7 +407,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, attributeReader) zephir_array_fetch_string(&_11$$11, &right, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 258); zephir_concat_self(&exprCode, &_11$$11); } else { - ZEPHIR_CALL_METHOD(&_12$$12, this_ptr, "expression", NULL, 504, &right); + ZEPHIR_CALL_METHOD(&_12$$12, this_ptr, "expression", NULL, 505, &right); zephir_check_call_status(); zephir_concat_self(&exprCode, &_12$$12); } @@ -679,7 +679,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compile) object_init_ex(&_17$$35, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_18$$35); ZEPHIR_CONCAT_SVS(&_18$$35, "Extends compilation file ", &compiledTemplatePath, " could not be opened"); - ZEPHIR_CALL_METHOD(NULL, &_17$$35, "__construct", NULL, 505, &_18$$35); + ZEPHIR_CALL_METHOD(NULL, &_17$$35, "__construct", NULL, 506, &_18$$35); zephir_check_call_status(); zephir_throw_exception_debug(&_17$$35, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 478); ZEPHIR_MM_RESTORE(); @@ -752,7 +752,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileAutoEscape) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_CALL_METHOD(&compilation, this_ptr, "statementlist", NULL, 506, &_0, &_1); + ZEPHIR_CALL_METHOD(&compilation, this_ptr, "statementlist", NULL, 507, &_0, &_1); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("autoescape"), &oldAutoescape); RETURN_CCTOR(&compilation); @@ -841,13 +841,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileCase) object_init_ex(&_0$$4, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$4); ZVAL_STRING(&_1$$4, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 505, &_1$$4, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 506, &_1$$4, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$4, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 568); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 504, &expr); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 505, &expr); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, ""); RETURN_MM(); @@ -889,7 +889,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileDo) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 592); return; } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 504, &expr); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 505, &expr); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, ""); RETURN_MM(); @@ -941,21 +941,21 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileEcho) object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 505, &_1$$3, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 506, &_1$$3, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 616); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 504, &expr); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 505, &expr); zephir_check_call_status(); zephir_array_fetch_string(&_2, &expr, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 624); if (ZEPHIR_IS_LONG(&_2, 350)) { - ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "istagfactory", NULL, 507, &expr); + ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "istagfactory", NULL, 508, &expr); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_3$$4)) { ZVAL_BOOL(&_4$$5, 1); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 504, &expr, &_4$$5); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 505, &expr, &_4$$5); zephir_check_call_status(); } zephir_array_fetch_string(&name, &expr, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 629); @@ -1015,13 +1015,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileElseIf) object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 505, &_1$$3, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 506, &_1$$3, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 666); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 504, &expr); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 505, &expr); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, ""); RETURN_MM(); @@ -1111,7 +1111,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileFile) object_init_ex(&_0$$4, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$4); ZEPHIR_CONCAT_SVS(&_1$$4, "Template file ", &path, " does not exist"); - ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 505, &_1$$4); + ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 506, &_1$$4); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$4, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 706); ZEPHIR_MM_RESTORE(); @@ -1124,7 +1124,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileFile) object_init_ex(&_2$$5, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_3$$5); ZEPHIR_CONCAT_SVS(&_3$$5, "Template file ", &path, " could not be opened"); - ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 505, &_3$$5); + ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 506, &_3$$5); zephir_check_call_status(); zephir_throw_exception_debug(&_2$$5, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 718); ZEPHIR_MM_RESTORE(); @@ -1249,7 +1249,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach) ZEPHIR_CONCAT_VV(&prefixLevel, &prefix, &level); ZEPHIR_OBS_VAR(&expr); zephir_array_fetch_string(&expr, &statement, SL("expr"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 782); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 504, &expr); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 505, &expr); zephir_check_call_status(); ZEPHIR_OBS_VAR(&blockStatements); zephir_array_fetch_string(&blockStatements, &statement, SL("block_statements"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 788); @@ -1309,7 +1309,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach) } else { ZVAL_BOOL(&_4, 0); } - ZEPHIR_CALL_METHOD(&code, this_ptr, "statementlist", NULL, 506, &blockStatements, &_4); + ZEPHIR_CALL_METHOD(&code, this_ptr, "statementlist", NULL, 507, &blockStatements, &_4); zephir_check_call_status(); ZEPHIR_OBS_VAR(&loopContext); zephir_read_property(&loopContext, this_ptr, ZEND_STRL("loopPointers"), PH_NOISY_CC); @@ -1360,7 +1360,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach) } ZEPHIR_OBS_VAR(&ifExpr); if (zephir_array_isset_string_fetch(&ifExpr, &statement, SL("if_expr"), 0)) { - ZEPHIR_CALL_METHOD(&_16$$15, this_ptr, "expression", NULL, 504, &ifExpr); + ZEPHIR_CALL_METHOD(&_16$$15, this_ptr, "expression", NULL, 505, &ifExpr); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_17$$15); ZEPHIR_CONCAT_SVS(&_17$$15, "if (", &_16$$15, ") { ?>"); @@ -1502,13 +1502,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileIf) object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 505, &_1$$3, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 506, &_1$$3, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 941); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 504, &expr); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 505, &expr); zephir_check_call_status(); zephir_array_fetch_string(&_4, &statement, SL("true_statements"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 947); if (extendsMode) { @@ -1516,7 +1516,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileIf) } else { ZVAL_BOOL(&_5, 0); } - ZEPHIR_CALL_METHOD(&_3, this_ptr, "statementlist", NULL, 506, &_4, &_5); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "statementlist", NULL, 507, &_4, &_5); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_6); ZEPHIR_CONCAT_SVSV(&_6, "", &_3); @@ -1528,7 +1528,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileIf) } else { ZVAL_BOOL(&_8$$4, 0); } - ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "statementlist", NULL, 506, &blockStatements, &_8$$4); + ZEPHIR_CALL_METHOD(&_7$$4, this_ptr, "statementlist", NULL, 507, &blockStatements, &_8$$4); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_9$$4); ZEPHIR_CONCAT_SV(&_9$$4, "", &_7$$4); @@ -1606,14 +1606,14 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileInclude) RETURN_CCTOR(&compilation); } } - ZEPHIR_CALL_METHOD(&path, this_ptr, "expression", NULL, 504, &pathExpr); + ZEPHIR_CALL_METHOD(&path, this_ptr, "expression", NULL, 505, &pathExpr); zephir_check_call_status(); ZEPHIR_OBS_VAR(¶ms); if (!(zephir_array_isset_string_fetch(¶ms, &statement, SL("params"), 0))) { ZEPHIR_CONCAT_SVS(return_value, "partial(", &path, "); ?>"); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&_3, this_ptr, "expression", NULL, 504, ¶ms); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "expression", NULL, 505, ¶ms); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "partial(", &path, ", ", &_3, "); ?>"); RETURN_MM(); @@ -1701,7 +1701,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro) object_init_ex(&_1$$4, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_2$$4); ZEPHIR_CONCAT_SVS(&_2$$4, "Macro '", &name, "' is already defined"); - ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 505, &_2$$4); + ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 506, &_2$$4); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$4, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1063); ZEPHIR_MM_RESTORE(); @@ -1752,7 +1752,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro) zephir_concat_self_str(&code, " } else { ", sizeof(" } else { ") - 1); ZEPHIR_OBS_NVAR(&defaultValue); if (EXPECTED(zephir_array_isset_string_fetch(&defaultValue, ¶meter, SL("default"), 0))) { - ZEPHIR_CALL_METHOD(&_14$$8, this_ptr, "expression", &_15, 504, &defaultValue); + ZEPHIR_CALL_METHOD(&_14$$8, this_ptr, "expression", &_15, 505, &defaultValue); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_16$$8); ZEPHIR_CONCAT_SVSVS(&_16$$8, "$", &variableName, " = ", &_14$$8, ";"); @@ -1795,7 +1795,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro) zephir_concat_self_str(&code, " } else { ", sizeof(" } else { ") - 1); ZEPHIR_OBS_NVAR(&defaultValue); if (EXPECTED(zephir_array_isset_string_fetch(&defaultValue, ¶meter, SL("default"), 0))) { - ZEPHIR_CALL_METHOD(&_22$$11, this_ptr, "expression", &_15, 504, &defaultValue); + ZEPHIR_CALL_METHOD(&_22$$11, this_ptr, "expression", &_15, 505, &defaultValue); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_23$$11); ZEPHIR_CONCAT_SVSVS(&_23$$11, "$", &variableName, " = ", &_22$$11, ";"); @@ -1821,7 +1821,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro) } else { ZVAL_BOOL(&_26$$13, 0); } - ZEPHIR_CALL_METHOD(&_25$$13, this_ptr, "statementlist", NULL, 506, &blockStatements, &_26$$13); + ZEPHIR_CALL_METHOD(&_25$$13, this_ptr, "statementlist", NULL, 507, &blockStatements, &_26$$13); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_27$$13); ZEPHIR_CONCAT_VS(&_27$$13, &_25$$13, ""); RETURN_MM(); @@ -1944,10 +1944,10 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSet) ZEPHIR_INIT_NVAR(&assignment); ZVAL_COPY(&assignment, _0); zephir_array_fetch_string(&_2$$4, &assignment, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1174); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_3, 504, &_2$$4); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_3, 505, &_2$$4); zephir_check_call_status(); zephir_array_fetch_string(&_4$$4, &assignment, SL("variable"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1181); - ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_3, 504, &_4$$4); + ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_3, 505, &_4$$4); zephir_check_call_status(); zephir_array_fetch_string(&_5$$4, &assignment, SL("op"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1187); do { @@ -1994,10 +1994,10 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSet) ZEPHIR_CALL_METHOD(&assignment, &assignments, "current", NULL, 0); zephir_check_call_status(); zephir_array_fetch_string(&_11$$10, &assignment, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1174); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_3, 504, &_11$$10); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_3, 505, &_11$$10); zephir_check_call_status(); zephir_array_fetch_string(&_12$$10, &assignment, SL("variable"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1181); - ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_3, 504, &_12$$10); + ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_3, 505, &_12$$10); zephir_check_call_status(); zephir_array_fetch_string(&_13$$10, &assignment, SL("op"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1187); do { @@ -2162,13 +2162,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSwitch) object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 505, &_1$$3, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 506, &_1$$3, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1253); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 504, &expr); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 505, &expr); zephir_check_call_status(); ZEPHIR_INIT_VAR(&compilation); ZEPHIR_CONCAT_SVS(&compilation, ""); @@ -2179,7 +2179,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSwitch) } else { ZVAL_BOOL(&_3$$4, 0); } - ZEPHIR_CALL_METHOD(&lines, this_ptr, "statementlist", NULL, 506, &caseClauses, &_3$$4); + ZEPHIR_CALL_METHOD(&lines, this_ptr, "statementlist", NULL, 507, &caseClauses, &_3$$4); zephir_check_call_status(); if (zephir_fast_strlen_ev(&lines) != 0) { ZEPHIR_INIT_VAR(&_4$$5); @@ -2292,7 +2292,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) zephir_array_fast_append(&_1$$4, &expr); ZEPHIR_INIT_NVAR(&_2$$4); ZVAL_STRING(&_2$$4, "resolveExpression"); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "fireextensionevent", &_3, 508, &_2$$4, &_1$$4); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "fireextensionevent", &_3, 509, &_2$$4, &_1$$4); zephir_check_call_status(); if (Z_TYPE_P(&exprCode) == IS_STRING) { break; @@ -2314,7 +2314,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) } else { ZVAL_BOOL(&_7$$7, 0); } - ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_8, 504, &_6$$7, &_7$$7); + ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_8, 505, &_6$$7, &_7$$7); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&name); if (zephir_array_isset_string_fetch(&name, &singleExpr, SL("name"), 0)) { @@ -2342,7 +2342,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) } else { ZVAL_BOOL(&_11$$10, 0); } - ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_8, 504, &_10$$10, &_11$$10); + ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_8, 505, &_10$$10, &_11$$10); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&name); if (zephir_array_isset_string_fetch(&name, &singleExpr, SL("name"), 0)) { @@ -2373,7 +2373,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) } else { ZVAL_BOOL(&_14$$14, 0); } - ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", &_8, 504, &left, &_14$$14); + ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", &_8, 505, &left, &_14$$14); zephir_check_call_status(); } if (ZEPHIR_IS_LONG(&type, 311)) { @@ -2384,7 +2384,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) } if (ZEPHIR_IS_LONG(&type, 124)) { zephir_array_fetch_string(&_17$$16, &expr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1390); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "resolvefilter", &_18, 509, &_17$$16, &leftCode); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "resolvefilter", &_18, 510, &_17$$16, &leftCode); zephir_check_call_status(); break; } @@ -2395,7 +2395,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) } else { ZVAL_BOOL(&_19$$17, 0); } - ZEPHIR_CALL_METHOD(&rightCode, this_ptr, "expression", &_8, 504, &right, &_19$$17); + ZEPHIR_CALL_METHOD(&rightCode, this_ptr, "expression", &_8, 505, &right, &_19$$17); zephir_check_call_status(); } ZEPHIR_INIT_NVAR(&exprCode); @@ -2586,7 +2586,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) } else { ZVAL_BOOL(&_28$$54, 0); } - ZEPHIR_CALL_METHOD(&startCode, this_ptr, "expression", &_8, 504, &start, &_28$$54); + ZEPHIR_CALL_METHOD(&startCode, this_ptr, "expression", &_8, 505, &start, &_28$$54); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&startCode); @@ -2599,7 +2599,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) } else { ZVAL_BOOL(&_29$$56, 0); } - ZEPHIR_CALL_METHOD(&endCode, this_ptr, "expression", &_8, 504, &end, &_29$$56); + ZEPHIR_CALL_METHOD(&endCode, this_ptr, "expression", &_8, 505, &end, &_29$$56); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&endCode); @@ -2696,7 +2696,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) } else { ZVAL_BOOL(&_32$$74, 0); } - ZEPHIR_CALL_METHOD(&_30$$74, this_ptr, "expression", &_8, 504, &_31$$74, &_32$$74); + ZEPHIR_CALL_METHOD(&_30$$74, this_ptr, "expression", &_8, 505, &_31$$74, &_32$$74); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&exprCode); ZEPHIR_CONCAT_SVSVSVS(&exprCode, "(", &_30$$74, " ? ", &leftCode, " : ", &rightCode, ")"); @@ -2723,7 +2723,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) zephir_array_fetch_string(&_35$$78, &expr, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1646); ZEPHIR_INIT_NVAR(&_36$$78); ZEPHIR_CONCAT_SVSVSV(&_36$$78, "Unknown expression ", &type, " in ", &_34$$78, " on line ", &_35$$78); - ZEPHIR_CALL_METHOD(NULL, &_33$$78, "__construct", &_37, 505, &_36$$78); + ZEPHIR_CALL_METHOD(NULL, &_33$$78, "__construct", &_37, 506, &_36$$78); zephir_check_call_status(); zephir_throw_exception_debug(&_33$$78, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1646); ZEPHIR_MM_RESTORE(); @@ -2960,7 +2960,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) } else { ZVAL_BOOL(&_0$$3, 0); } - ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 504, &funcArguments, &_0$$3); + ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 505, &funcArguments, &_0$$3); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&arguments); @@ -2979,7 +2979,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) zephir_array_fast_append(&_2$$6, &funcArguments); ZEPHIR_INIT_VAR(&_3$$6); ZVAL_STRING(&_3$$6, "compileFunction"); - ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 508, &_3$$6, &_2$$6); + ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 509, &_3$$6, &_2$$6); zephir_check_call_status(); if (Z_TYPE_P(&code) == IS_STRING) { RETURN_CCTOR(&code); @@ -3011,7 +3011,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) zephir_array_fetch_string(&_7$$9, &expr, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1782); ZEPHIR_INIT_VAR(&_8$$9); ZEPHIR_CONCAT_SVSVSV(&_8$$9, "Invalid definition for user function '", &name, "' in ", &_6$$9, " on line ", &_7$$9); - ZEPHIR_CALL_METHOD(NULL, &_5$$9, "__construct", NULL, 505, &_8$$9); + ZEPHIR_CALL_METHOD(NULL, &_5$$9, "__construct", NULL, 506, &_8$$9); zephir_check_call_status(); zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 1782); ZEPHIR_MM_RESTORE(); @@ -3040,7 +3040,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) zephir_read_property(&_12$$17, this_ptr, ZEND_STRL("exprLevel"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&exprLevel, &_12$$17); if (Z_TYPE_P(&block) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&code, this_ptr, "statementlistorextends", NULL, 510, &block); + ZEPHIR_CALL_METHOD(&code, this_ptr, "statementlistorextends", NULL, 511, &block); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&exprLevel, 1)) { ZEPHIR_CPY_WRT(&escapedCode, &code); @@ -3125,7 +3125,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) ZEPHIR_OBS_NVAR(&funcArguments); if (zephir_array_isset_string_fetch(&funcArguments, &expr, SL("arguments"), 0)) { ZVAL_BOOL(&_22$$30, 1); - ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 504, &funcArguments, &_22$$30); + ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 505, &funcArguments, &_22$$30); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&arguments); @@ -3176,7 +3176,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) } else { ZVAL_BOOL(&_24, 0); } - ZEPHIR_CALL_METHOD(&_23, this_ptr, "expression", NULL, 504, &nameExpr, &_24); + ZEPHIR_CALL_METHOD(&_23, this_ptr, "expression", NULL, 505, &nameExpr, &_24); zephir_check_call_status(); ZEPHIR_CONCAT_VSVS(return_value, &_23, "(", &arguments, ")"); RETURN_MM(); @@ -3515,21 +3515,21 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveTest) do { if (ZEPHIR_IS_STRING(&name, "divisibleby")) { zephir_array_fetch_string(&_1$$12, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2144); - ZEPHIR_CALL_METHOD(&_0$$12, this_ptr, "expression", NULL, 504, &_1$$12); + ZEPHIR_CALL_METHOD(&_0$$12, this_ptr, "expression", NULL, 505, &_1$$12); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "(((", &left, ") % (", &_0$$12, ")) == 0)"); RETURN_MM(); } if (ZEPHIR_IS_STRING(&name, "sameas")) { zephir_array_fetch_string(&_3$$13, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2146); - ZEPHIR_CALL_METHOD(&_2$$13, this_ptr, "expression", NULL, 504, &_3$$13); + ZEPHIR_CALL_METHOD(&_2$$13, this_ptr, "expression", NULL, 505, &_3$$13); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "(", &left, ") === (", &_2$$13, ")"); RETURN_MM(); } if (ZEPHIR_IS_STRING(&name, "type")) { zephir_array_fetch_string(&_5$$14, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2148); - ZEPHIR_CALL_METHOD(&_4$$14, this_ptr, "expression", NULL, 504, &_5$$14); + ZEPHIR_CALL_METHOD(&_4$$14, this_ptr, "expression", NULL, 505, &_5$$14); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "gettype(", &left, ") === (", &_4$$14, ")"); RETURN_MM(); @@ -3538,7 +3538,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveTest) } } - ZEPHIR_CALL_METHOD(&_6, this_ptr, "expression", NULL, 504, &test); + ZEPHIR_CALL_METHOD(&_6, this_ptr, "expression", NULL, 505, &test); zephir_check_call_status(); ZEPHIR_CONCAT_VSV(return_value, &left, " == ", &_6); RETURN_MM(); @@ -3757,7 +3757,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource) } else { ZVAL_BOOL(&_0, 0); } - ZEPHIR_CALL_METHOD(&compilation, this_ptr, "statementlist", NULL, 506, &intermediate, &_0); + ZEPHIR_CALL_METHOD(&compilation, this_ptr, "statementlist", NULL, 507, &intermediate, &_0); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("extended"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&extended, &_1); @@ -3793,11 +3793,11 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource) ZEPHIR_INIT_NVAR(&localBlock); array_init(&localBlock); } - ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 506, &localBlock); + ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 507, &localBlock); zephir_check_call_status(); } else { if (Z_TYPE_P(&block) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 506, &block); + ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 507, &block); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&blockCompilation, &block); @@ -3838,11 +3838,11 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSource) ZEPHIR_INIT_NVAR(&localBlock); array_init(&localBlock); } - ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 506, &localBlock); + ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 507, &localBlock); zephir_check_call_status(); } else { if (Z_TYPE_P(&block) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 506, &block); + ZEPHIR_CALL_METHOD(&blockCompilation, this_ptr, "statementlist", NULL, 507, &block); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&blockCompilation, &block); @@ -4036,7 +4036,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) zephir_array_fetch_string(&_2$$5, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2368); ZEPHIR_INIT_VAR(&_3$$5); ZEPHIR_CONCAT_SVSV(&_3$$5, "Unknown filter type in ", &_1$$5, " on line ", &_2$$5); - ZEPHIR_CALL_METHOD(NULL, &_0$$5, "__construct", NULL, 505, &_3$$5); + ZEPHIR_CALL_METHOD(NULL, &_0$$5, "__construct", NULL, 506, &_3$$5); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$5, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2368); ZEPHIR_MM_RESTORE(); @@ -4074,7 +4074,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) ZEPHIR_UNREF(&funcArguments); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 504, &funcArguments); + ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 505, &funcArguments); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&arguments, &left); @@ -4089,7 +4089,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) zephir_array_fast_append(&_7$$9, &funcArguments); ZEPHIR_INIT_VAR(&_8$$9); ZVAL_STRING(&_8$$9, "compileFilter"); - ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 508, &_8$$9, &_7$$9); + ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 509, &_8$$9, &_7$$9); zephir_check_call_status(); if (Z_TYPE_P(&code) == IS_STRING) { RETURN_CCTOR(&code); @@ -4120,7 +4120,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) zephir_array_fetch_string(&_12$$11, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2462); ZEPHIR_INIT_VAR(&_13$$11); ZEPHIR_CONCAT_SVSVSV(&_13$$11, "Invalid definition for user filter '", &name, "' in ", &_11$$11, " on line ", &_12$$11); - ZEPHIR_CALL_METHOD(NULL, &_10$$11, "__construct", NULL, 505, &_13$$11); + ZEPHIR_CALL_METHOD(NULL, &_10$$11, "__construct", NULL, 506, &_13$$11); zephir_check_call_status(); zephir_throw_exception_debug(&_10$$11, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2462); ZEPHIR_MM_RESTORE(); @@ -4245,7 +4245,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) zephir_array_fetch_string(&_22, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2529); ZEPHIR_INIT_VAR(&_23); ZEPHIR_CONCAT_SVSVSV(&_23, "Unknown filter \"", &name, "\" in ", &_21, " on line ", &_22); - ZEPHIR_CALL_METHOD(NULL, &_20, "__construct", NULL, 505, &_23); + ZEPHIR_CALL_METHOD(NULL, &_20, "__construct", NULL, 506, &_23); zephir_check_call_status(); zephir_throw_exception_debug(&_20, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2529); ZEPHIR_MM_RESTORE(); @@ -4416,7 +4416,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) zephir_array_fetch_string(&_6$$7, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2577); ZEPHIR_INIT_NVAR(&_7$$7); ZEPHIR_CONCAT_SVSV(&_7$$7, "Invalid statement in ", &_5$$7, " on line ", &_6$$7); - ZEPHIR_CALL_METHOD(NULL, &_4$$7, "__construct", &_8, 505, &_7$$7, &statement); + ZEPHIR_CALL_METHOD(NULL, &_4$$7, "__construct", &_8, 506, &_7$$7, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_4$$7, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2579); ZEPHIR_MM_RESTORE(); @@ -4428,7 +4428,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) zephir_array_fast_append(&_9$$8, &statement); ZEPHIR_INIT_NVAR(&_10$$8); ZVAL_STRING(&_10$$8, "compileStatement"); - ZEPHIR_CALL_METHOD(&tempCompilation, this_ptr, "fireextensionevent", &_11, 508, &_10$$8, &_9$$8); + ZEPHIR_CALL_METHOD(&tempCompilation, this_ptr, "fireextensionevent", &_11, 509, &_10$$8, &_9$$8); zephir_check_call_status(); if (Z_TYPE_P(&tempCompilation) == IS_STRING) { zephir_concat_self(&compilation, &tempCompilation); @@ -4533,7 +4533,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) } else { ZVAL_BOOL(&_34$$24, 0); } - ZEPHIR_CALL_METHOD(&_33$$24, this_ptr, "statementlist", &_35, 506, &blockStatements, &_34$$24); + ZEPHIR_CALL_METHOD(&_33$$24, this_ptr, "statementlist", &_35, 507, &blockStatements, &_34$$24); zephir_check_call_status(); zephir_concat_self(&compilation, &_33$$24); } @@ -4643,7 +4643,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) zephir_array_fetch_string(&_58$$37, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2807); ZEPHIR_INIT_NVAR(&_59$$37); ZEPHIR_CONCAT_SVSVSV(&_59$$37, "Unknown statement ", &type, " in ", &_57$$37, " on line ", &_58$$37); - ZEPHIR_CALL_METHOD(NULL, &_56$$37, "__construct", &_8, 505, &_59$$37); + ZEPHIR_CALL_METHOD(NULL, &_56$$37, "__construct", &_8, 506, &_59$$37); zephir_check_call_status(); zephir_throw_exception_debug(&_56$$37, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2807); ZEPHIR_MM_RESTORE(); @@ -4673,7 +4673,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) zephir_array_fetch_string(&_62$$40, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2577); ZEPHIR_INIT_NVAR(&_63$$40); ZEPHIR_CONCAT_SVSV(&_63$$40, "Invalid statement in ", &_61$$40, " on line ", &_62$$40); - ZEPHIR_CALL_METHOD(NULL, &_60$$40, "__construct", &_8, 505, &_63$$40, &statement); + ZEPHIR_CALL_METHOD(NULL, &_60$$40, "__construct", &_8, 506, &_63$$40, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_60$$40, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2579); ZEPHIR_MM_RESTORE(); @@ -4685,7 +4685,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) zephir_array_fast_append(&_64$$41, &statement); ZEPHIR_INIT_NVAR(&_65$$41); ZVAL_STRING(&_65$$41, "compileStatement"); - ZEPHIR_CALL_METHOD(&tempCompilation, this_ptr, "fireextensionevent", &_11, 508, &_65$$41, &_64$$41); + ZEPHIR_CALL_METHOD(&tempCompilation, this_ptr, "fireextensionevent", &_11, 509, &_65$$41, &_64$$41); zephir_check_call_status(); if (Z_TYPE_P(&tempCompilation) == IS_STRING) { zephir_concat_self(&compilation, &tempCompilation); @@ -4790,7 +4790,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) } else { ZVAL_BOOL(&_81$$57, 0); } - ZEPHIR_CALL_METHOD(&_80$$57, this_ptr, "statementlist", &_35, 506, &blockStatements, &_81$$57); + ZEPHIR_CALL_METHOD(&_80$$57, this_ptr, "statementlist", &_35, 507, &blockStatements, &_81$$57); zephir_check_call_status(); zephir_concat_self(&compilation, &_80$$57); } @@ -4900,7 +4900,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) zephir_array_fetch_string(&_96$$70, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2807); ZEPHIR_INIT_NVAR(&_97$$70); ZEPHIR_CONCAT_SVSVSV(&_97$$70, "Unknown statement ", &type, " in ", &_95$$70, " on line ", &_96$$70); - ZEPHIR_CALL_METHOD(NULL, &_94$$70, "__construct", &_8, 505, &_97$$70); + ZEPHIR_CALL_METHOD(NULL, &_94$$70, "__construct", &_8, 506, &_97$$70); zephir_check_call_status(); zephir_throw_exception_debug(&_94$$70, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2807); ZEPHIR_MM_RESTORE(); @@ -4993,7 +4993,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementListOrExtends) ZEPHIR_INIT_NVAR(&statement); } if (isStatementList) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "statementlist", NULL, 506, statements); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "statementlist", NULL, 507, statements); zephir_check_call_status(); RETURN_MM(); } @@ -5043,7 +5043,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, isTagFactory) _0$$6 = Z_TYPE_P(&_1$$6) == IS_ARRAY; } if (_0$$6) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "istagfactory", NULL, 507, &left); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "istagfactory", NULL, 508, &left); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/mvc/view/simple.zep.c b/ext/phalcon/mvc/view/simple.zep.c index 477af5d9695..245d2ba7dbe 100644 --- a/ext/phalcon/mvc/view/simple.zep.c +++ b/ext/phalcon/mvc/view/simple.zep.c @@ -431,12 +431,12 @@ PHP_METHOD(Phalcon_Mvc_View_Simple, partial) } else { ZEPHIR_CPY_WRT(&mergedParams, params); } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "internalrender", NULL, 511, &partialPath, &mergedParams); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "internalrender", NULL, 0, &partialPath, &mergedParams); zephir_check_call_status(); if (Z_TYPE_P(params) == IS_ARRAY) { zephir_update_property_zval(this_ptr, ZEND_STRL("viewParams"), &viewParams); } - ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 490); + ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 491); zephir_check_call_status(); zephir_read_property(&_2, this_ptr, ZEND_STRL("content"), PH_NOISY_CC | PH_READONLY); zend_print_zval(&_2, 0); @@ -541,9 +541,9 @@ PHP_METHOD(Phalcon_Mvc_View_Simple, render) ZEPHIR_CPY_WRT(&viewParams, &_1); ZEPHIR_INIT_VAR(&mergedParams); zephir_fast_array_merge(&mergedParams, &viewParams, ¶ms); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "internalrender", NULL, 511, &path, &mergedParams); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "internalrender", NULL, 0, &path, &mergedParams); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 490); + ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 491); zephir_check_call_status(); RETURN_MM_MEMBER(getThis(), "content"); } @@ -854,7 +854,7 @@ PHP_METHOD(Phalcon_Mvc_View_Simple, loadTemplateEngines) if (ZEPHIR_IS_EMPTY(®isteredEngines)) { ZEPHIR_INIT_VAR(&_2$$4); object_init_ex(&_2$$4, phalcon_mvc_view_engine_php_ce); - ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 493, this_ptr, &di); + ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 494, this_ptr, &di); zephir_check_call_status(); zephir_array_update_string(&engines, SL(".phtml"), &_2$$4, PH_COPY | PH_SEPARATE); } else { diff --git a/ext/phalcon/paginator/adapter/nativearray.zep.c b/ext/phalcon/paginator/adapter/nativearray.zep.c index b9133bcc5f9..76c1d313e13 100644 --- a/ext/phalcon/paginator/adapter/nativearray.zep.c +++ b/ext/phalcon/paginator/adapter/nativearray.zep.c @@ -113,7 +113,7 @@ PHP_METHOD(Phalcon_Paginator_Adapter_NativeArray, paginate) } ZVAL_LONG(&_0, (show * ((pageNumber - 1)))); ZVAL_LONG(&_4, show); - ZEPHIR_CALL_FUNCTION(&_5, "array_slice", NULL, 502, &items, &_0, &_4); + ZEPHIR_CALL_FUNCTION(&_5, "array_slice", NULL, 503, &items, &_0, &_4); zephir_check_call_status(); ZEPHIR_CPY_WRT(&items, &_5); if (pageNumber < totalPages) { diff --git a/ext/phalcon/support/debug.zep.c b/ext/phalcon/support/debug.zep.c index e2ded4b6243..b2bd622f040 100644 --- a/ext/phalcon/support/debug.zep.c +++ b/ext/phalcon/support/debug.zep.c @@ -407,7 +407,7 @@ PHP_METHOD(Phalcon_Support_Debug, onUncaughtException) ZEPHIR_CALL_FUNCTION(&obLevel, "ob_get_level", NULL, 0); zephir_check_call_status(); if (ZEPHIR_GT_LONG(&obLevel, 0)) { - ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 490); + ZEPHIR_CALL_FUNCTION(NULL, "ob_end_clean", NULL, 491); zephir_check_call_status(); } zephir_read_static_property_ce(&_0, phalcon_support_debug_ce, SL("isActive"), PH_NOISY_CC | PH_READONLY); diff --git a/ext/phalcon/support/helper/arr/first.zep.c b/ext/phalcon/support/helper/arr/first.zep.c index 873b5108310..21bc2e5e7d8 100644 --- a/ext/phalcon/support/helper/arr/first.zep.c +++ b/ext/phalcon/support/helper/arr/first.zep.c @@ -77,7 +77,7 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_First, __invoke) ZEPHIR_CALL_METHOD(&filtered, this_ptr, "tofilter", NULL, 0, &collection, method); zephir_check_call_status(); ZEPHIR_MAKE_REF(&filtered); - ZEPHIR_RETURN_CALL_FUNCTION("reset", NULL, 478, &filtered); + ZEPHIR_RETURN_CALL_FUNCTION("reset", NULL, 479, &filtered); ZEPHIR_UNREF(&filtered); zephir_check_call_status(); RETURN_MM(); diff --git a/ext/phalcon/support/helper/arr/sliceleft.zep.c b/ext/phalcon/support/helper/arr/sliceleft.zep.c index 5f5fc99b78b..20715d10a30 100644 --- a/ext/phalcon/support/helper/arr/sliceleft.zep.c +++ b/ext/phalcon/support/helper/arr/sliceleft.zep.c @@ -75,7 +75,7 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_SliceLeft, __invoke) ZVAL_LONG(&_0, 0); ZVAL_LONG(&_1, elements); - ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 502, &collection, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 503, &collection, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/support/helper/arr/sliceright.zep.c b/ext/phalcon/support/helper/arr/sliceright.zep.c index 817a09a8b75..f0aeb8bcc0a 100644 --- a/ext/phalcon/support/helper/arr/sliceright.zep.c +++ b/ext/phalcon/support/helper/arr/sliceright.zep.c @@ -73,7 +73,7 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_SliceRight, __invoke) ZVAL_LONG(&_0, elements); - ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 502, &collection, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 503, &collection, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/support/helper/str/concat.zep.c b/ext/phalcon/support/helper/str/concat.zep.c index e41f42810ed..ae07e1e4147 100644 --- a/ext/phalcon/support/helper/str/concat.zep.c +++ b/ext/phalcon/support/helper/str/concat.zep.c @@ -81,15 +81,15 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Concat, __invoke) return; } ZEPHIR_MAKE_REF(&arguments); - ZEPHIR_CALL_FUNCTION(&delimiter, "reset", NULL, 478, &arguments); + ZEPHIR_CALL_FUNCTION(&delimiter, "reset", NULL, 479, &arguments); ZEPHIR_UNREF(&arguments); zephir_check_call_status(); ZVAL_LONG(&_0, 1); - ZEPHIR_CALL_FUNCTION(&_1, "array_slice", NULL, 502, &arguments, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "array_slice", NULL, 503, &arguments, &_0); zephir_check_call_status(); ZEPHIR_CPY_WRT(&arguments, &_1); ZEPHIR_MAKE_REF(&arguments); - ZEPHIR_CALL_FUNCTION(&first, "reset", NULL, 478, &arguments); + ZEPHIR_CALL_FUNCTION(&first, "reset", NULL, 479, &arguments); ZEPHIR_UNREF(&arguments); zephir_check_call_status(); ZEPHIR_MAKE_REF(&arguments); diff --git a/ext/phalcon/support/version.zep.c b/ext/phalcon/support/version.zep.c index 9130f154632..b5d2950e5b0 100644 --- a/ext/phalcon/support/version.zep.c +++ b/ext/phalcon/support/version.zep.c @@ -117,7 +117,7 @@ PHP_METHOD(Phalcon_Support_Version, getVersion) ZVAL_LONG(&_0, 3); zephir_array_fast_append(return_value, &_0); ZEPHIR_INIT_NVAR(&_0); - ZVAL_LONG(&_0, 0); + ZVAL_LONG(&_0, 1); zephir_array_fast_append(return_value, &_0); ZEPHIR_INIT_NVAR(&_0); ZVAL_LONG(&_0, 4); diff --git a/ext/phalcon/tag.zep.c b/ext/phalcon/tag.zep.c index 5adbe3808e1..1c7ad8ad758 100644 --- a/ext/phalcon/tag.zep.c +++ b/ext/phalcon/tag.zep.c @@ -1852,7 +1852,7 @@ PHP_METHOD(Phalcon_Tag, preload) zephir_fast_str_replace(&_5$$5, &_6$$5, &_7$$5, &href); ZEPHIR_INIT_VAR(&_8$$5); ZVAL_STRING(&_8$$5, "preload"); - ZEPHIR_CALL_METHOD(NULL, &link, "__construct", NULL, 500, &_8$$5, &_5$$5, &attributes); + ZEPHIR_CALL_METHOD(NULL, &link, "__construct", NULL, 501, &_8$$5, &_5$$5, &attributes); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_8$$5); object_init_ex(&_8$$5, phalcon_html_link_serializer_header_ce); @@ -1864,7 +1864,7 @@ PHP_METHOD(Phalcon_Tag, preload) ZEPHIR_INIT_VAR(&_10$$5); zephir_create_array(&_10$$5, 1, 0); zephir_array_fast_append(&_10$$5, &link); - ZEPHIR_CALL_METHOD(&_9$$5, &_8$$5, "serialize", NULL, 501, &_10$$5); + ZEPHIR_CALL_METHOD(&_9$$5, &_8$$5, "serialize", NULL, 502, &_10$$5); zephir_check_call_status(); ZEPHIR_INIT_VAR(&header); ZEPHIR_CONCAT_SV(&header, "Link: ", &_9$$5); diff --git a/ext/php_phalcon.h b/ext/php_phalcon.h index 1303ea7fa80..dac2812e9d1 100644 --- a/ext/php_phalcon.h +++ b/ext/php_phalcon.h @@ -11,7 +11,7 @@ #include "kernel/globals.h" #define PHP_PHALCON_NAME "phalcon" -#define PHP_PHALCON_VERSION "5.3.0" +#define PHP_PHALCON_VERSION "5.3.1" #define PHP_PHALCON_EXTNAME "phalcon" #define PHP_PHALCON_AUTHOR "Phalcon Team and contributors" #define PHP_PHALCON_ZEPVERSION "0.17.0-9f99da6"