From 1562a40e99976cc26e2912533b5802220f204df6 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Thu, 14 Mar 2024 09:09:05 -0500 Subject: [PATCH 1/3] bumping to 5.6.2 --- .github/workflows/main.yml | 2 +- config.json | 2 +- package.xml | 17 +++++------------ phalcon/Support/Version.zep | 2 +- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 341a09bd84..ca831306cd 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.1 + PHALCON_VERSION: 5.6.2 ZEPHIR_PARSER_VERSION: 1.6.0 # For tests diff --git a/config.json b/config.json index d8bc1b075c..2e9d8db044 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.1", + "version": "5.6.2", "verbose": false, "stubs": { "path": "ide\/%version%\/%namespace%\/", diff --git a/package.xml b/package.xml index be1d63e946..b774a39590 100644 --- a/package.xml +++ b/package.xml @@ -22,11 +22,11 @@ nikos@phalcon.io yes - 2024-02-08 + 2024-03-14 - 5.6.1 - 5.6.1 + 5.6.2 + 5.6.2 stable @@ -38,15 +38,8 @@ ### 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) - - ### 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) + - Changed `Phalcon\Mvc\View\Engine\Volt\Compiler::filter` to use the helper with `upper` and `lower` for UTF-8 characters [#16543](https://github.com/phalcon/cphalcon/issues/16543) + - Changed `Phalcon\Di\AbstractInjectionAware` to extend `stdClass` for PHP 8.2 deprecation warnings [#16543](https://github.com/phalcon/cphalcon/issues/16543) diff --git a/phalcon/Support/Version.zep b/phalcon/Support/Version.zep index b7f1a0f85c..bda665f28f 100644 --- a/phalcon/Support/Version.zep +++ b/phalcon/Support/Version.zep @@ -77,7 +77,7 @@ class Version */ protected function getVersion() -> array { - return [5, 6, 1, 4, 0]; + return [5, 6, 2, 4, 0]; } /** From 5fab14d4dea1f16ab715f621cdf08e0e1b7ad2ce Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Thu, 14 Mar 2024 09:09:21 -0500 Subject: [PATCH 2/3] refreshing ext --- ext/phalcon/db/adapter/pdo/postgresql.zep.c | 4 +- ext/phalcon/di/abstractinjectionaware.zep.c | 2 +- .../mvc/view/engine/volt/compiler.zep.c | 131 ++++++++++++------ ext/phalcon/support/helperfactory.zep.c | 3 + ext/phalcon/support/version.zep.c | 2 +- ext/php_phalcon.h | 2 +- 6 files changed, 93 insertions(+), 51 deletions(-) diff --git a/ext/phalcon/db/adapter/pdo/postgresql.zep.c b/ext/phalcon/db/adapter/pdo/postgresql.zep.c index 3b1bb32e3b..c2130b76a2 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/di/abstractinjectionaware.zep.c b/ext/phalcon/di/abstractinjectionaware.zep.c index 32833eff69..1e7240a785 100644 --- a/ext/phalcon/di/abstractinjectionaware.zep.c +++ b/ext/phalcon/di/abstractinjectionaware.zep.c @@ -29,7 +29,7 @@ */ ZEPHIR_INIT_CLASS(Phalcon_Di_AbstractInjectionAware) { - ZEPHIR_REGISTER_CLASS(Phalcon\\Di, AbstractInjectionAware, phalcon, di_abstractinjectionaware, phalcon_di_abstractinjectionaware_method_entry, ZEND_ACC_EXPLICIT_ABSTRACT_CLASS); + ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Di, AbstractInjectionAware, phalcon, di_abstractinjectionaware, zend_standard_class_def, phalcon_di_abstractinjectionaware_method_entry, ZEND_ACC_EXPLICIT_ABSTRACT_CLASS); /** * Dependency Injector diff --git a/ext/phalcon/mvc/view/engine/volt/compiler.zep.c b/ext/phalcon/mvc/view/engine/volt/compiler.zep.c index e1bf1ac70b..7f98fc664c 100644 --- a/ext/phalcon/mvc/view/engine/volt/compiler.zep.c +++ b/ext/phalcon/mvc/view/engine/volt/compiler.zep.c @@ -3781,10 +3781,11 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, getFinalPath) */ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) { + zend_bool _21$$30, _26$$41; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zval left; - zval *filter_param = NULL, *left_param = NULL, code, type, functionName, name, file, line, extensions, filters, funcArguments, arguments, definition, _6, _20, _21, _22, _23, _0$$5, _1$$5, _2$$5, _3$$5, _8$$9, _10$$11, _11$$11, _12$$11, _13$$11, _14$$24, _15$$24, _16$$24, _17$$24, _18$$24, _19$$24; + zval *filter_param = NULL, *left_param = NULL, code, type, functionName, name, file, line, extensions, filters, funcArguments, arguments, definition, _6, _30, _31, _32, _33, _0$$5, _1$$5, _2$$5, _3$$5, _8$$9, _10$$11, _11$$11, _12$$11, _13$$11, _14$$24, _15$$24, _16$$24, _17$$24, _18$$24, _19$$24, _20$$30, _22$$30, _23$$30, _24$$30, _25$$41, _27$$41, _28$$41, _29$$41; zval filter, _4$$7, _5$$7, _7$$9, _9$$14; zval *this_ptr = getThis(); @@ -3805,10 +3806,10 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) ZVAL_UNDEF(&arguments); ZVAL_UNDEF(&definition); ZVAL_UNDEF(&_6); - ZVAL_UNDEF(&_20); - ZVAL_UNDEF(&_21); - ZVAL_UNDEF(&_22); - ZVAL_UNDEF(&_23); + ZVAL_UNDEF(&_30); + ZVAL_UNDEF(&_31); + ZVAL_UNDEF(&_32); + ZVAL_UNDEF(&_33); ZVAL_UNDEF(&_0$$5); ZVAL_UNDEF(&_1$$5); ZVAL_UNDEF(&_2$$5); @@ -3824,6 +3825,14 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) ZVAL_UNDEF(&_17$$24); ZVAL_UNDEF(&_18$$24); ZVAL_UNDEF(&_19$$24); + ZVAL_UNDEF(&_20$$30); + ZVAL_UNDEF(&_22$$30); + ZVAL_UNDEF(&_23$$30); + ZVAL_UNDEF(&_24$$30); + ZVAL_UNDEF(&_25$$41); + ZVAL_UNDEF(&_27$$41); + ZVAL_UNDEF(&_28$$41); + ZVAL_UNDEF(&_29$$41); ZVAL_UNDEF(&left); ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_ARRAY(filter) @@ -4007,8 +4016,23 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) RETURN_MM(); } if (ZEPHIR_IS_STRING(&name, "lower") || ZEPHIR_IS_STRING(&name, "lowercase")) { - ZEPHIR_CONCAT_SVS(return_value, "strtolower(", &arguments, ")"); - RETURN_MM(); + zephir_read_property(&_20$$30, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); + _21$$30 = Z_TYPE_P(&_20$$30) != IS_NULL; + if (_21$$30) { + zephir_read_property(&_22$$30, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_INIT_VAR(&_24$$30); + ZVAL_STRING(&_24$$30, "helper"); + ZEPHIR_CALL_METHOD(&_23$$30, &_22$$30, "has", NULL, 0, &_24$$30); + zephir_check_call_status(); + _21$$30 = ZEPHIR_IS_TRUE_IDENTICAL(&_23$$30); + } + if (_21$$30) { + ZEPHIR_CONCAT_SVS(return_value, "$this->helper->lower(", &arguments, ")"); + RETURN_MM(); + } else { + ZEPHIR_CONCAT_SVS(return_value, "strtolower(", &arguments, ")"); + RETURN_MM(); + } } if (ZEPHIR_IS_STRING(&name, "right_trim")) { ZEPHIR_CONCAT_SVS(return_value, "rtrim(", &arguments, ")"); @@ -4043,8 +4067,23 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) RETURN_MM(); } if (ZEPHIR_IS_STRING(&name, "upper") || ZEPHIR_IS_STRING(&name, "uppercase")) { - ZEPHIR_CONCAT_SVS(return_value, "strtoupper(", &arguments, ")"); - RETURN_MM(); + zephir_read_property(&_25$$41, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); + _26$$41 = Z_TYPE_P(&_25$$41) != IS_NULL; + if (_26$$41) { + zephir_read_property(&_27$$41, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_INIT_VAR(&_29$$41); + ZVAL_STRING(&_29$$41, "helper"); + ZEPHIR_CALL_METHOD(&_28$$41, &_27$$41, "has", NULL, 0, &_29$$41); + zephir_check_call_status(); + _26$$41 = ZEPHIR_IS_TRUE_IDENTICAL(&_28$$41); + } + if (_26$$41) { + ZEPHIR_CONCAT_SVS(return_value, "$this->helper->upper(", &arguments, ")"); + RETURN_MM(); + } else { + ZEPHIR_CONCAT_SVS(return_value, "strtoupper(", &arguments, ")"); + RETURN_MM(); + } } if (ZEPHIR_IS_STRING(&name, "url_encode")) { ZEPHIR_CONCAT_SVS(return_value, "urlencode(", &arguments, ")"); @@ -4052,15 +4091,15 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) } } while(0); - ZEPHIR_INIT_VAR(&_20); - object_init_ex(&_20, phalcon_mvc_view_engine_volt_exception_ce); - zephir_array_fetch_string(&_21, &filter, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2579); - zephir_array_fetch_string(&_22, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2580); - ZEPHIR_INIT_VAR(&_23); - ZEPHIR_CONCAT_SVSVSV(&_23, "Unknown filter \"", &name, "\" in ", &_21, " on line ", &_22); - ZEPHIR_CALL_METHOD(NULL, &_20, "__construct", NULL, 504, &_23); + ZEPHIR_INIT_VAR(&_30); + object_init_ex(&_30, phalcon_mvc_view_engine_volt_exception_ce); + zephir_array_fetch_string(&_31, &filter, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2587); + zephir_array_fetch_string(&_32, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2588); + ZEPHIR_INIT_VAR(&_33); + ZEPHIR_CONCAT_SVSVSV(&_33, "Unknown filter \"", &name, "\" in ", &_31, " on line ", &_32); + ZEPHIR_CALL_METHOD(NULL, &_30, "__construct", NULL, 504, &_33); zephir_check_call_status(); - zephir_throw_exception_debug(&_20, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2580); + zephir_throw_exception_debug(&_30, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2588); ZEPHIR_MM_RESTORE(); return; } @@ -4205,26 +4244,26 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) ZVAL_NULL(&compilation); zephir_read_property(&_0, this_ptr, ZEND_STRL("extensions"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&extensions, &_0); - zephir_is_iterable(&statements, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2866); + zephir_is_iterable(&statements, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2874); if (Z_TYPE_P(&statements) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&statements), _2) { ZEPHIR_INIT_NVAR(&statement); ZVAL_COPY(&statement, _2); if (UNEXPECTED(Z_TYPE_P(&statement) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2620); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2628); return; } if (UNEXPECTED(!(zephir_array_isset_string(&statement, SL("type"))))) { ZEPHIR_INIT_NVAR(&_4$$7); object_init_ex(&_4$$7, phalcon_mvc_view_engine_volt_exception_ce); - zephir_array_fetch_string(&_5$$7, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2628); - zephir_array_fetch_string(&_6$$7, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2628); + zephir_array_fetch_string(&_5$$7, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2636); + zephir_array_fetch_string(&_6$$7, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2636); ZEPHIR_INIT_NVAR(&_7$$7); ZEPHIR_CONCAT_SVSV(&_7$$7, "Invalid statement in ", &_5$$7, " on line ", &_6$$7); ZEPHIR_CALL_METHOD(NULL, &_4$$7, "__construct", &_8, 504, &_7$$7, &statement); zephir_check_call_status(); - zephir_throw_exception_debug(&_4$$7, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2630); + zephir_throw_exception_debug(&_4$$7, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2638); ZEPHIR_MM_RESTORE(); return; } @@ -4242,10 +4281,10 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) } } ZEPHIR_OBS_NVAR(&type); - zephir_array_fetch_string(&type, &statement, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2656); + zephir_array_fetch_string(&type, &statement, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2664); do { if (ZEPHIR_IS_LONG(&type, 357)) { - zephir_array_fetch_string(&_12$$10, &statement, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2664); + zephir_array_fetch_string(&_12$$10, &statement, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2672); zephir_concat_self(&compilation, &_12$$10); break; } @@ -4315,7 +4354,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) } if (ZEPHIR_IS_LONG(&type, 307)) { ZEPHIR_OBS_NVAR(&blockName); - zephir_array_fetch_string(&blockName, &statement, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2711); + zephir_array_fetch_string(&blockName, &statement, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2719); ZEPHIR_OBS_NVAR(&blockStatements); zephir_array_isset_string_fetch(&blockStatements, &statement, SL("block_statements"), 0); zephir_read_property(&_32$$19, this_ptr, ZEND_STRL("blocks"), PH_NOISY_CC | PH_READONLY); @@ -4326,7 +4365,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) array_init(&blocks); } if (Z_TYPE_P(&compilation) != IS_NULL) { - zephir_array_append(&blocks, &compilation, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2726); + zephir_array_append(&blocks, &compilation, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2734); ZEPHIR_INIT_NVAR(&compilation); ZVAL_NULL(&compilation); } @@ -4348,8 +4387,8 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) } if (ZEPHIR_IS_LONG(&type, 310)) { ZEPHIR_OBS_NVAR(&path); - zephir_array_fetch_string(&path, &statement, SL("path"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2751); - zephir_array_fetch_string(&_36$$25, &path, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2755); + zephir_array_fetch_string(&path, &statement, SL("path"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2759); + zephir_array_fetch_string(&_36$$25, &path, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2763); ZEPHIR_CALL_METHOD(&finalPath, this_ptr, "getfinalpath", &_37, 0, &_36$$25); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&extended); @@ -4445,13 +4484,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) } ZEPHIR_INIT_NVAR(&_56$$37); object_init_ex(&_56$$37, phalcon_mvc_view_engine_volt_exception_ce); - zephir_array_fetch_string(&_57$$37, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2857); - zephir_array_fetch_string(&_58$$37, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2858); + zephir_array_fetch_string(&_57$$37, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2865); + zephir_array_fetch_string(&_58$$37, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2866); ZEPHIR_INIT_NVAR(&_59$$37); ZEPHIR_CONCAT_SVSVSV(&_59$$37, "Unknown statement ", &type, " in ", &_57$$37, " on line ", &_58$$37); ZEPHIR_CALL_METHOD(NULL, &_56$$37, "__construct", &_8, 504, &_59$$37); zephir_check_call_status(); - zephir_throw_exception_debug(&_56$$37, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2858); + zephir_throw_exception_debug(&_56$$37, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2866); ZEPHIR_MM_RESTORE(); return; } while(0); @@ -4469,19 +4508,19 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) ZEPHIR_CALL_METHOD(&statement, &statements, "current", NULL, 0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&statement) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2620); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2628); return; } if (UNEXPECTED(!(zephir_array_isset_string(&statement, SL("type"))))) { ZEPHIR_INIT_NVAR(&_60$$40); object_init_ex(&_60$$40, phalcon_mvc_view_engine_volt_exception_ce); - zephir_array_fetch_string(&_61$$40, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2628); - zephir_array_fetch_string(&_62$$40, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2628); + zephir_array_fetch_string(&_61$$40, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2636); + zephir_array_fetch_string(&_62$$40, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2636); ZEPHIR_INIT_NVAR(&_63$$40); ZEPHIR_CONCAT_SVSV(&_63$$40, "Invalid statement in ", &_61$$40, " on line ", &_62$$40); ZEPHIR_CALL_METHOD(NULL, &_60$$40, "__construct", &_8, 504, &_63$$40, &statement); zephir_check_call_status(); - zephir_throw_exception_debug(&_60$$40, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2630); + zephir_throw_exception_debug(&_60$$40, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2638); ZEPHIR_MM_RESTORE(); return; } @@ -4499,10 +4538,10 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) } } ZEPHIR_OBS_NVAR(&type); - zephir_array_fetch_string(&type, &statement, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2656); + zephir_array_fetch_string(&type, &statement, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2664); do { if (ZEPHIR_IS_LONG(&type, 357)) { - zephir_array_fetch_string(&_66$$43, &statement, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2664); + zephir_array_fetch_string(&_66$$43, &statement, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2672); zephir_concat_self(&compilation, &_66$$43); break; } @@ -4572,7 +4611,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) } if (ZEPHIR_IS_LONG(&type, 307)) { ZEPHIR_OBS_NVAR(&blockName); - zephir_array_fetch_string(&blockName, &statement, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2711); + zephir_array_fetch_string(&blockName, &statement, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2719); ZEPHIR_OBS_NVAR(&blockStatements); zephir_array_isset_string_fetch(&blockStatements, &statement, SL("block_statements"), 0); zephir_read_property(&_79$$52, this_ptr, ZEND_STRL("blocks"), PH_NOISY_CC | PH_READONLY); @@ -4583,7 +4622,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) array_init(&blocks); } if (Z_TYPE_P(&compilation) != IS_NULL) { - zephir_array_append(&blocks, &compilation, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2726); + zephir_array_append(&blocks, &compilation, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2734); ZEPHIR_INIT_NVAR(&compilation); ZVAL_NULL(&compilation); } @@ -4605,8 +4644,8 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) } if (ZEPHIR_IS_LONG(&type, 310)) { ZEPHIR_OBS_NVAR(&path); - zephir_array_fetch_string(&path, &statement, SL("path"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2751); - zephir_array_fetch_string(&_82$$58, &path, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2755); + zephir_array_fetch_string(&path, &statement, SL("path"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2759); + zephir_array_fetch_string(&_82$$58, &path, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2763); ZEPHIR_CALL_METHOD(&finalPath, this_ptr, "getfinalpath", &_37, 0, &_82$$58); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&extended); @@ -4702,13 +4741,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) } ZEPHIR_INIT_NVAR(&_94$$70); object_init_ex(&_94$$70, phalcon_mvc_view_engine_volt_exception_ce); - zephir_array_fetch_string(&_95$$70, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2857); - zephir_array_fetch_string(&_96$$70, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2858); + zephir_array_fetch_string(&_95$$70, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2865); + zephir_array_fetch_string(&_96$$70, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2866); ZEPHIR_INIT_NVAR(&_97$$70); ZEPHIR_CONCAT_SVSVSV(&_97$$70, "Unknown statement ", &type, " in ", &_95$$70, " on line ", &_96$$70); ZEPHIR_CALL_METHOD(NULL, &_94$$70, "__construct", &_8, 504, &_97$$70); zephir_check_call_status(); - zephir_throw_exception_debug(&_94$$70, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2858); + zephir_throw_exception_debug(&_94$$70, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2866); ZEPHIR_MM_RESTORE(); return; } while(0); @@ -4760,7 +4799,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementListOrExtends) } isStatementList = 1; if (!(zephir_array_isset_string(statements, SL("type")))) { - zephir_is_iterable(statements, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2915); + zephir_is_iterable(statements, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2923); if (Z_TYPE_P(statements) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(statements), _0$$4) { @@ -4833,7 +4872,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, isTagFactory) _0$$6 = zephir_array_isset_string(&left, SL("name")); if (_0$$6) { zephir_memory_observe(&_1$$6); - zephir_array_fetch_string(&_1$$6, &left, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2952); + zephir_array_fetch_string(&_1$$6, &left, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2960); _0$$6 = Z_TYPE_P(&_1$$6) == IS_ARRAY; } if (_0$$6) { diff --git a/ext/phalcon/support/helperfactory.zep.c b/ext/phalcon/support/helperfactory.zep.c index 2a726b086a..ad3117cc12 100644 --- a/ext/phalcon/support/helperfactory.zep.c +++ b/ext/phalcon/support/helperfactory.zep.c @@ -43,8 +43,10 @@ * @method string decrement(string $text, string $separator = '_') * @method string dirFromFile(string $file) * @method string dirSeparator(string $directory) + * @method string dynamic(string $text, string $leftDelimiter = "{", string $rightDelimiter = "}", string $separator = "|") * @method string encode($data, int $options = 0, int $depth = 512) * @method bool endsWith(string $haystack, string $needle, bool $ignoreCase = true) + * @method mixed filter(array $collection, callable|null $method) * @method mixed first(array $collection, callable $method = null) * @method string firstBetween(string $text, string $start, string $end) * @method mixed firstKey(array $collection, callable $method = null) @@ -56,6 +58,7 @@ * @method string humanize(string $text) * @method bool includes(string $haystack, string $needle) * @method string increment(string $text, string $separator = '_') + * @method string interpolate(string $message, array $context = [], string $leftToken = "%", string $rightToken = "%") * @method bool isAnagram(string $first, string $second) * @method bool isBetween(int $value, int $start, int $end) * @method bool isLower(string $text, string $encoding = 'UTF-8') diff --git a/ext/phalcon/support/version.zep.c b/ext/phalcon/support/version.zep.c index a1876dd028..03672625a3 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, 1); + ZVAL_LONG(&_0, 2); 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 a70d261233..898500a98b 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.1" +#define PHP_PHALCON_VERSION "5.6.2" #define PHP_PHALCON_EXTNAME "phalcon" #define PHP_PHALCON_AUTHOR "Phalcon Team and contributors" #define PHP_PHALCON_ZEPVERSION "0.18.0-$Id$" From 057fb73062c1d033c83e2a5a6a7376e85b9a9abc Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Thu, 14 Mar 2024 09:09:38 -0500 Subject: [PATCH 3/3] refreshing build --- build/phalcon/phalcon.zep.c | 139 +++++++++++++++++++++++------------- build/phalcon/php_phalcon.h | 2 +- 2 files changed, 90 insertions(+), 51 deletions(-) diff --git a/build/phalcon/phalcon.zep.c b/build/phalcon/phalcon.zep.c index 9f7e1f5037..a513cf7b76 100644 --- a/build/phalcon/phalcon.zep.c +++ b/build/phalcon/phalcon.zep.c @@ -33142,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); @@ -33440,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); @@ -72774,10 +72774,11 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, getFinalPath) static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) { + zend_bool _21$$30, _26$$41; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zval left; - zval *filter_param = NULL, *left_param = NULL, code, type, functionName, name, file, line, extensions, filters, funcArguments, arguments, definition, _6, _20, _21, _22, _23, _0$$5, _1$$5, _2$$5, _3$$5, _8$$9, _10$$11, _11$$11, _12$$11, _13$$11, _14$$24, _15$$24, _16$$24, _17$$24, _18$$24, _19$$24; + zval *filter_param = NULL, *left_param = NULL, code, type, functionName, name, file, line, extensions, filters, funcArguments, arguments, definition, _6, _30, _31, _32, _33, _0$$5, _1$$5, _2$$5, _3$$5, _8$$9, _10$$11, _11$$11, _12$$11, _13$$11, _14$$24, _15$$24, _16$$24, _17$$24, _18$$24, _19$$24, _20$$30, _22$$30, _23$$30, _24$$30, _25$$41, _27$$41, _28$$41, _29$$41; zval filter, _4$$7, _5$$7, _7$$9, _9$$14; zval *this_ptr = getThis(); @@ -72798,10 +72799,10 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) ZVAL_UNDEF(&arguments); ZVAL_UNDEF(&definition); ZVAL_UNDEF(&_6); - ZVAL_UNDEF(&_20); - ZVAL_UNDEF(&_21); - ZVAL_UNDEF(&_22); - ZVAL_UNDEF(&_23); + ZVAL_UNDEF(&_30); + ZVAL_UNDEF(&_31); + ZVAL_UNDEF(&_32); + ZVAL_UNDEF(&_33); ZVAL_UNDEF(&_0$$5); ZVAL_UNDEF(&_1$$5); ZVAL_UNDEF(&_2$$5); @@ -72817,6 +72818,14 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) ZVAL_UNDEF(&_17$$24); ZVAL_UNDEF(&_18$$24); ZVAL_UNDEF(&_19$$24); + ZVAL_UNDEF(&_20$$30); + ZVAL_UNDEF(&_22$$30); + ZVAL_UNDEF(&_23$$30); + ZVAL_UNDEF(&_24$$30); + ZVAL_UNDEF(&_25$$41); + ZVAL_UNDEF(&_27$$41); + ZVAL_UNDEF(&_28$$41); + ZVAL_UNDEF(&_29$$41); ZVAL_UNDEF(&left); ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_ARRAY(filter) @@ -73000,8 +73009,23 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) RETURN_MM(); } if (ZEPHIR_IS_STRING(&name, "lower") || ZEPHIR_IS_STRING(&name, "lowercase")) { - ZEPHIR_CONCAT_SVS(return_value, "strtolower(", &arguments, ")"); - RETURN_MM(); + zephir_read_property(&_20$$30, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); + _21$$30 = Z_TYPE_P(&_20$$30) != IS_NULL; + if (_21$$30) { + zephir_read_property(&_22$$30, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_INIT_VAR(&_24$$30); + ZVAL_STRING(&_24$$30, "helper"); + ZEPHIR_CALL_METHOD(&_23$$30, &_22$$30, "has", NULL, 0, &_24$$30); + zephir_check_call_status(); + _21$$30 = ZEPHIR_IS_TRUE_IDENTICAL(&_23$$30); + } + if (_21$$30) { + ZEPHIR_CONCAT_SVS(return_value, "$this->helper->lower(", &arguments, ")"); + RETURN_MM(); + } else { + ZEPHIR_CONCAT_SVS(return_value, "strtolower(", &arguments, ")"); + RETURN_MM(); + } } if (ZEPHIR_IS_STRING(&name, "right_trim")) { ZEPHIR_CONCAT_SVS(return_value, "rtrim(", &arguments, ")"); @@ -73036,8 +73060,23 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) RETURN_MM(); } if (ZEPHIR_IS_STRING(&name, "upper") || ZEPHIR_IS_STRING(&name, "uppercase")) { - ZEPHIR_CONCAT_SVS(return_value, "strtoupper(", &arguments, ")"); - RETURN_MM(); + zephir_read_property(&_25$$41, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); + _26$$41 = Z_TYPE_P(&_25$$41) != IS_NULL; + if (_26$$41) { + zephir_read_property(&_27$$41, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_INIT_VAR(&_29$$41); + ZVAL_STRING(&_29$$41, "helper"); + ZEPHIR_CALL_METHOD(&_28$$41, &_27$$41, "has", NULL, 0, &_29$$41); + zephir_check_call_status(); + _26$$41 = ZEPHIR_IS_TRUE_IDENTICAL(&_28$$41); + } + if (_26$$41) { + ZEPHIR_CONCAT_SVS(return_value, "$this->helper->upper(", &arguments, ")"); + RETURN_MM(); + } else { + ZEPHIR_CONCAT_SVS(return_value, "strtoupper(", &arguments, ")"); + RETURN_MM(); + } } if (ZEPHIR_IS_STRING(&name, "url_encode")) { ZEPHIR_CONCAT_SVS(return_value, "urlencode(", &arguments, ")"); @@ -73045,15 +73084,15 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) } } while(0); - ZEPHIR_INIT_VAR(&_20); - object_init_ex(&_20, phalcon_mvc_view_engine_volt_exception_ce); - zephir_array_fetch_string(&_21, &filter, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2579); - zephir_array_fetch_string(&_22, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2580); - ZEPHIR_INIT_VAR(&_23); - ZEPHIR_CONCAT_SVSVSV(&_23, "Unknown filter \"", &name, "\" in ", &_21, " on line ", &_22); - ZEPHIR_CALL_METHOD(NULL, &_20, "__construct", NULL, 504, &_23); + ZEPHIR_INIT_VAR(&_30); + object_init_ex(&_30, phalcon_mvc_view_engine_volt_exception_ce); + zephir_array_fetch_string(&_31, &filter, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2587); + zephir_array_fetch_string(&_32, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2588); + ZEPHIR_INIT_VAR(&_33); + ZEPHIR_CONCAT_SVSVSV(&_33, "Unknown filter \"", &name, "\" in ", &_31, " on line ", &_32); + ZEPHIR_CALL_METHOD(NULL, &_30, "__construct", NULL, 504, &_33); zephir_check_call_status(); - zephir_throw_exception_debug(&_20, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2580); + zephir_throw_exception_debug(&_30, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2588); ZEPHIR_MM_RESTORE(); return; } @@ -73195,26 +73234,26 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) ZVAL_NULL(&compilation); zephir_read_property(&_0, this_ptr, ZEND_STRL("extensions"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&extensions, &_0); - zephir_is_iterable(&statements, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2866); + zephir_is_iterable(&statements, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2874); if (Z_TYPE_P(&statements) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&statements), _2) { ZEPHIR_INIT_NVAR(&statement); ZVAL_COPY(&statement, _2); if (UNEXPECTED(Z_TYPE_P(&statement) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2620); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2628); return; } if (UNEXPECTED(!(zephir_array_isset_string(&statement, SL("type"))))) { ZEPHIR_INIT_NVAR(&_4$$7); object_init_ex(&_4$$7, phalcon_mvc_view_engine_volt_exception_ce); - zephir_array_fetch_string(&_5$$7, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2628); - zephir_array_fetch_string(&_6$$7, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2628); + zephir_array_fetch_string(&_5$$7, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2636); + zephir_array_fetch_string(&_6$$7, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2636); ZEPHIR_INIT_NVAR(&_7$$7); ZEPHIR_CONCAT_SVSV(&_7$$7, "Invalid statement in ", &_5$$7, " on line ", &_6$$7); ZEPHIR_CALL_METHOD(NULL, &_4$$7, "__construct", &_8, 504, &_7$$7, &statement); zephir_check_call_status(); - zephir_throw_exception_debug(&_4$$7, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2630); + zephir_throw_exception_debug(&_4$$7, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2638); ZEPHIR_MM_RESTORE(); return; } @@ -73232,10 +73271,10 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) } } ZEPHIR_OBS_NVAR(&type); - zephir_array_fetch_string(&type, &statement, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2656); + zephir_array_fetch_string(&type, &statement, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2664); do { if (ZEPHIR_IS_LONG(&type, 357)) { - zephir_array_fetch_string(&_12$$10, &statement, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2664); + zephir_array_fetch_string(&_12$$10, &statement, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2672); zephir_concat_self(&compilation, &_12$$10); break; } @@ -73305,7 +73344,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) } if (ZEPHIR_IS_LONG(&type, 307)) { ZEPHIR_OBS_NVAR(&blockName); - zephir_array_fetch_string(&blockName, &statement, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2711); + zephir_array_fetch_string(&blockName, &statement, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2719); ZEPHIR_OBS_NVAR(&blockStatements); zephir_array_isset_string_fetch(&blockStatements, &statement, SL("block_statements"), 0); zephir_read_property(&_32$$19, this_ptr, ZEND_STRL("blocks"), PH_NOISY_CC | PH_READONLY); @@ -73316,7 +73355,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) array_init(&blocks); } if (Z_TYPE_P(&compilation) != IS_NULL) { - zephir_array_append(&blocks, &compilation, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2726); + zephir_array_append(&blocks, &compilation, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2734); ZEPHIR_INIT_NVAR(&compilation); ZVAL_NULL(&compilation); } @@ -73338,8 +73377,8 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) } if (ZEPHIR_IS_LONG(&type, 310)) { ZEPHIR_OBS_NVAR(&path); - zephir_array_fetch_string(&path, &statement, SL("path"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2751); - zephir_array_fetch_string(&_36$$25, &path, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2755); + zephir_array_fetch_string(&path, &statement, SL("path"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2759); + zephir_array_fetch_string(&_36$$25, &path, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2763); ZEPHIR_CALL_METHOD(&finalPath, this_ptr, "getfinalpath", &_37, 0, &_36$$25); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&extended); @@ -73435,13 +73474,13 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) } ZEPHIR_INIT_NVAR(&_56$$37); object_init_ex(&_56$$37, phalcon_mvc_view_engine_volt_exception_ce); - zephir_array_fetch_string(&_57$$37, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2857); - zephir_array_fetch_string(&_58$$37, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2858); + zephir_array_fetch_string(&_57$$37, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2865); + zephir_array_fetch_string(&_58$$37, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2866); ZEPHIR_INIT_NVAR(&_59$$37); ZEPHIR_CONCAT_SVSVSV(&_59$$37, "Unknown statement ", &type, " in ", &_57$$37, " on line ", &_58$$37); ZEPHIR_CALL_METHOD(NULL, &_56$$37, "__construct", &_8, 504, &_59$$37); zephir_check_call_status(); - zephir_throw_exception_debug(&_56$$37, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2858); + zephir_throw_exception_debug(&_56$$37, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2866); ZEPHIR_MM_RESTORE(); return; } while(0); @@ -73459,19 +73498,19 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) ZEPHIR_CALL_METHOD(&statement, &statements, "current", NULL, 0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&statement) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2620); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2628); return; } if (UNEXPECTED(!(zephir_array_isset_string(&statement, SL("type"))))) { ZEPHIR_INIT_NVAR(&_60$$40); object_init_ex(&_60$$40, phalcon_mvc_view_engine_volt_exception_ce); - zephir_array_fetch_string(&_61$$40, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2628); - zephir_array_fetch_string(&_62$$40, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2628); + zephir_array_fetch_string(&_61$$40, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2636); + zephir_array_fetch_string(&_62$$40, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2636); ZEPHIR_INIT_NVAR(&_63$$40); ZEPHIR_CONCAT_SVSV(&_63$$40, "Invalid statement in ", &_61$$40, " on line ", &_62$$40); ZEPHIR_CALL_METHOD(NULL, &_60$$40, "__construct", &_8, 504, &_63$$40, &statement); zephir_check_call_status(); - zephir_throw_exception_debug(&_60$$40, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2630); + zephir_throw_exception_debug(&_60$$40, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2638); ZEPHIR_MM_RESTORE(); return; } @@ -73489,10 +73528,10 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) } } ZEPHIR_OBS_NVAR(&type); - zephir_array_fetch_string(&type, &statement, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2656); + zephir_array_fetch_string(&type, &statement, SL("type"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2664); do { if (ZEPHIR_IS_LONG(&type, 357)) { - zephir_array_fetch_string(&_66$$43, &statement, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2664); + zephir_array_fetch_string(&_66$$43, &statement, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2672); zephir_concat_self(&compilation, &_66$$43); break; } @@ -73562,7 +73601,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) } if (ZEPHIR_IS_LONG(&type, 307)) { ZEPHIR_OBS_NVAR(&blockName); - zephir_array_fetch_string(&blockName, &statement, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2711); + zephir_array_fetch_string(&blockName, &statement, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2719); ZEPHIR_OBS_NVAR(&blockStatements); zephir_array_isset_string_fetch(&blockStatements, &statement, SL("block_statements"), 0); zephir_read_property(&_79$$52, this_ptr, ZEND_STRL("blocks"), PH_NOISY_CC | PH_READONLY); @@ -73573,7 +73612,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) array_init(&blocks); } if (Z_TYPE_P(&compilation) != IS_NULL) { - zephir_array_append(&blocks, &compilation, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2726); + zephir_array_append(&blocks, &compilation, PH_SEPARATE, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2734); ZEPHIR_INIT_NVAR(&compilation); ZVAL_NULL(&compilation); } @@ -73595,8 +73634,8 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) } if (ZEPHIR_IS_LONG(&type, 310)) { ZEPHIR_OBS_NVAR(&path); - zephir_array_fetch_string(&path, &statement, SL("path"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2751); - zephir_array_fetch_string(&_82$$58, &path, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2755); + zephir_array_fetch_string(&path, &statement, SL("path"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2759); + zephir_array_fetch_string(&_82$$58, &path, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2763); ZEPHIR_CALL_METHOD(&finalPath, this_ptr, "getfinalpath", &_37, 0, &_82$$58); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&extended); @@ -73692,13 +73731,13 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementList) } ZEPHIR_INIT_NVAR(&_94$$70); object_init_ex(&_94$$70, phalcon_mvc_view_engine_volt_exception_ce); - zephir_array_fetch_string(&_95$$70, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2857); - zephir_array_fetch_string(&_96$$70, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2858); + zephir_array_fetch_string(&_95$$70, &statement, SL("file"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2865); + zephir_array_fetch_string(&_96$$70, &statement, SL("line"), PH_NOISY | PH_READONLY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2866); ZEPHIR_INIT_NVAR(&_97$$70); ZEPHIR_CONCAT_SVSVSV(&_97$$70, "Unknown statement ", &type, " in ", &_95$$70, " on line ", &_96$$70); ZEPHIR_CALL_METHOD(NULL, &_94$$70, "__construct", &_8, 504, &_97$$70); zephir_check_call_status(); - zephir_throw_exception_debug(&_94$$70, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2858); + zephir_throw_exception_debug(&_94$$70, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2866); ZEPHIR_MM_RESTORE(); return; } while(0); @@ -73744,7 +73783,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, statementListOrExtends) } isStatementList = 1; if (!(zephir_array_isset_string(statements, SL("type")))) { - zephir_is_iterable(statements, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2915); + zephir_is_iterable(statements, 0, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2923); if (Z_TYPE_P(statements) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(statements), _0$$4) { @@ -73817,7 +73856,7 @@ static PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, isTagFactory) _0$$6 = zephir_array_isset_string(&left, SL("name")); if (_0$$6) { zephir_memory_observe(&_1$$6); - zephir_array_fetch_string(&_1$$6, &left, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2952); + zephir_array_fetch_string(&_1$$6, &left, SL("name"), PH_NOISY, "phalcon/Mvc/View/Engine/Volt/Compiler.zep", 2960); _0$$6 = Z_TYPE_P(&_1$$6) == IS_ARRAY; } if (_0$$6) { @@ -151017,7 +151056,7 @@ ZEPHIR_DOC_METHOD(Phalcon_Storage_Serializer_SerializerInterface, setData); ZEPHIR_INIT_CLASS(Phalcon_Di_AbstractInjectionAware) { - ZEPHIR_REGISTER_CLASS(Phalcon\\Di, AbstractInjectionAware, phalcon, di_abstractinjectionaware, phalcon_di_abstractinjectionaware_method_entry, ZEND_ACC_EXPLICIT_ABSTRACT_CLASS); + ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Di, AbstractInjectionAware, phalcon, di_abstractinjectionaware, zend_standard_class_def, phalcon_di_abstractinjectionaware_method_entry, ZEND_ACC_EXPLICIT_ABSTRACT_CLASS); zend_declare_property_null(phalcon_di_abstractinjectionaware_ce, SL("container"), ZEND_ACC_PROTECTED); zend_class_implements(phalcon_di_abstractinjectionaware_ce, 1, phalcon_di_injectionawareinterface_ce); @@ -183902,7 +183941,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, 1); + ZVAL_LONG(&_0, 2); zephir_array_fast_append(return_value, &_0); ZEPHIR_INIT_NVAR(&_0); ZVAL_LONG(&_0, 4); diff --git a/build/phalcon/php_phalcon.h b/build/phalcon/php_phalcon.h index 3cc2ddee2b..7579e66879 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.1" +#define PHP_PHALCON_VERSION "5.6.2" #define PHP_PHALCON_EXTNAME "phalcon" #define PHP_PHALCON_AUTHOR "Phalcon Team and contributors" #define PHP_PHALCON_ZEPVERSION "0.18.0-$Id$"