diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b4b73cfacf..17d956a2d3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,7 +19,7 @@ on:
env:
# All versions should be declared here
- PHALCON_VERSION: 5.6.0
+ PHALCON_VERSION: 5.6.1
ZEPHIR_PARSER_VERSION: 1.6.0
# For tests
diff --git a/BACKERS.md b/BACKERS.md
index 748d4fe5a6..30486967a3 100644
--- a/BACKERS.md
+++ b/BACKERS.md
@@ -115,6 +115,7 @@ Thanks for the support
+
[//]: github-sponsors
diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md
index 258940bc9d..2803c8984b 100644
--- a/CHANGELOG-5.0.md
+++ b/CHANGELOG-5.0.md
@@ -1,5 +1,23 @@
# Changelog
+## [5.6.1](https://github.com/phalcon/cphalcon/releases/tag/v5.6.1) (2024-02-08)
+
+### Changed
+
+- Changed `Phalcon\Cli\Router::setDefaultAction` and `Phalcon\Cli\Router::setDefaultModule` to return the object back for a fluent interface [#16328](https://github.com/phalcon/cphalcon/issues/16328)
+
+### Added
+
+### Fixed
+
+- Fixed `Phalcon\Db\Adapter\Pdo\Postgresql::describeColumns()` to return the correct string back [#16371](https://github.com/phalcon/cphalcon/issues/16371)
+- Fixed `Phalcon/Filter/Validation::validate()` and `Phalcon/Filter/Validation/ValidationInterface::validate()` to return also `bool` [#16337](https://github.com/phalcon/cphalcon/issues/16337)
+- Fixed `Phalcon\Mvc\Model::toArray` to ignore getters when the field name is `source`. [#16514](https://github.com/phalcon/cphalcon/issues/16514)
+- Fixed `Phalcon\Http\Request::getPut` to correctly get form encoded data [#16519](https://github.com/phalcon/cphalcon/issues/16519)
+- Fixed deprecation warning in callables `Use of "static" in callables is deprecated` for PHP 8.2+ [#16263](https://github.com/phalcon/cphalcon/issues/16263)
+
+### Removed
+
## [5.6.0](https://github.com/phalcon/cphalcon/releases/tag/v5.6.0) (2024-01-09)
### Changed
diff --git a/build/phalcon/phalcon.zep.c b/build/phalcon/phalcon.zep.c
index 919baaac5f..9f7e1f5037 100644
--- a/build/phalcon/phalcon.zep.c
+++ b/build/phalcon/phalcon.zep.c
@@ -8540,7 +8540,11 @@ static int zephir_call_user_function(
char *is_callable_error = NULL;
zend_execute_data *frame = EG(current_execute_data);
+#if PHP_VERSION_ID >= 80200
+ if (obj_ce || !zend_is_callable_at_frame(&callable, fci.object, frame, IS_CALLABLE_SUPPRESS_DEPRECATIONS, &fcic, &is_callable_error)) {
+#else
if (obj_ce || !zend_is_callable_at_frame(&callable, fci.object, frame, 0, &fcic, &is_callable_error)) {
+#endif
if (is_callable_error) {
zend_error(E_WARNING, "%s", is_callable_error);
efree(is_callable_error);
@@ -8756,7 +8760,11 @@ static int zephir_call_user_func_array_noex(zval *return_value, zval *handler, z
}
zend_execute_data *frame = EG(current_execute_data);
+#if PHP_VERSION_ID >= 80200
+ if (!zend_is_callable_at_frame(handler, NULL, frame, IS_CALLABLE_SUPPRESS_DEPRECATIONS, &fci_cache, &is_callable_error)) {
+#else
if (!zend_is_callable_at_frame(handler, NULL, frame, 0, &fci_cache, &is_callable_error)) {
+#endif
if (is_callable_error) {
zend_error(E_WARNING, "%s", is_callable_error);
efree(is_callable_error);
@@ -33134,7 +33142,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Postgresql, describeColumns)
if (Z_TYPE_P(&_50$$3) != IS_NULL) {
zephir_array_fetch_long(&_51$$38, &field, 9, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Postgresql.zep", 507);
ZEPHIR_INIT_NVAR(&_52$$38);
- ZVAL_STRING(&_52$$38, "/^'|'?::[[:alnum:][:space:]]+$/");
+ ZVAL_STRING(&_52$$38, "/^'|'?::[[:alnum:][:space:]]+(\\[\\])?$/");
ZEPHIR_INIT_NVAR(&_53$$38);
ZVAL_STRING(&_53$$38, "");
ZEPHIR_CALL_FUNCTION(&_54$$38, "preg_replace", &_55, 41, &_52$$38, &_53$$38, &_51$$38);
@@ -33432,7 +33440,7 @@ static PHP_METHOD(Phalcon_Db_Adapter_Pdo_Postgresql, describeColumns)
if (Z_TYPE_P(&_109$$41) != IS_NULL) {
zephir_array_fetch_long(&_110$$76, &field, 9, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Postgresql.zep", 507);
ZEPHIR_INIT_NVAR(&_111$$76);
- ZVAL_STRING(&_111$$76, "/^'|'?::[[:alnum:][:space:]]+$/");
+ ZVAL_STRING(&_111$$76, "/^'|'?::[[:alnum:][:space:]]+(\\[\\])?$/");
ZEPHIR_INIT_NVAR(&_112$$76);
ZVAL_STRING(&_112$$76, "");
ZEPHIR_CALL_FUNCTION(&_113$$76, "preg_replace", &_55, 41, &_111$$76, &_112$$76, &_110$$76);
@@ -56736,12 +56744,12 @@ static PHP_METHOD(Phalcon_Mvc_Model, sum)
static PHP_METHOD(Phalcon_Mvc_Model, toArray)
{
- zend_bool _3$$4, _11$$3, _14$$15, _20$$14;
+ zend_bool _3$$4, _11$$3, _13$$3, _16$$15, _22$$14, _24$$14;
zval data;
zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
zephir_fcall_cache_entry *_5 = NULL, *_9 = NULL;
zend_long ZEPHIR_LAST_CALL_STATUS;
- zval *columns = NULL, columns_sub, *useGetter = NULL, useGetter_sub, __$null, __$true, attribute, attributeField, columnMap, metaData, method, _0, *_1, _2, _4$$5, _6$$7, _7$$7, _8$$7, _10$$3, _12$$11, _13$$12, _15$$16, _16$$18, _17$$18, _18$$18, _19$$14, _21$$22, _22$$23;
+ zval *columns = NULL, columns_sub, *useGetter = NULL, useGetter_sub, __$null, __$true, attribute, attributeField, columnMap, metaData, method, _0, *_1, _2, _4$$5, _6$$7, _7$$7, _8$$7, _10$$3, _12$$3, _14$$11, _15$$12, _17$$16, _18$$18, _19$$18, _20$$18, _21$$14, _23$$14, _25$$22, _26$$23;
zval *this_ptr = getThis();
ZVAL_UNDEF(&columns_sub);
@@ -56760,15 +56768,17 @@ static PHP_METHOD(Phalcon_Mvc_Model, toArray)
ZVAL_UNDEF(&_7$$7);
ZVAL_UNDEF(&_8$$7);
ZVAL_UNDEF(&_10$$3);
- ZVAL_UNDEF(&_12$$11);
- ZVAL_UNDEF(&_13$$12);
- ZVAL_UNDEF(&_15$$16);
- ZVAL_UNDEF(&_16$$18);
- ZVAL_UNDEF(&_17$$18);
+ ZVAL_UNDEF(&_12$$3);
+ ZVAL_UNDEF(&_14$$11);
+ ZVAL_UNDEF(&_15$$12);
+ ZVAL_UNDEF(&_17$$16);
ZVAL_UNDEF(&_18$$18);
- ZVAL_UNDEF(&_19$$14);
- ZVAL_UNDEF(&_21$$22);
- ZVAL_UNDEF(&_22$$23);
+ ZVAL_UNDEF(&_19$$18);
+ ZVAL_UNDEF(&_20$$18);
+ ZVAL_UNDEF(&_21$$14);
+ ZVAL_UNDEF(&_23$$14);
+ ZVAL_UNDEF(&_25$$22);
+ ZVAL_UNDEF(&_26$$23);
ZVAL_UNDEF(&data);
bool is_null_true = 1;
ZEND_PARSE_PARAMETERS_START(0, 2)
@@ -56795,7 +56805,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, toArray)
zephir_check_call_status();
ZEPHIR_CALL_METHOD(&_0, &metaData, "getattributes", NULL, 0, this_ptr);
zephir_check_call_status();
- zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model.zep", 3340);
+ zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model.zep", 3343);
if (Z_TYPE_P(&_0) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _1)
{
@@ -56842,16 +56852,22 @@ static PHP_METHOD(Phalcon_Mvc_Model, toArray)
ZEPHIR_CONCAT_SV(&method, "get", &_10$$3);
_11$$3 = ZEPHIR_IS_TRUE_IDENTICAL(useGetter);
if (_11$$3) {
- _11$$3 = (zephir_method_exists(this_ptr, &method) == SUCCESS);
+ ZEPHIR_INIT_NVAR(&_12$$3);
+ ZVAL_STRING(&_12$$3, "getSource");
+ _11$$3 = !ZEPHIR_IS_IDENTICAL(&_12$$3, &method);
}
- if (_11$$3) {
- ZEPHIR_CALL_METHOD_ZVAL(&_12$$11, this_ptr, &method, NULL, 0);
+ _13$$3 = _11$$3;
+ if (_13$$3) {
+ _13$$3 = (zephir_method_exists(this_ptr, &method) == SUCCESS);
+ }
+ if (_13$$3) {
+ ZEPHIR_CALL_METHOD_ZVAL(&_14$$11, this_ptr, &method, NULL, 0);
zephir_check_call_status();
- zephir_array_update_zval(&data, &attributeField, &_12$$11, PH_COPY | PH_SEPARATE);
+ zephir_array_update_zval(&data, &attributeField, &_14$$11, PH_COPY | PH_SEPARATE);
} else if (zephir_isset_property_zval(this_ptr, &attributeField)) {
- ZEPHIR_OBS_NVAR(&_13$$12);
- zephir_read_property_zval(&_13$$12, this_ptr, &attributeField, PH_NOISY_CC);
- zephir_array_update_zval(&data, &attributeField, &_13$$12, PH_COPY | PH_SEPARATE);
+ ZEPHIR_OBS_NVAR(&_15$$12);
+ zephir_read_property_zval(&_15$$12, this_ptr, &attributeField, PH_NOISY_CC);
+ zephir_array_update_zval(&data, &attributeField, &_15$$12, PH_COPY | PH_SEPARATE);
} else {
zephir_array_update_zval(&data, &attributeField, &__$null, PH_COPY | PH_SEPARATE);
}
@@ -56868,27 +56884,27 @@ static PHP_METHOD(Phalcon_Mvc_Model, toArray)
ZEPHIR_CALL_METHOD(&attribute, &_0, "current", NULL, 0);
zephir_check_call_status();
if (Z_TYPE_P(&columnMap) == IS_ARRAY) {
- _14$$15 = !(zephir_array_isset(&columnMap, &attribute));
- if (_14$$15) {
- _14$$15 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map;
+ _16$$15 = !(zephir_array_isset(&columnMap, &attribute));
+ if (_16$$15) {
+ _16$$15 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map;
}
- if (_14$$15) {
- ZEPHIR_CALL_SELF(&_15$$16, "caseinsensitivecolumnmap", &_5, 420, &columnMap, &attribute);
+ if (_16$$15) {
+ ZEPHIR_CALL_SELF(&_17$$16, "caseinsensitivecolumnmap", &_5, 420, &columnMap, &attribute);
zephir_check_call_status();
- ZEPHIR_CPY_WRT(&attribute, &_15$$16);
+ ZEPHIR_CPY_WRT(&attribute, &_17$$16);
}
ZEPHIR_OBS_NVAR(&attributeField);
if (!(zephir_array_isset_fetch(&attributeField, &columnMap, &attribute, 0))) {
if (UNEXPECTED(!(ZEPHIR_GLOBAL(orm).ignore_unknown_columns))) {
- ZEPHIR_INIT_NVAR(&_16$$18);
- object_init_ex(&_16$$18, phalcon_mvc_model_exception_ce);
- ZEPHIR_INIT_NVAR(&_17$$18);
- zephir_get_class(&_17$$18, this_ptr, 0);
ZEPHIR_INIT_NVAR(&_18$$18);
- ZEPHIR_CONCAT_SVSVS(&_18$$18, "Column '", &attribute, "' doesn't make part of the column map in '", &_17$$18, "'");
- ZEPHIR_CALL_METHOD(NULL, &_16$$18, "__construct", &_9, 33, &_18$$18);
+ object_init_ex(&_18$$18, phalcon_mvc_model_exception_ce);
+ ZEPHIR_INIT_NVAR(&_19$$18);
+ zephir_get_class(&_19$$18, this_ptr, 0);
+ ZEPHIR_INIT_NVAR(&_20$$18);
+ ZEPHIR_CONCAT_SVSVS(&_20$$18, "Column '", &attribute, "' doesn't make part of the column map in '", &_19$$18, "'");
+ ZEPHIR_CALL_METHOD(NULL, &_18$$18, "__construct", &_9, 33, &_20$$18);
zephir_check_call_status();
- zephir_throw_exception_debug(&_16$$18, "phalcon/Mvc/Model.zep", 3311);
+ zephir_throw_exception_debug(&_18$$18, "phalcon/Mvc/Model.zep", 3311);
ZEPHIR_MM_RESTORE();
return;
}
@@ -56902,22 +56918,28 @@ static PHP_METHOD(Phalcon_Mvc_Model, toArray)
continue;
}
}
- ZEPHIR_INIT_NVAR(&_19$$14);
- zephir_camelize(&_19$$14, &attributeField, NULL );
+ ZEPHIR_INIT_NVAR(&_21$$14);
+ zephir_camelize(&_21$$14, &attributeField, NULL );
ZEPHIR_INIT_NVAR(&method);
- ZEPHIR_CONCAT_SV(&method, "get", &_19$$14);
- _20$$14 = ZEPHIR_IS_TRUE_IDENTICAL(useGetter);
- if (_20$$14) {
- _20$$14 = (zephir_method_exists(this_ptr, &method) == SUCCESS);
+ ZEPHIR_CONCAT_SV(&method, "get", &_21$$14);
+ _22$$14 = ZEPHIR_IS_TRUE_IDENTICAL(useGetter);
+ if (_22$$14) {
+ ZEPHIR_INIT_NVAR(&_23$$14);
+ ZVAL_STRING(&_23$$14, "getSource");
+ _22$$14 = !ZEPHIR_IS_IDENTICAL(&_23$$14, &method);
}
- if (_20$$14) {
- ZEPHIR_CALL_METHOD_ZVAL(&_21$$22, this_ptr, &method, NULL, 0);
+ _24$$14 = _22$$14;
+ if (_24$$14) {
+ _24$$14 = (zephir_method_exists(this_ptr, &method) == SUCCESS);
+ }
+ if (_24$$14) {
+ ZEPHIR_CALL_METHOD_ZVAL(&_25$$22, this_ptr, &method, NULL, 0);
zephir_check_call_status();
- zephir_array_update_zval(&data, &attributeField, &_21$$22, PH_COPY | PH_SEPARATE);
+ zephir_array_update_zval(&data, &attributeField, &_25$$22, PH_COPY | PH_SEPARATE);
} else if (zephir_isset_property_zval(this_ptr, &attributeField)) {
- ZEPHIR_OBS_NVAR(&_22$$23);
- zephir_read_property_zval(&_22$$23, this_ptr, &attributeField, PH_NOISY_CC);
- zephir_array_update_zval(&data, &attributeField, &_22$$23, PH_COPY | PH_SEPARATE);
+ ZEPHIR_OBS_NVAR(&_26$$23);
+ zephir_read_property_zval(&_26$$23, this_ptr, &attributeField, PH_NOISY_CC);
+ zephir_array_update_zval(&data, &attributeField, &_26$$23, PH_COPY | PH_SEPARATE);
} else {
zephir_array_update_zval(&data, &attributeField, &__$null, PH_COPY | PH_SEPARATE);
}
@@ -57088,7 +57110,7 @@ static 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", 3569);
+ zephir_is_iterable(&belongsTo, 0, "phalcon/Mvc/Model.zep", 3572);
if (Z_TYPE_P(&belongsTo) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&belongsTo), _1)
{
@@ -57103,7 +57125,7 @@ static 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", 3455);
+ zephir_array_fetch_string(&_3$$5, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3458);
action = zephir_get_intval(&_3$$5);
}
if (action != 1) {
@@ -57123,7 +57145,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
ZEPHIR_CALL_METHOD(&referencedFields, &relation, "getreferencedfields", NULL, 0);
zephir_check_call_status();
if (Z_TYPE_P(&fields) == IS_ARRAY) {
- zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model.zep", 3498);
+ zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model.zep", 3501);
if (Z_TYPE_P(&fields) == IS_ARRAY) {
ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _8$$7, _9$$7, _6$$7)
{
@@ -57137,11 +57159,11 @@ static 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", 3490);
+ zephir_array_fetch(&_10$$8, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3493);
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", 3490);
- zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3491);
+ zephir_array_append(&conditions, &_11$$8, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3493);
+ zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3494);
if (Z_TYPE_P(&value) == IS_NULL) {
numberNull++;
}
@@ -57161,11 +57183,11 @@ static 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", 3490);
+ zephir_array_fetch(&_12$$10, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3493);
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", 3490);
- zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3491);
+ zephir_array_append(&conditions, &_13$$10, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3493);
+ zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3494);
if (Z_TYPE_P(&value) == IS_NULL) {
numberNull++;
}
@@ -57181,15 +57203,15 @@ static 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", 3502);
- zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3503);
+ zephir_array_append(&conditions, &_14$$12, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3505);
+ zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3506);
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", 3514);
+ zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3517);
}
if (validateWithNulls) {
ZEPHIR_OBS_NVAR(&allowNulls);
@@ -57264,7 +57286,7 @@ static 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", 3455);
+ zephir_array_fetch_string(&_27$$24, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3458);
action = zephir_get_intval(&_27$$24);
}
if (action != 1) {
@@ -57284,7 +57306,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysRestrict)
ZEPHIR_CALL_METHOD(&referencedFields, &relation, "getreferencedfields", NULL, 0);
zephir_check_call_status();
if (Z_TYPE_P(&fields) == IS_ARRAY) {
- zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model.zep", 3498);
+ zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model.zep", 3501);
if (Z_TYPE_P(&fields) == IS_ARRAY) {
ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _32$$26, _33$$26, _30$$26)
{
@@ -57298,11 +57320,11 @@ static 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", 3490);
+ zephir_array_fetch(&_34$$27, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3493);
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", 3490);
- zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3491);
+ zephir_array_append(&conditions, &_35$$27, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3493);
+ zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3494);
if (Z_TYPE_P(&value) == IS_NULL) {
numberNull++;
}
@@ -57322,11 +57344,11 @@ static 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", 3490);
+ zephir_array_fetch(&_36$$29, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3493);
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", 3490);
- zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3491);
+ zephir_array_append(&conditions, &_37$$29, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3493);
+ zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3494);
if (Z_TYPE_P(&value) == IS_NULL) {
numberNull++;
}
@@ -57342,15 +57364,15 @@ static 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", 3502);
- zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3503);
+ zephir_array_append(&conditions, &_38$$31, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3505);
+ zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3506);
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", 3514);
+ zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3517);
}
if (validateWithNulls) {
ZEPHIR_OBS_NVAR(&allowNulls);
@@ -57450,7 +57472,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, checkForeignKeysReverseCascade)
ZEPHIR_CPY_WRT(&manager, &_0);
ZEPHIR_CALL_METHOD(&relations, &manager, "gethasoneandhasmany", NULL, 0, this_ptr);
zephir_check_call_status();
- zephir_is_iterable(&relations, 0, "phalcon/Mvc/Model.zep", 3645);
+ zephir_is_iterable(&relations, 0, "phalcon/Mvc/Model.zep", 3648);
if (Z_TYPE_P(&relations) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relations), _1)
{
@@ -57468,7 +57490,7 @@ static 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", 3619);
+ zephir_array_fetch_string(&_4$$5, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3622);
action = zephir_get_intval(&_4$$5);
}
if (action != 2) {
@@ -57507,7 +57529,7 @@ static 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", 3619);
+ zephir_array_fetch_string(&_8$$11, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3622);
action = zephir_get_intval(&_8$$11);
}
if (action != 2) {
@@ -57574,7 +57596,7 @@ static 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", 3736);
+ zephir_is_iterable(&relations, 0, "phalcon/Mvc/Model.zep", 3739);
if (Z_TYPE_P(&relations) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relations), _1)
{
@@ -57592,7 +57614,7 @@ static 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", 3690);
+ zephir_array_fetch_string(&_4$$5, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3693);
action = zephir_get_intval(&_4$$5);
}
if (action != 1) {
@@ -57655,7 +57677,7 @@ static 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", 3690);
+ zephir_array_fetch_string(&_16$$11, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3693);
action = zephir_get_intval(&_16$$11);
}
if (action != 1) {
@@ -57833,7 +57855,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
ZEPHIR_INIT_NVAR(&columnMap);
ZVAL_NULL(&columnMap);
}
- zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 3858);
+ zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 3861);
if (Z_TYPE_P(&attributes) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _1)
{
@@ -57850,7 +57872,7 @@ static 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, 33, &_5$$7);
zephir_check_call_status();
- zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model.zep", 3792);
+ zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model.zep", 3795);
ZEPHIR_MM_RESTORE();
return;
}
@@ -57866,9 +57888,9 @@ static 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", 3809);
+ zephir_array_fetch(&_8$$12, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3812);
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", 3810);
+ zephir_array_fetch(&_9$$12, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3813);
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();
@@ -57890,18 +57912,18 @@ static 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, 33, &_15$$15);
zephir_check_call_status();
- zephir_throw_exception_debug(&_13$$15, "phalcon/Mvc/Model.zep", 3827);
+ zephir_throw_exception_debug(&_13$$15, "phalcon/Mvc/Model.zep", 3830);
ZEPHIR_MM_RESTORE();
return;
}
- zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3830);
- zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3831);
- zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3832);
+ zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3833);
+ zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3834);
+ zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3835);
} else {
if (zephir_array_isset(&defaultValues, &field)) {
- zephir_array_fetch(&_16$$17, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3835);
+ zephir_array_fetch(&_16$$17, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3838);
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", 3836);
+ zephir_array_fetch(&_17$$17, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3839);
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();
@@ -57910,13 +57932,13 @@ static 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", 3842);
+ zephir_array_append(&values, &_20$$17, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3845);
} else {
- zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3844);
+ zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3847);
zephir_array_update_zval(&snapshot, &attributeField, &value, PH_COPY | PH_SEPARATE);
}
- zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3848);
- zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3849);
+ zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3851);
+ zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3852);
}
}
}
@@ -57943,7 +57965,7 @@ static 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, 33, &_24$$22);
zephir_check_call_status();
- zephir_throw_exception_debug(&_22$$22, "phalcon/Mvc/Model.zep", 3792);
+ zephir_throw_exception_debug(&_22$$22, "phalcon/Mvc/Model.zep", 3795);
ZEPHIR_MM_RESTORE();
return;
}
@@ -57959,9 +57981,9 @@ static 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", 3809);
+ zephir_array_fetch(&_26$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3812);
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", 3810);
+ zephir_array_fetch(&_27$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3813);
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();
@@ -57983,18 +58005,18 @@ static 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, 33, &_33$$30);
zephir_check_call_status();
- zephir_throw_exception_debug(&_31$$30, "phalcon/Mvc/Model.zep", 3827);
+ zephir_throw_exception_debug(&_31$$30, "phalcon/Mvc/Model.zep", 3830);
ZEPHIR_MM_RESTORE();
return;
}
- zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3830);
- zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3831);
- zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3832);
+ zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3833);
+ zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3834);
+ zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3835);
} else {
if (zephir_array_isset(&defaultValues, &field)) {
- zephir_array_fetch(&_34$$32, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3835);
+ zephir_array_fetch(&_34$$32, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3838);
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", 3836);
+ zephir_array_fetch(&_35$$32, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3839);
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();
@@ -58003,13 +58025,13 @@ static 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", 3842);
+ zephir_array_append(&values, &_38$$32, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3845);
} else {
- zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3844);
+ zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3847);
zephir_array_update_zval(&snapshot, &attributeField, &value, PH_COPY | PH_SEPARATE);
}
- zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3848);
- zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3849);
+ zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3851);
+ zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3852);
}
}
}
@@ -58025,7 +58047,7 @@ static 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", 3868);
+ zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3871);
}
if (Z_TYPE_P(&columnMap) == IS_ARRAY) {
ZEPHIR_OBS_NVAR(&attributeField);
@@ -58038,7 +58060,7 @@ static 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, 33, &_43$$38);
zephir_check_call_status();
- zephir_throw_exception_debug(&_41$$38, "phalcon/Mvc/Model.zep", 3878);
+ zephir_throw_exception_debug(&_41$$38, "phalcon/Mvc/Model.zep", 3881);
ZEPHIR_MM_RESTORE();
return;
}
@@ -58053,12 +58075,12 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
}
if (_44$$40) {
if (useExplicitIdentity) {
- zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3890);
- zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3890);
+ zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3893);
+ zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3893);
}
} else {
if (!(useExplicitIdentity)) {
- zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3898);
+ zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3901);
}
ZEPHIR_OBS_NVAR(&bindType);
if (UNEXPECTED(!(zephir_array_isset_fetch(&bindType, &bindDataTypes, identityField, 0)))) {
@@ -58070,23 +58092,23 @@ static 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, 33, &_47$$45);
zephir_check_call_status();
- zephir_throw_exception_debug(&_45$$45, "phalcon/Mvc/Model.zep", 3907);
+ zephir_throw_exception_debug(&_45$$45, "phalcon/Mvc/Model.zep", 3910);
ZEPHIR_MM_RESTORE();
return;
}
- zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3910);
- zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3911);
+ zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3913);
+ zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3914);
}
} else {
if (useExplicitIdentity) {
- zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3915);
- zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3916);
+ zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3918);
+ zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3919);
}
}
}
if (Z_TYPE_P(table) == IS_ARRAY) {
- zephir_array_fetch_long(&_48$$48, table, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3925);
- zephir_array_fetch_long(&_49$$48, table, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3925);
+ zephir_array_fetch_long(&_48$$48, table, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3928);
+ zephir_array_fetch_long(&_49$$48, table, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3928);
ZEPHIR_INIT_VAR(&_50$$48);
ZEPHIR_CONCAT_VSV(&_50$$48, &_48$$48, ".", &_49$$48);
ZEPHIR_CPY_WRT(table, &_50$$48);
@@ -58132,7 +58154,7 @@ static 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", 3986);
+ zephir_is_iterable(&unsetDefaultValues, 0, "phalcon/Mvc/Model.zep", 3989);
if (Z_TYPE_P(&unsetDefaultValues) == IS_ARRAY) {
ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&unsetDefaultValues), _57$$56, _58$$56, _55$$56)
{
@@ -58324,7 +58346,7 @@ static 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", 4146);
+ zephir_is_iterable(&nonPrimary, 0, "phalcon/Mvc/Model.zep", 4149);
if (Z_TYPE_P(&nonPrimary) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&nonPrimary), _3$$5)
{
@@ -58343,7 +58365,7 @@ static 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, 33, &_7$$9);
zephir_check_call_status();
- zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/Model.zep", 4040);
+ zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/Model.zep", 4043);
ZEPHIR_MM_RESTORE();
return;
}
@@ -58362,7 +58384,7 @@ static 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, 33, &_11$$12);
zephir_check_call_status();
- zephir_throw_exception_debug(&_9$$12, "phalcon/Mvc/Model.zep", 4053);
+ zephir_throw_exception_debug(&_9$$12, "phalcon/Mvc/Model.zep", 4056);
ZEPHIR_MM_RESTORE();
return;
}
@@ -58388,7 +58410,7 @@ static 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, 33, &_14$$20);
zephir_check_call_status();
- zephir_throw_exception_debug(&_12$$20, "phalcon/Mvc/Model.zep", 4083);
+ zephir_throw_exception_debug(&_12$$20, "phalcon/Mvc/Model.zep", 4086);
ZEPHIR_MM_RESTORE();
return;
}
@@ -58436,9 +58458,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
}
}
if (changed) {
- 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", 4136);
+ zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4137);
+ zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4138);
}
zephir_array_update_zval(&newSnapshot, &attributeField, &value, PH_COPY | PH_SEPARATE);
} else {
@@ -58470,7 +58492,7 @@ static 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, 33, &_25$$32);
zephir_check_call_status();
- zephir_throw_exception_debug(&_23$$32, "phalcon/Mvc/Model.zep", 4040);
+ zephir_throw_exception_debug(&_23$$32, "phalcon/Mvc/Model.zep", 4043);
ZEPHIR_MM_RESTORE();
return;
}
@@ -58489,7 +58511,7 @@ static 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, 33, &_28$$35);
zephir_check_call_status();
- zephir_throw_exception_debug(&_26$$35, "phalcon/Mvc/Model.zep", 4053);
+ zephir_throw_exception_debug(&_26$$35, "phalcon/Mvc/Model.zep", 4056);
ZEPHIR_MM_RESTORE();
return;
}
@@ -58515,7 +58537,7 @@ static 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, 33, &_31$$43);
zephir_check_call_status();
- zephir_throw_exception_debug(&_29$$43, "phalcon/Mvc/Model.zep", 4083);
+ zephir_throw_exception_debug(&_29$$43, "phalcon/Mvc/Model.zep", 4086);
ZEPHIR_MM_RESTORE();
return;
}
@@ -58563,9 +58585,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
}
}
if (changed) {
- 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", 4136);
+ zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4137);
+ zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4138);
}
zephir_array_update_zval(&newSnapshot, &attributeField, &value, PH_COPY | PH_SEPARATE);
} else {
@@ -58582,7 +58604,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
RETURN_MM_BOOL(1);
}
} else {
- zephir_is_iterable(&nonPrimary, 0, "phalcon/Mvc/Model.zep", 4201);
+ zephir_is_iterable(&nonPrimary, 0, "phalcon/Mvc/Model.zep", 4204);
if (Z_TYPE_P(&nonPrimary) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&nonPrimary), _39$$53)
{
@@ -58600,7 +58622,7 @@ static 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, 33, &_43$$57);
zephir_check_call_status();
- zephir_throw_exception_debug(&_41$$57, "phalcon/Mvc/Model.zep", 4164);
+ zephir_throw_exception_debug(&_41$$57, "phalcon/Mvc/Model.zep", 4167);
ZEPHIR_MM_RESTORE();
return;
}
@@ -58619,21 +58641,21 @@ static 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, 33, &_46$$60);
zephir_check_call_status();
- zephir_throw_exception_debug(&_44$$60, "phalcon/Mvc/Model.zep", 4178);
+ zephir_throw_exception_debug(&_44$$60, "phalcon/Mvc/Model.zep", 4181);
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", 4189);
- zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4190);
- zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4191);
+ zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4192);
+ zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4193);
+ zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4194);
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", 4195);
- zephir_array_append(&values, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4196);
- zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4197);
+ zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4198);
+ zephir_array_append(&values, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4199);
+ zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4200);
}
}
} ZEND_HASH_FOREACH_END();
@@ -58660,7 +58682,7 @@ static 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, 33, &_49$$66);
zephir_check_call_status();
- zephir_throw_exception_debug(&_47$$66, "phalcon/Mvc/Model.zep", 4164);
+ zephir_throw_exception_debug(&_47$$66, "phalcon/Mvc/Model.zep", 4167);
ZEPHIR_MM_RESTORE();
return;
}
@@ -58679,21 +58701,21 @@ static 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, 33, &_52$$69);
zephir_check_call_status();
- zephir_throw_exception_debug(&_50$$69, "phalcon/Mvc/Model.zep", 4178);
+ zephir_throw_exception_debug(&_50$$69, "phalcon/Mvc/Model.zep", 4181);
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", 4189);
- zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4190);
- zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4191);
+ zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4192);
+ zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4193);
+ zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4194);
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", 4195);
- zephir_array_append(&values, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4196);
- zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4197);
+ zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4198);
+ zephir_array_append(&values, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4199);
+ zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4200);
}
}
ZEPHIR_CALL_METHOD(NULL, &nonPrimary, "next", NULL, 0);
@@ -58721,13 +58743,13 @@ static 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, 33, &_55$$74);
zephir_check_call_status();
- zephir_throw_exception_debug(&_53$$74, "phalcon/Mvc/Model.zep", 4224);
+ zephir_throw_exception_debug(&_53$$74, "phalcon/Mvc/Model.zep", 4227);
ZEPHIR_MM_RESTORE();
return;
}
ZEPHIR_INIT_NVAR(&uniqueParams);
array_init(&uniqueParams);
- zephir_is_iterable(&primaryKeys, 0, "phalcon/Mvc/Model.zep", 4251);
+ zephir_is_iterable(&primaryKeys, 0, "phalcon/Mvc/Model.zep", 4254);
if (Z_TYPE_P(&primaryKeys) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&primaryKeys), _56$$73)
{
@@ -58744,7 +58766,7 @@ static 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, 33, &_60$$77);
zephir_check_call_status();
- zephir_throw_exception_debug(&_58$$77, "phalcon/Mvc/Model.zep", 4237);
+ zephir_throw_exception_debug(&_58$$77, "phalcon/Mvc/Model.zep", 4240);
ZEPHIR_MM_RESTORE();
return;
}
@@ -58754,10 +58776,10 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
ZEPHIR_OBS_NVAR(&value);
if (zephir_fetch_property_zval(&value, this_ptr, &attributeField, PH_SILENT_CC)) {
zephir_array_update_zval(&newSnapshot, &attributeField, &value, PH_COPY | PH_SEPARATE);
- zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4245);
+ zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4248);
} else {
zephir_array_update_zval(&newSnapshot, &attributeField, &__$null, PH_COPY | PH_SEPARATE);
- zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4248);
+ zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4251);
}
} ZEND_HASH_FOREACH_END();
} else {
@@ -58782,7 +58804,7 @@ static 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, 33, &_63$$83);
zephir_check_call_status();
- zephir_throw_exception_debug(&_61$$83, "phalcon/Mvc/Model.zep", 4237);
+ zephir_throw_exception_debug(&_61$$83, "phalcon/Mvc/Model.zep", 4240);
ZEPHIR_MM_RESTORE();
return;
}
@@ -58792,10 +58814,10 @@ static PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
ZEPHIR_OBS_NVAR(&value);
if (zephir_fetch_property_zval(&value, this_ptr, &attributeField, PH_SILENT_CC)) {
zephir_array_update_zval(&newSnapshot, &attributeField, &value, PH_COPY | PH_SEPARATE);
- zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4245);
+ zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4248);
} else {
zephir_array_update_zval(&newSnapshot, &attributeField, &__$null, PH_COPY | PH_SEPARATE);
- zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4248);
+ zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4251);
}
ZEPHIR_CALL_METHOD(NULL, &primaryKeys, "next", NULL, 0);
zephir_check_call_status();
@@ -58804,8 +58826,8 @@ static 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", 4257);
- zephir_array_fetch_long(&_65$$87, table, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4257);
+ zephir_array_fetch_long(&_64$$87, table, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4260);
+ zephir_array_fetch_long(&_65$$87, table, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4260);
ZEPHIR_INIT_VAR(&_66$$87);
ZEPHIR_CONCAT_VSV(&_66$$87, &_64$$87, ".", &_65$$87);
ZEPHIR_CPY_WRT(table, &_66$$87);
@@ -58936,7 +58958,7 @@ static 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", 4381);
+ zephir_is_iterable(&primaryKeys, 0, "phalcon/Mvc/Model.zep", 4384);
if (Z_TYPE_P(&primaryKeys) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&primaryKeys), _1$$3)
{
@@ -58953,7 +58975,7 @@ static 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, 33, &_5$$9);
zephir_check_call_status();
- zephir_throw_exception_debug(&_3$$9, "phalcon/Mvc/Model.zep", 4340);
+ zephir_throw_exception_debug(&_3$$9, "phalcon/Mvc/Model.zep", 4343);
ZEPHIR_MM_RESTORE();
return;
}
@@ -58971,9 +58993,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, has)
if (_7$$11) {
numberEmpty++;
}
- zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4361);
+ zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4364);
} else {
- zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4363);
+ zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4366);
numberEmpty++;
}
ZEPHIR_OBS_NVAR(&type);
@@ -58986,16 +59008,16 @@ static 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, 33, &_10$$14);
zephir_check_call_status();
- zephir_throw_exception_debug(&_8$$14, "phalcon/Mvc/Model.zep", 4370);
+ zephir_throw_exception_debug(&_8$$14, "phalcon/Mvc/Model.zep", 4373);
ZEPHIR_MM_RESTORE();
return;
}
- zephir_array_append(&uniqueTypes, &type, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4373);
+ zephir_array_append(&uniqueTypes, &type, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4376);
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", 4374);
+ zephir_array_append(&wherePk, &_13$$7, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4377);
} ZEND_HASH_FOREACH_END();
} else {
ZEPHIR_CALL_METHOD(NULL, &primaryKeys, "rewind", NULL, 0);
@@ -59019,7 +59041,7 @@ static 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, 33, &_16$$17);
zephir_check_call_status();
- zephir_throw_exception_debug(&_14$$17, "phalcon/Mvc/Model.zep", 4340);
+ zephir_throw_exception_debug(&_14$$17, "phalcon/Mvc/Model.zep", 4343);
ZEPHIR_MM_RESTORE();
return;
}
@@ -59037,9 +59059,9 @@ static PHP_METHOD(Phalcon_Mvc_Model, has)
if (_17$$19) {
numberEmpty++;
}
- zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4361);
+ zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4364);
} else {
- zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4363);
+ zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4366);
numberEmpty++;
}
ZEPHIR_OBS_NVAR(&type);
@@ -59052,16 +59074,16 @@ static 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, 33, &_20$$22);
zephir_check_call_status();
- zephir_throw_exception_debug(&_18$$22, "phalcon/Mvc/Model.zep", 4370);
+ zephir_throw_exception_debug(&_18$$22, "phalcon/Mvc/Model.zep", 4373);
ZEPHIR_MM_RESTORE();
return;
}
- zephir_array_append(&uniqueTypes, &type, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4373);
+ zephir_array_append(&uniqueTypes, &type, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4376);
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", 4374);
+ zephir_array_append(&wherePk, &_23$$15, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4377);
ZEPHIR_CALL_METHOD(NULL, &primaryKeys, "next", NULL, 0);
zephir_check_call_status();
}
@@ -59112,7 +59134,7 @@ static 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", 4435);
+ zephir_array_fetch_string(&_30, &num, SL("rowcount"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4438);
if (zephir_is_true(&_30)) {
ZVAL_UNDEF(&_31$$30);
ZVAL_LONG(&_31$$30, 0);
@@ -59293,7 +59315,7 @@ static 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", 4540);
+ zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4543);
}
} else {
ZEPHIR_CPY_WRT(¶ms, parameters);
@@ -59337,10 +59359,10 @@ static 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", 4583);
+ zephir_array_fetch_string(&bindParams, ¶ms, SL("bind"), PH_NOISY, "phalcon/Mvc/Model.zep", 4586);
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", 4586);
+ zephir_array_fetch_string(&bindTypes, ¶ms, SL("bindTypes"), PH_NOISY, "phalcon/Mvc/Model.zep", 4589);
}
}
zephir_memory_observe(&cache);
@@ -59440,7 +59462,7 @@ static 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, 33, &_5$$7);
zephir_check_call_status();
- zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model.zep", 4665);
+ zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model.zep", 4668);
ZEPHIR_MM_RESTORE();
return;
}
@@ -59474,7 +59496,7 @@ static 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, 33, &_8$$13);
zephir_check_call_status();
- zephir_throw_exception_debug(&_6$$13, "phalcon/Mvc/Model.zep", 4702);
+ zephir_throw_exception_debug(&_6$$13, "phalcon/Mvc/Model.zep", 4705);
ZEPHIR_MM_RESTORE();
return;
}
@@ -59681,7 +59703,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, preSave)
ZEPHIR_CALL_METHOD(&emptyStringValues, metaData, "getemptystringattributes", NULL, 0, this_ptr);
zephir_check_call_status();
error = 0;
- zephir_is_iterable(¬Null, 0, "phalcon/Mvc/Model.zep", 4943);
+ zephir_is_iterable(¬Null, 0, "phalcon/Mvc/Model.zep", 4946);
if (Z_TYPE_P(¬Null) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(¬Null), _4$$11)
{
@@ -59699,7 +59721,7 @@ static 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, 33, &_8$$19);
zephir_check_call_status();
- zephir_throw_exception_debug(&_6$$19, "phalcon/Mvc/Model.zep", 4863);
+ zephir_throw_exception_debug(&_6$$19, "phalcon/Mvc/Model.zep", 4866);
ZEPHIR_MM_RESTORE();
return;
}
@@ -59724,7 +59746,7 @@ static 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", 4893);
+ zephir_array_fetch(&_13$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4896);
_12$$27 = !ZEPHIR_IS_IDENTICAL(&value, &_13$$27);
}
_11$$27 = _12$$27;
@@ -59795,7 +59817,7 @@ static 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, 33, &_22$$39);
zephir_check_call_status();
- zephir_throw_exception_debug(&_20$$39, "phalcon/Mvc/Model.zep", 4863);
+ zephir_throw_exception_debug(&_20$$39, "phalcon/Mvc/Model.zep", 4866);
ZEPHIR_MM_RESTORE();
return;
}
@@ -59820,7 +59842,7 @@ static 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", 4893);
+ zephir_array_fetch(&_26$$47, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4896);
_25$$47 = !ZEPHIR_IS_IDENTICAL(&value, &_26$$47);
}
_24$$47 = _25$$47;
@@ -60022,7 +60044,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, preSaveRelatedRecords)
ZEPHIR_CALL_METHOD(&_1, this_ptr, "getmodelsmanager", NULL, 0);
zephir_check_call_status();
ZEPHIR_CPY_WRT(&manager, &_1);
- zephir_is_iterable(related, 0, "phalcon/Mvc/Model.zep", 5107);
+ zephir_is_iterable(related, 0, "phalcon/Mvc/Model.zep", 5110);
if (Z_TYPE_P(related) == IS_ARRAY) {
ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(related), _4, _5, _2)
{
@@ -60057,7 +60079,7 @@ static 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, 33, &_12$$6);
zephir_check_call_status();
- zephir_throw_exception_debug(&_10$$6, "phalcon/Mvc/Model.zep", 5065);
+ zephir_throw_exception_debug(&_10$$6, "phalcon/Mvc/Model.zep", 5068);
ZEPHIR_MM_RESTORE();
return;
}
@@ -60081,7 +60103,7 @@ static 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, 33, &_18$$7);
zephir_check_call_status();
- zephir_throw_exception_debug(&_16$$7, "phalcon/Mvc/Model.zep", 5076);
+ zephir_throw_exception_debug(&_16$$7, "phalcon/Mvc/Model.zep", 5079);
ZEPHIR_MM_RESTORE();
return;
}
@@ -60146,7 +60168,7 @@ static 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, 33, &_32$$12);
zephir_check_call_status();
- zephir_throw_exception_debug(&_30$$12, "phalcon/Mvc/Model.zep", 5065);
+ zephir_throw_exception_debug(&_30$$12, "phalcon/Mvc/Model.zep", 5068);
ZEPHIR_MM_RESTORE();
return;
}
@@ -60170,7 +60192,7 @@ static 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, 33, &_37$$13);
zephir_check_call_status();
- zephir_throw_exception_debug(&_35$$13, "phalcon/Mvc/Model.zep", 5076);
+ zephir_throw_exception_debug(&_35$$13, "phalcon/Mvc/Model.zep", 5079);
ZEPHIR_MM_RESTORE();
return;
}
@@ -60364,7 +60386,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmodelsmanager", NULL, 0);
zephir_check_call_status();
ZEPHIR_CPY_WRT(&manager, &_0);
- zephir_is_iterable(related, 0, "phalcon/Mvc/Model.zep", 5335);
+ zephir_is_iterable(related, 0, "phalcon/Mvc/Model.zep", 5338);
if (Z_TYPE_P(related) == IS_ARRAY) {
ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(related), _3, _4, _1)
{
@@ -60403,7 +60425,7 @@ static 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, 33, &_12$$6);
zephir_check_call_status();
- zephir_throw_exception_debug(&_11$$6, "phalcon/Mvc/Model.zep", 5170);
+ zephir_throw_exception_debug(&_11$$6, "phalcon/Mvc/Model.zep", 5173);
ZEPHIR_MM_RESTORE();
return;
}
@@ -60427,7 +60449,7 @@ static 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, 33, &_17$$7);
zephir_check_call_status();
- zephir_throw_exception_debug(&_16$$7, "phalcon/Mvc/Model.zep", 5180);
+ zephir_throw_exception_debug(&_16$$7, "phalcon/Mvc/Model.zep", 5183);
ZEPHIR_MM_RESTORE();
return;
}
@@ -60453,7 +60475,7 @@ static 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, 33, &_21$$10);
zephir_check_call_status();
- zephir_throw_exception_debug(&_20$$10, "phalcon/Mvc/Model.zep", 5197);
+ zephir_throw_exception_debug(&_20$$10, "phalcon/Mvc/Model.zep", 5200);
ZEPHIR_MM_RESTORE();
return;
}
@@ -60467,7 +60489,7 @@ static 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", 5296);
+ zephir_is_iterable(&relatedRecords, 0, "phalcon/Mvc/Model.zep", 5299);
if (Z_TYPE_P(&relatedRecords) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relatedRecords), _23$$11)
{
@@ -60601,7 +60623,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
}
ZEPHIR_INIT_NVAR(&recordAfter);
} else {
- zephir_is_iterable(&relatedRecords, 0, "phalcon/Mvc/Model.zep", 5320);
+ zephir_is_iterable(&relatedRecords, 0, "phalcon/Mvc/Model.zep", 5323);
if (Z_TYPE_P(&relatedRecords) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relatedRecords), _50$$22)
{
@@ -60672,7 +60694,7 @@ static 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, 33, &_61$$28);
zephir_check_call_status();
- zephir_throw_exception_debug(&_60$$28, "phalcon/Mvc/Model.zep", 5327);
+ zephir_throw_exception_debug(&_60$$28, "phalcon/Mvc/Model.zep", 5330);
ZEPHIR_MM_RESTORE();
return;
}
@@ -60718,7 +60740,7 @@ static 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, 33, &_69$$32);
zephir_check_call_status();
- zephir_throw_exception_debug(&_68$$32, "phalcon/Mvc/Model.zep", 5170);
+ zephir_throw_exception_debug(&_68$$32, "phalcon/Mvc/Model.zep", 5173);
ZEPHIR_MM_RESTORE();
return;
}
@@ -60742,7 +60764,7 @@ static 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, 33, &_73$$33);
zephir_check_call_status();
- zephir_throw_exception_debug(&_72$$33, "phalcon/Mvc/Model.zep", 5180);
+ zephir_throw_exception_debug(&_72$$33, "phalcon/Mvc/Model.zep", 5183);
ZEPHIR_MM_RESTORE();
return;
}
@@ -60769,7 +60791,7 @@ static 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, 33, &_78$$36);
zephir_check_call_status();
- zephir_throw_exception_debug(&_77$$36, "phalcon/Mvc/Model.zep", 5197);
+ zephir_throw_exception_debug(&_77$$36, "phalcon/Mvc/Model.zep", 5200);
ZEPHIR_MM_RESTORE();
return;
}
@@ -60783,7 +60805,7 @@ static 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", 5296);
+ zephir_is_iterable(&relatedRecords, 0, "phalcon/Mvc/Model.zep", 5299);
if (Z_TYPE_P(&relatedRecords) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relatedRecords), _80$$37)
{
@@ -60917,7 +60939,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
}
ZEPHIR_INIT_NVAR(&recordAfter);
} else {
- zephir_is_iterable(&relatedRecords, 0, "phalcon/Mvc/Model.zep", 5320);
+ zephir_is_iterable(&relatedRecords, 0, "phalcon/Mvc/Model.zep", 5323);
if (Z_TYPE_P(&relatedRecords) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relatedRecords), _106$$48)
{
@@ -60988,7 +61010,7 @@ static 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, 33, &_117$$54);
zephir_check_call_status();
- zephir_throw_exception_debug(&_116$$54, "phalcon/Mvc/Model.zep", 5327);
+ zephir_throw_exception_debug(&_116$$54, "phalcon/Mvc/Model.zep", 5330);
ZEPHIR_MM_RESTORE();
return;
}
@@ -61032,7 +61054,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, allowEmptyStringValues)
ZEPHIR_OBS_COPY_OR_DUP(&attributes, attributes_param);
ZEPHIR_INIT_VAR(&keysAttributes);
array_init(&keysAttributes);
- zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5368);
+ zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5371);
if (Z_TYPE_P(&attributes) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _0)
{
@@ -61568,7 +61590,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, skipAttributesOnCreate)
ZEPHIR_OBS_COPY_OR_DUP(&attributes, attributes_param);
ZEPHIR_INIT_VAR(&keysAttributes);
array_init(&keysAttributes);
- zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5827);
+ zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5830);
if (Z_TYPE_P(&attributes) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _0)
{
@@ -61623,7 +61645,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, skipAttributesOnUpdate)
ZEPHIR_OBS_COPY_OR_DUP(&attributes, attributes_param);
ZEPHIR_INIT_VAR(&keysAttributes);
array_init(&keysAttributes);
- zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5862);
+ zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5865);
if (Z_TYPE_P(&attributes) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _0)
{
@@ -61774,7 +61796,7 @@ static PHP_METHOD(Phalcon_Mvc_Model, caseInsensitiveColumnMap)
zephir_fetch_params(1, 2, 0, &columnMap, &key);
ZEPHIR_INIT_VAR(&_0);
zephir_array_keys(&_0, columnMap);
- zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model.zep", 5999);
+ zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model.zep", 6002);
if (Z_TYPE_P(&_0) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _1)
{
@@ -61842,7 +61864,7 @@ static 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", 6023);
+ zephir_is_iterable(&messages, 0, "phalcon/Mvc/Model.zep", 6026);
if (Z_TYPE_P(&messages) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&messages), _0$$3)
{
@@ -124590,7 +124612,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, validate)
zephir_read_property(&_0, this_ptr, ZEND_STRL("combinedFieldsValidators"), PH_NOISY_CC | PH_READONLY);
ZEPHIR_CPY_WRT(&combinedFieldsValidators, &_0);
if (UNEXPECTED(Z_TYPE_P(&validatorData) != IS_ARRAY)) {
- ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "There are no validators to validate", "phalcon/Filter/Validation.zep", 491);
+ ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "There are no validators to validate", "phalcon/Filter/Validation.zep", 493);
return;
}
ZEPHIR_INIT_VAR(&_1);
@@ -124618,12 +124640,12 @@ static PHP_METHOD(Phalcon_Filter_Validation, validate)
_2$$7 = Z_TYPE_P(data) != IS_OBJECT;
}
if (UNEXPECTED(_2$$7)) {
- ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Invalid data to validate", "phalcon/Filter/Validation.zep", 523);
+ ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Invalid data to validate", "phalcon/Filter/Validation.zep", 525);
return;
}
zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data);
}
- zephir_is_iterable(&validatorData, 0, "phalcon/Filter/Validation.zep", 554);
+ zephir_is_iterable(&validatorData, 0, "phalcon/Filter/Validation.zep", 556);
if (Z_TYPE_P(&validatorData) == IS_ARRAY) {
ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&validatorData), _5, _6, _3)
{
@@ -124635,14 +124657,14 @@ static PHP_METHOD(Phalcon_Filter_Validation, validate)
}
ZEPHIR_INIT_NVAR(&validators);
ZVAL_COPY(&validators, _3);
- zephir_is_iterable(&validators, 0, "phalcon/Filter/Validation.zep", 552);
+ zephir_is_iterable(&validators, 0, "phalcon/Filter/Validation.zep", 554);
if (Z_TYPE_P(&validators) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&validators), _7$$9)
{
ZEPHIR_INIT_NVAR(&validator);
ZVAL_COPY(&validator, _7$$9);
if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) {
- ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 532);
+ ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 534);
return;
}
ZEPHIR_CALL_METHOD(&_9$$10, this_ptr, "prechecking", &_10, 0, &field, &validator);
@@ -124674,7 +124696,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, validate)
ZEPHIR_CALL_METHOD(&validator, &validators, "current", NULL, 0);
zephir_check_call_status();
if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) {
- ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 532);
+ ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 534);
return;
}
ZEPHIR_CALL_METHOD(&_14$$15, this_ptr, "prechecking", &_10, 0, &field, &validator);
@@ -124712,14 +124734,14 @@ static PHP_METHOD(Phalcon_Filter_Validation, validate)
zephir_check_call_status();
ZEPHIR_CALL_METHOD(&validators, &validatorData, "current", NULL, 0);
zephir_check_call_status();
- zephir_is_iterable(&validators, 0, "phalcon/Filter/Validation.zep", 552);
+ zephir_is_iterable(&validators, 0, "phalcon/Filter/Validation.zep", 554);
if (Z_TYPE_P(&validators) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&validators), _18$$20)
{
ZEPHIR_INIT_NVAR(&validator);
ZVAL_COPY(&validator, _18$$20);
if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) {
- ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 532);
+ ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 534);
return;
}
ZEPHIR_CALL_METHOD(&_20$$21, this_ptr, "prechecking", &_10, 0, &field, &validator);
@@ -124751,7 +124773,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, validate)
ZEPHIR_CALL_METHOD(&validator, &validators, "current", NULL, 0);
zephir_check_call_status();
if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) {
- ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 532);
+ ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 534);
return;
}
ZEPHIR_CALL_METHOD(&_24$$26, this_ptr, "prechecking", &_10, 0, &field, &validator);
@@ -124781,22 +124803,22 @@ static PHP_METHOD(Phalcon_Filter_Validation, validate)
}
ZEPHIR_INIT_NVAR(&validators);
ZEPHIR_INIT_NVAR(&field);
- zephir_is_iterable(&combinedFieldsValidators, 0, "phalcon/Filter/Validation.zep", 587);
+ zephir_is_iterable(&combinedFieldsValidators, 0, "phalcon/Filter/Validation.zep", 589);
if (Z_TYPE_P(&combinedFieldsValidators) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&combinedFieldsValidators), _28)
{
ZEPHIR_INIT_NVAR(&scope);
ZVAL_COPY(&scope, _28);
if (UNEXPECTED(Z_TYPE_P(&scope) != IS_ARRAY)) {
- ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "The validator scope is not valid", "phalcon/Filter/Validation.zep", 556);
+ ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "The validator scope is not valid", "phalcon/Filter/Validation.zep", 558);
return;
}
ZEPHIR_OBS_NVAR(&field);
- zephir_array_fetch_long(&field, &scope, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 559);
+ zephir_array_fetch_long(&field, &scope, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 561);
ZEPHIR_OBS_NVAR(&validator);
- zephir_array_fetch_long(&validator, &scope, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 560);
+ zephir_array_fetch_long(&validator, &scope, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 562);
if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) {
- ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 563);
+ ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 565);
return;
}
ZEPHIR_CALL_METHOD(&_30$$31, this_ptr, "prechecking", &_10, 0, &field, &validator);
@@ -124828,15 +124850,15 @@ static PHP_METHOD(Phalcon_Filter_Validation, validate)
ZEPHIR_CALL_METHOD(&scope, &combinedFieldsValidators, "current", NULL, 0);
zephir_check_call_status();
if (UNEXPECTED(Z_TYPE_P(&scope) != IS_ARRAY)) {
- ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "The validator scope is not valid", "phalcon/Filter/Validation.zep", 556);
+ ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "The validator scope is not valid", "phalcon/Filter/Validation.zep", 558);
return;
}
ZEPHIR_OBS_NVAR(&field);
- zephir_array_fetch_long(&field, &scope, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 559);
+ zephir_array_fetch_long(&field, &scope, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 561);
ZEPHIR_OBS_NVAR(&validator);
- zephir_array_fetch_long(&validator, &scope, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 560);
+ zephir_array_fetch_long(&validator, &scope, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 562);
if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) {
- ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 563);
+ ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 565);
return;
}
ZEPHIR_CALL_METHOD(&_34$$37, this_ptr, "prechecking", &_10, 0, &field, &validator);
@@ -124901,7 +124923,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, preChecking)
ZEPHIR_INIT_VAR(&results);
array_init(&results);
if (Z_TYPE_P(field) == IS_ARRAY) {
- zephir_is_iterable(field, 0, "phalcon/Filter/Validation.zep", 615);
+ zephir_is_iterable(field, 0, "phalcon/Filter/Validation.zep", 617);
if (Z_TYPE_P(field) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(field), _0$$3)
{
@@ -124909,7 +124931,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, preChecking)
ZVAL_COPY(&singleField, _0$$3);
ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "prechecking", &_3, 291, &singleField, validator);
zephir_check_call_status();
- zephir_array_append(&results, &_2$$4, PH_SEPARATE, "phalcon/Filter/Validation.zep", 607);
+ zephir_array_append(&results, &_2$$4, PH_SEPARATE, "phalcon/Filter/Validation.zep", 609);
if (zephir_fast_in_array(&__$false, &results)) {
RETURN_MM_BOOL(0);
}
@@ -124928,7 +124950,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, preChecking)
zephir_check_call_status();
ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "prechecking", &_3, 291, &singleField, validator);
zephir_check_call_status();
- zephir_array_append(&results, &_4$$6, PH_SEPARATE, "phalcon/Filter/Validation.zep", 607);
+ zephir_array_append(&results, &_4$$6, PH_SEPARATE, "phalcon/Filter/Validation.zep", 609);
if (zephir_fast_in_array(&__$false, &results)) {
RETURN_MM_BOOL(0);
}
@@ -124953,7 +124975,7 @@ static PHP_METHOD(Phalcon_Filter_Validation, preChecking)
ZEPHIR_CALL_METHOD(&value, this_ptr, "getvalue", NULL, 0, field);
zephir_check_call_status();
if (Z_TYPE_P(&allowEmpty) == IS_ARRAY) {
- zephir_is_iterable(&allowEmpty, 0, "phalcon/Filter/Validation.zep", 632);
+ zephir_is_iterable(&allowEmpty, 0, "phalcon/Filter/Validation.zep", 634);
if (Z_TYPE_P(&allowEmpty) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&allowEmpty), _7$$11)
{
@@ -138911,8 +138933,8 @@ static PHP_METHOD(Phalcon_Http_Request, getPatchPut)
{
zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
zend_long ZEPHIR_LAST_CALL_STATUS;
- zend_bool notAllowEmpty, noRecursive;
- zval *collection_param = NULL, *name_param = NULL, *filters = NULL, filters_sub, *defaultValue = NULL, defaultValue_sub, *notAllowEmpty_param = NULL, *noRecursive_param = NULL, __$null, cached, contentType, _5, _6, _0$$4, _1$$4, _3$$4, _2$$5, _4$$8;
+ zend_bool notAllowEmpty, noRecursive, _0$$3, _3$$3;
+ zval *collection_param = NULL, *name_param = NULL, *filters = NULL, filters_sub, *defaultValue = NULL, defaultValue_sub, *notAllowEmpty_param = NULL, *noRecursive_param = NULL, __$null, cached, contentType, _10, _11, _1$$3, _2$$3, _4$$3, _5$$4, _6$$4, _8$$4, _7$$5, _9$$8;
zval collection, name;
zval *this_ptr = getThis();
@@ -138923,13 +138945,16 @@ static PHP_METHOD(Phalcon_Http_Request, getPatchPut)
ZVAL_NULL(&__$null);
ZVAL_UNDEF(&cached);
ZVAL_UNDEF(&contentType);
- ZVAL_UNDEF(&_5);
- ZVAL_UNDEF(&_6);
- ZVAL_UNDEF(&_0$$4);
- ZVAL_UNDEF(&_1$$4);
- ZVAL_UNDEF(&_3$$4);
- ZVAL_UNDEF(&_2$$5);
- ZVAL_UNDEF(&_4$$8);
+ ZVAL_UNDEF(&_10);
+ ZVAL_UNDEF(&_11);
+ ZVAL_UNDEF(&_1$$3);
+ ZVAL_UNDEF(&_2$$3);
+ ZVAL_UNDEF(&_4$$3);
+ ZVAL_UNDEF(&_5$$4);
+ ZVAL_UNDEF(&_6$$4);
+ ZVAL_UNDEF(&_8$$4);
+ ZVAL_UNDEF(&_7$$5);
+ ZVAL_UNDEF(&_9$$8);
bool is_null_true = 1;
ZEND_PARSE_PARAMETERS_START(1, 6)
Z_PARAM_STR(collection)
@@ -138970,21 +138995,37 @@ static PHP_METHOD(Phalcon_Http_Request, getPatchPut)
if (Z_TYPE_P(&cached) == IS_NULL) {
ZEPHIR_CALL_METHOD(&contentType, this_ptr, "getcontenttype", NULL, 0);
zephir_check_call_status();
- if (Z_TYPE_P(&contentType) == IS_STRING) {
- ZEPHIR_INIT_VAR(&_0$$4);
- ZVAL_STRING(&_0$$4, "json");
- ZEPHIR_CALL_FUNCTION(&_1$$4, "stripos", NULL, 348, &contentType, &_0$$4);
+ _0$$3 = Z_TYPE_P(&contentType) == IS_STRING;
+ if (_0$$3) {
+ ZEPHIR_INIT_VAR(&_1$$3);
+ ZVAL_STRING(&_1$$3, "json");
+ ZEPHIR_CALL_FUNCTION(&_2$$3, "stripos", NULL, 348, &contentType, &_1$$3);
zephir_check_call_status();
- if (!ZEPHIR_IS_FALSE(&_1$$4)) {
- ZVAL_BOOL(&_2$$5, 1);
- ZEPHIR_CALL_METHOD(&cached, this_ptr, "getjsonrawbody", NULL, 0, &_2$$5);
+ _3$$3 = !ZEPHIR_IS_FALSE(&_2$$3);
+ if (!(_3$$3)) {
+ ZEPHIR_INIT_NVAR(&_1$$3);
+ ZVAL_STRING(&_1$$3, "multipart/form-data");
+ ZEPHIR_CALL_FUNCTION(&_4$$3, "stripos", NULL, 348, &contentType, &_1$$3);
zephir_check_call_status();
+ _3$$3 = !ZEPHIR_IS_FALSE_IDENTICAL(&_4$$3);
}
- ZEPHIR_INIT_NVAR(&_0$$4);
- ZVAL_STRING(&_0$$4, "multipart/form-data");
- ZEPHIR_CALL_FUNCTION(&_3$$4, "stripos", NULL, 348, &contentType, &_0$$4);
+ _0$$3 = _3$$3;
+ }
+ if (_0$$3) {
+ ZEPHIR_INIT_VAR(&_5$$4);
+ ZVAL_STRING(&_5$$4, "json");
+ ZEPHIR_CALL_FUNCTION(&_6$$4, "stripos", NULL, 348, &contentType, &_5$$4);
+ zephir_check_call_status();
+ if (!ZEPHIR_IS_FALSE(&_6$$4)) {
+ ZVAL_BOOL(&_7$$5, 1);
+ ZEPHIR_CALL_METHOD(&cached, this_ptr, "getjsonrawbody", NULL, 0, &_7$$5);
+ zephir_check_call_status();
+ }
+ ZEPHIR_INIT_NVAR(&_5$$4);
+ ZVAL_STRING(&_5$$4, "multipart/form-data");
+ ZEPHIR_CALL_FUNCTION(&_8$$4, "stripos", NULL, 348, &contentType, &_5$$4);
zephir_check_call_status();
- if (!ZEPHIR_IS_FALSE_IDENTICAL(&_3$$4)) {
+ if (!ZEPHIR_IS_FALSE_IDENTICAL(&_8$$4)) {
ZEPHIR_CALL_METHOD(&cached, this_ptr, "getformdata", NULL, 349);
zephir_check_call_status();
}
@@ -138995,26 +139036,26 @@ static PHP_METHOD(Phalcon_Http_Request, getPatchPut)
} else {
ZEPHIR_INIT_NVAR(&cached);
array_init(&cached);
- ZEPHIR_CALL_METHOD(&_4$$8, this_ptr, "getrawbody", NULL, 0);
+ ZEPHIR_CALL_METHOD(&_9$$8, this_ptr, "getrawbody", NULL, 0);
zephir_check_call_status();
ZEPHIR_MAKE_REF(&cached);
- ZEPHIR_CALL_FUNCTION(NULL, "parse_str", NULL, 350, &_4$$8, &cached);
+ ZEPHIR_CALL_FUNCTION(NULL, "parse_str", NULL, 350, &_9$$8, &cached);
ZEPHIR_UNREF(&cached);
zephir_check_call_status();
}
zephir_update_property_zval_zval(this_ptr, &collection, &cached);
}
if (notAllowEmpty) {
- ZVAL_BOOL(&_5, 1);
+ ZVAL_BOOL(&_10, 1);
} else {
- ZVAL_BOOL(&_5, 0);
+ ZVAL_BOOL(&_10, 0);
}
if (noRecursive) {
- ZVAL_BOOL(&_6, 1);
+ ZVAL_BOOL(&_11, 1);
} else {
- ZVAL_BOOL(&_6, 0);
+ ZVAL_BOOL(&_11, 0);
}
- ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 333, &cached, &name, filters, defaultValue, &_5, &_6);
+ ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 333, &cached, &name, filters, defaultValue, &_10, &_11);
zephir_check_call_status();
RETURN_MM();
}
@@ -139218,7 +139259,7 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData)
ZVAL_STRING(&_3, "/boundary=(.*)$/is");
zephir_preg_match(&_2, &_3, &_0, &matches, 0, 0 , 0 );
zephir_memory_observe(&boundary);
- zephir_array_fetch_long(&boundary, &matches, 1, PH_NOISY, "phalcon/Http/Request.zep", 1766);
+ zephir_array_fetch_long(&boundary, &matches, 1, PH_NOISY, "phalcon/Http/Request.zep", 1771);
ZEPHIR_INIT_VAR(&_4);
ZVAL_STRING(&_4, "/");
ZEPHIR_CALL_FUNCTION(&_5, "preg_quote", NULL, 351, &boundary, &_4);
@@ -139235,7 +139276,7 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData)
zephir_check_call_status();
ZEPHIR_INIT_VAR(&dataset);
array_init(&dataset);
- zephir_is_iterable(&bodyParts, 0, "phalcon/Http/Request.zep", 1827);
+ zephir_is_iterable(&bodyParts, 0, "phalcon/Http/Request.zep", 1832);
if (Z_TYPE_P(&bodyParts) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&bodyParts), _8)
{
@@ -139251,14 +139292,14 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData)
zephir_check_call_status();
ZEPHIR_INIT_NVAR(&headers$$3);
array_init(&headers$$3);
- zephir_array_fetch_long(&_12$$3, &splited$$3, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1788);
+ zephir_array_fetch_long(&_12$$3, &splited$$3, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1793);
ZEPHIR_INIT_NVAR(&_10$$3);
ZVAL_STRING(&_10$$3, "/\\R/s");
ZVAL_LONG(&_11$$3, -1);
ZVAL_LONG(&_13$$3, 1);
ZEPHIR_CALL_FUNCTION(&headerParts$$3, "preg_split", NULL, 71, &_10$$3, &_12$$3, &_11$$3, &_13$$3);
zephir_check_call_status();
- zephir_is_iterable(&headerParts$$3, 0, "phalcon/Http/Request.zep", 1824);
+ zephir_is_iterable(&headerParts$$3, 0, "phalcon/Http/Request.zep", 1829);
if (Z_TYPE_P(&headerParts$$3) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&headerParts$$3), _14$$3)
{
@@ -139274,11 +139315,11 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData)
ZEPHIR_INIT_NVAR(&exploded$$5);
zephir_fast_explode_str(&exploded$$5, SL(":"), &headerPart$$3, 2 );
ZEPHIR_INIT_NVAR(&_18$$5);
- zephir_array_fetch_long(&_19$$5, &exploded$$5, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1798);
+ zephir_array_fetch_long(&_19$$5, &exploded$$5, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1803);
zephir_fast_trim(&_18$$5, &_19$$5, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&headerName$$5);
zephir_fast_strtolower(&headerName$$5, &_18$$5);
- zephir_array_fetch_long(&_20$$5, &exploded$$5, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1799);
+ zephir_array_fetch_long(&_20$$5, &exploded$$5, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1804);
ZEPHIR_INIT_NVAR(&headerValue$$5);
zephir_fast_trim(&headerValue$$5, &_20$$5, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&_21$$5);
@@ -139288,7 +139329,7 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData)
if (!ZEPHIR_IS_FALSE_IDENTICAL(&_22$$5)) {
ZEPHIR_INIT_NVAR(&explodedHeader$$7);
zephir_fast_explode_str(&explodedHeader$$7, SL(";"), &headerValue$$5, LONG_MAX);
- zephir_is_iterable(&explodedHeader$$7, 0, "phalcon/Http/Request.zep", 1819);
+ zephir_is_iterable(&explodedHeader$$7, 0, "phalcon/Http/Request.zep", 1824);
if (Z_TYPE_P(&explodedHeader$$7) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&explodedHeader$$7), _23$$7)
{
@@ -139310,12 +139351,12 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData)
ZEPHIR_INIT_NVAR(&explodedPart$$9);
zephir_fast_explode_str(&explodedPart$$9, SL("="), &part$$7, 2 );
ZEPHIR_INIT_NVAR(&_29$$9);
- zephir_array_fetch_long(&_30$$9, &explodedPart$$9, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1811);
+ zephir_array_fetch_long(&_30$$9, &explodedPart$$9, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1816);
zephir_fast_trim(&_29$$9, &_30$$9, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&namePart$$9);
zephir_fast_strtolower(&namePart$$9, &_29$$9);
ZEPHIR_INIT_NVAR(&_31$$9);
- zephir_array_fetch_long(&_32$$9, &explodedPart$$9, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1812);
+ zephir_array_fetch_long(&_32$$9, &explodedPart$$9, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1817);
zephir_fast_trim(&_31$$9, &_32$$9, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&_33$$9);
ZVAL_STRING(&_33$$9, "\"");
@@ -139353,12 +139394,12 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData)
ZEPHIR_INIT_NVAR(&explodedPart$$12);
zephir_fast_explode_str(&explodedPart$$12, SL("="), &part$$7, 2 );
ZEPHIR_INIT_NVAR(&_37$$12);
- zephir_array_fetch_long(&_38$$12, &explodedPart$$12, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1811);
+ zephir_array_fetch_long(&_38$$12, &explodedPart$$12, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1816);
zephir_fast_trim(&_37$$12, &_38$$12, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&namePart$$12);
zephir_fast_strtolower(&namePart$$12, &_37$$12);
ZEPHIR_INIT_NVAR(&_39$$12);
- zephir_array_fetch_long(&_40$$12, &explodedPart$$12, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1812);
+ zephir_array_fetch_long(&_40$$12, &explodedPart$$12, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1817);
zephir_fast_trim(&_39$$12, &_40$$12, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&_41$$12);
ZVAL_STRING(&_41$$12, "\"");
@@ -139398,11 +139439,11 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData)
ZEPHIR_INIT_NVAR(&exploded$$15);
zephir_fast_explode_str(&exploded$$15, SL(":"), &headerPart$$3, 2 );
ZEPHIR_INIT_NVAR(&_44$$15);
- zephir_array_fetch_long(&_45$$15, &exploded$$15, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1798);
+ zephir_array_fetch_long(&_45$$15, &exploded$$15, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1803);
zephir_fast_trim(&_44$$15, &_45$$15, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&headerName$$15);
zephir_fast_strtolower(&headerName$$15, &_44$$15);
- zephir_array_fetch_long(&_46$$15, &exploded$$15, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1799);
+ zephir_array_fetch_long(&_46$$15, &exploded$$15, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1804);
ZEPHIR_INIT_NVAR(&headerValue$$15);
zephir_fast_trim(&headerValue$$15, &_46$$15, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&_47$$15);
@@ -139412,7 +139453,7 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData)
if (!ZEPHIR_IS_FALSE_IDENTICAL(&_48$$15)) {
ZEPHIR_INIT_NVAR(&explodedHeader$$17);
zephir_fast_explode_str(&explodedHeader$$17, SL(";"), &headerValue$$15, LONG_MAX);
- zephir_is_iterable(&explodedHeader$$17, 0, "phalcon/Http/Request.zep", 1819);
+ zephir_is_iterable(&explodedHeader$$17, 0, "phalcon/Http/Request.zep", 1824);
if (Z_TYPE_P(&explodedHeader$$17) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&explodedHeader$$17), _49$$17)
{
@@ -139434,12 +139475,12 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData)
ZEPHIR_INIT_NVAR(&explodedPart$$19);
zephir_fast_explode_str(&explodedPart$$19, SL("="), &part$$17, 2 );
ZEPHIR_INIT_NVAR(&_54$$19);
- zephir_array_fetch_long(&_55$$19, &explodedPart$$19, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1811);
+ zephir_array_fetch_long(&_55$$19, &explodedPart$$19, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1816);
zephir_fast_trim(&_54$$19, &_55$$19, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&namePart$$19);
zephir_fast_strtolower(&namePart$$19, &_54$$19);
ZEPHIR_INIT_NVAR(&_56$$19);
- zephir_array_fetch_long(&_57$$19, &explodedPart$$19, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1812);
+ zephir_array_fetch_long(&_57$$19, &explodedPart$$19, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1817);
zephir_fast_trim(&_56$$19, &_57$$19, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&_58$$19);
ZVAL_STRING(&_58$$19, "\"");
@@ -139477,12 +139518,12 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData)
ZEPHIR_INIT_NVAR(&explodedPart$$22);
zephir_fast_explode_str(&explodedPart$$22, SL("="), &part$$17, 2 );
ZEPHIR_INIT_NVAR(&_62$$22);
- zephir_array_fetch_long(&_63$$22, &explodedPart$$22, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1811);
+ zephir_array_fetch_long(&_63$$22, &explodedPart$$22, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1816);
zephir_fast_trim(&_62$$22, &_63$$22, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&namePart$$22);
zephir_fast_strtolower(&namePart$$22, &_62$$22);
ZEPHIR_INIT_NVAR(&_64$$22);
- zephir_array_fetch_long(&_65$$22, &explodedPart$$22, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1812);
+ zephir_array_fetch_long(&_65$$22, &explodedPart$$22, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1817);
zephir_fast_trim(&_64$$22, &_65$$22, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&_66$$22);
ZVAL_STRING(&_66$$22, "\"");
@@ -139505,10 +139546,10 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData)
}
}
ZEPHIR_INIT_NVAR(&headerPart$$3);
- zephir_array_fetch_long(&_67$$3, &splited$$3, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1824);
- zephir_array_fetch_string(&_68$$3, &headers$$3, SL("content-disposition"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1824);
+ zephir_array_fetch_long(&_67$$3, &splited$$3, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1829);
+ zephir_array_fetch_string(&_68$$3, &headers$$3, SL("content-disposition"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1829);
ZEPHIR_OBS_NVAR(&_69$$3);
- zephir_array_fetch_string(&_69$$3, &_68$$3, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 1824);
+ zephir_array_fetch_string(&_69$$3, &_68$$3, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 1829);
zephir_array_update_zval(&dataset, &_69$$3, &_67$$3, PH_COPY | PH_SEPARATE);
} ZEND_HASH_FOREACH_END();
} else {
@@ -139532,14 +139573,14 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData)
zephir_check_call_status();
ZEPHIR_INIT_NVAR(&headers$$25);
array_init(&headers$$25);
- zephir_array_fetch_long(&_72$$25, &splited$$25, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1788);
+ zephir_array_fetch_long(&_72$$25, &splited$$25, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1793);
ZEPHIR_INIT_NVAR(&_70$$25);
ZVAL_STRING(&_70$$25, "/\\R/s");
ZVAL_LONG(&_71$$25, -1);
ZVAL_LONG(&_73$$25, 1);
ZEPHIR_CALL_FUNCTION(&headerParts$$25, "preg_split", NULL, 71, &_70$$25, &_72$$25, &_71$$25, &_73$$25);
zephir_check_call_status();
- zephir_is_iterable(&headerParts$$25, 0, "phalcon/Http/Request.zep", 1824);
+ zephir_is_iterable(&headerParts$$25, 0, "phalcon/Http/Request.zep", 1829);
if (Z_TYPE_P(&headerParts$$25) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&headerParts$$25), _74$$25)
{
@@ -139555,11 +139596,11 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData)
ZEPHIR_INIT_NVAR(&exploded$$27);
zephir_fast_explode_str(&exploded$$27, SL(":"), &headerPart$$25, 2 );
ZEPHIR_INIT_NVAR(&_78$$27);
- zephir_array_fetch_long(&_79$$27, &exploded$$27, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1798);
+ zephir_array_fetch_long(&_79$$27, &exploded$$27, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1803);
zephir_fast_trim(&_78$$27, &_79$$27, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&headerName$$27);
zephir_fast_strtolower(&headerName$$27, &_78$$27);
- zephir_array_fetch_long(&_80$$27, &exploded$$27, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1799);
+ zephir_array_fetch_long(&_80$$27, &exploded$$27, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1804);
ZEPHIR_INIT_NVAR(&headerValue$$27);
zephir_fast_trim(&headerValue$$27, &_80$$27, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&_81$$27);
@@ -139569,7 +139610,7 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData)
if (!ZEPHIR_IS_FALSE_IDENTICAL(&_82$$27)) {
ZEPHIR_INIT_NVAR(&explodedHeader$$29);
zephir_fast_explode_str(&explodedHeader$$29, SL(";"), &headerValue$$27, LONG_MAX);
- zephir_is_iterable(&explodedHeader$$29, 0, "phalcon/Http/Request.zep", 1819);
+ zephir_is_iterable(&explodedHeader$$29, 0, "phalcon/Http/Request.zep", 1824);
if (Z_TYPE_P(&explodedHeader$$29) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&explodedHeader$$29), _83$$29)
{
@@ -139591,12 +139632,12 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData)
ZEPHIR_INIT_NVAR(&explodedPart$$31);
zephir_fast_explode_str(&explodedPart$$31, SL("="), &part$$29, 2 );
ZEPHIR_INIT_NVAR(&_88$$31);
- zephir_array_fetch_long(&_89$$31, &explodedPart$$31, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1811);
+ zephir_array_fetch_long(&_89$$31, &explodedPart$$31, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1816);
zephir_fast_trim(&_88$$31, &_89$$31, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&namePart$$31);
zephir_fast_strtolower(&namePart$$31, &_88$$31);
ZEPHIR_INIT_NVAR(&_90$$31);
- zephir_array_fetch_long(&_91$$31, &explodedPart$$31, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1812);
+ zephir_array_fetch_long(&_91$$31, &explodedPart$$31, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1817);
zephir_fast_trim(&_90$$31, &_91$$31, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&_92$$31);
ZVAL_STRING(&_92$$31, "\"");
@@ -139634,12 +139675,12 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData)
ZEPHIR_INIT_NVAR(&explodedPart$$34);
zephir_fast_explode_str(&explodedPart$$34, SL("="), &part$$29, 2 );
ZEPHIR_INIT_NVAR(&_96$$34);
- zephir_array_fetch_long(&_97$$34, &explodedPart$$34, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1811);
+ zephir_array_fetch_long(&_97$$34, &explodedPart$$34, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1816);
zephir_fast_trim(&_96$$34, &_97$$34, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&namePart$$34);
zephir_fast_strtolower(&namePart$$34, &_96$$34);
ZEPHIR_INIT_NVAR(&_98$$34);
- zephir_array_fetch_long(&_99$$34, &explodedPart$$34, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1812);
+ zephir_array_fetch_long(&_99$$34, &explodedPart$$34, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1817);
zephir_fast_trim(&_98$$34, &_99$$34, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&_100$$34);
ZVAL_STRING(&_100$$34, "\"");
@@ -139679,11 +139720,11 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData)
ZEPHIR_INIT_NVAR(&exploded$$37);
zephir_fast_explode_str(&exploded$$37, SL(":"), &headerPart$$25, 2 );
ZEPHIR_INIT_NVAR(&_103$$37);
- zephir_array_fetch_long(&_104$$37, &exploded$$37, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1798);
+ zephir_array_fetch_long(&_104$$37, &exploded$$37, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1803);
zephir_fast_trim(&_103$$37, &_104$$37, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&headerName$$37);
zephir_fast_strtolower(&headerName$$37, &_103$$37);
- zephir_array_fetch_long(&_105$$37, &exploded$$37, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1799);
+ zephir_array_fetch_long(&_105$$37, &exploded$$37, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1804);
ZEPHIR_INIT_NVAR(&headerValue$$37);
zephir_fast_trim(&headerValue$$37, &_105$$37, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&_106$$37);
@@ -139693,7 +139734,7 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData)
if (!ZEPHIR_IS_FALSE_IDENTICAL(&_107$$37)) {
ZEPHIR_INIT_NVAR(&explodedHeader$$39);
zephir_fast_explode_str(&explodedHeader$$39, SL(";"), &headerValue$$37, LONG_MAX);
- zephir_is_iterable(&explodedHeader$$39, 0, "phalcon/Http/Request.zep", 1819);
+ zephir_is_iterable(&explodedHeader$$39, 0, "phalcon/Http/Request.zep", 1824);
if (Z_TYPE_P(&explodedHeader$$39) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&explodedHeader$$39), _108$$39)
{
@@ -139715,12 +139756,12 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData)
ZEPHIR_INIT_NVAR(&explodedPart$$41);
zephir_fast_explode_str(&explodedPart$$41, SL("="), &part$$39, 2 );
ZEPHIR_INIT_NVAR(&_113$$41);
- zephir_array_fetch_long(&_114$$41, &explodedPart$$41, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1811);
+ zephir_array_fetch_long(&_114$$41, &explodedPart$$41, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1816);
zephir_fast_trim(&_113$$41, &_114$$41, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&namePart$$41);
zephir_fast_strtolower(&namePart$$41, &_113$$41);
ZEPHIR_INIT_NVAR(&_115$$41);
- zephir_array_fetch_long(&_116$$41, &explodedPart$$41, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1812);
+ zephir_array_fetch_long(&_116$$41, &explodedPart$$41, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1817);
zephir_fast_trim(&_115$$41, &_116$$41, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&_117$$41);
ZVAL_STRING(&_117$$41, "\"");
@@ -139758,12 +139799,12 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData)
ZEPHIR_INIT_NVAR(&explodedPart$$44);
zephir_fast_explode_str(&explodedPart$$44, SL("="), &part$$39, 2 );
ZEPHIR_INIT_NVAR(&_121$$44);
- zephir_array_fetch_long(&_122$$44, &explodedPart$$44, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1811);
+ zephir_array_fetch_long(&_122$$44, &explodedPart$$44, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1816);
zephir_fast_trim(&_121$$44, &_122$$44, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&namePart$$44);
zephir_fast_strtolower(&namePart$$44, &_121$$44);
ZEPHIR_INIT_NVAR(&_123$$44);
- zephir_array_fetch_long(&_124$$44, &explodedPart$$44, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1812);
+ zephir_array_fetch_long(&_124$$44, &explodedPart$$44, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1817);
zephir_fast_trim(&_123$$44, &_124$$44, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&_125$$44);
ZVAL_STRING(&_125$$44, "\"");
@@ -139786,10 +139827,10 @@ static PHP_METHOD(Phalcon_Http_Request, getFormData)
}
}
ZEPHIR_INIT_NVAR(&headerPart$$25);
- zephir_array_fetch_long(&_126$$25, &splited$$25, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1824);
- zephir_array_fetch_string(&_127$$25, &headers$$25, SL("content-disposition"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1824);
+ zephir_array_fetch_long(&_126$$25, &splited$$25, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1829);
+ zephir_array_fetch_string(&_127$$25, &headers$$25, SL("content-disposition"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1829);
ZEPHIR_OBS_NVAR(&_128$$25);
- zephir_array_fetch_string(&_128$$25, &_127$$25, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 1824);
+ zephir_array_fetch_string(&_128$$25, &_127$$25, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 1829);
zephir_array_update_zval(&dataset, &_128$$25, &_126$$25, PH_COPY | PH_SEPARATE);
ZEPHIR_CALL_METHOD(NULL, &bodyParts, "next", NULL, 0);
zephir_check_call_status();
@@ -183861,7 +183902,7 @@ static PHP_METHOD(Phalcon_Support_Version, getVersion)
ZVAL_LONG(&_0, 6);
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);
@@ -203855,7 +203896,7 @@ static PHP_METHOD(Phalcon_Cli_Router, setDefaultAction)
zephir_fetch_params(1, 1, 0, &actionName_param);
zephir_get_strval(&actionName, actionName_param);
zephir_update_property_zval(this_ptr, ZEND_STRL("defaultAction"), &actionName);
- ZEPHIR_MM_RESTORE();
+ RETURN_THIS();
}
static PHP_METHOD(Phalcon_Cli_Router, setDefaultModule)
@@ -203874,7 +203915,7 @@ static PHP_METHOD(Phalcon_Cli_Router, setDefaultModule)
zephir_fetch_params(1, 1, 0, &moduleName_param);
zephir_get_strval(&moduleName, moduleName_param);
zephir_update_property_zval(this_ptr, ZEND_STRL("defaultModule"), &moduleName);
- ZEPHIR_MM_RESTORE();
+ RETURN_THIS();
}
static PHP_METHOD(Phalcon_Cli_Router, setDefaults)
diff --git a/build/phalcon/phalcon.zep.h b/build/phalcon/phalcon.zep.h
index 28c6b85077..ef7f4a7753 100644
--- a/build/phalcon/phalcon.zep.h
+++ b/build/phalcon/phalcon.zep.h
@@ -7645,7 +7645,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_cache_abstractcache_doget, 0, 0, 1)
ZEND_ARG_INFO(0, defaultValue)
ZEND_END_ARG_INFO()
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_cache_abstractcache_dogetmultiple, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_cache_abstractcache_dogetmultiple, 0, 1, IS_ARRAY, 0)
ZEND_ARG_INFO(0, keys)
ZEND_ARG_INFO(0, defaultValue)
ZEND_END_ARG_INFO()
@@ -8422,7 +8422,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_valida
ZEND_ARG_ARRAY_INFO(0, labels, 0)
ZEND_END_ARG_INFO()
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_filter_validation_validationinterface_validate, 0, 0, Phalcon\\Messages\\Messages, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_filter_validation_validationinterface_validate, 0, 0, 0)
ZEND_ARG_INFO(0, data)
ZEND_ARG_INFO(0, entity)
ZEND_END_ARG_INFO()
@@ -14281,11 +14281,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_cli_router_handle, 0, 0, 0)
ZEND_ARG_INFO(0, arguments)
ZEND_END_ARG_INFO()
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_cli_router_setdefaultaction, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_cli_router_setdefaultaction, 0, 1, Phalcon\\Cli\\Router, 0)
ZEND_ARG_TYPE_INFO(0, actionName, IS_STRING, 0)
ZEND_END_ARG_INFO()
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_cli_router_setdefaultmodule, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_cli_router_setdefaultmodule, 0, 1, Phalcon\\Cli\\Router, 0)
ZEND_ARG_TYPE_INFO(0, moduleName, IS_STRING, 0)
ZEND_END_ARG_INFO()
@@ -18960,7 +18960,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_filter_validation_setvali
ZEND_ARG_ARRAY_INFO(0, validators, 0)
ZEND_END_ARG_INFO()
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_filter_validation_validate, 0, 0, Phalcon\\Messages\\Messages, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_filter_validation_validate, 0, 0, 0)
ZEND_ARG_INFO(0, data)
ZEND_ARG_INFO(0, entity)
ZEND_END_ARG_INFO()
diff --git a/build/phalcon/php_phalcon.h b/build/phalcon/php_phalcon.h
index 55fd575f1f..3cc2ddee2b 100644
--- a/build/phalcon/php_phalcon.h
+++ b/build/phalcon/php_phalcon.h
@@ -103,7 +103,7 @@ typedef zend_function zephir_fcall_cache_entry;
#define PHP_PHALCON_NAME "phalcon"
-#define PHP_PHALCON_VERSION "5.6.0"
+#define PHP_PHALCON_VERSION "5.6.1"
#define PHP_PHALCON_EXTNAME "phalcon"
#define PHP_PHALCON_AUTHOR "Phalcon Team and contributors"
#define PHP_PHALCON_ZEPVERSION "0.18.0-$Id$"
diff --git a/composer.lock b/composer.lock
index 8860406828..c8a0895f07 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1274,16 +1274,16 @@
},
{
"name": "doctrine/deprecations",
- "version": "1.1.2",
+ "version": "1.1.3",
"source": {
"type": "git",
"url": "https://github.com/doctrine/deprecations.git",
- "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931"
+ "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931",
- "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931",
+ "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
+ "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
"shasum": ""
},
"require": {
@@ -1315,9 +1315,9 @@
"homepage": "https://www.doctrine-project.org/",
"support": {
"issues": "https://github.com/doctrine/deprecations/issues",
- "source": "https://github.com/doctrine/deprecations/tree/1.1.2"
+ "source": "https://github.com/doctrine/deprecations/tree/1.1.3"
},
- "time": "2023-09-27T20:04:15+00:00"
+ "time": "2024-01-30T19:34:25+00:00"
},
{
"name": "doctrine/instantiator",
@@ -1492,16 +1492,16 @@
},
{
"name": "fidry/cpu-core-counter",
- "version": "1.0.0",
+ "version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/theofidry/cpu-core-counter.git",
- "reference": "85193c0b0cb5c47894b5eaec906e946f054e7077"
+ "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/85193c0b0cb5c47894b5eaec906e946f054e7077",
- "reference": "85193c0b0cb5c47894b5eaec906e946f054e7077",
+ "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/f92996c4d5c1a696a6a970e20f7c4216200fcc42",
+ "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42",
"shasum": ""
},
"require": {
@@ -1541,7 +1541,7 @@
],
"support": {
"issues": "https://github.com/theofidry/cpu-core-counter/issues",
- "source": "https://github.com/theofidry/cpu-core-counter/tree/1.0.0"
+ "source": "https://github.com/theofidry/cpu-core-counter/tree/1.1.0"
},
"funding": [
{
@@ -1549,25 +1549,26 @@
"type": "github"
}
],
- "time": "2023-09-17T21:38:23+00:00"
+ "time": "2024-02-07T09:43:46+00:00"
},
{
"name": "friendsofphp/php-cs-fixer",
- "version": "v3.42.0",
+ "version": "v3.49.0",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
- "reference": "632ef1be3447a9b890bef06147475facee535d0f"
+ "reference": "8742f7aa6f72a399688b65e4f58992c2d4681fc2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/632ef1be3447a9b890bef06147475facee535d0f",
- "reference": "632ef1be3447a9b890bef06147475facee535d0f",
+ "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/8742f7aa6f72a399688b65e4f58992c2d4681fc2",
+ "reference": "8742f7aa6f72a399688b65e4f58992c2d4681fc2",
"shasum": ""
},
"require": {
"composer/semver": "^3.4",
"composer/xdebug-handler": "^3.0.3",
+ "ext-filter": "*",
"ext-json": "*",
"ext-tokenizer": "*",
"php": "^7.4 || ^8.0",
@@ -1592,7 +1593,7 @@
"php-cs-fixer/accessible-object": "^1.1",
"php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.4",
"php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.4",
- "phpunit/phpunit": "^9.6",
+ "phpunit/phpunit": "^9.6 || ^10.5.5",
"symfony/yaml": "^5.4 || ^6.0 || ^7.0"
},
"suggest": {
@@ -1631,7 +1632,7 @@
],
"support": {
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
- "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.42.0"
+ "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.49.0"
},
"funding": [
{
@@ -1639,7 +1640,7 @@
"type": "github"
}
],
- "time": "2023-12-24T14:38:51+00:00"
+ "time": "2024-02-02T00:41:40+00:00"
},
{
"name": "graham-campbell/result-type",
@@ -2241,16 +2242,16 @@
},
{
"name": "netresearch/jsonmapper",
- "version": "v4.2.0",
+ "version": "v4.4.1",
"source": {
"type": "git",
"url": "https://github.com/cweiske/jsonmapper.git",
- "reference": "f60565f8c0566a31acf06884cdaa591867ecc956"
+ "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/f60565f8c0566a31acf06884cdaa591867ecc956",
- "reference": "f60565f8c0566a31acf06884cdaa591867ecc956",
+ "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/132c75c7dd83e45353ebb9c6c9f591952995bbf0",
+ "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0",
"shasum": ""
},
"require": {
@@ -2261,7 +2262,7 @@
"php": ">=7.1"
},
"require-dev": {
- "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0",
+ "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0 || ~10.0",
"squizlabs/php_codesniffer": "~3.5"
},
"type": "library",
@@ -2286,9 +2287,9 @@
"support": {
"email": "cweiske@cweiske.de",
"issues": "https://github.com/cweiske/jsonmapper/issues",
- "source": "https://github.com/cweiske/jsonmapper/tree/v4.2.0"
+ "source": "https://github.com/cweiske/jsonmapper/tree/v4.4.1"
},
- "time": "2023-04-09T17:37:40+00:00"
+ "time": "2024-01-31T06:18:54+00:00"
},
{
"name": "nikic/php-parser",
@@ -2348,16 +2349,16 @@
},
{
"name": "phalcon/ide-stubs",
- "version": "v5.4.0",
+ "version": "v5.6.0",
"source": {
"type": "git",
"url": "https://github.com/phalcon/ide-stubs.git",
- "reference": "7e4560a5f0d2f67f5e20432ad9b5aba1530fd7f2"
+ "reference": "0593372dcf90d311f5f861a67b0438cc44d29a23"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phalcon/ide-stubs/zipball/7e4560a5f0d2f67f5e20432ad9b5aba1530fd7f2",
- "reference": "7e4560a5f0d2f67f5e20432ad9b5aba1530fd7f2",
+ "url": "https://api.github.com/repos/phalcon/ide-stubs/zipball/0593372dcf90d311f5f861a67b0438cc44d29a23",
+ "reference": "0593372dcf90d311f5f861a67b0438cc44d29a23",
"shasum": ""
},
"require": {
@@ -2411,7 +2412,7 @@
"type": "open_collective"
}
],
- "time": "2023-10-25T15:31:53+00:00"
+ "time": "2024-01-09T23:54:03+00:00"
},
{
"name": "phalcon/zephir",
@@ -2419,12 +2420,12 @@
"source": {
"type": "git",
"url": "https://github.com/zephir-lang/zephir.git",
- "reference": "254df48dda42de38bf1c3bbbac4f59a3b5728e5c"
+ "reference": "d1bb90a8b72abb5447b78cba56cb76e109a81cba"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zephir-lang/zephir/zipball/254df48dda42de38bf1c3bbbac4f59a3b5728e5c",
- "reference": "254df48dda42de38bf1c3bbbac4f59a3b5728e5c",
+ "url": "https://api.github.com/repos/zephir-lang/zephir/zipball/d1bb90a8b72abb5447b78cba56cb76e109a81cba",
+ "reference": "d1bb90a8b72abb5447b78cba56cb76e109a81cba",
"shasum": ""
},
"require": {
@@ -2498,7 +2499,7 @@
"type": "github"
}
],
- "time": "2023-12-23T15:37:37+00:00"
+ "time": "2024-02-07T23:14:49+00:00"
},
{
"name": "phar-io/manifest",
@@ -2723,16 +2724,16 @@
},
{
"name": "phpdocumentor/type-resolver",
- "version": "1.7.3",
+ "version": "1.8.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git",
- "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419"
+ "reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419",
- "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419",
+ "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fad452781b3d774e3337b0c0b245dd8e5a4455fc",
+ "reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc",
"shasum": ""
},
"require": {
@@ -2775,9 +2776,9 @@
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
"support": {
"issues": "https://github.com/phpDocumentor/TypeResolver/issues",
- "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.3"
+ "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.0"
},
- "time": "2023-08-12T11:01:26+00:00"
+ "time": "2024-01-11T11:49:22+00:00"
},
{
"name": "phpoption/phpoption",
@@ -2856,16 +2857,16 @@
},
{
"name": "phpstan/phpdoc-parser",
- "version": "1.24.5",
+ "version": "1.25.0",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpdoc-parser.git",
- "reference": "fedf211ff14ec8381c9bf5714e33a7a552dd1acc"
+ "reference": "bd84b629c8de41aa2ae82c067c955e06f1b00240"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/fedf211ff14ec8381c9bf5714e33a7a552dd1acc",
- "reference": "fedf211ff14ec8381c9bf5714e33a7a552dd1acc",
+ "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bd84b629c8de41aa2ae82c067c955e06f1b00240",
+ "reference": "bd84b629c8de41aa2ae82c067c955e06f1b00240",
"shasum": ""
},
"require": {
@@ -2897,9 +2898,9 @@
"description": "PHPDoc parser with support for nullable, intersection and generic types",
"support": {
"issues": "https://github.com/phpstan/phpdoc-parser/issues",
- "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.5"
+ "source": "https://github.com/phpstan/phpdoc-parser/tree/1.25.0"
},
- "time": "2023-12-16T09:33:33+00:00"
+ "time": "2024-01-04T17:06:16+00:00"
},
{
"name": "phpunit/php-code-coverage",
@@ -3222,16 +3223,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "9.6.15",
+ "version": "9.6.16",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1"
+ "reference": "3767b2c56ce02d01e3491046f33466a1ae60a37f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/05017b80304e0eb3f31d90194a563fd53a6021f1",
- "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3767b2c56ce02d01e3491046f33466a1ae60a37f",
+ "reference": "3767b2c56ce02d01e3491046f33466a1ae60a37f",
"shasum": ""
},
"require": {
@@ -3305,7 +3306,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.15"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.16"
},
"funding": [
{
@@ -3321,7 +3322,7 @@
"type": "tidelift"
}
],
- "time": "2023-12-01T16:55:19+00:00"
+ "time": "2024-01-19T07:03:14+00:00"
},
{
"name": "predis/predis",
@@ -4712,16 +4713,16 @@
},
{
"name": "spatie/array-to-xml",
- "version": "3.2.2",
+ "version": "3.2.3",
"source": {
"type": "git",
"url": "https://github.com/spatie/array-to-xml.git",
- "reference": "96be97e664c87613121d073ea39af4c74e57a7f8"
+ "reference": "c95fd4db94ec199f798d4b5b4a81757bd20d88ab"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/96be97e664c87613121d073ea39af4c74e57a7f8",
- "reference": "96be97e664c87613121d073ea39af4c74e57a7f8",
+ "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/c95fd4db94ec199f798d4b5b4a81757bd20d88ab",
+ "reference": "c95fd4db94ec199f798d4b5b4a81757bd20d88ab",
"shasum": ""
},
"require": {
@@ -4759,7 +4760,7 @@
"xml"
],
"support": {
- "source": "https://github.com/spatie/array-to-xml/tree/3.2.2"
+ "source": "https://github.com/spatie/array-to-xml/tree/3.2.3"
},
"funding": [
{
@@ -4771,20 +4772,20 @@
"type": "github"
}
],
- "time": "2023-11-14T14:08:51+00:00"
+ "time": "2024-02-07T10:39:02+00:00"
},
{
"name": "squizlabs/php_codesniffer",
- "version": "3.8.0",
+ "version": "3.8.1",
"source": {
"type": "git",
"url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
- "reference": "5805f7a4e4958dbb5e944ef1e6edae0a303765e7"
+ "reference": "14f5fff1e64118595db5408e946f3a22c75807f7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/5805f7a4e4958dbb5e944ef1e6edae0a303765e7",
- "reference": "5805f7a4e4958dbb5e944ef1e6edae0a303765e7",
+ "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/14f5fff1e64118595db5408e946f3a22c75807f7",
+ "reference": "14f5fff1e64118595db5408e946f3a22c75807f7",
"shasum": ""
},
"require": {
@@ -4794,11 +4795,11 @@
"php": ">=5.4.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
+ "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4"
},
"bin": [
- "bin/phpcs",
- "bin/phpcbf"
+ "bin/phpcbf",
+ "bin/phpcs"
],
"type": "library",
"extra": {
@@ -4851,20 +4852,20 @@
"type": "open_collective"
}
],
- "time": "2023-12-08T12:32:31+00:00"
+ "time": "2024-01-11T20:47:48+00:00"
},
{
"name": "symfony/browser-kit",
- "version": "v5.4.31",
+ "version": "v5.4.35",
"source": {
"type": "git",
"url": "https://github.com/symfony/browser-kit.git",
- "reference": "0ed1f634a36606f2065eec221b3975e05016cbbe"
+ "reference": "2f6f979b579ed1c051465c3c2fb81daf5bb4a002"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/browser-kit/zipball/0ed1f634a36606f2065eec221b3975e05016cbbe",
- "reference": "0ed1f634a36606f2065eec221b3975e05016cbbe",
+ "url": "https://api.github.com/repos/symfony/browser-kit/zipball/2f6f979b579ed1c051465c3c2fb81daf5bb4a002",
+ "reference": "2f6f979b579ed1c051465c3c2fb81daf5bb4a002",
"shasum": ""
},
"require": {
@@ -4907,7 +4908,7 @@
"description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/browser-kit/tree/v5.4.31"
+ "source": "https://github.com/symfony/browser-kit/tree/v5.4.35"
},
"funding": [
{
@@ -4923,20 +4924,20 @@
"type": "tidelift"
}
],
- "time": "2023-10-31T07:58:33+00:00"
+ "time": "2024-01-23T13:51:25+00:00"
},
{
"name": "symfony/console",
- "version": "v5.4.32",
+ "version": "v5.4.35",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "c70df1ffaf23a8d340bded3cfab1b86752ad6ed7"
+ "reference": "dbdf6adcb88d5f83790e1efb57ef4074309d3931"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/c70df1ffaf23a8d340bded3cfab1b86752ad6ed7",
- "reference": "c70df1ffaf23a8d340bded3cfab1b86752ad6ed7",
+ "url": "https://api.github.com/repos/symfony/console/zipball/dbdf6adcb88d5f83790e1efb57ef4074309d3931",
+ "reference": "dbdf6adcb88d5f83790e1efb57ef4074309d3931",
"shasum": ""
},
"require": {
@@ -5006,7 +5007,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v5.4.32"
+ "source": "https://github.com/symfony/console/tree/v5.4.35"
},
"funding": [
{
@@ -5022,20 +5023,20 @@
"type": "tidelift"
}
],
- "time": "2023-11-18T18:23:04+00:00"
+ "time": "2024-01-23T14:28:09+00:00"
},
{
"name": "symfony/css-selector",
- "version": "v5.4.26",
+ "version": "v5.4.35",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
- "reference": "0ad3f7e9a1ab492c5b4214cf22a9dc55dcf8600a"
+ "reference": "9e615d367e2bed41f633abb383948c96a2dbbfae"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/0ad3f7e9a1ab492c5b4214cf22a9dc55dcf8600a",
- "reference": "0ad3f7e9a1ab492c5b4214cf22a9dc55dcf8600a",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/9e615d367e2bed41f633abb383948c96a2dbbfae",
+ "reference": "9e615d367e2bed41f633abb383948c96a2dbbfae",
"shasum": ""
},
"require": {
@@ -5072,7 +5073,7 @@
"description": "Converts CSS selectors to XPath expressions",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/css-selector/tree/v5.4.26"
+ "source": "https://github.com/symfony/css-selector/tree/v5.4.35"
},
"funding": [
{
@@ -5088,7 +5089,7 @@
"type": "tidelift"
}
],
- "time": "2023-07-07T06:10:25+00:00"
+ "time": "2024-01-23T13:51:25+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -5159,16 +5160,16 @@
},
{
"name": "symfony/dom-crawler",
- "version": "v5.4.32",
+ "version": "v5.4.35",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
- "reference": "728f1fc136252a626ba5a69c02bd66a3697ff201"
+ "reference": "e3b4806f88abf106a411847a78619a542e71de29"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/728f1fc136252a626ba5a69c02bd66a3697ff201",
- "reference": "728f1fc136252a626ba5a69c02bd66a3697ff201",
+ "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/e3b4806f88abf106a411847a78619a542e71de29",
+ "reference": "e3b4806f88abf106a411847a78619a542e71de29",
"shasum": ""
},
"require": {
@@ -5214,7 +5215,7 @@
"description": "Eases DOM navigation for HTML and XML documents",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/dom-crawler/tree/v5.4.32"
+ "source": "https://github.com/symfony/dom-crawler/tree/v5.4.35"
},
"funding": [
{
@@ -5230,20 +5231,20 @@
"type": "tidelift"
}
],
- "time": "2023-11-17T20:43:48+00:00"
+ "time": "2024-01-23T13:51:25+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v5.4.26",
+ "version": "v5.4.35",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "5dcc00e03413f05c1e7900090927bb7247cb0aac"
+ "reference": "7a69a85c7ea5bdd1e875806a99c51a87d3a74b38"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/5dcc00e03413f05c1e7900090927bb7247cb0aac",
- "reference": "5dcc00e03413f05c1e7900090927bb7247cb0aac",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/7a69a85c7ea5bdd1e875806a99c51a87d3a74b38",
+ "reference": "7a69a85c7ea5bdd1e875806a99c51a87d3a74b38",
"shasum": ""
},
"require": {
@@ -5299,7 +5300,7 @@
"description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.26"
+ "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.35"
},
"funding": [
{
@@ -5315,7 +5316,7 @@
"type": "tidelift"
}
],
- "time": "2023-07-06T06:34:20+00:00"
+ "time": "2024-01-23T13:51:25+00:00"
},
{
"name": "symfony/event-dispatcher-contracts",
@@ -5461,16 +5462,16 @@
},
{
"name": "symfony/finder",
- "version": "v5.4.27",
+ "version": "v5.4.35",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "ff4bce3c33451e7ec778070e45bd23f74214cd5d"
+ "reference": "abe6d6f77d9465fed3cd2d029b29d03b56b56435"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/ff4bce3c33451e7ec778070e45bd23f74214cd5d",
- "reference": "ff4bce3c33451e7ec778070e45bd23f74214cd5d",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/abe6d6f77d9465fed3cd2d029b29d03b56b56435",
+ "reference": "abe6d6f77d9465fed3cd2d029b29d03b56b56435",
"shasum": ""
},
"require": {
@@ -5504,7 +5505,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/finder/tree/v5.4.27"
+ "source": "https://github.com/symfony/finder/tree/v5.4.35"
},
"funding": [
{
@@ -5520,7 +5521,7 @@
"type": "tidelift"
}
],
- "time": "2023-07-31T08:02:31+00:00"
+ "time": "2024-01-23T13:51:25+00:00"
},
{
"name": "symfony/options-resolver",
@@ -5591,16 +5592,16 @@
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.28.0",
+ "version": "v1.29.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb"
+ "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
- "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4",
+ "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4",
"shasum": ""
},
"require": {
@@ -5614,9 +5615,6 @@
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "1.28-dev"
- },
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
@@ -5653,7 +5651,7 @@
"portable"
],
"support": {
- "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0"
+ "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0"
},
"funding": [
{
@@ -5669,20 +5667,20 @@
"type": "tidelift"
}
],
- "time": "2023-01-26T09:26:14+00:00"
+ "time": "2024-01-29T20:11:03+00:00"
},
{
"name": "symfony/polyfill-intl-grapheme",
- "version": "v1.28.0",
+ "version": "v1.29.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-grapheme.git",
- "reference": "875e90aeea2777b6f135677f618529449334a612"
+ "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612",
- "reference": "875e90aeea2777b6f135677f618529449334a612",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f",
+ "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f",
"shasum": ""
},
"require": {
@@ -5693,9 +5691,6 @@
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "1.28-dev"
- },
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
@@ -5734,7 +5729,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0"
+ "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0"
},
"funding": [
{
@@ -5750,20 +5745,20 @@
"type": "tidelift"
}
],
- "time": "2023-01-26T09:26:14+00:00"
+ "time": "2024-01-29T20:11:03+00:00"
},
{
"name": "symfony/polyfill-intl-normalizer",
- "version": "v1.28.0",
+ "version": "v1.29.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
- "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92"
+ "reference": "bc45c394692b948b4d383a08d7753968bed9a83d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
- "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d",
+ "reference": "bc45c394692b948b4d383a08d7753968bed9a83d",
"shasum": ""
},
"require": {
@@ -5774,9 +5769,6 @@
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "1.28-dev"
- },
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
@@ -5818,7 +5810,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0"
+ "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0"
},
"funding": [
{
@@ -5834,20 +5826,20 @@
"type": "tidelift"
}
],
- "time": "2023-01-26T09:26:14+00:00"
+ "time": "2024-01-29T20:11:03+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.28.0",
+ "version": "v1.29.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "42292d99c55abe617799667f454222c54c60e229"
+ "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229",
- "reference": "42292d99c55abe617799667f454222c54c60e229",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
+ "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
"shasum": ""
},
"require": {
@@ -5861,9 +5853,6 @@
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "1.28-dev"
- },
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
@@ -5901,7 +5890,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0"
+ "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0"
},
"funding": [
{
@@ -5917,20 +5906,20 @@
"type": "tidelift"
}
],
- "time": "2023-07-28T09:04:16+00:00"
+ "time": "2024-01-29T20:11:03+00:00"
},
{
"name": "symfony/polyfill-php73",
- "version": "v1.28.0",
+ "version": "v1.29.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php73.git",
- "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5"
+ "reference": "21bd091060673a1177ae842c0ef8fe30893114d2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fe2f306d1d9d346a7fee353d0d5012e401e984b5",
- "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5",
+ "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/21bd091060673a1177ae842c0ef8fe30893114d2",
+ "reference": "21bd091060673a1177ae842c0ef8fe30893114d2",
"shasum": ""
},
"require": {
@@ -5938,9 +5927,6 @@
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "1.28-dev"
- },
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
@@ -5980,7 +5966,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php73/tree/v1.28.0"
+ "source": "https://github.com/symfony/polyfill-php73/tree/v1.29.0"
},
"funding": [
{
@@ -5996,20 +5982,20 @@
"type": "tidelift"
}
],
- "time": "2023-01-26T09:26:14+00:00"
+ "time": "2024-01-29T20:11:03+00:00"
},
{
"name": "symfony/polyfill-php80",
- "version": "v1.28.0",
+ "version": "v1.29.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php80.git",
- "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5"
+ "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5",
- "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5",
+ "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
+ "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
"shasum": ""
},
"require": {
@@ -6017,9 +6003,6 @@
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "1.28-dev"
- },
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
@@ -6063,7 +6046,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0"
+ "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0"
},
"funding": [
{
@@ -6079,20 +6062,20 @@
"type": "tidelift"
}
],
- "time": "2023-01-26T09:26:14+00:00"
+ "time": "2024-01-29T20:11:03+00:00"
},
{
"name": "symfony/polyfill-php81",
- "version": "v1.28.0",
+ "version": "v1.29.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php81.git",
- "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b"
+ "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/7581cd600fa9fd681b797d00b02f068e2f13263b",
- "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b",
+ "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/c565ad1e63f30e7477fc40738343c62b40bc672d",
+ "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d",
"shasum": ""
},
"require": {
@@ -6100,9 +6083,6 @@
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "1.28-dev"
- },
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
@@ -6142,7 +6122,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php81/tree/v1.28.0"
+ "source": "https://github.com/symfony/polyfill-php81/tree/v1.29.0"
},
"funding": [
{
@@ -6158,7 +6138,7 @@
"type": "tidelift"
}
],
- "time": "2023-01-26T09:26:14+00:00"
+ "time": "2024-01-29T20:11:03+00:00"
},
{
"name": "symfony/process",
@@ -6452,16 +6432,16 @@
},
{
"name": "symfony/yaml",
- "version": "v5.4.31",
+ "version": "v5.4.35",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "f387675d7f5fc4231f7554baa70681f222f73563"
+ "reference": "e78db7f5c70a21f0417a31f414c4a95fe76c07e4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/f387675d7f5fc4231f7554baa70681f222f73563",
- "reference": "f387675d7f5fc4231f7554baa70681f222f73563",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/e78db7f5c70a21f0417a31f414c4a95fe76c07e4",
+ "reference": "e78db7f5c70a21f0417a31f414c4a95fe76c07e4",
"shasum": ""
},
"require": {
@@ -6507,7 +6487,7 @@
"description": "Loads and dumps YAML files",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/yaml/tree/v5.4.31"
+ "source": "https://github.com/symfony/yaml/tree/v5.4.35"
},
"funding": [
{
@@ -6523,7 +6503,7 @@
"type": "tidelift"
}
],
- "time": "2023-11-03T14:41:28+00:00"
+ "time": "2024-01-23T13:51:25+00:00"
},
{
"name": "theseer/tokenizer",
@@ -6655,16 +6635,16 @@
},
{
"name": "vimeo/psalm",
- "version": "5.18.0",
+ "version": "5.21.1",
"source": {
"type": "git",
"url": "https://github.com/vimeo/psalm.git",
- "reference": "b113f3ed0259fd6e212d87c3df80eec95a6abf19"
+ "reference": "8c473e2437be8b6a8fd8f630f0f11a16b114c494"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vimeo/psalm/zipball/b113f3ed0259fd6e212d87c3df80eec95a6abf19",
- "reference": "b113f3ed0259fd6e212d87c3df80eec95a6abf19",
+ "url": "https://api.github.com/repos/vimeo/psalm/zipball/8c473e2437be8b6a8fd8f630f0f11a16b114c494",
+ "reference": "8c473e2437be8b6a8fd8f630f0f11a16b114c494",
"shasum": ""
},
"require": {
@@ -6761,7 +6741,7 @@
"issues": "https://github.com/vimeo/psalm/issues",
"source": "https://github.com/vimeo/psalm"
},
- "time": "2023-12-16T09:37:35+00:00"
+ "time": "2024-02-01T01:04:32+00:00"
},
{
"name": "vlucas/phpdotenv",
diff --git a/config.json b/config.json
index 33d9bac85a..d8bc1b075c 100644
--- a/config.json
+++ b/config.json
@@ -3,7 +3,7 @@
"name": "phalcon",
"description": "Phalcon is a full stack PHP framework, delivered as a PHP extension, offering lower resource consumption and high performance.",
"author": "Phalcon Team and contributors",
- "version": "5.6.0",
+ "version": "5.6.1",
"verbose": false,
"stubs": {
"path": "ide\/%version%\/%namespace%\/",
diff --git a/ext/kernel/fcall.c b/ext/kernel/fcall.c
index cfcc025bed..40b1f98f60 100644
--- a/ext/kernel/fcall.c
+++ b/ext/kernel/fcall.c
@@ -371,7 +371,11 @@ int zephir_call_user_function(
char *is_callable_error = NULL;
zend_execute_data *frame = EG(current_execute_data);
+#if PHP_VERSION_ID >= 80200
+ if (obj_ce || !zend_is_callable_at_frame(&callable, fci.object, frame, IS_CALLABLE_SUPPRESS_DEPRECATIONS, &fcic, &is_callable_error)) {
+#else
if (obj_ce || !zend_is_callable_at_frame(&callable, fci.object, frame, 0, &fcic, &is_callable_error)) {
+#endif
if (is_callable_error) {
zend_error(E_WARNING, "%s", is_callable_error);
efree(is_callable_error);
@@ -591,7 +595,11 @@ int zephir_call_user_func_array_noex(zval *return_value, zval *handler, zval *pa
}
zend_execute_data *frame = EG(current_execute_data);
+#if PHP_VERSION_ID >= 80200
+ if (!zend_is_callable_at_frame(handler, NULL, frame, IS_CALLABLE_SUPPRESS_DEPRECATIONS, &fci_cache, &is_callable_error)) {
+#else
if (!zend_is_callable_at_frame(handler, NULL, frame, 0, &fci_cache, &is_callable_error)) {
+#endif
if (is_callable_error) {
zend_error(E_WARNING, "%s", is_callable_error);
efree(is_callable_error);
diff --git a/ext/phalcon/cache/abstractcache.zep.h b/ext/phalcon/cache/abstractcache.zep.h
index f06290b755..549e350168 100644
--- a/ext/phalcon/cache/abstractcache.zep.h
+++ b/ext/phalcon/cache/abstractcache.zep.h
@@ -50,7 +50,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_cache_abstractcache_doget, 0, 0, 1)
ZEND_ARG_INFO(0, defaultValue)
ZEND_END_ARG_INFO()
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_cache_abstractcache_dogetmultiple, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_cache_abstractcache_dogetmultiple, 0, 1, IS_ARRAY, 0)
ZEND_ARG_INFO(0, keys)
ZEND_ARG_INFO(0, defaultValue)
ZEND_END_ARG_INFO()
diff --git a/ext/phalcon/cli/router.zep.c b/ext/phalcon/cli/router.zep.c
index 9b0779edf3..a404e74ae2 100644
--- a/ext/phalcon/cli/router.zep.c
+++ b/ext/phalcon/cli/router.zep.c
@@ -905,7 +905,7 @@ PHP_METHOD(Phalcon_Cli_Router, setDefaultAction)
zephir_fetch_params(1, 1, 0, &actionName_param);
zephir_get_strval(&actionName, actionName_param);
zephir_update_property_zval(this_ptr, ZEND_STRL("defaultAction"), &actionName);
- ZEPHIR_MM_RESTORE();
+ RETURN_THIS();
}
/**
@@ -927,7 +927,7 @@ PHP_METHOD(Phalcon_Cli_Router, setDefaultModule)
zephir_fetch_params(1, 1, 0, &moduleName_param);
zephir_get_strval(&moduleName, moduleName_param);
zephir_update_property_zval(this_ptr, ZEND_STRL("defaultModule"), &moduleName);
- ZEPHIR_MM_RESTORE();
+ RETURN_THIS();
}
/**
diff --git a/ext/phalcon/cli/router.zep.h b/ext/phalcon/cli/router.zep.h
index 38822ef255..1a4e83c9a4 100644
--- a/ext/phalcon/cli/router.zep.h
+++ b/ext/phalcon/cli/router.zep.h
@@ -68,11 +68,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_cli_router_handle, 0, 0, 0)
ZEND_ARG_INFO(0, arguments)
ZEND_END_ARG_INFO()
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_cli_router_setdefaultaction, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_cli_router_setdefaultaction, 0, 1, Phalcon\\Cli\\Router, 0)
ZEND_ARG_TYPE_INFO(0, actionName, IS_STRING, 0)
ZEND_END_ARG_INFO()
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_cli_router_setdefaultmodule, 0, 0, 1)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_cli_router_setdefaultmodule, 0, 1, Phalcon\\Cli\\Router, 0)
ZEND_ARG_TYPE_INFO(0, moduleName, IS_STRING, 0)
ZEND_END_ARG_INFO()
diff --git a/ext/phalcon/db/adapter/pdo/postgresql.zep.c b/ext/phalcon/db/adapter/pdo/postgresql.zep.c
index c2130b76a2..3b1bb32e3b 100644
--- a/ext/phalcon/db/adapter/pdo/postgresql.zep.c
+++ b/ext/phalcon/db/adapter/pdo/postgresql.zep.c
@@ -739,7 +739,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Postgresql, describeColumns)
if (Z_TYPE_P(&_50$$3) != IS_NULL) {
zephir_array_fetch_long(&_51$$38, &field, 9, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Postgresql.zep", 507);
ZEPHIR_INIT_NVAR(&_52$$38);
- ZVAL_STRING(&_52$$38, "/^'|'?::[[:alnum:][:space:]]+$/");
+ ZVAL_STRING(&_52$$38, "/^'|'?::[[:alnum:][:space:]]+(\\[\\])?$/");
ZEPHIR_INIT_NVAR(&_53$$38);
ZVAL_STRING(&_53$$38, "");
ZEPHIR_CALL_FUNCTION(&_54$$38, "preg_replace", &_55, 41, &_52$$38, &_53$$38, &_51$$38);
@@ -1037,7 +1037,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Postgresql, describeColumns)
if (Z_TYPE_P(&_109$$41) != IS_NULL) {
zephir_array_fetch_long(&_110$$76, &field, 9, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Postgresql.zep", 507);
ZEPHIR_INIT_NVAR(&_111$$76);
- ZVAL_STRING(&_111$$76, "/^'|'?::[[:alnum:][:space:]]+$/");
+ ZVAL_STRING(&_111$$76, "/^'|'?::[[:alnum:][:space:]]+(\\[\\])?$/");
ZEPHIR_INIT_NVAR(&_112$$76);
ZVAL_STRING(&_112$$76, "");
ZEPHIR_CALL_FUNCTION(&_113$$76, "preg_replace", &_55, 41, &_111$$76, &_112$$76, &_110$$76);
diff --git a/ext/phalcon/filter/validation.zep.c b/ext/phalcon/filter/validation.zep.c
index 7a9f7ecba5..1ccac30ad3 100644
--- a/ext/phalcon/filter/validation.zep.c
+++ b/ext/phalcon/filter/validation.zep.c
@@ -817,6 +817,8 @@ PHP_METHOD(Phalcon_Filter_Validation, setValidators)
*
* @param array|object data
* @param object entity
+ *
+ * @return Messages|false
*/
PHP_METHOD(Phalcon_Filter_Validation, validate)
{
@@ -893,7 +895,7 @@ PHP_METHOD(Phalcon_Filter_Validation, validate)
zephir_read_property(&_0, this_ptr, ZEND_STRL("combinedFieldsValidators"), PH_NOISY_CC | PH_READONLY);
ZEPHIR_CPY_WRT(&combinedFieldsValidators, &_0);
if (UNEXPECTED(Z_TYPE_P(&validatorData) != IS_ARRAY)) {
- ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "There are no validators to validate", "phalcon/Filter/Validation.zep", 491);
+ ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "There are no validators to validate", "phalcon/Filter/Validation.zep", 493);
return;
}
ZEPHIR_INIT_VAR(&_1);
@@ -921,12 +923,12 @@ PHP_METHOD(Phalcon_Filter_Validation, validate)
_2$$7 = Z_TYPE_P(data) != IS_OBJECT;
}
if (UNEXPECTED(_2$$7)) {
- ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Invalid data to validate", "phalcon/Filter/Validation.zep", 523);
+ ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "Invalid data to validate", "phalcon/Filter/Validation.zep", 525);
return;
}
zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data);
}
- zephir_is_iterable(&validatorData, 0, "phalcon/Filter/Validation.zep", 554);
+ zephir_is_iterable(&validatorData, 0, "phalcon/Filter/Validation.zep", 556);
if (Z_TYPE_P(&validatorData) == IS_ARRAY) {
ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&validatorData), _5, _6, _3)
{
@@ -938,14 +940,14 @@ PHP_METHOD(Phalcon_Filter_Validation, validate)
}
ZEPHIR_INIT_NVAR(&validators);
ZVAL_COPY(&validators, _3);
- zephir_is_iterable(&validators, 0, "phalcon/Filter/Validation.zep", 552);
+ zephir_is_iterable(&validators, 0, "phalcon/Filter/Validation.zep", 554);
if (Z_TYPE_P(&validators) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&validators), _7$$9)
{
ZEPHIR_INIT_NVAR(&validator);
ZVAL_COPY(&validator, _7$$9);
if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) {
- ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 532);
+ ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 534);
return;
}
ZEPHIR_CALL_METHOD(&_9$$10, this_ptr, "prechecking", &_10, 0, &field, &validator);
@@ -977,7 +979,7 @@ PHP_METHOD(Phalcon_Filter_Validation, validate)
ZEPHIR_CALL_METHOD(&validator, &validators, "current", NULL, 0);
zephir_check_call_status();
if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) {
- ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 532);
+ ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 534);
return;
}
ZEPHIR_CALL_METHOD(&_14$$15, this_ptr, "prechecking", &_10, 0, &field, &validator);
@@ -1015,14 +1017,14 @@ PHP_METHOD(Phalcon_Filter_Validation, validate)
zephir_check_call_status();
ZEPHIR_CALL_METHOD(&validators, &validatorData, "current", NULL, 0);
zephir_check_call_status();
- zephir_is_iterable(&validators, 0, "phalcon/Filter/Validation.zep", 552);
+ zephir_is_iterable(&validators, 0, "phalcon/Filter/Validation.zep", 554);
if (Z_TYPE_P(&validators) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&validators), _18$$20)
{
ZEPHIR_INIT_NVAR(&validator);
ZVAL_COPY(&validator, _18$$20);
if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) {
- ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 532);
+ ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 534);
return;
}
ZEPHIR_CALL_METHOD(&_20$$21, this_ptr, "prechecking", &_10, 0, &field, &validator);
@@ -1054,7 +1056,7 @@ PHP_METHOD(Phalcon_Filter_Validation, validate)
ZEPHIR_CALL_METHOD(&validator, &validators, "current", NULL, 0);
zephir_check_call_status();
if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) {
- ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 532);
+ ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 534);
return;
}
ZEPHIR_CALL_METHOD(&_24$$26, this_ptr, "prechecking", &_10, 0, &field, &validator);
@@ -1084,22 +1086,22 @@ PHP_METHOD(Phalcon_Filter_Validation, validate)
}
ZEPHIR_INIT_NVAR(&validators);
ZEPHIR_INIT_NVAR(&field);
- zephir_is_iterable(&combinedFieldsValidators, 0, "phalcon/Filter/Validation.zep", 587);
+ zephir_is_iterable(&combinedFieldsValidators, 0, "phalcon/Filter/Validation.zep", 589);
if (Z_TYPE_P(&combinedFieldsValidators) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&combinedFieldsValidators), _28)
{
ZEPHIR_INIT_NVAR(&scope);
ZVAL_COPY(&scope, _28);
if (UNEXPECTED(Z_TYPE_P(&scope) != IS_ARRAY)) {
- ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "The validator scope is not valid", "phalcon/Filter/Validation.zep", 556);
+ ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "The validator scope is not valid", "phalcon/Filter/Validation.zep", 558);
return;
}
ZEPHIR_OBS_NVAR(&field);
- zephir_array_fetch_long(&field, &scope, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 559);
+ zephir_array_fetch_long(&field, &scope, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 561);
ZEPHIR_OBS_NVAR(&validator);
- zephir_array_fetch_long(&validator, &scope, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 560);
+ zephir_array_fetch_long(&validator, &scope, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 562);
if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) {
- ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 563);
+ ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 565);
return;
}
ZEPHIR_CALL_METHOD(&_30$$31, this_ptr, "prechecking", &_10, 0, &field, &validator);
@@ -1131,15 +1133,15 @@ PHP_METHOD(Phalcon_Filter_Validation, validate)
ZEPHIR_CALL_METHOD(&scope, &combinedFieldsValidators, "current", NULL, 0);
zephir_check_call_status();
if (UNEXPECTED(Z_TYPE_P(&scope) != IS_ARRAY)) {
- ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "The validator scope is not valid", "phalcon/Filter/Validation.zep", 556);
+ ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "The validator scope is not valid", "phalcon/Filter/Validation.zep", 558);
return;
}
ZEPHIR_OBS_NVAR(&field);
- zephir_array_fetch_long(&field, &scope, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 559);
+ zephir_array_fetch_long(&field, &scope, 0, PH_NOISY, "phalcon/Filter/Validation.zep", 561);
ZEPHIR_OBS_NVAR(&validator);
- zephir_array_fetch_long(&validator, &scope, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 560);
+ zephir_array_fetch_long(&validator, &scope, 1, PH_NOISY, "phalcon/Filter/Validation.zep", 562);
if (UNEXPECTED(Z_TYPE_P(&validator) != IS_OBJECT)) {
- ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 563);
+ ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_filter_validation_exception_ce, "One of the validators is not valid", "phalcon/Filter/Validation.zep", 565);
return;
}
ZEPHIR_CALL_METHOD(&_34$$37, this_ptr, "prechecking", &_10, 0, &field, &validator);
@@ -1210,7 +1212,7 @@ PHP_METHOD(Phalcon_Filter_Validation, preChecking)
ZEPHIR_INIT_VAR(&results);
array_init(&results);
if (Z_TYPE_P(field) == IS_ARRAY) {
- zephir_is_iterable(field, 0, "phalcon/Filter/Validation.zep", 615);
+ zephir_is_iterable(field, 0, "phalcon/Filter/Validation.zep", 617);
if (Z_TYPE_P(field) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(field), _0$$3)
{
@@ -1218,7 +1220,7 @@ PHP_METHOD(Phalcon_Filter_Validation, preChecking)
ZVAL_COPY(&singleField, _0$$3);
ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "prechecking", &_3, 291, &singleField, validator);
zephir_check_call_status();
- zephir_array_append(&results, &_2$$4, PH_SEPARATE, "phalcon/Filter/Validation.zep", 607);
+ zephir_array_append(&results, &_2$$4, PH_SEPARATE, "phalcon/Filter/Validation.zep", 609);
if (zephir_fast_in_array(&__$false, &results)) {
RETURN_MM_BOOL(0);
}
@@ -1237,7 +1239,7 @@ PHP_METHOD(Phalcon_Filter_Validation, preChecking)
zephir_check_call_status();
ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "prechecking", &_3, 291, &singleField, validator);
zephir_check_call_status();
- zephir_array_append(&results, &_4$$6, PH_SEPARATE, "phalcon/Filter/Validation.zep", 607);
+ zephir_array_append(&results, &_4$$6, PH_SEPARATE, "phalcon/Filter/Validation.zep", 609);
if (zephir_fast_in_array(&__$false, &results)) {
RETURN_MM_BOOL(0);
}
@@ -1262,7 +1264,7 @@ PHP_METHOD(Phalcon_Filter_Validation, preChecking)
ZEPHIR_CALL_METHOD(&value, this_ptr, "getvalue", NULL, 0, field);
zephir_check_call_status();
if (Z_TYPE_P(&allowEmpty) == IS_ARRAY) {
- zephir_is_iterable(&allowEmpty, 0, "phalcon/Filter/Validation.zep", 632);
+ zephir_is_iterable(&allowEmpty, 0, "phalcon/Filter/Validation.zep", 634);
if (Z_TYPE_P(&allowEmpty) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&allowEmpty), _7$$11)
{
diff --git a/ext/phalcon/filter/validation.zep.h b/ext/phalcon/filter/validation.zep.h
index f13616033f..009a9c2b24 100644
--- a/ext/phalcon/filter/validation.zep.h
+++ b/ext/phalcon/filter/validation.zep.h
@@ -107,7 +107,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_filter_validation_setvali
ZEND_ARG_ARRAY_INFO(0, validators, 0)
ZEND_END_ARG_INFO()
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_filter_validation_validate, 0, 0, Phalcon\\Messages\\Messages, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_filter_validation_validate, 0, 0, 0)
ZEND_ARG_INFO(0, data)
ZEND_ARG_INFO(0, entity)
ZEND_END_ARG_INFO()
diff --git a/ext/phalcon/filter/validation/validationinterface.zep.c b/ext/phalcon/filter/validation/validationinterface.zep.c
index 1fd22e48a3..6fb74e3290 100644
--- a/ext/phalcon/filter/validation/validationinterface.zep.c
+++ b/ext/phalcon/filter/validation/validationinterface.zep.c
@@ -101,5 +101,7 @@ ZEPHIR_DOC_METHOD(Phalcon_Filter_Validation_ValidationInterface, setLabels);
*
* @param array|object data
* @param object entity
+ *
+ * @return Messages|false
*/
ZEPHIR_DOC_METHOD(Phalcon_Filter_Validation_ValidationInterface, validate);
diff --git a/ext/phalcon/filter/validation/validationinterface.zep.h b/ext/phalcon/filter/validation/validationinterface.zep.h
index effcc2f2ee..7f4897eb12 100644
--- a/ext/phalcon/filter/validation/validationinterface.zep.h
+++ b/ext/phalcon/filter/validation/validationinterface.zep.h
@@ -58,7 +58,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_filter_validation_valida
ZEND_ARG_ARRAY_INFO(0, labels, 0)
ZEND_END_ARG_INFO()
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_filter_validation_validationinterface_validate, 0, 0, Phalcon\\Messages\\Messages, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_filter_validation_validationinterface_validate, 0, 0, 0)
ZEND_ARG_INFO(0, data)
ZEND_ARG_INFO(0, entity)
ZEND_END_ARG_INFO()
diff --git a/ext/phalcon/http/request.zep.c b/ext/phalcon/http/request.zep.c
index 1006438e82..42672bad22 100644
--- a/ext/phalcon/http/request.zep.c
+++ b/ext/phalcon/http/request.zep.c
@@ -4669,8 +4669,8 @@ PHP_METHOD(Phalcon_Http_Request, getPatchPut)
{
zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
zend_long ZEPHIR_LAST_CALL_STATUS;
- zend_bool notAllowEmpty, noRecursive;
- zval *collection_param = NULL, *name_param = NULL, *filters = NULL, filters_sub, *defaultValue = NULL, defaultValue_sub, *notAllowEmpty_param = NULL, *noRecursive_param = NULL, __$null, cached, contentType, _5, _6, _0$$4, _1$$4, _3$$4, _2$$5, _4$$8;
+ zend_bool notAllowEmpty, noRecursive, _0$$3, _3$$3;
+ zval *collection_param = NULL, *name_param = NULL, *filters = NULL, filters_sub, *defaultValue = NULL, defaultValue_sub, *notAllowEmpty_param = NULL, *noRecursive_param = NULL, __$null, cached, contentType, _10, _11, _1$$3, _2$$3, _4$$3, _5$$4, _6$$4, _8$$4, _7$$5, _9$$8;
zval collection, name;
zval *this_ptr = getThis();
@@ -4681,13 +4681,16 @@ PHP_METHOD(Phalcon_Http_Request, getPatchPut)
ZVAL_NULL(&__$null);
ZVAL_UNDEF(&cached);
ZVAL_UNDEF(&contentType);
- ZVAL_UNDEF(&_5);
- ZVAL_UNDEF(&_6);
- ZVAL_UNDEF(&_0$$4);
- ZVAL_UNDEF(&_1$$4);
- ZVAL_UNDEF(&_3$$4);
- ZVAL_UNDEF(&_2$$5);
- ZVAL_UNDEF(&_4$$8);
+ ZVAL_UNDEF(&_10);
+ ZVAL_UNDEF(&_11);
+ ZVAL_UNDEF(&_1$$3);
+ ZVAL_UNDEF(&_2$$3);
+ ZVAL_UNDEF(&_4$$3);
+ ZVAL_UNDEF(&_5$$4);
+ ZVAL_UNDEF(&_6$$4);
+ ZVAL_UNDEF(&_8$$4);
+ ZVAL_UNDEF(&_7$$5);
+ ZVAL_UNDEF(&_9$$8);
bool is_null_true = 1;
ZEND_PARSE_PARAMETERS_START(1, 6)
Z_PARAM_STR(collection)
@@ -4728,21 +4731,37 @@ PHP_METHOD(Phalcon_Http_Request, getPatchPut)
if (Z_TYPE_P(&cached) == IS_NULL) {
ZEPHIR_CALL_METHOD(&contentType, this_ptr, "getcontenttype", NULL, 0);
zephir_check_call_status();
- if (Z_TYPE_P(&contentType) == IS_STRING) {
- ZEPHIR_INIT_VAR(&_0$$4);
- ZVAL_STRING(&_0$$4, "json");
- ZEPHIR_CALL_FUNCTION(&_1$$4, "stripos", NULL, 348, &contentType, &_0$$4);
+ _0$$3 = Z_TYPE_P(&contentType) == IS_STRING;
+ if (_0$$3) {
+ ZEPHIR_INIT_VAR(&_1$$3);
+ ZVAL_STRING(&_1$$3, "json");
+ ZEPHIR_CALL_FUNCTION(&_2$$3, "stripos", NULL, 348, &contentType, &_1$$3);
+ zephir_check_call_status();
+ _3$$3 = !ZEPHIR_IS_FALSE(&_2$$3);
+ if (!(_3$$3)) {
+ ZEPHIR_INIT_NVAR(&_1$$3);
+ ZVAL_STRING(&_1$$3, "multipart/form-data");
+ ZEPHIR_CALL_FUNCTION(&_4$$3, "stripos", NULL, 348, &contentType, &_1$$3);
+ zephir_check_call_status();
+ _3$$3 = !ZEPHIR_IS_FALSE_IDENTICAL(&_4$$3);
+ }
+ _0$$3 = _3$$3;
+ }
+ if (_0$$3) {
+ ZEPHIR_INIT_VAR(&_5$$4);
+ ZVAL_STRING(&_5$$4, "json");
+ ZEPHIR_CALL_FUNCTION(&_6$$4, "stripos", NULL, 348, &contentType, &_5$$4);
zephir_check_call_status();
- if (!ZEPHIR_IS_FALSE(&_1$$4)) {
- ZVAL_BOOL(&_2$$5, 1);
- ZEPHIR_CALL_METHOD(&cached, this_ptr, "getjsonrawbody", NULL, 0, &_2$$5);
+ if (!ZEPHIR_IS_FALSE(&_6$$4)) {
+ ZVAL_BOOL(&_7$$5, 1);
+ ZEPHIR_CALL_METHOD(&cached, this_ptr, "getjsonrawbody", NULL, 0, &_7$$5);
zephir_check_call_status();
}
- ZEPHIR_INIT_NVAR(&_0$$4);
- ZVAL_STRING(&_0$$4, "multipart/form-data");
- ZEPHIR_CALL_FUNCTION(&_3$$4, "stripos", NULL, 348, &contentType, &_0$$4);
+ ZEPHIR_INIT_NVAR(&_5$$4);
+ ZVAL_STRING(&_5$$4, "multipart/form-data");
+ ZEPHIR_CALL_FUNCTION(&_8$$4, "stripos", NULL, 348, &contentType, &_5$$4);
zephir_check_call_status();
- if (!ZEPHIR_IS_FALSE_IDENTICAL(&_3$$4)) {
+ if (!ZEPHIR_IS_FALSE_IDENTICAL(&_8$$4)) {
ZEPHIR_CALL_METHOD(&cached, this_ptr, "getformdata", NULL, 349);
zephir_check_call_status();
}
@@ -4753,26 +4772,26 @@ PHP_METHOD(Phalcon_Http_Request, getPatchPut)
} else {
ZEPHIR_INIT_NVAR(&cached);
array_init(&cached);
- ZEPHIR_CALL_METHOD(&_4$$8, this_ptr, "getrawbody", NULL, 0);
+ ZEPHIR_CALL_METHOD(&_9$$8, this_ptr, "getrawbody", NULL, 0);
zephir_check_call_status();
ZEPHIR_MAKE_REF(&cached);
- ZEPHIR_CALL_FUNCTION(NULL, "parse_str", NULL, 350, &_4$$8, &cached);
+ ZEPHIR_CALL_FUNCTION(NULL, "parse_str", NULL, 350, &_9$$8, &cached);
ZEPHIR_UNREF(&cached);
zephir_check_call_status();
}
zephir_update_property_zval_zval(this_ptr, &collection, &cached);
}
if (notAllowEmpty) {
- ZVAL_BOOL(&_5, 1);
+ ZVAL_BOOL(&_10, 1);
} else {
- ZVAL_BOOL(&_5, 0);
+ ZVAL_BOOL(&_10, 0);
}
if (noRecursive) {
- ZVAL_BOOL(&_6, 1);
+ ZVAL_BOOL(&_11, 1);
} else {
- ZVAL_BOOL(&_6, 0);
+ ZVAL_BOOL(&_11, 0);
}
- ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 333, &cached, &name, filters, defaultValue, &_5, &_6);
+ ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 333, &cached, &name, filters, defaultValue, &_10, &_11);
zephir_check_call_status();
RETURN_MM();
}
@@ -4979,7 +4998,7 @@ PHP_METHOD(Phalcon_Http_Request, getFormData)
ZVAL_STRING(&_3, "/boundary=(.*)$/is");
zephir_preg_match(&_2, &_3, &_0, &matches, 0, 0 , 0 );
zephir_memory_observe(&boundary);
- zephir_array_fetch_long(&boundary, &matches, 1, PH_NOISY, "phalcon/Http/Request.zep", 1766);
+ zephir_array_fetch_long(&boundary, &matches, 1, PH_NOISY, "phalcon/Http/Request.zep", 1771);
ZEPHIR_INIT_VAR(&_4);
ZVAL_STRING(&_4, "/");
ZEPHIR_CALL_FUNCTION(&_5, "preg_quote", NULL, 351, &boundary, &_4);
@@ -4996,7 +5015,7 @@ PHP_METHOD(Phalcon_Http_Request, getFormData)
zephir_check_call_status();
ZEPHIR_INIT_VAR(&dataset);
array_init(&dataset);
- zephir_is_iterable(&bodyParts, 0, "phalcon/Http/Request.zep", 1827);
+ zephir_is_iterable(&bodyParts, 0, "phalcon/Http/Request.zep", 1832);
if (Z_TYPE_P(&bodyParts) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&bodyParts), _8)
{
@@ -5012,14 +5031,14 @@ PHP_METHOD(Phalcon_Http_Request, getFormData)
zephir_check_call_status();
ZEPHIR_INIT_NVAR(&headers$$3);
array_init(&headers$$3);
- zephir_array_fetch_long(&_12$$3, &splited$$3, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1788);
+ zephir_array_fetch_long(&_12$$3, &splited$$3, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1793);
ZEPHIR_INIT_NVAR(&_10$$3);
ZVAL_STRING(&_10$$3, "/\\R/s");
ZVAL_LONG(&_11$$3, -1);
ZVAL_LONG(&_13$$3, 1);
ZEPHIR_CALL_FUNCTION(&headerParts$$3, "preg_split", NULL, 71, &_10$$3, &_12$$3, &_11$$3, &_13$$3);
zephir_check_call_status();
- zephir_is_iterable(&headerParts$$3, 0, "phalcon/Http/Request.zep", 1824);
+ zephir_is_iterable(&headerParts$$3, 0, "phalcon/Http/Request.zep", 1829);
if (Z_TYPE_P(&headerParts$$3) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&headerParts$$3), _14$$3)
{
@@ -5035,11 +5054,11 @@ PHP_METHOD(Phalcon_Http_Request, getFormData)
ZEPHIR_INIT_NVAR(&exploded$$5);
zephir_fast_explode_str(&exploded$$5, SL(":"), &headerPart$$3, 2 );
ZEPHIR_INIT_NVAR(&_18$$5);
- zephir_array_fetch_long(&_19$$5, &exploded$$5, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1798);
+ zephir_array_fetch_long(&_19$$5, &exploded$$5, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1803);
zephir_fast_trim(&_18$$5, &_19$$5, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&headerName$$5);
zephir_fast_strtolower(&headerName$$5, &_18$$5);
- zephir_array_fetch_long(&_20$$5, &exploded$$5, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1799);
+ zephir_array_fetch_long(&_20$$5, &exploded$$5, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1804);
ZEPHIR_INIT_NVAR(&headerValue$$5);
zephir_fast_trim(&headerValue$$5, &_20$$5, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&_21$$5);
@@ -5049,7 +5068,7 @@ PHP_METHOD(Phalcon_Http_Request, getFormData)
if (!ZEPHIR_IS_FALSE_IDENTICAL(&_22$$5)) {
ZEPHIR_INIT_NVAR(&explodedHeader$$7);
zephir_fast_explode_str(&explodedHeader$$7, SL(";"), &headerValue$$5, LONG_MAX);
- zephir_is_iterable(&explodedHeader$$7, 0, "phalcon/Http/Request.zep", 1819);
+ zephir_is_iterable(&explodedHeader$$7, 0, "phalcon/Http/Request.zep", 1824);
if (Z_TYPE_P(&explodedHeader$$7) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&explodedHeader$$7), _23$$7)
{
@@ -5071,12 +5090,12 @@ PHP_METHOD(Phalcon_Http_Request, getFormData)
ZEPHIR_INIT_NVAR(&explodedPart$$9);
zephir_fast_explode_str(&explodedPart$$9, SL("="), &part$$7, 2 );
ZEPHIR_INIT_NVAR(&_29$$9);
- zephir_array_fetch_long(&_30$$9, &explodedPart$$9, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1811);
+ zephir_array_fetch_long(&_30$$9, &explodedPart$$9, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1816);
zephir_fast_trim(&_29$$9, &_30$$9, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&namePart$$9);
zephir_fast_strtolower(&namePart$$9, &_29$$9);
ZEPHIR_INIT_NVAR(&_31$$9);
- zephir_array_fetch_long(&_32$$9, &explodedPart$$9, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1812);
+ zephir_array_fetch_long(&_32$$9, &explodedPart$$9, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1817);
zephir_fast_trim(&_31$$9, &_32$$9, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&_33$$9);
ZVAL_STRING(&_33$$9, "\"");
@@ -5114,12 +5133,12 @@ PHP_METHOD(Phalcon_Http_Request, getFormData)
ZEPHIR_INIT_NVAR(&explodedPart$$12);
zephir_fast_explode_str(&explodedPart$$12, SL("="), &part$$7, 2 );
ZEPHIR_INIT_NVAR(&_37$$12);
- zephir_array_fetch_long(&_38$$12, &explodedPart$$12, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1811);
+ zephir_array_fetch_long(&_38$$12, &explodedPart$$12, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1816);
zephir_fast_trim(&_37$$12, &_38$$12, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&namePart$$12);
zephir_fast_strtolower(&namePart$$12, &_37$$12);
ZEPHIR_INIT_NVAR(&_39$$12);
- zephir_array_fetch_long(&_40$$12, &explodedPart$$12, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1812);
+ zephir_array_fetch_long(&_40$$12, &explodedPart$$12, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1817);
zephir_fast_trim(&_39$$12, &_40$$12, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&_41$$12);
ZVAL_STRING(&_41$$12, "\"");
@@ -5159,11 +5178,11 @@ PHP_METHOD(Phalcon_Http_Request, getFormData)
ZEPHIR_INIT_NVAR(&exploded$$15);
zephir_fast_explode_str(&exploded$$15, SL(":"), &headerPart$$3, 2 );
ZEPHIR_INIT_NVAR(&_44$$15);
- zephir_array_fetch_long(&_45$$15, &exploded$$15, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1798);
+ zephir_array_fetch_long(&_45$$15, &exploded$$15, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1803);
zephir_fast_trim(&_44$$15, &_45$$15, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&headerName$$15);
zephir_fast_strtolower(&headerName$$15, &_44$$15);
- zephir_array_fetch_long(&_46$$15, &exploded$$15, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1799);
+ zephir_array_fetch_long(&_46$$15, &exploded$$15, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1804);
ZEPHIR_INIT_NVAR(&headerValue$$15);
zephir_fast_trim(&headerValue$$15, &_46$$15, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&_47$$15);
@@ -5173,7 +5192,7 @@ PHP_METHOD(Phalcon_Http_Request, getFormData)
if (!ZEPHIR_IS_FALSE_IDENTICAL(&_48$$15)) {
ZEPHIR_INIT_NVAR(&explodedHeader$$17);
zephir_fast_explode_str(&explodedHeader$$17, SL(";"), &headerValue$$15, LONG_MAX);
- zephir_is_iterable(&explodedHeader$$17, 0, "phalcon/Http/Request.zep", 1819);
+ zephir_is_iterable(&explodedHeader$$17, 0, "phalcon/Http/Request.zep", 1824);
if (Z_TYPE_P(&explodedHeader$$17) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&explodedHeader$$17), _49$$17)
{
@@ -5195,12 +5214,12 @@ PHP_METHOD(Phalcon_Http_Request, getFormData)
ZEPHIR_INIT_NVAR(&explodedPart$$19);
zephir_fast_explode_str(&explodedPart$$19, SL("="), &part$$17, 2 );
ZEPHIR_INIT_NVAR(&_54$$19);
- zephir_array_fetch_long(&_55$$19, &explodedPart$$19, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1811);
+ zephir_array_fetch_long(&_55$$19, &explodedPart$$19, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1816);
zephir_fast_trim(&_54$$19, &_55$$19, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&namePart$$19);
zephir_fast_strtolower(&namePart$$19, &_54$$19);
ZEPHIR_INIT_NVAR(&_56$$19);
- zephir_array_fetch_long(&_57$$19, &explodedPart$$19, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1812);
+ zephir_array_fetch_long(&_57$$19, &explodedPart$$19, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1817);
zephir_fast_trim(&_56$$19, &_57$$19, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&_58$$19);
ZVAL_STRING(&_58$$19, "\"");
@@ -5238,12 +5257,12 @@ PHP_METHOD(Phalcon_Http_Request, getFormData)
ZEPHIR_INIT_NVAR(&explodedPart$$22);
zephir_fast_explode_str(&explodedPart$$22, SL("="), &part$$17, 2 );
ZEPHIR_INIT_NVAR(&_62$$22);
- zephir_array_fetch_long(&_63$$22, &explodedPart$$22, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1811);
+ zephir_array_fetch_long(&_63$$22, &explodedPart$$22, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1816);
zephir_fast_trim(&_62$$22, &_63$$22, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&namePart$$22);
zephir_fast_strtolower(&namePart$$22, &_62$$22);
ZEPHIR_INIT_NVAR(&_64$$22);
- zephir_array_fetch_long(&_65$$22, &explodedPart$$22, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1812);
+ zephir_array_fetch_long(&_65$$22, &explodedPart$$22, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1817);
zephir_fast_trim(&_64$$22, &_65$$22, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&_66$$22);
ZVAL_STRING(&_66$$22, "\"");
@@ -5266,10 +5285,10 @@ PHP_METHOD(Phalcon_Http_Request, getFormData)
}
}
ZEPHIR_INIT_NVAR(&headerPart$$3);
- zephir_array_fetch_long(&_67$$3, &splited$$3, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1824);
- zephir_array_fetch_string(&_68$$3, &headers$$3, SL("content-disposition"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1824);
+ zephir_array_fetch_long(&_67$$3, &splited$$3, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1829);
+ zephir_array_fetch_string(&_68$$3, &headers$$3, SL("content-disposition"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1829);
ZEPHIR_OBS_NVAR(&_69$$3);
- zephir_array_fetch_string(&_69$$3, &_68$$3, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 1824);
+ zephir_array_fetch_string(&_69$$3, &_68$$3, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 1829);
zephir_array_update_zval(&dataset, &_69$$3, &_67$$3, PH_COPY | PH_SEPARATE);
} ZEND_HASH_FOREACH_END();
} else {
@@ -5293,14 +5312,14 @@ PHP_METHOD(Phalcon_Http_Request, getFormData)
zephir_check_call_status();
ZEPHIR_INIT_NVAR(&headers$$25);
array_init(&headers$$25);
- zephir_array_fetch_long(&_72$$25, &splited$$25, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1788);
+ zephir_array_fetch_long(&_72$$25, &splited$$25, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1793);
ZEPHIR_INIT_NVAR(&_70$$25);
ZVAL_STRING(&_70$$25, "/\\R/s");
ZVAL_LONG(&_71$$25, -1);
ZVAL_LONG(&_73$$25, 1);
ZEPHIR_CALL_FUNCTION(&headerParts$$25, "preg_split", NULL, 71, &_70$$25, &_72$$25, &_71$$25, &_73$$25);
zephir_check_call_status();
- zephir_is_iterable(&headerParts$$25, 0, "phalcon/Http/Request.zep", 1824);
+ zephir_is_iterable(&headerParts$$25, 0, "phalcon/Http/Request.zep", 1829);
if (Z_TYPE_P(&headerParts$$25) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&headerParts$$25), _74$$25)
{
@@ -5316,11 +5335,11 @@ PHP_METHOD(Phalcon_Http_Request, getFormData)
ZEPHIR_INIT_NVAR(&exploded$$27);
zephir_fast_explode_str(&exploded$$27, SL(":"), &headerPart$$25, 2 );
ZEPHIR_INIT_NVAR(&_78$$27);
- zephir_array_fetch_long(&_79$$27, &exploded$$27, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1798);
+ zephir_array_fetch_long(&_79$$27, &exploded$$27, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1803);
zephir_fast_trim(&_78$$27, &_79$$27, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&headerName$$27);
zephir_fast_strtolower(&headerName$$27, &_78$$27);
- zephir_array_fetch_long(&_80$$27, &exploded$$27, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1799);
+ zephir_array_fetch_long(&_80$$27, &exploded$$27, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1804);
ZEPHIR_INIT_NVAR(&headerValue$$27);
zephir_fast_trim(&headerValue$$27, &_80$$27, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&_81$$27);
@@ -5330,7 +5349,7 @@ PHP_METHOD(Phalcon_Http_Request, getFormData)
if (!ZEPHIR_IS_FALSE_IDENTICAL(&_82$$27)) {
ZEPHIR_INIT_NVAR(&explodedHeader$$29);
zephir_fast_explode_str(&explodedHeader$$29, SL(";"), &headerValue$$27, LONG_MAX);
- zephir_is_iterable(&explodedHeader$$29, 0, "phalcon/Http/Request.zep", 1819);
+ zephir_is_iterable(&explodedHeader$$29, 0, "phalcon/Http/Request.zep", 1824);
if (Z_TYPE_P(&explodedHeader$$29) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&explodedHeader$$29), _83$$29)
{
@@ -5352,12 +5371,12 @@ PHP_METHOD(Phalcon_Http_Request, getFormData)
ZEPHIR_INIT_NVAR(&explodedPart$$31);
zephir_fast_explode_str(&explodedPart$$31, SL("="), &part$$29, 2 );
ZEPHIR_INIT_NVAR(&_88$$31);
- zephir_array_fetch_long(&_89$$31, &explodedPart$$31, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1811);
+ zephir_array_fetch_long(&_89$$31, &explodedPart$$31, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1816);
zephir_fast_trim(&_88$$31, &_89$$31, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&namePart$$31);
zephir_fast_strtolower(&namePart$$31, &_88$$31);
ZEPHIR_INIT_NVAR(&_90$$31);
- zephir_array_fetch_long(&_91$$31, &explodedPart$$31, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1812);
+ zephir_array_fetch_long(&_91$$31, &explodedPart$$31, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1817);
zephir_fast_trim(&_90$$31, &_91$$31, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&_92$$31);
ZVAL_STRING(&_92$$31, "\"");
@@ -5395,12 +5414,12 @@ PHP_METHOD(Phalcon_Http_Request, getFormData)
ZEPHIR_INIT_NVAR(&explodedPart$$34);
zephir_fast_explode_str(&explodedPart$$34, SL("="), &part$$29, 2 );
ZEPHIR_INIT_NVAR(&_96$$34);
- zephir_array_fetch_long(&_97$$34, &explodedPart$$34, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1811);
+ zephir_array_fetch_long(&_97$$34, &explodedPart$$34, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1816);
zephir_fast_trim(&_96$$34, &_97$$34, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&namePart$$34);
zephir_fast_strtolower(&namePart$$34, &_96$$34);
ZEPHIR_INIT_NVAR(&_98$$34);
- zephir_array_fetch_long(&_99$$34, &explodedPart$$34, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1812);
+ zephir_array_fetch_long(&_99$$34, &explodedPart$$34, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1817);
zephir_fast_trim(&_98$$34, &_99$$34, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&_100$$34);
ZVAL_STRING(&_100$$34, "\"");
@@ -5440,11 +5459,11 @@ PHP_METHOD(Phalcon_Http_Request, getFormData)
ZEPHIR_INIT_NVAR(&exploded$$37);
zephir_fast_explode_str(&exploded$$37, SL(":"), &headerPart$$25, 2 );
ZEPHIR_INIT_NVAR(&_103$$37);
- zephir_array_fetch_long(&_104$$37, &exploded$$37, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1798);
+ zephir_array_fetch_long(&_104$$37, &exploded$$37, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1803);
zephir_fast_trim(&_103$$37, &_104$$37, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&headerName$$37);
zephir_fast_strtolower(&headerName$$37, &_103$$37);
- zephir_array_fetch_long(&_105$$37, &exploded$$37, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1799);
+ zephir_array_fetch_long(&_105$$37, &exploded$$37, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1804);
ZEPHIR_INIT_NVAR(&headerValue$$37);
zephir_fast_trim(&headerValue$$37, &_105$$37, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&_106$$37);
@@ -5454,7 +5473,7 @@ PHP_METHOD(Phalcon_Http_Request, getFormData)
if (!ZEPHIR_IS_FALSE_IDENTICAL(&_107$$37)) {
ZEPHIR_INIT_NVAR(&explodedHeader$$39);
zephir_fast_explode_str(&explodedHeader$$39, SL(";"), &headerValue$$37, LONG_MAX);
- zephir_is_iterable(&explodedHeader$$39, 0, "phalcon/Http/Request.zep", 1819);
+ zephir_is_iterable(&explodedHeader$$39, 0, "phalcon/Http/Request.zep", 1824);
if (Z_TYPE_P(&explodedHeader$$39) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&explodedHeader$$39), _108$$39)
{
@@ -5476,12 +5495,12 @@ PHP_METHOD(Phalcon_Http_Request, getFormData)
ZEPHIR_INIT_NVAR(&explodedPart$$41);
zephir_fast_explode_str(&explodedPart$$41, SL("="), &part$$39, 2 );
ZEPHIR_INIT_NVAR(&_113$$41);
- zephir_array_fetch_long(&_114$$41, &explodedPart$$41, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1811);
+ zephir_array_fetch_long(&_114$$41, &explodedPart$$41, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1816);
zephir_fast_trim(&_113$$41, &_114$$41, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&namePart$$41);
zephir_fast_strtolower(&namePart$$41, &_113$$41);
ZEPHIR_INIT_NVAR(&_115$$41);
- zephir_array_fetch_long(&_116$$41, &explodedPart$$41, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1812);
+ zephir_array_fetch_long(&_116$$41, &explodedPart$$41, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1817);
zephir_fast_trim(&_115$$41, &_116$$41, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&_117$$41);
ZVAL_STRING(&_117$$41, "\"");
@@ -5519,12 +5538,12 @@ PHP_METHOD(Phalcon_Http_Request, getFormData)
ZEPHIR_INIT_NVAR(&explodedPart$$44);
zephir_fast_explode_str(&explodedPart$$44, SL("="), &part$$39, 2 );
ZEPHIR_INIT_NVAR(&_121$$44);
- zephir_array_fetch_long(&_122$$44, &explodedPart$$44, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1811);
+ zephir_array_fetch_long(&_122$$44, &explodedPart$$44, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1816);
zephir_fast_trim(&_121$$44, &_122$$44, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&namePart$$44);
zephir_fast_strtolower(&namePart$$44, &_121$$44);
ZEPHIR_INIT_NVAR(&_123$$44);
- zephir_array_fetch_long(&_124$$44, &explodedPart$$44, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1812);
+ zephir_array_fetch_long(&_124$$44, &explodedPart$$44, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1817);
zephir_fast_trim(&_123$$44, &_124$$44, NULL , ZEPHIR_TRIM_BOTH);
ZEPHIR_INIT_NVAR(&_125$$44);
ZVAL_STRING(&_125$$44, "\"");
@@ -5547,10 +5566,10 @@ PHP_METHOD(Phalcon_Http_Request, getFormData)
}
}
ZEPHIR_INIT_NVAR(&headerPart$$25);
- zephir_array_fetch_long(&_126$$25, &splited$$25, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1824);
- zephir_array_fetch_string(&_127$$25, &headers$$25, SL("content-disposition"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1824);
+ zephir_array_fetch_long(&_126$$25, &splited$$25, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1829);
+ zephir_array_fetch_string(&_127$$25, &headers$$25, SL("content-disposition"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1829);
ZEPHIR_OBS_NVAR(&_128$$25);
- zephir_array_fetch_string(&_128$$25, &_127$$25, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 1824);
+ zephir_array_fetch_string(&_128$$25, &_127$$25, SL("name"), PH_NOISY, "phalcon/Http/Request.zep", 1829);
zephir_array_update_zval(&dataset, &_128$$25, &_126$$25, PH_COPY | PH_SEPARATE);
ZEPHIR_CALL_METHOD(NULL, &bodyParts, "next", NULL, 0);
zephir_check_call_status();
diff --git a/ext/phalcon/mvc/model.zep.c b/ext/phalcon/mvc/model.zep.c
index 0bffab7f81..6a7821b827 100644
--- a/ext/phalcon/mvc/model.zep.c
+++ b/ext/phalcon/mvc/model.zep.c
@@ -5501,12 +5501,12 @@ PHP_METHOD(Phalcon_Mvc_Model, sum)
*/
PHP_METHOD(Phalcon_Mvc_Model, toArray)
{
- zend_bool _3$$4, _11$$3, _14$$15, _20$$14;
+ zend_bool _3$$4, _11$$3, _13$$3, _16$$15, _22$$14, _24$$14;
zval data;
zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
zephir_fcall_cache_entry *_5 = NULL, *_9 = NULL;
zend_long ZEPHIR_LAST_CALL_STATUS;
- zval *columns = NULL, columns_sub, *useGetter = NULL, useGetter_sub, __$null, __$true, attribute, attributeField, columnMap, metaData, method, _0, *_1, _2, _4$$5, _6$$7, _7$$7, _8$$7, _10$$3, _12$$11, _13$$12, _15$$16, _16$$18, _17$$18, _18$$18, _19$$14, _21$$22, _22$$23;
+ zval *columns = NULL, columns_sub, *useGetter = NULL, useGetter_sub, __$null, __$true, attribute, attributeField, columnMap, metaData, method, _0, *_1, _2, _4$$5, _6$$7, _7$$7, _8$$7, _10$$3, _12$$3, _14$$11, _15$$12, _17$$16, _18$$18, _19$$18, _20$$18, _21$$14, _23$$14, _25$$22, _26$$23;
zval *this_ptr = getThis();
ZVAL_UNDEF(&columns_sub);
@@ -5525,15 +5525,17 @@ PHP_METHOD(Phalcon_Mvc_Model, toArray)
ZVAL_UNDEF(&_7$$7);
ZVAL_UNDEF(&_8$$7);
ZVAL_UNDEF(&_10$$3);
- ZVAL_UNDEF(&_12$$11);
- ZVAL_UNDEF(&_13$$12);
- ZVAL_UNDEF(&_15$$16);
- ZVAL_UNDEF(&_16$$18);
- ZVAL_UNDEF(&_17$$18);
+ ZVAL_UNDEF(&_12$$3);
+ ZVAL_UNDEF(&_14$$11);
+ ZVAL_UNDEF(&_15$$12);
+ ZVAL_UNDEF(&_17$$16);
ZVAL_UNDEF(&_18$$18);
- ZVAL_UNDEF(&_19$$14);
- ZVAL_UNDEF(&_21$$22);
- ZVAL_UNDEF(&_22$$23);
+ ZVAL_UNDEF(&_19$$18);
+ ZVAL_UNDEF(&_20$$18);
+ ZVAL_UNDEF(&_21$$14);
+ ZVAL_UNDEF(&_23$$14);
+ ZVAL_UNDEF(&_25$$22);
+ ZVAL_UNDEF(&_26$$23);
ZVAL_UNDEF(&data);
bool is_null_true = 1;
ZEND_PARSE_PARAMETERS_START(0, 2)
@@ -5560,7 +5562,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", 3340);
+ zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model.zep", 3343);
if (Z_TYPE_P(&_0) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _1)
{
@@ -5607,16 +5609,22 @@ PHP_METHOD(Phalcon_Mvc_Model, toArray)
ZEPHIR_CONCAT_SV(&method, "get", &_10$$3);
_11$$3 = ZEPHIR_IS_TRUE_IDENTICAL(useGetter);
if (_11$$3) {
- _11$$3 = (zephir_method_exists(this_ptr, &method) == SUCCESS);
+ ZEPHIR_INIT_NVAR(&_12$$3);
+ ZVAL_STRING(&_12$$3, "getSource");
+ _11$$3 = !ZEPHIR_IS_IDENTICAL(&_12$$3, &method);
}
- if (_11$$3) {
- ZEPHIR_CALL_METHOD_ZVAL(&_12$$11, this_ptr, &method, NULL, 0);
+ _13$$3 = _11$$3;
+ if (_13$$3) {
+ _13$$3 = (zephir_method_exists(this_ptr, &method) == SUCCESS);
+ }
+ if (_13$$3) {
+ ZEPHIR_CALL_METHOD_ZVAL(&_14$$11, this_ptr, &method, NULL, 0);
zephir_check_call_status();
- zephir_array_update_zval(&data, &attributeField, &_12$$11, PH_COPY | PH_SEPARATE);
+ zephir_array_update_zval(&data, &attributeField, &_14$$11, PH_COPY | PH_SEPARATE);
} else if (zephir_isset_property_zval(this_ptr, &attributeField)) {
- ZEPHIR_OBS_NVAR(&_13$$12);
- zephir_read_property_zval(&_13$$12, this_ptr, &attributeField, PH_NOISY_CC);
- zephir_array_update_zval(&data, &attributeField, &_13$$12, PH_COPY | PH_SEPARATE);
+ ZEPHIR_OBS_NVAR(&_15$$12);
+ zephir_read_property_zval(&_15$$12, this_ptr, &attributeField, PH_NOISY_CC);
+ zephir_array_update_zval(&data, &attributeField, &_15$$12, PH_COPY | PH_SEPARATE);
} else {
zephir_array_update_zval(&data, &attributeField, &__$null, PH_COPY | PH_SEPARATE);
}
@@ -5633,27 +5641,27 @@ PHP_METHOD(Phalcon_Mvc_Model, toArray)
ZEPHIR_CALL_METHOD(&attribute, &_0, "current", NULL, 0);
zephir_check_call_status();
if (Z_TYPE_P(&columnMap) == IS_ARRAY) {
- _14$$15 = !(zephir_array_isset(&columnMap, &attribute));
- if (_14$$15) {
- _14$$15 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map;
+ _16$$15 = !(zephir_array_isset(&columnMap, &attribute));
+ if (_16$$15) {
+ _16$$15 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map;
}
- if (_14$$15) {
- ZEPHIR_CALL_SELF(&_15$$16, "caseinsensitivecolumnmap", &_5, 420, &columnMap, &attribute);
+ if (_16$$15) {
+ ZEPHIR_CALL_SELF(&_17$$16, "caseinsensitivecolumnmap", &_5, 420, &columnMap, &attribute);
zephir_check_call_status();
- ZEPHIR_CPY_WRT(&attribute, &_15$$16);
+ ZEPHIR_CPY_WRT(&attribute, &_17$$16);
}
ZEPHIR_OBS_NVAR(&attributeField);
if (!(zephir_array_isset_fetch(&attributeField, &columnMap, &attribute, 0))) {
if (UNEXPECTED(!(ZEPHIR_GLOBAL(orm).ignore_unknown_columns))) {
- ZEPHIR_INIT_NVAR(&_16$$18);
- object_init_ex(&_16$$18, phalcon_mvc_model_exception_ce);
- ZEPHIR_INIT_NVAR(&_17$$18);
- zephir_get_class(&_17$$18, this_ptr, 0);
ZEPHIR_INIT_NVAR(&_18$$18);
- ZEPHIR_CONCAT_SVSVS(&_18$$18, "Column '", &attribute, "' doesn't make part of the column map in '", &_17$$18, "'");
- ZEPHIR_CALL_METHOD(NULL, &_16$$18, "__construct", &_9, 33, &_18$$18);
+ object_init_ex(&_18$$18, phalcon_mvc_model_exception_ce);
+ ZEPHIR_INIT_NVAR(&_19$$18);
+ zephir_get_class(&_19$$18, this_ptr, 0);
+ ZEPHIR_INIT_NVAR(&_20$$18);
+ ZEPHIR_CONCAT_SVSVS(&_20$$18, "Column '", &attribute, "' doesn't make part of the column map in '", &_19$$18, "'");
+ ZEPHIR_CALL_METHOD(NULL, &_18$$18, "__construct", &_9, 33, &_20$$18);
zephir_check_call_status();
- zephir_throw_exception_debug(&_16$$18, "phalcon/Mvc/Model.zep", 3311);
+ zephir_throw_exception_debug(&_18$$18, "phalcon/Mvc/Model.zep", 3311);
ZEPHIR_MM_RESTORE();
return;
}
@@ -5667,22 +5675,28 @@ PHP_METHOD(Phalcon_Mvc_Model, toArray)
continue;
}
}
- ZEPHIR_INIT_NVAR(&_19$$14);
- zephir_camelize(&_19$$14, &attributeField, NULL );
+ ZEPHIR_INIT_NVAR(&_21$$14);
+ zephir_camelize(&_21$$14, &attributeField, NULL );
ZEPHIR_INIT_NVAR(&method);
- ZEPHIR_CONCAT_SV(&method, "get", &_19$$14);
- _20$$14 = ZEPHIR_IS_TRUE_IDENTICAL(useGetter);
- if (_20$$14) {
- _20$$14 = (zephir_method_exists(this_ptr, &method) == SUCCESS);
- }
- if (_20$$14) {
- ZEPHIR_CALL_METHOD_ZVAL(&_21$$22, this_ptr, &method, NULL, 0);
+ ZEPHIR_CONCAT_SV(&method, "get", &_21$$14);
+ _22$$14 = ZEPHIR_IS_TRUE_IDENTICAL(useGetter);
+ if (_22$$14) {
+ ZEPHIR_INIT_NVAR(&_23$$14);
+ ZVAL_STRING(&_23$$14, "getSource");
+ _22$$14 = !ZEPHIR_IS_IDENTICAL(&_23$$14, &method);
+ }
+ _24$$14 = _22$$14;
+ if (_24$$14) {
+ _24$$14 = (zephir_method_exists(this_ptr, &method) == SUCCESS);
+ }
+ if (_24$$14) {
+ ZEPHIR_CALL_METHOD_ZVAL(&_25$$22, this_ptr, &method, NULL, 0);
zephir_check_call_status();
- zephir_array_update_zval(&data, &attributeField, &_21$$22, PH_COPY | PH_SEPARATE);
+ zephir_array_update_zval(&data, &attributeField, &_25$$22, PH_COPY | PH_SEPARATE);
} else if (zephir_isset_property_zval(this_ptr, &attributeField)) {
- ZEPHIR_OBS_NVAR(&_22$$23);
- zephir_read_property_zval(&_22$$23, this_ptr, &attributeField, PH_NOISY_CC);
- zephir_array_update_zval(&data, &attributeField, &_22$$23, PH_COPY | PH_SEPARATE);
+ ZEPHIR_OBS_NVAR(&_26$$23);
+ zephir_read_property_zval(&_26$$23, this_ptr, &attributeField, PH_NOISY_CC);
+ zephir_array_update_zval(&data, &attributeField, &_26$$23, PH_COPY | PH_SEPARATE);
} else {
zephir_array_update_zval(&data, &attributeField, &__$null, PH_COPY | PH_SEPARATE);
}
@@ -5888,7 +5902,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", 3569);
+ zephir_is_iterable(&belongsTo, 0, "phalcon/Mvc/Model.zep", 3572);
if (Z_TYPE_P(&belongsTo) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&belongsTo), _1)
{
@@ -5903,7 +5917,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", 3455);
+ zephir_array_fetch_string(&_3$$5, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3458);
action = zephir_get_intval(&_3$$5);
}
if (action != 1) {
@@ -5923,7 +5937,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", 3498);
+ zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model.zep", 3501);
if (Z_TYPE_P(&fields) == IS_ARRAY) {
ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _8$$7, _9$$7, _6$$7)
{
@@ -5937,11 +5951,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", 3490);
+ zephir_array_fetch(&_10$$8, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3493);
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", 3490);
- zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3491);
+ zephir_array_append(&conditions, &_11$$8, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3493);
+ zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3494);
if (Z_TYPE_P(&value) == IS_NULL) {
numberNull++;
}
@@ -5961,11 +5975,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", 3490);
+ zephir_array_fetch(&_12$$10, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3493);
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", 3490);
- zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3491);
+ zephir_array_append(&conditions, &_13$$10, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3493);
+ zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3494);
if (Z_TYPE_P(&value) == IS_NULL) {
numberNull++;
}
@@ -5981,15 +5995,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", 3502);
- zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3503);
+ zephir_array_append(&conditions, &_14$$12, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3505);
+ zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3506);
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", 3514);
+ zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3517);
}
if (validateWithNulls) {
ZEPHIR_OBS_NVAR(&allowNulls);
@@ -6064,7 +6078,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", 3455);
+ zephir_array_fetch_string(&_27$$24, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3458);
action = zephir_get_intval(&_27$$24);
}
if (action != 1) {
@@ -6084,7 +6098,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", 3498);
+ zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model.zep", 3501);
if (Z_TYPE_P(&fields) == IS_ARRAY) {
ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _32$$26, _33$$26, _30$$26)
{
@@ -6098,11 +6112,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", 3490);
+ zephir_array_fetch(&_34$$27, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3493);
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", 3490);
- zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3491);
+ zephir_array_append(&conditions, &_35$$27, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3493);
+ zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3494);
if (Z_TYPE_P(&value) == IS_NULL) {
numberNull++;
}
@@ -6122,11 +6136,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", 3490);
+ zephir_array_fetch(&_36$$29, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3493);
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", 3490);
- zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3491);
+ zephir_array_append(&conditions, &_37$$29, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3493);
+ zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3494);
if (Z_TYPE_P(&value) == IS_NULL) {
numberNull++;
}
@@ -6142,15 +6156,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", 3502);
- zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3503);
+ zephir_array_append(&conditions, &_38$$31, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3505);
+ zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3506);
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", 3514);
+ zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3517);
}
if (validateWithNulls) {
ZEPHIR_OBS_NVAR(&allowNulls);
@@ -6254,7 +6268,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", 3645);
+ zephir_is_iterable(&relations, 0, "phalcon/Mvc/Model.zep", 3648);
if (Z_TYPE_P(&relations) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relations), _1)
{
@@ -6272,7 +6286,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", 3619);
+ zephir_array_fetch_string(&_4$$5, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3622);
action = zephir_get_intval(&_4$$5);
}
if (action != 2) {
@@ -6311,7 +6325,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", 3619);
+ zephir_array_fetch_string(&_8$$11, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3622);
action = zephir_get_intval(&_8$$11);
}
if (action != 2) {
@@ -6382,7 +6396,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", 3736);
+ zephir_is_iterable(&relations, 0, "phalcon/Mvc/Model.zep", 3739);
if (Z_TYPE_P(&relations) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relations), _1)
{
@@ -6400,7 +6414,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", 3690);
+ zephir_array_fetch_string(&_4$$5, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3693);
action = zephir_get_intval(&_4$$5);
}
if (action != 1) {
@@ -6463,7 +6477,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", 3690);
+ zephir_array_fetch_string(&_16$$11, &foreignKey, SL("action"), PH_NOISY, "phalcon/Mvc/Model.zep", 3693);
action = zephir_get_intval(&_16$$11);
}
if (action != 1) {
@@ -6647,7 +6661,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
ZEPHIR_INIT_NVAR(&columnMap);
ZVAL_NULL(&columnMap);
}
- zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 3858);
+ zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 3861);
if (Z_TYPE_P(&attributes) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _1)
{
@@ -6664,7 +6678,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, 33, &_5$$7);
zephir_check_call_status();
- zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model.zep", 3792);
+ zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model.zep", 3795);
ZEPHIR_MM_RESTORE();
return;
}
@@ -6680,9 +6694,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", 3809);
+ zephir_array_fetch(&_8$$12, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3812);
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", 3810);
+ zephir_array_fetch(&_9$$12, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3813);
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();
@@ -6704,18 +6718,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, 33, &_15$$15);
zephir_check_call_status();
- zephir_throw_exception_debug(&_13$$15, "phalcon/Mvc/Model.zep", 3827);
+ zephir_throw_exception_debug(&_13$$15, "phalcon/Mvc/Model.zep", 3830);
ZEPHIR_MM_RESTORE();
return;
}
- zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3830);
- zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3831);
- zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3832);
+ zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3833);
+ zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3834);
+ zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3835);
} else {
if (zephir_array_isset(&defaultValues, &field)) {
- zephir_array_fetch(&_16$$17, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3835);
+ zephir_array_fetch(&_16$$17, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3838);
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", 3836);
+ zephir_array_fetch(&_17$$17, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3839);
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();
@@ -6724,13 +6738,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", 3842);
+ zephir_array_append(&values, &_20$$17, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3845);
} else {
- zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3844);
+ zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3847);
zephir_array_update_zval(&snapshot, &attributeField, &value, PH_COPY | PH_SEPARATE);
}
- zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3848);
- zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3849);
+ zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3851);
+ zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3852);
}
}
}
@@ -6757,7 +6771,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, 33, &_24$$22);
zephir_check_call_status();
- zephir_throw_exception_debug(&_22$$22, "phalcon/Mvc/Model.zep", 3792);
+ zephir_throw_exception_debug(&_22$$22, "phalcon/Mvc/Model.zep", 3795);
ZEPHIR_MM_RESTORE();
return;
}
@@ -6773,9 +6787,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", 3809);
+ zephir_array_fetch(&_26$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3812);
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", 3810);
+ zephir_array_fetch(&_27$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3813);
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();
@@ -6797,18 +6811,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, 33, &_33$$30);
zephir_check_call_status();
- zephir_throw_exception_debug(&_31$$30, "phalcon/Mvc/Model.zep", 3827);
+ zephir_throw_exception_debug(&_31$$30, "phalcon/Mvc/Model.zep", 3830);
ZEPHIR_MM_RESTORE();
return;
}
- zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3830);
- zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3831);
- zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3832);
+ zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3833);
+ zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3834);
+ zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3835);
} else {
if (zephir_array_isset(&defaultValues, &field)) {
- zephir_array_fetch(&_34$$32, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3835);
+ zephir_array_fetch(&_34$$32, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3838);
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", 3836);
+ zephir_array_fetch(&_35$$32, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3839);
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();
@@ -6817,13 +6831,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", 3842);
+ zephir_array_append(&values, &_38$$32, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3845);
} else {
- zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3844);
+ zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3847);
zephir_array_update_zval(&snapshot, &attributeField, &value, PH_COPY | PH_SEPARATE);
}
- zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3848);
- zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3849);
+ zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3851);
+ zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3852);
}
}
}
@@ -6839,7 +6853,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", 3868);
+ zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3871);
}
if (Z_TYPE_P(&columnMap) == IS_ARRAY) {
ZEPHIR_OBS_NVAR(&attributeField);
@@ -6852,7 +6866,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, 33, &_43$$38);
zephir_check_call_status();
- zephir_throw_exception_debug(&_41$$38, "phalcon/Mvc/Model.zep", 3878);
+ zephir_throw_exception_debug(&_41$$38, "phalcon/Mvc/Model.zep", 3881);
ZEPHIR_MM_RESTORE();
return;
}
@@ -6867,12 +6881,12 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert)
}
if (_44$$40) {
if (useExplicitIdentity) {
- zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3890);
- zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3890);
+ zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3893);
+ zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3893);
}
} else {
if (!(useExplicitIdentity)) {
- zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3898);
+ zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3901);
}
ZEPHIR_OBS_NVAR(&bindType);
if (UNEXPECTED(!(zephir_array_isset_fetch(&bindType, &bindDataTypes, identityField, 0)))) {
@@ -6884,23 +6898,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, 33, &_47$$45);
zephir_check_call_status();
- zephir_throw_exception_debug(&_45$$45, "phalcon/Mvc/Model.zep", 3907);
+ zephir_throw_exception_debug(&_45$$45, "phalcon/Mvc/Model.zep", 3910);
ZEPHIR_MM_RESTORE();
return;
}
- zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3910);
- zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3911);
+ zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3913);
+ zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3914);
}
} else {
if (useExplicitIdentity) {
- zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3915);
- zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3916);
+ zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3918);
+ zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 3919);
}
}
}
if (Z_TYPE_P(table) == IS_ARRAY) {
- zephir_array_fetch_long(&_48$$48, table, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3925);
- zephir_array_fetch_long(&_49$$48, table, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3925);
+ zephir_array_fetch_long(&_48$$48, table, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3928);
+ zephir_array_fetch_long(&_49$$48, table, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 3928);
ZEPHIR_INIT_VAR(&_50$$48);
ZEPHIR_CONCAT_VSV(&_50$$48, &_48$$48, ".", &_49$$48);
ZEPHIR_CPY_WRT(table, &_50$$48);
@@ -6946,7 +6960,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", 3986);
+ zephir_is_iterable(&unsetDefaultValues, 0, "phalcon/Mvc/Model.zep", 3989);
if (Z_TYPE_P(&unsetDefaultValues) == IS_ARRAY) {
ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&unsetDefaultValues), _57$$56, _58$$56, _55$$56)
{
@@ -7143,7 +7157,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", 4146);
+ zephir_is_iterable(&nonPrimary, 0, "phalcon/Mvc/Model.zep", 4149);
if (Z_TYPE_P(&nonPrimary) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&nonPrimary), _3$$5)
{
@@ -7162,7 +7176,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, 33, &_7$$9);
zephir_check_call_status();
- zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/Model.zep", 4040);
+ zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/Model.zep", 4043);
ZEPHIR_MM_RESTORE();
return;
}
@@ -7181,7 +7195,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, 33, &_11$$12);
zephir_check_call_status();
- zephir_throw_exception_debug(&_9$$12, "phalcon/Mvc/Model.zep", 4053);
+ zephir_throw_exception_debug(&_9$$12, "phalcon/Mvc/Model.zep", 4056);
ZEPHIR_MM_RESTORE();
return;
}
@@ -7207,7 +7221,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, 33, &_14$$20);
zephir_check_call_status();
- zephir_throw_exception_debug(&_12$$20, "phalcon/Mvc/Model.zep", 4083);
+ zephir_throw_exception_debug(&_12$$20, "phalcon/Mvc/Model.zep", 4086);
ZEPHIR_MM_RESTORE();
return;
}
@@ -7255,9 +7269,9 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
}
}
if (changed) {
- 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", 4136);
+ zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4137);
+ zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4138);
}
zephir_array_update_zval(&newSnapshot, &attributeField, &value, PH_COPY | PH_SEPARATE);
} else {
@@ -7289,7 +7303,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, 33, &_25$$32);
zephir_check_call_status();
- zephir_throw_exception_debug(&_23$$32, "phalcon/Mvc/Model.zep", 4040);
+ zephir_throw_exception_debug(&_23$$32, "phalcon/Mvc/Model.zep", 4043);
ZEPHIR_MM_RESTORE();
return;
}
@@ -7308,7 +7322,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, 33, &_28$$35);
zephir_check_call_status();
- zephir_throw_exception_debug(&_26$$35, "phalcon/Mvc/Model.zep", 4053);
+ zephir_throw_exception_debug(&_26$$35, "phalcon/Mvc/Model.zep", 4056);
ZEPHIR_MM_RESTORE();
return;
}
@@ -7334,7 +7348,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, 33, &_31$$43);
zephir_check_call_status();
- zephir_throw_exception_debug(&_29$$43, "phalcon/Mvc/Model.zep", 4083);
+ zephir_throw_exception_debug(&_29$$43, "phalcon/Mvc/Model.zep", 4086);
ZEPHIR_MM_RESTORE();
return;
}
@@ -7382,9 +7396,9 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
}
}
if (changed) {
- 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", 4136);
+ zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4137);
+ zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4138);
}
zephir_array_update_zval(&newSnapshot, &attributeField, &value, PH_COPY | PH_SEPARATE);
} else {
@@ -7401,7 +7415,7 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowUpdate)
RETURN_MM_BOOL(1);
}
} else {
- zephir_is_iterable(&nonPrimary, 0, "phalcon/Mvc/Model.zep", 4201);
+ zephir_is_iterable(&nonPrimary, 0, "phalcon/Mvc/Model.zep", 4204);
if (Z_TYPE_P(&nonPrimary) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&nonPrimary), _39$$53)
{
@@ -7419,7 +7433,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, 33, &_43$$57);
zephir_check_call_status();
- zephir_throw_exception_debug(&_41$$57, "phalcon/Mvc/Model.zep", 4164);
+ zephir_throw_exception_debug(&_41$$57, "phalcon/Mvc/Model.zep", 4167);
ZEPHIR_MM_RESTORE();
return;
}
@@ -7438,21 +7452,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, 33, &_46$$60);
zephir_check_call_status();
- zephir_throw_exception_debug(&_44$$60, "phalcon/Mvc/Model.zep", 4178);
+ zephir_throw_exception_debug(&_44$$60, "phalcon/Mvc/Model.zep", 4181);
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", 4189);
- zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4190);
- zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4191);
+ zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4192);
+ zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4193);
+ zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4194);
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", 4195);
- zephir_array_append(&values, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4196);
- zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4197);
+ zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4198);
+ zephir_array_append(&values, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4199);
+ zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4200);
}
}
} ZEND_HASH_FOREACH_END();
@@ -7479,7 +7493,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, 33, &_49$$66);
zephir_check_call_status();
- zephir_throw_exception_debug(&_47$$66, "phalcon/Mvc/Model.zep", 4164);
+ zephir_throw_exception_debug(&_47$$66, "phalcon/Mvc/Model.zep", 4167);
ZEPHIR_MM_RESTORE();
return;
}
@@ -7498,21 +7512,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, 33, &_52$$69);
zephir_check_call_status();
- zephir_throw_exception_debug(&_50$$69, "phalcon/Mvc/Model.zep", 4178);
+ zephir_throw_exception_debug(&_50$$69, "phalcon/Mvc/Model.zep", 4181);
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", 4189);
- zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4190);
- zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4191);
+ zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4192);
+ zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4193);
+ zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4194);
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", 4195);
- zephir_array_append(&values, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4196);
- zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4197);
+ zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4198);
+ zephir_array_append(&values, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4199);
+ zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4200);
}
}
ZEPHIR_CALL_METHOD(NULL, &nonPrimary, "next", NULL, 0);
@@ -7540,13 +7554,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, 33, &_55$$74);
zephir_check_call_status();
- zephir_throw_exception_debug(&_53$$74, "phalcon/Mvc/Model.zep", 4224);
+ zephir_throw_exception_debug(&_53$$74, "phalcon/Mvc/Model.zep", 4227);
ZEPHIR_MM_RESTORE();
return;
}
ZEPHIR_INIT_NVAR(&uniqueParams);
array_init(&uniqueParams);
- zephir_is_iterable(&primaryKeys, 0, "phalcon/Mvc/Model.zep", 4251);
+ zephir_is_iterable(&primaryKeys, 0, "phalcon/Mvc/Model.zep", 4254);
if (Z_TYPE_P(&primaryKeys) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&primaryKeys), _56$$73)
{
@@ -7563,7 +7577,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, 33, &_60$$77);
zephir_check_call_status();
- zephir_throw_exception_debug(&_58$$77, "phalcon/Mvc/Model.zep", 4237);
+ zephir_throw_exception_debug(&_58$$77, "phalcon/Mvc/Model.zep", 4240);
ZEPHIR_MM_RESTORE();
return;
}
@@ -7573,10 +7587,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", 4245);
+ zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4248);
} else {
zephir_array_update_zval(&newSnapshot, &attributeField, &__$null, PH_COPY | PH_SEPARATE);
- zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4248);
+ zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4251);
}
} ZEND_HASH_FOREACH_END();
} else {
@@ -7601,7 +7615,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, 33, &_63$$83);
zephir_check_call_status();
- zephir_throw_exception_debug(&_61$$83, "phalcon/Mvc/Model.zep", 4237);
+ zephir_throw_exception_debug(&_61$$83, "phalcon/Mvc/Model.zep", 4240);
ZEPHIR_MM_RESTORE();
return;
}
@@ -7611,10 +7625,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", 4245);
+ zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4248);
} else {
zephir_array_update_zval(&newSnapshot, &attributeField, &__$null, PH_COPY | PH_SEPARATE);
- zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4248);
+ zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4251);
}
ZEPHIR_CALL_METHOD(NULL, &primaryKeys, "next", NULL, 0);
zephir_check_call_status();
@@ -7623,8 +7637,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", 4257);
- zephir_array_fetch_long(&_65$$87, table, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4257);
+ zephir_array_fetch_long(&_64$$87, table, 0, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4260);
+ zephir_array_fetch_long(&_65$$87, table, 1, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4260);
ZEPHIR_INIT_VAR(&_66$$87);
ZEPHIR_CONCAT_VSV(&_66$$87, &_64$$87, ".", &_65$$87);
ZEPHIR_CPY_WRT(table, &_66$$87);
@@ -7760,7 +7774,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", 4381);
+ zephir_is_iterable(&primaryKeys, 0, "phalcon/Mvc/Model.zep", 4384);
if (Z_TYPE_P(&primaryKeys) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&primaryKeys), _1$$3)
{
@@ -7777,7 +7791,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, 33, &_5$$9);
zephir_check_call_status();
- zephir_throw_exception_debug(&_3$$9, "phalcon/Mvc/Model.zep", 4340);
+ zephir_throw_exception_debug(&_3$$9, "phalcon/Mvc/Model.zep", 4343);
ZEPHIR_MM_RESTORE();
return;
}
@@ -7795,9 +7809,9 @@ PHP_METHOD(Phalcon_Mvc_Model, has)
if (_7$$11) {
numberEmpty++;
}
- zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4361);
+ zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4364);
} else {
- zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4363);
+ zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4366);
numberEmpty++;
}
ZEPHIR_OBS_NVAR(&type);
@@ -7810,16 +7824,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, 33, &_10$$14);
zephir_check_call_status();
- zephir_throw_exception_debug(&_8$$14, "phalcon/Mvc/Model.zep", 4370);
+ zephir_throw_exception_debug(&_8$$14, "phalcon/Mvc/Model.zep", 4373);
ZEPHIR_MM_RESTORE();
return;
}
- zephir_array_append(&uniqueTypes, &type, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4373);
+ zephir_array_append(&uniqueTypes, &type, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4376);
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", 4374);
+ zephir_array_append(&wherePk, &_13$$7, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4377);
} ZEND_HASH_FOREACH_END();
} else {
ZEPHIR_CALL_METHOD(NULL, &primaryKeys, "rewind", NULL, 0);
@@ -7843,7 +7857,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, 33, &_16$$17);
zephir_check_call_status();
- zephir_throw_exception_debug(&_14$$17, "phalcon/Mvc/Model.zep", 4340);
+ zephir_throw_exception_debug(&_14$$17, "phalcon/Mvc/Model.zep", 4343);
ZEPHIR_MM_RESTORE();
return;
}
@@ -7861,9 +7875,9 @@ PHP_METHOD(Phalcon_Mvc_Model, has)
if (_17$$19) {
numberEmpty++;
}
- zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4361);
+ zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4364);
} else {
- zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4363);
+ zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4366);
numberEmpty++;
}
ZEPHIR_OBS_NVAR(&type);
@@ -7876,16 +7890,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, 33, &_20$$22);
zephir_check_call_status();
- zephir_throw_exception_debug(&_18$$22, "phalcon/Mvc/Model.zep", 4370);
+ zephir_throw_exception_debug(&_18$$22, "phalcon/Mvc/Model.zep", 4373);
ZEPHIR_MM_RESTORE();
return;
}
- zephir_array_append(&uniqueTypes, &type, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4373);
+ zephir_array_append(&uniqueTypes, &type, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4376);
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", 4374);
+ zephir_array_append(&wherePk, &_23$$15, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4377);
ZEPHIR_CALL_METHOD(NULL, &primaryKeys, "next", NULL, 0);
zephir_check_call_status();
}
@@ -7936,7 +7950,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", 4435);
+ zephir_array_fetch_string(&_30, &num, SL("rowcount"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4438);
if (zephir_is_true(&_30)) {
ZVAL_UNDEF(&_31$$30);
ZVAL_LONG(&_31$$30, 0);
@@ -8136,7 +8150,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", 4540);
+ zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/Mvc/Model.zep", 4543);
}
} else {
ZEPHIR_CPY_WRT(¶ms, parameters);
@@ -8180,10 +8194,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", 4583);
+ zephir_array_fetch_string(&bindParams, ¶ms, SL("bind"), PH_NOISY, "phalcon/Mvc/Model.zep", 4586);
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", 4586);
+ zephir_array_fetch_string(&bindTypes, ¶ms, SL("bindTypes"), PH_NOISY, "phalcon/Mvc/Model.zep", 4589);
}
}
zephir_memory_observe(&cache);
@@ -8288,7 +8302,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, 33, &_5$$7);
zephir_check_call_status();
- zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model.zep", 4665);
+ zephir_throw_exception_debug(&_3$$7, "phalcon/Mvc/Model.zep", 4668);
ZEPHIR_MM_RESTORE();
return;
}
@@ -8322,7 +8336,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, 33, &_8$$13);
zephir_check_call_status();
- zephir_throw_exception_debug(&_6$$13, "phalcon/Mvc/Model.zep", 4702);
+ zephir_throw_exception_debug(&_6$$13, "phalcon/Mvc/Model.zep", 4705);
ZEPHIR_MM_RESTORE();
return;
}
@@ -8537,7 +8551,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", 4943);
+ zephir_is_iterable(¬Null, 0, "phalcon/Mvc/Model.zep", 4946);
if (Z_TYPE_P(¬Null) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(¬Null), _4$$11)
{
@@ -8555,7 +8569,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, 33, &_8$$19);
zephir_check_call_status();
- zephir_throw_exception_debug(&_6$$19, "phalcon/Mvc/Model.zep", 4863);
+ zephir_throw_exception_debug(&_6$$19, "phalcon/Mvc/Model.zep", 4866);
ZEPHIR_MM_RESTORE();
return;
}
@@ -8580,7 +8594,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", 4893);
+ zephir_array_fetch(&_13$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4896);
_12$$27 = !ZEPHIR_IS_IDENTICAL(&value, &_13$$27);
}
_11$$27 = _12$$27;
@@ -8651,7 +8665,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, 33, &_22$$39);
zephir_check_call_status();
- zephir_throw_exception_debug(&_20$$39, "phalcon/Mvc/Model.zep", 4863);
+ zephir_throw_exception_debug(&_20$$39, "phalcon/Mvc/Model.zep", 4866);
ZEPHIR_MM_RESTORE();
return;
}
@@ -8676,7 +8690,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", 4893);
+ zephir_array_fetch(&_26$$47, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model.zep", 4896);
_25$$47 = !ZEPHIR_IS_IDENTICAL(&value, &_26$$47);
}
_24$$47 = _25$$47;
@@ -8885,7 +8899,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", 5107);
+ zephir_is_iterable(related, 0, "phalcon/Mvc/Model.zep", 5110);
if (Z_TYPE_P(related) == IS_ARRAY) {
ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(related), _4, _5, _2)
{
@@ -8920,7 +8934,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, 33, &_12$$6);
zephir_check_call_status();
- zephir_throw_exception_debug(&_10$$6, "phalcon/Mvc/Model.zep", 5065);
+ zephir_throw_exception_debug(&_10$$6, "phalcon/Mvc/Model.zep", 5068);
ZEPHIR_MM_RESTORE();
return;
}
@@ -8944,7 +8958,7 @@ 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, 33, &_18$$7);
zephir_check_call_status();
- zephir_throw_exception_debug(&_16$$7, "phalcon/Mvc/Model.zep", 5076);
+ zephir_throw_exception_debug(&_16$$7, "phalcon/Mvc/Model.zep", 5079);
ZEPHIR_MM_RESTORE();
return;
}
@@ -9009,7 +9023,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, 33, &_32$$12);
zephir_check_call_status();
- zephir_throw_exception_debug(&_30$$12, "phalcon/Mvc/Model.zep", 5065);
+ zephir_throw_exception_debug(&_30$$12, "phalcon/Mvc/Model.zep", 5068);
ZEPHIR_MM_RESTORE();
return;
}
@@ -9033,7 +9047,7 @@ 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, 33, &_37$$13);
zephir_check_call_status();
- zephir_throw_exception_debug(&_35$$13, "phalcon/Mvc/Model.zep", 5076);
+ zephir_throw_exception_debug(&_35$$13, "phalcon/Mvc/Model.zep", 5079);
ZEPHIR_MM_RESTORE();
return;
}
@@ -9239,7 +9253,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", 5335);
+ zephir_is_iterable(related, 0, "phalcon/Mvc/Model.zep", 5338);
if (Z_TYPE_P(related) == IS_ARRAY) {
ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(related), _3, _4, _1)
{
@@ -9278,7 +9292,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, 33, &_12$$6);
zephir_check_call_status();
- zephir_throw_exception_debug(&_11$$6, "phalcon/Mvc/Model.zep", 5170);
+ zephir_throw_exception_debug(&_11$$6, "phalcon/Mvc/Model.zep", 5173);
ZEPHIR_MM_RESTORE();
return;
}
@@ -9302,7 +9316,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, 33, &_17$$7);
zephir_check_call_status();
- zephir_throw_exception_debug(&_16$$7, "phalcon/Mvc/Model.zep", 5180);
+ zephir_throw_exception_debug(&_16$$7, "phalcon/Mvc/Model.zep", 5183);
ZEPHIR_MM_RESTORE();
return;
}
@@ -9328,7 +9342,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, 33, &_21$$10);
zephir_check_call_status();
- zephir_throw_exception_debug(&_20$$10, "phalcon/Mvc/Model.zep", 5197);
+ zephir_throw_exception_debug(&_20$$10, "phalcon/Mvc/Model.zep", 5200);
ZEPHIR_MM_RESTORE();
return;
}
@@ -9342,7 +9356,7 @@ 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", 5296);
+ zephir_is_iterable(&relatedRecords, 0, "phalcon/Mvc/Model.zep", 5299);
if (Z_TYPE_P(&relatedRecords) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relatedRecords), _23$$11)
{
@@ -9476,7 +9490,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
}
ZEPHIR_INIT_NVAR(&recordAfter);
} else {
- zephir_is_iterable(&relatedRecords, 0, "phalcon/Mvc/Model.zep", 5320);
+ zephir_is_iterable(&relatedRecords, 0, "phalcon/Mvc/Model.zep", 5323);
if (Z_TYPE_P(&relatedRecords) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relatedRecords), _50$$22)
{
@@ -9547,7 +9561,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, 33, &_61$$28);
zephir_check_call_status();
- zephir_throw_exception_debug(&_60$$28, "phalcon/Mvc/Model.zep", 5327);
+ zephir_throw_exception_debug(&_60$$28, "phalcon/Mvc/Model.zep", 5330);
ZEPHIR_MM_RESTORE();
return;
}
@@ -9593,7 +9607,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, 33, &_69$$32);
zephir_check_call_status();
- zephir_throw_exception_debug(&_68$$32, "phalcon/Mvc/Model.zep", 5170);
+ zephir_throw_exception_debug(&_68$$32, "phalcon/Mvc/Model.zep", 5173);
ZEPHIR_MM_RESTORE();
return;
}
@@ -9617,7 +9631,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, 33, &_73$$33);
zephir_check_call_status();
- zephir_throw_exception_debug(&_72$$33, "phalcon/Mvc/Model.zep", 5180);
+ zephir_throw_exception_debug(&_72$$33, "phalcon/Mvc/Model.zep", 5183);
ZEPHIR_MM_RESTORE();
return;
}
@@ -9644,7 +9658,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, 33, &_78$$36);
zephir_check_call_status();
- zephir_throw_exception_debug(&_77$$36, "phalcon/Mvc/Model.zep", 5197);
+ zephir_throw_exception_debug(&_77$$36, "phalcon/Mvc/Model.zep", 5200);
ZEPHIR_MM_RESTORE();
return;
}
@@ -9658,7 +9672,7 @@ 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", 5296);
+ zephir_is_iterable(&relatedRecords, 0, "phalcon/Mvc/Model.zep", 5299);
if (Z_TYPE_P(&relatedRecords) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relatedRecords), _80$$37)
{
@@ -9792,7 +9806,7 @@ PHP_METHOD(Phalcon_Mvc_Model, postSaveRelatedRecords)
}
ZEPHIR_INIT_NVAR(&recordAfter);
} else {
- zephir_is_iterable(&relatedRecords, 0, "phalcon/Mvc/Model.zep", 5320);
+ zephir_is_iterable(&relatedRecords, 0, "phalcon/Mvc/Model.zep", 5323);
if (Z_TYPE_P(&relatedRecords) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relatedRecords), _106$$48)
{
@@ -9863,7 +9877,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, 33, &_117$$54);
zephir_check_call_status();
- zephir_throw_exception_debug(&_116$$54, "phalcon/Mvc/Model.zep", 5327);
+ zephir_throw_exception_debug(&_116$$54, "phalcon/Mvc/Model.zep", 5330);
ZEPHIR_MM_RESTORE();
return;
}
@@ -9925,7 +9939,7 @@ PHP_METHOD(Phalcon_Mvc_Model, allowEmptyStringValues)
ZEPHIR_OBS_COPY_OR_DUP(&attributes, attributes_param);
ZEPHIR_INIT_VAR(&keysAttributes);
array_init(&keysAttributes);
- zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5368);
+ zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5371);
if (Z_TYPE_P(&attributes) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _0)
{
@@ -10739,7 +10753,7 @@ PHP_METHOD(Phalcon_Mvc_Model, skipAttributesOnCreate)
ZEPHIR_OBS_COPY_OR_DUP(&attributes, attributes_param);
ZEPHIR_INIT_VAR(&keysAttributes);
array_init(&keysAttributes);
- zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5827);
+ zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5830);
if (Z_TYPE_P(&attributes) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _0)
{
@@ -10812,7 +10826,7 @@ PHP_METHOD(Phalcon_Mvc_Model, skipAttributesOnUpdate)
ZEPHIR_OBS_COPY_OR_DUP(&attributes, attributes_param);
ZEPHIR_INIT_VAR(&keysAttributes);
array_init(&keysAttributes);
- zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5862);
+ zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model.zep", 5865);
if (Z_TYPE_P(&attributes) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _0)
{
@@ -11043,7 +11057,7 @@ PHP_METHOD(Phalcon_Mvc_Model, caseInsensitiveColumnMap)
zephir_fetch_params(1, 2, 0, &columnMap, &key);
ZEPHIR_INIT_VAR(&_0);
zephir_array_keys(&_0, columnMap);
- zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model.zep", 5999);
+ zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model.zep", 6002);
if (Z_TYPE_P(&_0) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _1)
{
@@ -11111,7 +11125,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", 6023);
+ zephir_is_iterable(&messages, 0, "phalcon/Mvc/Model.zep", 6026);
if (Z_TYPE_P(&messages) == IS_ARRAY) {
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&messages), _0$$3)
{
diff --git a/ext/phalcon/support/version.zep.c b/ext/phalcon/support/version.zep.c
index 73e33c4ea7..a1876dd028 100644
--- a/ext/phalcon/support/version.zep.c
+++ b/ext/phalcon/support/version.zep.c
@@ -115,7 +115,7 @@ PHP_METHOD(Phalcon_Support_Version, getVersion)
ZVAL_LONG(&_0, 6);
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/php_phalcon.h b/ext/php_phalcon.h
index 808f6e37d3..a70d261233 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.6.0"
+#define PHP_PHALCON_VERSION "5.6.1"
#define PHP_PHALCON_EXTNAME "phalcon"
#define PHP_PHALCON_AUTHOR "Phalcon Team and contributors"
#define PHP_PHALCON_ZEPVERSION "0.18.0-$Id$"
diff --git a/package.xml b/package.xml
index e9f445025e..be1d63e946 100644
--- a/package.xml
+++ b/package.xml
@@ -22,11 +22,11 @@
nikos@phalcon.io
yes
- 2024-01-09
+ 2024-02-08
- 5.6.0
- 5.6.0
+ 5.6.1
+ 5.6.1
stable
@@ -38,18 +38,15 @@
### Changed
- - Changed `Phalcon\Db\Adapter\Pdo\Mysql` to not use specific flags for `PDO` (`PDO::ATTR_EMULATE_PREPARES` or `PDO::ATTR_STRINGIFY_FETCHES`) for performance reasons [#16474](https://github.com/phalcon/cphalcon/issues/16474)
- - Merged `Phalcon\Db\AbstractDb` with `Phalcon\Db\Adapter\AbstractAdapter` since the former was not used [#16474](https://github.com/phalcon/cphalcon/issues/16474)
-
- ### Added
-
- - Added `resetColumns()`, `resetFrom()`, `resetWhere()`, `resetGroupBy()`, `resetHaving()`, `resetOrderBy()`, `resetLimit()`, `resetFlags()` to the `Phalcon\Datamapper\Query\AbstractQuery` to allow resetting query filters.
+ - Changed `Phalcon\Cli\Router::setDefaultAction` and `Phalcon\Cli\Router::setDefaultModule` to return the object back for a fluent interface [#16328](https://github.com/phalcon/cphalcon/issues/16328)
### Fixed
- - Fixed `Phalcon\Mvc\Model::count` to ignore the `order` parameter (needed for Posgresql) [#16471](https://github.com/phalcon/cphalcon/issues/16471)
- - Fixed `Phalcon\Mvc\Model::toArray` added parameter to ignore getters in order not to break serialize. [#16490](https://github.com/phalcon/cphalcon/issues/16490)
- - Fixed `Phalcon\Mvc\Model::toArray` changing the conditionals for population to remove segfault. [#16498](https://github.com/phalcon/cphalcon/issues/16498)
+ - Fixed `Phalcon\Db\Adapter\Pdo\Postgresql::describeColumns()` to return the correct string back [#16371](https://github.com/phalcon/cphalcon/issues/16371)
+ - Fixed `Phalcon/Filter/Validation::validate()` and `Phalcon/Filter/Validation/ValidationInterface::validate()` to return also `bool` [#16337](https://github.com/phalcon/cphalcon/issues/16337)
+ - Fixed `Phalcon\Mvc\Model::toArray` to ignore getters when the field name is `source`. [#16514](https://github.com/phalcon/cphalcon/issues/16514)
+ - Fixed `Phalcon\Http\Request::getPut` to correctly get form encoded data [#16519](https://github.com/phalcon/cphalcon/issues/16519)
+ - Fixed deprecation warning in callables `Use of "static" in callables is deprecated` for PHP 8.2+ [#16263](https://github.com/phalcon/cphalcon/issues/16263)
diff --git a/phalcon/Cache/AbstractCache.zep b/phalcon/Cache/AbstractCache.zep
index 53c8a3ac5a..06cd30a711 100644
--- a/phalcon/Cache/AbstractCache.zep
+++ b/phalcon/Cache/AbstractCache.zep
@@ -144,7 +144,7 @@ abstract class AbstractCache implements CacheInterface
* @throws InvalidArgumentException MUST be thrown if the $key string is
* not a legal value.
*/
- protected function doGet(string key, var defaultValue = null)
+ protected function doGet(string key, var defaultValue = null) -> var
{
this->checkKey(key);
@@ -154,7 +154,7 @@ abstract class AbstractCache implements CacheInterface
/**
* Obtains multiple cache items by their unique keys.
*/
- protected function doGetMultiple(var keys, var defaultValue = null)
+ protected function doGetMultiple(var keys, var defaultValue = null) -> array
{
var element, results;
diff --git a/phalcon/Cli/Router.zep b/phalcon/Cli/Router.zep
index bfbedd811e..7e3a416d51 100644
--- a/phalcon/Cli/Router.zep
+++ b/phalcon/Cli/Router.zep
@@ -461,17 +461,20 @@ class Router extends AbstractInjectionAware
/**
* Sets the default action name
*/
- public function setDefaultAction(string actionName)
+ public function setDefaultAction(string actionName) ->
{
let this->defaultAction = actionName;
+
+ return this;
}
/**
* Sets the name of the default module
*/
- public function setDefaultModule(string moduleName)
+ public function setDefaultModule(string moduleName) ->
{
let this->defaultModule = moduleName;
+ return this;
}
/**
diff --git a/phalcon/Filter/Validation.zep b/phalcon/Filter/Validation.zep
index ac21aaccf9..ca7e89c72d 100644
--- a/phalcon/Filter/Validation.zep
+++ b/phalcon/Filter/Validation.zep
@@ -478,8 +478,10 @@ class Validation extends Injectable implements ValidationInterface
*
* @param array|object data
* @param object entity
+ *
+ * @return Messages|false
*/
- public function validate(var data = null, var entity = null) ->
+ public function validate(var data = null, var entity = null) -> | bool
{
var combinedFieldsValidators, field, messages, scope, status, validator,
validatorData, validators;
diff --git a/phalcon/Filter/Validation/ValidationInterface.zep b/phalcon/Filter/Validation/ValidationInterface.zep
index 8e6711123e..d1a5d98d34 100644
--- a/phalcon/Filter/Validation/ValidationInterface.zep
+++ b/phalcon/Filter/Validation/ValidationInterface.zep
@@ -103,6 +103,8 @@ interface ValidationInterface
*
* @param array|object data
* @param object entity
+ *
+ * @return Messages|false
*/
- public function validate(var data = null, var entity = null) -> ;
+ public function validate(var data = null, var entity = null) -> | bool;
}
diff --git a/phalcon/Http/Request.zep b/phalcon/Http/Request.zep
index be9ed7e50b..12cd49a6bc 100644
--- a/phalcon/Http/Request.zep
+++ b/phalcon/Http/Request.zep
@@ -1721,8 +1721,13 @@ class Request extends AbstractInjectionAware implements RequestInterface, Reques
if null === cached {
let contentType = this->getContentType();
- if typeof contentType == "string" {
-
+ if (
+ typeof contentType == "string" &&
+ (
+ stripos(contentType, "json") != false ||
+ stripos(contentType, "multipart/form-data") !== false
+ )
+ ) {
if (stripos(contentType, "json") != false) {
let cached = this->getJsonRawBody(true);
}
diff --git a/phalcon/Mvc/Model.zep b/phalcon/Mvc/Model.zep
index c0532165cf..9276217bcd 100644
--- a/phalcon/Mvc/Model.zep
+++ b/phalcon/Mvc/Model.zep
@@ -3328,7 +3328,10 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
*/
let method = "get" . camelize(attributeField);
- if true === useGetter && method_exists(this, method) {
+ /**
+ * Do not use the getter if the field name is `source` (getSource)
+ */
+ if true === useGetter && "getSource" !== method && method_exists(this, method) {
let data[attributeField] = this->{method}();
} elseif isset(this->{attributeField}) {
let data[attributeField] = this->{attributeField};
diff --git a/phalcon/Support/Version.zep b/phalcon/Support/Version.zep
index 47bb667ffa..b7f1a0f85c 100644
--- a/phalcon/Support/Version.zep
+++ b/phalcon/Support/Version.zep
@@ -77,7 +77,7 @@ class Version
*/
protected function getVersion() -> array
{
- return [5, 6, 0, 4, 0];
+ return [5, 6, 1, 4, 0];
}
/**
diff --git a/tests/database/Mvc/Model/FindCest.php b/tests/database/Mvc/Model/FindCest.php
index f7361c91dc..6a2c23b172 100644
--- a/tests/database/Mvc/Model/FindCest.php
+++ b/tests/database/Mvc/Model/FindCest.php
@@ -18,6 +18,7 @@
use Phalcon\Cache\AdapterFactory;
use Phalcon\Cache\Cache;
use Phalcon\Mvc\Model\Exception;
+use Phalcon\Mvc\Router;
use Phalcon\Storage\SerializerFactory;
use Phalcon\Tests\Fixtures\Migrations\CustomersMigration;
use Phalcon\Tests\Fixtures\Migrations\InvoicesMigration;
@@ -28,8 +29,13 @@
use Phalcon\Tests\Models\Objects;
use function getOptionsRedis;
+use function ob_end_clean;
+use function ob_end_flush;
+use function ob_get_contents;
+use function ob_start;
use function outputDir;
use function uniqid;
+use function var_dump;
/**
* Class FindCest
@@ -413,4 +419,52 @@ public function mvcModelFindWithSpecificColumn(DatabaseTester $I)
$I->assertEquals(1, $data[0]->obj_id);
$I->assertEquals(2, $data[1]->obj_id);
}
+
+ /**
+ * Tests Phalcon\Mvc\Model :: find() - deprecation warning PHP 8.2
+ *
+ * @author Phalcon Team
+ * @since 2024-08-02
+ *
+ * @group mysql
+ */
+ public function mvcModelFindDeprecationWarning(DatabaseTester $I)
+ {
+ $I->wantToTest('Mvc\Model - find() - deprecation warning');
+
+ /** @var PDO $connection */
+ $connection = $I->getConnection();
+ $migration = new ObjectsMigration($connection);
+ $migration->insert(1, 'random data', 1);
+ $migration->insert(2, 'random data 2', 1);
+ $migration->insert(4, 'random data 4', 1);
+
+ /**
+ * Calling `findFirst()` in the router callable will produce
+ * a deprecation warning. If so, this test will fail.
+ */
+
+ $this->container->set(
+ 'router',
+ function () {
+ var_dump('inside callable');
+ $results = Objects::find();
+ var_dump($results->toArray());
+
+ return new Router();
+ }
+ );
+
+ ob_start();
+ $router = $this->container->get('router');
+ $actual = ob_get_contents();
+ ob_end_clean();
+
+ $expected = 'inside callable';
+ $I->assertStringContainsString($expected, $actual);
+ $expected = 'Deprecated';
+ $I->assertStringNotContainsString($expected, $actual);
+ $expected = 'Use of "static" in callables in deprecated';
+ $I->assertStringNotContainsString($expected, $actual);
+ }
}
diff --git a/tests/unit/Http/Request/GetPutCest.php b/tests/unit/Http/Request/GetPutCest.php
index 41a174466f..e6a6607fd3 100644
--- a/tests/unit/Http/Request/GetPutCest.php
+++ b/tests/unit/Http/Request/GetPutCest.php
@@ -189,4 +189,49 @@ public function httpRequestGetPutMultipartFormData(UnitTester $I)
$_SERVER = $store;
}
+
+ /**
+ * Tests Phalcon\Http\Request :: getPut() - x-www-form-urlencoded
+ *
+ * @issue @16519
+ * @author Phalcon Team
+ * @since 2024-01-29
+ */
+ public function httpRequestGetPutApplicationtXWwwFormUrlencoded(UnitTester $I)
+ {
+ $I->wantToTest('Http\Request - getPut() - x-www-form-urlencoded');
+
+ stream_wrapper_unregister('php');
+ stream_wrapper_register('php', PhpStream::class);
+
+ file_put_contents('php://input', 'fruit=orange&quantity=4');
+
+ $store = $_SERVER ?? [];
+ $time = $_SERVER['REQUEST_TIME_FLOAT'];
+ $_SERVER = [
+ 'REQUEST_TIME_FLOAT' => $time,
+ 'REQUEST_METHOD' => 'PUT',
+ 'CONTENT_TYPE' => "application/x-www-form-urlencoded",
+ ];
+
+ $request = new Request();
+
+ $expected = [
+ 'fruit' => 'orange',
+ 'quantity' => '4',
+ ];
+
+ $actual = file_get_contents('php://input');
+
+ $I->assertSame("fruit=orange&quantity=4", $actual);
+
+ $I->assertSame(
+ $expected,
+ $request->getPut()
+ );
+
+ stream_wrapper_restore('php');
+
+ $_SERVER = $store;
+ }
}