From 1099a7d2685b43b0103d4d23624dee857e4b8bf1 Mon Sep 17 00:00:00 2001 From: Anton Vasiliev Date: Sun, 29 May 2022 19:32:54 +0100 Subject: [PATCH] #15598 - Regenerate ext/ directory --- ext/phalcon/db/adapter/pdo/sqlite.zep.c | 280 +++++++++--------- .../filter/validation/validator/regex.zep.c | 26 +- ext/phalcon/mvc/application.zep.c | 265 ++++++++--------- ext/phalcon/mvc/micro/collection.zep.c | 15 +- ext/phalcon/mvc/micro/collection.zep.h | 4 +- ext/phalcon/mvc/router.zep.c | 33 ++- ext/phalcon/storage/serializer/base64.zep.c | 22 +- ext/phalcon/storage/serializer/igbinary.zep.c | 19 +- ext/phalcon/storage/serializer/json.zep.c | 19 +- ext/phalcon/storage/serializer/none.zep.c | 21 +- ext/phalcon/storage/serializer/none.zep.h | 6 +- ext/phalcon/storage/serializer/php.zep.c | 119 ++++---- ext/phalcon/storage/serializer/php.zep.h | 6 +- 13 files changed, 423 insertions(+), 412 deletions(-) diff --git a/ext/phalcon/db/adapter/pdo/sqlite.zep.c b/ext/phalcon/db/adapter/pdo/sqlite.zep.c index 33eea200cf3..7d907c5eb3c 100644 --- a/ext/phalcon/db/adapter/pdo/sqlite.zep.c +++ b/ext/phalcon/db/adapter/pdo/sqlite.zep.c @@ -160,11 +160,11 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, connect) */ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) { - zend_bool _5$$3, _34$$3, _43$$28, _71$$28; + zend_bool _5$$3, _31$$3, _43$$28, _69$$28; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zephir_fcall_cache_entry *_33 = NULL, *_40 = NULL, *_41 = NULL; + zephir_fcall_cache_entry *_35 = NULL, *_40 = NULL, *_41 = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *table_param = NULL, *schema_param = NULL, __$true, __$false, columns, columnType, fields, field, definition, oldColumn, sizePattern, matches, matchOne, matchTwo, columnName, _0, _1, _2, *_3, _4, _28$$3, _29$$3, _30$$3, _31$$3, _32$$3, _35$$3, _6$$4, _7$$4, _8$$5, _9$$5, _10$$5, _11$$7, _12$$7, _13$$8, _14$$9, _15$$10, _16$$11, _17$$11, _18$$12, _19$$12, _20$$13, _21$$14, _22$$15, _23$$16, _24$$17, _25$$18, _26$$20, _27$$21, _36$$27, _37$$27, _38$$27, _39$$27, _42$$28, _66$$28, _67$$28, _68$$28, _69$$28, _70$$28, _72$$28, _44$$29, _45$$29, _46$$30, _47$$30, _48$$30, _49$$32, _50$$32, _51$$33, _52$$34, _53$$35, _54$$36, _55$$36, _56$$37, _57$$37, _58$$38, _59$$39, _60$$40, _61$$41, _62$$42, _63$$43, _64$$45, _65$$46, _73$$52, _74$$52, _75$$52, _76$$52; + zval *table_param = NULL, *schema_param = NULL, __$true, __$false, columns, columnType, fields, field, definition, oldColumn, sizePattern, matches, matchOne, matchTwo, columnName, _0, _1, _2, *_3, _4, _28$$3, _29$$3, _30$$3, _32$$3, _33$$3, _34$$3, _6$$4, _7$$4, _8$$5, _9$$5, _10$$5, _11$$7, _12$$7, _13$$8, _14$$9, _15$$10, _16$$11, _17$$11, _18$$12, _19$$12, _20$$13, _21$$14, _22$$15, _23$$16, _24$$17, _25$$18, _26$$20, _27$$21, _36$$27, _37$$27, _38$$27, _39$$27, _42$$28, _66$$28, _67$$28, _68$$28, _70$$28, _71$$28, _72$$28, _44$$29, _45$$29, _46$$30, _47$$30, _48$$30, _49$$32, _50$$32, _51$$33, _52$$34, _53$$35, _54$$36, _55$$36, _56$$37, _57$$37, _58$$38, _59$$39, _60$$40, _61$$41, _62$$42, _63$$43, _64$$45, _65$$46, _73$$52, _74$$52, _75$$52, _76$$52; zval table, schema; zval *this_ptr = getThis(); @@ -190,9 +190,9 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZVAL_UNDEF(&_28$$3); ZVAL_UNDEF(&_29$$3); ZVAL_UNDEF(&_30$$3); - ZVAL_UNDEF(&_31$$3); ZVAL_UNDEF(&_32$$3); - ZVAL_UNDEF(&_35$$3); + ZVAL_UNDEF(&_33$$3); + ZVAL_UNDEF(&_34$$3); ZVAL_UNDEF(&_6$$4); ZVAL_UNDEF(&_7$$4); ZVAL_UNDEF(&_8$$5); @@ -223,8 +223,8 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZVAL_UNDEF(&_66$$28); ZVAL_UNDEF(&_67$$28); ZVAL_UNDEF(&_68$$28); - ZVAL_UNDEF(&_69$$28); ZVAL_UNDEF(&_70$$28); + ZVAL_UNDEF(&_71$$28); ZVAL_UNDEF(&_72$$28); ZVAL_UNDEF(&_44$$29); ZVAL_UNDEF(&_45$$29); @@ -300,7 +300,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZVAL_LONG(&_2, 3); ZEPHIR_CALL_METHOD(&fields, this_ptr, "fetchall", NULL, 0, &_1, &_2); zephir_check_call_status(); - zephir_is_iterable(&fields, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 312); + zephir_is_iterable(&fields, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 311); if (Z_TYPE_P(&fields) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&fields), _3) { @@ -310,12 +310,12 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) zephir_create_array(&definition, 1, 0); add_assoc_long_ex(&definition, SL("bindType"), 2); ZEPHIR_OBS_NVAR(&columnType); - zephir_array_fetch_long(&columnType, &field, 2, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 128); - _5$$3 = zephir_memnstr_str(&columnType, SL("int"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 150); + zephir_array_fetch_long(&columnType, &field, 2, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 127); + _5$$3 = zephir_memnstr_str(&columnType, SL("int"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 149); if (!(_5$$3)) { - _5$$3 = zephir_memnstr_str(&columnType, SL("INT"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 150); + _5$$3 = zephir_memnstr_str(&columnType, SL("INT"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 149); } - if (zephir_memnstr_str(&columnType, SL("bigint"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 143)) { + if (zephir_memnstr_str(&columnType, SL("bigint"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 142)) { ZEPHIR_INIT_NVAR(&_6$$4); ZVAL_LONG(&_6$$4, 14); zephir_array_update_string(&definition, SL("type"), &_6$$4, PH_COPY | PH_SEPARATE); @@ -331,11 +331,11 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZEPHIR_INIT_NVAR(&_9$$5); ZVAL_LONG(&_9$$5, 1); zephir_array_update_string(&definition, SL("bindType"), &_9$$5, PH_COPY | PH_SEPARATE); - zephir_array_fetch_long(&_10$$5, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 158); + zephir_array_fetch_long(&_10$$5, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 157); if (zephir_is_true(&_10$$5)) { zephir_array_update_string(&definition, SL("autoIncrement"), &__$true, PH_COPY | PH_SEPARATE); } - } else if (zephir_memnstr_str(&columnType, SL("tinyint(1)"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 161)) { + } else if (zephir_memnstr_str(&columnType, SL("tinyint(1)"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 160)) { ZEPHIR_INIT_NVAR(&_11$$7); ZVAL_LONG(&_11$$7, 8); zephir_array_update_string(&definition, SL("type"), &_11$$7, PH_COPY | PH_SEPARATE); @@ -344,19 +344,19 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) zephir_array_update_string(&definition, SL("bindType"), &_12$$7, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&columnType); ZVAL_STRING(&columnType, "boolean"); - } else if (zephir_memnstr_str(&columnType, SL("enum"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 172)) { + } else if (zephir_memnstr_str(&columnType, SL("enum"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 171)) { ZEPHIR_INIT_NVAR(&_13$$8); ZVAL_LONG(&_13$$8, 5); zephir_array_update_string(&definition, SL("type"), &_13$$8, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("datetime"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 181)) { + } else if (zephir_memnstr_str(&columnType, SL("datetime"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 180)) { ZEPHIR_INIT_NVAR(&_14$$9); ZVAL_LONG(&_14$$9, 4); zephir_array_update_string(&definition, SL("type"), &_14$$9, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("date"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 186)) { + } else if (zephir_memnstr_str(&columnType, SL("date"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 185)) { ZEPHIR_INIT_NVAR(&_15$$10); ZVAL_LONG(&_15$$10, 1); zephir_array_update_string(&definition, SL("type"), &_15$$10, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("decimal"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 195)) { + } else if (zephir_memnstr_str(&columnType, SL("decimal"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 194)) { ZEPHIR_INIT_NVAR(&_16$$11); ZVAL_LONG(&_16$$11, 3); zephir_array_update_string(&definition, SL("type"), &_16$$11, PH_COPY | PH_SEPARATE); @@ -364,7 +364,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZEPHIR_INIT_NVAR(&_17$$11); ZVAL_LONG(&_17$$11, 32); zephir_array_update_string(&definition, SL("bindType"), &_17$$11, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("float"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 202)) { + } else if (zephir_memnstr_str(&columnType, SL("float"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 201)) { ZEPHIR_INIT_NVAR(&_18$$12); ZVAL_LONG(&_18$$12, 7); zephir_array_update_string(&definition, SL("type"), &_18$$12, PH_COPY | PH_SEPARATE); @@ -372,19 +372,19 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZEPHIR_INIT_NVAR(&_19$$12); ZVAL_LONG(&_19$$12, 3); zephir_array_update_string(&definition, SL("bindType"), &_19$$12, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("timestamp"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 213)) { + } else if (zephir_memnstr_str(&columnType, SL("timestamp"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 212)) { ZEPHIR_INIT_NVAR(&_20$$13); ZVAL_LONG(&_20$$13, 17); zephir_array_update_string(&definition, SL("type"), &_20$$13, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("varchar"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 222)) { + } else if (zephir_memnstr_str(&columnType, SL("varchar"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 221)) { ZEPHIR_INIT_NVAR(&_21$$14); ZVAL_LONG(&_21$$14, 2); zephir_array_update_string(&definition, SL("type"), &_21$$14, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("char"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 227)) { + } else if (zephir_memnstr_str(&columnType, SL("char"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 226)) { ZEPHIR_INIT_NVAR(&_22$$15); ZVAL_LONG(&_22$$15, 5); zephir_array_update_string(&definition, SL("type"), &_22$$15, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("text"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 232)) { + } else if (zephir_memnstr_str(&columnType, SL("text"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 231)) { ZEPHIR_INIT_NVAR(&_23$$16); ZVAL_LONG(&_23$$16, 6); zephir_array_update_string(&definition, SL("type"), &_23$$16, PH_COPY | PH_SEPARATE); @@ -393,7 +393,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZVAL_LONG(&_24$$17, 2); zephir_array_update_string(&definition, SL("type"), &_24$$17, PH_COPY | PH_SEPARATE); } - if (zephir_memnstr_str(&columnType, SL("("), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 249)) { + if (zephir_memnstr_str(&columnType, SL("("), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 248)) { ZEPHIR_INIT_NVAR(&matches); ZVAL_NULL(&matches); ZEPHIR_INIT_NVAR(&_25$$18); @@ -413,7 +413,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) } } } - if (zephir_memnstr_str(&columnType, SL("unsigned"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 265)) { + if (zephir_memnstr_str(&columnType, SL("unsigned"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 264)) { zephir_array_update_string(&definition, SL("unsigned"), &__$true, PH_COPY | PH_SEPARATE); } if (Z_TYPE_P(&oldColumn) == IS_NULL) { @@ -421,26 +421,27 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) } else { zephir_array_update_string(&definition, SL("after"), &oldColumn, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_28$$3, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 281); + zephir_array_fetch_long(&_28$$3, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 280); if (zephir_is_true(&_28$$3)) { zephir_array_update_string(&definition, SL("primary"), &__$true, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_29$$3, &field, 3, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 288); + zephir_array_fetch_long(&_29$$3, &field, 3, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 287); if (ZEPHIR_IS_LONG(&_29$$3, 0)) { zephir_array_update_string(&definition, SL("notNull"), &__$false, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_30$$3, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 296); - ZEPHIR_INIT_NVAR(&_31$$3); - ZVAL_STRING(&_31$$3, "null"); - ZEPHIR_CALL_FUNCTION(&_32$$3, "strcasecmp", &_33, 34, &_30$$3, &_31$$3); - zephir_check_call_status(); - _34$$3 = !ZEPHIR_IS_LONG(&_32$$3, 0); - if (_34$$3) { - zephir_array_fetch_long(&_35$$3, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 296); - _34$$3 = !ZEPHIR_IS_STRING(&_35$$3, ""); + ZEPHIR_OBS_NVAR(&_30$$3); + zephir_array_fetch_long(&_30$$3, &field, 4, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 295); + _31$$3 = !(ZEPHIR_IS_EMPTY(&_30$$3)); + if (_31$$3) { + zephir_array_fetch_long(&_32$$3, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 295); + ZEPHIR_INIT_NVAR(&_33$$3); + ZVAL_STRING(&_33$$3, "null"); + ZEPHIR_CALL_FUNCTION(&_34$$3, "strcasecmp", &_35, 34, &_32$$3, &_33$$3); + zephir_check_call_status(); + _31$$3 = !ZEPHIR_IS_LONG_IDENTICAL(&_34$$3, 0); } - if (_34$$3) { - zephir_array_fetch_long(&_36$$27, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 301); + if (_31$$3) { + zephir_array_fetch_long(&_36$$27, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 300); ZEPHIR_INIT_NVAR(&_37$$27); ZVAL_STRING(&_37$$27, "/^'|'$/"); ZEPHIR_INIT_NVAR(&_38$$27); @@ -449,12 +450,12 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) zephir_check_call_status(); zephir_array_update_string(&definition, SL("default"), &_39$$27, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&columnName, &field, 1, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 307); - ZEPHIR_INIT_NVAR(&_31$$3); - object_init_ex(&_31$$3, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_31$$3, "__construct", &_41, 206, &columnName, &definition); + zephir_array_fetch_long(&columnName, &field, 1, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 306); + ZEPHIR_INIT_NVAR(&_33$$3); + object_init_ex(&_33$$3, phalcon_db_column_ce); + ZEPHIR_CALL_METHOD(NULL, &_33$$3, "__construct", &_41, 206, &columnName, &definition); zephir_check_call_status(); - zephir_array_append(&columns, &_31$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 308); + zephir_array_append(&columns, &_33$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 307); ZEPHIR_CPY_WRT(&oldColumn, &columnName); } ZEND_HASH_FOREACH_END(); } else { @@ -473,12 +474,12 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) add_assoc_long_ex(&_42$$28, SL("bindType"), 2); ZEPHIR_CPY_WRT(&definition, &_42$$28); ZEPHIR_OBS_NVAR(&columnType); - zephir_array_fetch_long(&columnType, &field, 2, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 128); - _43$$28 = zephir_memnstr_str(&columnType, SL("int"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 150); + zephir_array_fetch_long(&columnType, &field, 2, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 127); + _43$$28 = zephir_memnstr_str(&columnType, SL("int"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 149); if (!(_43$$28)) { - _43$$28 = zephir_memnstr_str(&columnType, SL("INT"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 150); + _43$$28 = zephir_memnstr_str(&columnType, SL("INT"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 149); } - if (zephir_memnstr_str(&columnType, SL("bigint"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 143)) { + if (zephir_memnstr_str(&columnType, SL("bigint"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 142)) { ZEPHIR_INIT_NVAR(&_44$$29); ZVAL_LONG(&_44$$29, 14); zephir_array_update_string(&definition, SL("type"), &_44$$29, PH_COPY | PH_SEPARATE); @@ -494,11 +495,11 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZEPHIR_INIT_NVAR(&_47$$30); ZVAL_LONG(&_47$$30, 1); zephir_array_update_string(&definition, SL("bindType"), &_47$$30, PH_COPY | PH_SEPARATE); - zephir_array_fetch_long(&_48$$30, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 158); + zephir_array_fetch_long(&_48$$30, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 157); if (zephir_is_true(&_48$$30)) { zephir_array_update_string(&definition, SL("autoIncrement"), &__$true, PH_COPY | PH_SEPARATE); } - } else if (zephir_memnstr_str(&columnType, SL("tinyint(1)"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 161)) { + } else if (zephir_memnstr_str(&columnType, SL("tinyint(1)"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 160)) { ZEPHIR_INIT_NVAR(&_49$$32); ZVAL_LONG(&_49$$32, 8); zephir_array_update_string(&definition, SL("type"), &_49$$32, PH_COPY | PH_SEPARATE); @@ -507,19 +508,19 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) zephir_array_update_string(&definition, SL("bindType"), &_50$$32, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&columnType); ZVAL_STRING(&columnType, "boolean"); - } else if (zephir_memnstr_str(&columnType, SL("enum"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 172)) { + } else if (zephir_memnstr_str(&columnType, SL("enum"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 171)) { ZEPHIR_INIT_NVAR(&_51$$33); ZVAL_LONG(&_51$$33, 5); zephir_array_update_string(&definition, SL("type"), &_51$$33, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("datetime"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 181)) { + } else if (zephir_memnstr_str(&columnType, SL("datetime"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 180)) { ZEPHIR_INIT_NVAR(&_52$$34); ZVAL_LONG(&_52$$34, 4); zephir_array_update_string(&definition, SL("type"), &_52$$34, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("date"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 186)) { + } else if (zephir_memnstr_str(&columnType, SL("date"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 185)) { ZEPHIR_INIT_NVAR(&_53$$35); ZVAL_LONG(&_53$$35, 1); zephir_array_update_string(&definition, SL("type"), &_53$$35, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("decimal"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 195)) { + } else if (zephir_memnstr_str(&columnType, SL("decimal"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 194)) { ZEPHIR_INIT_NVAR(&_54$$36); ZVAL_LONG(&_54$$36, 3); zephir_array_update_string(&definition, SL("type"), &_54$$36, PH_COPY | PH_SEPARATE); @@ -527,7 +528,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZEPHIR_INIT_NVAR(&_55$$36); ZVAL_LONG(&_55$$36, 32); zephir_array_update_string(&definition, SL("bindType"), &_55$$36, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("float"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 202)) { + } else if (zephir_memnstr_str(&columnType, SL("float"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 201)) { ZEPHIR_INIT_NVAR(&_56$$37); ZVAL_LONG(&_56$$37, 7); zephir_array_update_string(&definition, SL("type"), &_56$$37, PH_COPY | PH_SEPARATE); @@ -535,19 +536,19 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZEPHIR_INIT_NVAR(&_57$$37); ZVAL_LONG(&_57$$37, 3); zephir_array_update_string(&definition, SL("bindType"), &_57$$37, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("timestamp"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 213)) { + } else if (zephir_memnstr_str(&columnType, SL("timestamp"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 212)) { ZEPHIR_INIT_NVAR(&_58$$38); ZVAL_LONG(&_58$$38, 17); zephir_array_update_string(&definition, SL("type"), &_58$$38, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("varchar"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 222)) { + } else if (zephir_memnstr_str(&columnType, SL("varchar"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 221)) { ZEPHIR_INIT_NVAR(&_59$$39); ZVAL_LONG(&_59$$39, 2); zephir_array_update_string(&definition, SL("type"), &_59$$39, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("char"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 227)) { + } else if (zephir_memnstr_str(&columnType, SL("char"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 226)) { ZEPHIR_INIT_NVAR(&_60$$40); ZVAL_LONG(&_60$$40, 5); zephir_array_update_string(&definition, SL("type"), &_60$$40, PH_COPY | PH_SEPARATE); - } else if (zephir_memnstr_str(&columnType, SL("text"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 232)) { + } else if (zephir_memnstr_str(&columnType, SL("text"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 231)) { ZEPHIR_INIT_NVAR(&_61$$41); ZVAL_LONG(&_61$$41, 6); zephir_array_update_string(&definition, SL("type"), &_61$$41, PH_COPY | PH_SEPARATE); @@ -556,7 +557,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) ZVAL_LONG(&_62$$42, 2); zephir_array_update_string(&definition, SL("type"), &_62$$42, PH_COPY | PH_SEPARATE); } - if (zephir_memnstr_str(&columnType, SL("("), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 249)) { + if (zephir_memnstr_str(&columnType, SL("("), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 248)) { ZEPHIR_INIT_NVAR(&matches); ZVAL_NULL(&matches); ZEPHIR_INIT_NVAR(&_63$$43); @@ -576,7 +577,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) } } } - if (zephir_memnstr_str(&columnType, SL("unsigned"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 265)) { + if (zephir_memnstr_str(&columnType, SL("unsigned"), "phalcon/Db/Adapter/Pdo/Sqlite.zep", 264)) { zephir_array_update_string(&definition, SL("unsigned"), &__$true, PH_COPY | PH_SEPARATE); } if (Z_TYPE_P(&oldColumn) == IS_NULL) { @@ -584,26 +585,27 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) } else { zephir_array_update_string(&definition, SL("after"), &oldColumn, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_66$$28, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 281); + zephir_array_fetch_long(&_66$$28, &field, 5, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 280); if (zephir_is_true(&_66$$28)) { zephir_array_update_string(&definition, SL("primary"), &__$true, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_67$$28, &field, 3, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 288); + zephir_array_fetch_long(&_67$$28, &field, 3, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 287); if (ZEPHIR_IS_LONG(&_67$$28, 0)) { zephir_array_update_string(&definition, SL("notNull"), &__$false, PH_COPY | PH_SEPARATE); } - zephir_array_fetch_long(&_68$$28, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 296); - ZEPHIR_INIT_NVAR(&_69$$28); - ZVAL_STRING(&_69$$28, "null"); - ZEPHIR_CALL_FUNCTION(&_70$$28, "strcasecmp", &_33, 34, &_68$$28, &_69$$28); - zephir_check_call_status(); - _71$$28 = !ZEPHIR_IS_LONG(&_70$$28, 0); - if (_71$$28) { - zephir_array_fetch_long(&_72$$28, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 296); - _71$$28 = !ZEPHIR_IS_STRING(&_72$$28, ""); + ZEPHIR_OBS_NVAR(&_68$$28); + zephir_array_fetch_long(&_68$$28, &field, 4, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 295); + _69$$28 = !(ZEPHIR_IS_EMPTY(&_68$$28)); + if (_69$$28) { + zephir_array_fetch_long(&_70$$28, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 295); + ZEPHIR_INIT_NVAR(&_71$$28); + ZVAL_STRING(&_71$$28, "null"); + ZEPHIR_CALL_FUNCTION(&_72$$28, "strcasecmp", &_35, 34, &_70$$28, &_71$$28); + zephir_check_call_status(); + _69$$28 = !ZEPHIR_IS_LONG_IDENTICAL(&_72$$28, 0); } - if (_71$$28) { - zephir_array_fetch_long(&_73$$52, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 301); + if (_69$$28) { + zephir_array_fetch_long(&_73$$52, &field, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 300); ZEPHIR_INIT_NVAR(&_74$$52); ZVAL_STRING(&_74$$52, "/^'|'$/"); ZEPHIR_INIT_NVAR(&_75$$52); @@ -613,12 +615,12 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) zephir_array_update_string(&definition, SL("default"), &_76$$52, PH_COPY | PH_SEPARATE); } ZEPHIR_OBS_NVAR(&columnName); - zephir_array_fetch_long(&columnName, &field, 1, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 307); - ZEPHIR_INIT_NVAR(&_69$$28); - object_init_ex(&_69$$28, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_69$$28, "__construct", &_41, 206, &columnName, &definition); + zephir_array_fetch_long(&columnName, &field, 1, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 306); + ZEPHIR_INIT_NVAR(&_71$$28); + object_init_ex(&_71$$28, phalcon_db_column_ce); + ZEPHIR_CALL_METHOD(NULL, &_71$$28, "__construct", &_41, 206, &columnName, &definition); zephir_check_call_status(); - zephir_array_append(&columns, &_69$$28, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 308); + zephir_array_append(&columns, &_71$$28, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 307); ZEPHIR_CPY_WRT(&oldColumn, &columnName); ZEPHIR_CALL_METHOD(NULL, &fields, "next", NULL, 0); zephir_check_call_status(); @@ -750,27 +752,27 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) ZVAL_LONG(&_3, 2); ZEPHIR_CALL_METHOD(&_0, this_ptr, "fetchall", NULL, 0, &_2, &_3); zephir_check_call_status(); - zephir_is_iterable(&_0, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 370); + zephir_is_iterable(&_0, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 369); if (Z_TYPE_P(&_0) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _4) { ZEPHIR_INIT_NVAR(&index); ZVAL_COPY(&index, _4); ZEPHIR_OBS_NVAR(&keyName); - zephir_array_fetch_string(&keyName, &index, SL("name"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 332); + zephir_array_fetch_string(&keyName, &index, SL("name"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 331); if (!(zephir_array_isset(&indexes, &keyName))) { ZEPHIR_INIT_NVAR(&_6$$4); array_init(&_6$$4); zephir_array_update_zval(&indexes, &keyName, &_6$$4, PH_COPY | PH_SEPARATE); } - zephir_array_fetch(&_7$$3, &indexes, &keyName, PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 338); + zephir_array_fetch(&_7$$3, &indexes, &keyName, PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 337); if (!(zephir_array_isset_string(&_7$$3, SL("columns")))) { ZEPHIR_INIT_NVAR(&columns); array_init(&columns); } else { - zephir_array_fetch(&_8$$6, &indexes, &keyName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 341); + zephir_array_fetch(&_8$$6, &indexes, &keyName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 340); ZEPHIR_OBS_NVAR(&columns); - zephir_array_fetch_string(&columns, &_8$$6, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 341); + zephir_array_fetch_string(&columns, &_8$$6, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 340); } zephir_read_property(&_9$$3, this_ptr, ZEND_STRL("dialect"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(&_10$$3, &_9$$3, "describeindex", NULL, 0, &keyName); @@ -778,14 +780,14 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) ZVAL_LONG(&_11$$3, 2); ZEPHIR_CALL_METHOD(&describeIndexes, this_ptr, "fetchall", NULL, 0, &_10$$3, &_11$$3); zephir_check_call_status(); - zephir_is_iterable(&describeIndexes, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 353); + zephir_is_iterable(&describeIndexes, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 352); if (Z_TYPE_P(&describeIndexes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&describeIndexes), _12$$3) { ZEPHIR_INIT_NVAR(&describeIndex); ZVAL_COPY(&describeIndex, _12$$3); - zephir_array_fetch_string(&_14$$7, &describeIndex, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 350); - zephir_array_append(&columns, &_14$$7, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 350); + zephir_array_fetch_string(&_14$$7, &describeIndex, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 349); + zephir_array_append(&columns, &_14$$7, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 349); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &describeIndexes, "rewind", NULL, 0); @@ -798,8 +800,8 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) } ZEPHIR_CALL_METHOD(&describeIndex, &describeIndexes, "current", NULL, 0); zephir_check_call_status(); - zephir_array_fetch_string(&_15$$8, &describeIndex, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 350); - zephir_array_append(&columns, &_15$$8, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 350); + zephir_array_fetch_string(&_15$$8, &describeIndex, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 349); + zephir_array_append(&columns, &_15$$8, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 349); ZEPHIR_CALL_METHOD(NULL, &describeIndexes, "next", NULL, 0); zephir_check_call_status(); } @@ -811,7 +813,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&indexSql, this_ptr, "fetchcolumn", &_17, 0, &_16$$3); zephir_check_call_status(); - zephir_array_fetch_string(&_18$$3, &index, SL("unique"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 359); + zephir_array_fetch_string(&_18$$3, &index, SL("unique"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 358); if (zephir_is_true(&_18$$3)) { ZEPHIR_INIT_NVAR(&_19$$9); ZEPHIR_INIT_NVAR(&_20$$9); @@ -845,20 +847,20 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) ZEPHIR_CALL_METHOD(&index, &_0, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&keyName); - zephir_array_fetch_string(&keyName, &index, SL("name"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 332); + zephir_array_fetch_string(&keyName, &index, SL("name"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 331); if (!(zephir_array_isset(&indexes, &keyName))) { ZEPHIR_INIT_NVAR(&_25$$14); array_init(&_25$$14); zephir_array_update_zval(&indexes, &keyName, &_25$$14, PH_COPY | PH_SEPARATE); } - zephir_array_fetch(&_26$$13, &indexes, &keyName, PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 338); + zephir_array_fetch(&_26$$13, &indexes, &keyName, PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 337); if (!(zephir_array_isset_string(&_26$$13, SL("columns")))) { ZEPHIR_INIT_NVAR(&columns); array_init(&columns); } else { - zephir_array_fetch(&_27$$16, &indexes, &keyName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 341); + zephir_array_fetch(&_27$$16, &indexes, &keyName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 340); ZEPHIR_OBS_NVAR(&columns); - zephir_array_fetch_string(&columns, &_27$$16, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 341); + zephir_array_fetch_string(&columns, &_27$$16, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 340); } zephir_read_property(&_28$$13, this_ptr, ZEND_STRL("dialect"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(&_29$$13, &_28$$13, "describeindex", NULL, 0, &keyName); @@ -866,14 +868,14 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) ZVAL_LONG(&_30$$13, 2); ZEPHIR_CALL_METHOD(&describeIndexes, this_ptr, "fetchall", NULL, 0, &_29$$13, &_30$$13); zephir_check_call_status(); - zephir_is_iterable(&describeIndexes, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 353); + zephir_is_iterable(&describeIndexes, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 352); if (Z_TYPE_P(&describeIndexes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&describeIndexes), _31$$13) { ZEPHIR_INIT_NVAR(&describeIndex); ZVAL_COPY(&describeIndex, _31$$13); - zephir_array_fetch_string(&_33$$17, &describeIndex, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 350); - zephir_array_append(&columns, &_33$$17, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 350); + zephir_array_fetch_string(&_33$$17, &describeIndex, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 349); + zephir_array_append(&columns, &_33$$17, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 349); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &describeIndexes, "rewind", NULL, 0); @@ -886,8 +888,8 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) } ZEPHIR_CALL_METHOD(&describeIndex, &describeIndexes, "current", NULL, 0); zephir_check_call_status(); - zephir_array_fetch_string(&_34$$18, &describeIndex, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 350); - zephir_array_append(&columns, &_34$$18, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 350); + zephir_array_fetch_string(&_34$$18, &describeIndex, SL("name"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 349); + zephir_array_append(&columns, &_34$$18, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 349); ZEPHIR_CALL_METHOD(NULL, &describeIndexes, "next", NULL, 0); zephir_check_call_status(); } @@ -899,7 +901,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&indexSql, this_ptr, "fetchcolumn", &_17, 0, &_35$$13); zephir_check_call_status(); - zephir_array_fetch_string(&_36$$13, &index, SL("unique"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 359); + zephir_array_fetch_string(&_36$$13, &index, SL("unique"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 358); if (zephir_is_true(&_36$$13)) { ZEPHIR_INIT_NVAR(&_37$$19); ZEPHIR_INIT_NVAR(&_38$$19); @@ -927,7 +929,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) ZEPHIR_INIT_NVAR(&index); ZEPHIR_INIT_VAR(&indexObjects); array_init(&indexObjects); - zephir_is_iterable(&indexes, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 380); + zephir_is_iterable(&indexes, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 379); if (Z_TYPE_P(&indexes) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&indexes), _45, _46, _43) { @@ -941,8 +943,8 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) ZVAL_COPY(&index, _43); ZEPHIR_INIT_NVAR(&_47$$23); object_init_ex(&_47$$23, phalcon_db_index_ce); - zephir_array_fetch_string(&_48$$23, &index, SL("columns"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 375); - zephir_array_fetch_string(&_49$$23, &index, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 377); + zephir_array_fetch_string(&_48$$23, &index, SL("columns"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 374); + zephir_array_fetch_string(&_49$$23, &index, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 376); ZEPHIR_CALL_METHOD(NULL, &_47$$23, "__construct", &_50, 30, &name, &_48$$23, &_49$$23); zephir_check_call_status(); zephir_array_update_zval(&indexObjects, &name, &_47$$23, PH_COPY | PH_SEPARATE); @@ -962,8 +964,8 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeIndexes) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_51$$24); object_init_ex(&_51$$24, phalcon_db_index_ce); - zephir_array_fetch_string(&_52$$24, &index, SL("columns"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 375); - zephir_array_fetch_string(&_53$$24, &index, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 377); + zephir_array_fetch_string(&_52$$24, &index, SL("columns"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 374); + zephir_array_fetch_string(&_53$$24, &index, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 376); ZEPHIR_CALL_METHOD(NULL, &_51$$24, "__construct", &_50, 30, &name, &_52$$24, &_53$$24); zephir_check_call_status(); zephir_array_update_zval(&indexObjects, &name, &_51$$24, PH_COPY | PH_SEPARATE); @@ -1074,7 +1076,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeReferences) ZVAL_LONG(&_3, 3); ZEPHIR_CALL_METHOD(&_0, this_ptr, "fetchall", NULL, 0, &_2, &_3); zephir_check_call_status(); - zephir_is_iterable(&_0, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 420); + zephir_is_iterable(&_0, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 419); if (Z_TYPE_P(&_0) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_0), _6, _7, _4) { @@ -1092,29 +1094,29 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeReferences) ZEPHIR_INIT_NVAR(&referencedSchema); ZVAL_NULL(&referencedSchema); ZEPHIR_OBS_NVAR(&referencedTable); - zephir_array_fetch_long(&referencedTable, &reference, 2, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 399); + zephir_array_fetch_long(&referencedTable, &reference, 2, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 398); ZEPHIR_INIT_NVAR(&columns); array_init(&columns); ZEPHIR_INIT_NVAR(&referencedColumns); array_init(&referencedColumns); } else { - zephir_array_fetch(&_8$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 403); + zephir_array_fetch(&_8$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 402); ZEPHIR_OBS_NVAR(&referencedSchema); - zephir_array_fetch_string(&referencedSchema, &_8$$5, SL("referencedSchema"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 403); - zephir_array_fetch(&_9$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 404); + zephir_array_fetch_string(&referencedSchema, &_8$$5, SL("referencedSchema"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 402); + zephir_array_fetch(&_9$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 403); ZEPHIR_OBS_NVAR(&referencedTable); - zephir_array_fetch_string(&referencedTable, &_9$$5, SL("referencedTable"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 404); - zephir_array_fetch(&_10$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 405); + zephir_array_fetch_string(&referencedTable, &_9$$5, SL("referencedTable"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 403); + zephir_array_fetch(&_10$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 404); ZEPHIR_OBS_NVAR(&columns); - zephir_array_fetch_string(&columns, &_10$$5, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 405); - zephir_array_fetch(&_11$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 406); + zephir_array_fetch_string(&columns, &_10$$5, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 404); + zephir_array_fetch(&_11$$5, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 405); ZEPHIR_OBS_NVAR(&referencedColumns); - zephir_array_fetch_string(&referencedColumns, &_11$$5, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 406); + zephir_array_fetch_string(&referencedColumns, &_11$$5, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 405); } - zephir_array_fetch_long(&_12$$3, &reference, 3, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 409); - zephir_array_append(&columns, &_12$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 409); - zephir_array_fetch_long(&_13$$3, &reference, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 410); - zephir_array_append(&referencedColumns, &_13$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 410); + zephir_array_fetch_long(&_12$$3, &reference, 3, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 408); + zephir_array_append(&columns, &_12$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 408); + zephir_array_fetch_long(&_13$$3, &reference, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 409); + zephir_array_append(&referencedColumns, &_13$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 409); ZEPHIR_INIT_NVAR(&_14$$3); zephir_create_array(&_14$$3, 4, 0); zephir_array_update_string(&_14$$3, SL("referencedSchema"), &referencedSchema, PH_COPY | PH_SEPARATE); @@ -1142,29 +1144,29 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeReferences) ZEPHIR_INIT_NVAR(&referencedSchema); ZVAL_NULL(&referencedSchema); ZEPHIR_OBS_NVAR(&referencedTable); - zephir_array_fetch_long(&referencedTable, &reference, 2, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 399); + zephir_array_fetch_long(&referencedTable, &reference, 2, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 398); ZEPHIR_INIT_NVAR(&columns); array_init(&columns); ZEPHIR_INIT_NVAR(&referencedColumns); array_init(&referencedColumns); } else { - zephir_array_fetch(&_15$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 403); + zephir_array_fetch(&_15$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 402); ZEPHIR_OBS_NVAR(&referencedSchema); - zephir_array_fetch_string(&referencedSchema, &_15$$8, SL("referencedSchema"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 403); - zephir_array_fetch(&_16$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 404); + zephir_array_fetch_string(&referencedSchema, &_15$$8, SL("referencedSchema"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 402); + zephir_array_fetch(&_16$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 403); ZEPHIR_OBS_NVAR(&referencedTable); - zephir_array_fetch_string(&referencedTable, &_16$$8, SL("referencedTable"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 404); - zephir_array_fetch(&_17$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 405); + zephir_array_fetch_string(&referencedTable, &_16$$8, SL("referencedTable"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 403); + zephir_array_fetch(&_17$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 404); ZEPHIR_OBS_NVAR(&columns); - zephir_array_fetch_string(&columns, &_17$$8, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 405); - zephir_array_fetch(&_18$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 406); + zephir_array_fetch_string(&columns, &_17$$8, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 404); + zephir_array_fetch(&_18$$8, &references, &constraintName, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 405); ZEPHIR_OBS_NVAR(&referencedColumns); - zephir_array_fetch_string(&referencedColumns, &_18$$8, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 406); + zephir_array_fetch_string(&referencedColumns, &_18$$8, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 405); } - zephir_array_fetch_long(&_19$$6, &reference, 3, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 409); - zephir_array_append(&columns, &_19$$6, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 409); - zephir_array_fetch_long(&_20$$6, &reference, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 410); - zephir_array_append(&referencedColumns, &_20$$6, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 410); + zephir_array_fetch_long(&_19$$6, &reference, 3, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 408); + zephir_array_append(&columns, &_19$$6, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 408); + zephir_array_fetch_long(&_20$$6, &reference, 4, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 409); + zephir_array_append(&referencedColumns, &_20$$6, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 409); ZEPHIR_INIT_NVAR(&_21$$6); zephir_create_array(&_21$$6, 4, 0); zephir_array_update_string(&_21$$6, SL("referencedSchema"), &referencedSchema, PH_COPY | PH_SEPARATE); @@ -1180,7 +1182,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeReferences) ZEPHIR_INIT_NVAR(&number); ZEPHIR_INIT_VAR(&referenceObjects); array_init(&referenceObjects); - zephir_is_iterable(&references, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 434); + zephir_is_iterable(&references, 0, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 433); if (Z_TYPE_P(&references) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&references), _24, _25, _22) { @@ -1197,16 +1199,16 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeReferences) ZEPHIR_INIT_NVAR(&_27$$9); zephir_create_array(&_27$$9, 4, 0); ZEPHIR_OBS_NVAR(&_28$$9); - zephir_array_fetch_string(&_28$$9, &arrayReference, SL("referencedSchema"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 426); + zephir_array_fetch_string(&_28$$9, &arrayReference, SL("referencedSchema"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 425); zephir_array_update_string(&_27$$9, SL("referencedSchema"), &_28$$9, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_28$$9); - zephir_array_fetch_string(&_28$$9, &arrayReference, SL("referencedTable"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 427); + zephir_array_fetch_string(&_28$$9, &arrayReference, SL("referencedTable"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 426); zephir_array_update_string(&_27$$9, SL("referencedTable"), &_28$$9, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_28$$9); - zephir_array_fetch_string(&_28$$9, &arrayReference, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 428); + zephir_array_fetch_string(&_28$$9, &arrayReference, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 427); zephir_array_update_string(&_27$$9, SL("columns"), &_28$$9, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_28$$9); - zephir_array_fetch_string(&_28$$9, &arrayReference, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 430); + zephir_array_fetch_string(&_28$$9, &arrayReference, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 429); zephir_array_update_string(&_27$$9, SL("referencedColumns"), &_28$$9, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &_26$$9, "__construct", &_29, 31, &name, &_27$$9); zephir_check_call_status(); @@ -1230,16 +1232,16 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeReferences) ZEPHIR_INIT_NVAR(&_31$$10); zephir_create_array(&_31$$10, 4, 0); ZEPHIR_OBS_NVAR(&_32$$10); - zephir_array_fetch_string(&_32$$10, &arrayReference, SL("referencedSchema"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 426); + zephir_array_fetch_string(&_32$$10, &arrayReference, SL("referencedSchema"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 425); zephir_array_update_string(&_31$$10, SL("referencedSchema"), &_32$$10, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_32$$10); - zephir_array_fetch_string(&_32$$10, &arrayReference, SL("referencedTable"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 427); + zephir_array_fetch_string(&_32$$10, &arrayReference, SL("referencedTable"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 426); zephir_array_update_string(&_31$$10, SL("referencedTable"), &_32$$10, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_32$$10); - zephir_array_fetch_string(&_32$$10, &arrayReference, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 428); + zephir_array_fetch_string(&_32$$10, &arrayReference, SL("columns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 427); zephir_array_update_string(&_31$$10, SL("columns"), &_32$$10, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_32$$10); - zephir_array_fetch_string(&_32$$10, &arrayReference, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 430); + zephir_array_fetch_string(&_32$$10, &arrayReference, SL("referencedColumns"), PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 429); zephir_array_update_string(&_31$$10, SL("referencedColumns"), &_32$$10, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &_30$$10, "__construct", &_29, 31, &name, &_31$$10); zephir_check_call_status(); diff --git a/ext/phalcon/filter/validation/validator/regex.zep.c b/ext/phalcon/filter/validation/validator/regex.zep.c index a07ec820af6..a4f26e39996 100644 --- a/ext/phalcon/filter/validation/validator/regex.zep.c +++ b/ext/phalcon/filter/validation/validator/regex.zep.c @@ -126,10 +126,10 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Regex, __construct) */ PHP_METHOD(Phalcon_Filter_Validation_Validator_Regex, validate) { - zend_bool failed = 0; + zend_bool failed = 0, _3; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *validation, validation_sub, *field, field_sub, matches, value, pattern, _0, _1, _2$$4, _3$$5, _4$$7; + zval *validation, validation_sub, *field, field_sub, matches, value, pattern, _0, _1, _2$$4, _4$$5, _5$$7; zval *this_ptr = getThis(); ZVAL_UNDEF(&validation_sub); @@ -140,8 +140,8 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Regex, validate) ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1); ZVAL_UNDEF(&_2$$4); - ZVAL_UNDEF(&_3$$5); - ZVAL_UNDEF(&_4$$7); + ZVAL_UNDEF(&_4$$5); + ZVAL_UNDEF(&_5$$7); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 2) @@ -172,18 +172,22 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Regex, validate) zephir_array_fetch(&_2$$4, &pattern, field, PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/Validator/Regex.zep", 94); ZEPHIR_CPY_WRT(&pattern, &_2$$4); } - ZEPHIR_INIT_NVAR(&_1); - zephir_preg_match(&_1, &pattern, &value, &matches, 0, 0 , 0 ); - if (zephir_is_true(&_1)) { - zephir_array_fetch_long(&_3$$5, &matches, 0, PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/Validator/Regex.zep", 98); - failed = !ZEPHIR_IS_EQUAL(&_3$$5, &value); + _3 = Z_TYPE_P(&value) != IS_NULL; + if (_3) { + ZEPHIR_INIT_NVAR(&_1); + zephir_preg_match(&_1, &pattern, &value, &matches, 0, 0 , 0 ); + _3 = zephir_is_true(&_1); + } + if (_3) { + zephir_array_fetch_long(&_4$$5, &matches, 0, PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/Validator/Regex.zep", 101); + failed = !ZEPHIR_IS_EQUAL(&_4$$5, &value); } else { failed = 1; } if (failed) { - ZEPHIR_CALL_METHOD(&_4$$7, this_ptr, "messagefactory", NULL, 0, validation, field); + ZEPHIR_CALL_METHOD(&_5$$7, this_ptr, "messagefactory", NULL, 0, validation, field); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, &_4$$7); + ZEPHIR_CALL_METHOD(NULL, validation, "appendmessage", NULL, 0, &_5$$7); zephir_check_call_status(); RETURN_MM_BOOL(0); } diff --git a/ext/phalcon/mvc/application.zep.c b/ext/phalcon/mvc/application.zep.c index ae1e2cf6bc2..d0e57595505 100644 --- a/ext/phalcon/mvc/application.zep.c +++ b/ext/phalcon/mvc/application.zep.c @@ -13,10 +13,10 @@ #include "kernel/main.h" #include "kernel/object.h" +#include "kernel/operators.h" #include "kernel/exception.h" #include "kernel/memory.h" #include "kernel/fcall.h" -#include "kernel/operators.h" #include "Zend/zend_closures.h" #include "kernel/array.h" #include "kernel/file.h" @@ -103,12 +103,12 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Application) */ PHP_METHOD(Phalcon_Mvc_Application, handle) { - zval _17$$21; - zend_class_entry *_6$$8; - zend_bool returnedResponse = 0, _10$$7, _13$$12, _31$$31, _33$$31; + zval _17$$20; + zend_class_entry *_6$$7; + zend_bool returnedResponse = 0, _1, _10$$6, _13$$11, _31$$30, _33$$30; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *uri_param = NULL, __$false, container, eventsManager, router, dispatcher, response, view, module, moduleObject, moduleName, className, path, implicitView, controller, possibleResponse, renderStatus, matchedRoute, match, _0, _3, _4, _21, _22, _23, _24, _41, _1$$4, _2$$4, _5$$8, _7$$7, _8$$9, _9$$9, _11$$13, _12$$13, _14$$19, _15$$19, _16$$16, _18$$23, _19$$24, _20$$24, _25$$26, _26$$26, _27$$28, _28$$28, _29$$30, _30$$30, _32$$32, _34$$35, _35$$36, _36$$36, _37$$39, _38$$39, _39$$40, _40$$41; + zval *uri_param = NULL, __$false, container, eventsManager, router, dispatcher, response, view, module, moduleObject, moduleName, className, path, implicitView, controller, possibleResponse, renderStatus, matchedRoute, match, _0, _2, _3, _4, _21, _22, _23, _24, _41, _5$$7, _7$$6, _8$$8, _9$$8, _11$$12, _12$$12, _14$$18, _15$$18, _16$$15, _18$$22, _19$$23, _20$$23, _25$$25, _26$$25, _27$$27, _28$$27, _29$$29, _30$$29, _32$$31, _34$$34, _35$$35, _36$$35, _37$$38, _38$$38, _39$$39, _40$$40; zval uri; zval *this_ptr = getThis(); @@ -132,6 +132,7 @@ PHP_METHOD(Phalcon_Mvc_Application, handle) ZVAL_UNDEF(&matchedRoute); ZVAL_UNDEF(&match); ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_2); ZVAL_UNDEF(&_3); ZVAL_UNDEF(&_4); ZVAL_UNDEF(&_21); @@ -139,35 +140,33 @@ PHP_METHOD(Phalcon_Mvc_Application, handle) ZVAL_UNDEF(&_23); ZVAL_UNDEF(&_24); ZVAL_UNDEF(&_41); - ZVAL_UNDEF(&_1$$4); - ZVAL_UNDEF(&_2$$4); - ZVAL_UNDEF(&_5$$8); - ZVAL_UNDEF(&_7$$7); - ZVAL_UNDEF(&_8$$9); - ZVAL_UNDEF(&_9$$9); - ZVAL_UNDEF(&_11$$13); - ZVAL_UNDEF(&_12$$13); - ZVAL_UNDEF(&_14$$19); - ZVAL_UNDEF(&_15$$19); - ZVAL_UNDEF(&_16$$16); - ZVAL_UNDEF(&_18$$23); - ZVAL_UNDEF(&_19$$24); - ZVAL_UNDEF(&_20$$24); - ZVAL_UNDEF(&_25$$26); - ZVAL_UNDEF(&_26$$26); - ZVAL_UNDEF(&_27$$28); - ZVAL_UNDEF(&_28$$28); - ZVAL_UNDEF(&_29$$30); - ZVAL_UNDEF(&_30$$30); - ZVAL_UNDEF(&_32$$32); - ZVAL_UNDEF(&_34$$35); - ZVAL_UNDEF(&_35$$36); - ZVAL_UNDEF(&_36$$36); - ZVAL_UNDEF(&_37$$39); - ZVAL_UNDEF(&_38$$39); - ZVAL_UNDEF(&_39$$40); - ZVAL_UNDEF(&_40$$41); - ZVAL_UNDEF(&_17$$21); + ZVAL_UNDEF(&_5$$7); + ZVAL_UNDEF(&_7$$6); + ZVAL_UNDEF(&_8$$8); + ZVAL_UNDEF(&_9$$8); + ZVAL_UNDEF(&_11$$12); + ZVAL_UNDEF(&_12$$12); + ZVAL_UNDEF(&_14$$18); + ZVAL_UNDEF(&_15$$18); + ZVAL_UNDEF(&_16$$15); + ZVAL_UNDEF(&_18$$22); + ZVAL_UNDEF(&_19$$23); + ZVAL_UNDEF(&_20$$23); + ZVAL_UNDEF(&_25$$25); + ZVAL_UNDEF(&_26$$25); + ZVAL_UNDEF(&_27$$27); + ZVAL_UNDEF(&_28$$27); + ZVAL_UNDEF(&_29$$29); + ZVAL_UNDEF(&_30$$29); + ZVAL_UNDEF(&_32$$31); + ZVAL_UNDEF(&_34$$34); + ZVAL_UNDEF(&_35$$35); + ZVAL_UNDEF(&_36$$35); + ZVAL_UNDEF(&_37$$38); + ZVAL_UNDEF(&_38$$38); + ZVAL_UNDEF(&_39$$39); + ZVAL_UNDEF(&_40$$40); + ZVAL_UNDEF(&_17$$20); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -191,26 +190,28 @@ PHP_METHOD(Phalcon_Mvc_Application, handle) zephir_read_property(&_0, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&container, &_0); - if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) { + if (Z_TYPE_P(&container) == IS_NULL) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_application_exception_ce, "A dependency injection container is required to access internal services", "phalcon/Mvc/Application.zep", 100); return; } zephir_read_property(&_0, this_ptr, ZEND_STRL("eventsManager"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&eventsManager, &_0); - if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_VAR(&_2$$4); - ZVAL_STRING(&_2$$4, "application:boot"); - ZEPHIR_CALL_METHOD(&_1$$4, &eventsManager, "fire", NULL, 0, &_2$$4, this_ptr); + _1 = Z_TYPE_P(&eventsManager) != IS_NULL; + if (_1) { + ZEPHIR_INIT_VAR(&_3); + ZVAL_STRING(&_3, "application:boot"); + ZEPHIR_CALL_METHOD(&_2, &eventsManager, "fire", NULL, 0, &_3, this_ptr); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(&_1$$4)) { - RETURN_MM_BOOL(0); - } + _1 = ZEPHIR_IS_FALSE_IDENTICAL(&_2); + } + if (_1) { + RETURN_MM_BOOL(0); } - ZEPHIR_INIT_VAR(&_4); - ZVAL_STRING(&_4, "router"); - ZEPHIR_CALL_METHOD(&_3, &container, "getshared", NULL, 0, &_4); + ZEPHIR_INIT_NVAR(&_3); + ZVAL_STRING(&_3, "router"); + ZEPHIR_CALL_METHOD(&_4, &container, "getshared", NULL, 0, &_3); zephir_check_call_status(); - ZEPHIR_CPY_WRT(&router, &_3); + ZEPHIR_CPY_WRT(&router, &_4); ZEPHIR_CALL_METHOD(NULL, &router, "handle", NULL, 0, &uri); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&matchedRoute, &router, "getmatchedroute", NULL, 0); @@ -220,31 +221,31 @@ PHP_METHOD(Phalcon_Mvc_Application, handle) zephir_check_call_status(); if (Z_TYPE_P(&match) != IS_NULL) { if (zephir_is_instance_of(&match, SL("Closure"))) { - _6$$8 = zephir_fetch_class_str_ex(SL("Closure"), ZEND_FETCH_CLASS_AUTO); - ZEPHIR_CALL_CE_STATIC(&_5$$8, _6$$8, "bind", NULL, 0, &match, &container); + _6$$7 = zephir_fetch_class_str_ex(SL("Closure"), ZEND_FETCH_CLASS_AUTO); + ZEPHIR_CALL_CE_STATIC(&_5$$7, _6$$7, "bind", NULL, 0, &match, &container); zephir_check_call_status(); - ZEPHIR_CPY_WRT(&match, &_5$$8); + ZEPHIR_CPY_WRT(&match, &_5$$7); } - ZEPHIR_CALL_METHOD(&_7$$7, &router, "getparams", NULL, 0); + ZEPHIR_CALL_METHOD(&_7$$6, &router, "getparams", NULL, 0); zephir_check_call_status(); ZEPHIR_INIT_VAR(&possibleResponse); - ZEPHIR_CALL_USER_FUNC_ARRAY(&possibleResponse, &match, &_7$$7); + ZEPHIR_CALL_USER_FUNC_ARRAY(&possibleResponse, &match, &_7$$6); zephir_check_call_status(); if (Z_TYPE_P(&possibleResponse) == IS_STRING) { - ZEPHIR_INIT_VAR(&_9$$9); - ZVAL_STRING(&_9$$9, "response"); - ZEPHIR_CALL_METHOD(&_8$$9, &container, "getshared", NULL, 0, &_9$$9); + ZEPHIR_INIT_VAR(&_9$$8); + ZVAL_STRING(&_9$$8, "response"); + ZEPHIR_CALL_METHOD(&_8$$8, &container, "getshared", NULL, 0, &_9$$8); zephir_check_call_status(); - ZEPHIR_CPY_WRT(&response, &_8$$9); + ZEPHIR_CPY_WRT(&response, &_8$$8); ZEPHIR_CALL_METHOD(NULL, &response, "setcontent", NULL, 0, &possibleResponse); zephir_check_call_status(); RETURN_CCTOR(&response); } - _10$$7 = Z_TYPE_P(&possibleResponse) == IS_OBJECT; - if (_10$$7) { - _10$$7 = zephir_instance_of_ev(&possibleResponse, phalcon_http_responseinterface_ce); + _10$$6 = Z_TYPE_P(&possibleResponse) == IS_OBJECT; + if (_10$$6) { + _10$$6 = zephir_instance_of_ev(&possibleResponse, phalcon_http_responseinterface_ce); } - if (_10$$7) { + if (_10$$6) { ZEPHIR_CALL_METHOD(NULL, &possibleResponse, "sendheaders", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &possibleResponse, "sendcookies", NULL, 0); @@ -263,22 +264,22 @@ PHP_METHOD(Phalcon_Mvc_Application, handle) ZVAL_NULL(&moduleObject); if (zephir_is_true(&moduleName)) { if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_VAR(&_12$$13); - ZVAL_STRING(&_12$$13, "application:beforeStartModule"); - ZEPHIR_CALL_METHOD(&_11$$13, &eventsManager, "fire", NULL, 0, &_12$$13, this_ptr, &moduleName); + ZEPHIR_INIT_VAR(&_12$$12); + ZVAL_STRING(&_12$$12, "application:beforeStartModule"); + ZEPHIR_CALL_METHOD(&_11$$12, &eventsManager, "fire", NULL, 0, &_12$$12, this_ptr, &moduleName); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(&_11$$13)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(&_11$$12)) { RETURN_MM_BOOL(0); } } ZEPHIR_CALL_METHOD(&module, this_ptr, "getmodule", NULL, 0, &moduleName); zephir_check_call_status(); - _13$$12 = Z_TYPE_P(&module) != IS_ARRAY; - if (_13$$12) { - _13$$12 = Z_TYPE_P(&module) != IS_OBJECT; + _13$$11 = Z_TYPE_P(&module) != IS_ARRAY; + if (_13$$11) { + _13$$11 = Z_TYPE_P(&module) != IS_OBJECT; } - if (UNEXPECTED(_13$$12)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_application_exception_ce, "Invalid module definition", "phalcon/Mvc/Application.zep", 198); + if (UNEXPECTED(_13$$11)) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_application_exception_ce, "Invalid module definition", "phalcon/Mvc/Application.zep", 196); return; } if (Z_TYPE_P(&module) == IS_ARRAY) { @@ -290,13 +291,13 @@ PHP_METHOD(Phalcon_Mvc_Application, handle) ZEPHIR_OBS_VAR(&path); if (zephir_array_isset_string_fetch(&path, &module, SL("path"), 0)) { if (UNEXPECTED(!((zephir_file_exists(&path) == SUCCESS)))) { - ZEPHIR_INIT_VAR(&_14$$19); - object_init_ex(&_14$$19, phalcon_mvc_application_exception_ce); - ZEPHIR_INIT_VAR(&_15$$19); - ZEPHIR_CONCAT_SVS(&_15$$19, "Module definition path '", &path, "' doesn't exist"); - ZEPHIR_CALL_METHOD(NULL, &_14$$19, "__construct", NULL, 29, &_15$$19); + ZEPHIR_INIT_VAR(&_14$$18); + object_init_ex(&_14$$18, phalcon_mvc_application_exception_ce); + ZEPHIR_INIT_VAR(&_15$$18); + ZEPHIR_CONCAT_SVS(&_15$$18, "Module definition path '", &path, "' doesn't exist"); + ZEPHIR_CALL_METHOD(NULL, &_14$$18, "__construct", NULL, 29, &_15$$18); zephir_check_call_status(); - zephir_throw_exception_debug(&_14$$19, "phalcon/Mvc/Application.zep", 220); + zephir_throw_exception_debug(&_14$$18, "phalcon/Mvc/Application.zep", 218); ZEPHIR_MM_RESTORE(); return; } @@ -306,49 +307,49 @@ PHP_METHOD(Phalcon_Mvc_Application, handle) } } } - ZEPHIR_CALL_METHOD(&_16$$16, &container, "get", NULL, 0, &className); + ZEPHIR_CALL_METHOD(&_16$$15, &container, "get", NULL, 0, &className); zephir_check_call_status(); - ZEPHIR_CPY_WRT(&moduleObject, &_16$$16); + ZEPHIR_CPY_WRT(&moduleObject, &_16$$15); ZEPHIR_CALL_METHOD(NULL, &moduleObject, "registerautoloaders", NULL, 0, &container); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &moduleObject, "registerservices", NULL, 0, &container); zephir_check_call_status(); } else { if (UNEXPECTED(!((zephir_is_instance_of(&module, SL("Closure")))))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_application_exception_ce, "Invalid module definition", "phalcon/Mvc/Application.zep", 241); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_application_exception_ce, "Invalid module definition", "phalcon/Mvc/Application.zep", 239); return; } - ZEPHIR_INIT_VAR(&_17$$21); - zephir_create_array(&_17$$21, 1, 0); - zephir_array_fast_append(&_17$$21, &container); + ZEPHIR_INIT_VAR(&_17$$20); + zephir_create_array(&_17$$20, 1, 0); + zephir_array_fast_append(&_17$$20, &container); ZEPHIR_INIT_NVAR(&moduleObject); - ZEPHIR_CALL_USER_FUNC_ARRAY(&moduleObject, &module, &_17$$21); + ZEPHIR_CALL_USER_FUNC_ARRAY(&moduleObject, &module, &_17$$20); zephir_check_call_status(); } if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_VAR(&_18$$23); - ZVAL_STRING(&_18$$23, "application:afterStartModule"); - ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_18$$23, this_ptr, &moduleObject); + ZEPHIR_INIT_VAR(&_18$$22); + ZVAL_STRING(&_18$$22, "application:afterStartModule"); + ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_18$$22, this_ptr, &moduleObject); zephir_check_call_status(); } } zephir_read_property(&_0, this_ptr, ZEND_STRL("implicitView"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&implicitView, &_0); if (ZEPHIR_IS_TRUE_IDENTICAL(&implicitView)) { - ZEPHIR_INIT_VAR(&_20$$24); - ZVAL_STRING(&_20$$24, "view"); - ZEPHIR_CALL_METHOD(&_19$$24, &container, "getshared", NULL, 0, &_20$$24); + ZEPHIR_INIT_VAR(&_20$$23); + ZVAL_STRING(&_20$$23, "view"); + ZEPHIR_CALL_METHOD(&_19$$23, &container, "getshared", NULL, 0, &_20$$23); zephir_check_call_status(); - ZEPHIR_CPY_WRT(&view, &_19$$24); + ZEPHIR_CPY_WRT(&view, &_19$$23); } - ZEPHIR_INIT_NVAR(&_4); - ZVAL_STRING(&_4, "dispatcher"); - ZEPHIR_CALL_METHOD(&_3, &container, "getshared", NULL, 0, &_4); + ZEPHIR_INIT_NVAR(&_3); + ZVAL_STRING(&_3, "dispatcher"); + ZEPHIR_CALL_METHOD(&_4, &container, "getshared", NULL, 0, &_3); zephir_check_call_status(); - ZEPHIR_CPY_WRT(&dispatcher, &_3); - ZEPHIR_CALL_METHOD(&_3, &router, "getmodulename", NULL, 0); + ZEPHIR_CPY_WRT(&dispatcher, &_4); + ZEPHIR_CALL_METHOD(&_4, &router, "getmodulename", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &dispatcher, "setmodulename", NULL, 0, &_3); + ZEPHIR_CALL_METHOD(NULL, &dispatcher, "setmodulename", NULL, 0, &_4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_21, &router, "getnamespacename", NULL, 0); zephir_check_call_status(); @@ -371,11 +372,11 @@ PHP_METHOD(Phalcon_Mvc_Application, handle) zephir_check_call_status(); } if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_VAR(&_26$$26); - ZVAL_STRING(&_26$$26, "application:beforeHandleRequest"); - ZEPHIR_CALL_METHOD(&_25$$26, &eventsManager, "fire", NULL, 0, &_26$$26, this_ptr, &dispatcher); + ZEPHIR_INIT_VAR(&_26$$25); + ZVAL_STRING(&_26$$25, "application:beforeHandleRequest"); + ZEPHIR_CALL_METHOD(&_25$$25, &eventsManager, "fire", NULL, 0, &_26$$25, this_ptr, &dispatcher); zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(&_25$$26)) { + if (ZEPHIR_IS_FALSE_IDENTICAL(&_25$$25)) { RETURN_MM_BOOL(0); } } @@ -384,52 +385,52 @@ PHP_METHOD(Phalcon_Mvc_Application, handle) ZEPHIR_CALL_METHOD(&possibleResponse, &dispatcher, "getreturnedvalue", NULL, 0); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&possibleResponse)) { - ZEPHIR_INIT_VAR(&_28$$28); - ZVAL_STRING(&_28$$28, "response"); - ZEPHIR_CALL_METHOD(&_27$$28, &container, "getshared", NULL, 0, &_28$$28); + ZEPHIR_INIT_VAR(&_28$$27); + ZVAL_STRING(&_28$$27, "response"); + ZEPHIR_CALL_METHOD(&_27$$27, &container, "getshared", NULL, 0, &_28$$27); zephir_check_call_status(); - ZEPHIR_CPY_WRT(&response, &_27$$28); + ZEPHIR_CPY_WRT(&response, &_27$$27); } else { if (Z_TYPE_P(&possibleResponse) == IS_STRING) { - ZEPHIR_INIT_VAR(&_30$$30); - ZVAL_STRING(&_30$$30, "response"); - ZEPHIR_CALL_METHOD(&_29$$30, &container, "getshared", NULL, 0, &_30$$30); + ZEPHIR_INIT_VAR(&_30$$29); + ZVAL_STRING(&_30$$29, "response"); + ZEPHIR_CALL_METHOD(&_29$$29, &container, "getshared", NULL, 0, &_30$$29); zephir_check_call_status(); - ZEPHIR_CPY_WRT(&response, &_29$$30); + ZEPHIR_CPY_WRT(&response, &_29$$29); ZEPHIR_CALL_METHOD(NULL, &response, "setcontent", NULL, 0, &possibleResponse); zephir_check_call_status(); } else { - _31$$31 = (Z_TYPE_P(&possibleResponse) == IS_OBJECT); - if (_31$$31) { - _31$$31 = (zephir_instance_of_ev(&possibleResponse, phalcon_http_responseinterface_ce)); + _31$$30 = (Z_TYPE_P(&possibleResponse) == IS_OBJECT); + if (_31$$30) { + _31$$30 = (zephir_instance_of_ev(&possibleResponse, phalcon_http_responseinterface_ce)); } - returnedResponse = _31$$31; + returnedResponse = _31$$30; if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_VAR(&_32$$32); - ZVAL_STRING(&_32$$32, "application:afterHandleRequest"); - ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_32$$32, this_ptr, &controller); + ZEPHIR_INIT_VAR(&_32$$31); + ZVAL_STRING(&_32$$31, "application:afterHandleRequest"); + ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_32$$31, this_ptr, &controller); zephir_check_call_status(); } - _33$$31 = returnedResponse == 0; - if (_33$$31) { - _33$$31 = ZEPHIR_IS_TRUE_IDENTICAL(&implicitView); + _33$$30 = returnedResponse == 0; + if (_33$$30) { + _33$$30 = ZEPHIR_IS_TRUE_IDENTICAL(&implicitView); } - if (_33$$31) { + if (_33$$30) { if (Z_TYPE_P(&controller) == IS_OBJECT) { ZEPHIR_INIT_VAR(&renderStatus); ZVAL_BOOL(&renderStatus, 1); if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_VAR(&_34$$35); - ZVAL_STRING(&_34$$35, "application:viewRender"); - ZEPHIR_CALL_METHOD(&renderStatus, &eventsManager, "fire", NULL, 0, &_34$$35, this_ptr, &view); + ZEPHIR_INIT_VAR(&_34$$34); + ZVAL_STRING(&_34$$34, "application:viewRender"); + ZEPHIR_CALL_METHOD(&renderStatus, &eventsManager, "fire", NULL, 0, &_34$$34, this_ptr, &view); zephir_check_call_status(); } if (!ZEPHIR_IS_FALSE_IDENTICAL(&renderStatus)) { - ZEPHIR_CALL_METHOD(&_35$$36, &dispatcher, "getcontrollername", NULL, 0); + ZEPHIR_CALL_METHOD(&_35$$35, &dispatcher, "getcontrollername", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_36$$36, &dispatcher, "getactionname", NULL, 0); + ZEPHIR_CALL_METHOD(&_36$$35, &dispatcher, "getactionname", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &view, "render", NULL, 0, &_35$$36, &_36$$36); + ZEPHIR_CALL_METHOD(NULL, &view, "render", NULL, 0, &_35$$35, &_36$$35); zephir_check_call_status(); } } @@ -441,24 +442,24 @@ PHP_METHOD(Phalcon_Mvc_Application, handle) if (returnedResponse == 1) { ZEPHIR_CPY_WRT(&response, &possibleResponse); } else { - ZEPHIR_INIT_VAR(&_38$$39); - ZVAL_STRING(&_38$$39, "response"); - ZEPHIR_CALL_METHOD(&_37$$39, &container, "getshared", NULL, 0, &_38$$39); + ZEPHIR_INIT_VAR(&_38$$38); + ZVAL_STRING(&_38$$38, "response"); + ZEPHIR_CALL_METHOD(&_37$$38, &container, "getshared", NULL, 0, &_38$$38); zephir_check_call_status(); - ZEPHIR_CPY_WRT(&response, &_37$$39); + ZEPHIR_CPY_WRT(&response, &_37$$38); if (ZEPHIR_IS_TRUE_IDENTICAL(&implicitView)) { - ZEPHIR_CALL_METHOD(&_39$$40, &view, "getcontent", NULL, 0); + ZEPHIR_CALL_METHOD(&_39$$39, &view, "getcontent", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &response, "setcontent", NULL, 0, &_39$$40); + ZEPHIR_CALL_METHOD(NULL, &response, "setcontent", NULL, 0, &_39$$39); zephir_check_call_status(); } } } } if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_VAR(&_40$$41); - ZVAL_STRING(&_40$$41, "application:beforeSendResponse"); - ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_40$$41, this_ptr, &response); + ZEPHIR_INIT_VAR(&_40$$40); + ZVAL_STRING(&_40$$40, "application:beforeSendResponse"); + ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_40$$40, this_ptr, &response); zephir_check_call_status(); } zephir_read_property(&_0, this_ptr, ZEND_STRL("sendHeaders"), PH_NOISY_CC | PH_READONLY); diff --git a/ext/phalcon/mvc/micro/collection.zep.c b/ext/phalcon/mvc/micro/collection.zep.c index c9fd4c4b713..a938b2e0f67 100644 --- a/ext/phalcon/mvc/micro/collection.zep.c +++ b/ext/phalcon/mvc/micro/collection.zep.c @@ -775,7 +775,7 @@ PHP_METHOD(Phalcon_Mvc_Micro_Collection, setPrefix) * @param string|array method * @param string routePattern * @param callable handler - * @param string name + * @param string|null name */ PHP_METHOD(Phalcon_Mvc_Micro_Collection, addMap) { @@ -792,17 +792,18 @@ PHP_METHOD(Phalcon_Mvc_Micro_Collection, addMap) ZVAL_UNDEF(&_0); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(4, 4) + ZEND_PARSE_PARAMETERS_START(3, 4) Z_PARAM_ZVAL(method) Z_PARAM_STR(routePattern) Z_PARAM_ZVAL(handler) - Z_PARAM_STR(name) + Z_PARAM_OPTIONAL + Z_PARAM_STR_OR_NULL(name) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 4, 0, &method, &routePattern_param, &handler, &name_param); + zephir_fetch_params(1, 3, 1, &method, &routePattern_param, &handler, &name_param); if (UNEXPECTED(Z_TYPE_P(routePattern_param) != IS_STRING && Z_TYPE_P(routePattern_param) != IS_NULL)) { zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'routePattern' must be of the type string")); RETURN_MM_NULL(); @@ -812,7 +813,11 @@ PHP_METHOD(Phalcon_Mvc_Micro_Collection, addMap) } else { ZEPHIR_INIT_VAR(&routePattern); } - zephir_get_strval(&name, name_param); + if (!name_param) { + ZEPHIR_INIT_VAR(&name); + } else { + zephir_get_strval(&name, name_param); + } ZEPHIR_INIT_VAR(&_0); diff --git a/ext/phalcon/mvc/micro/collection.zep.h b/ext/phalcon/mvc/micro/collection.zep.h index 6a3fe7d933b..04eda9a7d75 100644 --- a/ext/phalcon/mvc/micro/collection.zep.h +++ b/ext/phalcon/mvc/micro/collection.zep.h @@ -102,12 +102,12 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_micro_collection_setp ZEND_ARG_TYPE_INFO(0, prefix, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_collection_addmap, 0, 4, IS_VOID, 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_micro_collection_addmap, 0, 3, IS_VOID, 0) ZEND_ARG_INFO(0, method) ZEND_ARG_TYPE_INFO(0, routePattern, IS_STRING, 0) ZEND_ARG_INFO(0, handler) - ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_micro_collection_zephir_init_properties_phalcon_mvc_micro_collection, 0, 0, 0) diff --git a/ext/phalcon/mvc/router.zep.c b/ext/phalcon/mvc/router.zep.c index 6d76279a395..40e1751540e 100644 --- a/ext/phalcon/mvc/router.zep.c +++ b/ext/phalcon/mvc/router.zep.c @@ -64,29 +64,29 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Router) ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Mvc, Router, phalcon, mvc_router, phalcon_di_abstractinjectionaware_ce, phalcon_mvc_router_method_entry, 0); /** - * @var string|null + * @var string */ - zend_declare_property_null(phalcon_mvc_router_ce, SL("action"), ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_mvc_router_ce, SL("action"), "", ZEND_ACC_PROTECTED); /** - * @var string|null + * @var string */ - zend_declare_property_null(phalcon_mvc_router_ce, SL("controller"), ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_mvc_router_ce, SL("controller"), "", ZEND_ACC_PROTECTED); /** - * @var string|null + * @var string */ - zend_declare_property_null(phalcon_mvc_router_ce, SL("defaultAction"), ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_mvc_router_ce, SL("defaultAction"), "", ZEND_ACC_PROTECTED); /** - * @var string|null + * @var string */ - zend_declare_property_null(phalcon_mvc_router_ce, SL("defaultController"), ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_mvc_router_ce, SL("defaultController"), "", ZEND_ACC_PROTECTED); /** * @var string */ zend_declare_property_string(phalcon_mvc_router_ce, SL("defaultModule"), "", ZEND_ACC_PROTECTED); /** - * @var string|null + * @var string */ - zend_declare_property_null(phalcon_mvc_router_ce, SL("defaultNamespace"), ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_mvc_router_ce, SL("defaultNamespace"), "", ZEND_ACC_PROTECTED); /** * @var array */ @@ -112,13 +112,13 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Router) */ zend_declare_property_null(phalcon_mvc_router_ce, SL("matches"), ZEND_ACC_PROTECTED); /** - * @var string|null + * @var string */ - zend_declare_property_null(phalcon_mvc_router_ce, SL("module"), ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_mvc_router_ce, SL("module"), "", ZEND_ACC_PROTECTED); /** - * @var string|null + * @var string */ - zend_declare_property_null(phalcon_mvc_router_ce, SL("namespaceName"), ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_mvc_router_ce, SL("namespaceName"), "", ZEND_ACC_PROTECTED); /** * @var array|string|null */ @@ -2704,6 +2704,7 @@ PHP_METHOD(Phalcon_Mvc_Router, setDefaultNamespace) */ PHP_METHOD(Phalcon_Mvc_Router, setDefaults) { + zval _0$$3; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zval *defaults_param = NULL, namespaceName, module, controller, action, params; zval defaults; @@ -2715,6 +2716,7 @@ PHP_METHOD(Phalcon_Mvc_Router, setDefaults) ZVAL_UNDEF(&controller); ZVAL_UNDEF(&action); ZVAL_UNDEF(¶ms); + ZVAL_UNDEF(&_0$$3); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -2729,7 +2731,8 @@ PHP_METHOD(Phalcon_Mvc_Router, setDefaults) if (zephir_array_isset_string_fetch(&namespaceName, &defaults, SL("namespace"), 1)) { - zephir_update_property_zval(this_ptr, ZEND_STRL("defaultNamespace"), &namespaceName); + zephir_cast_to_string(&_0$$3, &namespaceName); + zephir_update_property_zval(this_ptr, ZEND_STRL("defaultNamespace"), &_0$$3); } if (zephir_array_isset_string_fetch(&module, &defaults, SL("module"), 1)) { zephir_update_property_zval(this_ptr, ZEND_STRL("defaultModule"), &module); diff --git a/ext/phalcon/storage/serializer/base64.zep.c b/ext/phalcon/storage/serializer/base64.zep.c index dacd10156b7..d7a91bfe0eb 100644 --- a/ext/phalcon/storage/serializer/base64.zep.c +++ b/ext/phalcon/storage/serializer/base64.zep.c @@ -68,7 +68,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Base64, serialize) /** * Unserializes data * - * @param string $data + * @param mixed $data * * @retrun void */ @@ -76,34 +76,36 @@ PHP_METHOD(Phalcon_Storage_Serializer_Base64, unserialize) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *data_param = NULL, __$true, __$false, result, _0; - zval data; + zval data_sub, __$true, __$false, result, _0, _1; + zval *data; zval *this_ptr = getThis(); - ZVAL_UNDEF(&data); + ZVAL_UNDEF(&data_sub); ZVAL_BOOL(&__$true, 1); ZVAL_BOOL(&__$false, 0); ZVAL_UNDEF(&result); ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_STR(data) + Z_PARAM_ZVAL(data) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &data_param); - zephir_get_strval(&data, data_param); + zephir_fetch_params(1, 1, 0, &data); - if (1 != 1) { + ZEPHIR_INIT_VAR(&_0); + zephir_gettype(&_0, data); + if (!ZEPHIR_IS_STRING_IDENTICAL(&_0, "string")) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Data for the unserializer must of type string", "phalcon/Storage/Serializer/Base64.zep", 47); return; } - ZVAL_BOOL(&_0, 1); - ZEPHIR_CALL_METHOD(&result, this_ptr, "phpbase64decode", NULL, 0, &data, &_0); + ZVAL_BOOL(&_1, 1); + ZEPHIR_CALL_METHOD(&result, this_ptr, "phpbase64decode", NULL, 0, data, &_1); zephir_check_call_status(); if (UNEXPECTED(ZEPHIR_IS_FALSE_IDENTICAL(&result))) { if (0) { diff --git a/ext/phalcon/storage/serializer/igbinary.zep.c b/ext/phalcon/storage/serializer/igbinary.zep.c index 10bf83e9910..abfab6b9074 100644 --- a/ext/phalcon/storage/serializer/igbinary.zep.c +++ b/ext/phalcon/storage/serializer/igbinary.zep.c @@ -79,7 +79,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, serialize) /** * Unserializes data * - * @param string $data + * @param mixed $data * * @return void */ @@ -88,11 +88,11 @@ PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, unserialize) zend_bool _8$$4; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *data_param = NULL, __$false, __$true, result, version, _0, _1$$4, _2$$4, _3$$4, _4$$5, _5$$5, _6$$6, _7$$6; - zval data; + zval data_sub, __$false, __$true, result, version, _0, _1$$4, _2$$4, _3$$4, _4$$5, _5$$5, _6$$6, _7$$6; + zval *data; zval *this_ptr = getThis(); - ZVAL_UNDEF(&data); + ZVAL_UNDEF(&data_sub); ZVAL_BOOL(&__$false, 0); ZVAL_BOOL(&__$true, 1); ZVAL_UNDEF(&result); @@ -108,20 +108,19 @@ PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, unserialize) #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_STR(data) + Z_PARAM_ZVAL(data) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &data_param); - zephir_get_strval(&data, data_param); + zephir_fetch_params(1, 1, 0, &data); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "isserializable", NULL, 0, &data); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "isserializable", NULL, 0, data); zephir_check_call_status(); if (!ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { - zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &data); + zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data); } else { ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 127); zephir_check_call_status(); @@ -147,7 +146,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, unserialize) ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 129, &_6$$6, &_7$$6); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&result, this_ptr, "dounserialize", NULL, 0, &data); + ZEPHIR_CALL_METHOD(&result, this_ptr, "dounserialize", NULL, 0, data); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 130); zephir_check_call_status(); diff --git a/ext/phalcon/storage/serializer/json.zep.c b/ext/phalcon/storage/serializer/json.zep.c index 6bc311e9e84..e5ca535eed8 100644 --- a/ext/phalcon/storage/serializer/json.zep.c +++ b/ext/phalcon/storage/serializer/json.zep.c @@ -96,7 +96,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Json, serialize) /** * Unserializes data * - * @param string $data + * @param mixed $data * * @return void */ @@ -104,32 +104,31 @@ PHP_METHOD(Phalcon_Storage_Serializer_Json, unserialize) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *data_param = NULL, _0, _1$$4; - zval data; + zval data_sub, _0, _1$$4; + zval *data; zval *this_ptr = getThis(); - ZVAL_UNDEF(&data); + ZVAL_UNDEF(&data_sub); ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1$$4); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_STR(data) + Z_PARAM_ZVAL(data) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &data_param); - zephir_get_strval(&data, data_param); + zephir_fetch_params(1, 1, 0, &data); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "isserializable", NULL, 0, &data); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "isserializable", NULL, 0, data); zephir_check_call_status(); if (!ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { - zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &data); + zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data); } else { - ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "getdecode", NULL, 0, &data); + ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "getdecode", NULL, 0, data); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &_1$$4); } diff --git a/ext/phalcon/storage/serializer/none.zep.c b/ext/phalcon/storage/serializer/none.zep.c index 09d7b31f81e..9c7c5160f26 100644 --- a/ext/phalcon/storage/serializer/none.zep.c +++ b/ext/phalcon/storage/serializer/none.zep.c @@ -13,7 +13,6 @@ #include "kernel/main.h" #include "kernel/object.h" -#include "kernel/operators.h" #include "kernel/memory.h" @@ -35,7 +34,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Storage_Serializer_None) /** * Serializes data * - * @return string + * @return mixed */ PHP_METHOD(Phalcon_Storage_Serializer_None, serialize) { @@ -49,32 +48,28 @@ PHP_METHOD(Phalcon_Storage_Serializer_None, serialize) /** * Unserializes data * - * @param string $data + * @param mixed $data * * @retrun void */ PHP_METHOD(Phalcon_Storage_Serializer_None, unserialize) { - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval *data_param = NULL; - zval data; + zval data_sub; + zval *data; zval *this_ptr = getThis(); - ZVAL_UNDEF(&data); + ZVAL_UNDEF(&data_sub); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_STR(data) + Z_PARAM_ZVAL(data) ZEND_PARSE_PARAMETERS_END(); #endif - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &data_param); - zephir_get_strval(&data, data_param); + zephir_fetch_params_without_memory_grow(1, 0, &data); - zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &data); - ZEPHIR_MM_RESTORE(); + zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data); } diff --git a/ext/phalcon/storage/serializer/none.zep.h b/ext/phalcon/storage/serializer/none.zep.h index 346fa5e9ee8..8104c8a302c 100644 --- a/ext/phalcon/storage/serializer/none.zep.h +++ b/ext/phalcon/storage/serializer/none.zep.h @@ -6,7 +6,11 @@ ZEPHIR_INIT_CLASS(Phalcon_Storage_Serializer_None); PHP_METHOD(Phalcon_Storage_Serializer_None, serialize); PHP_METHOD(Phalcon_Storage_Serializer_None, unserialize); -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_none_serialize, 0, 0, IS_STRING, 1) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_none_serialize, 0, 0, IS_MIXED, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_none_serialize, 0, 0, IS_NULL, 0) +#endif ZEND_END_ARG_INFO() #if PHP_VERSION_ID >= 80000 diff --git a/ext/phalcon/storage/serializer/php.zep.c b/ext/phalcon/storage/serializer/php.zep.c index e1d200ce604..1bc9425ed18 100644 --- a/ext/phalcon/storage/serializer/php.zep.c +++ b/ext/phalcon/storage/serializer/php.zep.c @@ -16,8 +16,6 @@ #include "kernel/fcall.h" #include "kernel/object.h" #include "kernel/operators.h" -#include "kernel/exception.h" -#include "ext/spl/spl_exceptions.h" /** @@ -69,95 +67,90 @@ PHP_METHOD(Phalcon_Storage_Serializer_Php, serialize) /** * Unserializes data * - * @param string $data + * @param mixed $data */ PHP_METHOD(Phalcon_Storage_Serializer_Php, unserialize) { - zend_bool _8$$4; + zend_bool _8; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *data_param = NULL, __$false, __$true, result, version, _0, _1$$4, _2$$4, _3$$4, _4$$6, _5$$6, _6$$7, _7$$7; - zval data; + zval data_sub, __$false, __$true, result, version, _0, _1, _2, _3, _4$$4, _5$$4, _6$$5, _7$$5; + zval *data; zval *this_ptr = getThis(); - ZVAL_UNDEF(&data); + ZVAL_UNDEF(&data_sub); ZVAL_BOOL(&__$false, 0); ZVAL_BOOL(&__$true, 1); ZVAL_UNDEF(&result); ZVAL_UNDEF(&version); ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1$$4); - ZVAL_UNDEF(&_2$$4); - ZVAL_UNDEF(&_3$$4); - ZVAL_UNDEF(&_4$$6); - ZVAL_UNDEF(&_5$$6); - ZVAL_UNDEF(&_6$$7); - ZVAL_UNDEF(&_7$$7); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_3); + ZVAL_UNDEF(&_4$$4); + ZVAL_UNDEF(&_5$$4); + ZVAL_UNDEF(&_6$$5); + ZVAL_UNDEF(&_7$$5); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_STR(data) + Z_PARAM_ZVAL(data) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &data_param); - zephir_get_strval(&data, data_param); + zephir_fetch_params(1, 1, 0, &data); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "isserializable", NULL, 0, &data); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "isserializable", NULL, 0, data); zephir_check_call_status(); if (!ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { - zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &data); - } else { - if (1 != 1) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Data for the unserializer must of type string", "phalcon/Storage/Serializer/Php.zep", 46); - return; - } - ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 127); + zephir_update_property_zval(this_ptr, ZEND_STRL("data"), data); + RETURN_MM_NULL(); + } + ZEPHIR_CALL_FUNCTION(&version, "phpversion", NULL, 127); + zephir_check_call_status(); + ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$false); + ZEPHIR_INIT_VAR(&_1); + ZVAL_STRING(&_1, "8.0"); + ZEPHIR_INIT_VAR(&_2); + ZVAL_STRING(&_2, ">="); + ZEPHIR_CALL_FUNCTION(&_3, "version_compare", NULL, 128, &version, &_1, &_2); + zephir_check_call_status(); + if (zephir_is_true(&_3)) { + ZEPHIR_INIT_VAR(&_4$$4); + ZEPHIR_INIT_NVAR(&_4$$4); + zephir_create_closure_ex(&_4$$4, NULL, phalcon_11__closure_ce, SL("__invoke")); + ZVAL_LONG(&_5$$4, 8); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 129, &_4$$4, &_5$$4); zephir_check_call_status(); - ZEPHIR_GLOBAL(warning).enable = zend_is_true(&__$false); - ZEPHIR_INIT_VAR(&_1$$4); - ZVAL_STRING(&_1$$4, "8.0"); - ZEPHIR_INIT_VAR(&_2$$4); - ZVAL_STRING(&_2$$4, ">="); - ZEPHIR_CALL_FUNCTION(&_3$$4, "version_compare", NULL, 128, &version, &_1$$4, &_2$$4); + } else { + ZEPHIR_INIT_VAR(&_6$$5); + ZEPHIR_INIT_NVAR(&_6$$5); + zephir_create_closure_ex(&_6$$5, NULL, phalcon_12__closure_ce, SL("__invoke")); + ZVAL_LONG(&_7$$5, 8); + ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 129, &_6$$5, &_7$$5); zephir_check_call_status(); - if (zephir_is_true(&_3$$4)) { - ZEPHIR_INIT_VAR(&_4$$6); - ZEPHIR_INIT_NVAR(&_4$$6); - zephir_create_closure_ex(&_4$$6, NULL, phalcon_11__closure_ce, SL("__invoke")); - ZVAL_LONG(&_5$$6, 8); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 129, &_4$$6, &_5$$6); - zephir_check_call_status(); + } + ZEPHIR_CALL_METHOD(&result, this_ptr, "phpunserialize", NULL, 0, data); + zephir_check_call_status(); + ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 130); + zephir_check_call_status(); + _8 = ZEPHIR_GLOBAL(warning).enable; + if (!(_8)) { + _8 = ZEPHIR_IS_FALSE_IDENTICAL(&result); + } + if (UNEXPECTED(_8)) { + if (0) { + zephir_update_property_zval(this_ptr, ZEND_STRL("isSuccess"), &__$true); } else { - ZEPHIR_INIT_VAR(&_6$$7); - ZEPHIR_INIT_NVAR(&_6$$7); - zephir_create_closure_ex(&_6$$7, NULL, phalcon_12__closure_ce, SL("__invoke")); - ZVAL_LONG(&_7$$7, 8); - ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 129, &_6$$7, &_7$$7); - zephir_check_call_status(); - } - ZEPHIR_CALL_METHOD(&result, this_ptr, "phpunserialize", NULL, 0, &data); - zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 130); - zephir_check_call_status(); - _8$$4 = ZEPHIR_GLOBAL(warning).enable; - if (!(_8$$4)) { - _8$$4 = ZEPHIR_IS_FALSE_IDENTICAL(&result); - } - if (UNEXPECTED(_8$$4)) { - if (0) { - zephir_update_property_zval(this_ptr, ZEND_STRL("isSuccess"), &__$true); - } else { - zephir_update_property_zval(this_ptr, ZEND_STRL("isSuccess"), &__$false); - } - ZEPHIR_INIT_NVAR(&result); - ZVAL_STRING(&result, ""); + zephir_update_property_zval(this_ptr, ZEND_STRL("isSuccess"), &__$false); } - zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &result); + ZEPHIR_INIT_NVAR(&result); + ZVAL_STRING(&result, ""); } + zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &result); ZEPHIR_MM_RESTORE(); } @@ -165,7 +158,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Php, unserialize) * @param string $data * @param array $options * - * @return mixed|false + * @return mixed */ PHP_METHOD(Phalcon_Storage_Serializer_Php, phpUnserialize) { diff --git a/ext/phalcon/storage/serializer/php.zep.h b/ext/phalcon/storage/serializer/php.zep.h index 1aadb57bebb..ce6bc2f91f0 100644 --- a/ext/phalcon/storage/serializer/php.zep.h +++ b/ext/phalcon/storage/serializer/php.zep.h @@ -20,7 +20,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_php_u ZEND_END_ARG_INFO() #endif -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_storage_serializer_php_phpunserialize, 0, 0, 1) +#if PHP_VERSION_ID >= 80000 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_php_phpunserialize, 0, 1, IS_MIXED, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_storage_serializer_php_phpunserialize, 0, 1, IS_NULL, 0) +#endif ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0) #if PHP_VERSION_ID >= 80000 ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "[]")