From 40d9930a7c47d190e88dd6f3e0b5959fb1de40f7 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Mon, 28 Jan 2019 10:03:23 -0500 Subject: [PATCH 1/7] [4.0.x] - Added unicode flag for email filter --- phalcon/filter/sanitize/email.zep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phalcon/filter/sanitize/email.zep b/phalcon/filter/sanitize/email.zep index 426b29f6691..c01f9f27a1c 100644 --- a/phalcon/filter/sanitize/email.zep +++ b/phalcon/filter/sanitize/email.zep @@ -22,6 +22,6 @@ class Email */ public function __invoke(var input) { - return filter_var(input, constant("FILTER_SANITIZE_EMAIL")); + return filter_var(input, FILTER_SANITIZE_EMAIL, FILTER_FLAG_EMAIL_UNICODE); } } From 655eafec10ca761a48daafe3e2e49fbe97712865 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Sun, 17 Feb 2019 09:25:06 -0500 Subject: [PATCH 2/7] [4.0.x] - Updating the ext folder --- ext/config.m4 | 6 +- ext/config.w32 | 6 +- ext/phalcon.c | 12 +- ext/phalcon.h | 6 +- ext/phalcon/cli/dispatcher.zep.c | 22 +- ext/phalcon/config.zep.c | 32 +- ext/phalcon/config.zep.h | 2 +- ext/phalcon/di.zep.c | 67 ++-- ext/phalcon/di/factorydefault.zep.c | 2 +- ext/phalcon/di/injectable.zep.c | 2 +- ext/phalcon/dispatcher.zep.c | 122 ++++-- ext/phalcon/dispatcher.zep.h | 14 + ext/phalcon/mvc/model.zep.c | 293 +++++++------- ext/phalcon/mvc/url.zep.h | 134 ------- ext/phalcon/mvc/url/exception.zep.h | 5 - ext/phalcon/mvc/url/utils.c | 369 ------------------ ext/phalcon/mvc/url/utils.h | 30 -- ext/phalcon/mvc/urlinterface.zep.h | 78 ---- ext/phalcon/mvc/view.zep.c | 4 +- ext/phalcon/mvc/view/engine/php.zep.c | 2 +- ext/phalcon/mvc/view/engine/volt.zep.c | 85 ++-- .../mvc/view/engine/volt/compiler.zep.c | 134 +++---- ext/phalcon/mvc/view/simple.zep.c | 6 +- .../paginator/adapter/nativearray.zep.c | 2 +- ext/phalcon/queue/beanstalk.zep.c | 60 +-- ext/phalcon/registry.zep.c | 18 +- ext/phalcon/security.zep.c | 8 +- ext/phalcon/security/random.zep.c | 26 +- ext/phalcon/session/adapter/files.zep.c | 6 +- .../session/adapter/libmemcached.zep.c | 2 +- ext/phalcon/session/bag.zep.c | 2 +- ext/phalcon/session/manager.zep.c | 26 +- ext/phalcon/tag.zep.c | 42 +- ext/phalcon/tag.zep.h | 4 +- ext/phalcon/tag/select.zep.c | 6 +- ext/phalcon/text.zep.c | 40 +- ext/phalcon/translate/adapter/csv.zep.c | 4 +- ext/phalcon/translate/adapter/gettext.zep.c | 20 +- .../translate/interpolator/indexedarray.zep.c | 2 +- ext/phalcon/{mvc => }/url.zep.c | 62 +-- ext/phalcon/url.zep.h | 134 +++++++ ext/phalcon/{mvc => }/url/exception.zep.c | 14 +- ext/phalcon/url/exception.zep.h | 5 + ext/phalcon/{mvc => }/urlinterface.zep.c | 26 +- ext/phalcon/urlinterface.zep.h | 78 ++++ .../validation/validator/confirmation.zep.c | 4 +- .../validation/validator/uniqueness.zep.c | 2 +- 47 files changed, 871 insertions(+), 1155 deletions(-) delete mode 100644 ext/phalcon/mvc/url.zep.h delete mode 100644 ext/phalcon/mvc/url/exception.zep.h delete mode 100644 ext/phalcon/mvc/url/utils.c delete mode 100644 ext/phalcon/mvc/url/utils.h delete mode 100644 ext/phalcon/mvc/urlinterface.zep.h rename ext/phalcon/{mvc => }/url.zep.c (87%) create mode 100644 ext/phalcon/url.zep.h rename ext/phalcon/{mvc => }/url/exception.zep.c (56%) create mode 100644 ext/phalcon/url/exception.zep.h rename ext/phalcon/{mvc => }/urlinterface.zep.c (54%) create mode 100644 ext/phalcon/urlinterface.zep.h diff --git a/ext/config.m4 b/ext/config.m4 index ffef614e04b..ba72f641cf4 100644 --- a/ext/config.m4 +++ b/ext/config.m4 @@ -120,12 +120,12 @@ if test "$PHP_PHALCON" = "yes"; then phalcon/mvc/router.zep.c phalcon/mvc/router/groupinterface.zep.c phalcon/mvc/router/routeinterface.zep.c - phalcon/mvc/urlinterface.zep.c phalcon/mvc/view/exception.zep.c phalcon/mvc/viewinterface.zep.c phalcon/paginator/repositoryinterface.zep.c phalcon/session/baginterface.zep.c phalcon/session/managerinterface.zep.c + phalcon/urlinterface.zep.c phalcon/validation/combinedfieldsvalidator.zep.c phalcon/validationinterface.zep.c phalcon/acl.zep.c @@ -353,8 +353,6 @@ if test "$PHP_PHALCON" = "yes"; then phalcon/mvc/router/exception.zep.c phalcon/mvc/router/group.zep.c phalcon/mvc/router/route.zep.c - phalcon/mvc/url.zep.c - phalcon/mvc/url/exception.zep.c phalcon/mvc/view.zep.c phalcon/mvc/view/engine/php.zep.c phalcon/mvc/view/engine/volt.zep.c @@ -395,6 +393,8 @@ if test "$PHP_PHALCON" = "yes"; then phalcon/translate/factory.zep.c phalcon/translate/interpolator/associativearray.zep.c phalcon/translate/interpolator/indexedarray.zep.c + phalcon/url.zep.c + phalcon/url/exception.zep.c phalcon/validation.zep.c phalcon/validation/exception.zep.c phalcon/validation/validator/alnum.zep.c diff --git a/ext/config.w32 b/ext/config.w32 index b5eedd33e1d..9357471abfb 100644 --- a/ext/config.w32 +++ b/ext/config.w32 @@ -14,7 +14,7 @@ if (PHP_PHALCON != "no") { ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/model/query", "scanner.c parser.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/view/engine/volt", "parser.c scanner.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/url", "utils.c", "phalcon"); - ADD_SOURCES(configure_module_dirname + "/phalcon", "exception.zep.c factoryinterface.zep.c factory.zep.c dispatcherinterface.zep.c config.zep.c utility.zep.c diinterface.zep.c flashinterface.zep.c application.zep.c di.zep.c dispatcher.zep.c flash.zep.c cryptinterface.zep.c escaperinterface.zep.c validationinterface.zep.c acl.zep.c container.zep.c crypt.zep.c db.zep.c debug.zep.c escaper.zep.c image.zep.c kernel.zep.c loader.zep.c logger.zep.c plugin.zep.c registry.zep.c security.zep.c tag.zep.c text.zep.c translate.zep.c validation.zep.c version.zep.c 0__closure.zep.c 1__closure.zep.c 2__closure.zep.c 3__closure.zep.c 4__closure.zep.c 5__closure.zep.c 6__closure.zep.c 7__closure.zep.c 8__closure.zep.c 9__closure.zep.c 10__closure.zep.c 11__closure.zep.c 12__closure.zep.c 13__closure.zep.c 14__closure.zep.c 15__closure.zep.c 16__closure.zep.c 17__closure.zep.c 18__closure.zep.c 19__closure.zep.c 20__closure.zep.c 21__closure.zep.c 22__closure.zep.c 23__closure.zep.c 24__closure.zep.c 25__closure.zep.c 26__closure.zep.c 27__closure.zep.c", "phalcon"); + ADD_SOURCES(configure_module_dirname + "/phalcon", "exception.zep.c factoryinterface.zep.c factory.zep.c dispatcherinterface.zep.c config.zep.c utility.zep.c diinterface.zep.c flashinterface.zep.c application.zep.c di.zep.c dispatcher.zep.c flash.zep.c cryptinterface.zep.c escaperinterface.zep.c urlinterface.zep.c validationinterface.zep.c acl.zep.c container.zep.c crypt.zep.c db.zep.c debug.zep.c escaper.zep.c image.zep.c kernel.zep.c loader.zep.c logger.zep.c plugin.zep.c registry.zep.c security.zep.c tag.zep.c text.zep.c translate.zep.c url.zep.c validation.zep.c version.zep.c 0__closure.zep.c 1__closure.zep.c 2__closure.zep.c 3__closure.zep.c 4__closure.zep.c 5__closure.zep.c 6__closure.zep.c 7__closure.zep.c 8__closure.zep.c 9__closure.zep.c 10__closure.zep.c 11__closure.zep.c 12__closure.zep.c 13__closure.zep.c 14__closure.zep.c 15__closure.zep.c 16__closure.zep.c 17__closure.zep.c 18__closure.zep.c 19__closure.zep.c 20__closure.zep.c 21__closure.zep.c 22__closure.zep.c 23__closure.zep.c 24__closure.zep.c 25__closure.zep.c 26__closure.zep.c 27__closure.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/di", "injectionawareinterface.zep.c injectable.zep.c exception.zep.c factorydefault.zep.c serviceinterface.zep.c service.zep.c serviceproviderinterface.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/events", "eventsawareinterface.zep.c eventinterface.zep.c managerinterface.zep.c event.zep.c exception.zep.c manager.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/validation", "validatorinterface.zep.c validator.zep.c combinedfieldsvalidator.zep.c exception.zep.c", "phalcon"); @@ -27,7 +27,7 @@ if (PHP_PHALCON != "no") { ADD_SOURCES(configure_module_dirname + "/phalcon/annotations", "adapterinterface.zep.c adapter.zep.c readerinterface.zep.c annotation.zep.c collection.zep.c exception.zep.c factory.zep.c reader.zep.c reflection.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/logger/adapter", "adapterinterface.zep.c abstractadapter.zep.c noop.zep.c stream.zep.c syslog.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/logger/formatter", "formatterinterface.zep.c abstractformatter.zep.c json.zep.c line.zep.c syslog.zep.c", "phalcon"); - ADD_SOURCES(configure_module_dirname + "/phalcon/mvc", "entityinterface.zep.c viewbaseinterface.zep.c routerinterface.zep.c collectioninterface.zep.c controllerinterface.zep.c dispatcherinterface.zep.c modelinterface.zep.c router.zep.c urlinterface.zep.c viewinterface.zep.c application.zep.c collection.zep.c controller.zep.c dispatcher.zep.c micro.zep.c model.zep.c moduledefinitioninterface.zep.c url.zep.c view.zep.c", "phalcon"); + ADD_SOURCES(configure_module_dirname + "/phalcon/mvc", "entityinterface.zep.c viewbaseinterface.zep.c routerinterface.zep.c collectioninterface.zep.c controllerinterface.zep.c dispatcherinterface.zep.c modelinterface.zep.c router.zep.c viewinterface.zep.c application.zep.c collection.zep.c controller.zep.c dispatcher.zep.c micro.zep.c model.zep.c moduledefinitioninterface.zep.c view.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/paginator", "adapterinterface.zep.c adapter.zep.c repositoryinterface.zep.c exception.zep.c factory.zep.c repository.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/translate", "adapterinterface.zep.c adapter.zep.c interpolatorinterface.zep.c exception.zep.c factory.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/db/adapter", "pdo.zep.c", "phalcon"); @@ -89,7 +89,6 @@ if (PHP_PHALCON != "no") { ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/model/binder", "bindableinterface.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/model/metadata/strategy", "annotations.zep.c introspection.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/model/resultset", "complex.zep.c simple.zep.c", "phalcon"); - ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/url", "exception.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/view/engine", "php.zep.c volt.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/view/engine/volt", "compiler.zep.c exception.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/paginator/adapter", "model.zep.c nativearray.zep.c querybuilder.zep.c", "phalcon"); @@ -99,6 +98,7 @@ if (PHP_PHALCON != "no") { ADD_SOURCES(configure_module_dirname + "/phalcon/tag", "exception.zep.c select.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/translate/adapter", "csv.zep.c gettext.zep.c nativearray.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/translate/interpolator", "associativearray.zep.c indexedarray.zep.c", "phalcon"); + ADD_SOURCES(configure_module_dirname + "/phalcon/url", "exception.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/validation/validator", "alnum.zep.c alpha.zep.c between.zep.c callback.zep.c confirmation.zep.c creditcard.zep.c date.zep.c digit.zep.c email.zep.c exception.zep.c exclusionin.zep.c file.zep.c identical.zep.c inclusionin.zep.c ip.zep.c numericality.zep.c presenceof.zep.c regex.zep.c stringlength.zep.c uniqueness.zep.c url.zep.c", "phalcon"); ADD_FLAG("CFLAGS_PHALCON", "/D ZEPHIR_RELEASE /Oi /Ot /Oy /Ob2 /Gs /GF /Gy /GL"); ADD_FLAG("CFLAGS", "/D ZEPHIR_RELEASE /Oi /Ot /Oy /Ob2 /Gs /GF /Gy /GL"); diff --git a/ext/phalcon.c b/ext/phalcon.c index 3e32f3cd7f3..971e9476422 100644 --- a/ext/phalcon.c +++ b/ext/phalcon.c @@ -95,11 +95,11 @@ zend_class_entry *phalcon_mvc_model_transactioninterface_ce; zend_class_entry *phalcon_mvc_modelinterface_ce; zend_class_entry *phalcon_mvc_router_groupinterface_ce; zend_class_entry *phalcon_mvc_router_routeinterface_ce; -zend_class_entry *phalcon_mvc_urlinterface_ce; zend_class_entry *phalcon_mvc_viewinterface_ce; zend_class_entry *phalcon_paginator_repositoryinterface_ce; zend_class_entry *phalcon_session_baginterface_ce; zend_class_entry *phalcon_session_managerinterface_ce; +zend_class_entry *phalcon_urlinterface_ce; zend_class_entry *phalcon_validationinterface_ce; zend_class_entry *phalcon_acl_componentaware_ce; zend_class_entry *phalcon_acl_roleaware_ce; @@ -396,8 +396,6 @@ zend_class_entry *phalcon_mvc_router_annotations_ce; zend_class_entry *phalcon_mvc_router_exception_ce; zend_class_entry *phalcon_mvc_router_group_ce; zend_class_entry *phalcon_mvc_router_route_ce; -zend_class_entry *phalcon_mvc_url_ce; -zend_class_entry *phalcon_mvc_url_exception_ce; zend_class_entry *phalcon_mvc_view_ce; zend_class_entry *phalcon_mvc_view_engine_php_ce; zend_class_entry *phalcon_mvc_view_engine_volt_ce; @@ -438,6 +436,8 @@ zend_class_entry *phalcon_translate_exception_ce; zend_class_entry *phalcon_translate_factory_ce; zend_class_entry *phalcon_translate_interpolator_associativearray_ce; zend_class_entry *phalcon_translate_interpolator_indexedarray_ce; +zend_class_entry *phalcon_url_ce; +zend_class_entry *phalcon_url_exception_ce; zend_class_entry *phalcon_validation_ce; zend_class_entry *phalcon_validation_exception_ce; zend_class_entry *phalcon_validation_validator_alnum_ce; @@ -562,11 +562,11 @@ static PHP_MINIT_FUNCTION(phalcon) ZEPHIR_INIT(Phalcon_Mvc_Model_Transaction_ManagerInterface); ZEPHIR_INIT(Phalcon_Mvc_Router_GroupInterface); ZEPHIR_INIT(Phalcon_Mvc_Router_RouteInterface); - ZEPHIR_INIT(Phalcon_Mvc_UrlInterface); ZEPHIR_INIT(Phalcon_Mvc_ViewInterface); ZEPHIR_INIT(Phalcon_Paginator_RepositoryInterface); ZEPHIR_INIT(Phalcon_Session_BagInterface); ZEPHIR_INIT(Phalcon_Session_ManagerInterface); + ZEPHIR_INIT(Phalcon_UrlInterface); ZEPHIR_INIT(Phalcon_ValidationInterface); ZEPHIR_INIT(Phalcon_Acl_ComponentAware); ZEPHIR_INIT(Phalcon_Acl_RoleAware); @@ -835,8 +835,6 @@ static PHP_MINIT_FUNCTION(phalcon) ZEPHIR_INIT(Phalcon_Mvc_Router_Exception); ZEPHIR_INIT(Phalcon_Mvc_Router_Group); ZEPHIR_INIT(Phalcon_Mvc_Router_Route); - ZEPHIR_INIT(Phalcon_Mvc_Url); - ZEPHIR_INIT(Phalcon_Mvc_Url_Exception); ZEPHIR_INIT(Phalcon_Mvc_View); ZEPHIR_INIT(Phalcon_Mvc_View_Engine_Php); ZEPHIR_INIT(Phalcon_Mvc_View_Engine_Volt); @@ -877,6 +875,8 @@ static PHP_MINIT_FUNCTION(phalcon) ZEPHIR_INIT(Phalcon_Translate_Factory); ZEPHIR_INIT(Phalcon_Translate_Interpolator_AssociativeArray); ZEPHIR_INIT(Phalcon_Translate_Interpolator_IndexedArray); + ZEPHIR_INIT(Phalcon_Url); + ZEPHIR_INIT(Phalcon_Url_Exception); ZEPHIR_INIT(Phalcon_Validation); ZEPHIR_INIT(Phalcon_Validation_Exception); ZEPHIR_INIT(Phalcon_Validation_Validator_Alnum); diff --git a/ext/phalcon.h b/ext/phalcon.h index 46d6ddb97e5..e0da833dc09 100644 --- a/ext/phalcon.h +++ b/ext/phalcon.h @@ -115,12 +115,12 @@ #include "phalcon/mvc/router.zep.h" #include "phalcon/mvc/router/groupinterface.zep.h" #include "phalcon/mvc/router/routeinterface.zep.h" -#include "phalcon/mvc/urlinterface.zep.h" #include "phalcon/mvc/view/exception.zep.h" #include "phalcon/mvc/viewinterface.zep.h" #include "phalcon/paginator/repositoryinterface.zep.h" #include "phalcon/session/baginterface.zep.h" #include "phalcon/session/managerinterface.zep.h" +#include "phalcon/urlinterface.zep.h" #include "phalcon/validation/combinedfieldsvalidator.zep.h" #include "phalcon/validationinterface.zep.h" #include "phalcon/acl.zep.h" @@ -348,8 +348,6 @@ #include "phalcon/mvc/router/exception.zep.h" #include "phalcon/mvc/router/group.zep.h" #include "phalcon/mvc/router/route.zep.h" -#include "phalcon/mvc/url.zep.h" -#include "phalcon/mvc/url/exception.zep.h" #include "phalcon/mvc/view.zep.h" #include "phalcon/mvc/view/engine/php.zep.h" #include "phalcon/mvc/view/engine/volt.zep.h" @@ -390,6 +388,8 @@ #include "phalcon/translate/factory.zep.h" #include "phalcon/translate/interpolator/associativearray.zep.h" #include "phalcon/translate/interpolator/indexedarray.zep.h" +#include "phalcon/url.zep.h" +#include "phalcon/url/exception.zep.h" #include "phalcon/validation.zep.h" #include "phalcon/validation/exception.zep.h" #include "phalcon/validation/validator/alnum.zep.h" diff --git a/ext/phalcon/cli/dispatcher.zep.c b/ext/phalcon/cli/dispatcher.zep.c index 6f1ac5a703b..07ac475f402 100644 --- a/ext/phalcon/cli/dispatcher.zep.c +++ b/ext/phalcon/cli/dispatcher.zep.c @@ -434,36 +434,44 @@ PHP_METHOD(Phalcon_Cli_Dispatcher, callActionMethod) { zend_object *zephir_init_properties_Phalcon_Cli_Dispatcher(zend_class_entry *class_type TSRMLS_DC) { - zval _0, _2, _4, _1$$3, _3$$4, _5$$5; + zval _0, _2, _4, _6, _1$$3, _3$$4, _5$$5, _7$$6; ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_2); ZVAL_UNDEF(&_4); + ZVAL_UNDEF(&_6); ZVAL_UNDEF(&_1$$3); ZVAL_UNDEF(&_3$$4); ZVAL_UNDEF(&_5$$5); + ZVAL_UNDEF(&_7$$6); ZEPHIR_MM_GROW(); { zval local_this_ptr, *this_ptr = &local_this_ptr; ZEPHIR_CREATE_OBJECT(this_ptr, class_type); - zephir_read_property(&_0, this_ptr, SL("_activeMethodMap"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_0, this_ptr, SL("_camelCaseMap"), PH_NOISY_CC | PH_READONLY); if (Z_TYPE_P(&_0) == IS_NULL) { ZEPHIR_INIT_VAR(&_1$$3); array_init(&_1$$3); - zephir_update_property_zval(this_ptr, SL("_activeMethodMap"), &_1$$3); + zephir_update_property_zval(this_ptr, SL("_camelCaseMap"), &_1$$3); } - zephir_read_property(&_2, this_ptr, SL("_params"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_2, this_ptr, SL("_activeMethodMap"), PH_NOISY_CC | PH_READONLY); if (Z_TYPE_P(&_2) == IS_NULL) { ZEPHIR_INIT_VAR(&_3$$4); array_init(&_3$$4); - zephir_update_property_zval(this_ptr, SL("_params"), &_3$$4); + zephir_update_property_zval(this_ptr, SL("_activeMethodMap"), &_3$$4); } - zephir_read_property(&_4, this_ptr, SL("_options"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_4, this_ptr, SL("_params"), PH_NOISY_CC | PH_READONLY); if (Z_TYPE_P(&_4) == IS_NULL) { ZEPHIR_INIT_VAR(&_5$$5); array_init(&_5$$5); - zephir_update_property_zval(this_ptr, SL("_options"), &_5$$5); + zephir_update_property_zval(this_ptr, SL("_params"), &_5$$5); + } + zephir_read_property(&_6, this_ptr, SL("_options"), PH_NOISY_CC | PH_READONLY); + if (Z_TYPE_P(&_6) == IS_NULL) { + ZEPHIR_INIT_VAR(&_7$$6); + array_init(&_7$$6); + zephir_update_property_zval(this_ptr, SL("_options"), &_7$$6); } ZEPHIR_MM_RESTORE(); return Z_OBJ_P(this_ptr); diff --git a/ext/phalcon/config.zep.c b/ext/phalcon/config.zep.c index 8ebaafe4bf9..b2e07d9091f 100644 --- a/ext/phalcon/config.zep.c +++ b/ext/phalcon/config.zep.c @@ -409,17 +409,37 @@ PHP_METHOD(Phalcon_Config, offsetUnset) { PHP_METHOD(Phalcon_Config, merge) { zend_long ZEPHIR_LAST_CALL_STATUS; - zval *config, config_sub; + zval *configParam, configParam_sub, config, _0; zval *this_ptr = getThis(); - ZVAL_UNDEF(&config_sub); + ZVAL_UNDEF(&configParam_sub); + ZVAL_UNDEF(&config); + ZVAL_UNDEF(&_0); ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &config); + zephir_fetch_params(1, 1, 0, &configParam); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_merge", NULL, 13, config); + ZEPHIR_INIT_VAR(&_0); + zephir_gettype(&_0, configParam TSRMLS_CC); + do { + if (ZEPHIR_IS_STRING(&_0, "array")) { + ZEPHIR_INIT_VAR(&config); + object_init_ex(&config, phalcon_config_ce); + ZEPHIR_CALL_METHOD(NULL, &config, "__construct", NULL, 12, configParam); + zephir_check_call_status(); + break; + } + if (ZEPHIR_IS_STRING(&_0, "object")) { + ZEPHIR_CPY_WRT(&config, configParam); + break; + } + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_config_exception_ce, "Invalid data type for merge.", "phalcon/config.zep", 216); + return; + } while(0); + + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_merge", NULL, 13, &config); zephir_check_call_status(); RETURN_MM(); @@ -454,7 +474,7 @@ PHP_METHOD(Phalcon_Config, toArray) { array_init(&arrayConfig); ZEPHIR_CALL_FUNCTION(&_0, "get_object_vars", NULL, 14, this_ptr); zephir_check_call_status(); - zephir_is_iterable(&_0, 0, "phalcon/config.zep", 234); + zephir_is_iterable(&_0, 0, "phalcon/config.zep", 247); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_0), _2, _3, _1) { ZEPHIR_INIT_NVAR(&key); @@ -637,7 +657,7 @@ PHP_METHOD(Phalcon_Config, _merge) { zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&_0, "get_object_vars", NULL, 14, config); zephir_check_call_status(); - zephir_is_iterable(&_0, 0, "phalcon/config.zep", 322); + zephir_is_iterable(&_0, 0, "phalcon/config.zep", 335); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_0), _2, _3, _1) { ZEPHIR_INIT_NVAR(&key); diff --git a/ext/phalcon/config.zep.h b/ext/phalcon/config.zep.h index 23c27566cd0..963cc2b0568 100644 --- a/ext/phalcon/config.zep.h +++ b/ext/phalcon/config.zep.h @@ -63,7 +63,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_config_merge, 0, 1, Phalc #else ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_config_merge, 0, 1, IS_OBJECT, "Phalcon\\Config", 0) #endif - ZEND_ARG_OBJ_INFO(0, config, Phalcon\\Config, 0) + ZEND_ARG_INFO(0, configParam) ZEND_END_ARG_INFO() #if PHP_VERSION_ID >= 70200 diff --git a/ext/phalcon/di.zep.c b/ext/phalcon/di.zep.c index 9da17c0abac..9b4e35682e1 100644 --- a/ext/phalcon/di.zep.c +++ b/ext/phalcon/di.zep.c @@ -471,31 +471,31 @@ PHP_METHOD(Phalcon_Di, getService) { */ PHP_METHOD(Phalcon_Di, get) { - zend_bool _9$$8; - zval _1$$3, _10$$14; + zend_bool _10$$8; + zval _1$$3, _11$$14; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *name_param = NULL, *parameters = NULL, parameters_sub, __$null, service, eventsManager, instance, e, _0, _2$$3, _3$$4, _4$$5, _5$$7, _7$$9, _11$$14; - zval name, _6$$7, _8$$9; + zval *name_param = NULL, *parameters = NULL, parameters_sub, __$null, service, eventsManager, instance, _0, _2$$3, _3$$4, _4$$5, _5$$5, _6$$7, _8$$9, _12$$14; + zval name, _7$$7, _9$$9; zval *this_ptr = getThis(); ZVAL_UNDEF(&name); - ZVAL_UNDEF(&_6$$7); - ZVAL_UNDEF(&_8$$9); + ZVAL_UNDEF(&_7$$7); + ZVAL_UNDEF(&_9$$9); ZVAL_UNDEF(¶meters_sub); ZVAL_NULL(&__$null); ZVAL_UNDEF(&service); ZVAL_UNDEF(&eventsManager); ZVAL_UNDEF(&instance); - ZVAL_UNDEF(&e); ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_2$$3); ZVAL_UNDEF(&_3$$4); ZVAL_UNDEF(&_4$$5); - ZVAL_UNDEF(&_5$$7); - ZVAL_UNDEF(&_7$$9); - ZVAL_UNDEF(&_11$$14); + ZVAL_UNDEF(&_5$$5); + ZVAL_UNDEF(&_6$$7); + ZVAL_UNDEF(&_8$$9); + ZVAL_UNDEF(&_12$$14); ZVAL_UNDEF(&_1$$3); - ZVAL_UNDEF(&_10$$14); + ZVAL_UNDEF(&_11$$14); ZEPHIR_MM_GROW(); zephir_fetch_params(1, 1, 1, &name_param, ¶meters); @@ -546,37 +546,38 @@ PHP_METHOD(Phalcon_Di, get) { ZEPHIR_INIT_VAR(&_4$$5); ZVAL_OBJ(&_4$$5, EG(exception)); Z_ADDREF_P(&_4$$5); + ZEPHIR_INIT_VAR(&_5$$5); if (zephir_instance_of_ev(&_4$$5, phalcon_di_exception_serviceresolutionexception_ce TSRMLS_CC)) { zend_clear_exception(TSRMLS_C); - ZEPHIR_CPY_WRT(&e, &_4$$5); - ZEPHIR_INIT_VAR(&_5$$7); - object_init_ex(&_5$$7, phalcon_di_exception_ce); + ZEPHIR_CPY_WRT(&_5$$5, &_4$$5); ZEPHIR_INIT_VAR(&_6$$7); - ZEPHIR_CONCAT_SVS(&_6$$7, "Service '", &name, "' cannot be resolved"); - ZEPHIR_CALL_METHOD(NULL, &_5$$7, "__construct", NULL, 4, &_6$$7); + object_init_ex(&_6$$7, phalcon_di_exception_ce); + ZEPHIR_INIT_VAR(&_7$$7); + ZEPHIR_CONCAT_SVS(&_7$$7, "Service '", &name, "' cannot be resolved"); + ZEPHIR_CALL_METHOD(NULL, &_6$$7, "__construct", NULL, 4, &_7$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_5$$7, "phalcon/di.zep", 228 TSRMLS_CC); + zephir_throw_exception_debug(&_6$$7, "phalcon/di.zep", 228 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } } } else { if (!(zephir_class_exists(&name, 1 TSRMLS_CC))) { - ZEPHIR_INIT_VAR(&_7$$9); - object_init_ex(&_7$$9, phalcon_di_exception_ce); ZEPHIR_INIT_VAR(&_8$$9); - ZEPHIR_CONCAT_SVS(&_8$$9, "Service '", &name, "' wasn't found in the dependency injection container"); - ZEPHIR_CALL_METHOD(NULL, &_7$$9, "__construct", NULL, 4, &_8$$9); + object_init_ex(&_8$$9, phalcon_di_exception_ce); + ZEPHIR_INIT_VAR(&_9$$9); + ZEPHIR_CONCAT_SVS(&_9$$9, "Service '", &name, "' wasn't found in the dependency injection container"); + ZEPHIR_CALL_METHOD(NULL, &_8$$9, "__construct", NULL, 4, &_9$$9); zephir_check_call_status(); - zephir_throw_exception_debug(&_7$$9, "phalcon/di.zep", 235 TSRMLS_CC); + zephir_throw_exception_debug(&_8$$9, "phalcon/di.zep", 235 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - _9$$8 = Z_TYPE_P(parameters) == IS_ARRAY; - if (_9$$8) { - _9$$8 = ((zephir_fast_count_int(parameters TSRMLS_CC)) ? 1 : 0); + _10$$8 = Z_TYPE_P(parameters) == IS_ARRAY; + if (_10$$8) { + _10$$8 = ((zephir_fast_count_int(parameters TSRMLS_CC)) ? 1 : 0); } - if (_9$$8) { + if (_10$$8) { ZEPHIR_INIT_NVAR(&instance); ZEPHIR_LAST_CALL_STATUS = zephir_create_instance_params(&instance, &name, parameters TSRMLS_CC); zephir_check_call_status(); @@ -594,14 +595,14 @@ PHP_METHOD(Phalcon_Di, get) { } } if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_VAR(&_10$$14); - zephir_create_array(&_10$$14, 3, 0 TSRMLS_CC); - zephir_array_update_string(&_10$$14, SL("name"), &name, PH_COPY | PH_SEPARATE); - zephir_array_update_string(&_10$$14, SL("parameters"), parameters, PH_COPY | PH_SEPARATE); - zephir_array_update_string(&_10$$14, SL("instance"), &instance, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_VAR(&_11$$14); - ZVAL_STRING(&_11$$14, "di:afterServiceResolve"); - ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_11$$14, this_ptr, &_10$$14); + zephir_create_array(&_11$$14, 3, 0 TSRMLS_CC); + zephir_array_update_string(&_11$$14, SL("name"), &name, PH_COPY | PH_SEPARATE); + zephir_array_update_string(&_11$$14, SL("parameters"), parameters, PH_COPY | PH_SEPARATE); + zephir_array_update_string(&_11$$14, SL("instance"), &instance, PH_COPY | PH_SEPARATE); + ZEPHIR_INIT_VAR(&_12$$14); + ZVAL_STRING(&_12$$14, "di:afterServiceResolve"); + ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_12$$14, this_ptr, &_11$$14); zephir_check_call_status(); } RETURN_CCTOR(&instance); diff --git a/ext/phalcon/di/factorydefault.zep.c b/ext/phalcon/di/factorydefault.zep.c index 68d93536ceb..a71972c547d 100644 --- a/ext/phalcon/di/factorydefault.zep.c +++ b/ext/phalcon/di/factorydefault.zep.c @@ -218,7 +218,7 @@ PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) { ZEPHIR_INIT_NVAR(&_2); object_init_ex(&_2, phalcon_di_service_ce); ZEPHIR_INIT_NVAR(&_3); - ZVAL_STRING(&_3, "Phalcon\\Mvc\\Url"); + ZVAL_STRING(&_3, "Phalcon\\Url"); ZVAL_BOOL(&_4, 1); ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 54, &_3, &_4); zephir_check_call_status(); diff --git a/ext/phalcon/di/injectable.zep.c b/ext/phalcon/di/injectable.zep.c index 11a867043df..dfdd3e1c867 100644 --- a/ext/phalcon/di/injectable.zep.c +++ b/ext/phalcon/di/injectable.zep.c @@ -38,7 +38,7 @@ * * @property \Phalcon\Mvc\Dispatcher|\Phalcon\Mvc\DispatcherInterface $dispatcher * @property \Phalcon\Mvc\Router|\Phalcon\Mvc\RouterInterface $router - * @property \Phalcon\Mvc\Url|\Phalcon\Mvc\UrlInterface $url + * @property \Phalcon\Url|\Phalcon\UrlInterface $url * @property \Phalcon\Http\Request|\Phalcon\Http\RequestInterface $request * @property \Phalcon\Http\Response|\Phalcon\Http\ResponseInterface $response * @property \Phalcon\Http\Response\Cookies|\Phalcon\Http\Response\CookiesInterface $cookies diff --git a/ext/phalcon/dispatcher.zep.c b/ext/phalcon/dispatcher.zep.c index 62cb67d057c..0b662cfc9ea 100644 --- a/ext/phalcon/dispatcher.zep.c +++ b/ext/phalcon/dispatcher.zep.c @@ -18,8 +18,8 @@ #include "kernel/exception.h" #include "kernel/array.h" #include "kernel/fcall.h" -#include "kernel/string.h" #include "kernel/concat.h" +#include "kernel/string.h" #include "ext/spl/spl_exceptions.h" @@ -77,6 +77,8 @@ ZEPHIR_INIT_CLASS(Phalcon_Dispatcher) { zend_declare_property_null(phalcon_dispatcher_ce, SL("_activeMethodMap"), ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_null(phalcon_dispatcher_ce, SL("_camelCaseMap"), ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_null(phalcon_dispatcher_ce, SL("_previousNamespaceName"), ZEND_ACC_PROTECTED TSRMLS_CC); zend_declare_property_null(phalcon_dispatcher_ce, SL("_previousHandlerName"), ZEND_ACC_PROTECTED TSRMLS_CC); @@ -378,7 +380,7 @@ PHP_METHOD(Phalcon_Dispatcher, setParams) { if (Z_TYPE_P(params) != IS_ARRAY) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_exception_ce, "Parameters must be an Array", "phalcon/dispatcher.zep", 226); + ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_exception_ce, "Parameters must be an Array", "phalcon/dispatcher.zep", 228); return; } zephir_update_property_zval(this_ptr, SL("_params"), params); @@ -511,20 +513,17 @@ PHP_METHOD(Phalcon_Dispatcher, hasParam) { */ PHP_METHOD(Phalcon_Dispatcher, getActiveMethod) { - zval activeMethodName, _0, _1, _8, _2$$3, _3$$3, _4$$3, _5$$3, _6$$3, _7$$3; + zval activeMethodName, _0, _1, _5, _2$$3, _3$$3, _4$$3; zend_long ZEPHIR_LAST_CALL_STATUS; zval *this_ptr = getThis(); ZVAL_UNDEF(&activeMethodName); ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_8); + ZVAL_UNDEF(&_5); ZVAL_UNDEF(&_2$$3); ZVAL_UNDEF(&_3$$3); ZVAL_UNDEF(&_4$$3); - ZVAL_UNDEF(&_5$$3); - ZVAL_UNDEF(&_6$$3); - ZVAL_UNDEF(&_7$$3); ZEPHIR_MM_GROW(); @@ -532,25 +531,17 @@ PHP_METHOD(Phalcon_Dispatcher, getActiveMethod) { zephir_read_property(&_0, this_ptr, SL("_activeMethodMap"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_1, this_ptr, SL("_actionName"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset_fetch(&activeMethodName, &_0, &_1, 0 TSRMLS_CC))) { - ZEPHIR_INIT_VAR(&_2$$3); zephir_read_property(&_3$$3, this_ptr, SL("_actionName"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_INIT_VAR(&_4$$3); - ZVAL_STRING(&_4$$3, "/[_-]+/"); - ZEPHIR_CALL_FUNCTION(&_5$$3, "preg_split", NULL, 58, &_4$$3, &_3$$3); - zephir_check_call_status(); - ZEPHIR_INIT_NVAR(&_4$$3); - ZVAL_STRING(&_4$$3, "ucfirst"); - ZEPHIR_CALL_FUNCTION(&_6$$3, "array_map", NULL, 59, &_4$$3, &_5$$3); + ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "tocamelcase", NULL, 0, &_3$$3); zephir_check_call_status(); - zephir_fast_join_str(&_2$$3, SL(""), &_6$$3 TSRMLS_CC); ZEPHIR_CALL_FUNCTION(&activeMethodName, "lcfirst", NULL, 55, &_2$$3); zephir_check_call_status(); - ZEPHIR_OBS_VAR(&_7$$3); - zephir_read_property(&_7$$3, this_ptr, SL("_actionName"), PH_NOISY_CC); - zephir_update_property_array(this_ptr, SL("_activeMethodMap"), &_7$$3, &activeMethodName TSRMLS_CC); + ZEPHIR_OBS_VAR(&_4$$3); + zephir_read_property(&_4$$3, this_ptr, SL("_actionName"), PH_NOISY_CC); + zephir_update_property_array(this_ptr, SL("_activeMethodMap"), &_4$$3, &activeMethodName TSRMLS_CC); } - zephir_read_property(&_8, this_ptr, SL("_actionSuffix"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CONCAT_VV(return_value, &activeMethodName, &_8); + zephir_read_property(&_5, this_ptr, SL("_actionSuffix"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CONCAT_VV(return_value, &activeMethodName, &_5); RETURN_MM(); } @@ -871,7 +862,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { if (ZEPHIR_IS_FALSE_IDENTICAL(&status)) { RETURN_MM_BOOL(0); } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 434 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 436 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -947,7 +938,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { if (_21$$15) { continue; } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 470 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 472 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -1097,7 +1088,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { zephir_check_call_status(); continue; } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 564 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 566 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -1141,7 +1132,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { zephir_check_call_status(); continue; } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 581 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 583 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -1184,7 +1175,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { if (_75$$42) { continue; } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 614 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 616 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -1231,7 +1222,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { if (_85$$47) { continue; } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 631 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 633 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -1303,7 +1294,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { if (_101$$58) { continue; } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 681 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 683 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -1344,7 +1335,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { if (_111$$63) { continue; } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 695 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 697 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -1384,7 +1375,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { if (_119$$68) { continue; } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 710 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 712 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -1418,7 +1409,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { if (_126$$72) { continue; } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 724 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 726 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -1448,7 +1439,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { if (ZEPHIR_IS_FALSE_IDENTICAL(&_130$$76)) { RETURN_MM_BOOL(0); } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 741 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 743 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -1499,11 +1490,11 @@ PHP_METHOD(Phalcon_Dispatcher, forward) { zephir_read_property(&_0, this_ptr, SL("_isControllerInitialize"), PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_exception_ce, "Forwarding inside a controller's initialize() method is forbidden", "phalcon/dispatcher.zep", 772); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_exception_ce, "Forwarding inside a controller's initialize() method is forbidden", "phalcon/dispatcher.zep", 774); return; } if (Z_TYPE_P(forward) != IS_ARRAY) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_exception_ce, "Forward parameter must be an Array", "phalcon/dispatcher.zep", 780); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_exception_ce, "Forward parameter must be an Array", "phalcon/dispatcher.zep", 782); return; } zephir_read_property(&_1, this_ptr, SL("_namespaceName"), PH_NOISY_CC | PH_READONLY); @@ -1578,9 +1569,9 @@ PHP_METHOD(Phalcon_Dispatcher, getHandlerClass) { zephir_read_property(&handlerName, this_ptr, SL("_handlerName"), PH_NOISY_CC); ZEPHIR_OBS_VAR(&namespaceName); zephir_read_property(&namespaceName, this_ptr, SL("_namespaceName"), PH_NOISY_CC); - if (!(zephir_memnstr_str(&handlerName, SL("\\"), "phalcon/dispatcher.zep", 837))) { - ZEPHIR_INIT_VAR(&camelizedClass); - zephir_camelize(&camelizedClass, &handlerName, NULL ); + if (!(zephir_memnstr_str(&handlerName, SL("\\"), "phalcon/dispatcher.zep", 839))) { + ZEPHIR_CALL_METHOD(&camelizedClass, this_ptr, "tocamelcase", NULL, 0, &handlerName); + zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&camelizedClass, &handlerName); } @@ -1703,30 +1694,77 @@ PHP_METHOD(Phalcon_Dispatcher, _resolveEmptyProperties) { } +PHP_METHOD(Phalcon_Dispatcher, toCamelCase) { + + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *input_param = NULL, camelCaseInput, _0, _1$$3, _2$$3, _3$$3; + zval input; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&input); + ZVAL_UNDEF(&camelCaseInput); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1$$3); + ZVAL_UNDEF(&_2$$3); + ZVAL_UNDEF(&_3$$3); + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &input_param); + + zephir_get_strval(&input, input_param); + + + ZEPHIR_OBS_VAR(&camelCaseInput); + zephir_read_property(&_0, this_ptr, SL("_camelCaseMap"), PH_NOISY_CC | PH_READONLY); + if (!(zephir_array_isset_fetch(&camelCaseInput, &_0, &input, 0 TSRMLS_CC))) { + ZEPHIR_INIT_VAR(&_1$$3); + ZVAL_STRING(&_1$$3, "/[_-]+/"); + ZEPHIR_CALL_FUNCTION(&_2$$3, "preg_split", NULL, 58, &_1$$3, &input); + zephir_check_call_status(); + ZEPHIR_INIT_NVAR(&_1$$3); + ZVAL_STRING(&_1$$3, "ucfirst"); + ZEPHIR_CALL_FUNCTION(&_3$$3, "array_map", NULL, 59, &_1$$3, &_2$$3); + zephir_check_call_status(); + ZEPHIR_INIT_NVAR(&camelCaseInput); + zephir_fast_join_str(&camelCaseInput, SL(""), &_3$$3 TSRMLS_CC); + zephir_update_property_array(this_ptr, SL("_camelCaseMap"), &input, &camelCaseInput TSRMLS_CC); + } + RETURN_CCTOR(&camelCaseInput); + +} + zend_object *zephir_init_properties_Phalcon_Dispatcher(zend_class_entry *class_type TSRMLS_DC) { - zval _0, _2, _1$$3, _3$$4; + zval _0, _2, _4, _1$$3, _3$$4, _5$$5; ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_4); ZVAL_UNDEF(&_1$$3); ZVAL_UNDEF(&_3$$4); + ZVAL_UNDEF(&_5$$5); ZEPHIR_MM_GROW(); { zval local_this_ptr, *this_ptr = &local_this_ptr; ZEPHIR_CREATE_OBJECT(this_ptr, class_type); - zephir_read_property(&_0, this_ptr, SL("_activeMethodMap"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_0, this_ptr, SL("_camelCaseMap"), PH_NOISY_CC | PH_READONLY); if (Z_TYPE_P(&_0) == IS_NULL) { ZEPHIR_INIT_VAR(&_1$$3); array_init(&_1$$3); - zephir_update_property_zval(this_ptr, SL("_activeMethodMap"), &_1$$3); + zephir_update_property_zval(this_ptr, SL("_camelCaseMap"), &_1$$3); } - zephir_read_property(&_2, this_ptr, SL("_params"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_2, this_ptr, SL("_activeMethodMap"), PH_NOISY_CC | PH_READONLY); if (Z_TYPE_P(&_2) == IS_NULL) { ZEPHIR_INIT_VAR(&_3$$4); array_init(&_3$$4); - zephir_update_property_zval(this_ptr, SL("_params"), &_3$$4); + zephir_update_property_zval(this_ptr, SL("_activeMethodMap"), &_3$$4); + } + zephir_read_property(&_4, this_ptr, SL("_params"), PH_NOISY_CC | PH_READONLY); + if (Z_TYPE_P(&_4) == IS_NULL) { + ZEPHIR_INIT_VAR(&_5$$5); + array_init(&_5$$5); + zephir_update_property_zval(this_ptr, SL("_params"), &_5$$5); } ZEPHIR_MM_RESTORE(); return Z_OBJ_P(this_ptr); diff --git a/ext/phalcon/dispatcher.zep.h b/ext/phalcon/dispatcher.zep.h index 73c03b163b4..7a6557111ef 100644 --- a/ext/phalcon/dispatcher.zep.h +++ b/ext/phalcon/dispatcher.zep.h @@ -38,6 +38,7 @@ PHP_METHOD(Phalcon_Dispatcher, getHandlerClass); PHP_METHOD(Phalcon_Dispatcher, callActionMethod); PHP_METHOD(Phalcon_Dispatcher, getBoundModels); PHP_METHOD(Phalcon_Dispatcher, _resolveEmptyProperties); +PHP_METHOD(Phalcon_Dispatcher, toCamelCase); zend_object *zephir_init_properties_Phalcon_Dispatcher(zend_class_entry *class_type TSRMLS_DC); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_dispatcher_setdi, 0, 0, 1) @@ -259,6 +260,18 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_dispatcher_getboundmodel #endif ZEND_END_ARG_INFO() +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_dispatcher_tocamelcase, 0, 1, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_dispatcher_tocamelcase, 0, 1, IS_STRING, NULL, 0) +#endif +#if PHP_VERSION_ID >= 70200 + ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0) +#else + ZEND_ARG_INFO(0, input) +#endif +ZEND_END_ARG_INFO() + ZEPHIR_INIT_FUNCS(phalcon_dispatcher_method_entry) { PHP_ME(Phalcon_Dispatcher, setDI, arginfo_phalcon_dispatcher_setdi, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Dispatcher, getDI, arginfo_phalcon_dispatcher_getdi, ZEND_ACC_PUBLIC) @@ -295,5 +308,6 @@ ZEPHIR_INIT_FUNCS(phalcon_dispatcher_method_entry) { PHP_ME(Phalcon_Dispatcher, callActionMethod, arginfo_phalcon_dispatcher_callactionmethod, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Dispatcher, getBoundModels, arginfo_phalcon_dispatcher_getboundmodels, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Dispatcher, _resolveEmptyProperties, NULL, ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Dispatcher, toCamelCase, arginfo_phalcon_dispatcher_tocamelcase, ZEND_ACC_PROTECTED) PHP_FE_END }; diff --git a/ext/phalcon/mvc/model.zep.c b/ext/phalcon/mvc/model.zep.c index 71a9b51d15a..b6a06a3d753 100644 --- a/ext/phalcon/mvc/model.zep.c +++ b/ext/phalcon/mvc/model.zep.c @@ -1837,16 +1837,17 @@ PHP_METHOD(Phalcon_Mvc_Model, find) { */ PHP_METHOD(Phalcon_Mvc_Model, findFirst) { + zend_bool _0; zend_long ZEPHIR_LAST_CALL_STATUS; - zephir_fcall_cache_entry *_0 = NULL; - zval *parameters = NULL, parameters_sub, __$null, params, query, _1; + zephir_fcall_cache_entry *_1 = NULL; + zval *parameters = NULL, parameters_sub, __$null, params, query, _2; zval *this_ptr = getThis(); ZVAL_UNDEF(¶meters_sub); ZVAL_NULL(&__$null); ZVAL_UNDEF(¶ms); ZVAL_UNDEF(&query); - ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2); ZEPHIR_MM_GROW(); zephir_fetch_params(1, 0, 1, ¶meters); @@ -1857,20 +1858,28 @@ PHP_METHOD(Phalcon_Mvc_Model, findFirst) { } - if (Z_TYPE_P(parameters) != IS_ARRAY) { + _0 = Z_TYPE_P(parameters) == IS_STRING; + if (!(_0)) { + _0 = 1 == zephir_is_numeric(parameters); + } + if (Z_TYPE_P(parameters) == IS_NULL) { ZEPHIR_INIT_VAR(¶ms); array_init(¶ms); - if (Z_TYPE_P(parameters) != IS_NULL) { - zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/mvc/model.zep", 1274); - } - } else { + } else if (Z_TYPE_P(parameters) == IS_ARRAY) { ZEPHIR_CPY_WRT(¶ms, parameters); + } else if (_0) { + ZEPHIR_INIT_NVAR(¶ms); + array_init(¶ms); + zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/mvc/model.zep", 1277); + } else { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Parameters passed must be of type array, string, numeric or null", "phalcon/mvc/model.zep", 1279); + return; } - ZVAL_LONG(&_1, 1); - ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_0, 320, ¶ms, &_1); + ZVAL_LONG(&_2, 1); + ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_1, 320, ¶ms, &_2); zephir_check_call_status(); - ZVAL_BOOL(&_1, 1); - ZEPHIR_CALL_METHOD(NULL, &query, "setuniquerow", NULL, 0, &_1); + ZVAL_BOOL(&_2, 1); + ZEPHIR_CALL_METHOD(NULL, &query, "setuniquerow", NULL, 0, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(&query, "execute", NULL, 0); zephir_check_call_status(); @@ -2001,7 +2010,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getChangedFields) { ZEPHIR_OBS_VAR(&snapshot); zephir_read_property(&snapshot, this_ptr, SL("_snapshot"), PH_NOISY_CC); if (Z_TYPE_P(&snapshot) != IS_ARRAY) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record doesn't have a valid data snapshot", "phalcon/mvc/model.zep", 1356); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record doesn't have a valid data snapshot", "phalcon/mvc/model.zep", 1358); return; } ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); @@ -2017,7 +2026,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getChangedFields) { ZEPHIR_INIT_VAR(&changed); array_init(&changed); ZEPHIR_INIT_VAR(&_0); - zephir_is_iterable(&allAttributes, 0, "phalcon/mvc/model.zep", 1409); + zephir_is_iterable(&allAttributes, 0, "phalcon/mvc/model.zep", 1411); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&allAttributes), _2, _3, _1) { ZEPHIR_INIT_NVAR(&name); @@ -2029,17 +2038,17 @@ PHP_METHOD(Phalcon_Mvc_Model, getChangedFields) { ZEPHIR_INIT_NVAR(&_0); ZVAL_COPY(&_0, _1); if (!(zephir_array_isset(&snapshot, &name))) { - zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/mvc/model.zep", 1388); + zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/mvc/model.zep", 1390); continue; } ZEPHIR_OBS_NVAR(&value); if (!(zephir_fetch_property_zval(&value, this_ptr, &name, PH_SILENT_CC))) { - zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/mvc/model.zep", 1396); + zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/mvc/model.zep", 1398); continue; } - zephir_array_fetch(&_4$$6, &snapshot, &name, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1403 TSRMLS_CC); + zephir_array_fetch(&_4$$6, &snapshot, &name, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1405 TSRMLS_CC); if (!ZEPHIR_IS_IDENTICAL(&value, &_4$$6)) { - zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/mvc/model.zep", 1404); + zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/mvc/model.zep", 1406); continue; } } ZEND_HASH_FOREACH_END(); @@ -2147,7 +2156,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getMessages) { ZEPHIR_INIT_VAR(&filtered); array_init(&filtered); zephir_read_property(&_1$$3, this_ptr, SL("_errorMessages"), PH_NOISY_CC | PH_READONLY); - zephir_is_iterable(&_1$$3, 0, "phalcon/mvc/model.zep", 1470); + zephir_is_iterable(&_1$$3, 0, "phalcon/mvc/model.zep", 1472); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_1$$3), _2$$3) { ZEPHIR_INIT_NVAR(&message); @@ -2155,7 +2164,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getMessages) { ZEPHIR_CALL_METHOD(&_3$$4, &message, "getfield", NULL, 0); zephir_check_call_status(); if (ZEPHIR_IS_EQUAL(&_3$$4, filter)) { - zephir_array_append(&filtered, &message, PH_SEPARATE, "phalcon/mvc/model.zep", 1467); + zephir_array_append(&filtered, &message, PH_SEPARATE, "phalcon/mvc/model.zep", 1469); } } ZEND_HASH_FOREACH_END(); ZEPHIR_INIT_NVAR(&message); @@ -2205,7 +2214,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getModelsMetaData) { zephir_check_call_status(); ZEPHIR_CPY_WRT(&metaData, &_1$$3); if (Z_TYPE_P(&metaData) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsMetadata' is not valid", "phalcon/mvc/model.zep", 1501); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsMetadata' is not valid", "phalcon/mvc/model.zep", 1503); return; } zephir_update_property_zval(this_ptr, SL("_modelsMetaData"), &metaData); @@ -2334,7 +2343,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getRelated) { ZEPHIR_CONCAT_SVSVS(&_3$$3, "There is no defined relations for the model '", &className, "' using alias '", &alias, "'"); ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 4, &_3$$3); zephir_check_call_status(); - zephir_throw_exception_debug(&_2$$3, "phalcon/mvc/model.zep", 1568 TSRMLS_CC); + zephir_throw_exception_debug(&_2$$3, "phalcon/mvc/model.zep", 1570 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -2455,21 +2464,21 @@ PHP_METHOD(Phalcon_Mvc_Model, getUpdatedFields) { ZEPHIR_OBS_VAR(&oldSnapshot); zephir_read_property(&oldSnapshot, this_ptr, SL("_oldSnapshot"), PH_NOISY_CC); if (!(ZEPHIR_GLOBAL(orm).update_snapshot_on_save)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Update snapshot on save must be enabled for this method to work properly", "phalcon/mvc/model.zep", 1632); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Update snapshot on save must be enabled for this method to work properly", "phalcon/mvc/model.zep", 1634); return; } if (Z_TYPE_P(&snapshot) != IS_ARRAY) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record doesn't have a valid data snapshot", "phalcon/mvc/model.zep", 1636); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record doesn't have a valid data snapshot", "phalcon/mvc/model.zep", 1638); return; } zephir_read_property(&_0, this_ptr, SL("_dirtyState"), PH_NOISY_CC | PH_READONLY); if (!ZEPHIR_IS_LONG(&_0, 0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Change checking cannot be performed because the object has not been persisted or is deleted", "phalcon/mvc/model.zep", 1643); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Change checking cannot be performed because the object has not been persisted or is deleted", "phalcon/mvc/model.zep", 1645); return; } ZEPHIR_INIT_VAR(&updated); array_init(&updated); - zephir_is_iterable(&snapshot, 0, "phalcon/mvc/model.zep", 1663); + zephir_is_iterable(&snapshot, 0, "phalcon/mvc/model.zep", 1665); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&snapshot), _2, _3, _1) { ZEPHIR_INIT_NVAR(&name); @@ -2481,12 +2490,12 @@ PHP_METHOD(Phalcon_Mvc_Model, getUpdatedFields) { ZEPHIR_INIT_NVAR(&value); ZVAL_COPY(&value, _1); if (!(zephir_array_isset(&oldSnapshot, &name))) { - zephir_array_append(&updated, &name, PH_SEPARATE, "phalcon/mvc/model.zep", 1653); + zephir_array_append(&updated, &name, PH_SEPARATE, "phalcon/mvc/model.zep", 1655); continue; } - zephir_array_fetch(&_4$$6, &oldSnapshot, &name, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1657 TSRMLS_CC); + zephir_array_fetch(&_4$$6, &oldSnapshot, &name, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1659 TSRMLS_CC); if (!ZEPHIR_IS_IDENTICAL(&value, &_4$$6)) { - zephir_array_append(&updated, &name, PH_SEPARATE, "phalcon/mvc/model.zep", 1658); + zephir_array_append(&updated, &name, PH_SEPARATE, "phalcon/mvc/model.zep", 1660); continue; } } ZEND_HASH_FOREACH_END(); @@ -2946,7 +2955,7 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh) { zephir_read_property(&_0, this_ptr, SL("_dirtyState"), PH_NOISY_CC | PH_READONLY); if (!ZEPHIR_IS_LONG(&_0, 0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 1900); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 1902); return; } ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); @@ -2973,7 +2982,7 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh) { ZEPHIR_CALL_METHOD(&_2$$6, this_ptr, "_exists", NULL, 0, &metaData, &readConnection, &table); zephir_check_call_status(); if (!(zephir_is_true(&_2$$6))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 1923); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 1925); return; } ZEPHIR_OBS_NVAR(&uniqueKey); @@ -2982,14 +2991,14 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh) { ZEPHIR_OBS_VAR(&uniqueParams); zephir_read_property(&uniqueParams, this_ptr, SL("_uniqueParams"), PH_NOISY_CC); if (Z_TYPE_P(&uniqueParams) != IS_ARRAY) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 1931); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 1933); return; } ZEPHIR_INIT_VAR(&fields); array_init(&fields); ZEPHIR_CALL_METHOD(&_3, &metaData, "getattributes", NULL, 0, this_ptr); zephir_check_call_status(); - zephir_is_iterable(&_3, 0, "phalcon/mvc/model.zep", 1945); + zephir_is_iterable(&_3, 0, "phalcon/mvc/model.zep", 1947); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_3), _4) { ZEPHIR_INIT_NVAR(&attribute); @@ -2997,7 +3006,7 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh) { ZEPHIR_INIT_NVAR(&_5$$9); zephir_create_array(&_5$$9, 1, 0 TSRMLS_CC); zephir_array_fast_append(&_5$$9, &attribute); - zephir_array_append(&fields, &_5$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 1939); + zephir_array_append(&fields, &_5$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 1941); } ZEND_HASH_FOREACH_END(); ZEPHIR_INIT_NVAR(&attribute); ZEPHIR_CALL_METHOD(&dialect, &readConnection, "getdialect", NULL, 0); @@ -3151,7 +3160,7 @@ PHP_METHOD(Phalcon_Mvc_Model, save) { zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_6$$11, "__construct", NULL, 324, this_ptr, &_7$$11); zephir_check_call_status(); - zephir_throw_exception_debug(&_6$$11, "phalcon/mvc/model.zep", 2073 TSRMLS_CC); + zephir_throw_exception_debug(&_6$$11, "phalcon/mvc/model.zep", 2075 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -3280,7 +3289,7 @@ PHP_METHOD(Phalcon_Mvc_Model, unserialize) { ZEPHIR_CALL_CE_STATIC(&dependencyInjector, phalcon_di_ce, "getdefault", &_0, 0); zephir_check_call_status(); if (Z_TYPE_P(&dependencyInjector) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injector container is required to obtain the services related to the ORM", "phalcon/mvc/model.zep", 2168); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injector container is required to obtain the services related to the ORM", "phalcon/mvc/model.zep", 2170); return; } zephir_update_property_zval(this_ptr, SL("_dependencyInjector"), &dependencyInjector); @@ -3290,7 +3299,7 @@ PHP_METHOD(Phalcon_Mvc_Model, unserialize) { zephir_check_call_status(); ZEPHIR_CPY_WRT(&manager, &_1$$3); if (Z_TYPE_P(&manager) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsManager' is not valid", "phalcon/mvc/model.zep", 2181); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsManager' is not valid", "phalcon/mvc/model.zep", 2183); return; } zephir_update_property_zval(this_ptr, SL("_modelsManager"), &manager); @@ -3301,13 +3310,13 @@ PHP_METHOD(Phalcon_Mvc_Model, unserialize) { if (zephir_is_true(&_1$$3)) { if (zephir_array_isset_string_fetch(&snapshot, &attributes, SL("_snapshot"), 1)) { zephir_update_property_zval(this_ptr, SL("_snapshot"), &snapshot); - zephir_array_fetch_string(&_3$$7, &attributes, SL("_attributes"), PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 2196 TSRMLS_CC); + zephir_array_fetch_string(&_3$$7, &attributes, SL("_attributes"), PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 2198 TSRMLS_CC); ZEPHIR_CPY_WRT(&attributes, &_3$$7); } else { zephir_update_property_zval(this_ptr, SL("_snapshot"), &attributes); } } - zephir_is_iterable(&attributes, 0, "phalcon/mvc/model.zep", 2209); + zephir_is_iterable(&attributes, 0, "phalcon/mvc/model.zep", 2211); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&attributes), _5$$3, _6$$3, _4$$3) { ZEPHIR_INIT_NVAR(&key); @@ -3504,7 +3513,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData) { if (Z_TYPE_P(columnMap) == IS_ARRAY) { ZEPHIR_INIT_VAR(&snapshot); array_init(&snapshot); - zephir_is_iterable(&data, 0, "phalcon/mvc/model.zep", 2298); + zephir_is_iterable(&data, 0, "phalcon/mvc/model.zep", 2300); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&data), _1$$3, _2$$3, _0$$3) { ZEPHIR_INIT_NVAR(&key); @@ -3527,7 +3536,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData) { ZEPHIR_CONCAT_SVS(&_4$$7, "Column '", &key, "' doesn't make part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_3$$7, "__construct", &_5, 4, &_4$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_3$$7, "phalcon/mvc/model.zep", 2282 TSRMLS_CC); + zephir_throw_exception_debug(&_3$$7, "phalcon/mvc/model.zep", 2284 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -3544,7 +3553,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData) { ZEPHIR_CONCAT_SVS(&_7$$11, "Column '", &key, "' doesn't make part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_6$$11, "__construct", &_5, 4, &_7$$11); zephir_check_call_status(); - zephir_throw_exception_debug(&_6$$11, "phalcon/mvc/model.zep", 2290 TSRMLS_CC); + zephir_throw_exception_debug(&_6$$11, "phalcon/mvc/model.zep", 2292 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -3607,7 +3616,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) { if (Z_TYPE_P(columnMap) == IS_ARRAY) { ZEPHIR_INIT_VAR(&snapshot); array_init(&snapshot); - zephir_is_iterable(&data, 0, "phalcon/mvc/model.zep", 2358); + zephir_is_iterable(&data, 0, "phalcon/mvc/model.zep", 2360); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&data), _1$$3, _2$$3, _0$$3) { ZEPHIR_INIT_NVAR(&key); @@ -3639,7 +3648,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) { ZEPHIR_CONCAT_SVS(&_7$$8, "Column '", &key, "' doesn't make part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_6$$8, "__construct", &_8, 4, &_7$$8); zephir_check_call_status(); - zephir_throw_exception_debug(&_6$$8, "phalcon/mvc/model.zep", 2340 TSRMLS_CC); + zephir_throw_exception_debug(&_6$$8, "phalcon/mvc/model.zep", 2342 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -3656,7 +3665,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) { ZEPHIR_CONCAT_SVS(&_10$$12, "Column '", &key, "' doesn't make part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_9$$12, "__construct", &_8, 4, &_10$$12); zephir_check_call_status(); - zephir_throw_exception_debug(&_9$$12, "phalcon/mvc/model.zep", 2349 TSRMLS_CC); + zephir_throw_exception_debug(&_9$$12, "phalcon/mvc/model.zep", 2351 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -3978,7 +3987,7 @@ PHP_METHOD(Phalcon_Mvc_Model, toArray) { zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_0, &metaData, "getattributes", NULL, 0, this_ptr); zephir_check_call_status(); - zephir_is_iterable(&_0, 0, "phalcon/mvc/model.zep", 2601); + zephir_is_iterable(&_0, 0, "phalcon/mvc/model.zep", 2603); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _1) { ZEPHIR_INIT_NVAR(&attribute); @@ -4002,7 +4011,7 @@ PHP_METHOD(Phalcon_Mvc_Model, toArray) { ZEPHIR_CONCAT_SVS(&_6$$7, "Column '", &attribute, "' doesn't make part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_5$$7, "__construct", &_7, 4, &_6$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_5$$7, "phalcon/mvc/model.zep", 2579 TSRMLS_CC); + zephir_throw_exception_debug(&_5$$7, "phalcon/mvc/model.zep", 2581 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -4179,7 +4188,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { ZEPHIR_CALL_METHOD(&belongsTo, &manager, "getbelongsto", NULL, 0, this_ptr); zephir_check_call_status(); error = 0; - zephir_is_iterable(&belongsTo, 0, "phalcon/mvc/model.zep", 2798); + zephir_is_iterable(&belongsTo, 0, "phalcon/mvc/model.zep", 2800); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&belongsTo), _1) { ZEPHIR_INIT_NVAR(&relation); @@ -4194,7 +4203,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { if (Z_TYPE_P(&foreignKey) == IS_ARRAY) { if (zephir_array_isset_string(&foreignKey, SL("action"))) { ZEPHIR_OBS_NVAR(&_2$$6); - zephir_array_fetch_string(&_2$$6, &foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 2700 TSRMLS_CC); + zephir_array_fetch_string(&_2$$6, &foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 2702 TSRMLS_CC); action = zephir_get_intval(&_2$$6); } } @@ -4215,7 +4224,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { ZEPHIR_CALL_METHOD(&referencedFields, &relation, "getreferencedfields", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&fields) == IS_ARRAY) { - zephir_is_iterable(&fields, 0, "phalcon/mvc/model.zep", 2738); + zephir_is_iterable(&fields, 0, "phalcon/mvc/model.zep", 2740); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _6$$8, _7$$8, _5$$8) { ZEPHIR_INIT_NVAR(&position); @@ -4228,11 +4237,11 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { ZVAL_COPY(&field, _5$$8); ZEPHIR_OBS_NVAR(&value); zephir_fetch_property_zval(&value, this_ptr, &field, PH_SILENT_CC); - zephir_array_fetch(&_8$$9, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 2731 TSRMLS_CC); + zephir_array_fetch(&_8$$9, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 2733 TSRMLS_CC); ZEPHIR_INIT_LNVAR(_9$$9); ZEPHIR_CONCAT_SVSV(&_9$$9, "[", &_8$$9, "] = ?", &position); - zephir_array_append(&conditions, &_9$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 2731); - zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2732); + zephir_array_append(&conditions, &_9$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 2733); + zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2734); if (Z_TYPE_P(&value) == IS_NULL) { numberNull++; } @@ -4245,15 +4254,15 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { zephir_fetch_property_zval(&value, this_ptr, &fields, PH_SILENT_CC); ZEPHIR_INIT_LNVAR(_10$$11); ZEPHIR_CONCAT_SVS(&_10$$11, "[", &referencedFields, "] = ?0"); - zephir_array_append(&conditions, &_10$$11, PH_SEPARATE, "phalcon/mvc/model.zep", 2743); - zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2744); + zephir_array_append(&conditions, &_10$$11, PH_SEPARATE, "phalcon/mvc/model.zep", 2745); + zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2746); if (Z_TYPE_P(&value) == IS_NULL) { validateWithNulls = 1; } } ZEPHIR_OBS_NVAR(&extraConditions); if (zephir_array_isset_string_fetch(&extraConditions, &foreignKey, SL("conditions"), 0)) { - zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 2755); + zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 2757); } if (validateWithNulls) { ZEPHIR_OBS_NVAR(&allowNulls); @@ -4358,7 +4367,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseCascade) { ZEPHIR_CPY_WRT(&manager, &_0); ZEPHIR_CALL_METHOD(&relations, &manager, "gethasoneandhasmany", NULL, 0, this_ptr); zephir_check_call_status(); - zephir_is_iterable(&relations, 0, "phalcon/mvc/model.zep", 2911); + zephir_is_iterable(&relations, 0, "phalcon/mvc/model.zep", 2913); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relations), _1) { ZEPHIR_INIT_NVAR(&relation); @@ -4372,7 +4381,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseCascade) { if (Z_TYPE_P(&foreignKey) == IS_ARRAY) { if (zephir_array_isset_string(&foreignKey, SL("action"))) { ZEPHIR_OBS_NVAR(&_2$$6); - zephir_array_fetch_string(&_2$$6, &foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 2850 TSRMLS_CC); + zephir_array_fetch_string(&_2$$6, &foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 2852 TSRMLS_CC); action = zephir_get_intval(&_2$$6); } } @@ -4392,7 +4401,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseCascade) { ZEPHIR_INIT_NVAR(&bindParams); array_init(&bindParams); if (Z_TYPE_P(&fields) == IS_ARRAY) { - zephir_is_iterable(&fields, 0, "phalcon/mvc/model.zep", 2880); + zephir_is_iterable(&fields, 0, "phalcon/mvc/model.zep", 2882); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _6$$8, _7$$8, _5$$8) { ZEPHIR_INIT_NVAR(&position); @@ -4405,11 +4414,11 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseCascade) { ZVAL_COPY(&field, _5$$8); ZEPHIR_OBS_NVAR(&value); zephir_fetch_property_zval(&value, this_ptr, &field, PH_SILENT_CC); - zephir_array_fetch(&_8$$9, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 2877 TSRMLS_CC); + zephir_array_fetch(&_8$$9, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 2879 TSRMLS_CC); ZEPHIR_INIT_LNVAR(_9$$9); ZEPHIR_CONCAT_SVSV(&_9$$9, "[", &_8$$9, "] = ?", &position); - zephir_array_append(&conditions, &_9$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 2877); - zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2878); + zephir_array_append(&conditions, &_9$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 2879); + zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2880); } ZEND_HASH_FOREACH_END(); ZEPHIR_INIT_NVAR(&field); ZEPHIR_INIT_NVAR(&position); @@ -4418,12 +4427,12 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseCascade) { zephir_fetch_property_zval(&value, this_ptr, &fields, PH_SILENT_CC); ZEPHIR_INIT_LNVAR(_10$$10); ZEPHIR_CONCAT_SVS(&_10$$10, "[", &referencedFields, "] = ?0"); - zephir_array_append(&conditions, &_10$$10, PH_SEPARATE, "phalcon/mvc/model.zep", 2882); - zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2883); + zephir_array_append(&conditions, &_10$$10, PH_SEPARATE, "phalcon/mvc/model.zep", 2884); + zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2885); } ZEPHIR_OBS_NVAR(&extraConditions); if (zephir_array_isset_string_fetch(&extraConditions, &foreignKey, SL("conditions"), 0)) { - zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 2890); + zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 2892); } ZEPHIR_INIT_NVAR(&_11$$3); zephir_create_array(&_11$$3, 2, 0 TSRMLS_CC); @@ -4492,7 +4501,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseRestrict) { ZEPHIR_CALL_METHOD(&relations, &manager, "gethasoneandhasmany", NULL, 0, this_ptr); zephir_check_call_status(); error = 0; - zephir_is_iterable(&relations, 0, "phalcon/mvc/model.zep", 3029); + zephir_is_iterable(&relations, 0, "phalcon/mvc/model.zep", 3031); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relations), _1) { ZEPHIR_INIT_NVAR(&relation); @@ -4506,7 +4515,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseRestrict) { if (Z_TYPE_P(&foreignKey) == IS_ARRAY) { if (zephir_array_isset_string(&foreignKey, SL("action"))) { ZEPHIR_OBS_NVAR(&_2$$6); - zephir_array_fetch_string(&_2$$6, &foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 2957 TSRMLS_CC); + zephir_array_fetch_string(&_2$$6, &foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 2959 TSRMLS_CC); action = zephir_get_intval(&_2$$6); } } @@ -4526,7 +4535,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseRestrict) { ZEPHIR_INIT_NVAR(&bindParams); array_init(&bindParams); if (Z_TYPE_P(&fields) == IS_ARRAY) { - zephir_is_iterable(&fields, 0, "phalcon/mvc/model.zep", 2991); + zephir_is_iterable(&fields, 0, "phalcon/mvc/model.zep", 2993); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _5$$8, _6$$8, _4$$8) { ZEPHIR_INIT_NVAR(&position); @@ -4539,11 +4548,11 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseRestrict) { ZVAL_COPY(&field, _4$$8); ZEPHIR_OBS_NVAR(&value); zephir_fetch_property_zval(&value, this_ptr, &field, PH_SILENT_CC); - zephir_array_fetch(&_7$$9, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 2987 TSRMLS_CC); + zephir_array_fetch(&_7$$9, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 2989 TSRMLS_CC); ZEPHIR_INIT_LNVAR(_8$$9); ZEPHIR_CONCAT_SVSV(&_8$$9, "[", &_7$$9, "] = ?", &position); - zephir_array_append(&conditions, &_8$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 2987); - zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2988); + zephir_array_append(&conditions, &_8$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 2989); + zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2990); } ZEND_HASH_FOREACH_END(); ZEPHIR_INIT_NVAR(&field); ZEPHIR_INIT_NVAR(&position); @@ -4552,12 +4561,12 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseRestrict) { zephir_fetch_property_zval(&value, this_ptr, &fields, PH_SILENT_CC); ZEPHIR_INIT_LNVAR(_9$$10); ZEPHIR_CONCAT_SVS(&_9$$10, "[", &referencedFields, "] = ?0"); - zephir_array_append(&conditions, &_9$$10, PH_SEPARATE, "phalcon/mvc/model.zep", 2993); - zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2994); + zephir_array_append(&conditions, &_9$$10, PH_SEPARATE, "phalcon/mvc/model.zep", 2995); + zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2996); } ZEPHIR_OBS_NVAR(&extraConditions); if (zephir_array_isset_string_fetch(&extraConditions, &foreignKey, SL("conditions"), 0)) { - zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 3001); + zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 3003); } ZEPHIR_INIT_NVAR(&_11$$3); zephir_create_array(&_11$$3, 2, 0 TSRMLS_CC); @@ -4687,7 +4696,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { ZEPHIR_INIT_NVAR(&columnMap); ZVAL_NULL(&columnMap); } - zephir_is_iterable(&attributes, 0, "phalcon/mvc/model.zep", 3138); + zephir_is_iterable(&attributes, 0, "phalcon/mvc/model.zep", 3140); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _1) { ZEPHIR_INIT_NVAR(&field); @@ -4701,7 +4710,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { ZEPHIR_CONCAT_SVS(&_3$$7, "Column '", &field, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_2$$7, "__construct", &_4, 4, &_3$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_2$$7, "phalcon/mvc/model.zep", 3083 TSRMLS_CC); + zephir_throw_exception_debug(&_2$$7, "phalcon/mvc/model.zep", 3085 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -4731,25 +4740,25 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { ZEPHIR_CONCAT_SVS(&_8$$14, "Column '", &field, "' have not defined a bind data type"); ZEPHIR_CALL_METHOD(NULL, &_7$$14, "__construct", &_4, 4, &_8$$14); zephir_check_call_status(); - zephir_throw_exception_debug(&_7$$14, "phalcon/mvc/model.zep", 3112 TSRMLS_CC); + zephir_throw_exception_debug(&_7$$14, "phalcon/mvc/model.zep", 3114 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/mvc/model.zep", 3115); - zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3115); - zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 3115); + zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/mvc/model.zep", 3117); + zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3117); + zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 3117); } else { if (zephir_array_isset(&defaultValues, &field)) { ZEPHIR_CALL_METHOD(&_9$$16, connection, "getdefaultvalue", &_10, 0); zephir_check_call_status(); - zephir_array_append(&values, &_9$$16, PH_SEPARATE, "phalcon/mvc/model.zep", 3119); + zephir_array_append(&values, &_9$$16, PH_SEPARATE, "phalcon/mvc/model.zep", 3121); zephir_array_update_zval(&snapshot, &attributeField, &__$null, PH_COPY | PH_SEPARATE); } else { - zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3125); + zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3127); zephir_array_update_zval(&snapshot, &attributeField, &value, PH_COPY | PH_SEPARATE); } - zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/mvc/model.zep", 3129); - zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 3129); + zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/mvc/model.zep", 3131); + zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 3131); } } } @@ -4762,7 +4771,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { zephir_check_call_status(); useExplicitIdentity = zephir_get_boolval(&_11$$18); if (useExplicitIdentity) { - zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/mvc/model.zep", 3147); + zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/mvc/model.zep", 3149); } if (Z_TYPE_P(&columnMap) == IS_ARRAY) { ZEPHIR_OBS_NVAR(&attributeField); @@ -4773,7 +4782,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { ZEPHIR_CONCAT_SVS(&_13$$21, "Identity column '", identityField, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_12$$21, "__construct", &_4, 4, &_13$$21); zephir_check_call_status(); - zephir_throw_exception_debug(&_12$$21, "phalcon/mvc/model.zep", 3155 TSRMLS_CC); + zephir_throw_exception_debug(&_12$$21, "phalcon/mvc/model.zep", 3157 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -4788,12 +4797,12 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { } if (_14$$23) { if (useExplicitIdentity) { - zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/mvc/model.zep", 3168); - zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 3168); + zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/mvc/model.zep", 3170); + zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 3170); } } else { if (!(useExplicitIdentity)) { - zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/mvc/model.zep", 3176); + zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/mvc/model.zep", 3178); } ZEPHIR_OBS_NVAR(&bindType); if (!(zephir_array_isset_fetch(&bindType, &bindDataTypes, identityField, 0 TSRMLS_CC))) { @@ -4803,17 +4812,17 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { ZEPHIR_CONCAT_SVS(&_16$$28, "Identity column '", identityField, "' isn\\'t part of the table columns"); ZEPHIR_CALL_METHOD(NULL, &_15$$28, "__construct", &_4, 4, &_16$$28); zephir_check_call_status(); - zephir_throw_exception_debug(&_15$$28, "phalcon/mvc/model.zep", 3183 TSRMLS_CC); + zephir_throw_exception_debug(&_15$$28, "phalcon/mvc/model.zep", 3185 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3186); - zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 3186); + zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3188); + zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 3188); } } else { if (useExplicitIdentity) { - zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/mvc/model.zep", 3190); - zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 3190); + zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/mvc/model.zep", 3192); + zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 3192); } } } @@ -4970,7 +4979,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_INIT_NVAR(&columnMap); ZVAL_NULL(&columnMap); } - zephir_is_iterable(&nonPrimary, 0, "phalcon/mvc/model.zep", 3404); + zephir_is_iterable(&nonPrimary, 0, "phalcon/mvc/model.zep", 3406); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&nonPrimary), _2) { ZEPHIR_INIT_NVAR(&field); @@ -4984,7 +4993,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_CONCAT_SVS(&_4$$9, "Column '", &field, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_3$$9, "__construct", &_5, 4, &_4$$9); zephir_check_call_status(); - zephir_throw_exception_debug(&_3$$9, "phalcon/mvc/model.zep", 3297 TSRMLS_CC); + zephir_throw_exception_debug(&_3$$9, "phalcon/mvc/model.zep", 3299 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -5000,16 +5009,16 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_CONCAT_SVS(&_7$$12, "Column '", &field, "' have not defined a bind data type"); ZEPHIR_CALL_METHOD(NULL, &_6$$12, "__construct", &_5, 4, &_7$$12); zephir_check_call_status(); - zephir_throw_exception_debug(&_6$$12, "phalcon/mvc/model.zep", 3309 TSRMLS_CC); + zephir_throw_exception_debug(&_6$$12, "phalcon/mvc/model.zep", 3311 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&value); if (zephir_fetch_property_zval(&value, this_ptr, &attributeField, PH_SILENT_CC)) { if (!(useDynamicUpdate)) { - zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/mvc/model.zep", 3323); - zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3323); - zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 3324); + zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/mvc/model.zep", 3325); + zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3325); + zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 3326); } else { ZEPHIR_OBS_NVAR(&snapshotValue); if (!(zephir_array_isset_fetch(&snapshotValue, &snapshot, &attributeField, 0 TSRMLS_CC))) { @@ -5029,7 +5038,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_CONCAT_SVS(&_9$$22, "Column '", &field, "' have not defined a data type"); ZEPHIR_CALL_METHOD(NULL, &_8$$22, "__construct", &_5, 4, &_9$$22); zephir_check_call_status(); - zephir_throw_exception_debug(&_8$$22, "phalcon/mvc/model.zep", 3349 TSRMLS_CC); + zephir_throw_exception_debug(&_8$$22, "phalcon/mvc/model.zep", 3351 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -5059,17 +5068,17 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { } } if (changed) { - zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/mvc/model.zep", 3388); - zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3388); - zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 3389); + zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/mvc/model.zep", 3390); + zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3390); + zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 3391); } } zephir_array_update_zval(&newSnapshot, &attributeField, &value, PH_COPY | PH_SEPARATE); } else { zephir_array_update_zval(&newSnapshot, &attributeField, &__$null, PH_COPY | PH_SEPARATE); - zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/mvc/model.zep", 3396); - zephir_array_append(&values, &__$null, PH_SEPARATE, "phalcon/mvc/model.zep", 3396); - zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 3396); + zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/mvc/model.zep", 3398); + zephir_array_append(&values, &__$null, PH_SEPARATE, "phalcon/mvc/model.zep", 3398); + zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 3398); } } } ZEND_HASH_FOREACH_END(); @@ -5090,12 +5099,12 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_CALL_METHOD(&primaryKeys, metaData, "getprimarykeyattributes", NULL, 0, this_ptr); zephir_check_call_status(); if (!(zephir_fast_count_int(&primaryKeys TSRMLS_CC))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A primary key must be defined in the model in order to perform the operation", "phalcon/mvc/model.zep", 3426); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A primary key must be defined in the model in order to perform the operation", "phalcon/mvc/model.zep", 3428); return; } ZEPHIR_INIT_NVAR(&uniqueParams); array_init(&uniqueParams); - zephir_is_iterable(&primaryKeys, 0, "phalcon/mvc/model.zep", 3451); + zephir_is_iterable(&primaryKeys, 0, "phalcon/mvc/model.zep", 3453); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&primaryKeys), _15$$31) { ZEPHIR_INIT_NVAR(&field); @@ -5109,7 +5118,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_CONCAT_SVS(&_17$$35, "Column '", &field, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_16$$35, "__construct", &_5, 4, &_17$$35); zephir_check_call_status(); - zephir_throw_exception_debug(&_16$$35, "phalcon/mvc/model.zep", 3437 TSRMLS_CC); + zephir_throw_exception_debug(&_16$$35, "phalcon/mvc/model.zep", 3439 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -5119,10 +5128,10 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_OBS_NVAR(&value); if (zephir_fetch_property_zval(&value, this_ptr, &attributeField, PH_SILENT_CC)) { zephir_array_update_zval(&newSnapshot, &attributeField, &value, PH_COPY | PH_SEPARATE); - zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3445); + zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3447); } else { zephir_array_update_zval(&newSnapshot, &attributeField, &__$null, PH_COPY | PH_SEPARATE); - zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/mvc/model.zep", 3448); + zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/mvc/model.zep", 3450); } } ZEND_HASH_FOREACH_END(); ZEPHIR_INIT_NVAR(&field); @@ -5247,7 +5256,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _exists) { array_init(&uniqueParams); ZEPHIR_INIT_NVAR(&uniqueTypes); array_init(&uniqueTypes); - zephir_is_iterable(&primaryKeys, 0, "phalcon/mvc/model.zep", 3562); + zephir_is_iterable(&primaryKeys, 0, "phalcon/mvc/model.zep", 3564); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&primaryKeys), _0$$3) { ZEPHIR_INIT_NVAR(&field); @@ -5261,7 +5270,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _exists) { ZEPHIR_CONCAT_SVS(&_2$$9, "Column '", &field, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_1$$9, "__construct", &_3, 4, &_2$$9); zephir_check_call_status(); - zephir_throw_exception_debug(&_1$$9, "phalcon/mvc/model.zep", 3526 TSRMLS_CC); + zephir_throw_exception_debug(&_1$$9, "phalcon/mvc/model.zep", 3528 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -5279,9 +5288,9 @@ PHP_METHOD(Phalcon_Mvc_Model, _exists) { if (_4$$11) { numberEmpty++; } - zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3544); + zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3546); } else { - zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/mvc/model.zep", 3547); + zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/mvc/model.zep", 3549); numberEmpty++; } ZEPHIR_OBS_NVAR(&type); @@ -5292,16 +5301,16 @@ PHP_METHOD(Phalcon_Mvc_Model, _exists) { ZEPHIR_CONCAT_SVS(&_6$$14, "Column '", &field, "' isn't part of the table columns"); ZEPHIR_CALL_METHOD(NULL, &_5$$14, "__construct", &_3, 4, &_6$$14); zephir_check_call_status(); - zephir_throw_exception_debug(&_5$$14, "phalcon/mvc/model.zep", 3552 TSRMLS_CC); + zephir_throw_exception_debug(&_5$$14, "phalcon/mvc/model.zep", 3554 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&uniqueTypes, &type, PH_SEPARATE, "phalcon/mvc/model.zep", 3555); + zephir_array_append(&uniqueTypes, &type, PH_SEPARATE, "phalcon/mvc/model.zep", 3557); ZEPHIR_CALL_METHOD(&_7$$7, connection, "escapeidentifier", &_8, 0, &field); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_9$$7); ZEPHIR_CONCAT_VS(&_9$$7, &_7$$7, " = ?"); - zephir_array_append(&wherePk, &_9$$7, PH_SEPARATE, "phalcon/mvc/model.zep", 3556); + zephir_array_append(&wherePk, &_9$$7, PH_SEPARATE, "phalcon/mvc/model.zep", 3558); } ZEND_HASH_FOREACH_END(); ZEPHIR_INIT_NVAR(&field); if (numberPrimary == numberEmpty) { @@ -5349,7 +5358,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _exists) { ZVAL_NULL(&_13); ZEPHIR_CALL_METHOD(&num, connection, "fetchone", NULL, 0, &_12, &_13, &uniqueParams, &uniqueTypes); zephir_check_call_status(); - zephir_array_fetch_string(&_14, &num, SL("rowcount"), PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 3612 TSRMLS_CC); + zephir_array_fetch_string(&_14, &num, SL("rowcount"), PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 3614 TSRMLS_CC); if (zephir_is_true(&_14)) { ZEPHIR_INIT_ZVAL_NREF(_15$$22); ZVAL_LONG(&_15$$22, 0); @@ -5521,7 +5530,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _groupResult) { ZEPHIR_INIT_VAR(¶ms); array_init(¶ms); if (Z_TYPE_P(parameters) != IS_NULL) { - zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/mvc/model.zep", 3686); + zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/mvc/model.zep", 3688); } } else { ZEPHIR_CPY_WRT(¶ms, parameters); @@ -5661,7 +5670,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _invokeFinder) { ZEPHIR_CONCAT_SVS(&_4$$7, "The static method '", &method, "' requires one argument"); ZEPHIR_CALL_METHOD(NULL, &_3$$7, "__construct", NULL, 4, &_4$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_3$$7, "phalcon/mvc/model.zep", 3798 TSRMLS_CC); + zephir_throw_exception_debug(&_3$$7, "phalcon/mvc/model.zep", 3800 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -5698,7 +5707,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _invokeFinder) { ZEPHIR_CONCAT_SVS(&_8$$13, "Cannot resolve attribute '", &extraMethod, "' in the model"); ZEPHIR_CALL_METHOD(NULL, &_7$$13, "__construct", NULL, 4, &_8$$13); zephir_check_call_status(); - zephir_throw_exception_debug(&_7$$13, "phalcon/mvc/model.zep", 3832 TSRMLS_CC); + zephir_throw_exception_debug(&_7$$13, "phalcon/mvc/model.zep", 3834 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -5872,7 +5881,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _preSave) { ZEPHIR_CALL_METHOD(&emptyStringValues, metaData, "getemptystringattributes", NULL, 0, this_ptr); zephir_check_call_status(); error = 0; - zephir_is_iterable(¬Null, 0, "phalcon/mvc/model.zep", 4018); + zephir_is_iterable(¬Null, 0, "phalcon/mvc/model.zep", 4020); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(¬Null), _7$$12) { ZEPHIR_INIT_NVAR(&field); @@ -5886,7 +5895,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _preSave) { ZEPHIR_CONCAT_SVS(&_9$$19, "Column '", &field, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_8$$19, "__construct", &_10, 4, &_9$$19); zephir_check_call_status(); - zephir_throw_exception_debug(&_8$$19, "phalcon/mvc/model.zep", 3945 TSRMLS_CC); + zephir_throw_exception_debug(&_8$$19, "phalcon/mvc/model.zep", 3947 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -5910,7 +5919,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _preSave) { if (_12$$27) { _13$$27 = !(zephir_array_isset(&defaultValues, &field)); if (!(_13$$27)) { - zephir_array_fetch(&_14$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 3976 TSRMLS_CC); + zephir_array_fetch(&_14$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 3978 TSRMLS_CC); _13$$27 = !ZEPHIR_IS_IDENTICAL(&value, &_14$$27); } _12$$27 = _13$$27; @@ -6099,7 +6108,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _preSaveRelatedRecords) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "getmodelsmanager", NULL, 0); zephir_check_call_status(); ZEPHIR_CPY_WRT(&manager, &_1); - zephir_is_iterable(related, 0, "phalcon/mvc/model.zep", 4187); + zephir_is_iterable(related, 0, "phalcon/mvc/model.zep", 4189); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(related), _3, _4, _2) { ZEPHIR_INIT_NVAR(&name); @@ -6125,7 +6134,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _preSaveRelatedRecords) { } ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_9, 0, &_8$$6); zephir_check_call_status(); - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects can be stored as part of belongs-to relations", "phalcon/mvc/model.zep", 4134); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects can be stored as part of belongs-to relations", "phalcon/mvc/model.zep", 4136); return; } ZEPHIR_CALL_METHOD(&columns, &relation, "getfields", &_10, 0); @@ -6142,7 +6151,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _preSaveRelatedRecords) { } ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_14, 0, &_13$$7); zephir_check_call_status(); - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/mvc/model.zep", 4143); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/mvc/model.zep", 4145); return; } ZEPHIR_CALL_METHOD(&_15$$5, &record, "save", NULL, 0); @@ -6150,7 +6159,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _preSaveRelatedRecords) { if (!(zephir_is_true(&_15$$5))) { ZEPHIR_CALL_METHOD(&_16$$8, &record, "getmessages", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&_16$$8, 0, "phalcon/mvc/model.zep", 4174); + zephir_is_iterable(&_16$$8, 0, "phalcon/mvc/model.zep", 4176); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_16$$8), _17$$8) { ZEPHIR_INIT_NVAR(&message); @@ -6292,7 +6301,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmodelsmanager", NULL, 0); zephir_check_call_status(); ZEPHIR_CPY_WRT(&manager, &_0); - zephir_is_iterable(related, 0, "phalcon/mvc/model.zep", 4396); + zephir_is_iterable(related, 0, "phalcon/mvc/model.zep", 4398); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(related), _2, _3, _1) { ZEPHIR_INIT_NVAR(&name); @@ -6324,7 +6333,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { } ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_10, 0, &_9$$6); zephir_check_call_status(); - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects/arrays can be stored as part of has-many/has-one/has-many-to-many relations", "phalcon/mvc/model.zep", 4240); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects/arrays can be stored as part of has-many/has-one/has-many-to-many relations", "phalcon/mvc/model.zep", 4242); return; } ZEPHIR_CALL_METHOD(&columns, &relation, "getfields", &_11, 0); @@ -6341,7 +6350,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { } ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_15, 0, &_14$$7); zephir_check_call_status(); - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/mvc/model.zep", 4249); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/mvc/model.zep", 4251); return; } if (Z_TYPE_P(&record) == IS_OBJECT) { @@ -6366,7 +6375,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { ZEPHIR_CONCAT_SVS(&_19$$10, "The column '", &columns, "' needs to be present in the model"); ZEPHIR_CALL_METHOD(NULL, &_18$$10, "__construct", &_20, 4, &_19$$10); zephir_check_call_status(); - zephir_throw_exception_debug(&_18$$10, "phalcon/mvc/model.zep", 4263 TSRMLS_CC); + zephir_throw_exception_debug(&_18$$10, "phalcon/mvc/model.zep", 4265 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -6381,7 +6390,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { ZEPHIR_CALL_METHOD(&intermediateReferencedFields, &relation, "getintermediatereferencedfields", &_25, 0); zephir_check_call_status(); } - zephir_is_iterable(&relatedRecords, 0, "phalcon/mvc/model.zep", 4382); + zephir_is_iterable(&relatedRecords, 0, "phalcon/mvc/model.zep", 4384); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relatedRecords), _26$$4) { ZEPHIR_INIT_NVAR(&recordAfter); @@ -6395,7 +6404,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { if (!(zephir_is_true(&_27$$12))) { ZEPHIR_CALL_METHOD(&_28$$14, &recordAfter, "getmessages", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&_28$$14, 0, "phalcon/mvc/model.zep", 4322); + zephir_is_iterable(&_28$$14, 0, "phalcon/mvc/model.zep", 4324); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_28$$14), _29$$14) { ZEPHIR_INIT_NVAR(&message); @@ -6434,7 +6443,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { if (!(zephir_is_true(&_35$$17))) { ZEPHIR_CALL_METHOD(&_36$$18, &intermediateModel, "getmessages", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&_36$$18, 0, "phalcon/mvc/model.zep", 4376); + zephir_is_iterable(&_36$$18, 0, "phalcon/mvc/model.zep", 4378); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_36$$18), _37$$18) { ZEPHIR_INIT_NVAR(&message); @@ -6477,7 +6486,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { ZEPHIR_CONCAT_SVSVS(&_44$$22, "There are no defined relations for the model '", &className, "' using alias '", &name, "'"); ZEPHIR_CALL_METHOD(NULL, &_43$$22, "__construct", &_20, 4, &_44$$22); zephir_check_call_status(); - zephir_throw_exception_debug(&_43$$22, "phalcon/mvc/model.zep", 4388 TSRMLS_CC); + zephir_throw_exception_debug(&_43$$22, "phalcon/mvc/model.zep", 4390 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -6536,7 +6545,7 @@ PHP_METHOD(Phalcon_Mvc_Model, allowEmptyStringValues) { ZEPHIR_INIT_VAR(&keysAttributes); array_init(&keysAttributes); - zephir_is_iterable(&attributes, 0, "phalcon/mvc/model.zep", 4428); + zephir_is_iterable(&attributes, 0, "phalcon/mvc/model.zep", 4430); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _0) { ZEPHIR_INIT_NVAR(&attribute); @@ -7110,7 +7119,7 @@ PHP_METHOD(Phalcon_Mvc_Model, skipAttributesOnCreate) { ZEPHIR_INIT_VAR(&keysAttributes); array_init(&keysAttributes); - zephir_is_iterable(&attributes, 0, "phalcon/mvc/model.zep", 4699); + zephir_is_iterable(&attributes, 0, "phalcon/mvc/model.zep", 4701); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _0) { ZEPHIR_INIT_NVAR(&attribute); @@ -7166,7 +7175,7 @@ PHP_METHOD(Phalcon_Mvc_Model, skipAttributesOnUpdate) { ZEPHIR_INIT_VAR(&keysAttributes); array_init(&keysAttributes); - zephir_is_iterable(&attributes, 0, "phalcon/mvc/model.zep", 4730); + zephir_is_iterable(&attributes, 0, "phalcon/mvc/model.zep", 4732); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _0) { ZEPHIR_INIT_NVAR(&attribute); @@ -7378,7 +7387,7 @@ PHP_METHOD(Phalcon_Mvc_Model, caseInsensitiveColumnMap) { ZEPHIR_INIT_VAR(&_0); zephir_array_keys(&_0, columnMap TSRMLS_CC); - zephir_is_iterable(&_0, 0, "phalcon/mvc/model.zep", 4861); + zephir_is_iterable(&_0, 0, "phalcon/mvc/model.zep", 4863); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _1) { ZEPHIR_INIT_NVAR(&cmKey); diff --git a/ext/phalcon/mvc/url.zep.h b/ext/phalcon/mvc/url.zep.h deleted file mode 100644 index b029d839298..00000000000 --- a/ext/phalcon/mvc/url.zep.h +++ /dev/null @@ -1,134 +0,0 @@ - -extern zend_class_entry *phalcon_mvc_url_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Mvc_Url); - -PHP_METHOD(Phalcon_Mvc_Url, get); -PHP_METHOD(Phalcon_Mvc_Url, getBasePath); -PHP_METHOD(Phalcon_Mvc_Url, getBaseUri); -PHP_METHOD(Phalcon_Mvc_Url, getDI); -PHP_METHOD(Phalcon_Mvc_Url, getStatic); -PHP_METHOD(Phalcon_Mvc_Url, getStaticBaseUri); -PHP_METHOD(Phalcon_Mvc_Url, setBasePath); -PHP_METHOD(Phalcon_Mvc_Url, setBaseUri); -PHP_METHOD(Phalcon_Mvc_Url, setDI); -PHP_METHOD(Phalcon_Mvc_Url, setStaticBaseUri); -PHP_METHOD(Phalcon_Mvc_Url, path); - -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_url_get, 0, 0, IS_STRING, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_url_get, 0, 0, IS_STRING, NULL, 0) -#endif - ZEND_ARG_INFO(0, uri) - ZEND_ARG_INFO(0, args) -#if PHP_VERSION_ID >= 70200 - ZEND_ARG_TYPE_INFO(0, local, _IS_BOOL, 1) -#else - ZEND_ARG_INFO(0, local) -#endif - ZEND_ARG_INFO(0, baseUri) -ZEND_END_ARG_INFO() - -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_url_getbasepath, 0, 0, IS_STRING, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_url_getbasepath, 0, 0, IS_STRING, NULL, 0) -#endif -ZEND_END_ARG_INFO() - -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_url_getbaseuri, 0, 0, IS_STRING, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_url_getbaseuri, 0, 0, IS_STRING, NULL, 0) -#endif -ZEND_END_ARG_INFO() - -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_url_getdi, 0, 0, Phalcon\\DiInterface, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_url_getdi, 0, 0, IS_OBJECT, "Phalcon\\DiInterface", 0) -#endif -ZEND_END_ARG_INFO() - -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_url_getstatic, 0, 0, IS_STRING, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_url_getstatic, 0, 0, IS_STRING, NULL, 0) -#endif - ZEND_ARG_INFO(0, uri) -ZEND_END_ARG_INFO() - -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_url_getstaticbaseuri, 0, 0, IS_STRING, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_url_getstaticbaseuri, 0, 0, IS_STRING, NULL, 0) -#endif -ZEND_END_ARG_INFO() - -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_url_setbasepath, 0, 1, Phalcon\\Mvc\\UrlInterface, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_url_setbasepath, 0, 1, IS_OBJECT, "Phalcon\\Mvc\\UrlInterface", 0) -#endif -#if PHP_VERSION_ID >= 70200 - ZEND_ARG_TYPE_INFO(0, basePath, IS_STRING, 0) -#else - ZEND_ARG_INFO(0, basePath) -#endif -ZEND_END_ARG_INFO() - -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_url_setbaseuri, 0, 1, Phalcon\\Mvc\\UrlInterface, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_url_setbaseuri, 0, 1, IS_OBJECT, "Phalcon\\Mvc\\UrlInterface", 0) -#endif -#if PHP_VERSION_ID >= 70200 - ZEND_ARG_TYPE_INFO(0, baseUri, IS_STRING, 0) -#else - ZEND_ARG_INFO(0, baseUri) -#endif -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_url_setdi, 0, 0, 1) - ZEND_ARG_OBJ_INFO(0, dependencyInjector, Phalcon\\DiInterface, 0) -ZEND_END_ARG_INFO() - -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_url_setstaticbaseuri, 0, 1, Phalcon\\Mvc\\UrlInterface, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_url_setstaticbaseuri, 0, 1, IS_OBJECT, "Phalcon\\Mvc\\UrlInterface", 0) -#endif -#if PHP_VERSION_ID >= 70200 - ZEND_ARG_TYPE_INFO(0, staticBaseUri, IS_STRING, 0) -#else - ZEND_ARG_INFO(0, staticBaseUri) -#endif -ZEND_END_ARG_INFO() - -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_url_path, 0, 0, IS_STRING, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_url_path, 0, 0, IS_STRING, NULL, 0) -#endif -#if PHP_VERSION_ID >= 70200 - ZEND_ARG_TYPE_INFO(0, path, IS_STRING, 1) -#else - ZEND_ARG_INFO(0, path) -#endif -ZEND_END_ARG_INFO() - -ZEPHIR_INIT_FUNCS(phalcon_mvc_url_method_entry) { - PHP_ME(Phalcon_Mvc_Url, get, arginfo_phalcon_mvc_url_get, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Mvc_Url, getBasePath, arginfo_phalcon_mvc_url_getbasepath, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Mvc_Url, getBaseUri, arginfo_phalcon_mvc_url_getbaseuri, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Mvc_Url, getDI, arginfo_phalcon_mvc_url_getdi, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Mvc_Url, getStatic, arginfo_phalcon_mvc_url_getstatic, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Mvc_Url, getStaticBaseUri, arginfo_phalcon_mvc_url_getstaticbaseuri, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Mvc_Url, setBasePath, arginfo_phalcon_mvc_url_setbasepath, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Mvc_Url, setBaseUri, arginfo_phalcon_mvc_url_setbaseuri, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Mvc_Url, setDI, arginfo_phalcon_mvc_url_setdi, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Mvc_Url, setStaticBaseUri, arginfo_phalcon_mvc_url_setstaticbaseuri, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Mvc_Url, path, arginfo_phalcon_mvc_url_path, ZEND_ACC_PUBLIC) - PHP_FE_END -}; diff --git a/ext/phalcon/mvc/url/exception.zep.h b/ext/phalcon/mvc/url/exception.zep.h deleted file mode 100644 index 127c0e8eb07..00000000000 --- a/ext/phalcon/mvc/url/exception.zep.h +++ /dev/null @@ -1,5 +0,0 @@ - -extern zend_class_entry *phalcon_mvc_url_exception_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Mvc_Url_Exception); - diff --git a/ext/phalcon/mvc/url/utils.c b/ext/phalcon/mvc/url/utils.c deleted file mode 100644 index 7fddf120f7a..00000000000 --- a/ext/phalcon/mvc/url/utils.c +++ /dev/null @@ -1,369 +0,0 @@ - -/* - +------------------------------------------------------------------------+ - | Phalcon Framework | - +------------------------------------------------------------------------+ - | Copyright (c) 2011-2016 Phalcon Team (https://phalconphp.com) | - +------------------------------------------------------------------------+ - | This source file is subject to the New BSD License that is bundled | - | with this package in the file docs/LICENSE.txt. | - | | - | If you did not receive a copy of the license and are unable to | - | obtain it through the world-wide-web, please send an email | - | to license@phalconphp.com so we can send you a copy immediately. | - +------------------------------------------------------------------------+ - | Authors: Andres Gutierrez | - | Eduar Carvajal | - +------------------------------------------------------------------------+ -*/ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "php.h" -#include "php_phalcon.h" -#include "phalcon.h" - -#include "kernel/main.h" -#include "kernel/memory.h" -#include "kernel/fcall.h" -#include "kernel/exception.h" - -#if PHP_VERSION_ID < 70000 -#include -#else -#include -#include -#endif - -#include - -void phalcon_get_uri(zval *return_value, zval *path) -{ - int i, found = 0, mark = 0; - char *cursor, *str, ch; - - if (Z_TYPE_P(path) != IS_STRING) { - RETURN_EMPTY_STRING(); - } - - if (Z_STRLEN_P(path) > 0) { - cursor = Z_STRVAL_P(path) + Z_STRLEN_P(path) - 1; - for (i = Z_STRLEN_P(path); i > 0; i--) { - ch = *cursor; - if (ch == '/' || ch == '\\') { - found++; - if (found == 1) { - mark = i - 1; - } else { - str = emalloc(mark - i + 1); - memcpy(str, Z_STRVAL_P(path) + i, mark - i); - str[mark - i] = '\0'; -#if PHP_VERSION_ID < 70000 - ZVAL_STRINGL(return_value, str, mark - i, 0); -#else - ZVAL_STRINGL(return_value, str, mark - i); -#endif - return; - } - } - cursor--; - } - } - - RETURN_EMPTY_STRING(); -} - -zval *phalcon_replace_marker(int named, zval *paths, zval *replacements, unsigned long *position, char *cursor, char *marker) -{ - unsigned int length = 0, variable_length, ch, j; - char *item = NULL, *cursor_var, *variable = NULL; - int not_valid = 0; -#if PHP_VERSION_ID < 70000 - int result = FAILURE; - zval **zv, **tmp; -#else - zval *zv, *tmp; -#endif - - if (named) { - length = cursor - marker - 1; - item = estrndup(marker + 1, length); - cursor_var = item; - marker = item; - for (j = 0; j < length; j++) { - ch = *cursor_var; - if (ch == '\0') { - not_valid = 1; - break; - } - if (j == 0 && !((ch >= 'a' && ch <='z') || (ch >= 'A' && ch <= 'Z'))){ - not_valid = 1; - break; - } - if ((ch >= 'a' && ch <='z') || (ch >= 'A' && ch <= 'Z') || (ch >= '0' && ch <= '9') || ch == '-' || ch == '_' || ch == ':') { - if (ch == ':') { - variable_length = cursor_var - marker; - variable = estrndup(marker, variable_length); - break; - } - } else { - not_valid = 1; - break; - } - cursor_var++; - } - } - - if (!not_valid) { - - if (zend_hash_index_exists(Z_ARRVAL_P(paths), *position)) { - if (named) { - if (variable) { - efree(item); - item = variable; - length = variable_length; - } -#if PHP_VERSION_ID < 70000 - if (zend_hash_exists(Z_ARRVAL_P(replacements), item, length + 1)) { - if ((result = zend_hash_find(Z_ARRVAL_P(replacements), item, length + 1, (void**) &zv)) == SUCCESS) { - efree(item); - (*position)++; - return *zv; - } - } -#else - if (zend_hash_str_exists(Z_ARRVAL_P(replacements), item, length)) { - if ((zv = zend_hash_str_find(Z_ARRVAL_P(replacements), item, length)) != NULL) { - efree(item); - (*position)++; - return zv; - } - } -#endif - } else { -#if PHP_VERSION_ID < 70000 - if ((result = zend_hash_index_find(Z_ARRVAL_P(paths), *position, (void**) &zv)) == SUCCESS) { - if (Z_TYPE_PP(zv) == IS_STRING) { - if (zend_hash_exists(Z_ARRVAL_P(replacements), Z_STRVAL_PP(zv), Z_STRLEN_PP(zv) + 1)) { - if ((result = zend_hash_find(Z_ARRVAL_P(replacements), Z_STRVAL_PP(zv), Z_STRLEN_PP(zv) + 1, (void**) &tmp)) == SUCCESS) { - (*position)++; - return *tmp; - } - } - } - } -#else - if ((zv = zend_hash_index_find(Z_ARRVAL_P(paths), *position)) != NULL) { - if (Z_TYPE_P(zv) == IS_STRING) { - if (zend_hash_str_exists(Z_ARRVAL_P(replacements), Z_STRVAL_P(zv), Z_STRLEN_P(zv))) { - if ((tmp = zend_hash_str_find(Z_ARRVAL_P(replacements), Z_STRVAL_P(zv), Z_STRLEN_P(zv))) != NULL) { - (*position)++; - return tmp; - } - } - } - } -#endif - } - } - - (*position)++; - } - - if (item) { - efree(item); - } - - return NULL; -} - -/** - * Replaces placeholders and named variables with their corresponding values in an array - */ -void phalcon_replace_paths(zval *return_value, zval *pattern, zval *paths, zval *replacements TSRMLS_DC) -{ - - char *cursor, *marker = NULL; - unsigned int bracket_count = 0, parentheses_count = 0, intermediate = 0; - unsigned char ch; - smart_str route_str = {0}; - ulong position = 1; - int i; - zval *replace, replace_copy; - int use_copy, looking_placeholder = 0; - - if (Z_TYPE_P(pattern) != IS_STRING || Z_TYPE_P(replacements) != IS_ARRAY || Z_TYPE_P(paths) != IS_ARRAY) { - ZVAL_NULL(return_value); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid arguments supplied for phalcon_replace_paths()"); - return; - } - - if (Z_STRLEN_P(pattern) <= 0) { - ZVAL_FALSE(return_value); - return; - } - - cursor = Z_STRVAL_P(pattern); - if (*cursor == '/') { - ++cursor; - i = 1; - } - else { - i = 0; - } - - if (!zend_hash_num_elements(Z_ARRVAL_P(paths))) { -#if PHP_VERSION_ID < 70000 - ZVAL_STRINGL(return_value, Z_STRVAL_P(pattern) + i, Z_STRLEN_P(pattern) - i, 1); -#else - ZVAL_STRINGL(return_value, Z_STRVAL_P(pattern) + i, Z_STRLEN_P(pattern) - i); -#endif - return; - } - - for (; i < Z_STRLEN_P(pattern); ++i) { - - ch = *cursor; - if (ch == '\0') { - break; - } - - if (parentheses_count == 0 && !looking_placeholder) { - if (ch == '{') { - if (bracket_count == 0) { - marker = cursor; - intermediate = 0; - } - bracket_count++; - } else { - if (ch == '}') { - bracket_count--; - if (intermediate > 0) { - if (bracket_count == 0) { - replace = phalcon_replace_marker(1, paths, replacements, &position, cursor, marker); - if (replace) { - use_copy = 0; - if (Z_TYPE_P(replace) != IS_STRING) { -#if PHP_VERSION_ID < 70000 - zend_make_printable_zval(replace, &replace_copy, &use_copy); -#else - use_copy = zend_make_printable_zval(replace, &replace_copy); -#endif - if (use_copy) { - replace = &replace_copy; - } - } - smart_str_appendl(&route_str, Z_STRVAL_P(replace), Z_STRLEN_P(replace)); - if (use_copy) { - zval_dtor(&replace_copy); - } - } - cursor++; - continue; - } - } - } - } - } - - if (bracket_count == 0 && !looking_placeholder) { - if (ch == '(') { - if (parentheses_count == 0) { - marker = cursor; - intermediate = 0; - } - parentheses_count++; - } else { - if (ch == ')') { - parentheses_count--; - if (intermediate > 0) { - if (parentheses_count == 0) { - replace = phalcon_replace_marker(0, paths, replacements, &position, cursor, marker); - if (replace) { - use_copy = 0; - if (Z_TYPE_P(replace) != IS_STRING) { -#if PHP_VERSION_ID < 70000 - zend_make_printable_zval(replace, &replace_copy, &use_copy); -#else - use_copy = zend_make_printable_zval(replace, &replace_copy); -#endif - if (use_copy) { - replace = &replace_copy; - } - } - smart_str_appendl(&route_str, Z_STRVAL_P(replace), Z_STRLEN_P(replace)); - if (use_copy) { - zval_dtor(&replace_copy); - } - } - cursor++; - continue; - } - } - } - } - } - - if (bracket_count == 0 && parentheses_count == 0) { - if (looking_placeholder) { - if (intermediate > 0) { - if (ch < 'a' || ch > 'z' || i == (Z_STRLEN_P(pattern) - 1)) { - replace = phalcon_replace_marker(0, paths, replacements, &position, cursor, marker); - if (replace) { - use_copy = 0; - if (Z_TYPE_P(replace) != IS_STRING) { -#if PHP_VERSION_ID < 70000 - zend_make_printable_zval(replace, &replace_copy, &use_copy); -#else - use_copy = zend_make_printable_zval(replace, &replace_copy); -#endif - if (use_copy) { - replace = &replace_copy; - } - } - smart_str_appendl(&route_str, Z_STRVAL_P(replace), Z_STRLEN_P(replace)); - if (use_copy) { - zval_dtor(&replace_copy); - } - } - looking_placeholder = 0; - continue; - } - } - } else { - if (ch == ':') { - looking_placeholder = 1; - marker = cursor; - intermediate = 0; - } - } - } - - if (bracket_count > 0 || parentheses_count > 0 || looking_placeholder) { - intermediate++; - } else { - smart_str_appendc(&route_str, ch); - } - - cursor++; - } - smart_str_0(&route_str); - -#if PHP_VERSION_ID < 70000 - if (route_str.len) { - RETURN_STRINGL(route_str.c, route_str.len, 0); - } else { - smart_str_free(&route_str); - RETURN_EMPTY_STRING(); - } -#else - if (route_str.s) { - RETURN_STR(route_str.s); - } else { - smart_str_free(&route_str); - RETURN_EMPTY_STRING(); - } -#endif -} diff --git a/ext/phalcon/mvc/url/utils.h b/ext/phalcon/mvc/url/utils.h deleted file mode 100644 index 210ce6c23c2..00000000000 --- a/ext/phalcon/mvc/url/utils.h +++ /dev/null @@ -1,30 +0,0 @@ - -/* - +------------------------------------------------------------------------+ - | Phalcon Framework | - +------------------------------------------------------------------------+ - | Copyright (c) 2011-2014 Phalcon Team (http://www.phalconphp.com) | - +------------------------------------------------------------------------+ - | This source file is subject to the New BSD License that is bundled | - | with this package in the file docs/LICENSE.txt. | - | | - | If you did not receive a copy of the license and are unable to | - | obtain it through the world-wide-web, please send an email | - | to license@phalconphp.com so we can send you a copy immediately. | - +------------------------------------------------------------------------+ - | Authors: Andres Gutierrez | - | Eduar Carvajal | - +------------------------------------------------------------------------+ -*/ - -#ifndef PHALCON_MVC_URL_UTILS_H -#define PHALCON_MVC_URL_UTILS_H - -#include - -/* Extract named parameters */ -void phalcon_get_uri(zval *return_value, zval *path); -void phalcon_extract_named_params(zval *return_value, zval *str, zval *matches); -void phalcon_replace_paths(zval *return_value, zval *pattern, zval *paths, zval *uri TSRMLS_DC); - -#endif /* PHALCON_MVC_URL_UTILS_H */ diff --git a/ext/phalcon/mvc/urlinterface.zep.h b/ext/phalcon/mvc/urlinterface.zep.h deleted file mode 100644 index d378d163fc1..00000000000 --- a/ext/phalcon/mvc/urlinterface.zep.h +++ /dev/null @@ -1,78 +0,0 @@ - -extern zend_class_entry *phalcon_mvc_urlinterface_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Mvc_UrlInterface); - -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_urlinterface_get, 0, 0, IS_STRING, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_urlinterface_get, 0, 0, IS_STRING, NULL, 0) -#endif - ZEND_ARG_INFO(0, uri) - ZEND_ARG_INFO(0, args) -#if PHP_VERSION_ID >= 70200 - ZEND_ARG_TYPE_INFO(0, local, _IS_BOOL, 1) -#else - ZEND_ARG_INFO(0, local) -#endif -ZEND_END_ARG_INFO() - -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_urlinterface_getbasepath, 0, 0, IS_STRING, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_urlinterface_getbasepath, 0, 0, IS_STRING, NULL, 0) -#endif -ZEND_END_ARG_INFO() - -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_urlinterface_getbaseuri, 0, 0, IS_STRING, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_urlinterface_getbaseuri, 0, 0, IS_STRING, NULL, 0) -#endif -ZEND_END_ARG_INFO() - -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_urlinterface_setbasepath, 0, 1, Phalcon\\Mvc\\UrlInterface, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_urlinterface_setbasepath, 0, 1, IS_OBJECT, "Phalcon\\Mvc\\UrlInterface", 0) -#endif -#if PHP_VERSION_ID >= 70200 - ZEND_ARG_TYPE_INFO(0, basePath, IS_STRING, 0) -#else - ZEND_ARG_INFO(0, basePath) -#endif -ZEND_END_ARG_INFO() - -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_urlinterface_setbaseuri, 0, 1, Phalcon\\Mvc\\UrlInterface, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_urlinterface_setbaseuri, 0, 1, IS_OBJECT, "Phalcon\\Mvc\\UrlInterface", 0) -#endif -#if PHP_VERSION_ID >= 70200 - ZEND_ARG_TYPE_INFO(0, baseUri, IS_STRING, 0) -#else - ZEND_ARG_INFO(0, baseUri) -#endif -ZEND_END_ARG_INFO() - -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_urlinterface_path, 0, 0, IS_STRING, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_urlinterface_path, 0, 0, IS_STRING, NULL, 0) -#endif -#if PHP_VERSION_ID >= 70200 - ZEND_ARG_TYPE_INFO(0, path, IS_STRING, 1) -#else - ZEND_ARG_INFO(0, path) -#endif -ZEND_END_ARG_INFO() - -ZEPHIR_INIT_FUNCS(phalcon_mvc_urlinterface_method_entry) { - PHP_ABSTRACT_ME(Phalcon_Mvc_UrlInterface, get, arginfo_phalcon_mvc_urlinterface_get) - PHP_ABSTRACT_ME(Phalcon_Mvc_UrlInterface, getBasePath, arginfo_phalcon_mvc_urlinterface_getbasepath) - PHP_ABSTRACT_ME(Phalcon_Mvc_UrlInterface, getBaseUri, arginfo_phalcon_mvc_urlinterface_getbaseuri) - PHP_ABSTRACT_ME(Phalcon_Mvc_UrlInterface, setBasePath, arginfo_phalcon_mvc_urlinterface_setbasepath) - PHP_ABSTRACT_ME(Phalcon_Mvc_UrlInterface, setBaseUri, arginfo_phalcon_mvc_urlinterface_setbaseuri) - PHP_ABSTRACT_ME(Phalcon_Mvc_UrlInterface, path, arginfo_phalcon_mvc_urlinterface_path) - PHP_FE_END -}; diff --git a/ext/phalcon/mvc/view.zep.c b/ext/phalcon/mvc/view.zep.c index eb42f1b22bc..765f343e971 100644 --- a/ext/phalcon/mvc/view.zep.c +++ b/ext/phalcon/mvc/view.zep.c @@ -953,7 +953,7 @@ PHP_METHOD(Phalcon_Mvc_View, _loadTemplateEngines) { if (ZEPHIR_IS_EMPTY(®isteredEngines)) { ZEPHIR_INIT_VAR(&_1$$4); object_init_ex(&_1$$4, phalcon_mvc_view_engine_php_ce); - ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 379, this_ptr, &dependencyInjector); + ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 378, this_ptr, &dependencyInjector); zephir_check_call_status(); zephir_array_update_string(&engines, SL(".phtml"), &_1$$4, PH_COPY | PH_SEPARATE); } else { @@ -1089,7 +1089,7 @@ PHP_METHOD(Phalcon_Mvc_View, _engineRender) { { ZEPHIR_INIT_NVAR(&viewsDir); ZVAL_COPY(&viewsDir, _2); - ZEPHIR_CALL_METHOD(&_3$$3, this_ptr, "_isabsolutepath", &_4, 380, &viewPath); + ZEPHIR_CALL_METHOD(&_3$$3, this_ptr, "_isabsolutepath", &_4, 379, &viewPath); zephir_check_call_status(); if (!(zephir_is_true(&_3$$3))) { ZEPHIR_INIT_NVAR(&viewsDirPath); diff --git a/ext/phalcon/mvc/view/engine/php.zep.c b/ext/phalcon/mvc/view/engine/php.zep.c index d36db57aee1..d77da60afbf 100644 --- a/ext/phalcon/mvc/view/engine/php.zep.c +++ b/ext/phalcon/mvc/view/engine/php.zep.c @@ -84,7 +84,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Php, render) { if (mustClean == 1) { - ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 381); + ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 380); zephir_check_call_status(); } if (Z_TYPE_P(params) == IS_ARRAY) { diff --git a/ext/phalcon/mvc/view/engine/volt.zep.c b/ext/phalcon/mvc/view/engine/volt.zep.c index 0182ef2ab99..168476bdf56 100644 --- a/ext/phalcon/mvc/view/engine/volt.zep.c +++ b/ext/phalcon/mvc/view/engine/volt.zep.c @@ -17,8 +17,8 @@ #include "kernel/exception.h" #include "kernel/memory.h" #include "kernel/fcall.h" -#include "kernel/require.h" #include "kernel/operators.h" +#include "kernel/require.h" #include "kernel/string.h" #include "kernel/array.h" #include "kernel/concat.h" @@ -108,18 +108,18 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, getCompiler) { ZEPHIR_INIT_NVAR(&compiler); object_init_ex(&compiler, phalcon_mvc_view_engine_volt_compiler_ce); zephir_read_property(&_0$$3, this_ptr, SL("_view"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(NULL, &compiler, "__construct", NULL, 382, &_0$$3); + ZEPHIR_CALL_METHOD(NULL, &compiler, "__construct", NULL, 381, &_0$$3); zephir_check_call_status(); zephir_read_property(&_1$$3, this_ptr, SL("_dependencyInjector"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&dependencyInjector, &_1$$3); if (Z_TYPE_P(&dependencyInjector) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(NULL, &compiler, "setdi", NULL, 383, &dependencyInjector); + ZEPHIR_CALL_METHOD(NULL, &compiler, "setdi", NULL, 382, &dependencyInjector); zephir_check_call_status(); } ZEPHIR_OBS_VAR(&options); zephir_read_property(&options, this_ptr, SL("_options"), PH_NOISY_CC); if (Z_TYPE_P(&options) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(NULL, &compiler, "setoptions", NULL, 384, &options); + ZEPHIR_CALL_METHOD(NULL, &compiler, "setoptions", NULL, 383, &options); zephir_check_call_status(); } zephir_update_property_zval(this_ptr, SL("_compiler"), &compiler); @@ -133,11 +133,11 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, getCompiler) { */ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, render) { - zend_string *_2$$4; - zend_ulong _1$$4; + zend_string *_6$$8; + zend_ulong _5$$8; zend_long ZEPHIR_LAST_CALL_STATUS; zend_bool mustClean; - zval *templatePath_param = NULL, *params, params_sub, *mustClean_param = NULL, compiler, compiledTemplatePath, key, value, *_0$$4, _3$$5, _4$$6, _5$$6; + zval *templatePath_param = NULL, *params, params_sub, *mustClean_param = NULL, compiler, compiledTemplatePath, eventsManager, key, value, _0$$4, _1$$4, _2$$6, _3$$6, *_4$$8, _7$$9, _8$$10, _9$$10; zval templatePath; zval *this_ptr = getThis(); @@ -145,11 +145,16 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, render) { ZVAL_UNDEF(¶ms_sub); ZVAL_UNDEF(&compiler); ZVAL_UNDEF(&compiledTemplatePath); + ZVAL_UNDEF(&eventsManager); ZVAL_UNDEF(&key); ZVAL_UNDEF(&value); - ZVAL_UNDEF(&_3$$5); - ZVAL_UNDEF(&_4$$6); - ZVAL_UNDEF(&_5$$6); + ZVAL_UNDEF(&_0$$4); + ZVAL_UNDEF(&_1$$4); + ZVAL_UNDEF(&_2$$6); + ZVAL_UNDEF(&_3$$6); + ZVAL_UNDEF(&_7$$9); + ZVAL_UNDEF(&_8$$10); + ZVAL_UNDEF(&_9$$10); ZEPHIR_MM_GROW(); zephir_fetch_params(1, 2, 1, &templatePath_param, ¶ms, &mustClean_param); @@ -172,29 +177,49 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, render) { if (mustClean) { - ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 381); + ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 380); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(&compiler, this_ptr, "getcompiler", NULL, 0); zephir_check_call_status(); + ZEPHIR_OBS_VAR(&eventsManager); + zephir_read_property(&eventsManager, this_ptr, SL("_eventsManager"), PH_NOISY_CC); + if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { + ZEPHIR_INIT_VAR(&_1$$4); + ZVAL_STRING(&_1$$4, "view:beforeCompile"); + ZEPHIR_CALL_METHOD(&_0$$4, &eventsManager, "fire", NULL, 0, &_1$$4, this_ptr); + zephir_check_call_status(); + if (ZEPHIR_IS_FALSE_IDENTICAL(&_0$$4)) { + RETURN_MM_NULL(); + } + } ZEPHIR_CALL_METHOD(NULL, &compiler, "compile", NULL, 0, &templatePath); zephir_check_call_status(); + if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { + ZEPHIR_INIT_VAR(&_3$$6); + ZVAL_STRING(&_3$$6, "view:afterCompile"); + ZEPHIR_CALL_METHOD(&_2$$6, &eventsManager, "fire", NULL, 0, &_3$$6, this_ptr); + zephir_check_call_status(); + if (ZEPHIR_IS_FALSE_IDENTICAL(&_2$$6)) { + RETURN_MM_NULL(); + } + } ZEPHIR_CALL_METHOD(&compiledTemplatePath, &compiler, "getcompiledtemplatepath", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(params) == IS_ARRAY) { - zephir_is_iterable(params, 0, "phalcon/mvc/view/engine/volt.zep", 107); - ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(params), _1$$4, _2$$4, _0$$4) + zephir_is_iterable(params, 0, "phalcon/mvc/view/engine/volt.zep", 120); + ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(params), _5$$8, _6$$8, _4$$8) { ZEPHIR_INIT_NVAR(&key); - if (_2$$4 != NULL) { - ZVAL_STR_COPY(&key, _2$$4); + if (_6$$8 != NULL) { + ZVAL_STR_COPY(&key, _6$$8); } else { - ZVAL_LONG(&key, _1$$4); + ZVAL_LONG(&key, _5$$8); } ZEPHIR_INIT_NVAR(&value); - ZVAL_COPY(&value, _0$$4); - ZEPHIR_CPY_WRT(&_3$$5, &value); - if (zephir_set_symbol(&key, &_3$$5 TSRMLS_CC) == FAILURE) { + ZVAL_COPY(&value, _4$$8); + ZEPHIR_CPY_WRT(&_7$$9, &value); + if (zephir_set_symbol(&key, &_7$$9 TSRMLS_CC) == FAILURE) { return; } } ZEND_HASH_FOREACH_END(); @@ -205,10 +230,10 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, render) { RETURN_MM_NULL(); } if (mustClean) { - zephir_read_property(&_4$$6, this_ptr, SL("_view"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_5$$6, "ob_get_contents", NULL, 116); + zephir_read_property(&_8$$10, this_ptr, SL("_view"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_FUNCTION(&_9$$10, "ob_get_contents", NULL, 116); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_4$$6, "setcontent", NULL, 0, &_5$$6); + ZEPHIR_CALL_METHOD(NULL, &_8$$10, "setcontent", NULL, 0, &_9$$10); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -272,7 +297,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, isIncluded) { } if (Z_TYPE_P(haystack) == IS_STRING) { if ((zephir_function_exists_ex(SL("mb_strpos") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&_0$$5, "mb_strpos", NULL, 385, haystack, needle); + ZEPHIR_CALL_FUNCTION(&_0$$5, "mb_strpos", NULL, 384, haystack, needle); zephir_check_call_status(); RETURN_MM_BOOL(!ZEPHIR_IS_FALSE_IDENTICAL(&_0$$5)); } @@ -280,7 +305,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, isIncluded) { zephir_fast_strpos(&_1$$4, haystack, needle, 0 ); RETURN_MM_BOOL(!ZEPHIR_IS_FALSE_IDENTICAL(&_1$$4)); } - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Invalid haystack", "phalcon/mvc/view/engine/volt.zep", 149); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Invalid haystack", "phalcon/mvc/view/engine/volt.zep", 162); return; } @@ -331,7 +356,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, convertEncoding) { _0 = ZEPHIR_IS_STRING(&to, "utf8"); } if (_0) { - ZEPHIR_RETURN_CALL_FUNCTION("utf8_encode", NULL, 386, &text); + ZEPHIR_RETURN_CALL_FUNCTION("utf8_encode", NULL, 385, &text); zephir_check_call_status(); RETURN_MM(); } @@ -354,7 +379,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, convertEncoding) { zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Any of 'mbstring' or 'iconv' is required to perform the charset conversion", "phalcon/mvc/view/engine/volt.zep", 188); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Any of 'mbstring' or 'iconv' is required to perform the charset conversion", "phalcon/mvc/view/engine/volt.zep", 201); return; } @@ -422,7 +447,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, slice) { if (_1$$5) { ZEPHIR_CALL_METHOD(&_2$$6, value, "current", &_3, 0); zephir_check_call_status(); - zephir_array_append(&slice, &_2$$6, PH_SEPARATE, "phalcon/mvc/view/engine/volt.zep", 214); + zephir_array_append(&slice, &_2$$6, PH_SEPARATE, "phalcon/mvc/view/engine/volt.zep", 227); } ZEPHIR_CALL_METHOD(NULL, value, "next", &_4, 0); zephir_check_call_status(); @@ -438,7 +463,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, slice) { } if (Z_TYPE_P(value) == IS_ARRAY) { ZVAL_LONG(&_5$$9, start); - ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 387, value, &_5$$9, &length); + ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 386, value, &_5$$9, &length); zephir_check_call_status(); RETURN_MM(); } @@ -484,7 +509,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, sort) { ZEPHIR_MAKE_REF(&value); - ZEPHIR_CALL_FUNCTION(NULL, "asort", NULL, 388, &value); + ZEPHIR_CALL_FUNCTION(NULL, "asort", NULL, 387, &value); ZEPHIR_UNREF(&value); zephir_check_call_status(); RETURN_CTOR(&value); @@ -539,7 +564,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, callMacro) { ZEPHIR_CONCAT_SVS(&_2$$3, "Macro '", &name, "' does not exist"); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 4, &_2$$3); zephir_check_call_status(); - zephir_throw_exception_debug(&_1$$3, "phalcon/mvc/view/engine/volt.zep", 278 TSRMLS_CC); + zephir_throw_exception_debug(&_1$$3, "phalcon/mvc/view/engine/volt.zep", 291 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } diff --git a/ext/phalcon/mvc/view/engine/volt/compiler.zep.c b/ext/phalcon/mvc/view/engine/volt/compiler.zep.c index 4785bfb7fe9..eaa38a989ec 100644 --- a/ext/phalcon/mvc/view/engine/volt/compiler.zep.c +++ b/ext/phalcon/mvc/view/engine/volt/compiler.zep.c @@ -629,7 +629,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, attributeReader) { } } } else { - ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", NULL, 389, &left); + ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", NULL, 388, &left); zephir_check_call_status(); ZEPHIR_OBS_VAR(&leftType); zephir_array_fetch_string(&leftType, &left, SL("type"), PH_NOISY, "phalcon/mvc/view/engine/volt/compiler.zep", 316 TSRMLS_CC); @@ -651,7 +651,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, attributeReader) { zephir_array_fetch_string(&_9$$11, &right, SL("value"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 329 TSRMLS_CC); zephir_concat_self(&exprCode, &_9$$11 TSRMLS_CC); } else { - ZEPHIR_CALL_METHOD(&_10$$12, this_ptr, "expression", NULL, 389, &right); + ZEPHIR_CALL_METHOD(&_10$$12, this_ptr, "expression", NULL, 388, &right); zephir_check_call_status(); zephir_concat_self(&exprCode, &_10$$12 TSRMLS_CC); } @@ -711,7 +711,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) { ZVAL_NULL(&funcArguments); ZEPHIR_OBS_NVAR(&funcArguments); if (zephir_array_isset_string_fetch(&funcArguments, &expr, SL("arguments"), 0)) { - ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 389, &funcArguments); + ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 388, &funcArguments); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&arguments); @@ -734,7 +734,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) { zephir_array_fast_append(&_0$$6, &funcArguments); ZEPHIR_INIT_VAR(&_1$$6); ZVAL_STRING(&_1$$6, "compileFunction"); - ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 390, &_1$$6, &_0$$6); + ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 389, &_1$$6, &_0$$6); zephir_check_call_status(); if (Z_TYPE_P(&code) == IS_STRING) { RETURN_CCTOR(&code); @@ -766,7 +766,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) { zephir_array_fetch_string(&_5$$9, &expr, SL("line"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 406 TSRMLS_CC); ZEPHIR_INIT_VAR(&_6$$9); ZEPHIR_CONCAT_SVSVSV(&_6$$9, "Invalid definition for user function '", &name, "' in ", &_4$$9, " on line ", &_5$$9); - ZEPHIR_CALL_METHOD(NULL, &_3$$9, "__construct", NULL, 391, &_6$$9); + ZEPHIR_CALL_METHOD(NULL, &_3$$9, "__construct", NULL, 390, &_6$$9); zephir_check_call_status(); zephir_throw_exception_debug(&_3$$9, "phalcon/mvc/view/engine/volt/compiler.zep", 406 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -795,7 +795,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) { ZEPHIR_OBS_VAR(&exprLevel); zephir_read_property(&exprLevel, this_ptr, SL("_exprLevel"), PH_NOISY_CC); if (Z_TYPE_P(&block) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&code, this_ptr, "_statementlistorextends", NULL, 392, &block); + ZEPHIR_CALL_METHOD(&code, this_ptr, "_statementlistorextends", NULL, 391, &block); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&exprLevel, 1)) { ZEPHIR_CPY_WRT(&escapedCode, &code); @@ -889,7 +889,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) { ZEPHIR_CONCAT_SVSVS(return_value, "$this->callMacro('", &name, "', [", &arguments, "])"); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&_9, this_ptr, "expression", NULL, 389, &nameExpr); + ZEPHIR_CALL_METHOD(&_9, this_ptr, "expression", NULL, 388, &nameExpr); zephir_check_call_status(); ZEPHIR_CONCAT_VSVS(return_value, &_9, "(", &arguments, ")"); RETURN_MM(); @@ -964,28 +964,28 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveTest) { if (zephir_array_isset_string_fetch(&name, &testName, SL("value"), 0)) { if (ZEPHIR_IS_STRING(&name, "divisibleby")) { zephir_array_fetch_string(&_1$$12, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 677 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_0$$12, this_ptr, "expression", NULL, 389, &_1$$12); + ZEPHIR_CALL_METHOD(&_0$$12, this_ptr, "expression", NULL, 388, &_1$$12); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "(((", &left, ") % (", &_0$$12, ")) == 0)"); RETURN_MM(); } if (ZEPHIR_IS_STRING(&name, "sameas")) { zephir_array_fetch_string(&_3$$13, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 684 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_2$$13, this_ptr, "expression", NULL, 389, &_3$$13); + ZEPHIR_CALL_METHOD(&_2$$13, this_ptr, "expression", NULL, 388, &_3$$13); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "(", &left, ") === (", &_2$$13, ")"); RETURN_MM(); } if (ZEPHIR_IS_STRING(&name, "type")) { zephir_array_fetch_string(&_5$$14, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 691 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_4$$14, this_ptr, "expression", NULL, 389, &_5$$14); + ZEPHIR_CALL_METHOD(&_4$$14, this_ptr, "expression", NULL, 388, &_5$$14); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "gettype(", &left, ") === (", &_4$$14, ")"); RETURN_MM(); } } } - ZEPHIR_CALL_METHOD(&_6, this_ptr, "expression", NULL, 389, &test); + ZEPHIR_CALL_METHOD(&_6, this_ptr, "expression", NULL, 388, &test); zephir_check_call_status(); ZEPHIR_CONCAT_VSV(return_value, &left, " == ", &_6); RETURN_MM(); @@ -1057,7 +1057,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) { zephir_array_fetch_string(&_2$$5, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 724 TSRMLS_CC); ZEPHIR_INIT_VAR(&_3$$5); ZEPHIR_CONCAT_SVSV(&_3$$5, "Unknown filter type in ", &_1$$5, " on line ", &_2$$5); - ZEPHIR_CALL_METHOD(NULL, &_0$$5, "__construct", NULL, 391, &_3$$5); + ZEPHIR_CALL_METHOD(NULL, &_0$$5, "__construct", NULL, 390, &_3$$5); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$5, "phalcon/mvc/view/engine/volt/compiler.zep", 724 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -1091,11 +1091,11 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) { zephir_array_update_string(&_4$$7, SL("file"), &file, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_4$$7, SL("line"), &line, PH_COPY | PH_SEPARATE); ZEPHIR_MAKE_REF(&funcArguments); - ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 393, &funcArguments, &_4$$7); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 392, &funcArguments, &_4$$7); ZEPHIR_UNREF(&funcArguments); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 389, &funcArguments); + ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 388, &funcArguments); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&arguments, &left); @@ -1110,7 +1110,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) { zephir_array_fast_append(&_6$$9, &funcArguments); ZEPHIR_INIT_VAR(&_7$$9); ZVAL_STRING(&_7$$9, "compileFilter"); - ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 390, &_7$$9, &_6$$9); + ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 389, &_7$$9, &_6$$9); zephir_check_call_status(); if (Z_TYPE_P(&code) == IS_STRING) { RETURN_CCTOR(&code); @@ -1142,7 +1142,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) { zephir_array_fetch_string(&_11$$12, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 808 TSRMLS_CC); ZEPHIR_INIT_VAR(&_12$$12); ZEPHIR_CONCAT_SVSVSV(&_12$$12, "Invalid definition for user filter '", &name, "' in ", &_10$$12, " on line ", &_11$$12); - ZEPHIR_CALL_METHOD(NULL, &_9$$12, "__construct", NULL, 391, &_12$$12); + ZEPHIR_CALL_METHOD(NULL, &_9$$12, "__construct", NULL, 390, &_12$$12); zephir_check_call_status(); zephir_throw_exception_debug(&_9$$12, "phalcon/mvc/view/engine/volt/compiler.zep", 808 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -1271,7 +1271,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) { zephir_array_fetch_string(&_18, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 997 TSRMLS_CC); ZEPHIR_INIT_VAR(&_19); ZEPHIR_CONCAT_SVSVSV(&_19, "Unknown filter \"", &name, "\" in ", &_17, " on line ", &_18); - ZEPHIR_CALL_METHOD(NULL, &_16, "__construct", NULL, 391, &_19); + ZEPHIR_CALL_METHOD(NULL, &_16, "__construct", NULL, 390, &_19); zephir_check_call_status(); zephir_throw_exception_debug(&_16, "phalcon/mvc/view/engine/volt/compiler.zep", 997 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -1342,7 +1342,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { zephir_array_fast_append(&_0$$4, &expr); ZEPHIR_INIT_NVAR(&_1$$4); ZVAL_STRING(&_1$$4, "resolveExpression"); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "fireextensionevent", &_2, 390, &_1$$4, &_0$$4); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "fireextensionevent", &_2, 389, &_1$$4, &_0$$4); zephir_check_call_status(); if (Z_TYPE_P(&exprCode) == IS_STRING) { break; @@ -1358,7 +1358,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { ZEPHIR_INIT_NVAR(&singleExpr); ZVAL_COPY(&singleExpr, _3$$6); zephir_array_fetch_string(&_4$$7, &singleExpr, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1031 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_5, 389, &_4$$7); + ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_5, 388, &_4$$7); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&name); if (zephir_array_isset_string_fetch(&name, &singleExpr, SL("name"), 0)) { @@ -1381,7 +1381,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { } ZEPHIR_OBS_NVAR(&left); if (zephir_array_isset_string_fetch(&left, &expr, SL("left"), 0)) { - ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", &_5, 389, &left); + ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", &_5, 388, &left); zephir_check_call_status(); } if (ZEPHIR_IS_LONG(&type, 311)) { @@ -1392,13 +1392,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { } if (ZEPHIR_IS_LONG(&type, 124)) { zephir_array_fetch_string(&_10$$13, &expr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1069 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "resolvefilter", &_11, 394, &_10$$13, &leftCode); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "resolvefilter", &_11, 393, &_10$$13, &leftCode); zephir_check_call_status(); break; } ZEPHIR_OBS_NVAR(&right); if (zephir_array_isset_string_fetch(&right, &expr, SL("right"), 0)) { - ZEPHIR_CALL_METHOD(&rightCode, this_ptr, "expression", &_5, 389, &right); + ZEPHIR_CALL_METHOD(&rightCode, this_ptr, "expression", &_5, 388, &right); zephir_check_call_status(); } ZEPHIR_INIT_NVAR(&exprCode); @@ -1574,7 +1574,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { if (ZEPHIR_IS_LONG(&type, 365)) { ZEPHIR_OBS_NVAR(&start); if (zephir_array_isset_string_fetch(&start, &expr, SL("start"), 0)) { - ZEPHIR_CALL_METHOD(&startCode, this_ptr, "expression", &_5, 389, &start); + ZEPHIR_CALL_METHOD(&startCode, this_ptr, "expression", &_5, 388, &start); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&startCode); @@ -1582,7 +1582,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { } ZEPHIR_OBS_NVAR(&end); if (zephir_array_isset_string_fetch(&end, &expr, SL("end"), 0)) { - ZEPHIR_CALL_METHOD(&endCode, this_ptr, "expression", &_5, 389, &end); + ZEPHIR_CALL_METHOD(&endCode, this_ptr, "expression", &_5, 388, &end); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&endCode); @@ -1674,7 +1674,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { } if (ZEPHIR_IS_LONG(&type, 366)) { zephir_array_fetch_string(&_19$$69, &expr, SL("ternary"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1299 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_18$$69, this_ptr, "expression", &_5, 389, &_19$$69); + ZEPHIR_CALL_METHOD(&_18$$69, this_ptr, "expression", &_5, 388, &_19$$69); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&exprCode); ZEPHIR_CONCAT_SVSVSVS(&exprCode, "(", &_18$$69, " ? ", &leftCode, " : ", &rightCode, ")"); @@ -1701,7 +1701,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { zephir_array_fetch_string(&_22$$73, &expr, SL("line"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1315 TSRMLS_CC); ZEPHIR_INIT_LNVAR(_23$$73); ZEPHIR_CONCAT_SVSVSV(&_23$$73, "Unknown expression ", &type, " in ", &_21$$73, " on line ", &_22$$73); - ZEPHIR_CALL_METHOD(NULL, &_20$$73, "__construct", &_24, 391, &_23$$73); + ZEPHIR_CALL_METHOD(NULL, &_20$$73, "__construct", &_24, 390, &_23$$73); zephir_check_call_status(); zephir_throw_exception_debug(&_20$$73, "phalcon/mvc/view/engine/volt/compiler.zep", 1315 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -1755,7 +1755,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, _statementListOrExtends) { ZEPHIR_INIT_NVAR(&statement); } if (isStatementList == 1) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_statementlist", NULL, 395, statements); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_statementlist", NULL, 394, statements); zephir_check_call_status(); RETURN_MM(); } @@ -1844,7 +1844,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach) { ZEPHIR_CONCAT_VV(&prefixLevel, &prefix, &level); ZEPHIR_OBS_VAR(&expr); zephir_array_fetch_string(&expr, &statement, SL("expr"), PH_NOISY, "phalcon/mvc/view/engine/volt/compiler.zep", 1401 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 389, &expr); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 388, &expr); zephir_check_call_status(); ZEPHIR_OBS_VAR(&blockStatements); zephir_array_fetch_string(&blockStatements, &statement, SL("block_statements"), PH_NOISY, "phalcon/mvc/view/engine/volt/compiler.zep", 1407 TSRMLS_CC); @@ -1879,7 +1879,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach) { } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_CALL_METHOD(&code, this_ptr, "_statementlist", NULL, 395, &blockStatements, &_2); + ZEPHIR_CALL_METHOD(&code, this_ptr, "_statementlist", NULL, 394, &blockStatements, &_2); zephir_check_call_status(); ZEPHIR_OBS_VAR(&loopContext); zephir_read_property(&loopContext, this_ptr, SL("_loopPointers"), PH_NOISY_CC); @@ -1930,7 +1930,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach) { } ZEPHIR_OBS_VAR(&ifExpr); if (zephir_array_isset_string_fetch(&ifExpr, &statement, SL("if_expr"), 0)) { - ZEPHIR_CALL_METHOD(&_14$$13, this_ptr, "expression", NULL, 389, &ifExpr); + ZEPHIR_CALL_METHOD(&_14$$13, this_ptr, "expression", NULL, 388, &ifExpr); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_15$$13); ZEPHIR_CONCAT_SVS(&_15$$13, "if (", &_14$$13, ") { ?>"); @@ -2054,13 +2054,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileIf) { object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 391, &_1$$3, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 390, &_1$$3, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/mvc/view/engine/volt/compiler.zep", 1554 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 389, &expr); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 388, &expr); zephir_check_call_status(); zephir_array_fetch_string(&_4, &statement, SL("true_statements"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1560 TSRMLS_CC); if (extendsMode) { @@ -2068,7 +2068,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileIf) { } else { ZVAL_BOOL(&_5, 0); } - ZEPHIR_CALL_METHOD(&_3, this_ptr, "_statementlist", NULL, 395, &_4, &_5); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "_statementlist", NULL, 394, &_4, &_5); zephir_check_call_status(); ZEPHIR_INIT_VAR(&compilation); ZEPHIR_CONCAT_SVSV(&compilation, "", &_3); @@ -2079,7 +2079,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileIf) { } else { ZVAL_BOOL(&_7$$4, 0); } - ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "_statementlist", NULL, 395, &blockStatements, &_7$$4); + ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "_statementlist", NULL, 394, &blockStatements, &_7$$4); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_8$$4); ZEPHIR_CONCAT_SV(&_8$$4, "", &_6$$4); @@ -2131,13 +2131,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSwitch) { object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 391, &_1$$3, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 390, &_1$$3, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/mvc/view/engine/volt/compiler.zep", 1589 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 389, &expr); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 388, &expr); zephir_check_call_status(); ZEPHIR_INIT_VAR(&compilation); ZEPHIR_CONCAT_SVS(&compilation, ""); @@ -2148,7 +2148,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSwitch) { } else { ZVAL_BOOL(&_3$$4, 0); } - ZEPHIR_CALL_METHOD(&lines, this_ptr, "_statementlist", NULL, 395, &caseClauses, &_3$$4); + ZEPHIR_CALL_METHOD(&lines, this_ptr, "_statementlist", NULL, 394, &caseClauses, &_3$$4); zephir_check_call_status(); if (zephir_fast_strlen_ev(&lines) != 0) { ZEPHIR_INIT_VAR(&_4$$5); @@ -2203,13 +2203,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileCase) { object_init_ex(&_0$$4, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$4); ZVAL_STRING(&_1$$4, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 391, &_1$$4, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 390, &_1$$4, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$4, "phalcon/mvc/view/engine/volt/compiler.zep", 1649 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 389, &expr); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 388, &expr); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, ""); RETURN_MM(); @@ -2244,13 +2244,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileElseIf) { object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 391, &_1$$3, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 390, &_1$$3, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/mvc/view/engine/volt/compiler.zep", 1669 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 389, &expr); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 388, &expr); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, ""); RETURN_MM(); @@ -2312,15 +2312,15 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileCache) { object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 391, &_1$$3, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 390, &_1$$3, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/mvc/view/engine/volt/compiler.zep", 1689 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 389, &expr); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 388, &expr); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 389, &expr); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 388, &expr); zephir_check_call_status(); ZEPHIR_INIT_VAR(&compilation); ZEPHIR_CONCAT_SVS(&compilation, "di->get('viewCache'); "); @@ -2355,7 +2355,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileCache) { } else { ZVAL_BOOL(&_13, 0); } - ZEPHIR_CALL_METHOD(&_11, this_ptr, "_statementlist", NULL, 395, &_12, &_13); + ZEPHIR_CALL_METHOD(&_11, this_ptr, "_statementlist", NULL, 394, &_12, &_13); zephir_check_call_status(); zephir_concat_self(&compilation, &_11 TSRMLS_CC); ZEPHIR_OBS_NVAR(&lifetime); @@ -2429,10 +2429,10 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSet) { ZEPHIR_INIT_NVAR(&assignment); ZVAL_COPY(&assignment, _0); zephir_array_fetch_string(&_1$$4, &assignment, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1752 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_2, 389, &_1$$4); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_2, 388, &_1$$4); zephir_check_call_status(); zephir_array_fetch_string(&_3$$4, &assignment, SL("variable"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1757 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_2, 389, &_3$$4); + ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_2, 388, &_3$$4); zephir_check_call_status(); zephir_array_fetch_string(&_4$$4, &assignment, SL("op"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1763 TSRMLS_CC); do { @@ -2498,7 +2498,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileDo) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/mvc/view/engine/volt/compiler.zep", 1803); return; } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 389, &expr); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 388, &expr); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, ""); RETURN_MM(); @@ -2530,7 +2530,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileReturn) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/mvc/view/engine/volt/compiler.zep", 1823); return; } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 389, &expr); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 388, &expr); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, ""); RETURN_MM(); @@ -2576,7 +2576,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileAutoEscape) { } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_CALL_METHOD(&compilation, this_ptr, "_statementlist", NULL, 395, &_0, &_1); + ZEPHIR_CALL_METHOD(&compilation, this_ptr, "_statementlist", NULL, 394, &_0, &_1); zephir_check_call_status(); zephir_update_property_zval(this_ptr, SL("_autoescape"), &oldAutoescape); RETURN_CCTOR(&compilation); @@ -2616,13 +2616,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileEcho) { object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 391, &_1$$3, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 390, &_1$$3, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/mvc/view/engine/volt/compiler.zep", 1869 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 389, &expr); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 388, &expr); zephir_check_call_status(); zephir_array_fetch_string(&_2, &expr, SL("type"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1877 TSRMLS_CC); if (ZEPHIR_IS_LONG(&_2, 350)) { @@ -2701,14 +2701,14 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileInclude) { RETURN_CCTOR(&compilation); } } - ZEPHIR_CALL_METHOD(&path, this_ptr, "expression", NULL, 389, &pathExpr); + ZEPHIR_CALL_METHOD(&path, this_ptr, "expression", NULL, 388, &pathExpr); zephir_check_call_status(); ZEPHIR_OBS_VAR(¶ms); if (!(zephir_array_isset_string_fetch(¶ms, &statement, SL("params"), 0))) { ZEPHIR_CONCAT_SVS(return_value, "partial(", &path, "); ?>"); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&_3, this_ptr, "expression", NULL, 389, ¶ms); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "expression", NULL, 388, ¶ms); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "partial(", &path, ", ", &_3, "); ?>"); RETURN_MM(); @@ -2774,7 +2774,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro) { object_init_ex(&_1$$4, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_2$$4); ZEPHIR_CONCAT_SVS(&_2$$4, "Macro '", &name, "' is already defined"); - ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 391, &_2$$4); + ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 390, &_2$$4); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$4, "phalcon/mvc/view/engine/volt/compiler.zep", 1988 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -2823,7 +2823,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro) { zephir_concat_self_str(&code, SL(" } else { ") TSRMLS_CC); ZEPHIR_OBS_NVAR(&defaultValue); if (zephir_array_isset_string_fetch(&defaultValue, ¶meter, SL("default"), 0)) { - ZEPHIR_CALL_METHOD(&_12$$8, this_ptr, "expression", &_13, 389, &defaultValue); + ZEPHIR_CALL_METHOD(&_12$$8, this_ptr, "expression", &_13, 388, &defaultValue); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_14$$8); ZEPHIR_CONCAT_SVSVS(&_14$$8, "$", &variableName, " = ", &_12$$8, ";"); @@ -2846,7 +2846,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro) { } else { ZVAL_BOOL(&_17$$10, 0); } - ZEPHIR_CALL_METHOD(&_16$$10, this_ptr, "_statementlist", NULL, 395, &blockStatements, &_17$$10); + ZEPHIR_CALL_METHOD(&_16$$10, this_ptr, "_statementlist", NULL, 394, &blockStatements, &_17$$10); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_18$$10); ZEPHIR_CONCAT_VS(&_18$$10, &_16$$10, "= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_tag_geturlservice, 0, 0, Phalcon\\Mvc\\UrlInterface, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_tag_geturlservice, 0, 0, Phalcon\\UrlInterface, 0) #else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_tag_geturlservice, 0, 0, IS_OBJECT, "Phalcon\\Mvc\\UrlInterface", 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_tag_geturlservice, 0, 0, IS_OBJECT, "Phalcon\\UrlInterface", 0) #endif ZEND_END_ARG_INFO() diff --git a/ext/phalcon/tag/select.zep.c b/ext/phalcon/tag/select.zep.c index 15d54bb356d..f6b501a4851 100644 --- a/ext/phalcon/tag/select.zep.c +++ b/ext/phalcon/tag/select.zep.c @@ -184,7 +184,7 @@ PHP_METHOD(Phalcon_Tag_Select, selectField) { ZEPHIR_GET_CONSTANT(&_10$$24, "PHP_EOL"); ZEPHIR_INIT_VAR(&_11$$24); ZEPHIR_CONCAT_SV(&_11$$24, "", &_10$$24); - ZEPHIR_CALL_SELF(&_8$$24, "_optionsfromresultset", &_9, 440, &options, &using, &value, &_11$$24); + ZEPHIR_CALL_SELF(&_8$$24, "_optionsfromresultset", &_9, 439, &options, &using, &value, &_11$$24); zephir_check_call_status(); zephir_concat_self(&code, &_8$$24 TSRMLS_CC); } else { @@ -193,7 +193,7 @@ PHP_METHOD(Phalcon_Tag_Select, selectField) { ZEPHIR_GET_CONSTANT(&_14$$26, "PHP_EOL"); ZEPHIR_INIT_VAR(&_15$$26); ZEPHIR_CONCAT_SV(&_15$$26, "", &_14$$26); - ZEPHIR_CALL_SELF(&_12$$26, "_optionsfromarray", &_13, 441, &options, &value, &_15$$26); + ZEPHIR_CALL_SELF(&_12$$26, "_optionsfromarray", &_13, 440, &options, &value, &_15$$26); zephir_check_call_status(); zephir_concat_self(&code, &_12$$26 TSRMLS_CC); } @@ -403,7 +403,7 @@ PHP_METHOD(Phalcon_Tag_Select, _optionsFromArray) { if (Z_TYPE_P(&optionText) == IS_ARRAY) { ZEPHIR_INIT_NVAR(&_4$$4); ZEPHIR_GET_CONSTANT(&_4$$4, "PHP_EOL"); - ZEPHIR_CALL_SELF(&_5$$4, "_optionsfromarray", &_6, 441, &optionText, value, &closeOption); + ZEPHIR_CALL_SELF(&_5$$4, "_optionsfromarray", &_6, 440, &optionText, value, &closeOption); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_7$$4); ZEPHIR_GET_CONSTANT(&_7$$4, "PHP_EOL"); diff --git a/ext/phalcon/text.zep.c b/ext/phalcon/text.zep.c index e399a233ced..993c6ec5bd2 100644 --- a/ext/phalcon/text.zep.c +++ b/ext/phalcon/text.zep.c @@ -263,13 +263,13 @@ PHP_METHOD(Phalcon_Text, random) { ZVAL_STRING(&_0$$3, "a"); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "z"); - ZEPHIR_CALL_FUNCTION(&_2$$3, "range", NULL, 442, &_0$$3, &_1$$3); + ZEPHIR_CALL_FUNCTION(&_2$$3, "range", NULL, 441, &_0$$3, &_1$$3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_0$$3); ZVAL_STRING(&_0$$3, "A"); ZEPHIR_INIT_NVAR(&_1$$3); ZVAL_STRING(&_1$$3, "Z"); - ZEPHIR_CALL_FUNCTION(&_3$$3, "range", NULL, 442, &_0$$3, &_1$$3); + ZEPHIR_CALL_FUNCTION(&_3$$3, "range", NULL, 441, &_0$$3, &_1$$3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&pool); zephir_fast_array_merge(&pool, &_2$$3, &_3$$3 TSRMLS_CC); @@ -278,13 +278,13 @@ PHP_METHOD(Phalcon_Text, random) { if (type == 2) { ZVAL_LONG(&_4$$4, 0); ZVAL_LONG(&_5$$4, 9); - ZEPHIR_CALL_FUNCTION(&_6$$4, "range", NULL, 442, &_4$$4, &_5$$4); + ZEPHIR_CALL_FUNCTION(&_6$$4, "range", NULL, 441, &_4$$4, &_5$$4); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_7$$4); ZVAL_STRING(&_7$$4, "a"); ZEPHIR_INIT_VAR(&_8$$4); ZVAL_STRING(&_8$$4, "f"); - ZEPHIR_CALL_FUNCTION(&_9$$4, "range", NULL, 442, &_7$$4, &_8$$4); + ZEPHIR_CALL_FUNCTION(&_9$$4, "range", NULL, 441, &_7$$4, &_8$$4); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&pool); zephir_fast_array_merge(&pool, &_6$$4, &_9$$4 TSRMLS_CC); @@ -293,14 +293,14 @@ PHP_METHOD(Phalcon_Text, random) { if (type == 3) { ZVAL_LONG(&_10$$5, 0); ZVAL_LONG(&_11$$5, 9); - ZEPHIR_CALL_FUNCTION(&pool, "range", NULL, 442, &_10$$5, &_11$$5); + ZEPHIR_CALL_FUNCTION(&pool, "range", NULL, 441, &_10$$5, &_11$$5); zephir_check_call_status(); break; } if (type == 4) { ZVAL_LONG(&_12$$6, 1); ZVAL_LONG(&_13$$6, 9); - ZEPHIR_CALL_FUNCTION(&pool, "range", NULL, 442, &_12$$6, &_13$$6); + ZEPHIR_CALL_FUNCTION(&pool, "range", NULL, 441, &_12$$6, &_13$$6); zephir_check_call_status(); break; } @@ -313,21 +313,21 @@ PHP_METHOD(Phalcon_Text, random) { } ZVAL_LONG(&_15$$8, 0); ZVAL_LONG(&_16$$8, 9); - ZEPHIR_CALL_FUNCTION(&_17$$8, "range", NULL, 442, &_15$$8, &_16$$8); + ZEPHIR_CALL_FUNCTION(&_17$$8, "range", NULL, 441, &_15$$8, &_16$$8); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_18$$8); ZVAL_STRING(&_18$$8, "a"); ZEPHIR_INIT_VAR(&_19$$8); ZVAL_STRING(&_19$$8, "z"); - ZEPHIR_CALL_FUNCTION(&_20$$8, "range", NULL, 442, &_18$$8, &_19$$8); + ZEPHIR_CALL_FUNCTION(&_20$$8, "range", NULL, 441, &_18$$8, &_19$$8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_18$$8); ZVAL_STRING(&_18$$8, "A"); ZEPHIR_INIT_NVAR(&_19$$8); ZVAL_STRING(&_19$$8, "Z"); - ZEPHIR_CALL_FUNCTION(&_21$$8, "range", NULL, 442, &_18$$8, &_19$$8); + ZEPHIR_CALL_FUNCTION(&_21$$8, "range", NULL, 441, &_18$$8, &_19$$8); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&pool, "array_merge", NULL, 443, &_17$$8, &_20$$8, &_21$$8); + ZEPHIR_CALL_FUNCTION(&pool, "array_merge", NULL, 442, &_17$$8, &_20$$8, &_21$$8); zephir_check_call_status(); break; } while(0); @@ -468,7 +468,7 @@ PHP_METHOD(Phalcon_Text, lower) { if ((zephir_function_exists_ex(SL("mb_strtolower") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("mb_strtolower", NULL, 444, &str, &encoding); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strtolower", NULL, 443, &str, &encoding); zephir_check_call_status(); RETURN_MM(); } @@ -525,7 +525,7 @@ PHP_METHOD(Phalcon_Text, upper) { if ((zephir_function_exists_ex(SL("mb_strtoupper") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("mb_strtoupper", NULL, 445, &str, &encoding); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strtoupper", NULL, 444, &str, &encoding); zephir_check_call_status(); RETURN_MM(); } @@ -627,7 +627,7 @@ PHP_METHOD(Phalcon_Text, concat) { ZEPHIR_INIT_VAR(&_3$$3); zephir_get_args(&_3$$3); ZVAL_LONG(&_4$$3, 3); - ZEPHIR_CALL_FUNCTION(&_5$$3, "array_slice", NULL, 387, &_3$$3, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "array_slice", NULL, 386, &_3$$3, &_4$$3); zephir_check_call_status(); zephir_is_iterable(&_5$$3, 0, "phalcon/text.zep", 253); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_5$$3), _6$$3) @@ -763,24 +763,24 @@ PHP_METHOD(Phalcon_Text, dynamic) { } - ZEPHIR_CALL_FUNCTION(&_0, "substr_count", NULL, 446, &text, &leftDelimiter); + ZEPHIR_CALL_FUNCTION(&_0, "substr_count", NULL, 445, &text, &leftDelimiter); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "substr_count", NULL, 446, &text, &rightDelimiter); + ZEPHIR_CALL_FUNCTION(&_1, "substr_count", NULL, 445, &text, &rightDelimiter); zephir_check_call_status(); if (!ZEPHIR_IS_IDENTICAL(&_0, &_1)) { ZEPHIR_INIT_VAR(&_2$$3); object_init_ex(&_2$$3, spl_ce_RuntimeException); ZEPHIR_INIT_VAR(&_3$$3); ZEPHIR_CONCAT_SVS(&_3$$3, "Syntax error in string \"", &text, "\""); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 436, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 435, &_3$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_2$$3, "phalcon/text.zep", 280 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_FUNCTION(&ldS, "preg_quote", NULL, 447, &leftDelimiter); + ZEPHIR_CALL_FUNCTION(&ldS, "preg_quote", NULL, 446, &leftDelimiter); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&rdS, "preg_quote", NULL, 447, &rightDelimiter); + ZEPHIR_CALL_FUNCTION(&rdS, "preg_quote", NULL, 446, &rightDelimiter); zephir_check_call_status(); ZEPHIR_INIT_VAR(&pattern); ZEPHIR_CONCAT_SVSVVSVS(&pattern, "/", &ldS, "([^", &ldS, &rdS, "]+)", &rdS, "/"); @@ -808,11 +808,11 @@ PHP_METHOD(Phalcon_Text, dynamic) { ZEPHIR_INIT_NVAR(&words); zephir_fast_explode(&words, &separator, &_7$$6, LONG_MAX TSRMLS_CC); ZEPHIR_OBS_NVAR(&word); - ZEPHIR_CALL_FUNCTION(&_8$$6, "array_rand", &_9, 448, &words); + ZEPHIR_CALL_FUNCTION(&_8$$6, "array_rand", &_9, 447, &words); zephir_check_call_status(); zephir_array_fetch(&word, &words, &_8$$6, PH_NOISY, "phalcon/text.zep", 299 TSRMLS_CC); zephir_array_fetch_long(&_10$$6, &match, 0, PH_NOISY | PH_READONLY, "phalcon/text.zep", 300 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&sub, "preg_quote", NULL, 447, &_10$$6, &separator); + ZEPHIR_CALL_FUNCTION(&sub, "preg_quote", NULL, 446, &_10$$6, &separator); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_11$$6); ZEPHIR_CONCAT_SVS(&_11$$6, "/", &sub, "/"); diff --git a/ext/phalcon/translate/adapter/csv.zep.c b/ext/phalcon/translate/adapter/csv.zep.c index 59956d4c75f..1bb323fbf12 100644 --- a/ext/phalcon/translate/adapter/csv.zep.c +++ b/ext/phalcon/translate/adapter/csv.zep.c @@ -85,7 +85,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_Csv, __construct) { ZVAL_STRING(&_3, ";"); ZEPHIR_INIT_VAR(&_4); ZVAL_STRING(&_4, "\""); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "_load", NULL, 449, &_1, &_2, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "_load", NULL, 448, &_1, &_2, &_3, &_4); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -144,7 +144,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_Csv, _load) { } while (1) { ZVAL_LONG(&_3$$4, length); - ZEPHIR_CALL_FUNCTION(&data, "fgetcsv", &_4, 450, &fileHandler, &_3$$4, &delimiter, &enclosure); + ZEPHIR_CALL_FUNCTION(&data, "fgetcsv", &_4, 449, &fileHandler, &_3$$4, &delimiter, &enclosure); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&data)) { break; diff --git a/ext/phalcon/translate/adapter/gettext.zep.c b/ext/phalcon/translate/adapter/gettext.zep.c index 60f48ce30ad..f0b66eb9116 100644 --- a/ext/phalcon/translate/adapter/gettext.zep.c +++ b/ext/phalcon/translate/adapter/gettext.zep.c @@ -193,7 +193,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_Gettext, query) { } - ZEPHIR_CALL_FUNCTION(&translation, "gettext", NULL, 451, &index); + ZEPHIR_CALL_FUNCTION(&translation, "gettext", NULL, 450, &index); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "replaceplaceholders", NULL, 0, &translation, placeholders); zephir_check_call_status(); @@ -306,11 +306,11 @@ PHP_METHOD(Phalcon_Translate_Adapter_Gettext, nquery) { if (!(!(Z_TYPE_P(&domain) == IS_UNDEF) && Z_STRLEN_P(&domain))) { ZVAL_LONG(&_0$$3, count); - ZEPHIR_CALL_FUNCTION(&translation, "ngettext", NULL, 452, &msgid1, &msgid2, &_0$$3); + ZEPHIR_CALL_FUNCTION(&translation, "ngettext", NULL, 451, &msgid1, &msgid2, &_0$$3); zephir_check_call_status(); } else { ZVAL_LONG(&_1$$4, count); - ZEPHIR_CALL_FUNCTION(&translation, "dngettext", NULL, 453, &domain, &msgid1, &msgid2, &_1$$4); + ZEPHIR_CALL_FUNCTION(&translation, "dngettext", NULL, 452, &domain, &msgid1, &msgid2, &_1$$4); zephir_check_call_status(); } ZEPHIR_RETURN_CALL_METHOD(this_ptr, "replaceplaceholders", NULL, 0, &translation, placeholders); @@ -335,7 +335,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_Gettext, setDomain) { - ZEPHIR_RETURN_CALL_FUNCTION("textdomain", NULL, 454, domain); + ZEPHIR_RETURN_CALL_FUNCTION("textdomain", NULL, 453, domain); zephir_check_call_status(); RETURN_MM(); @@ -356,7 +356,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_Gettext, resetDomain) { ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdefaultdomain", NULL, 0); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("textdomain", NULL, 454, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("textdomain", NULL, 453, &_0); zephir_check_call_status(); RETURN_MM(); @@ -446,7 +446,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_Gettext, setDirectory) { } ZEPHIR_INIT_NVAR(&value); ZVAL_COPY(&value, _0$$4); - ZEPHIR_CALL_FUNCTION(NULL, "bindtextdomain", &_3, 455, &key, &value); + ZEPHIR_CALL_FUNCTION(NULL, "bindtextdomain", &_3, 454, &key, &value); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); ZEPHIR_INIT_NVAR(&value); @@ -454,7 +454,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_Gettext, setDirectory) { } else { ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "getdefaultdomain", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "bindtextdomain", &_3, 455, &_4$$6, directory); + ZEPHIR_CALL_FUNCTION(NULL, "bindtextdomain", &_3, 454, &_4$$6, directory); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -526,17 +526,17 @@ PHP_METHOD(Phalcon_Translate_Adapter_Gettext, setLocale) { zephir_read_property(&_3, this_ptr, SL("_locale"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_4); ZEPHIR_CONCAT_SV(&_4, "LC_ALL=", &_3); - ZEPHIR_CALL_FUNCTION(NULL, "putenv", NULL, 456, &_4); + ZEPHIR_CALL_FUNCTION(NULL, "putenv", NULL, 455, &_4); zephir_check_call_status(); zephir_read_property(&_5, this_ptr, SL("_locale"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_6); ZEPHIR_CONCAT_SV(&_6, "LANG=", &_5); - ZEPHIR_CALL_FUNCTION(NULL, "putenv", NULL, 456, &_6); + ZEPHIR_CALL_FUNCTION(NULL, "putenv", NULL, 455, &_6); zephir_check_call_status(); zephir_read_property(&_7, this_ptr, SL("_locale"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_8); ZEPHIR_CONCAT_SV(&_8, "LANGUAGE=", &_7); - ZEPHIR_CALL_FUNCTION(NULL, "putenv", NULL, 456, &_8); + ZEPHIR_CALL_FUNCTION(NULL, "putenv", NULL, 455, &_8); zephir_check_call_status(); zephir_read_property(&_9, this_ptr, SL("_locale"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_10, 6); diff --git a/ext/phalcon/translate/interpolator/indexedarray.zep.c b/ext/phalcon/translate/interpolator/indexedarray.zep.c index b631409d845..4f27b1ebf60 100644 --- a/ext/phalcon/translate/interpolator/indexedarray.zep.c +++ b/ext/phalcon/translate/interpolator/indexedarray.zep.c @@ -77,7 +77,7 @@ PHP_METHOD(Phalcon_Translate_Interpolator_IndexedArray, replacePlaceholders) { } if (_0) { ZEPHIR_MAKE_REF(placeholders); - ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 393, placeholders, &translation); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 392, placeholders, &translation); ZEPHIR_UNREF(placeholders); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1$$3); diff --git a/ext/phalcon/mvc/url.zep.c b/ext/phalcon/url.zep.c similarity index 87% rename from ext/phalcon/mvc/url.zep.c rename to ext/phalcon/url.zep.c index 5637756b36f..a7af4cf62f2 100644 --- a/ext/phalcon/mvc/url.zep.c +++ b/ext/phalcon/url.zep.c @@ -1,11 +1,11 @@ #ifdef HAVE_CONFIG_H -#include "../../ext_config.h" +#include "../ext_config.h" #endif #include -#include "../../php_ext.h" -#include "../../ext.h" +#include "../php_ext.h" +#include "../ext.h" #include #include @@ -33,7 +33,7 @@ * file that was distributed with this source code. */ /** - * Phalcon\Mvc\Url + * Phalcon\Url * * This components helps in the generation of: URIs, URLs and Paths * @@ -51,34 +51,34 @@ * ); * */ -ZEPHIR_INIT_CLASS(Phalcon_Mvc_Url) { +ZEPHIR_INIT_CLASS(Phalcon_Url) { - ZEPHIR_REGISTER_CLASS(Phalcon\\Mvc, Url, phalcon, mvc_url, phalcon_mvc_url_method_entry, 0); + ZEPHIR_REGISTER_CLASS(Phalcon, Url, phalcon, url, phalcon_url_method_entry, 0); /** * @var null | string */ - zend_declare_property_null(phalcon_mvc_url_ce, SL("baseUri"), ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_null(phalcon_url_ce, SL("baseUri"), ZEND_ACC_PROTECTED TSRMLS_CC); /** * @var null | string */ - zend_declare_property_null(phalcon_mvc_url_ce, SL("basePath"), ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_null(phalcon_url_ce, SL("basePath"), ZEND_ACC_PROTECTED TSRMLS_CC); /** * @var */ - zend_declare_property_null(phalcon_mvc_url_ce, SL("container"), ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_null(phalcon_url_ce, SL("container"), ZEND_ACC_PROTECTED TSRMLS_CC); - zend_declare_property_null(phalcon_mvc_url_ce, SL("router"), ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_null(phalcon_url_ce, SL("router"), ZEND_ACC_PROTECTED TSRMLS_CC); /** * @var null | string */ - zend_declare_property_null(phalcon_mvc_url_ce, SL("staticBaseUri"), ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_null(phalcon_url_ce, SL("staticBaseUri"), ZEND_ACC_PROTECTED TSRMLS_CC); - zend_class_implements(phalcon_mvc_url_ce TSRMLS_CC, 1, phalcon_mvc_urlinterface_ce); - zend_class_implements(phalcon_mvc_url_ce TSRMLS_CC, 1, phalcon_di_injectionawareinterface_ce); + zend_class_implements(phalcon_url_ce TSRMLS_CC, 1, phalcon_urlinterface_ce); + zend_class_implements(phalcon_url_ce TSRMLS_CC, 1, phalcon_di_injectionawareinterface_ce); return SUCCESS; } @@ -116,7 +116,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Url) { * ); * */ -PHP_METHOD(Phalcon_Mvc_Url, get) { +PHP_METHOD(Phalcon_Url, get) { unsigned char _20$$14, _22$$14, _27$$16; zval strUri, _15$$14; @@ -187,9 +187,9 @@ PHP_METHOD(Phalcon_Mvc_Url, get) { if (local == 0) { _0$$3 = Z_TYPE_P(uri) == IS_STRING; if (_0$$3) { - _1$$3 = zephir_memnstr_str(uri, SL("//"), "phalcon/mvc/url.zep", 103); + _1$$3 = zephir_memnstr_str(uri, SL("//"), "phalcon/url.zep", 103); if (!(_1$$3)) { - _1$$3 = zephir_memnstr_str(uri, SL(":"), "phalcon/mvc/url.zep", 103); + _1$$3 = zephir_memnstr_str(uri, SL(":"), "phalcon/url.zep", 103); } _0$$3 = _1$$3; } @@ -217,7 +217,7 @@ PHP_METHOD(Phalcon_Mvc_Url, get) { if (Z_TYPE_P(uri) == IS_ARRAY) { ZEPHIR_OBS_VAR(&routeName); if (!(zephir_array_isset_string_fetch(&routeName, uri, SL("for"), 0))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_url_exception_ce, "It's necessary to define the route name with the parameter 'for'", "phalcon/mvc/url.zep", 121); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_url_exception_ce, "It's necessary to define the route name with the parameter 'for'", "phalcon/url.zep", 121); return; } zephir_read_property(&_6$$9, this_ptr, SL("router"), PH_NOISY_CC | PH_READONLY); @@ -226,7 +226,7 @@ PHP_METHOD(Phalcon_Mvc_Url, get) { zephir_read_property(&_7$$11, this_ptr, SL("container"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&dependencyInjector, &_7$$11); if (Z_TYPE_P(&dependencyInjector) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_url_exception_ce, "A dependency injector container is required to obtain the 'router' service", "phalcon/mvc/url.zep", 133); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_url_exception_ce, "A dependency injector container is required to obtain the 'router' service", "phalcon/url.zep", 133); return; } ZEPHIR_INIT_VAR(&_9$$11); @@ -241,12 +241,12 @@ PHP_METHOD(Phalcon_Mvc_Url, get) { ZEPHIR_CPY_WRT(&route, &_10$$9); if (Z_TYPE_P(&route) != IS_OBJECT) { ZEPHIR_INIT_VAR(&_11$$13); - object_init_ex(&_11$$13, phalcon_mvc_url_exception_ce); + object_init_ex(&_11$$13, phalcon_url_exception_ce); ZEPHIR_INIT_VAR(&_12$$13); ZEPHIR_CONCAT_SVS(&_12$$13, "Cannot obtain a route using the name '", &routeName, "'"); ZEPHIR_CALL_METHOD(NULL, &_11$$13, "__construct", NULL, 4, &_12$$13); zephir_check_call_status(); - zephir_throw_exception_debug(&_11$$13, "phalcon/mvc/url.zep", 145 TSRMLS_CC); + zephir_throw_exception_debug(&_11$$13, "phalcon/url.zep", 145 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -303,7 +303,7 @@ PHP_METHOD(Phalcon_Mvc_Url, get) { } } if (zephir_is_true(args)) { - ZEPHIR_CALL_FUNCTION(&queryString, "http_build_query", NULL, 378, args); + ZEPHIR_CALL_FUNCTION(&queryString, "http_build_query", NULL, 456, args); zephir_check_call_status(); _28$$19 = Z_TYPE_P(&queryString) == IS_STRING; if (_28$$19) { @@ -333,7 +333,7 @@ PHP_METHOD(Phalcon_Mvc_Url, get) { /** * Returns the base path */ -PHP_METHOD(Phalcon_Mvc_Url, getBasePath) { +PHP_METHOD(Phalcon_Url, getBasePath) { zval *this_ptr = getThis(); @@ -345,7 +345,7 @@ PHP_METHOD(Phalcon_Mvc_Url, getBasePath) { /** * Returns the prefix for all the generated urls. By default / */ -PHP_METHOD(Phalcon_Mvc_Url, getBaseUri) { +PHP_METHOD(Phalcon_Url, getBaseUri) { zval *_SERVER, baseUri, phpSelf, uri, _0; zval *this_ptr = getThis(); @@ -384,7 +384,7 @@ PHP_METHOD(Phalcon_Mvc_Url, getBaseUri) { /** * Returns the DependencyInjector container */ -PHP_METHOD(Phalcon_Mvc_Url, getDI) { +PHP_METHOD(Phalcon_Url, getDI) { zval *this_ptr = getThis(); @@ -408,7 +408,7 @@ PHP_METHOD(Phalcon_Mvc_Url, getDI) { * ); * */ -PHP_METHOD(Phalcon_Mvc_Url, getStatic) { +PHP_METHOD(Phalcon_Url, getStatic) { zend_long ZEPHIR_LAST_CALL_STATUS; zval *uri = NULL, uri_sub, __$null, _0, _1, _2; @@ -442,7 +442,7 @@ PHP_METHOD(Phalcon_Mvc_Url, getStatic) { /** * Returns the prefix for all the generated static urls. By default / */ -PHP_METHOD(Phalcon_Mvc_Url, getStaticBaseUri) { +PHP_METHOD(Phalcon_Url, getStaticBaseUri) { zval staticBaseUri, _0; zend_long ZEPHIR_LAST_CALL_STATUS; @@ -471,7 +471,7 @@ PHP_METHOD(Phalcon_Mvc_Url, getStaticBaseUri) { * $url->setBasePath("/var/www/htdocs/"); * */ -PHP_METHOD(Phalcon_Mvc_Url, setBasePath) { +PHP_METHOD(Phalcon_Url, setBasePath) { zval *basePath_param = NULL; zval basePath; @@ -508,7 +508,7 @@ PHP_METHOD(Phalcon_Mvc_Url, setBasePath) { * $url->setBaseUri("/invo/index.php/"); * */ -PHP_METHOD(Phalcon_Mvc_Url, setBaseUri) { +PHP_METHOD(Phalcon_Url, setBaseUri) { zval *baseUri_param = NULL, _0; zval baseUri; @@ -544,7 +544,7 @@ PHP_METHOD(Phalcon_Mvc_Url, setBaseUri) { /** * Sets the DependencyInjector container */ -PHP_METHOD(Phalcon_Mvc_Url, setDI) { +PHP_METHOD(Phalcon_Url, setDI) { zval *dependencyInjector, dependencyInjector_sub; zval *this_ptr = getThis(); @@ -566,7 +566,7 @@ PHP_METHOD(Phalcon_Mvc_Url, setDI) { * $url->setStaticBaseUri("/invo/"); * */ -PHP_METHOD(Phalcon_Mvc_Url, setStaticBaseUri) { +PHP_METHOD(Phalcon_Url, setStaticBaseUri) { zval *staticBaseUri_param = NULL; zval staticBaseUri; @@ -597,7 +597,7 @@ PHP_METHOD(Phalcon_Mvc_Url, setStaticBaseUri) { /** * Generates a local path */ -PHP_METHOD(Phalcon_Mvc_Url, path) { +PHP_METHOD(Phalcon_Url, path) { zval *path_param = NULL, _0; zval path; diff --git a/ext/phalcon/url.zep.h b/ext/phalcon/url.zep.h new file mode 100644 index 00000000000..111f0b8fe97 --- /dev/null +++ b/ext/phalcon/url.zep.h @@ -0,0 +1,134 @@ + +extern zend_class_entry *phalcon_url_ce; + +ZEPHIR_INIT_CLASS(Phalcon_Url); + +PHP_METHOD(Phalcon_Url, get); +PHP_METHOD(Phalcon_Url, getBasePath); +PHP_METHOD(Phalcon_Url, getBaseUri); +PHP_METHOD(Phalcon_Url, getDI); +PHP_METHOD(Phalcon_Url, getStatic); +PHP_METHOD(Phalcon_Url, getStaticBaseUri); +PHP_METHOD(Phalcon_Url, setBasePath); +PHP_METHOD(Phalcon_Url, setBaseUri); +PHP_METHOD(Phalcon_Url, setDI); +PHP_METHOD(Phalcon_Url, setStaticBaseUri); +PHP_METHOD(Phalcon_Url, path); + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_get, 0, 0, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_get, 0, 0, IS_STRING, NULL, 0) +#endif + ZEND_ARG_INFO(0, uri) + ZEND_ARG_INFO(0, args) +#if PHP_VERSION_ID >= 70200 + ZEND_ARG_TYPE_INFO(0, local, _IS_BOOL, 1) +#else + ZEND_ARG_INFO(0, local) +#endif + ZEND_ARG_INFO(0, baseUri) +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_getbasepath, 0, 0, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_getbasepath, 0, 0, IS_STRING, NULL, 0) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_getbaseuri, 0, 0, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_getbaseuri, 0, 0, IS_STRING, NULL, 0) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_url_getdi, 0, 0, Phalcon\\DiInterface, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_getdi, 0, 0, IS_OBJECT, "Phalcon\\DiInterface", 0) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_getstatic, 0, 0, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_getstatic, 0, 0, IS_STRING, NULL, 0) +#endif + ZEND_ARG_INFO(0, uri) +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_getstaticbaseuri, 0, 0, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_getstaticbaseuri, 0, 0, IS_STRING, NULL, 0) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_url_setbasepath, 0, 1, Phalcon\\UrlInterface, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_setbasepath, 0, 1, IS_OBJECT, "Phalcon\\UrlInterface", 0) +#endif +#if PHP_VERSION_ID >= 70200 + ZEND_ARG_TYPE_INFO(0, basePath, IS_STRING, 0) +#else + ZEND_ARG_INFO(0, basePath) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_url_setbaseuri, 0, 1, Phalcon\\UrlInterface, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_setbaseuri, 0, 1, IS_OBJECT, "Phalcon\\UrlInterface", 0) +#endif +#if PHP_VERSION_ID >= 70200 + ZEND_ARG_TYPE_INFO(0, baseUri, IS_STRING, 0) +#else + ZEND_ARG_INFO(0, baseUri) +#endif +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_url_setdi, 0, 0, 1) + ZEND_ARG_OBJ_INFO(0, dependencyInjector, Phalcon\\DiInterface, 0) +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_url_setstaticbaseuri, 0, 1, Phalcon\\UrlInterface, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_setstaticbaseuri, 0, 1, IS_OBJECT, "Phalcon\\UrlInterface", 0) +#endif +#if PHP_VERSION_ID >= 70200 + ZEND_ARG_TYPE_INFO(0, staticBaseUri, IS_STRING, 0) +#else + ZEND_ARG_INFO(0, staticBaseUri) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_path, 0, 0, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_path, 0, 0, IS_STRING, NULL, 0) +#endif +#if PHP_VERSION_ID >= 70200 + ZEND_ARG_TYPE_INFO(0, path, IS_STRING, 1) +#else + ZEND_ARG_INFO(0, path) +#endif +ZEND_END_ARG_INFO() + +ZEPHIR_INIT_FUNCS(phalcon_url_method_entry) { + PHP_ME(Phalcon_Url, get, arginfo_phalcon_url_get, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Url, getBasePath, arginfo_phalcon_url_getbasepath, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Url, getBaseUri, arginfo_phalcon_url_getbaseuri, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Url, getDI, arginfo_phalcon_url_getdi, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Url, getStatic, arginfo_phalcon_url_getstatic, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Url, getStaticBaseUri, arginfo_phalcon_url_getstaticbaseuri, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Url, setBasePath, arginfo_phalcon_url_setbasepath, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Url, setBaseUri, arginfo_phalcon_url_setbaseuri, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Url, setDI, arginfo_phalcon_url_setdi, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Url, setStaticBaseUri, arginfo_phalcon_url_setstaticbaseuri, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Url, path, arginfo_phalcon_url_path, ZEND_ACC_PUBLIC) + PHP_FE_END +}; diff --git a/ext/phalcon/mvc/url/exception.zep.c b/ext/phalcon/url/exception.zep.c similarity index 56% rename from ext/phalcon/mvc/url/exception.zep.c rename to ext/phalcon/url/exception.zep.c index c0648695464..68ab3c74860 100644 --- a/ext/phalcon/mvc/url/exception.zep.c +++ b/ext/phalcon/url/exception.zep.c @@ -1,11 +1,11 @@ #ifdef HAVE_CONFIG_H -#include "../../../ext_config.h" +#include "../../ext_config.h" #endif #include -#include "../../../php_ext.h" -#include "../../../ext.h" +#include "../../php_ext.h" +#include "../../ext.h" #include #include @@ -23,13 +23,13 @@ * file that was distributed with this source code. */ /** - * Phalcon\Mvc\Url\Exception + * Phalcon\Url\Exception * - * Exceptions thrown in Phalcon\Mvc\Url will use this class + * Exceptions thrown in Phalcon\Url will use this class */ -ZEPHIR_INIT_CLASS(Phalcon_Mvc_Url_Exception) { +ZEPHIR_INIT_CLASS(Phalcon_Url_Exception) { - ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Mvc\\Url, Exception, phalcon, mvc_url_exception, phalcon_exception_ce, NULL, 0); + ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Url, Exception, phalcon, url_exception, phalcon_exception_ce, NULL, 0); return SUCCESS; diff --git a/ext/phalcon/url/exception.zep.h b/ext/phalcon/url/exception.zep.h new file mode 100644 index 00000000000..37fc57d55b5 --- /dev/null +++ b/ext/phalcon/url/exception.zep.h @@ -0,0 +1,5 @@ + +extern zend_class_entry *phalcon_url_exception_ce; + +ZEPHIR_INIT_CLASS(Phalcon_Url_Exception); + diff --git a/ext/phalcon/mvc/urlinterface.zep.c b/ext/phalcon/urlinterface.zep.c similarity index 54% rename from ext/phalcon/mvc/urlinterface.zep.c rename to ext/phalcon/urlinterface.zep.c index 2a66fdf35b6..7d108e68049 100644 --- a/ext/phalcon/mvc/urlinterface.zep.c +++ b/ext/phalcon/urlinterface.zep.c @@ -1,11 +1,11 @@ #ifdef HAVE_CONFIG_H -#include "../../ext_config.h" +#include "../ext_config.h" #endif #include -#include "../../php_ext.h" -#include "../../ext.h" +#include "../php_ext.h" +#include "../ext.h" #include @@ -21,13 +21,13 @@ * file that was distributed with this source code. */ /** - * Phalcon\Mvc\UrlInterface + * Phalcon\UrlInterface * - * Interface for Phalcon\Mvc\UrlInterface + * Interface for Phalcon\UrlInterface */ -ZEPHIR_INIT_CLASS(Phalcon_Mvc_UrlInterface) { +ZEPHIR_INIT_CLASS(Phalcon_UrlInterface) { - ZEPHIR_REGISTER_INTERFACE(Phalcon\\Mvc, UrlInterface, phalcon, mvc_urlinterface, phalcon_mvc_urlinterface_method_entry); + ZEPHIR_REGISTER_INTERFACE(Phalcon, UrlInterface, phalcon, urlinterface, phalcon_urlinterface_method_entry); return SUCCESS; @@ -39,30 +39,30 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_UrlInterface) { * @param string|array uri * @param array|object args Optional arguments to be appended to the query string */ -ZEPHIR_DOC_METHOD(Phalcon_Mvc_UrlInterface, get); +ZEPHIR_DOC_METHOD(Phalcon_UrlInterface, get); /** * Returns a base path */ -ZEPHIR_DOC_METHOD(Phalcon_Mvc_UrlInterface, getBasePath); +ZEPHIR_DOC_METHOD(Phalcon_UrlInterface, getBasePath); /** * Returns the prefix for all the generated urls. By default / */ -ZEPHIR_DOC_METHOD(Phalcon_Mvc_UrlInterface, getBaseUri); +ZEPHIR_DOC_METHOD(Phalcon_UrlInterface, getBaseUri); /** * Sets a base paths for all the generated paths */ -ZEPHIR_DOC_METHOD(Phalcon_Mvc_UrlInterface, setBasePath); +ZEPHIR_DOC_METHOD(Phalcon_UrlInterface, setBasePath); /** * Sets a prefix to all the urls generated */ -ZEPHIR_DOC_METHOD(Phalcon_Mvc_UrlInterface, setBaseUri); +ZEPHIR_DOC_METHOD(Phalcon_UrlInterface, setBaseUri); /** * Generates a local path */ -ZEPHIR_DOC_METHOD(Phalcon_Mvc_UrlInterface, path); +ZEPHIR_DOC_METHOD(Phalcon_UrlInterface, path); diff --git a/ext/phalcon/urlinterface.zep.h b/ext/phalcon/urlinterface.zep.h new file mode 100644 index 00000000000..e8b4f599b38 --- /dev/null +++ b/ext/phalcon/urlinterface.zep.h @@ -0,0 +1,78 @@ + +extern zend_class_entry *phalcon_urlinterface_ce; + +ZEPHIR_INIT_CLASS(Phalcon_UrlInterface); + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_urlinterface_get, 0, 0, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_urlinterface_get, 0, 0, IS_STRING, NULL, 0) +#endif + ZEND_ARG_INFO(0, uri) + ZEND_ARG_INFO(0, args) +#if PHP_VERSION_ID >= 70200 + ZEND_ARG_TYPE_INFO(0, local, _IS_BOOL, 1) +#else + ZEND_ARG_INFO(0, local) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_urlinterface_getbasepath, 0, 0, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_urlinterface_getbasepath, 0, 0, IS_STRING, NULL, 0) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_urlinterface_getbaseuri, 0, 0, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_urlinterface_getbaseuri, 0, 0, IS_STRING, NULL, 0) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_urlinterface_setbasepath, 0, 1, Phalcon\\UrlInterface, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_urlinterface_setbasepath, 0, 1, IS_OBJECT, "Phalcon\\UrlInterface", 0) +#endif +#if PHP_VERSION_ID >= 70200 + ZEND_ARG_TYPE_INFO(0, basePath, IS_STRING, 0) +#else + ZEND_ARG_INFO(0, basePath) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_urlinterface_setbaseuri, 0, 1, Phalcon\\UrlInterface, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_urlinterface_setbaseuri, 0, 1, IS_OBJECT, "Phalcon\\UrlInterface", 0) +#endif +#if PHP_VERSION_ID >= 70200 + ZEND_ARG_TYPE_INFO(0, baseUri, IS_STRING, 0) +#else + ZEND_ARG_INFO(0, baseUri) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_urlinterface_path, 0, 0, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_urlinterface_path, 0, 0, IS_STRING, NULL, 0) +#endif +#if PHP_VERSION_ID >= 70200 + ZEND_ARG_TYPE_INFO(0, path, IS_STRING, 1) +#else + ZEND_ARG_INFO(0, path) +#endif +ZEND_END_ARG_INFO() + +ZEPHIR_INIT_FUNCS(phalcon_urlinterface_method_entry) { + PHP_ABSTRACT_ME(Phalcon_UrlInterface, get, arginfo_phalcon_urlinterface_get) + PHP_ABSTRACT_ME(Phalcon_UrlInterface, getBasePath, arginfo_phalcon_urlinterface_getbasepath) + PHP_ABSTRACT_ME(Phalcon_UrlInterface, getBaseUri, arginfo_phalcon_urlinterface_getbaseuri) + PHP_ABSTRACT_ME(Phalcon_UrlInterface, setBasePath, arginfo_phalcon_urlinterface_setbasepath) + PHP_ABSTRACT_ME(Phalcon_UrlInterface, setBaseUri, arginfo_phalcon_urlinterface_setbaseuri) + PHP_ABSTRACT_ME(Phalcon_UrlInterface, path, arginfo_phalcon_urlinterface_path) + PHP_FE_END +}; diff --git a/ext/phalcon/validation/validator/confirmation.zep.c b/ext/phalcon/validation/validator/confirmation.zep.c index 69bfd2af788..711d147b683 100644 --- a/ext/phalcon/validation/validator/confirmation.zep.c +++ b/ext/phalcon/validation/validator/confirmation.zep.c @@ -202,12 +202,12 @@ PHP_METHOD(Phalcon_Validation_Validator_Confirmation, compare) { } ZEPHIR_INIT_VAR(&_3$$3); ZVAL_STRING(&_3$$3, "utf-8"); - ZEPHIR_CALL_FUNCTION(&_4$$3, "mb_strtolower", NULL, 444, &a, &_3$$3); + ZEPHIR_CALL_FUNCTION(&_4$$3, "mb_strtolower", NULL, 443, &a, &_3$$3); zephir_check_call_status(); zephir_get_strval(&a, &_4$$3); ZEPHIR_INIT_NVAR(&_3$$3); ZVAL_STRING(&_3$$3, "utf-8"); - ZEPHIR_CALL_FUNCTION(&_5$$3, "mb_strtolower", NULL, 444, &b, &_3$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "mb_strtolower", NULL, 443, &b, &_3$$3); zephir_check_call_status(); zephir_get_strval(&b, &_5$$3); } diff --git a/ext/phalcon/validation/validator/uniqueness.zep.c b/ext/phalcon/validation/validator/uniqueness.zep.c index 9c61d99a00e..818bbb27c15 100644 --- a/ext/phalcon/validation/validator/uniqueness.zep.c +++ b/ext/phalcon/validation/validator/uniqueness.zep.c @@ -487,7 +487,7 @@ PHP_METHOD(Phalcon_Validation_Validator_Uniqueness, isUniquenessModel) { zephir_array_keys(&_9$$6, &except TSRMLS_CC); ZVAL_LONG(&_10$$6, 0); ZVAL_LONG(&_11$$6, (zephir_fast_count_int(&except TSRMLS_CC) - 1)); - ZEPHIR_CALL_FUNCTION(&_12$$6, "range", &_13, 442, &_10$$6, &_11$$6); + ZEPHIR_CALL_FUNCTION(&_12$$6, "range", &_13, 441, &_10$$6, &_11$$6); zephir_check_call_status(); _8$$6 = !ZEPHIR_IS_IDENTICAL(&_9$$6, &_12$$6); } From f8153d32712755bad373e406088186cf84ba5c16 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Sun, 17 Feb 2019 10:05:49 -0500 Subject: [PATCH 3/7] [4.0.x] - Added Arr helper class --- phalcon/helper/arr.zep | 55 ++++++++++++++++++++++++++++++++++++ phalcon/helper/exception.zep | 22 +++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 phalcon/helper/arr.zep create mode 100644 phalcon/helper/exception.zep diff --git a/phalcon/helper/arr.zep b/phalcon/helper/arr.zep new file mode 100644 index 00000000000..e26b509fe70 --- /dev/null +++ b/phalcon/helper/arr.zep @@ -0,0 +1,55 @@ + +/** + * This file is part of the Phalcon Framework. + * + * (c) Phalcon Team + * + * For the full copyright and license information, please view the LICENSE.txt + * file that was distributed with this source code. + */ + +namespace Phalcon\Helper; + +use Phalcon\Helper\Exception; + +/** + * Phalcon\Helper\Arr + * + * Array helper methods + */ +class Arr +{ + /** + * Helper method to check an array for an element. If it exists it returns it, + * if not, it returns the supplied default value + */ + public static function get(var key, array collection, var defaultValue = null) -> var + { + var value; + + if typeof !== "string" || true !== is_numeric(key) { + throw new Exception("Key must be either string or numeric"); + } + + if likely fetch value, collection[name] { + return value; + } + + return defaultValue; + } + + /** + * Helper method to add an element to an array with an optional key. Returns + * the final array + */ + public static function set(var value, array collection = [], var key = null) -> array + { + if null === key { + let collection[] = value; + } else { + let collection[key] = value; + } + + return collection; + } +} diff --git a/phalcon/helper/exception.zep b/phalcon/helper/exception.zep new file mode 100644 index 00000000000..f315d4fc18b --- /dev/null +++ b/phalcon/helper/exception.zep @@ -0,0 +1,22 @@ + +/** + * This file is part of the Phalcon Framework. + * + * (c) Phalcon Team + * + * For the full copyright and license information, please view the LICENSE.txt + * file that was distributed with this source code. + */ + +namespace Phalcon\Helper; + +/** + * Phalcon\Helper\Tag\Exception + * + * Exceptions thrown in Phalcon\Helper will use this class + * + */ +class Exception extends \Phalcon\Exception +{ + +} From d9587e952bf546aea161806376cc43a485a8c846 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Sun, 17 Feb 2019 10:32:55 -0500 Subject: [PATCH 4/7] Revert "[4.0.x] - Added Arr helper class" This reverts commit f8153d32712755bad373e406088186cf84ba5c16. --- phalcon/helper/arr.zep | 55 ------------------------------------ phalcon/helper/exception.zep | 22 --------------- 2 files changed, 77 deletions(-) delete mode 100644 phalcon/helper/arr.zep delete mode 100644 phalcon/helper/exception.zep diff --git a/phalcon/helper/arr.zep b/phalcon/helper/arr.zep deleted file mode 100644 index e26b509fe70..00000000000 --- a/phalcon/helper/arr.zep +++ /dev/null @@ -1,55 +0,0 @@ - -/** - * This file is part of the Phalcon Framework. - * - * (c) Phalcon Team - * - * For the full copyright and license information, please view the LICENSE.txt - * file that was distributed with this source code. - */ - -namespace Phalcon\Helper; - -use Phalcon\Helper\Exception; - -/** - * Phalcon\Helper\Arr - * - * Array helper methods - */ -class Arr -{ - /** - * Helper method to check an array for an element. If it exists it returns it, - * if not, it returns the supplied default value - */ - public static function get(var key, array collection, var defaultValue = null) -> var - { - var value; - - if typeof !== "string" || true !== is_numeric(key) { - throw new Exception("Key must be either string or numeric"); - } - - if likely fetch value, collection[name] { - return value; - } - - return defaultValue; - } - - /** - * Helper method to add an element to an array with an optional key. Returns - * the final array - */ - public static function set(var value, array collection = [], var key = null) -> array - { - if null === key { - let collection[] = value; - } else { - let collection[key] = value; - } - - return collection; - } -} diff --git a/phalcon/helper/exception.zep b/phalcon/helper/exception.zep deleted file mode 100644 index f315d4fc18b..00000000000 --- a/phalcon/helper/exception.zep +++ /dev/null @@ -1,22 +0,0 @@ - -/** - * This file is part of the Phalcon Framework. - * - * (c) Phalcon Team - * - * For the full copyright and license information, please view the LICENSE.txt - * file that was distributed with this source code. - */ - -namespace Phalcon\Helper; - -/** - * Phalcon\Helper\Tag\Exception - * - * Exceptions thrown in Phalcon\Helper will use this class - * - */ -class Exception extends \Phalcon\Exception -{ - -} From d6528943188a49a04dd6b95bb290532aa8ca85b7 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Sun, 17 Feb 2019 10:33:11 -0500 Subject: [PATCH 5/7] Revert "[4.0.x] - Updating the ext folder" This reverts commit 655eafec10ca761a48daafe3e2e49fbe97712865. --- ext/config.m4 | 6 +- ext/config.w32 | 6 +- ext/phalcon.c | 12 +- ext/phalcon.h | 6 +- ext/phalcon/cli/dispatcher.zep.c | 22 +- ext/phalcon/config.zep.c | 32 +- ext/phalcon/config.zep.h | 2 +- ext/phalcon/di.zep.c | 67 ++-- ext/phalcon/di/factorydefault.zep.c | 2 +- ext/phalcon/di/injectable.zep.c | 2 +- ext/phalcon/dispatcher.zep.c | 122 ++---- ext/phalcon/dispatcher.zep.h | 14 - ext/phalcon/mvc/model.zep.c | 293 +++++++------- ext/phalcon/{ => mvc}/url.zep.c | 62 +-- ext/phalcon/mvc/url.zep.h | 134 +++++++ ext/phalcon/{ => mvc}/url/exception.zep.c | 14 +- ext/phalcon/mvc/url/exception.zep.h | 5 + ext/phalcon/mvc/url/utils.c | 369 ++++++++++++++++++ ext/phalcon/mvc/url/utils.h | 30 ++ ext/phalcon/{ => mvc}/urlinterface.zep.c | 26 +- ext/phalcon/mvc/urlinterface.zep.h | 78 ++++ ext/phalcon/mvc/view.zep.c | 4 +- ext/phalcon/mvc/view/engine/php.zep.c | 2 +- ext/phalcon/mvc/view/engine/volt.zep.c | 85 ++-- .../mvc/view/engine/volt/compiler.zep.c | 134 +++---- ext/phalcon/mvc/view/simple.zep.c | 6 +- .../paginator/adapter/nativearray.zep.c | 2 +- ext/phalcon/queue/beanstalk.zep.c | 60 +-- ext/phalcon/registry.zep.c | 18 +- ext/phalcon/security.zep.c | 8 +- ext/phalcon/security/random.zep.c | 26 +- ext/phalcon/session/adapter/files.zep.c | 6 +- .../session/adapter/libmemcached.zep.c | 2 +- ext/phalcon/session/bag.zep.c | 2 +- ext/phalcon/session/manager.zep.c | 26 +- ext/phalcon/tag.zep.c | 42 +- ext/phalcon/tag.zep.h | 4 +- ext/phalcon/tag/select.zep.c | 6 +- ext/phalcon/text.zep.c | 40 +- ext/phalcon/translate/adapter/csv.zep.c | 4 +- ext/phalcon/translate/adapter/gettext.zep.c | 20 +- .../translate/interpolator/indexedarray.zep.c | 2 +- ext/phalcon/url.zep.h | 134 ------- ext/phalcon/url/exception.zep.h | 5 - ext/phalcon/urlinterface.zep.h | 78 ---- .../validation/validator/confirmation.zep.c | 4 +- .../validation/validator/uniqueness.zep.c | 2 +- 47 files changed, 1155 insertions(+), 871 deletions(-) rename ext/phalcon/{ => mvc}/url.zep.c (87%) create mode 100644 ext/phalcon/mvc/url.zep.h rename ext/phalcon/{ => mvc}/url/exception.zep.c (56%) create mode 100644 ext/phalcon/mvc/url/exception.zep.h create mode 100644 ext/phalcon/mvc/url/utils.c create mode 100644 ext/phalcon/mvc/url/utils.h rename ext/phalcon/{ => mvc}/urlinterface.zep.c (54%) create mode 100644 ext/phalcon/mvc/urlinterface.zep.h delete mode 100644 ext/phalcon/url.zep.h delete mode 100644 ext/phalcon/url/exception.zep.h delete mode 100644 ext/phalcon/urlinterface.zep.h diff --git a/ext/config.m4 b/ext/config.m4 index ba72f641cf4..ffef614e04b 100644 --- a/ext/config.m4 +++ b/ext/config.m4 @@ -120,12 +120,12 @@ if test "$PHP_PHALCON" = "yes"; then phalcon/mvc/router.zep.c phalcon/mvc/router/groupinterface.zep.c phalcon/mvc/router/routeinterface.zep.c + phalcon/mvc/urlinterface.zep.c phalcon/mvc/view/exception.zep.c phalcon/mvc/viewinterface.zep.c phalcon/paginator/repositoryinterface.zep.c phalcon/session/baginterface.zep.c phalcon/session/managerinterface.zep.c - phalcon/urlinterface.zep.c phalcon/validation/combinedfieldsvalidator.zep.c phalcon/validationinterface.zep.c phalcon/acl.zep.c @@ -353,6 +353,8 @@ if test "$PHP_PHALCON" = "yes"; then phalcon/mvc/router/exception.zep.c phalcon/mvc/router/group.zep.c phalcon/mvc/router/route.zep.c + phalcon/mvc/url.zep.c + phalcon/mvc/url/exception.zep.c phalcon/mvc/view.zep.c phalcon/mvc/view/engine/php.zep.c phalcon/mvc/view/engine/volt.zep.c @@ -393,8 +395,6 @@ if test "$PHP_PHALCON" = "yes"; then phalcon/translate/factory.zep.c phalcon/translate/interpolator/associativearray.zep.c phalcon/translate/interpolator/indexedarray.zep.c - phalcon/url.zep.c - phalcon/url/exception.zep.c phalcon/validation.zep.c phalcon/validation/exception.zep.c phalcon/validation/validator/alnum.zep.c diff --git a/ext/config.w32 b/ext/config.w32 index 9357471abfb..b5eedd33e1d 100644 --- a/ext/config.w32 +++ b/ext/config.w32 @@ -14,7 +14,7 @@ if (PHP_PHALCON != "no") { ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/model/query", "scanner.c parser.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/view/engine/volt", "parser.c scanner.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/url", "utils.c", "phalcon"); - ADD_SOURCES(configure_module_dirname + "/phalcon", "exception.zep.c factoryinterface.zep.c factory.zep.c dispatcherinterface.zep.c config.zep.c utility.zep.c diinterface.zep.c flashinterface.zep.c application.zep.c di.zep.c dispatcher.zep.c flash.zep.c cryptinterface.zep.c escaperinterface.zep.c urlinterface.zep.c validationinterface.zep.c acl.zep.c container.zep.c crypt.zep.c db.zep.c debug.zep.c escaper.zep.c image.zep.c kernel.zep.c loader.zep.c logger.zep.c plugin.zep.c registry.zep.c security.zep.c tag.zep.c text.zep.c translate.zep.c url.zep.c validation.zep.c version.zep.c 0__closure.zep.c 1__closure.zep.c 2__closure.zep.c 3__closure.zep.c 4__closure.zep.c 5__closure.zep.c 6__closure.zep.c 7__closure.zep.c 8__closure.zep.c 9__closure.zep.c 10__closure.zep.c 11__closure.zep.c 12__closure.zep.c 13__closure.zep.c 14__closure.zep.c 15__closure.zep.c 16__closure.zep.c 17__closure.zep.c 18__closure.zep.c 19__closure.zep.c 20__closure.zep.c 21__closure.zep.c 22__closure.zep.c 23__closure.zep.c 24__closure.zep.c 25__closure.zep.c 26__closure.zep.c 27__closure.zep.c", "phalcon"); + ADD_SOURCES(configure_module_dirname + "/phalcon", "exception.zep.c factoryinterface.zep.c factory.zep.c dispatcherinterface.zep.c config.zep.c utility.zep.c diinterface.zep.c flashinterface.zep.c application.zep.c di.zep.c dispatcher.zep.c flash.zep.c cryptinterface.zep.c escaperinterface.zep.c validationinterface.zep.c acl.zep.c container.zep.c crypt.zep.c db.zep.c debug.zep.c escaper.zep.c image.zep.c kernel.zep.c loader.zep.c logger.zep.c plugin.zep.c registry.zep.c security.zep.c tag.zep.c text.zep.c translate.zep.c validation.zep.c version.zep.c 0__closure.zep.c 1__closure.zep.c 2__closure.zep.c 3__closure.zep.c 4__closure.zep.c 5__closure.zep.c 6__closure.zep.c 7__closure.zep.c 8__closure.zep.c 9__closure.zep.c 10__closure.zep.c 11__closure.zep.c 12__closure.zep.c 13__closure.zep.c 14__closure.zep.c 15__closure.zep.c 16__closure.zep.c 17__closure.zep.c 18__closure.zep.c 19__closure.zep.c 20__closure.zep.c 21__closure.zep.c 22__closure.zep.c 23__closure.zep.c 24__closure.zep.c 25__closure.zep.c 26__closure.zep.c 27__closure.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/di", "injectionawareinterface.zep.c injectable.zep.c exception.zep.c factorydefault.zep.c serviceinterface.zep.c service.zep.c serviceproviderinterface.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/events", "eventsawareinterface.zep.c eventinterface.zep.c managerinterface.zep.c event.zep.c exception.zep.c manager.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/validation", "validatorinterface.zep.c validator.zep.c combinedfieldsvalidator.zep.c exception.zep.c", "phalcon"); @@ -27,7 +27,7 @@ if (PHP_PHALCON != "no") { ADD_SOURCES(configure_module_dirname + "/phalcon/annotations", "adapterinterface.zep.c adapter.zep.c readerinterface.zep.c annotation.zep.c collection.zep.c exception.zep.c factory.zep.c reader.zep.c reflection.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/logger/adapter", "adapterinterface.zep.c abstractadapter.zep.c noop.zep.c stream.zep.c syslog.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/logger/formatter", "formatterinterface.zep.c abstractformatter.zep.c json.zep.c line.zep.c syslog.zep.c", "phalcon"); - ADD_SOURCES(configure_module_dirname + "/phalcon/mvc", "entityinterface.zep.c viewbaseinterface.zep.c routerinterface.zep.c collectioninterface.zep.c controllerinterface.zep.c dispatcherinterface.zep.c modelinterface.zep.c router.zep.c viewinterface.zep.c application.zep.c collection.zep.c controller.zep.c dispatcher.zep.c micro.zep.c model.zep.c moduledefinitioninterface.zep.c view.zep.c", "phalcon"); + ADD_SOURCES(configure_module_dirname + "/phalcon/mvc", "entityinterface.zep.c viewbaseinterface.zep.c routerinterface.zep.c collectioninterface.zep.c controllerinterface.zep.c dispatcherinterface.zep.c modelinterface.zep.c router.zep.c urlinterface.zep.c viewinterface.zep.c application.zep.c collection.zep.c controller.zep.c dispatcher.zep.c micro.zep.c model.zep.c moduledefinitioninterface.zep.c url.zep.c view.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/paginator", "adapterinterface.zep.c adapter.zep.c repositoryinterface.zep.c exception.zep.c factory.zep.c repository.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/translate", "adapterinterface.zep.c adapter.zep.c interpolatorinterface.zep.c exception.zep.c factory.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/db/adapter", "pdo.zep.c", "phalcon"); @@ -89,6 +89,7 @@ if (PHP_PHALCON != "no") { ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/model/binder", "bindableinterface.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/model/metadata/strategy", "annotations.zep.c introspection.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/model/resultset", "complex.zep.c simple.zep.c", "phalcon"); + ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/url", "exception.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/view/engine", "php.zep.c volt.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/view/engine/volt", "compiler.zep.c exception.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/paginator/adapter", "model.zep.c nativearray.zep.c querybuilder.zep.c", "phalcon"); @@ -98,7 +99,6 @@ if (PHP_PHALCON != "no") { ADD_SOURCES(configure_module_dirname + "/phalcon/tag", "exception.zep.c select.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/translate/adapter", "csv.zep.c gettext.zep.c nativearray.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/translate/interpolator", "associativearray.zep.c indexedarray.zep.c", "phalcon"); - ADD_SOURCES(configure_module_dirname + "/phalcon/url", "exception.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/validation/validator", "alnum.zep.c alpha.zep.c between.zep.c callback.zep.c confirmation.zep.c creditcard.zep.c date.zep.c digit.zep.c email.zep.c exception.zep.c exclusionin.zep.c file.zep.c identical.zep.c inclusionin.zep.c ip.zep.c numericality.zep.c presenceof.zep.c regex.zep.c stringlength.zep.c uniqueness.zep.c url.zep.c", "phalcon"); ADD_FLAG("CFLAGS_PHALCON", "/D ZEPHIR_RELEASE /Oi /Ot /Oy /Ob2 /Gs /GF /Gy /GL"); ADD_FLAG("CFLAGS", "/D ZEPHIR_RELEASE /Oi /Ot /Oy /Ob2 /Gs /GF /Gy /GL"); diff --git a/ext/phalcon.c b/ext/phalcon.c index 971e9476422..3e32f3cd7f3 100644 --- a/ext/phalcon.c +++ b/ext/phalcon.c @@ -95,11 +95,11 @@ zend_class_entry *phalcon_mvc_model_transactioninterface_ce; zend_class_entry *phalcon_mvc_modelinterface_ce; zend_class_entry *phalcon_mvc_router_groupinterface_ce; zend_class_entry *phalcon_mvc_router_routeinterface_ce; +zend_class_entry *phalcon_mvc_urlinterface_ce; zend_class_entry *phalcon_mvc_viewinterface_ce; zend_class_entry *phalcon_paginator_repositoryinterface_ce; zend_class_entry *phalcon_session_baginterface_ce; zend_class_entry *phalcon_session_managerinterface_ce; -zend_class_entry *phalcon_urlinterface_ce; zend_class_entry *phalcon_validationinterface_ce; zend_class_entry *phalcon_acl_componentaware_ce; zend_class_entry *phalcon_acl_roleaware_ce; @@ -396,6 +396,8 @@ zend_class_entry *phalcon_mvc_router_annotations_ce; zend_class_entry *phalcon_mvc_router_exception_ce; zend_class_entry *phalcon_mvc_router_group_ce; zend_class_entry *phalcon_mvc_router_route_ce; +zend_class_entry *phalcon_mvc_url_ce; +zend_class_entry *phalcon_mvc_url_exception_ce; zend_class_entry *phalcon_mvc_view_ce; zend_class_entry *phalcon_mvc_view_engine_php_ce; zend_class_entry *phalcon_mvc_view_engine_volt_ce; @@ -436,8 +438,6 @@ zend_class_entry *phalcon_translate_exception_ce; zend_class_entry *phalcon_translate_factory_ce; zend_class_entry *phalcon_translate_interpolator_associativearray_ce; zend_class_entry *phalcon_translate_interpolator_indexedarray_ce; -zend_class_entry *phalcon_url_ce; -zend_class_entry *phalcon_url_exception_ce; zend_class_entry *phalcon_validation_ce; zend_class_entry *phalcon_validation_exception_ce; zend_class_entry *phalcon_validation_validator_alnum_ce; @@ -562,11 +562,11 @@ static PHP_MINIT_FUNCTION(phalcon) ZEPHIR_INIT(Phalcon_Mvc_Model_Transaction_ManagerInterface); ZEPHIR_INIT(Phalcon_Mvc_Router_GroupInterface); ZEPHIR_INIT(Phalcon_Mvc_Router_RouteInterface); + ZEPHIR_INIT(Phalcon_Mvc_UrlInterface); ZEPHIR_INIT(Phalcon_Mvc_ViewInterface); ZEPHIR_INIT(Phalcon_Paginator_RepositoryInterface); ZEPHIR_INIT(Phalcon_Session_BagInterface); ZEPHIR_INIT(Phalcon_Session_ManagerInterface); - ZEPHIR_INIT(Phalcon_UrlInterface); ZEPHIR_INIT(Phalcon_ValidationInterface); ZEPHIR_INIT(Phalcon_Acl_ComponentAware); ZEPHIR_INIT(Phalcon_Acl_RoleAware); @@ -835,6 +835,8 @@ static PHP_MINIT_FUNCTION(phalcon) ZEPHIR_INIT(Phalcon_Mvc_Router_Exception); ZEPHIR_INIT(Phalcon_Mvc_Router_Group); ZEPHIR_INIT(Phalcon_Mvc_Router_Route); + ZEPHIR_INIT(Phalcon_Mvc_Url); + ZEPHIR_INIT(Phalcon_Mvc_Url_Exception); ZEPHIR_INIT(Phalcon_Mvc_View); ZEPHIR_INIT(Phalcon_Mvc_View_Engine_Php); ZEPHIR_INIT(Phalcon_Mvc_View_Engine_Volt); @@ -875,8 +877,6 @@ static PHP_MINIT_FUNCTION(phalcon) ZEPHIR_INIT(Phalcon_Translate_Factory); ZEPHIR_INIT(Phalcon_Translate_Interpolator_AssociativeArray); ZEPHIR_INIT(Phalcon_Translate_Interpolator_IndexedArray); - ZEPHIR_INIT(Phalcon_Url); - ZEPHIR_INIT(Phalcon_Url_Exception); ZEPHIR_INIT(Phalcon_Validation); ZEPHIR_INIT(Phalcon_Validation_Exception); ZEPHIR_INIT(Phalcon_Validation_Validator_Alnum); diff --git a/ext/phalcon.h b/ext/phalcon.h index e0da833dc09..46d6ddb97e5 100644 --- a/ext/phalcon.h +++ b/ext/phalcon.h @@ -115,12 +115,12 @@ #include "phalcon/mvc/router.zep.h" #include "phalcon/mvc/router/groupinterface.zep.h" #include "phalcon/mvc/router/routeinterface.zep.h" +#include "phalcon/mvc/urlinterface.zep.h" #include "phalcon/mvc/view/exception.zep.h" #include "phalcon/mvc/viewinterface.zep.h" #include "phalcon/paginator/repositoryinterface.zep.h" #include "phalcon/session/baginterface.zep.h" #include "phalcon/session/managerinterface.zep.h" -#include "phalcon/urlinterface.zep.h" #include "phalcon/validation/combinedfieldsvalidator.zep.h" #include "phalcon/validationinterface.zep.h" #include "phalcon/acl.zep.h" @@ -348,6 +348,8 @@ #include "phalcon/mvc/router/exception.zep.h" #include "phalcon/mvc/router/group.zep.h" #include "phalcon/mvc/router/route.zep.h" +#include "phalcon/mvc/url.zep.h" +#include "phalcon/mvc/url/exception.zep.h" #include "phalcon/mvc/view.zep.h" #include "phalcon/mvc/view/engine/php.zep.h" #include "phalcon/mvc/view/engine/volt.zep.h" @@ -388,8 +390,6 @@ #include "phalcon/translate/factory.zep.h" #include "phalcon/translate/interpolator/associativearray.zep.h" #include "phalcon/translate/interpolator/indexedarray.zep.h" -#include "phalcon/url.zep.h" -#include "phalcon/url/exception.zep.h" #include "phalcon/validation.zep.h" #include "phalcon/validation/exception.zep.h" #include "phalcon/validation/validator/alnum.zep.h" diff --git a/ext/phalcon/cli/dispatcher.zep.c b/ext/phalcon/cli/dispatcher.zep.c index 07ac475f402..6f1ac5a703b 100644 --- a/ext/phalcon/cli/dispatcher.zep.c +++ b/ext/phalcon/cli/dispatcher.zep.c @@ -434,44 +434,36 @@ PHP_METHOD(Phalcon_Cli_Dispatcher, callActionMethod) { zend_object *zephir_init_properties_Phalcon_Cli_Dispatcher(zend_class_entry *class_type TSRMLS_DC) { - zval _0, _2, _4, _6, _1$$3, _3$$4, _5$$5, _7$$6; + zval _0, _2, _4, _1$$3, _3$$4, _5$$5; ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_2); ZVAL_UNDEF(&_4); - ZVAL_UNDEF(&_6); ZVAL_UNDEF(&_1$$3); ZVAL_UNDEF(&_3$$4); ZVAL_UNDEF(&_5$$5); - ZVAL_UNDEF(&_7$$6); ZEPHIR_MM_GROW(); { zval local_this_ptr, *this_ptr = &local_this_ptr; ZEPHIR_CREATE_OBJECT(this_ptr, class_type); - zephir_read_property(&_0, this_ptr, SL("_camelCaseMap"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_0, this_ptr, SL("_activeMethodMap"), PH_NOISY_CC | PH_READONLY); if (Z_TYPE_P(&_0) == IS_NULL) { ZEPHIR_INIT_VAR(&_1$$3); array_init(&_1$$3); - zephir_update_property_zval(this_ptr, SL("_camelCaseMap"), &_1$$3); + zephir_update_property_zval(this_ptr, SL("_activeMethodMap"), &_1$$3); } - zephir_read_property(&_2, this_ptr, SL("_activeMethodMap"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_2, this_ptr, SL("_params"), PH_NOISY_CC | PH_READONLY); if (Z_TYPE_P(&_2) == IS_NULL) { ZEPHIR_INIT_VAR(&_3$$4); array_init(&_3$$4); - zephir_update_property_zval(this_ptr, SL("_activeMethodMap"), &_3$$4); + zephir_update_property_zval(this_ptr, SL("_params"), &_3$$4); } - zephir_read_property(&_4, this_ptr, SL("_params"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_4, this_ptr, SL("_options"), PH_NOISY_CC | PH_READONLY); if (Z_TYPE_P(&_4) == IS_NULL) { ZEPHIR_INIT_VAR(&_5$$5); array_init(&_5$$5); - zephir_update_property_zval(this_ptr, SL("_params"), &_5$$5); - } - zephir_read_property(&_6, this_ptr, SL("_options"), PH_NOISY_CC | PH_READONLY); - if (Z_TYPE_P(&_6) == IS_NULL) { - ZEPHIR_INIT_VAR(&_7$$6); - array_init(&_7$$6); - zephir_update_property_zval(this_ptr, SL("_options"), &_7$$6); + zephir_update_property_zval(this_ptr, SL("_options"), &_5$$5); } ZEPHIR_MM_RESTORE(); return Z_OBJ_P(this_ptr); diff --git a/ext/phalcon/config.zep.c b/ext/phalcon/config.zep.c index b2e07d9091f..8ebaafe4bf9 100644 --- a/ext/phalcon/config.zep.c +++ b/ext/phalcon/config.zep.c @@ -409,37 +409,17 @@ PHP_METHOD(Phalcon_Config, offsetUnset) { PHP_METHOD(Phalcon_Config, merge) { zend_long ZEPHIR_LAST_CALL_STATUS; - zval *configParam, configParam_sub, config, _0; + zval *config, config_sub; zval *this_ptr = getThis(); - ZVAL_UNDEF(&configParam_sub); - ZVAL_UNDEF(&config); - ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&config_sub); ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &configParam); + zephir_fetch_params(1, 1, 0, &config); - ZEPHIR_INIT_VAR(&_0); - zephir_gettype(&_0, configParam TSRMLS_CC); - do { - if (ZEPHIR_IS_STRING(&_0, "array")) { - ZEPHIR_INIT_VAR(&config); - object_init_ex(&config, phalcon_config_ce); - ZEPHIR_CALL_METHOD(NULL, &config, "__construct", NULL, 12, configParam); - zephir_check_call_status(); - break; - } - if (ZEPHIR_IS_STRING(&_0, "object")) { - ZEPHIR_CPY_WRT(&config, configParam); - break; - } - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_config_exception_ce, "Invalid data type for merge.", "phalcon/config.zep", 216); - return; - } while(0); - - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_merge", NULL, 13, &config); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_merge", NULL, 13, config); zephir_check_call_status(); RETURN_MM(); @@ -474,7 +454,7 @@ PHP_METHOD(Phalcon_Config, toArray) { array_init(&arrayConfig); ZEPHIR_CALL_FUNCTION(&_0, "get_object_vars", NULL, 14, this_ptr); zephir_check_call_status(); - zephir_is_iterable(&_0, 0, "phalcon/config.zep", 247); + zephir_is_iterable(&_0, 0, "phalcon/config.zep", 234); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_0), _2, _3, _1) { ZEPHIR_INIT_NVAR(&key); @@ -657,7 +637,7 @@ PHP_METHOD(Phalcon_Config, _merge) { zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&_0, "get_object_vars", NULL, 14, config); zephir_check_call_status(); - zephir_is_iterable(&_0, 0, "phalcon/config.zep", 335); + zephir_is_iterable(&_0, 0, "phalcon/config.zep", 322); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_0), _2, _3, _1) { ZEPHIR_INIT_NVAR(&key); diff --git a/ext/phalcon/config.zep.h b/ext/phalcon/config.zep.h index 963cc2b0568..23c27566cd0 100644 --- a/ext/phalcon/config.zep.h +++ b/ext/phalcon/config.zep.h @@ -63,7 +63,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_config_merge, 0, 1, Phalc #else ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_config_merge, 0, 1, IS_OBJECT, "Phalcon\\Config", 0) #endif - ZEND_ARG_INFO(0, configParam) + ZEND_ARG_OBJ_INFO(0, config, Phalcon\\Config, 0) ZEND_END_ARG_INFO() #if PHP_VERSION_ID >= 70200 diff --git a/ext/phalcon/di.zep.c b/ext/phalcon/di.zep.c index 9b4e35682e1..9da17c0abac 100644 --- a/ext/phalcon/di.zep.c +++ b/ext/phalcon/di.zep.c @@ -471,31 +471,31 @@ PHP_METHOD(Phalcon_Di, getService) { */ PHP_METHOD(Phalcon_Di, get) { - zend_bool _10$$8; - zval _1$$3, _11$$14; + zend_bool _9$$8; + zval _1$$3, _10$$14; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *name_param = NULL, *parameters = NULL, parameters_sub, __$null, service, eventsManager, instance, _0, _2$$3, _3$$4, _4$$5, _5$$5, _6$$7, _8$$9, _12$$14; - zval name, _7$$7, _9$$9; + zval *name_param = NULL, *parameters = NULL, parameters_sub, __$null, service, eventsManager, instance, e, _0, _2$$3, _3$$4, _4$$5, _5$$7, _7$$9, _11$$14; + zval name, _6$$7, _8$$9; zval *this_ptr = getThis(); ZVAL_UNDEF(&name); - ZVAL_UNDEF(&_7$$7); - ZVAL_UNDEF(&_9$$9); + ZVAL_UNDEF(&_6$$7); + ZVAL_UNDEF(&_8$$9); ZVAL_UNDEF(¶meters_sub); ZVAL_NULL(&__$null); ZVAL_UNDEF(&service); ZVAL_UNDEF(&eventsManager); ZVAL_UNDEF(&instance); + ZVAL_UNDEF(&e); ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_2$$3); ZVAL_UNDEF(&_3$$4); ZVAL_UNDEF(&_4$$5); - ZVAL_UNDEF(&_5$$5); - ZVAL_UNDEF(&_6$$7); - ZVAL_UNDEF(&_8$$9); - ZVAL_UNDEF(&_12$$14); - ZVAL_UNDEF(&_1$$3); + ZVAL_UNDEF(&_5$$7); + ZVAL_UNDEF(&_7$$9); ZVAL_UNDEF(&_11$$14); + ZVAL_UNDEF(&_1$$3); + ZVAL_UNDEF(&_10$$14); ZEPHIR_MM_GROW(); zephir_fetch_params(1, 1, 1, &name_param, ¶meters); @@ -546,38 +546,37 @@ PHP_METHOD(Phalcon_Di, get) { ZEPHIR_INIT_VAR(&_4$$5); ZVAL_OBJ(&_4$$5, EG(exception)); Z_ADDREF_P(&_4$$5); - ZEPHIR_INIT_VAR(&_5$$5); if (zephir_instance_of_ev(&_4$$5, phalcon_di_exception_serviceresolutionexception_ce TSRMLS_CC)) { zend_clear_exception(TSRMLS_C); - ZEPHIR_CPY_WRT(&_5$$5, &_4$$5); + ZEPHIR_CPY_WRT(&e, &_4$$5); + ZEPHIR_INIT_VAR(&_5$$7); + object_init_ex(&_5$$7, phalcon_di_exception_ce); ZEPHIR_INIT_VAR(&_6$$7); - object_init_ex(&_6$$7, phalcon_di_exception_ce); - ZEPHIR_INIT_VAR(&_7$$7); - ZEPHIR_CONCAT_SVS(&_7$$7, "Service '", &name, "' cannot be resolved"); - ZEPHIR_CALL_METHOD(NULL, &_6$$7, "__construct", NULL, 4, &_7$$7); + ZEPHIR_CONCAT_SVS(&_6$$7, "Service '", &name, "' cannot be resolved"); + ZEPHIR_CALL_METHOD(NULL, &_5$$7, "__construct", NULL, 4, &_6$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_6$$7, "phalcon/di.zep", 228 TSRMLS_CC); + zephir_throw_exception_debug(&_5$$7, "phalcon/di.zep", 228 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } } } else { if (!(zephir_class_exists(&name, 1 TSRMLS_CC))) { + ZEPHIR_INIT_VAR(&_7$$9); + object_init_ex(&_7$$9, phalcon_di_exception_ce); ZEPHIR_INIT_VAR(&_8$$9); - object_init_ex(&_8$$9, phalcon_di_exception_ce); - ZEPHIR_INIT_VAR(&_9$$9); - ZEPHIR_CONCAT_SVS(&_9$$9, "Service '", &name, "' wasn't found in the dependency injection container"); - ZEPHIR_CALL_METHOD(NULL, &_8$$9, "__construct", NULL, 4, &_9$$9); + ZEPHIR_CONCAT_SVS(&_8$$9, "Service '", &name, "' wasn't found in the dependency injection container"); + ZEPHIR_CALL_METHOD(NULL, &_7$$9, "__construct", NULL, 4, &_8$$9); zephir_check_call_status(); - zephir_throw_exception_debug(&_8$$9, "phalcon/di.zep", 235 TSRMLS_CC); + zephir_throw_exception_debug(&_7$$9, "phalcon/di.zep", 235 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - _10$$8 = Z_TYPE_P(parameters) == IS_ARRAY; - if (_10$$8) { - _10$$8 = ((zephir_fast_count_int(parameters TSRMLS_CC)) ? 1 : 0); + _9$$8 = Z_TYPE_P(parameters) == IS_ARRAY; + if (_9$$8) { + _9$$8 = ((zephir_fast_count_int(parameters TSRMLS_CC)) ? 1 : 0); } - if (_10$$8) { + if (_9$$8) { ZEPHIR_INIT_NVAR(&instance); ZEPHIR_LAST_CALL_STATUS = zephir_create_instance_params(&instance, &name, parameters TSRMLS_CC); zephir_check_call_status(); @@ -595,14 +594,14 @@ PHP_METHOD(Phalcon_Di, get) { } } if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { + ZEPHIR_INIT_VAR(&_10$$14); + zephir_create_array(&_10$$14, 3, 0 TSRMLS_CC); + zephir_array_update_string(&_10$$14, SL("name"), &name, PH_COPY | PH_SEPARATE); + zephir_array_update_string(&_10$$14, SL("parameters"), parameters, PH_COPY | PH_SEPARATE); + zephir_array_update_string(&_10$$14, SL("instance"), &instance, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_VAR(&_11$$14); - zephir_create_array(&_11$$14, 3, 0 TSRMLS_CC); - zephir_array_update_string(&_11$$14, SL("name"), &name, PH_COPY | PH_SEPARATE); - zephir_array_update_string(&_11$$14, SL("parameters"), parameters, PH_COPY | PH_SEPARATE); - zephir_array_update_string(&_11$$14, SL("instance"), &instance, PH_COPY | PH_SEPARATE); - ZEPHIR_INIT_VAR(&_12$$14); - ZVAL_STRING(&_12$$14, "di:afterServiceResolve"); - ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_12$$14, this_ptr, &_11$$14); + ZVAL_STRING(&_11$$14, "di:afterServiceResolve"); + ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_11$$14, this_ptr, &_10$$14); zephir_check_call_status(); } RETURN_CCTOR(&instance); diff --git a/ext/phalcon/di/factorydefault.zep.c b/ext/phalcon/di/factorydefault.zep.c index a71972c547d..68d93536ceb 100644 --- a/ext/phalcon/di/factorydefault.zep.c +++ b/ext/phalcon/di/factorydefault.zep.c @@ -218,7 +218,7 @@ PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) { ZEPHIR_INIT_NVAR(&_2); object_init_ex(&_2, phalcon_di_service_ce); ZEPHIR_INIT_NVAR(&_3); - ZVAL_STRING(&_3, "Phalcon\\Url"); + ZVAL_STRING(&_3, "Phalcon\\Mvc\\Url"); ZVAL_BOOL(&_4, 1); ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 54, &_3, &_4); zephir_check_call_status(); diff --git a/ext/phalcon/di/injectable.zep.c b/ext/phalcon/di/injectable.zep.c index dfdd3e1c867..11a867043df 100644 --- a/ext/phalcon/di/injectable.zep.c +++ b/ext/phalcon/di/injectable.zep.c @@ -38,7 +38,7 @@ * * @property \Phalcon\Mvc\Dispatcher|\Phalcon\Mvc\DispatcherInterface $dispatcher * @property \Phalcon\Mvc\Router|\Phalcon\Mvc\RouterInterface $router - * @property \Phalcon\Url|\Phalcon\UrlInterface $url + * @property \Phalcon\Mvc\Url|\Phalcon\Mvc\UrlInterface $url * @property \Phalcon\Http\Request|\Phalcon\Http\RequestInterface $request * @property \Phalcon\Http\Response|\Phalcon\Http\ResponseInterface $response * @property \Phalcon\Http\Response\Cookies|\Phalcon\Http\Response\CookiesInterface $cookies diff --git a/ext/phalcon/dispatcher.zep.c b/ext/phalcon/dispatcher.zep.c index 0b662cfc9ea..62cb67d057c 100644 --- a/ext/phalcon/dispatcher.zep.c +++ b/ext/phalcon/dispatcher.zep.c @@ -18,8 +18,8 @@ #include "kernel/exception.h" #include "kernel/array.h" #include "kernel/fcall.h" -#include "kernel/concat.h" #include "kernel/string.h" +#include "kernel/concat.h" #include "ext/spl/spl_exceptions.h" @@ -77,8 +77,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Dispatcher) { zend_declare_property_null(phalcon_dispatcher_ce, SL("_activeMethodMap"), ZEND_ACC_PROTECTED TSRMLS_CC); - zend_declare_property_null(phalcon_dispatcher_ce, SL("_camelCaseMap"), ZEND_ACC_PROTECTED TSRMLS_CC); - zend_declare_property_null(phalcon_dispatcher_ce, SL("_previousNamespaceName"), ZEND_ACC_PROTECTED TSRMLS_CC); zend_declare_property_null(phalcon_dispatcher_ce, SL("_previousHandlerName"), ZEND_ACC_PROTECTED TSRMLS_CC); @@ -380,7 +378,7 @@ PHP_METHOD(Phalcon_Dispatcher, setParams) { if (Z_TYPE_P(params) != IS_ARRAY) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_exception_ce, "Parameters must be an Array", "phalcon/dispatcher.zep", 228); + ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_exception_ce, "Parameters must be an Array", "phalcon/dispatcher.zep", 226); return; } zephir_update_property_zval(this_ptr, SL("_params"), params); @@ -513,17 +511,20 @@ PHP_METHOD(Phalcon_Dispatcher, hasParam) { */ PHP_METHOD(Phalcon_Dispatcher, getActiveMethod) { - zval activeMethodName, _0, _1, _5, _2$$3, _3$$3, _4$$3; + zval activeMethodName, _0, _1, _8, _2$$3, _3$$3, _4$$3, _5$$3, _6$$3, _7$$3; zend_long ZEPHIR_LAST_CALL_STATUS; zval *this_ptr = getThis(); ZVAL_UNDEF(&activeMethodName); ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_5); + ZVAL_UNDEF(&_8); ZVAL_UNDEF(&_2$$3); ZVAL_UNDEF(&_3$$3); ZVAL_UNDEF(&_4$$3); + ZVAL_UNDEF(&_5$$3); + ZVAL_UNDEF(&_6$$3); + ZVAL_UNDEF(&_7$$3); ZEPHIR_MM_GROW(); @@ -531,17 +532,25 @@ PHP_METHOD(Phalcon_Dispatcher, getActiveMethod) { zephir_read_property(&_0, this_ptr, SL("_activeMethodMap"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_1, this_ptr, SL("_actionName"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset_fetch(&activeMethodName, &_0, &_1, 0 TSRMLS_CC))) { + ZEPHIR_INIT_VAR(&_2$$3); zephir_read_property(&_3$$3, this_ptr, SL("_actionName"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "tocamelcase", NULL, 0, &_3$$3); + ZEPHIR_INIT_VAR(&_4$$3); + ZVAL_STRING(&_4$$3, "/[_-]+/"); + ZEPHIR_CALL_FUNCTION(&_5$$3, "preg_split", NULL, 58, &_4$$3, &_3$$3); + zephir_check_call_status(); + ZEPHIR_INIT_NVAR(&_4$$3); + ZVAL_STRING(&_4$$3, "ucfirst"); + ZEPHIR_CALL_FUNCTION(&_6$$3, "array_map", NULL, 59, &_4$$3, &_5$$3); zephir_check_call_status(); + zephir_fast_join_str(&_2$$3, SL(""), &_6$$3 TSRMLS_CC); ZEPHIR_CALL_FUNCTION(&activeMethodName, "lcfirst", NULL, 55, &_2$$3); zephir_check_call_status(); - ZEPHIR_OBS_VAR(&_4$$3); - zephir_read_property(&_4$$3, this_ptr, SL("_actionName"), PH_NOISY_CC); - zephir_update_property_array(this_ptr, SL("_activeMethodMap"), &_4$$3, &activeMethodName TSRMLS_CC); + ZEPHIR_OBS_VAR(&_7$$3); + zephir_read_property(&_7$$3, this_ptr, SL("_actionName"), PH_NOISY_CC); + zephir_update_property_array(this_ptr, SL("_activeMethodMap"), &_7$$3, &activeMethodName TSRMLS_CC); } - zephir_read_property(&_5, this_ptr, SL("_actionSuffix"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CONCAT_VV(return_value, &activeMethodName, &_5); + zephir_read_property(&_8, this_ptr, SL("_actionSuffix"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CONCAT_VV(return_value, &activeMethodName, &_8); RETURN_MM(); } @@ -862,7 +871,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { if (ZEPHIR_IS_FALSE_IDENTICAL(&status)) { RETURN_MM_BOOL(0); } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 436 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 434 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -938,7 +947,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { if (_21$$15) { continue; } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 472 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 470 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -1088,7 +1097,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { zephir_check_call_status(); continue; } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 566 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 564 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -1132,7 +1141,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { zephir_check_call_status(); continue; } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 583 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 581 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -1175,7 +1184,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { if (_75$$42) { continue; } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 616 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 614 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -1222,7 +1231,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { if (_85$$47) { continue; } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 633 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 631 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -1294,7 +1303,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { if (_101$$58) { continue; } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 683 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 681 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -1335,7 +1344,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { if (_111$$63) { continue; } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 697 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 695 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -1375,7 +1384,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { if (_119$$68) { continue; } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 712 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 710 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -1409,7 +1418,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { if (_126$$72) { continue; } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 726 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 724 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -1439,7 +1448,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { if (ZEPHIR_IS_FALSE_IDENTICAL(&_130$$76)) { RETURN_MM_BOOL(0); } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 743 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 741 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -1490,11 +1499,11 @@ PHP_METHOD(Phalcon_Dispatcher, forward) { zephir_read_property(&_0, this_ptr, SL("_isControllerInitialize"), PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_exception_ce, "Forwarding inside a controller's initialize() method is forbidden", "phalcon/dispatcher.zep", 774); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_exception_ce, "Forwarding inside a controller's initialize() method is forbidden", "phalcon/dispatcher.zep", 772); return; } if (Z_TYPE_P(forward) != IS_ARRAY) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_exception_ce, "Forward parameter must be an Array", "phalcon/dispatcher.zep", 782); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_exception_ce, "Forward parameter must be an Array", "phalcon/dispatcher.zep", 780); return; } zephir_read_property(&_1, this_ptr, SL("_namespaceName"), PH_NOISY_CC | PH_READONLY); @@ -1569,9 +1578,9 @@ PHP_METHOD(Phalcon_Dispatcher, getHandlerClass) { zephir_read_property(&handlerName, this_ptr, SL("_handlerName"), PH_NOISY_CC); ZEPHIR_OBS_VAR(&namespaceName); zephir_read_property(&namespaceName, this_ptr, SL("_namespaceName"), PH_NOISY_CC); - if (!(zephir_memnstr_str(&handlerName, SL("\\"), "phalcon/dispatcher.zep", 839))) { - ZEPHIR_CALL_METHOD(&camelizedClass, this_ptr, "tocamelcase", NULL, 0, &handlerName); - zephir_check_call_status(); + if (!(zephir_memnstr_str(&handlerName, SL("\\"), "phalcon/dispatcher.zep", 837))) { + ZEPHIR_INIT_VAR(&camelizedClass); + zephir_camelize(&camelizedClass, &handlerName, NULL ); } else { ZEPHIR_CPY_WRT(&camelizedClass, &handlerName); } @@ -1694,77 +1703,30 @@ PHP_METHOD(Phalcon_Dispatcher, _resolveEmptyProperties) { } -PHP_METHOD(Phalcon_Dispatcher, toCamelCase) { - - zend_long ZEPHIR_LAST_CALL_STATUS; - zval *input_param = NULL, camelCaseInput, _0, _1$$3, _2$$3, _3$$3; - zval input; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&input); - ZVAL_UNDEF(&camelCaseInput); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1$$3); - ZVAL_UNDEF(&_2$$3); - ZVAL_UNDEF(&_3$$3); - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &input_param); - - zephir_get_strval(&input, input_param); - - - ZEPHIR_OBS_VAR(&camelCaseInput); - zephir_read_property(&_0, this_ptr, SL("_camelCaseMap"), PH_NOISY_CC | PH_READONLY); - if (!(zephir_array_isset_fetch(&camelCaseInput, &_0, &input, 0 TSRMLS_CC))) { - ZEPHIR_INIT_VAR(&_1$$3); - ZVAL_STRING(&_1$$3, "/[_-]+/"); - ZEPHIR_CALL_FUNCTION(&_2$$3, "preg_split", NULL, 58, &_1$$3, &input); - zephir_check_call_status(); - ZEPHIR_INIT_NVAR(&_1$$3); - ZVAL_STRING(&_1$$3, "ucfirst"); - ZEPHIR_CALL_FUNCTION(&_3$$3, "array_map", NULL, 59, &_1$$3, &_2$$3); - zephir_check_call_status(); - ZEPHIR_INIT_NVAR(&camelCaseInput); - zephir_fast_join_str(&camelCaseInput, SL(""), &_3$$3 TSRMLS_CC); - zephir_update_property_array(this_ptr, SL("_camelCaseMap"), &input, &camelCaseInput TSRMLS_CC); - } - RETURN_CCTOR(&camelCaseInput); - -} - zend_object *zephir_init_properties_Phalcon_Dispatcher(zend_class_entry *class_type TSRMLS_DC) { - zval _0, _2, _4, _1$$3, _3$$4, _5$$5; + zval _0, _2, _1$$3, _3$$4; ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_4); ZVAL_UNDEF(&_1$$3); ZVAL_UNDEF(&_3$$4); - ZVAL_UNDEF(&_5$$5); ZEPHIR_MM_GROW(); { zval local_this_ptr, *this_ptr = &local_this_ptr; ZEPHIR_CREATE_OBJECT(this_ptr, class_type); - zephir_read_property(&_0, this_ptr, SL("_camelCaseMap"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_0, this_ptr, SL("_activeMethodMap"), PH_NOISY_CC | PH_READONLY); if (Z_TYPE_P(&_0) == IS_NULL) { ZEPHIR_INIT_VAR(&_1$$3); array_init(&_1$$3); - zephir_update_property_zval(this_ptr, SL("_camelCaseMap"), &_1$$3); + zephir_update_property_zval(this_ptr, SL("_activeMethodMap"), &_1$$3); } - zephir_read_property(&_2, this_ptr, SL("_activeMethodMap"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_2, this_ptr, SL("_params"), PH_NOISY_CC | PH_READONLY); if (Z_TYPE_P(&_2) == IS_NULL) { ZEPHIR_INIT_VAR(&_3$$4); array_init(&_3$$4); - zephir_update_property_zval(this_ptr, SL("_activeMethodMap"), &_3$$4); - } - zephir_read_property(&_4, this_ptr, SL("_params"), PH_NOISY_CC | PH_READONLY); - if (Z_TYPE_P(&_4) == IS_NULL) { - ZEPHIR_INIT_VAR(&_5$$5); - array_init(&_5$$5); - zephir_update_property_zval(this_ptr, SL("_params"), &_5$$5); + zephir_update_property_zval(this_ptr, SL("_params"), &_3$$4); } ZEPHIR_MM_RESTORE(); return Z_OBJ_P(this_ptr); diff --git a/ext/phalcon/dispatcher.zep.h b/ext/phalcon/dispatcher.zep.h index 7a6557111ef..73c03b163b4 100644 --- a/ext/phalcon/dispatcher.zep.h +++ b/ext/phalcon/dispatcher.zep.h @@ -38,7 +38,6 @@ PHP_METHOD(Phalcon_Dispatcher, getHandlerClass); PHP_METHOD(Phalcon_Dispatcher, callActionMethod); PHP_METHOD(Phalcon_Dispatcher, getBoundModels); PHP_METHOD(Phalcon_Dispatcher, _resolveEmptyProperties); -PHP_METHOD(Phalcon_Dispatcher, toCamelCase); zend_object *zephir_init_properties_Phalcon_Dispatcher(zend_class_entry *class_type TSRMLS_DC); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_dispatcher_setdi, 0, 0, 1) @@ -260,18 +259,6 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_dispatcher_getboundmodel #endif ZEND_END_ARG_INFO() -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_dispatcher_tocamelcase, 0, 1, IS_STRING, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_dispatcher_tocamelcase, 0, 1, IS_STRING, NULL, 0) -#endif -#if PHP_VERSION_ID >= 70200 - ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0) -#else - ZEND_ARG_INFO(0, input) -#endif -ZEND_END_ARG_INFO() - ZEPHIR_INIT_FUNCS(phalcon_dispatcher_method_entry) { PHP_ME(Phalcon_Dispatcher, setDI, arginfo_phalcon_dispatcher_setdi, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Dispatcher, getDI, arginfo_phalcon_dispatcher_getdi, ZEND_ACC_PUBLIC) @@ -308,6 +295,5 @@ ZEPHIR_INIT_FUNCS(phalcon_dispatcher_method_entry) { PHP_ME(Phalcon_Dispatcher, callActionMethod, arginfo_phalcon_dispatcher_callactionmethod, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Dispatcher, getBoundModels, arginfo_phalcon_dispatcher_getboundmodels, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Dispatcher, _resolveEmptyProperties, NULL, ZEND_ACC_PROTECTED) - PHP_ME(Phalcon_Dispatcher, toCamelCase, arginfo_phalcon_dispatcher_tocamelcase, ZEND_ACC_PROTECTED) PHP_FE_END }; diff --git a/ext/phalcon/mvc/model.zep.c b/ext/phalcon/mvc/model.zep.c index b6a06a3d753..71a9b51d15a 100644 --- a/ext/phalcon/mvc/model.zep.c +++ b/ext/phalcon/mvc/model.zep.c @@ -1837,17 +1837,16 @@ PHP_METHOD(Phalcon_Mvc_Model, find) { */ PHP_METHOD(Phalcon_Mvc_Model, findFirst) { - zend_bool _0; zend_long ZEPHIR_LAST_CALL_STATUS; - zephir_fcall_cache_entry *_1 = NULL; - zval *parameters = NULL, parameters_sub, __$null, params, query, _2; + zephir_fcall_cache_entry *_0 = NULL; + zval *parameters = NULL, parameters_sub, __$null, params, query, _1; zval *this_ptr = getThis(); ZVAL_UNDEF(¶meters_sub); ZVAL_NULL(&__$null); ZVAL_UNDEF(¶ms); ZVAL_UNDEF(&query); - ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_1); ZEPHIR_MM_GROW(); zephir_fetch_params(1, 0, 1, ¶meters); @@ -1858,28 +1857,20 @@ PHP_METHOD(Phalcon_Mvc_Model, findFirst) { } - _0 = Z_TYPE_P(parameters) == IS_STRING; - if (!(_0)) { - _0 = 1 == zephir_is_numeric(parameters); - } - if (Z_TYPE_P(parameters) == IS_NULL) { + if (Z_TYPE_P(parameters) != IS_ARRAY) { ZEPHIR_INIT_VAR(¶ms); array_init(¶ms); - } else if (Z_TYPE_P(parameters) == IS_ARRAY) { - ZEPHIR_CPY_WRT(¶ms, parameters); - } else if (_0) { - ZEPHIR_INIT_NVAR(¶ms); - array_init(¶ms); - zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/mvc/model.zep", 1277); + if (Z_TYPE_P(parameters) != IS_NULL) { + zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/mvc/model.zep", 1274); + } } else { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Parameters passed must be of type array, string, numeric or null", "phalcon/mvc/model.zep", 1279); - return; + ZEPHIR_CPY_WRT(¶ms, parameters); } - ZVAL_LONG(&_2, 1); - ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_1, 320, ¶ms, &_2); + ZVAL_LONG(&_1, 1); + ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_0, 320, ¶ms, &_1); zephir_check_call_status(); - ZVAL_BOOL(&_2, 1); - ZEPHIR_CALL_METHOD(NULL, &query, "setuniquerow", NULL, 0, &_2); + ZVAL_BOOL(&_1, 1); + ZEPHIR_CALL_METHOD(NULL, &query, "setuniquerow", NULL, 0, &_1); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(&query, "execute", NULL, 0); zephir_check_call_status(); @@ -2010,7 +2001,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getChangedFields) { ZEPHIR_OBS_VAR(&snapshot); zephir_read_property(&snapshot, this_ptr, SL("_snapshot"), PH_NOISY_CC); if (Z_TYPE_P(&snapshot) != IS_ARRAY) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record doesn't have a valid data snapshot", "phalcon/mvc/model.zep", 1358); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record doesn't have a valid data snapshot", "phalcon/mvc/model.zep", 1356); return; } ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); @@ -2026,7 +2017,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getChangedFields) { ZEPHIR_INIT_VAR(&changed); array_init(&changed); ZEPHIR_INIT_VAR(&_0); - zephir_is_iterable(&allAttributes, 0, "phalcon/mvc/model.zep", 1411); + zephir_is_iterable(&allAttributes, 0, "phalcon/mvc/model.zep", 1409); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&allAttributes), _2, _3, _1) { ZEPHIR_INIT_NVAR(&name); @@ -2038,17 +2029,17 @@ PHP_METHOD(Phalcon_Mvc_Model, getChangedFields) { ZEPHIR_INIT_NVAR(&_0); ZVAL_COPY(&_0, _1); if (!(zephir_array_isset(&snapshot, &name))) { - zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/mvc/model.zep", 1390); + zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/mvc/model.zep", 1388); continue; } ZEPHIR_OBS_NVAR(&value); if (!(zephir_fetch_property_zval(&value, this_ptr, &name, PH_SILENT_CC))) { - zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/mvc/model.zep", 1398); + zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/mvc/model.zep", 1396); continue; } - zephir_array_fetch(&_4$$6, &snapshot, &name, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1405 TSRMLS_CC); + zephir_array_fetch(&_4$$6, &snapshot, &name, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1403 TSRMLS_CC); if (!ZEPHIR_IS_IDENTICAL(&value, &_4$$6)) { - zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/mvc/model.zep", 1406); + zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/mvc/model.zep", 1404); continue; } } ZEND_HASH_FOREACH_END(); @@ -2156,7 +2147,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getMessages) { ZEPHIR_INIT_VAR(&filtered); array_init(&filtered); zephir_read_property(&_1$$3, this_ptr, SL("_errorMessages"), PH_NOISY_CC | PH_READONLY); - zephir_is_iterable(&_1$$3, 0, "phalcon/mvc/model.zep", 1472); + zephir_is_iterable(&_1$$3, 0, "phalcon/mvc/model.zep", 1470); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_1$$3), _2$$3) { ZEPHIR_INIT_NVAR(&message); @@ -2164,7 +2155,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getMessages) { ZEPHIR_CALL_METHOD(&_3$$4, &message, "getfield", NULL, 0); zephir_check_call_status(); if (ZEPHIR_IS_EQUAL(&_3$$4, filter)) { - zephir_array_append(&filtered, &message, PH_SEPARATE, "phalcon/mvc/model.zep", 1469); + zephir_array_append(&filtered, &message, PH_SEPARATE, "phalcon/mvc/model.zep", 1467); } } ZEND_HASH_FOREACH_END(); ZEPHIR_INIT_NVAR(&message); @@ -2214,7 +2205,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getModelsMetaData) { zephir_check_call_status(); ZEPHIR_CPY_WRT(&metaData, &_1$$3); if (Z_TYPE_P(&metaData) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsMetadata' is not valid", "phalcon/mvc/model.zep", 1503); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsMetadata' is not valid", "phalcon/mvc/model.zep", 1501); return; } zephir_update_property_zval(this_ptr, SL("_modelsMetaData"), &metaData); @@ -2343,7 +2334,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getRelated) { ZEPHIR_CONCAT_SVSVS(&_3$$3, "There is no defined relations for the model '", &className, "' using alias '", &alias, "'"); ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 4, &_3$$3); zephir_check_call_status(); - zephir_throw_exception_debug(&_2$$3, "phalcon/mvc/model.zep", 1570 TSRMLS_CC); + zephir_throw_exception_debug(&_2$$3, "phalcon/mvc/model.zep", 1568 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -2464,21 +2455,21 @@ PHP_METHOD(Phalcon_Mvc_Model, getUpdatedFields) { ZEPHIR_OBS_VAR(&oldSnapshot); zephir_read_property(&oldSnapshot, this_ptr, SL("_oldSnapshot"), PH_NOISY_CC); if (!(ZEPHIR_GLOBAL(orm).update_snapshot_on_save)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Update snapshot on save must be enabled for this method to work properly", "phalcon/mvc/model.zep", 1634); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Update snapshot on save must be enabled for this method to work properly", "phalcon/mvc/model.zep", 1632); return; } if (Z_TYPE_P(&snapshot) != IS_ARRAY) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record doesn't have a valid data snapshot", "phalcon/mvc/model.zep", 1638); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record doesn't have a valid data snapshot", "phalcon/mvc/model.zep", 1636); return; } zephir_read_property(&_0, this_ptr, SL("_dirtyState"), PH_NOISY_CC | PH_READONLY); if (!ZEPHIR_IS_LONG(&_0, 0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Change checking cannot be performed because the object has not been persisted or is deleted", "phalcon/mvc/model.zep", 1645); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Change checking cannot be performed because the object has not been persisted or is deleted", "phalcon/mvc/model.zep", 1643); return; } ZEPHIR_INIT_VAR(&updated); array_init(&updated); - zephir_is_iterable(&snapshot, 0, "phalcon/mvc/model.zep", 1665); + zephir_is_iterable(&snapshot, 0, "phalcon/mvc/model.zep", 1663); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&snapshot), _2, _3, _1) { ZEPHIR_INIT_NVAR(&name); @@ -2490,12 +2481,12 @@ PHP_METHOD(Phalcon_Mvc_Model, getUpdatedFields) { ZEPHIR_INIT_NVAR(&value); ZVAL_COPY(&value, _1); if (!(zephir_array_isset(&oldSnapshot, &name))) { - zephir_array_append(&updated, &name, PH_SEPARATE, "phalcon/mvc/model.zep", 1655); + zephir_array_append(&updated, &name, PH_SEPARATE, "phalcon/mvc/model.zep", 1653); continue; } - zephir_array_fetch(&_4$$6, &oldSnapshot, &name, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1659 TSRMLS_CC); + zephir_array_fetch(&_4$$6, &oldSnapshot, &name, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1657 TSRMLS_CC); if (!ZEPHIR_IS_IDENTICAL(&value, &_4$$6)) { - zephir_array_append(&updated, &name, PH_SEPARATE, "phalcon/mvc/model.zep", 1660); + zephir_array_append(&updated, &name, PH_SEPARATE, "phalcon/mvc/model.zep", 1658); continue; } } ZEND_HASH_FOREACH_END(); @@ -2955,7 +2946,7 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh) { zephir_read_property(&_0, this_ptr, SL("_dirtyState"), PH_NOISY_CC | PH_READONLY); if (!ZEPHIR_IS_LONG(&_0, 0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 1902); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 1900); return; } ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); @@ -2982,7 +2973,7 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh) { ZEPHIR_CALL_METHOD(&_2$$6, this_ptr, "_exists", NULL, 0, &metaData, &readConnection, &table); zephir_check_call_status(); if (!(zephir_is_true(&_2$$6))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 1925); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 1923); return; } ZEPHIR_OBS_NVAR(&uniqueKey); @@ -2991,14 +2982,14 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh) { ZEPHIR_OBS_VAR(&uniqueParams); zephir_read_property(&uniqueParams, this_ptr, SL("_uniqueParams"), PH_NOISY_CC); if (Z_TYPE_P(&uniqueParams) != IS_ARRAY) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 1933); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 1931); return; } ZEPHIR_INIT_VAR(&fields); array_init(&fields); ZEPHIR_CALL_METHOD(&_3, &metaData, "getattributes", NULL, 0, this_ptr); zephir_check_call_status(); - zephir_is_iterable(&_3, 0, "phalcon/mvc/model.zep", 1947); + zephir_is_iterable(&_3, 0, "phalcon/mvc/model.zep", 1945); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_3), _4) { ZEPHIR_INIT_NVAR(&attribute); @@ -3006,7 +2997,7 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh) { ZEPHIR_INIT_NVAR(&_5$$9); zephir_create_array(&_5$$9, 1, 0 TSRMLS_CC); zephir_array_fast_append(&_5$$9, &attribute); - zephir_array_append(&fields, &_5$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 1941); + zephir_array_append(&fields, &_5$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 1939); } ZEND_HASH_FOREACH_END(); ZEPHIR_INIT_NVAR(&attribute); ZEPHIR_CALL_METHOD(&dialect, &readConnection, "getdialect", NULL, 0); @@ -3160,7 +3151,7 @@ PHP_METHOD(Phalcon_Mvc_Model, save) { zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_6$$11, "__construct", NULL, 324, this_ptr, &_7$$11); zephir_check_call_status(); - zephir_throw_exception_debug(&_6$$11, "phalcon/mvc/model.zep", 2075 TSRMLS_CC); + zephir_throw_exception_debug(&_6$$11, "phalcon/mvc/model.zep", 2073 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -3289,7 +3280,7 @@ PHP_METHOD(Phalcon_Mvc_Model, unserialize) { ZEPHIR_CALL_CE_STATIC(&dependencyInjector, phalcon_di_ce, "getdefault", &_0, 0); zephir_check_call_status(); if (Z_TYPE_P(&dependencyInjector) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injector container is required to obtain the services related to the ORM", "phalcon/mvc/model.zep", 2170); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injector container is required to obtain the services related to the ORM", "phalcon/mvc/model.zep", 2168); return; } zephir_update_property_zval(this_ptr, SL("_dependencyInjector"), &dependencyInjector); @@ -3299,7 +3290,7 @@ PHP_METHOD(Phalcon_Mvc_Model, unserialize) { zephir_check_call_status(); ZEPHIR_CPY_WRT(&manager, &_1$$3); if (Z_TYPE_P(&manager) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsManager' is not valid", "phalcon/mvc/model.zep", 2183); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsManager' is not valid", "phalcon/mvc/model.zep", 2181); return; } zephir_update_property_zval(this_ptr, SL("_modelsManager"), &manager); @@ -3310,13 +3301,13 @@ PHP_METHOD(Phalcon_Mvc_Model, unserialize) { if (zephir_is_true(&_1$$3)) { if (zephir_array_isset_string_fetch(&snapshot, &attributes, SL("_snapshot"), 1)) { zephir_update_property_zval(this_ptr, SL("_snapshot"), &snapshot); - zephir_array_fetch_string(&_3$$7, &attributes, SL("_attributes"), PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 2198 TSRMLS_CC); + zephir_array_fetch_string(&_3$$7, &attributes, SL("_attributes"), PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 2196 TSRMLS_CC); ZEPHIR_CPY_WRT(&attributes, &_3$$7); } else { zephir_update_property_zval(this_ptr, SL("_snapshot"), &attributes); } } - zephir_is_iterable(&attributes, 0, "phalcon/mvc/model.zep", 2211); + zephir_is_iterable(&attributes, 0, "phalcon/mvc/model.zep", 2209); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&attributes), _5$$3, _6$$3, _4$$3) { ZEPHIR_INIT_NVAR(&key); @@ -3513,7 +3504,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData) { if (Z_TYPE_P(columnMap) == IS_ARRAY) { ZEPHIR_INIT_VAR(&snapshot); array_init(&snapshot); - zephir_is_iterable(&data, 0, "phalcon/mvc/model.zep", 2300); + zephir_is_iterable(&data, 0, "phalcon/mvc/model.zep", 2298); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&data), _1$$3, _2$$3, _0$$3) { ZEPHIR_INIT_NVAR(&key); @@ -3536,7 +3527,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData) { ZEPHIR_CONCAT_SVS(&_4$$7, "Column '", &key, "' doesn't make part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_3$$7, "__construct", &_5, 4, &_4$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_3$$7, "phalcon/mvc/model.zep", 2284 TSRMLS_CC); + zephir_throw_exception_debug(&_3$$7, "phalcon/mvc/model.zep", 2282 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -3553,7 +3544,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData) { ZEPHIR_CONCAT_SVS(&_7$$11, "Column '", &key, "' doesn't make part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_6$$11, "__construct", &_5, 4, &_7$$11); zephir_check_call_status(); - zephir_throw_exception_debug(&_6$$11, "phalcon/mvc/model.zep", 2292 TSRMLS_CC); + zephir_throw_exception_debug(&_6$$11, "phalcon/mvc/model.zep", 2290 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -3616,7 +3607,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) { if (Z_TYPE_P(columnMap) == IS_ARRAY) { ZEPHIR_INIT_VAR(&snapshot); array_init(&snapshot); - zephir_is_iterable(&data, 0, "phalcon/mvc/model.zep", 2360); + zephir_is_iterable(&data, 0, "phalcon/mvc/model.zep", 2358); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&data), _1$$3, _2$$3, _0$$3) { ZEPHIR_INIT_NVAR(&key); @@ -3648,7 +3639,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) { ZEPHIR_CONCAT_SVS(&_7$$8, "Column '", &key, "' doesn't make part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_6$$8, "__construct", &_8, 4, &_7$$8); zephir_check_call_status(); - zephir_throw_exception_debug(&_6$$8, "phalcon/mvc/model.zep", 2342 TSRMLS_CC); + zephir_throw_exception_debug(&_6$$8, "phalcon/mvc/model.zep", 2340 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -3665,7 +3656,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) { ZEPHIR_CONCAT_SVS(&_10$$12, "Column '", &key, "' doesn't make part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_9$$12, "__construct", &_8, 4, &_10$$12); zephir_check_call_status(); - zephir_throw_exception_debug(&_9$$12, "phalcon/mvc/model.zep", 2351 TSRMLS_CC); + zephir_throw_exception_debug(&_9$$12, "phalcon/mvc/model.zep", 2349 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -3987,7 +3978,7 @@ PHP_METHOD(Phalcon_Mvc_Model, toArray) { zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_0, &metaData, "getattributes", NULL, 0, this_ptr); zephir_check_call_status(); - zephir_is_iterable(&_0, 0, "phalcon/mvc/model.zep", 2603); + zephir_is_iterable(&_0, 0, "phalcon/mvc/model.zep", 2601); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _1) { ZEPHIR_INIT_NVAR(&attribute); @@ -4011,7 +4002,7 @@ PHP_METHOD(Phalcon_Mvc_Model, toArray) { ZEPHIR_CONCAT_SVS(&_6$$7, "Column '", &attribute, "' doesn't make part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_5$$7, "__construct", &_7, 4, &_6$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_5$$7, "phalcon/mvc/model.zep", 2581 TSRMLS_CC); + zephir_throw_exception_debug(&_5$$7, "phalcon/mvc/model.zep", 2579 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -4188,7 +4179,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { ZEPHIR_CALL_METHOD(&belongsTo, &manager, "getbelongsto", NULL, 0, this_ptr); zephir_check_call_status(); error = 0; - zephir_is_iterable(&belongsTo, 0, "phalcon/mvc/model.zep", 2800); + zephir_is_iterable(&belongsTo, 0, "phalcon/mvc/model.zep", 2798); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&belongsTo), _1) { ZEPHIR_INIT_NVAR(&relation); @@ -4203,7 +4194,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { if (Z_TYPE_P(&foreignKey) == IS_ARRAY) { if (zephir_array_isset_string(&foreignKey, SL("action"))) { ZEPHIR_OBS_NVAR(&_2$$6); - zephir_array_fetch_string(&_2$$6, &foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 2702 TSRMLS_CC); + zephir_array_fetch_string(&_2$$6, &foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 2700 TSRMLS_CC); action = zephir_get_intval(&_2$$6); } } @@ -4224,7 +4215,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { ZEPHIR_CALL_METHOD(&referencedFields, &relation, "getreferencedfields", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&fields) == IS_ARRAY) { - zephir_is_iterable(&fields, 0, "phalcon/mvc/model.zep", 2740); + zephir_is_iterable(&fields, 0, "phalcon/mvc/model.zep", 2738); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _6$$8, _7$$8, _5$$8) { ZEPHIR_INIT_NVAR(&position); @@ -4237,11 +4228,11 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { ZVAL_COPY(&field, _5$$8); ZEPHIR_OBS_NVAR(&value); zephir_fetch_property_zval(&value, this_ptr, &field, PH_SILENT_CC); - zephir_array_fetch(&_8$$9, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 2733 TSRMLS_CC); + zephir_array_fetch(&_8$$9, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 2731 TSRMLS_CC); ZEPHIR_INIT_LNVAR(_9$$9); ZEPHIR_CONCAT_SVSV(&_9$$9, "[", &_8$$9, "] = ?", &position); - zephir_array_append(&conditions, &_9$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 2733); - zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2734); + zephir_array_append(&conditions, &_9$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 2731); + zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2732); if (Z_TYPE_P(&value) == IS_NULL) { numberNull++; } @@ -4254,15 +4245,15 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { zephir_fetch_property_zval(&value, this_ptr, &fields, PH_SILENT_CC); ZEPHIR_INIT_LNVAR(_10$$11); ZEPHIR_CONCAT_SVS(&_10$$11, "[", &referencedFields, "] = ?0"); - zephir_array_append(&conditions, &_10$$11, PH_SEPARATE, "phalcon/mvc/model.zep", 2745); - zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2746); + zephir_array_append(&conditions, &_10$$11, PH_SEPARATE, "phalcon/mvc/model.zep", 2743); + zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2744); if (Z_TYPE_P(&value) == IS_NULL) { validateWithNulls = 1; } } ZEPHIR_OBS_NVAR(&extraConditions); if (zephir_array_isset_string_fetch(&extraConditions, &foreignKey, SL("conditions"), 0)) { - zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 2757); + zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 2755); } if (validateWithNulls) { ZEPHIR_OBS_NVAR(&allowNulls); @@ -4367,7 +4358,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseCascade) { ZEPHIR_CPY_WRT(&manager, &_0); ZEPHIR_CALL_METHOD(&relations, &manager, "gethasoneandhasmany", NULL, 0, this_ptr); zephir_check_call_status(); - zephir_is_iterable(&relations, 0, "phalcon/mvc/model.zep", 2913); + zephir_is_iterable(&relations, 0, "phalcon/mvc/model.zep", 2911); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relations), _1) { ZEPHIR_INIT_NVAR(&relation); @@ -4381,7 +4372,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseCascade) { if (Z_TYPE_P(&foreignKey) == IS_ARRAY) { if (zephir_array_isset_string(&foreignKey, SL("action"))) { ZEPHIR_OBS_NVAR(&_2$$6); - zephir_array_fetch_string(&_2$$6, &foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 2852 TSRMLS_CC); + zephir_array_fetch_string(&_2$$6, &foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 2850 TSRMLS_CC); action = zephir_get_intval(&_2$$6); } } @@ -4401,7 +4392,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseCascade) { ZEPHIR_INIT_NVAR(&bindParams); array_init(&bindParams); if (Z_TYPE_P(&fields) == IS_ARRAY) { - zephir_is_iterable(&fields, 0, "phalcon/mvc/model.zep", 2882); + zephir_is_iterable(&fields, 0, "phalcon/mvc/model.zep", 2880); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _6$$8, _7$$8, _5$$8) { ZEPHIR_INIT_NVAR(&position); @@ -4414,11 +4405,11 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseCascade) { ZVAL_COPY(&field, _5$$8); ZEPHIR_OBS_NVAR(&value); zephir_fetch_property_zval(&value, this_ptr, &field, PH_SILENT_CC); - zephir_array_fetch(&_8$$9, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 2879 TSRMLS_CC); + zephir_array_fetch(&_8$$9, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 2877 TSRMLS_CC); ZEPHIR_INIT_LNVAR(_9$$9); ZEPHIR_CONCAT_SVSV(&_9$$9, "[", &_8$$9, "] = ?", &position); - zephir_array_append(&conditions, &_9$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 2879); - zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2880); + zephir_array_append(&conditions, &_9$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 2877); + zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2878); } ZEND_HASH_FOREACH_END(); ZEPHIR_INIT_NVAR(&field); ZEPHIR_INIT_NVAR(&position); @@ -4427,12 +4418,12 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseCascade) { zephir_fetch_property_zval(&value, this_ptr, &fields, PH_SILENT_CC); ZEPHIR_INIT_LNVAR(_10$$10); ZEPHIR_CONCAT_SVS(&_10$$10, "[", &referencedFields, "] = ?0"); - zephir_array_append(&conditions, &_10$$10, PH_SEPARATE, "phalcon/mvc/model.zep", 2884); - zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2885); + zephir_array_append(&conditions, &_10$$10, PH_SEPARATE, "phalcon/mvc/model.zep", 2882); + zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2883); } ZEPHIR_OBS_NVAR(&extraConditions); if (zephir_array_isset_string_fetch(&extraConditions, &foreignKey, SL("conditions"), 0)) { - zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 2892); + zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 2890); } ZEPHIR_INIT_NVAR(&_11$$3); zephir_create_array(&_11$$3, 2, 0 TSRMLS_CC); @@ -4501,7 +4492,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseRestrict) { ZEPHIR_CALL_METHOD(&relations, &manager, "gethasoneandhasmany", NULL, 0, this_ptr); zephir_check_call_status(); error = 0; - zephir_is_iterable(&relations, 0, "phalcon/mvc/model.zep", 3031); + zephir_is_iterable(&relations, 0, "phalcon/mvc/model.zep", 3029); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relations), _1) { ZEPHIR_INIT_NVAR(&relation); @@ -4515,7 +4506,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseRestrict) { if (Z_TYPE_P(&foreignKey) == IS_ARRAY) { if (zephir_array_isset_string(&foreignKey, SL("action"))) { ZEPHIR_OBS_NVAR(&_2$$6); - zephir_array_fetch_string(&_2$$6, &foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 2959 TSRMLS_CC); + zephir_array_fetch_string(&_2$$6, &foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 2957 TSRMLS_CC); action = zephir_get_intval(&_2$$6); } } @@ -4535,7 +4526,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseRestrict) { ZEPHIR_INIT_NVAR(&bindParams); array_init(&bindParams); if (Z_TYPE_P(&fields) == IS_ARRAY) { - zephir_is_iterable(&fields, 0, "phalcon/mvc/model.zep", 2993); + zephir_is_iterable(&fields, 0, "phalcon/mvc/model.zep", 2991); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _5$$8, _6$$8, _4$$8) { ZEPHIR_INIT_NVAR(&position); @@ -4548,11 +4539,11 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseRestrict) { ZVAL_COPY(&field, _4$$8); ZEPHIR_OBS_NVAR(&value); zephir_fetch_property_zval(&value, this_ptr, &field, PH_SILENT_CC); - zephir_array_fetch(&_7$$9, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 2989 TSRMLS_CC); + zephir_array_fetch(&_7$$9, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 2987 TSRMLS_CC); ZEPHIR_INIT_LNVAR(_8$$9); ZEPHIR_CONCAT_SVSV(&_8$$9, "[", &_7$$9, "] = ?", &position); - zephir_array_append(&conditions, &_8$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 2989); - zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2990); + zephir_array_append(&conditions, &_8$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 2987); + zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2988); } ZEND_HASH_FOREACH_END(); ZEPHIR_INIT_NVAR(&field); ZEPHIR_INIT_NVAR(&position); @@ -4561,12 +4552,12 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseRestrict) { zephir_fetch_property_zval(&value, this_ptr, &fields, PH_SILENT_CC); ZEPHIR_INIT_LNVAR(_9$$10); ZEPHIR_CONCAT_SVS(&_9$$10, "[", &referencedFields, "] = ?0"); - zephir_array_append(&conditions, &_9$$10, PH_SEPARATE, "phalcon/mvc/model.zep", 2995); - zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2996); + zephir_array_append(&conditions, &_9$$10, PH_SEPARATE, "phalcon/mvc/model.zep", 2993); + zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2994); } ZEPHIR_OBS_NVAR(&extraConditions); if (zephir_array_isset_string_fetch(&extraConditions, &foreignKey, SL("conditions"), 0)) { - zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 3003); + zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 3001); } ZEPHIR_INIT_NVAR(&_11$$3); zephir_create_array(&_11$$3, 2, 0 TSRMLS_CC); @@ -4696,7 +4687,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { ZEPHIR_INIT_NVAR(&columnMap); ZVAL_NULL(&columnMap); } - zephir_is_iterable(&attributes, 0, "phalcon/mvc/model.zep", 3140); + zephir_is_iterable(&attributes, 0, "phalcon/mvc/model.zep", 3138); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _1) { ZEPHIR_INIT_NVAR(&field); @@ -4710,7 +4701,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { ZEPHIR_CONCAT_SVS(&_3$$7, "Column '", &field, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_2$$7, "__construct", &_4, 4, &_3$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_2$$7, "phalcon/mvc/model.zep", 3085 TSRMLS_CC); + zephir_throw_exception_debug(&_2$$7, "phalcon/mvc/model.zep", 3083 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -4740,25 +4731,25 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { ZEPHIR_CONCAT_SVS(&_8$$14, "Column '", &field, "' have not defined a bind data type"); ZEPHIR_CALL_METHOD(NULL, &_7$$14, "__construct", &_4, 4, &_8$$14); zephir_check_call_status(); - zephir_throw_exception_debug(&_7$$14, "phalcon/mvc/model.zep", 3114 TSRMLS_CC); + zephir_throw_exception_debug(&_7$$14, "phalcon/mvc/model.zep", 3112 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/mvc/model.zep", 3117); - zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3117); - zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 3117); + zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/mvc/model.zep", 3115); + zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3115); + zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 3115); } else { if (zephir_array_isset(&defaultValues, &field)) { ZEPHIR_CALL_METHOD(&_9$$16, connection, "getdefaultvalue", &_10, 0); zephir_check_call_status(); - zephir_array_append(&values, &_9$$16, PH_SEPARATE, "phalcon/mvc/model.zep", 3121); + zephir_array_append(&values, &_9$$16, PH_SEPARATE, "phalcon/mvc/model.zep", 3119); zephir_array_update_zval(&snapshot, &attributeField, &__$null, PH_COPY | PH_SEPARATE); } else { - zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3127); + zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3125); zephir_array_update_zval(&snapshot, &attributeField, &value, PH_COPY | PH_SEPARATE); } - zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/mvc/model.zep", 3131); - zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 3131); + zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/mvc/model.zep", 3129); + zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 3129); } } } @@ -4771,7 +4762,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { zephir_check_call_status(); useExplicitIdentity = zephir_get_boolval(&_11$$18); if (useExplicitIdentity) { - zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/mvc/model.zep", 3149); + zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/mvc/model.zep", 3147); } if (Z_TYPE_P(&columnMap) == IS_ARRAY) { ZEPHIR_OBS_NVAR(&attributeField); @@ -4782,7 +4773,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { ZEPHIR_CONCAT_SVS(&_13$$21, "Identity column '", identityField, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_12$$21, "__construct", &_4, 4, &_13$$21); zephir_check_call_status(); - zephir_throw_exception_debug(&_12$$21, "phalcon/mvc/model.zep", 3157 TSRMLS_CC); + zephir_throw_exception_debug(&_12$$21, "phalcon/mvc/model.zep", 3155 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -4797,12 +4788,12 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { } if (_14$$23) { if (useExplicitIdentity) { - zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/mvc/model.zep", 3170); - zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 3170); + zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/mvc/model.zep", 3168); + zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 3168); } } else { if (!(useExplicitIdentity)) { - zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/mvc/model.zep", 3178); + zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/mvc/model.zep", 3176); } ZEPHIR_OBS_NVAR(&bindType); if (!(zephir_array_isset_fetch(&bindType, &bindDataTypes, identityField, 0 TSRMLS_CC))) { @@ -4812,17 +4803,17 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { ZEPHIR_CONCAT_SVS(&_16$$28, "Identity column '", identityField, "' isn\\'t part of the table columns"); ZEPHIR_CALL_METHOD(NULL, &_15$$28, "__construct", &_4, 4, &_16$$28); zephir_check_call_status(); - zephir_throw_exception_debug(&_15$$28, "phalcon/mvc/model.zep", 3185 TSRMLS_CC); + zephir_throw_exception_debug(&_15$$28, "phalcon/mvc/model.zep", 3183 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3188); - zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 3188); + zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3186); + zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 3186); } } else { if (useExplicitIdentity) { - zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/mvc/model.zep", 3192); - zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 3192); + zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/mvc/model.zep", 3190); + zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 3190); } } } @@ -4979,7 +4970,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_INIT_NVAR(&columnMap); ZVAL_NULL(&columnMap); } - zephir_is_iterable(&nonPrimary, 0, "phalcon/mvc/model.zep", 3406); + zephir_is_iterable(&nonPrimary, 0, "phalcon/mvc/model.zep", 3404); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&nonPrimary), _2) { ZEPHIR_INIT_NVAR(&field); @@ -4993,7 +4984,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_CONCAT_SVS(&_4$$9, "Column '", &field, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_3$$9, "__construct", &_5, 4, &_4$$9); zephir_check_call_status(); - zephir_throw_exception_debug(&_3$$9, "phalcon/mvc/model.zep", 3299 TSRMLS_CC); + zephir_throw_exception_debug(&_3$$9, "phalcon/mvc/model.zep", 3297 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -5009,16 +5000,16 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_CONCAT_SVS(&_7$$12, "Column '", &field, "' have not defined a bind data type"); ZEPHIR_CALL_METHOD(NULL, &_6$$12, "__construct", &_5, 4, &_7$$12); zephir_check_call_status(); - zephir_throw_exception_debug(&_6$$12, "phalcon/mvc/model.zep", 3311 TSRMLS_CC); + zephir_throw_exception_debug(&_6$$12, "phalcon/mvc/model.zep", 3309 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&value); if (zephir_fetch_property_zval(&value, this_ptr, &attributeField, PH_SILENT_CC)) { if (!(useDynamicUpdate)) { - zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/mvc/model.zep", 3325); - zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3325); - zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 3326); + zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/mvc/model.zep", 3323); + zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3323); + zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 3324); } else { ZEPHIR_OBS_NVAR(&snapshotValue); if (!(zephir_array_isset_fetch(&snapshotValue, &snapshot, &attributeField, 0 TSRMLS_CC))) { @@ -5038,7 +5029,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_CONCAT_SVS(&_9$$22, "Column '", &field, "' have not defined a data type"); ZEPHIR_CALL_METHOD(NULL, &_8$$22, "__construct", &_5, 4, &_9$$22); zephir_check_call_status(); - zephir_throw_exception_debug(&_8$$22, "phalcon/mvc/model.zep", 3351 TSRMLS_CC); + zephir_throw_exception_debug(&_8$$22, "phalcon/mvc/model.zep", 3349 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -5068,17 +5059,17 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { } } if (changed) { - zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/mvc/model.zep", 3390); - zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3390); - zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 3391); + zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/mvc/model.zep", 3388); + zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3388); + zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 3389); } } zephir_array_update_zval(&newSnapshot, &attributeField, &value, PH_COPY | PH_SEPARATE); } else { zephir_array_update_zval(&newSnapshot, &attributeField, &__$null, PH_COPY | PH_SEPARATE); - zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/mvc/model.zep", 3398); - zephir_array_append(&values, &__$null, PH_SEPARATE, "phalcon/mvc/model.zep", 3398); - zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 3398); + zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/mvc/model.zep", 3396); + zephir_array_append(&values, &__$null, PH_SEPARATE, "phalcon/mvc/model.zep", 3396); + zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 3396); } } } ZEND_HASH_FOREACH_END(); @@ -5099,12 +5090,12 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_CALL_METHOD(&primaryKeys, metaData, "getprimarykeyattributes", NULL, 0, this_ptr); zephir_check_call_status(); if (!(zephir_fast_count_int(&primaryKeys TSRMLS_CC))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A primary key must be defined in the model in order to perform the operation", "phalcon/mvc/model.zep", 3428); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A primary key must be defined in the model in order to perform the operation", "phalcon/mvc/model.zep", 3426); return; } ZEPHIR_INIT_NVAR(&uniqueParams); array_init(&uniqueParams); - zephir_is_iterable(&primaryKeys, 0, "phalcon/mvc/model.zep", 3453); + zephir_is_iterable(&primaryKeys, 0, "phalcon/mvc/model.zep", 3451); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&primaryKeys), _15$$31) { ZEPHIR_INIT_NVAR(&field); @@ -5118,7 +5109,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_CONCAT_SVS(&_17$$35, "Column '", &field, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_16$$35, "__construct", &_5, 4, &_17$$35); zephir_check_call_status(); - zephir_throw_exception_debug(&_16$$35, "phalcon/mvc/model.zep", 3439 TSRMLS_CC); + zephir_throw_exception_debug(&_16$$35, "phalcon/mvc/model.zep", 3437 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -5128,10 +5119,10 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_OBS_NVAR(&value); if (zephir_fetch_property_zval(&value, this_ptr, &attributeField, PH_SILENT_CC)) { zephir_array_update_zval(&newSnapshot, &attributeField, &value, PH_COPY | PH_SEPARATE); - zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3447); + zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3445); } else { zephir_array_update_zval(&newSnapshot, &attributeField, &__$null, PH_COPY | PH_SEPARATE); - zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/mvc/model.zep", 3450); + zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/mvc/model.zep", 3448); } } ZEND_HASH_FOREACH_END(); ZEPHIR_INIT_NVAR(&field); @@ -5256,7 +5247,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _exists) { array_init(&uniqueParams); ZEPHIR_INIT_NVAR(&uniqueTypes); array_init(&uniqueTypes); - zephir_is_iterable(&primaryKeys, 0, "phalcon/mvc/model.zep", 3564); + zephir_is_iterable(&primaryKeys, 0, "phalcon/mvc/model.zep", 3562); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&primaryKeys), _0$$3) { ZEPHIR_INIT_NVAR(&field); @@ -5270,7 +5261,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _exists) { ZEPHIR_CONCAT_SVS(&_2$$9, "Column '", &field, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_1$$9, "__construct", &_3, 4, &_2$$9); zephir_check_call_status(); - zephir_throw_exception_debug(&_1$$9, "phalcon/mvc/model.zep", 3528 TSRMLS_CC); + zephir_throw_exception_debug(&_1$$9, "phalcon/mvc/model.zep", 3526 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -5288,9 +5279,9 @@ PHP_METHOD(Phalcon_Mvc_Model, _exists) { if (_4$$11) { numberEmpty++; } - zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3546); + zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3544); } else { - zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/mvc/model.zep", 3549); + zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/mvc/model.zep", 3547); numberEmpty++; } ZEPHIR_OBS_NVAR(&type); @@ -5301,16 +5292,16 @@ PHP_METHOD(Phalcon_Mvc_Model, _exists) { ZEPHIR_CONCAT_SVS(&_6$$14, "Column '", &field, "' isn't part of the table columns"); ZEPHIR_CALL_METHOD(NULL, &_5$$14, "__construct", &_3, 4, &_6$$14); zephir_check_call_status(); - zephir_throw_exception_debug(&_5$$14, "phalcon/mvc/model.zep", 3554 TSRMLS_CC); + zephir_throw_exception_debug(&_5$$14, "phalcon/mvc/model.zep", 3552 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&uniqueTypes, &type, PH_SEPARATE, "phalcon/mvc/model.zep", 3557); + zephir_array_append(&uniqueTypes, &type, PH_SEPARATE, "phalcon/mvc/model.zep", 3555); ZEPHIR_CALL_METHOD(&_7$$7, connection, "escapeidentifier", &_8, 0, &field); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_9$$7); ZEPHIR_CONCAT_VS(&_9$$7, &_7$$7, " = ?"); - zephir_array_append(&wherePk, &_9$$7, PH_SEPARATE, "phalcon/mvc/model.zep", 3558); + zephir_array_append(&wherePk, &_9$$7, PH_SEPARATE, "phalcon/mvc/model.zep", 3556); } ZEND_HASH_FOREACH_END(); ZEPHIR_INIT_NVAR(&field); if (numberPrimary == numberEmpty) { @@ -5358,7 +5349,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _exists) { ZVAL_NULL(&_13); ZEPHIR_CALL_METHOD(&num, connection, "fetchone", NULL, 0, &_12, &_13, &uniqueParams, &uniqueTypes); zephir_check_call_status(); - zephir_array_fetch_string(&_14, &num, SL("rowcount"), PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 3614 TSRMLS_CC); + zephir_array_fetch_string(&_14, &num, SL("rowcount"), PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 3612 TSRMLS_CC); if (zephir_is_true(&_14)) { ZEPHIR_INIT_ZVAL_NREF(_15$$22); ZVAL_LONG(&_15$$22, 0); @@ -5530,7 +5521,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _groupResult) { ZEPHIR_INIT_VAR(¶ms); array_init(¶ms); if (Z_TYPE_P(parameters) != IS_NULL) { - zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/mvc/model.zep", 3688); + zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/mvc/model.zep", 3686); } } else { ZEPHIR_CPY_WRT(¶ms, parameters); @@ -5670,7 +5661,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _invokeFinder) { ZEPHIR_CONCAT_SVS(&_4$$7, "The static method '", &method, "' requires one argument"); ZEPHIR_CALL_METHOD(NULL, &_3$$7, "__construct", NULL, 4, &_4$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_3$$7, "phalcon/mvc/model.zep", 3800 TSRMLS_CC); + zephir_throw_exception_debug(&_3$$7, "phalcon/mvc/model.zep", 3798 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -5707,7 +5698,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _invokeFinder) { ZEPHIR_CONCAT_SVS(&_8$$13, "Cannot resolve attribute '", &extraMethod, "' in the model"); ZEPHIR_CALL_METHOD(NULL, &_7$$13, "__construct", NULL, 4, &_8$$13); zephir_check_call_status(); - zephir_throw_exception_debug(&_7$$13, "phalcon/mvc/model.zep", 3834 TSRMLS_CC); + zephir_throw_exception_debug(&_7$$13, "phalcon/mvc/model.zep", 3832 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -5881,7 +5872,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _preSave) { ZEPHIR_CALL_METHOD(&emptyStringValues, metaData, "getemptystringattributes", NULL, 0, this_ptr); zephir_check_call_status(); error = 0; - zephir_is_iterable(¬Null, 0, "phalcon/mvc/model.zep", 4020); + zephir_is_iterable(¬Null, 0, "phalcon/mvc/model.zep", 4018); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(¬Null), _7$$12) { ZEPHIR_INIT_NVAR(&field); @@ -5895,7 +5886,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _preSave) { ZEPHIR_CONCAT_SVS(&_9$$19, "Column '", &field, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_8$$19, "__construct", &_10, 4, &_9$$19); zephir_check_call_status(); - zephir_throw_exception_debug(&_8$$19, "phalcon/mvc/model.zep", 3947 TSRMLS_CC); + zephir_throw_exception_debug(&_8$$19, "phalcon/mvc/model.zep", 3945 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -5919,7 +5910,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _preSave) { if (_12$$27) { _13$$27 = !(zephir_array_isset(&defaultValues, &field)); if (!(_13$$27)) { - zephir_array_fetch(&_14$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 3978 TSRMLS_CC); + zephir_array_fetch(&_14$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 3976 TSRMLS_CC); _13$$27 = !ZEPHIR_IS_IDENTICAL(&value, &_14$$27); } _12$$27 = _13$$27; @@ -6108,7 +6099,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _preSaveRelatedRecords) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "getmodelsmanager", NULL, 0); zephir_check_call_status(); ZEPHIR_CPY_WRT(&manager, &_1); - zephir_is_iterable(related, 0, "phalcon/mvc/model.zep", 4189); + zephir_is_iterable(related, 0, "phalcon/mvc/model.zep", 4187); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(related), _3, _4, _2) { ZEPHIR_INIT_NVAR(&name); @@ -6134,7 +6125,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _preSaveRelatedRecords) { } ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_9, 0, &_8$$6); zephir_check_call_status(); - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects can be stored as part of belongs-to relations", "phalcon/mvc/model.zep", 4136); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects can be stored as part of belongs-to relations", "phalcon/mvc/model.zep", 4134); return; } ZEPHIR_CALL_METHOD(&columns, &relation, "getfields", &_10, 0); @@ -6151,7 +6142,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _preSaveRelatedRecords) { } ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_14, 0, &_13$$7); zephir_check_call_status(); - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/mvc/model.zep", 4145); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/mvc/model.zep", 4143); return; } ZEPHIR_CALL_METHOD(&_15$$5, &record, "save", NULL, 0); @@ -6159,7 +6150,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _preSaveRelatedRecords) { if (!(zephir_is_true(&_15$$5))) { ZEPHIR_CALL_METHOD(&_16$$8, &record, "getmessages", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&_16$$8, 0, "phalcon/mvc/model.zep", 4176); + zephir_is_iterable(&_16$$8, 0, "phalcon/mvc/model.zep", 4174); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_16$$8), _17$$8) { ZEPHIR_INIT_NVAR(&message); @@ -6301,7 +6292,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmodelsmanager", NULL, 0); zephir_check_call_status(); ZEPHIR_CPY_WRT(&manager, &_0); - zephir_is_iterable(related, 0, "phalcon/mvc/model.zep", 4398); + zephir_is_iterable(related, 0, "phalcon/mvc/model.zep", 4396); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(related), _2, _3, _1) { ZEPHIR_INIT_NVAR(&name); @@ -6333,7 +6324,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { } ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_10, 0, &_9$$6); zephir_check_call_status(); - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects/arrays can be stored as part of has-many/has-one/has-many-to-many relations", "phalcon/mvc/model.zep", 4242); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects/arrays can be stored as part of has-many/has-one/has-many-to-many relations", "phalcon/mvc/model.zep", 4240); return; } ZEPHIR_CALL_METHOD(&columns, &relation, "getfields", &_11, 0); @@ -6350,7 +6341,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { } ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_15, 0, &_14$$7); zephir_check_call_status(); - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/mvc/model.zep", 4251); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/mvc/model.zep", 4249); return; } if (Z_TYPE_P(&record) == IS_OBJECT) { @@ -6375,7 +6366,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { ZEPHIR_CONCAT_SVS(&_19$$10, "The column '", &columns, "' needs to be present in the model"); ZEPHIR_CALL_METHOD(NULL, &_18$$10, "__construct", &_20, 4, &_19$$10); zephir_check_call_status(); - zephir_throw_exception_debug(&_18$$10, "phalcon/mvc/model.zep", 4265 TSRMLS_CC); + zephir_throw_exception_debug(&_18$$10, "phalcon/mvc/model.zep", 4263 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -6390,7 +6381,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { ZEPHIR_CALL_METHOD(&intermediateReferencedFields, &relation, "getintermediatereferencedfields", &_25, 0); zephir_check_call_status(); } - zephir_is_iterable(&relatedRecords, 0, "phalcon/mvc/model.zep", 4384); + zephir_is_iterable(&relatedRecords, 0, "phalcon/mvc/model.zep", 4382); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relatedRecords), _26$$4) { ZEPHIR_INIT_NVAR(&recordAfter); @@ -6404,7 +6395,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { if (!(zephir_is_true(&_27$$12))) { ZEPHIR_CALL_METHOD(&_28$$14, &recordAfter, "getmessages", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&_28$$14, 0, "phalcon/mvc/model.zep", 4324); + zephir_is_iterable(&_28$$14, 0, "phalcon/mvc/model.zep", 4322); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_28$$14), _29$$14) { ZEPHIR_INIT_NVAR(&message); @@ -6443,7 +6434,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { if (!(zephir_is_true(&_35$$17))) { ZEPHIR_CALL_METHOD(&_36$$18, &intermediateModel, "getmessages", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&_36$$18, 0, "phalcon/mvc/model.zep", 4378); + zephir_is_iterable(&_36$$18, 0, "phalcon/mvc/model.zep", 4376); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_36$$18), _37$$18) { ZEPHIR_INIT_NVAR(&message); @@ -6486,7 +6477,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { ZEPHIR_CONCAT_SVSVS(&_44$$22, "There are no defined relations for the model '", &className, "' using alias '", &name, "'"); ZEPHIR_CALL_METHOD(NULL, &_43$$22, "__construct", &_20, 4, &_44$$22); zephir_check_call_status(); - zephir_throw_exception_debug(&_43$$22, "phalcon/mvc/model.zep", 4390 TSRMLS_CC); + zephir_throw_exception_debug(&_43$$22, "phalcon/mvc/model.zep", 4388 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -6545,7 +6536,7 @@ PHP_METHOD(Phalcon_Mvc_Model, allowEmptyStringValues) { ZEPHIR_INIT_VAR(&keysAttributes); array_init(&keysAttributes); - zephir_is_iterable(&attributes, 0, "phalcon/mvc/model.zep", 4430); + zephir_is_iterable(&attributes, 0, "phalcon/mvc/model.zep", 4428); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _0) { ZEPHIR_INIT_NVAR(&attribute); @@ -7119,7 +7110,7 @@ PHP_METHOD(Phalcon_Mvc_Model, skipAttributesOnCreate) { ZEPHIR_INIT_VAR(&keysAttributes); array_init(&keysAttributes); - zephir_is_iterable(&attributes, 0, "phalcon/mvc/model.zep", 4701); + zephir_is_iterable(&attributes, 0, "phalcon/mvc/model.zep", 4699); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _0) { ZEPHIR_INIT_NVAR(&attribute); @@ -7175,7 +7166,7 @@ PHP_METHOD(Phalcon_Mvc_Model, skipAttributesOnUpdate) { ZEPHIR_INIT_VAR(&keysAttributes); array_init(&keysAttributes); - zephir_is_iterable(&attributes, 0, "phalcon/mvc/model.zep", 4732); + zephir_is_iterable(&attributes, 0, "phalcon/mvc/model.zep", 4730); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _0) { ZEPHIR_INIT_NVAR(&attribute); @@ -7387,7 +7378,7 @@ PHP_METHOD(Phalcon_Mvc_Model, caseInsensitiveColumnMap) { ZEPHIR_INIT_VAR(&_0); zephir_array_keys(&_0, columnMap TSRMLS_CC); - zephir_is_iterable(&_0, 0, "phalcon/mvc/model.zep", 4863); + zephir_is_iterable(&_0, 0, "phalcon/mvc/model.zep", 4861); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _1) { ZEPHIR_INIT_NVAR(&cmKey); diff --git a/ext/phalcon/url.zep.c b/ext/phalcon/mvc/url.zep.c similarity index 87% rename from ext/phalcon/url.zep.c rename to ext/phalcon/mvc/url.zep.c index a7af4cf62f2..5637756b36f 100644 --- a/ext/phalcon/url.zep.c +++ b/ext/phalcon/mvc/url.zep.c @@ -1,11 +1,11 @@ #ifdef HAVE_CONFIG_H -#include "../ext_config.h" +#include "../../ext_config.h" #endif #include -#include "../php_ext.h" -#include "../ext.h" +#include "../../php_ext.h" +#include "../../ext.h" #include #include @@ -33,7 +33,7 @@ * file that was distributed with this source code. */ /** - * Phalcon\Url + * Phalcon\Mvc\Url * * This components helps in the generation of: URIs, URLs and Paths * @@ -51,34 +51,34 @@ * ); * */ -ZEPHIR_INIT_CLASS(Phalcon_Url) { +ZEPHIR_INIT_CLASS(Phalcon_Mvc_Url) { - ZEPHIR_REGISTER_CLASS(Phalcon, Url, phalcon, url, phalcon_url_method_entry, 0); + ZEPHIR_REGISTER_CLASS(Phalcon\\Mvc, Url, phalcon, mvc_url, phalcon_mvc_url_method_entry, 0); /** * @var null | string */ - zend_declare_property_null(phalcon_url_ce, SL("baseUri"), ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_null(phalcon_mvc_url_ce, SL("baseUri"), ZEND_ACC_PROTECTED TSRMLS_CC); /** * @var null | string */ - zend_declare_property_null(phalcon_url_ce, SL("basePath"), ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_null(phalcon_mvc_url_ce, SL("basePath"), ZEND_ACC_PROTECTED TSRMLS_CC); /** * @var */ - zend_declare_property_null(phalcon_url_ce, SL("container"), ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_null(phalcon_mvc_url_ce, SL("container"), ZEND_ACC_PROTECTED TSRMLS_CC); - zend_declare_property_null(phalcon_url_ce, SL("router"), ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_null(phalcon_mvc_url_ce, SL("router"), ZEND_ACC_PROTECTED TSRMLS_CC); /** * @var null | string */ - zend_declare_property_null(phalcon_url_ce, SL("staticBaseUri"), ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_null(phalcon_mvc_url_ce, SL("staticBaseUri"), ZEND_ACC_PROTECTED TSRMLS_CC); - zend_class_implements(phalcon_url_ce TSRMLS_CC, 1, phalcon_urlinterface_ce); - zend_class_implements(phalcon_url_ce TSRMLS_CC, 1, phalcon_di_injectionawareinterface_ce); + zend_class_implements(phalcon_mvc_url_ce TSRMLS_CC, 1, phalcon_mvc_urlinterface_ce); + zend_class_implements(phalcon_mvc_url_ce TSRMLS_CC, 1, phalcon_di_injectionawareinterface_ce); return SUCCESS; } @@ -116,7 +116,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Url) { * ); * */ -PHP_METHOD(Phalcon_Url, get) { +PHP_METHOD(Phalcon_Mvc_Url, get) { unsigned char _20$$14, _22$$14, _27$$16; zval strUri, _15$$14; @@ -187,9 +187,9 @@ PHP_METHOD(Phalcon_Url, get) { if (local == 0) { _0$$3 = Z_TYPE_P(uri) == IS_STRING; if (_0$$3) { - _1$$3 = zephir_memnstr_str(uri, SL("//"), "phalcon/url.zep", 103); + _1$$3 = zephir_memnstr_str(uri, SL("//"), "phalcon/mvc/url.zep", 103); if (!(_1$$3)) { - _1$$3 = zephir_memnstr_str(uri, SL(":"), "phalcon/url.zep", 103); + _1$$3 = zephir_memnstr_str(uri, SL(":"), "phalcon/mvc/url.zep", 103); } _0$$3 = _1$$3; } @@ -217,7 +217,7 @@ PHP_METHOD(Phalcon_Url, get) { if (Z_TYPE_P(uri) == IS_ARRAY) { ZEPHIR_OBS_VAR(&routeName); if (!(zephir_array_isset_string_fetch(&routeName, uri, SL("for"), 0))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_url_exception_ce, "It's necessary to define the route name with the parameter 'for'", "phalcon/url.zep", 121); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_url_exception_ce, "It's necessary to define the route name with the parameter 'for'", "phalcon/mvc/url.zep", 121); return; } zephir_read_property(&_6$$9, this_ptr, SL("router"), PH_NOISY_CC | PH_READONLY); @@ -226,7 +226,7 @@ PHP_METHOD(Phalcon_Url, get) { zephir_read_property(&_7$$11, this_ptr, SL("container"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&dependencyInjector, &_7$$11); if (Z_TYPE_P(&dependencyInjector) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_url_exception_ce, "A dependency injector container is required to obtain the 'router' service", "phalcon/url.zep", 133); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_url_exception_ce, "A dependency injector container is required to obtain the 'router' service", "phalcon/mvc/url.zep", 133); return; } ZEPHIR_INIT_VAR(&_9$$11); @@ -241,12 +241,12 @@ PHP_METHOD(Phalcon_Url, get) { ZEPHIR_CPY_WRT(&route, &_10$$9); if (Z_TYPE_P(&route) != IS_OBJECT) { ZEPHIR_INIT_VAR(&_11$$13); - object_init_ex(&_11$$13, phalcon_url_exception_ce); + object_init_ex(&_11$$13, phalcon_mvc_url_exception_ce); ZEPHIR_INIT_VAR(&_12$$13); ZEPHIR_CONCAT_SVS(&_12$$13, "Cannot obtain a route using the name '", &routeName, "'"); ZEPHIR_CALL_METHOD(NULL, &_11$$13, "__construct", NULL, 4, &_12$$13); zephir_check_call_status(); - zephir_throw_exception_debug(&_11$$13, "phalcon/url.zep", 145 TSRMLS_CC); + zephir_throw_exception_debug(&_11$$13, "phalcon/mvc/url.zep", 145 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -303,7 +303,7 @@ PHP_METHOD(Phalcon_Url, get) { } } if (zephir_is_true(args)) { - ZEPHIR_CALL_FUNCTION(&queryString, "http_build_query", NULL, 456, args); + ZEPHIR_CALL_FUNCTION(&queryString, "http_build_query", NULL, 378, args); zephir_check_call_status(); _28$$19 = Z_TYPE_P(&queryString) == IS_STRING; if (_28$$19) { @@ -333,7 +333,7 @@ PHP_METHOD(Phalcon_Url, get) { /** * Returns the base path */ -PHP_METHOD(Phalcon_Url, getBasePath) { +PHP_METHOD(Phalcon_Mvc_Url, getBasePath) { zval *this_ptr = getThis(); @@ -345,7 +345,7 @@ PHP_METHOD(Phalcon_Url, getBasePath) { /** * Returns the prefix for all the generated urls. By default / */ -PHP_METHOD(Phalcon_Url, getBaseUri) { +PHP_METHOD(Phalcon_Mvc_Url, getBaseUri) { zval *_SERVER, baseUri, phpSelf, uri, _0; zval *this_ptr = getThis(); @@ -384,7 +384,7 @@ PHP_METHOD(Phalcon_Url, getBaseUri) { /** * Returns the DependencyInjector container */ -PHP_METHOD(Phalcon_Url, getDI) { +PHP_METHOD(Phalcon_Mvc_Url, getDI) { zval *this_ptr = getThis(); @@ -408,7 +408,7 @@ PHP_METHOD(Phalcon_Url, getDI) { * ); * */ -PHP_METHOD(Phalcon_Url, getStatic) { +PHP_METHOD(Phalcon_Mvc_Url, getStatic) { zend_long ZEPHIR_LAST_CALL_STATUS; zval *uri = NULL, uri_sub, __$null, _0, _1, _2; @@ -442,7 +442,7 @@ PHP_METHOD(Phalcon_Url, getStatic) { /** * Returns the prefix for all the generated static urls. By default / */ -PHP_METHOD(Phalcon_Url, getStaticBaseUri) { +PHP_METHOD(Phalcon_Mvc_Url, getStaticBaseUri) { zval staticBaseUri, _0; zend_long ZEPHIR_LAST_CALL_STATUS; @@ -471,7 +471,7 @@ PHP_METHOD(Phalcon_Url, getStaticBaseUri) { * $url->setBasePath("/var/www/htdocs/"); * */ -PHP_METHOD(Phalcon_Url, setBasePath) { +PHP_METHOD(Phalcon_Mvc_Url, setBasePath) { zval *basePath_param = NULL; zval basePath; @@ -508,7 +508,7 @@ PHP_METHOD(Phalcon_Url, setBasePath) { * $url->setBaseUri("/invo/index.php/"); * */ -PHP_METHOD(Phalcon_Url, setBaseUri) { +PHP_METHOD(Phalcon_Mvc_Url, setBaseUri) { zval *baseUri_param = NULL, _0; zval baseUri; @@ -544,7 +544,7 @@ PHP_METHOD(Phalcon_Url, setBaseUri) { /** * Sets the DependencyInjector container */ -PHP_METHOD(Phalcon_Url, setDI) { +PHP_METHOD(Phalcon_Mvc_Url, setDI) { zval *dependencyInjector, dependencyInjector_sub; zval *this_ptr = getThis(); @@ -566,7 +566,7 @@ PHP_METHOD(Phalcon_Url, setDI) { * $url->setStaticBaseUri("/invo/"); * */ -PHP_METHOD(Phalcon_Url, setStaticBaseUri) { +PHP_METHOD(Phalcon_Mvc_Url, setStaticBaseUri) { zval *staticBaseUri_param = NULL; zval staticBaseUri; @@ -597,7 +597,7 @@ PHP_METHOD(Phalcon_Url, setStaticBaseUri) { /** * Generates a local path */ -PHP_METHOD(Phalcon_Url, path) { +PHP_METHOD(Phalcon_Mvc_Url, path) { zval *path_param = NULL, _0; zval path; diff --git a/ext/phalcon/mvc/url.zep.h b/ext/phalcon/mvc/url.zep.h new file mode 100644 index 00000000000..b029d839298 --- /dev/null +++ b/ext/phalcon/mvc/url.zep.h @@ -0,0 +1,134 @@ + +extern zend_class_entry *phalcon_mvc_url_ce; + +ZEPHIR_INIT_CLASS(Phalcon_Mvc_Url); + +PHP_METHOD(Phalcon_Mvc_Url, get); +PHP_METHOD(Phalcon_Mvc_Url, getBasePath); +PHP_METHOD(Phalcon_Mvc_Url, getBaseUri); +PHP_METHOD(Phalcon_Mvc_Url, getDI); +PHP_METHOD(Phalcon_Mvc_Url, getStatic); +PHP_METHOD(Phalcon_Mvc_Url, getStaticBaseUri); +PHP_METHOD(Phalcon_Mvc_Url, setBasePath); +PHP_METHOD(Phalcon_Mvc_Url, setBaseUri); +PHP_METHOD(Phalcon_Mvc_Url, setDI); +PHP_METHOD(Phalcon_Mvc_Url, setStaticBaseUri); +PHP_METHOD(Phalcon_Mvc_Url, path); + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_url_get, 0, 0, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_url_get, 0, 0, IS_STRING, NULL, 0) +#endif + ZEND_ARG_INFO(0, uri) + ZEND_ARG_INFO(0, args) +#if PHP_VERSION_ID >= 70200 + ZEND_ARG_TYPE_INFO(0, local, _IS_BOOL, 1) +#else + ZEND_ARG_INFO(0, local) +#endif + ZEND_ARG_INFO(0, baseUri) +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_url_getbasepath, 0, 0, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_url_getbasepath, 0, 0, IS_STRING, NULL, 0) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_url_getbaseuri, 0, 0, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_url_getbaseuri, 0, 0, IS_STRING, NULL, 0) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_url_getdi, 0, 0, Phalcon\\DiInterface, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_url_getdi, 0, 0, IS_OBJECT, "Phalcon\\DiInterface", 0) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_url_getstatic, 0, 0, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_url_getstatic, 0, 0, IS_STRING, NULL, 0) +#endif + ZEND_ARG_INFO(0, uri) +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_url_getstaticbaseuri, 0, 0, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_url_getstaticbaseuri, 0, 0, IS_STRING, NULL, 0) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_url_setbasepath, 0, 1, Phalcon\\Mvc\\UrlInterface, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_url_setbasepath, 0, 1, IS_OBJECT, "Phalcon\\Mvc\\UrlInterface", 0) +#endif +#if PHP_VERSION_ID >= 70200 + ZEND_ARG_TYPE_INFO(0, basePath, IS_STRING, 0) +#else + ZEND_ARG_INFO(0, basePath) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_url_setbaseuri, 0, 1, Phalcon\\Mvc\\UrlInterface, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_url_setbaseuri, 0, 1, IS_OBJECT, "Phalcon\\Mvc\\UrlInterface", 0) +#endif +#if PHP_VERSION_ID >= 70200 + ZEND_ARG_TYPE_INFO(0, baseUri, IS_STRING, 0) +#else + ZEND_ARG_INFO(0, baseUri) +#endif +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_url_setdi, 0, 0, 1) + ZEND_ARG_OBJ_INFO(0, dependencyInjector, Phalcon\\DiInterface, 0) +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_url_setstaticbaseuri, 0, 1, Phalcon\\Mvc\\UrlInterface, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_url_setstaticbaseuri, 0, 1, IS_OBJECT, "Phalcon\\Mvc\\UrlInterface", 0) +#endif +#if PHP_VERSION_ID >= 70200 + ZEND_ARG_TYPE_INFO(0, staticBaseUri, IS_STRING, 0) +#else + ZEND_ARG_INFO(0, staticBaseUri) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_url_path, 0, 0, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_url_path, 0, 0, IS_STRING, NULL, 0) +#endif +#if PHP_VERSION_ID >= 70200 + ZEND_ARG_TYPE_INFO(0, path, IS_STRING, 1) +#else + ZEND_ARG_INFO(0, path) +#endif +ZEND_END_ARG_INFO() + +ZEPHIR_INIT_FUNCS(phalcon_mvc_url_method_entry) { + PHP_ME(Phalcon_Mvc_Url, get, arginfo_phalcon_mvc_url_get, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Mvc_Url, getBasePath, arginfo_phalcon_mvc_url_getbasepath, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Mvc_Url, getBaseUri, arginfo_phalcon_mvc_url_getbaseuri, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Mvc_Url, getDI, arginfo_phalcon_mvc_url_getdi, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Mvc_Url, getStatic, arginfo_phalcon_mvc_url_getstatic, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Mvc_Url, getStaticBaseUri, arginfo_phalcon_mvc_url_getstaticbaseuri, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Mvc_Url, setBasePath, arginfo_phalcon_mvc_url_setbasepath, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Mvc_Url, setBaseUri, arginfo_phalcon_mvc_url_setbaseuri, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Mvc_Url, setDI, arginfo_phalcon_mvc_url_setdi, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Mvc_Url, setStaticBaseUri, arginfo_phalcon_mvc_url_setstaticbaseuri, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Mvc_Url, path, arginfo_phalcon_mvc_url_path, ZEND_ACC_PUBLIC) + PHP_FE_END +}; diff --git a/ext/phalcon/url/exception.zep.c b/ext/phalcon/mvc/url/exception.zep.c similarity index 56% rename from ext/phalcon/url/exception.zep.c rename to ext/phalcon/mvc/url/exception.zep.c index 68ab3c74860..c0648695464 100644 --- a/ext/phalcon/url/exception.zep.c +++ b/ext/phalcon/mvc/url/exception.zep.c @@ -1,11 +1,11 @@ #ifdef HAVE_CONFIG_H -#include "../../ext_config.h" +#include "../../../ext_config.h" #endif #include -#include "../../php_ext.h" -#include "../../ext.h" +#include "../../../php_ext.h" +#include "../../../ext.h" #include #include @@ -23,13 +23,13 @@ * file that was distributed with this source code. */ /** - * Phalcon\Url\Exception + * Phalcon\Mvc\Url\Exception * - * Exceptions thrown in Phalcon\Url will use this class + * Exceptions thrown in Phalcon\Mvc\Url will use this class */ -ZEPHIR_INIT_CLASS(Phalcon_Url_Exception) { +ZEPHIR_INIT_CLASS(Phalcon_Mvc_Url_Exception) { - ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Url, Exception, phalcon, url_exception, phalcon_exception_ce, NULL, 0); + ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Mvc\\Url, Exception, phalcon, mvc_url_exception, phalcon_exception_ce, NULL, 0); return SUCCESS; diff --git a/ext/phalcon/mvc/url/exception.zep.h b/ext/phalcon/mvc/url/exception.zep.h new file mode 100644 index 00000000000..127c0e8eb07 --- /dev/null +++ b/ext/phalcon/mvc/url/exception.zep.h @@ -0,0 +1,5 @@ + +extern zend_class_entry *phalcon_mvc_url_exception_ce; + +ZEPHIR_INIT_CLASS(Phalcon_Mvc_Url_Exception); + diff --git a/ext/phalcon/mvc/url/utils.c b/ext/phalcon/mvc/url/utils.c new file mode 100644 index 00000000000..7fddf120f7a --- /dev/null +++ b/ext/phalcon/mvc/url/utils.c @@ -0,0 +1,369 @@ + +/* + +------------------------------------------------------------------------+ + | Phalcon Framework | + +------------------------------------------------------------------------+ + | Copyright (c) 2011-2016 Phalcon Team (https://phalconphp.com) | + +------------------------------------------------------------------------+ + | This source file is subject to the New BSD License that is bundled | + | with this package in the file docs/LICENSE.txt. | + | | + | If you did not receive a copy of the license and are unable to | + | obtain it through the world-wide-web, please send an email | + | to license@phalconphp.com so we can send you a copy immediately. | + +------------------------------------------------------------------------+ + | Authors: Andres Gutierrez | + | Eduar Carvajal | + +------------------------------------------------------------------------+ +*/ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "php.h" +#include "php_phalcon.h" +#include "phalcon.h" + +#include "kernel/main.h" +#include "kernel/memory.h" +#include "kernel/fcall.h" +#include "kernel/exception.h" + +#if PHP_VERSION_ID < 70000 +#include +#else +#include +#include +#endif + +#include + +void phalcon_get_uri(zval *return_value, zval *path) +{ + int i, found = 0, mark = 0; + char *cursor, *str, ch; + + if (Z_TYPE_P(path) != IS_STRING) { + RETURN_EMPTY_STRING(); + } + + if (Z_STRLEN_P(path) > 0) { + cursor = Z_STRVAL_P(path) + Z_STRLEN_P(path) - 1; + for (i = Z_STRLEN_P(path); i > 0; i--) { + ch = *cursor; + if (ch == '/' || ch == '\\') { + found++; + if (found == 1) { + mark = i - 1; + } else { + str = emalloc(mark - i + 1); + memcpy(str, Z_STRVAL_P(path) + i, mark - i); + str[mark - i] = '\0'; +#if PHP_VERSION_ID < 70000 + ZVAL_STRINGL(return_value, str, mark - i, 0); +#else + ZVAL_STRINGL(return_value, str, mark - i); +#endif + return; + } + } + cursor--; + } + } + + RETURN_EMPTY_STRING(); +} + +zval *phalcon_replace_marker(int named, zval *paths, zval *replacements, unsigned long *position, char *cursor, char *marker) +{ + unsigned int length = 0, variable_length, ch, j; + char *item = NULL, *cursor_var, *variable = NULL; + int not_valid = 0; +#if PHP_VERSION_ID < 70000 + int result = FAILURE; + zval **zv, **tmp; +#else + zval *zv, *tmp; +#endif + + if (named) { + length = cursor - marker - 1; + item = estrndup(marker + 1, length); + cursor_var = item; + marker = item; + for (j = 0; j < length; j++) { + ch = *cursor_var; + if (ch == '\0') { + not_valid = 1; + break; + } + if (j == 0 && !((ch >= 'a' && ch <='z') || (ch >= 'A' && ch <= 'Z'))){ + not_valid = 1; + break; + } + if ((ch >= 'a' && ch <='z') || (ch >= 'A' && ch <= 'Z') || (ch >= '0' && ch <= '9') || ch == '-' || ch == '_' || ch == ':') { + if (ch == ':') { + variable_length = cursor_var - marker; + variable = estrndup(marker, variable_length); + break; + } + } else { + not_valid = 1; + break; + } + cursor_var++; + } + } + + if (!not_valid) { + + if (zend_hash_index_exists(Z_ARRVAL_P(paths), *position)) { + if (named) { + if (variable) { + efree(item); + item = variable; + length = variable_length; + } +#if PHP_VERSION_ID < 70000 + if (zend_hash_exists(Z_ARRVAL_P(replacements), item, length + 1)) { + if ((result = zend_hash_find(Z_ARRVAL_P(replacements), item, length + 1, (void**) &zv)) == SUCCESS) { + efree(item); + (*position)++; + return *zv; + } + } +#else + if (zend_hash_str_exists(Z_ARRVAL_P(replacements), item, length)) { + if ((zv = zend_hash_str_find(Z_ARRVAL_P(replacements), item, length)) != NULL) { + efree(item); + (*position)++; + return zv; + } + } +#endif + } else { +#if PHP_VERSION_ID < 70000 + if ((result = zend_hash_index_find(Z_ARRVAL_P(paths), *position, (void**) &zv)) == SUCCESS) { + if (Z_TYPE_PP(zv) == IS_STRING) { + if (zend_hash_exists(Z_ARRVAL_P(replacements), Z_STRVAL_PP(zv), Z_STRLEN_PP(zv) + 1)) { + if ((result = zend_hash_find(Z_ARRVAL_P(replacements), Z_STRVAL_PP(zv), Z_STRLEN_PP(zv) + 1, (void**) &tmp)) == SUCCESS) { + (*position)++; + return *tmp; + } + } + } + } +#else + if ((zv = zend_hash_index_find(Z_ARRVAL_P(paths), *position)) != NULL) { + if (Z_TYPE_P(zv) == IS_STRING) { + if (zend_hash_str_exists(Z_ARRVAL_P(replacements), Z_STRVAL_P(zv), Z_STRLEN_P(zv))) { + if ((tmp = zend_hash_str_find(Z_ARRVAL_P(replacements), Z_STRVAL_P(zv), Z_STRLEN_P(zv))) != NULL) { + (*position)++; + return tmp; + } + } + } + } +#endif + } + } + + (*position)++; + } + + if (item) { + efree(item); + } + + return NULL; +} + +/** + * Replaces placeholders and named variables with their corresponding values in an array + */ +void phalcon_replace_paths(zval *return_value, zval *pattern, zval *paths, zval *replacements TSRMLS_DC) +{ + + char *cursor, *marker = NULL; + unsigned int bracket_count = 0, parentheses_count = 0, intermediate = 0; + unsigned char ch; + smart_str route_str = {0}; + ulong position = 1; + int i; + zval *replace, replace_copy; + int use_copy, looking_placeholder = 0; + + if (Z_TYPE_P(pattern) != IS_STRING || Z_TYPE_P(replacements) != IS_ARRAY || Z_TYPE_P(paths) != IS_ARRAY) { + ZVAL_NULL(return_value); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid arguments supplied for phalcon_replace_paths()"); + return; + } + + if (Z_STRLEN_P(pattern) <= 0) { + ZVAL_FALSE(return_value); + return; + } + + cursor = Z_STRVAL_P(pattern); + if (*cursor == '/') { + ++cursor; + i = 1; + } + else { + i = 0; + } + + if (!zend_hash_num_elements(Z_ARRVAL_P(paths))) { +#if PHP_VERSION_ID < 70000 + ZVAL_STRINGL(return_value, Z_STRVAL_P(pattern) + i, Z_STRLEN_P(pattern) - i, 1); +#else + ZVAL_STRINGL(return_value, Z_STRVAL_P(pattern) + i, Z_STRLEN_P(pattern) - i); +#endif + return; + } + + for (; i < Z_STRLEN_P(pattern); ++i) { + + ch = *cursor; + if (ch == '\0') { + break; + } + + if (parentheses_count == 0 && !looking_placeholder) { + if (ch == '{') { + if (bracket_count == 0) { + marker = cursor; + intermediate = 0; + } + bracket_count++; + } else { + if (ch == '}') { + bracket_count--; + if (intermediate > 0) { + if (bracket_count == 0) { + replace = phalcon_replace_marker(1, paths, replacements, &position, cursor, marker); + if (replace) { + use_copy = 0; + if (Z_TYPE_P(replace) != IS_STRING) { +#if PHP_VERSION_ID < 70000 + zend_make_printable_zval(replace, &replace_copy, &use_copy); +#else + use_copy = zend_make_printable_zval(replace, &replace_copy); +#endif + if (use_copy) { + replace = &replace_copy; + } + } + smart_str_appendl(&route_str, Z_STRVAL_P(replace), Z_STRLEN_P(replace)); + if (use_copy) { + zval_dtor(&replace_copy); + } + } + cursor++; + continue; + } + } + } + } + } + + if (bracket_count == 0 && !looking_placeholder) { + if (ch == '(') { + if (parentheses_count == 0) { + marker = cursor; + intermediate = 0; + } + parentheses_count++; + } else { + if (ch == ')') { + parentheses_count--; + if (intermediate > 0) { + if (parentheses_count == 0) { + replace = phalcon_replace_marker(0, paths, replacements, &position, cursor, marker); + if (replace) { + use_copy = 0; + if (Z_TYPE_P(replace) != IS_STRING) { +#if PHP_VERSION_ID < 70000 + zend_make_printable_zval(replace, &replace_copy, &use_copy); +#else + use_copy = zend_make_printable_zval(replace, &replace_copy); +#endif + if (use_copy) { + replace = &replace_copy; + } + } + smart_str_appendl(&route_str, Z_STRVAL_P(replace), Z_STRLEN_P(replace)); + if (use_copy) { + zval_dtor(&replace_copy); + } + } + cursor++; + continue; + } + } + } + } + } + + if (bracket_count == 0 && parentheses_count == 0) { + if (looking_placeholder) { + if (intermediate > 0) { + if (ch < 'a' || ch > 'z' || i == (Z_STRLEN_P(pattern) - 1)) { + replace = phalcon_replace_marker(0, paths, replacements, &position, cursor, marker); + if (replace) { + use_copy = 0; + if (Z_TYPE_P(replace) != IS_STRING) { +#if PHP_VERSION_ID < 70000 + zend_make_printable_zval(replace, &replace_copy, &use_copy); +#else + use_copy = zend_make_printable_zval(replace, &replace_copy); +#endif + if (use_copy) { + replace = &replace_copy; + } + } + smart_str_appendl(&route_str, Z_STRVAL_P(replace), Z_STRLEN_P(replace)); + if (use_copy) { + zval_dtor(&replace_copy); + } + } + looking_placeholder = 0; + continue; + } + } + } else { + if (ch == ':') { + looking_placeholder = 1; + marker = cursor; + intermediate = 0; + } + } + } + + if (bracket_count > 0 || parentheses_count > 0 || looking_placeholder) { + intermediate++; + } else { + smart_str_appendc(&route_str, ch); + } + + cursor++; + } + smart_str_0(&route_str); + +#if PHP_VERSION_ID < 70000 + if (route_str.len) { + RETURN_STRINGL(route_str.c, route_str.len, 0); + } else { + smart_str_free(&route_str); + RETURN_EMPTY_STRING(); + } +#else + if (route_str.s) { + RETURN_STR(route_str.s); + } else { + smart_str_free(&route_str); + RETURN_EMPTY_STRING(); + } +#endif +} diff --git a/ext/phalcon/mvc/url/utils.h b/ext/phalcon/mvc/url/utils.h new file mode 100644 index 00000000000..210ce6c23c2 --- /dev/null +++ b/ext/phalcon/mvc/url/utils.h @@ -0,0 +1,30 @@ + +/* + +------------------------------------------------------------------------+ + | Phalcon Framework | + +------------------------------------------------------------------------+ + | Copyright (c) 2011-2014 Phalcon Team (http://www.phalconphp.com) | + +------------------------------------------------------------------------+ + | This source file is subject to the New BSD License that is bundled | + | with this package in the file docs/LICENSE.txt. | + | | + | If you did not receive a copy of the license and are unable to | + | obtain it through the world-wide-web, please send an email | + | to license@phalconphp.com so we can send you a copy immediately. | + +------------------------------------------------------------------------+ + | Authors: Andres Gutierrez | + | Eduar Carvajal | + +------------------------------------------------------------------------+ +*/ + +#ifndef PHALCON_MVC_URL_UTILS_H +#define PHALCON_MVC_URL_UTILS_H + +#include + +/* Extract named parameters */ +void phalcon_get_uri(zval *return_value, zval *path); +void phalcon_extract_named_params(zval *return_value, zval *str, zval *matches); +void phalcon_replace_paths(zval *return_value, zval *pattern, zval *paths, zval *uri TSRMLS_DC); + +#endif /* PHALCON_MVC_URL_UTILS_H */ diff --git a/ext/phalcon/urlinterface.zep.c b/ext/phalcon/mvc/urlinterface.zep.c similarity index 54% rename from ext/phalcon/urlinterface.zep.c rename to ext/phalcon/mvc/urlinterface.zep.c index 7d108e68049..2a66fdf35b6 100644 --- a/ext/phalcon/urlinterface.zep.c +++ b/ext/phalcon/mvc/urlinterface.zep.c @@ -1,11 +1,11 @@ #ifdef HAVE_CONFIG_H -#include "../ext_config.h" +#include "../../ext_config.h" #endif #include -#include "../php_ext.h" -#include "../ext.h" +#include "../../php_ext.h" +#include "../../ext.h" #include @@ -21,13 +21,13 @@ * file that was distributed with this source code. */ /** - * Phalcon\UrlInterface + * Phalcon\Mvc\UrlInterface * - * Interface for Phalcon\UrlInterface + * Interface for Phalcon\Mvc\UrlInterface */ -ZEPHIR_INIT_CLASS(Phalcon_UrlInterface) { +ZEPHIR_INIT_CLASS(Phalcon_Mvc_UrlInterface) { - ZEPHIR_REGISTER_INTERFACE(Phalcon, UrlInterface, phalcon, urlinterface, phalcon_urlinterface_method_entry); + ZEPHIR_REGISTER_INTERFACE(Phalcon\\Mvc, UrlInterface, phalcon, mvc_urlinterface, phalcon_mvc_urlinterface_method_entry); return SUCCESS; @@ -39,30 +39,30 @@ ZEPHIR_INIT_CLASS(Phalcon_UrlInterface) { * @param string|array uri * @param array|object args Optional arguments to be appended to the query string */ -ZEPHIR_DOC_METHOD(Phalcon_UrlInterface, get); +ZEPHIR_DOC_METHOD(Phalcon_Mvc_UrlInterface, get); /** * Returns a base path */ -ZEPHIR_DOC_METHOD(Phalcon_UrlInterface, getBasePath); +ZEPHIR_DOC_METHOD(Phalcon_Mvc_UrlInterface, getBasePath); /** * Returns the prefix for all the generated urls. By default / */ -ZEPHIR_DOC_METHOD(Phalcon_UrlInterface, getBaseUri); +ZEPHIR_DOC_METHOD(Phalcon_Mvc_UrlInterface, getBaseUri); /** * Sets a base paths for all the generated paths */ -ZEPHIR_DOC_METHOD(Phalcon_UrlInterface, setBasePath); +ZEPHIR_DOC_METHOD(Phalcon_Mvc_UrlInterface, setBasePath); /** * Sets a prefix to all the urls generated */ -ZEPHIR_DOC_METHOD(Phalcon_UrlInterface, setBaseUri); +ZEPHIR_DOC_METHOD(Phalcon_Mvc_UrlInterface, setBaseUri); /** * Generates a local path */ -ZEPHIR_DOC_METHOD(Phalcon_UrlInterface, path); +ZEPHIR_DOC_METHOD(Phalcon_Mvc_UrlInterface, path); diff --git a/ext/phalcon/mvc/urlinterface.zep.h b/ext/phalcon/mvc/urlinterface.zep.h new file mode 100644 index 00000000000..d378d163fc1 --- /dev/null +++ b/ext/phalcon/mvc/urlinterface.zep.h @@ -0,0 +1,78 @@ + +extern zend_class_entry *phalcon_mvc_urlinterface_ce; + +ZEPHIR_INIT_CLASS(Phalcon_Mvc_UrlInterface); + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_urlinterface_get, 0, 0, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_urlinterface_get, 0, 0, IS_STRING, NULL, 0) +#endif + ZEND_ARG_INFO(0, uri) + ZEND_ARG_INFO(0, args) +#if PHP_VERSION_ID >= 70200 + ZEND_ARG_TYPE_INFO(0, local, _IS_BOOL, 1) +#else + ZEND_ARG_INFO(0, local) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_urlinterface_getbasepath, 0, 0, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_urlinterface_getbasepath, 0, 0, IS_STRING, NULL, 0) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_urlinterface_getbaseuri, 0, 0, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_urlinterface_getbaseuri, 0, 0, IS_STRING, NULL, 0) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_urlinterface_setbasepath, 0, 1, Phalcon\\Mvc\\UrlInterface, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_urlinterface_setbasepath, 0, 1, IS_OBJECT, "Phalcon\\Mvc\\UrlInterface", 0) +#endif +#if PHP_VERSION_ID >= 70200 + ZEND_ARG_TYPE_INFO(0, basePath, IS_STRING, 0) +#else + ZEND_ARG_INFO(0, basePath) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_urlinterface_setbaseuri, 0, 1, Phalcon\\Mvc\\UrlInterface, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_urlinterface_setbaseuri, 0, 1, IS_OBJECT, "Phalcon\\Mvc\\UrlInterface", 0) +#endif +#if PHP_VERSION_ID >= 70200 + ZEND_ARG_TYPE_INFO(0, baseUri, IS_STRING, 0) +#else + ZEND_ARG_INFO(0, baseUri) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_urlinterface_path, 0, 0, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_urlinterface_path, 0, 0, IS_STRING, NULL, 0) +#endif +#if PHP_VERSION_ID >= 70200 + ZEND_ARG_TYPE_INFO(0, path, IS_STRING, 1) +#else + ZEND_ARG_INFO(0, path) +#endif +ZEND_END_ARG_INFO() + +ZEPHIR_INIT_FUNCS(phalcon_mvc_urlinterface_method_entry) { + PHP_ABSTRACT_ME(Phalcon_Mvc_UrlInterface, get, arginfo_phalcon_mvc_urlinterface_get) + PHP_ABSTRACT_ME(Phalcon_Mvc_UrlInterface, getBasePath, arginfo_phalcon_mvc_urlinterface_getbasepath) + PHP_ABSTRACT_ME(Phalcon_Mvc_UrlInterface, getBaseUri, arginfo_phalcon_mvc_urlinterface_getbaseuri) + PHP_ABSTRACT_ME(Phalcon_Mvc_UrlInterface, setBasePath, arginfo_phalcon_mvc_urlinterface_setbasepath) + PHP_ABSTRACT_ME(Phalcon_Mvc_UrlInterface, setBaseUri, arginfo_phalcon_mvc_urlinterface_setbaseuri) + PHP_ABSTRACT_ME(Phalcon_Mvc_UrlInterface, path, arginfo_phalcon_mvc_urlinterface_path) + PHP_FE_END +}; diff --git a/ext/phalcon/mvc/view.zep.c b/ext/phalcon/mvc/view.zep.c index 765f343e971..eb42f1b22bc 100644 --- a/ext/phalcon/mvc/view.zep.c +++ b/ext/phalcon/mvc/view.zep.c @@ -953,7 +953,7 @@ PHP_METHOD(Phalcon_Mvc_View, _loadTemplateEngines) { if (ZEPHIR_IS_EMPTY(®isteredEngines)) { ZEPHIR_INIT_VAR(&_1$$4); object_init_ex(&_1$$4, phalcon_mvc_view_engine_php_ce); - ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 378, this_ptr, &dependencyInjector); + ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 379, this_ptr, &dependencyInjector); zephir_check_call_status(); zephir_array_update_string(&engines, SL(".phtml"), &_1$$4, PH_COPY | PH_SEPARATE); } else { @@ -1089,7 +1089,7 @@ PHP_METHOD(Phalcon_Mvc_View, _engineRender) { { ZEPHIR_INIT_NVAR(&viewsDir); ZVAL_COPY(&viewsDir, _2); - ZEPHIR_CALL_METHOD(&_3$$3, this_ptr, "_isabsolutepath", &_4, 379, &viewPath); + ZEPHIR_CALL_METHOD(&_3$$3, this_ptr, "_isabsolutepath", &_4, 380, &viewPath); zephir_check_call_status(); if (!(zephir_is_true(&_3$$3))) { ZEPHIR_INIT_NVAR(&viewsDirPath); diff --git a/ext/phalcon/mvc/view/engine/php.zep.c b/ext/phalcon/mvc/view/engine/php.zep.c index d77da60afbf..d36db57aee1 100644 --- a/ext/phalcon/mvc/view/engine/php.zep.c +++ b/ext/phalcon/mvc/view/engine/php.zep.c @@ -84,7 +84,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Php, render) { if (mustClean == 1) { - ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 380); + ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 381); zephir_check_call_status(); } if (Z_TYPE_P(params) == IS_ARRAY) { diff --git a/ext/phalcon/mvc/view/engine/volt.zep.c b/ext/phalcon/mvc/view/engine/volt.zep.c index 168476bdf56..0182ef2ab99 100644 --- a/ext/phalcon/mvc/view/engine/volt.zep.c +++ b/ext/phalcon/mvc/view/engine/volt.zep.c @@ -17,8 +17,8 @@ #include "kernel/exception.h" #include "kernel/memory.h" #include "kernel/fcall.h" -#include "kernel/operators.h" #include "kernel/require.h" +#include "kernel/operators.h" #include "kernel/string.h" #include "kernel/array.h" #include "kernel/concat.h" @@ -108,18 +108,18 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, getCompiler) { ZEPHIR_INIT_NVAR(&compiler); object_init_ex(&compiler, phalcon_mvc_view_engine_volt_compiler_ce); zephir_read_property(&_0$$3, this_ptr, SL("_view"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(NULL, &compiler, "__construct", NULL, 381, &_0$$3); + ZEPHIR_CALL_METHOD(NULL, &compiler, "__construct", NULL, 382, &_0$$3); zephir_check_call_status(); zephir_read_property(&_1$$3, this_ptr, SL("_dependencyInjector"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&dependencyInjector, &_1$$3); if (Z_TYPE_P(&dependencyInjector) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(NULL, &compiler, "setdi", NULL, 382, &dependencyInjector); + ZEPHIR_CALL_METHOD(NULL, &compiler, "setdi", NULL, 383, &dependencyInjector); zephir_check_call_status(); } ZEPHIR_OBS_VAR(&options); zephir_read_property(&options, this_ptr, SL("_options"), PH_NOISY_CC); if (Z_TYPE_P(&options) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(NULL, &compiler, "setoptions", NULL, 383, &options); + ZEPHIR_CALL_METHOD(NULL, &compiler, "setoptions", NULL, 384, &options); zephir_check_call_status(); } zephir_update_property_zval(this_ptr, SL("_compiler"), &compiler); @@ -133,11 +133,11 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, getCompiler) { */ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, render) { - zend_string *_6$$8; - zend_ulong _5$$8; + zend_string *_2$$4; + zend_ulong _1$$4; zend_long ZEPHIR_LAST_CALL_STATUS; zend_bool mustClean; - zval *templatePath_param = NULL, *params, params_sub, *mustClean_param = NULL, compiler, compiledTemplatePath, eventsManager, key, value, _0$$4, _1$$4, _2$$6, _3$$6, *_4$$8, _7$$9, _8$$10, _9$$10; + zval *templatePath_param = NULL, *params, params_sub, *mustClean_param = NULL, compiler, compiledTemplatePath, key, value, *_0$$4, _3$$5, _4$$6, _5$$6; zval templatePath; zval *this_ptr = getThis(); @@ -145,16 +145,11 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, render) { ZVAL_UNDEF(¶ms_sub); ZVAL_UNDEF(&compiler); ZVAL_UNDEF(&compiledTemplatePath); - ZVAL_UNDEF(&eventsManager); ZVAL_UNDEF(&key); ZVAL_UNDEF(&value); - ZVAL_UNDEF(&_0$$4); - ZVAL_UNDEF(&_1$$4); - ZVAL_UNDEF(&_2$$6); - ZVAL_UNDEF(&_3$$6); - ZVAL_UNDEF(&_7$$9); - ZVAL_UNDEF(&_8$$10); - ZVAL_UNDEF(&_9$$10); + ZVAL_UNDEF(&_3$$5); + ZVAL_UNDEF(&_4$$6); + ZVAL_UNDEF(&_5$$6); ZEPHIR_MM_GROW(); zephir_fetch_params(1, 2, 1, &templatePath_param, ¶ms, &mustClean_param); @@ -177,49 +172,29 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, render) { if (mustClean) { - ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 380); + ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 381); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(&compiler, this_ptr, "getcompiler", NULL, 0); zephir_check_call_status(); - ZEPHIR_OBS_VAR(&eventsManager); - zephir_read_property(&eventsManager, this_ptr, SL("_eventsManager"), PH_NOISY_CC); - if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_VAR(&_1$$4); - ZVAL_STRING(&_1$$4, "view:beforeCompile"); - ZEPHIR_CALL_METHOD(&_0$$4, &eventsManager, "fire", NULL, 0, &_1$$4, this_ptr); - zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(&_0$$4)) { - RETURN_MM_NULL(); - } - } ZEPHIR_CALL_METHOD(NULL, &compiler, "compile", NULL, 0, &templatePath); zephir_check_call_status(); - if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_VAR(&_3$$6); - ZVAL_STRING(&_3$$6, "view:afterCompile"); - ZEPHIR_CALL_METHOD(&_2$$6, &eventsManager, "fire", NULL, 0, &_3$$6, this_ptr); - zephir_check_call_status(); - if (ZEPHIR_IS_FALSE_IDENTICAL(&_2$$6)) { - RETURN_MM_NULL(); - } - } ZEPHIR_CALL_METHOD(&compiledTemplatePath, &compiler, "getcompiledtemplatepath", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(params) == IS_ARRAY) { - zephir_is_iterable(params, 0, "phalcon/mvc/view/engine/volt.zep", 120); - ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(params), _5$$8, _6$$8, _4$$8) + zephir_is_iterable(params, 0, "phalcon/mvc/view/engine/volt.zep", 107); + ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(params), _1$$4, _2$$4, _0$$4) { ZEPHIR_INIT_NVAR(&key); - if (_6$$8 != NULL) { - ZVAL_STR_COPY(&key, _6$$8); + if (_2$$4 != NULL) { + ZVAL_STR_COPY(&key, _2$$4); } else { - ZVAL_LONG(&key, _5$$8); + ZVAL_LONG(&key, _1$$4); } ZEPHIR_INIT_NVAR(&value); - ZVAL_COPY(&value, _4$$8); - ZEPHIR_CPY_WRT(&_7$$9, &value); - if (zephir_set_symbol(&key, &_7$$9 TSRMLS_CC) == FAILURE) { + ZVAL_COPY(&value, _0$$4); + ZEPHIR_CPY_WRT(&_3$$5, &value); + if (zephir_set_symbol(&key, &_3$$5 TSRMLS_CC) == FAILURE) { return; } } ZEND_HASH_FOREACH_END(); @@ -230,10 +205,10 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, render) { RETURN_MM_NULL(); } if (mustClean) { - zephir_read_property(&_8$$10, this_ptr, SL("_view"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_9$$10, "ob_get_contents", NULL, 116); + zephir_read_property(&_4$$6, this_ptr, SL("_view"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_FUNCTION(&_5$$6, "ob_get_contents", NULL, 116); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_8$$10, "setcontent", NULL, 0, &_9$$10); + ZEPHIR_CALL_METHOD(NULL, &_4$$6, "setcontent", NULL, 0, &_5$$6); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -297,7 +272,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, isIncluded) { } if (Z_TYPE_P(haystack) == IS_STRING) { if ((zephir_function_exists_ex(SL("mb_strpos") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&_0$$5, "mb_strpos", NULL, 384, haystack, needle); + ZEPHIR_CALL_FUNCTION(&_0$$5, "mb_strpos", NULL, 385, haystack, needle); zephir_check_call_status(); RETURN_MM_BOOL(!ZEPHIR_IS_FALSE_IDENTICAL(&_0$$5)); } @@ -305,7 +280,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, isIncluded) { zephir_fast_strpos(&_1$$4, haystack, needle, 0 ); RETURN_MM_BOOL(!ZEPHIR_IS_FALSE_IDENTICAL(&_1$$4)); } - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Invalid haystack", "phalcon/mvc/view/engine/volt.zep", 162); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Invalid haystack", "phalcon/mvc/view/engine/volt.zep", 149); return; } @@ -356,7 +331,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, convertEncoding) { _0 = ZEPHIR_IS_STRING(&to, "utf8"); } if (_0) { - ZEPHIR_RETURN_CALL_FUNCTION("utf8_encode", NULL, 385, &text); + ZEPHIR_RETURN_CALL_FUNCTION("utf8_encode", NULL, 386, &text); zephir_check_call_status(); RETURN_MM(); } @@ -379,7 +354,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, convertEncoding) { zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Any of 'mbstring' or 'iconv' is required to perform the charset conversion", "phalcon/mvc/view/engine/volt.zep", 201); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Any of 'mbstring' or 'iconv' is required to perform the charset conversion", "phalcon/mvc/view/engine/volt.zep", 188); return; } @@ -447,7 +422,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, slice) { if (_1$$5) { ZEPHIR_CALL_METHOD(&_2$$6, value, "current", &_3, 0); zephir_check_call_status(); - zephir_array_append(&slice, &_2$$6, PH_SEPARATE, "phalcon/mvc/view/engine/volt.zep", 227); + zephir_array_append(&slice, &_2$$6, PH_SEPARATE, "phalcon/mvc/view/engine/volt.zep", 214); } ZEPHIR_CALL_METHOD(NULL, value, "next", &_4, 0); zephir_check_call_status(); @@ -463,7 +438,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, slice) { } if (Z_TYPE_P(value) == IS_ARRAY) { ZVAL_LONG(&_5$$9, start); - ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 386, value, &_5$$9, &length); + ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 387, value, &_5$$9, &length); zephir_check_call_status(); RETURN_MM(); } @@ -509,7 +484,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, sort) { ZEPHIR_MAKE_REF(&value); - ZEPHIR_CALL_FUNCTION(NULL, "asort", NULL, 387, &value); + ZEPHIR_CALL_FUNCTION(NULL, "asort", NULL, 388, &value); ZEPHIR_UNREF(&value); zephir_check_call_status(); RETURN_CTOR(&value); @@ -564,7 +539,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, callMacro) { ZEPHIR_CONCAT_SVS(&_2$$3, "Macro '", &name, "' does not exist"); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 4, &_2$$3); zephir_check_call_status(); - zephir_throw_exception_debug(&_1$$3, "phalcon/mvc/view/engine/volt.zep", 291 TSRMLS_CC); + zephir_throw_exception_debug(&_1$$3, "phalcon/mvc/view/engine/volt.zep", 278 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } diff --git a/ext/phalcon/mvc/view/engine/volt/compiler.zep.c b/ext/phalcon/mvc/view/engine/volt/compiler.zep.c index eaa38a989ec..4785bfb7fe9 100644 --- a/ext/phalcon/mvc/view/engine/volt/compiler.zep.c +++ b/ext/phalcon/mvc/view/engine/volt/compiler.zep.c @@ -629,7 +629,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, attributeReader) { } } } else { - ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", NULL, 388, &left); + ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", NULL, 389, &left); zephir_check_call_status(); ZEPHIR_OBS_VAR(&leftType); zephir_array_fetch_string(&leftType, &left, SL("type"), PH_NOISY, "phalcon/mvc/view/engine/volt/compiler.zep", 316 TSRMLS_CC); @@ -651,7 +651,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, attributeReader) { zephir_array_fetch_string(&_9$$11, &right, SL("value"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 329 TSRMLS_CC); zephir_concat_self(&exprCode, &_9$$11 TSRMLS_CC); } else { - ZEPHIR_CALL_METHOD(&_10$$12, this_ptr, "expression", NULL, 388, &right); + ZEPHIR_CALL_METHOD(&_10$$12, this_ptr, "expression", NULL, 389, &right); zephir_check_call_status(); zephir_concat_self(&exprCode, &_10$$12 TSRMLS_CC); } @@ -711,7 +711,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) { ZVAL_NULL(&funcArguments); ZEPHIR_OBS_NVAR(&funcArguments); if (zephir_array_isset_string_fetch(&funcArguments, &expr, SL("arguments"), 0)) { - ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 388, &funcArguments); + ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 389, &funcArguments); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&arguments); @@ -734,7 +734,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) { zephir_array_fast_append(&_0$$6, &funcArguments); ZEPHIR_INIT_VAR(&_1$$6); ZVAL_STRING(&_1$$6, "compileFunction"); - ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 389, &_1$$6, &_0$$6); + ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 390, &_1$$6, &_0$$6); zephir_check_call_status(); if (Z_TYPE_P(&code) == IS_STRING) { RETURN_CCTOR(&code); @@ -766,7 +766,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) { zephir_array_fetch_string(&_5$$9, &expr, SL("line"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 406 TSRMLS_CC); ZEPHIR_INIT_VAR(&_6$$9); ZEPHIR_CONCAT_SVSVSV(&_6$$9, "Invalid definition for user function '", &name, "' in ", &_4$$9, " on line ", &_5$$9); - ZEPHIR_CALL_METHOD(NULL, &_3$$9, "__construct", NULL, 390, &_6$$9); + ZEPHIR_CALL_METHOD(NULL, &_3$$9, "__construct", NULL, 391, &_6$$9); zephir_check_call_status(); zephir_throw_exception_debug(&_3$$9, "phalcon/mvc/view/engine/volt/compiler.zep", 406 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -795,7 +795,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) { ZEPHIR_OBS_VAR(&exprLevel); zephir_read_property(&exprLevel, this_ptr, SL("_exprLevel"), PH_NOISY_CC); if (Z_TYPE_P(&block) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&code, this_ptr, "_statementlistorextends", NULL, 391, &block); + ZEPHIR_CALL_METHOD(&code, this_ptr, "_statementlistorextends", NULL, 392, &block); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&exprLevel, 1)) { ZEPHIR_CPY_WRT(&escapedCode, &code); @@ -889,7 +889,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) { ZEPHIR_CONCAT_SVSVS(return_value, "$this->callMacro('", &name, "', [", &arguments, "])"); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&_9, this_ptr, "expression", NULL, 388, &nameExpr); + ZEPHIR_CALL_METHOD(&_9, this_ptr, "expression", NULL, 389, &nameExpr); zephir_check_call_status(); ZEPHIR_CONCAT_VSVS(return_value, &_9, "(", &arguments, ")"); RETURN_MM(); @@ -964,28 +964,28 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveTest) { if (zephir_array_isset_string_fetch(&name, &testName, SL("value"), 0)) { if (ZEPHIR_IS_STRING(&name, "divisibleby")) { zephir_array_fetch_string(&_1$$12, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 677 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_0$$12, this_ptr, "expression", NULL, 388, &_1$$12); + ZEPHIR_CALL_METHOD(&_0$$12, this_ptr, "expression", NULL, 389, &_1$$12); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "(((", &left, ") % (", &_0$$12, ")) == 0)"); RETURN_MM(); } if (ZEPHIR_IS_STRING(&name, "sameas")) { zephir_array_fetch_string(&_3$$13, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 684 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_2$$13, this_ptr, "expression", NULL, 388, &_3$$13); + ZEPHIR_CALL_METHOD(&_2$$13, this_ptr, "expression", NULL, 389, &_3$$13); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "(", &left, ") === (", &_2$$13, ")"); RETURN_MM(); } if (ZEPHIR_IS_STRING(&name, "type")) { zephir_array_fetch_string(&_5$$14, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 691 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_4$$14, this_ptr, "expression", NULL, 388, &_5$$14); + ZEPHIR_CALL_METHOD(&_4$$14, this_ptr, "expression", NULL, 389, &_5$$14); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "gettype(", &left, ") === (", &_4$$14, ")"); RETURN_MM(); } } } - ZEPHIR_CALL_METHOD(&_6, this_ptr, "expression", NULL, 388, &test); + ZEPHIR_CALL_METHOD(&_6, this_ptr, "expression", NULL, 389, &test); zephir_check_call_status(); ZEPHIR_CONCAT_VSV(return_value, &left, " == ", &_6); RETURN_MM(); @@ -1057,7 +1057,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) { zephir_array_fetch_string(&_2$$5, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 724 TSRMLS_CC); ZEPHIR_INIT_VAR(&_3$$5); ZEPHIR_CONCAT_SVSV(&_3$$5, "Unknown filter type in ", &_1$$5, " on line ", &_2$$5); - ZEPHIR_CALL_METHOD(NULL, &_0$$5, "__construct", NULL, 390, &_3$$5); + ZEPHIR_CALL_METHOD(NULL, &_0$$5, "__construct", NULL, 391, &_3$$5); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$5, "phalcon/mvc/view/engine/volt/compiler.zep", 724 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -1091,11 +1091,11 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) { zephir_array_update_string(&_4$$7, SL("file"), &file, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_4$$7, SL("line"), &line, PH_COPY | PH_SEPARATE); ZEPHIR_MAKE_REF(&funcArguments); - ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 392, &funcArguments, &_4$$7); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 393, &funcArguments, &_4$$7); ZEPHIR_UNREF(&funcArguments); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 388, &funcArguments); + ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 389, &funcArguments); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&arguments, &left); @@ -1110,7 +1110,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) { zephir_array_fast_append(&_6$$9, &funcArguments); ZEPHIR_INIT_VAR(&_7$$9); ZVAL_STRING(&_7$$9, "compileFilter"); - ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 389, &_7$$9, &_6$$9); + ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 390, &_7$$9, &_6$$9); zephir_check_call_status(); if (Z_TYPE_P(&code) == IS_STRING) { RETURN_CCTOR(&code); @@ -1142,7 +1142,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) { zephir_array_fetch_string(&_11$$12, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 808 TSRMLS_CC); ZEPHIR_INIT_VAR(&_12$$12); ZEPHIR_CONCAT_SVSVSV(&_12$$12, "Invalid definition for user filter '", &name, "' in ", &_10$$12, " on line ", &_11$$12); - ZEPHIR_CALL_METHOD(NULL, &_9$$12, "__construct", NULL, 390, &_12$$12); + ZEPHIR_CALL_METHOD(NULL, &_9$$12, "__construct", NULL, 391, &_12$$12); zephir_check_call_status(); zephir_throw_exception_debug(&_9$$12, "phalcon/mvc/view/engine/volt/compiler.zep", 808 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -1271,7 +1271,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) { zephir_array_fetch_string(&_18, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 997 TSRMLS_CC); ZEPHIR_INIT_VAR(&_19); ZEPHIR_CONCAT_SVSVSV(&_19, "Unknown filter \"", &name, "\" in ", &_17, " on line ", &_18); - ZEPHIR_CALL_METHOD(NULL, &_16, "__construct", NULL, 390, &_19); + ZEPHIR_CALL_METHOD(NULL, &_16, "__construct", NULL, 391, &_19); zephir_check_call_status(); zephir_throw_exception_debug(&_16, "phalcon/mvc/view/engine/volt/compiler.zep", 997 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -1342,7 +1342,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { zephir_array_fast_append(&_0$$4, &expr); ZEPHIR_INIT_NVAR(&_1$$4); ZVAL_STRING(&_1$$4, "resolveExpression"); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "fireextensionevent", &_2, 389, &_1$$4, &_0$$4); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "fireextensionevent", &_2, 390, &_1$$4, &_0$$4); zephir_check_call_status(); if (Z_TYPE_P(&exprCode) == IS_STRING) { break; @@ -1358,7 +1358,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { ZEPHIR_INIT_NVAR(&singleExpr); ZVAL_COPY(&singleExpr, _3$$6); zephir_array_fetch_string(&_4$$7, &singleExpr, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1031 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_5, 388, &_4$$7); + ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_5, 389, &_4$$7); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&name); if (zephir_array_isset_string_fetch(&name, &singleExpr, SL("name"), 0)) { @@ -1381,7 +1381,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { } ZEPHIR_OBS_NVAR(&left); if (zephir_array_isset_string_fetch(&left, &expr, SL("left"), 0)) { - ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", &_5, 388, &left); + ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", &_5, 389, &left); zephir_check_call_status(); } if (ZEPHIR_IS_LONG(&type, 311)) { @@ -1392,13 +1392,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { } if (ZEPHIR_IS_LONG(&type, 124)) { zephir_array_fetch_string(&_10$$13, &expr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1069 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "resolvefilter", &_11, 393, &_10$$13, &leftCode); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "resolvefilter", &_11, 394, &_10$$13, &leftCode); zephir_check_call_status(); break; } ZEPHIR_OBS_NVAR(&right); if (zephir_array_isset_string_fetch(&right, &expr, SL("right"), 0)) { - ZEPHIR_CALL_METHOD(&rightCode, this_ptr, "expression", &_5, 388, &right); + ZEPHIR_CALL_METHOD(&rightCode, this_ptr, "expression", &_5, 389, &right); zephir_check_call_status(); } ZEPHIR_INIT_NVAR(&exprCode); @@ -1574,7 +1574,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { if (ZEPHIR_IS_LONG(&type, 365)) { ZEPHIR_OBS_NVAR(&start); if (zephir_array_isset_string_fetch(&start, &expr, SL("start"), 0)) { - ZEPHIR_CALL_METHOD(&startCode, this_ptr, "expression", &_5, 388, &start); + ZEPHIR_CALL_METHOD(&startCode, this_ptr, "expression", &_5, 389, &start); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&startCode); @@ -1582,7 +1582,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { } ZEPHIR_OBS_NVAR(&end); if (zephir_array_isset_string_fetch(&end, &expr, SL("end"), 0)) { - ZEPHIR_CALL_METHOD(&endCode, this_ptr, "expression", &_5, 388, &end); + ZEPHIR_CALL_METHOD(&endCode, this_ptr, "expression", &_5, 389, &end); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&endCode); @@ -1674,7 +1674,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { } if (ZEPHIR_IS_LONG(&type, 366)) { zephir_array_fetch_string(&_19$$69, &expr, SL("ternary"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1299 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_18$$69, this_ptr, "expression", &_5, 388, &_19$$69); + ZEPHIR_CALL_METHOD(&_18$$69, this_ptr, "expression", &_5, 389, &_19$$69); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&exprCode); ZEPHIR_CONCAT_SVSVSVS(&exprCode, "(", &_18$$69, " ? ", &leftCode, " : ", &rightCode, ")"); @@ -1701,7 +1701,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { zephir_array_fetch_string(&_22$$73, &expr, SL("line"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1315 TSRMLS_CC); ZEPHIR_INIT_LNVAR(_23$$73); ZEPHIR_CONCAT_SVSVSV(&_23$$73, "Unknown expression ", &type, " in ", &_21$$73, " on line ", &_22$$73); - ZEPHIR_CALL_METHOD(NULL, &_20$$73, "__construct", &_24, 390, &_23$$73); + ZEPHIR_CALL_METHOD(NULL, &_20$$73, "__construct", &_24, 391, &_23$$73); zephir_check_call_status(); zephir_throw_exception_debug(&_20$$73, "phalcon/mvc/view/engine/volt/compiler.zep", 1315 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -1755,7 +1755,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, _statementListOrExtends) { ZEPHIR_INIT_NVAR(&statement); } if (isStatementList == 1) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_statementlist", NULL, 394, statements); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_statementlist", NULL, 395, statements); zephir_check_call_status(); RETURN_MM(); } @@ -1844,7 +1844,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach) { ZEPHIR_CONCAT_VV(&prefixLevel, &prefix, &level); ZEPHIR_OBS_VAR(&expr); zephir_array_fetch_string(&expr, &statement, SL("expr"), PH_NOISY, "phalcon/mvc/view/engine/volt/compiler.zep", 1401 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 388, &expr); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 389, &expr); zephir_check_call_status(); ZEPHIR_OBS_VAR(&blockStatements); zephir_array_fetch_string(&blockStatements, &statement, SL("block_statements"), PH_NOISY, "phalcon/mvc/view/engine/volt/compiler.zep", 1407 TSRMLS_CC); @@ -1879,7 +1879,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach) { } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_CALL_METHOD(&code, this_ptr, "_statementlist", NULL, 394, &blockStatements, &_2); + ZEPHIR_CALL_METHOD(&code, this_ptr, "_statementlist", NULL, 395, &blockStatements, &_2); zephir_check_call_status(); ZEPHIR_OBS_VAR(&loopContext); zephir_read_property(&loopContext, this_ptr, SL("_loopPointers"), PH_NOISY_CC); @@ -1930,7 +1930,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach) { } ZEPHIR_OBS_VAR(&ifExpr); if (zephir_array_isset_string_fetch(&ifExpr, &statement, SL("if_expr"), 0)) { - ZEPHIR_CALL_METHOD(&_14$$13, this_ptr, "expression", NULL, 388, &ifExpr); + ZEPHIR_CALL_METHOD(&_14$$13, this_ptr, "expression", NULL, 389, &ifExpr); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_15$$13); ZEPHIR_CONCAT_SVS(&_15$$13, "if (", &_14$$13, ") { ?>"); @@ -2054,13 +2054,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileIf) { object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 390, &_1$$3, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 391, &_1$$3, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/mvc/view/engine/volt/compiler.zep", 1554 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 388, &expr); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 389, &expr); zephir_check_call_status(); zephir_array_fetch_string(&_4, &statement, SL("true_statements"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1560 TSRMLS_CC); if (extendsMode) { @@ -2068,7 +2068,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileIf) { } else { ZVAL_BOOL(&_5, 0); } - ZEPHIR_CALL_METHOD(&_3, this_ptr, "_statementlist", NULL, 394, &_4, &_5); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "_statementlist", NULL, 395, &_4, &_5); zephir_check_call_status(); ZEPHIR_INIT_VAR(&compilation); ZEPHIR_CONCAT_SVSV(&compilation, "", &_3); @@ -2079,7 +2079,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileIf) { } else { ZVAL_BOOL(&_7$$4, 0); } - ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "_statementlist", NULL, 394, &blockStatements, &_7$$4); + ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "_statementlist", NULL, 395, &blockStatements, &_7$$4); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_8$$4); ZEPHIR_CONCAT_SV(&_8$$4, "", &_6$$4); @@ -2131,13 +2131,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSwitch) { object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 390, &_1$$3, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 391, &_1$$3, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/mvc/view/engine/volt/compiler.zep", 1589 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 388, &expr); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 389, &expr); zephir_check_call_status(); ZEPHIR_INIT_VAR(&compilation); ZEPHIR_CONCAT_SVS(&compilation, ""); @@ -2148,7 +2148,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSwitch) { } else { ZVAL_BOOL(&_3$$4, 0); } - ZEPHIR_CALL_METHOD(&lines, this_ptr, "_statementlist", NULL, 394, &caseClauses, &_3$$4); + ZEPHIR_CALL_METHOD(&lines, this_ptr, "_statementlist", NULL, 395, &caseClauses, &_3$$4); zephir_check_call_status(); if (zephir_fast_strlen_ev(&lines) != 0) { ZEPHIR_INIT_VAR(&_4$$5); @@ -2203,13 +2203,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileCase) { object_init_ex(&_0$$4, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$4); ZVAL_STRING(&_1$$4, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 390, &_1$$4, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 391, &_1$$4, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$4, "phalcon/mvc/view/engine/volt/compiler.zep", 1649 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 388, &expr); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 389, &expr); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, ""); RETURN_MM(); @@ -2244,13 +2244,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileElseIf) { object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 390, &_1$$3, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 391, &_1$$3, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/mvc/view/engine/volt/compiler.zep", 1669 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 388, &expr); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 389, &expr); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, ""); RETURN_MM(); @@ -2312,15 +2312,15 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileCache) { object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 390, &_1$$3, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 391, &_1$$3, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/mvc/view/engine/volt/compiler.zep", 1689 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 388, &expr); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 389, &expr); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 388, &expr); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 389, &expr); zephir_check_call_status(); ZEPHIR_INIT_VAR(&compilation); ZEPHIR_CONCAT_SVS(&compilation, "di->get('viewCache'); "); @@ -2355,7 +2355,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileCache) { } else { ZVAL_BOOL(&_13, 0); } - ZEPHIR_CALL_METHOD(&_11, this_ptr, "_statementlist", NULL, 394, &_12, &_13); + ZEPHIR_CALL_METHOD(&_11, this_ptr, "_statementlist", NULL, 395, &_12, &_13); zephir_check_call_status(); zephir_concat_self(&compilation, &_11 TSRMLS_CC); ZEPHIR_OBS_NVAR(&lifetime); @@ -2429,10 +2429,10 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSet) { ZEPHIR_INIT_NVAR(&assignment); ZVAL_COPY(&assignment, _0); zephir_array_fetch_string(&_1$$4, &assignment, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1752 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_2, 388, &_1$$4); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_2, 389, &_1$$4); zephir_check_call_status(); zephir_array_fetch_string(&_3$$4, &assignment, SL("variable"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1757 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_2, 388, &_3$$4); + ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_2, 389, &_3$$4); zephir_check_call_status(); zephir_array_fetch_string(&_4$$4, &assignment, SL("op"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1763 TSRMLS_CC); do { @@ -2498,7 +2498,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileDo) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/mvc/view/engine/volt/compiler.zep", 1803); return; } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 388, &expr); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 389, &expr); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, ""); RETURN_MM(); @@ -2530,7 +2530,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileReturn) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/mvc/view/engine/volt/compiler.zep", 1823); return; } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 388, &expr); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 389, &expr); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, ""); RETURN_MM(); @@ -2576,7 +2576,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileAutoEscape) { } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_CALL_METHOD(&compilation, this_ptr, "_statementlist", NULL, 394, &_0, &_1); + ZEPHIR_CALL_METHOD(&compilation, this_ptr, "_statementlist", NULL, 395, &_0, &_1); zephir_check_call_status(); zephir_update_property_zval(this_ptr, SL("_autoescape"), &oldAutoescape); RETURN_CCTOR(&compilation); @@ -2616,13 +2616,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileEcho) { object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 390, &_1$$3, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 391, &_1$$3, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/mvc/view/engine/volt/compiler.zep", 1869 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 388, &expr); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 389, &expr); zephir_check_call_status(); zephir_array_fetch_string(&_2, &expr, SL("type"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1877 TSRMLS_CC); if (ZEPHIR_IS_LONG(&_2, 350)) { @@ -2701,14 +2701,14 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileInclude) { RETURN_CCTOR(&compilation); } } - ZEPHIR_CALL_METHOD(&path, this_ptr, "expression", NULL, 388, &pathExpr); + ZEPHIR_CALL_METHOD(&path, this_ptr, "expression", NULL, 389, &pathExpr); zephir_check_call_status(); ZEPHIR_OBS_VAR(¶ms); if (!(zephir_array_isset_string_fetch(¶ms, &statement, SL("params"), 0))) { ZEPHIR_CONCAT_SVS(return_value, "partial(", &path, "); ?>"); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&_3, this_ptr, "expression", NULL, 388, ¶ms); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "expression", NULL, 389, ¶ms); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "partial(", &path, ", ", &_3, "); ?>"); RETURN_MM(); @@ -2774,7 +2774,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro) { object_init_ex(&_1$$4, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_2$$4); ZEPHIR_CONCAT_SVS(&_2$$4, "Macro '", &name, "' is already defined"); - ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 390, &_2$$4); + ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 391, &_2$$4); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$4, "phalcon/mvc/view/engine/volt/compiler.zep", 1988 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -2823,7 +2823,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro) { zephir_concat_self_str(&code, SL(" } else { ") TSRMLS_CC); ZEPHIR_OBS_NVAR(&defaultValue); if (zephir_array_isset_string_fetch(&defaultValue, ¶meter, SL("default"), 0)) { - ZEPHIR_CALL_METHOD(&_12$$8, this_ptr, "expression", &_13, 388, &defaultValue); + ZEPHIR_CALL_METHOD(&_12$$8, this_ptr, "expression", &_13, 389, &defaultValue); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_14$$8); ZEPHIR_CONCAT_SVSVS(&_14$$8, "$", &variableName, " = ", &_12$$8, ";"); @@ -2846,7 +2846,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro) { } else { ZVAL_BOOL(&_17$$10, 0); } - ZEPHIR_CALL_METHOD(&_16$$10, this_ptr, "_statementlist", NULL, 394, &blockStatements, &_17$$10); + ZEPHIR_CALL_METHOD(&_16$$10, this_ptr, "_statementlist", NULL, 395, &blockStatements, &_17$$10); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_18$$10); ZEPHIR_CONCAT_VS(&_18$$10, &_16$$10, "= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_tag_geturlservice, 0, 0, Phalcon\\UrlInterface, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_tag_geturlservice, 0, 0, Phalcon\\Mvc\\UrlInterface, 0) #else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_tag_geturlservice, 0, 0, IS_OBJECT, "Phalcon\\UrlInterface", 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_tag_geturlservice, 0, 0, IS_OBJECT, "Phalcon\\Mvc\\UrlInterface", 0) #endif ZEND_END_ARG_INFO() diff --git a/ext/phalcon/tag/select.zep.c b/ext/phalcon/tag/select.zep.c index f6b501a4851..15d54bb356d 100644 --- a/ext/phalcon/tag/select.zep.c +++ b/ext/phalcon/tag/select.zep.c @@ -184,7 +184,7 @@ PHP_METHOD(Phalcon_Tag_Select, selectField) { ZEPHIR_GET_CONSTANT(&_10$$24, "PHP_EOL"); ZEPHIR_INIT_VAR(&_11$$24); ZEPHIR_CONCAT_SV(&_11$$24, "", &_10$$24); - ZEPHIR_CALL_SELF(&_8$$24, "_optionsfromresultset", &_9, 439, &options, &using, &value, &_11$$24); + ZEPHIR_CALL_SELF(&_8$$24, "_optionsfromresultset", &_9, 440, &options, &using, &value, &_11$$24); zephir_check_call_status(); zephir_concat_self(&code, &_8$$24 TSRMLS_CC); } else { @@ -193,7 +193,7 @@ PHP_METHOD(Phalcon_Tag_Select, selectField) { ZEPHIR_GET_CONSTANT(&_14$$26, "PHP_EOL"); ZEPHIR_INIT_VAR(&_15$$26); ZEPHIR_CONCAT_SV(&_15$$26, "", &_14$$26); - ZEPHIR_CALL_SELF(&_12$$26, "_optionsfromarray", &_13, 440, &options, &value, &_15$$26); + ZEPHIR_CALL_SELF(&_12$$26, "_optionsfromarray", &_13, 441, &options, &value, &_15$$26); zephir_check_call_status(); zephir_concat_self(&code, &_12$$26 TSRMLS_CC); } @@ -403,7 +403,7 @@ PHP_METHOD(Phalcon_Tag_Select, _optionsFromArray) { if (Z_TYPE_P(&optionText) == IS_ARRAY) { ZEPHIR_INIT_NVAR(&_4$$4); ZEPHIR_GET_CONSTANT(&_4$$4, "PHP_EOL"); - ZEPHIR_CALL_SELF(&_5$$4, "_optionsfromarray", &_6, 440, &optionText, value, &closeOption); + ZEPHIR_CALL_SELF(&_5$$4, "_optionsfromarray", &_6, 441, &optionText, value, &closeOption); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_7$$4); ZEPHIR_GET_CONSTANT(&_7$$4, "PHP_EOL"); diff --git a/ext/phalcon/text.zep.c b/ext/phalcon/text.zep.c index 993c6ec5bd2..e399a233ced 100644 --- a/ext/phalcon/text.zep.c +++ b/ext/phalcon/text.zep.c @@ -263,13 +263,13 @@ PHP_METHOD(Phalcon_Text, random) { ZVAL_STRING(&_0$$3, "a"); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "z"); - ZEPHIR_CALL_FUNCTION(&_2$$3, "range", NULL, 441, &_0$$3, &_1$$3); + ZEPHIR_CALL_FUNCTION(&_2$$3, "range", NULL, 442, &_0$$3, &_1$$3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_0$$3); ZVAL_STRING(&_0$$3, "A"); ZEPHIR_INIT_NVAR(&_1$$3); ZVAL_STRING(&_1$$3, "Z"); - ZEPHIR_CALL_FUNCTION(&_3$$3, "range", NULL, 441, &_0$$3, &_1$$3); + ZEPHIR_CALL_FUNCTION(&_3$$3, "range", NULL, 442, &_0$$3, &_1$$3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&pool); zephir_fast_array_merge(&pool, &_2$$3, &_3$$3 TSRMLS_CC); @@ -278,13 +278,13 @@ PHP_METHOD(Phalcon_Text, random) { if (type == 2) { ZVAL_LONG(&_4$$4, 0); ZVAL_LONG(&_5$$4, 9); - ZEPHIR_CALL_FUNCTION(&_6$$4, "range", NULL, 441, &_4$$4, &_5$$4); + ZEPHIR_CALL_FUNCTION(&_6$$4, "range", NULL, 442, &_4$$4, &_5$$4); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_7$$4); ZVAL_STRING(&_7$$4, "a"); ZEPHIR_INIT_VAR(&_8$$4); ZVAL_STRING(&_8$$4, "f"); - ZEPHIR_CALL_FUNCTION(&_9$$4, "range", NULL, 441, &_7$$4, &_8$$4); + ZEPHIR_CALL_FUNCTION(&_9$$4, "range", NULL, 442, &_7$$4, &_8$$4); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&pool); zephir_fast_array_merge(&pool, &_6$$4, &_9$$4 TSRMLS_CC); @@ -293,14 +293,14 @@ PHP_METHOD(Phalcon_Text, random) { if (type == 3) { ZVAL_LONG(&_10$$5, 0); ZVAL_LONG(&_11$$5, 9); - ZEPHIR_CALL_FUNCTION(&pool, "range", NULL, 441, &_10$$5, &_11$$5); + ZEPHIR_CALL_FUNCTION(&pool, "range", NULL, 442, &_10$$5, &_11$$5); zephir_check_call_status(); break; } if (type == 4) { ZVAL_LONG(&_12$$6, 1); ZVAL_LONG(&_13$$6, 9); - ZEPHIR_CALL_FUNCTION(&pool, "range", NULL, 441, &_12$$6, &_13$$6); + ZEPHIR_CALL_FUNCTION(&pool, "range", NULL, 442, &_12$$6, &_13$$6); zephir_check_call_status(); break; } @@ -313,21 +313,21 @@ PHP_METHOD(Phalcon_Text, random) { } ZVAL_LONG(&_15$$8, 0); ZVAL_LONG(&_16$$8, 9); - ZEPHIR_CALL_FUNCTION(&_17$$8, "range", NULL, 441, &_15$$8, &_16$$8); + ZEPHIR_CALL_FUNCTION(&_17$$8, "range", NULL, 442, &_15$$8, &_16$$8); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_18$$8); ZVAL_STRING(&_18$$8, "a"); ZEPHIR_INIT_VAR(&_19$$8); ZVAL_STRING(&_19$$8, "z"); - ZEPHIR_CALL_FUNCTION(&_20$$8, "range", NULL, 441, &_18$$8, &_19$$8); + ZEPHIR_CALL_FUNCTION(&_20$$8, "range", NULL, 442, &_18$$8, &_19$$8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_18$$8); ZVAL_STRING(&_18$$8, "A"); ZEPHIR_INIT_NVAR(&_19$$8); ZVAL_STRING(&_19$$8, "Z"); - ZEPHIR_CALL_FUNCTION(&_21$$8, "range", NULL, 441, &_18$$8, &_19$$8); + ZEPHIR_CALL_FUNCTION(&_21$$8, "range", NULL, 442, &_18$$8, &_19$$8); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&pool, "array_merge", NULL, 442, &_17$$8, &_20$$8, &_21$$8); + ZEPHIR_CALL_FUNCTION(&pool, "array_merge", NULL, 443, &_17$$8, &_20$$8, &_21$$8); zephir_check_call_status(); break; } while(0); @@ -468,7 +468,7 @@ PHP_METHOD(Phalcon_Text, lower) { if ((zephir_function_exists_ex(SL("mb_strtolower") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("mb_strtolower", NULL, 443, &str, &encoding); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strtolower", NULL, 444, &str, &encoding); zephir_check_call_status(); RETURN_MM(); } @@ -525,7 +525,7 @@ PHP_METHOD(Phalcon_Text, upper) { if ((zephir_function_exists_ex(SL("mb_strtoupper") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("mb_strtoupper", NULL, 444, &str, &encoding); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strtoupper", NULL, 445, &str, &encoding); zephir_check_call_status(); RETURN_MM(); } @@ -627,7 +627,7 @@ PHP_METHOD(Phalcon_Text, concat) { ZEPHIR_INIT_VAR(&_3$$3); zephir_get_args(&_3$$3); ZVAL_LONG(&_4$$3, 3); - ZEPHIR_CALL_FUNCTION(&_5$$3, "array_slice", NULL, 386, &_3$$3, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "array_slice", NULL, 387, &_3$$3, &_4$$3); zephir_check_call_status(); zephir_is_iterable(&_5$$3, 0, "phalcon/text.zep", 253); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_5$$3), _6$$3) @@ -763,24 +763,24 @@ PHP_METHOD(Phalcon_Text, dynamic) { } - ZEPHIR_CALL_FUNCTION(&_0, "substr_count", NULL, 445, &text, &leftDelimiter); + ZEPHIR_CALL_FUNCTION(&_0, "substr_count", NULL, 446, &text, &leftDelimiter); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "substr_count", NULL, 445, &text, &rightDelimiter); + ZEPHIR_CALL_FUNCTION(&_1, "substr_count", NULL, 446, &text, &rightDelimiter); zephir_check_call_status(); if (!ZEPHIR_IS_IDENTICAL(&_0, &_1)) { ZEPHIR_INIT_VAR(&_2$$3); object_init_ex(&_2$$3, spl_ce_RuntimeException); ZEPHIR_INIT_VAR(&_3$$3); ZEPHIR_CONCAT_SVS(&_3$$3, "Syntax error in string \"", &text, "\""); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 435, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 436, &_3$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_2$$3, "phalcon/text.zep", 280 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_FUNCTION(&ldS, "preg_quote", NULL, 446, &leftDelimiter); + ZEPHIR_CALL_FUNCTION(&ldS, "preg_quote", NULL, 447, &leftDelimiter); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&rdS, "preg_quote", NULL, 446, &rightDelimiter); + ZEPHIR_CALL_FUNCTION(&rdS, "preg_quote", NULL, 447, &rightDelimiter); zephir_check_call_status(); ZEPHIR_INIT_VAR(&pattern); ZEPHIR_CONCAT_SVSVVSVS(&pattern, "/", &ldS, "([^", &ldS, &rdS, "]+)", &rdS, "/"); @@ -808,11 +808,11 @@ PHP_METHOD(Phalcon_Text, dynamic) { ZEPHIR_INIT_NVAR(&words); zephir_fast_explode(&words, &separator, &_7$$6, LONG_MAX TSRMLS_CC); ZEPHIR_OBS_NVAR(&word); - ZEPHIR_CALL_FUNCTION(&_8$$6, "array_rand", &_9, 447, &words); + ZEPHIR_CALL_FUNCTION(&_8$$6, "array_rand", &_9, 448, &words); zephir_check_call_status(); zephir_array_fetch(&word, &words, &_8$$6, PH_NOISY, "phalcon/text.zep", 299 TSRMLS_CC); zephir_array_fetch_long(&_10$$6, &match, 0, PH_NOISY | PH_READONLY, "phalcon/text.zep", 300 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&sub, "preg_quote", NULL, 446, &_10$$6, &separator); + ZEPHIR_CALL_FUNCTION(&sub, "preg_quote", NULL, 447, &_10$$6, &separator); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_11$$6); ZEPHIR_CONCAT_SVS(&_11$$6, "/", &sub, "/"); diff --git a/ext/phalcon/translate/adapter/csv.zep.c b/ext/phalcon/translate/adapter/csv.zep.c index 1bb323fbf12..59956d4c75f 100644 --- a/ext/phalcon/translate/adapter/csv.zep.c +++ b/ext/phalcon/translate/adapter/csv.zep.c @@ -85,7 +85,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_Csv, __construct) { ZVAL_STRING(&_3, ";"); ZEPHIR_INIT_VAR(&_4); ZVAL_STRING(&_4, "\""); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "_load", NULL, 448, &_1, &_2, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "_load", NULL, 449, &_1, &_2, &_3, &_4); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -144,7 +144,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_Csv, _load) { } while (1) { ZVAL_LONG(&_3$$4, length); - ZEPHIR_CALL_FUNCTION(&data, "fgetcsv", &_4, 449, &fileHandler, &_3$$4, &delimiter, &enclosure); + ZEPHIR_CALL_FUNCTION(&data, "fgetcsv", &_4, 450, &fileHandler, &_3$$4, &delimiter, &enclosure); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&data)) { break; diff --git a/ext/phalcon/translate/adapter/gettext.zep.c b/ext/phalcon/translate/adapter/gettext.zep.c index f0b66eb9116..60f48ce30ad 100644 --- a/ext/phalcon/translate/adapter/gettext.zep.c +++ b/ext/phalcon/translate/adapter/gettext.zep.c @@ -193,7 +193,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_Gettext, query) { } - ZEPHIR_CALL_FUNCTION(&translation, "gettext", NULL, 450, &index); + ZEPHIR_CALL_FUNCTION(&translation, "gettext", NULL, 451, &index); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "replaceplaceholders", NULL, 0, &translation, placeholders); zephir_check_call_status(); @@ -306,11 +306,11 @@ PHP_METHOD(Phalcon_Translate_Adapter_Gettext, nquery) { if (!(!(Z_TYPE_P(&domain) == IS_UNDEF) && Z_STRLEN_P(&domain))) { ZVAL_LONG(&_0$$3, count); - ZEPHIR_CALL_FUNCTION(&translation, "ngettext", NULL, 451, &msgid1, &msgid2, &_0$$3); + ZEPHIR_CALL_FUNCTION(&translation, "ngettext", NULL, 452, &msgid1, &msgid2, &_0$$3); zephir_check_call_status(); } else { ZVAL_LONG(&_1$$4, count); - ZEPHIR_CALL_FUNCTION(&translation, "dngettext", NULL, 452, &domain, &msgid1, &msgid2, &_1$$4); + ZEPHIR_CALL_FUNCTION(&translation, "dngettext", NULL, 453, &domain, &msgid1, &msgid2, &_1$$4); zephir_check_call_status(); } ZEPHIR_RETURN_CALL_METHOD(this_ptr, "replaceplaceholders", NULL, 0, &translation, placeholders); @@ -335,7 +335,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_Gettext, setDomain) { - ZEPHIR_RETURN_CALL_FUNCTION("textdomain", NULL, 453, domain); + ZEPHIR_RETURN_CALL_FUNCTION("textdomain", NULL, 454, domain); zephir_check_call_status(); RETURN_MM(); @@ -356,7 +356,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_Gettext, resetDomain) { ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdefaultdomain", NULL, 0); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("textdomain", NULL, 453, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("textdomain", NULL, 454, &_0); zephir_check_call_status(); RETURN_MM(); @@ -446,7 +446,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_Gettext, setDirectory) { } ZEPHIR_INIT_NVAR(&value); ZVAL_COPY(&value, _0$$4); - ZEPHIR_CALL_FUNCTION(NULL, "bindtextdomain", &_3, 454, &key, &value); + ZEPHIR_CALL_FUNCTION(NULL, "bindtextdomain", &_3, 455, &key, &value); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); ZEPHIR_INIT_NVAR(&value); @@ -454,7 +454,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_Gettext, setDirectory) { } else { ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "getdefaultdomain", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "bindtextdomain", &_3, 454, &_4$$6, directory); + ZEPHIR_CALL_FUNCTION(NULL, "bindtextdomain", &_3, 455, &_4$$6, directory); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -526,17 +526,17 @@ PHP_METHOD(Phalcon_Translate_Adapter_Gettext, setLocale) { zephir_read_property(&_3, this_ptr, SL("_locale"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_4); ZEPHIR_CONCAT_SV(&_4, "LC_ALL=", &_3); - ZEPHIR_CALL_FUNCTION(NULL, "putenv", NULL, 455, &_4); + ZEPHIR_CALL_FUNCTION(NULL, "putenv", NULL, 456, &_4); zephir_check_call_status(); zephir_read_property(&_5, this_ptr, SL("_locale"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_6); ZEPHIR_CONCAT_SV(&_6, "LANG=", &_5); - ZEPHIR_CALL_FUNCTION(NULL, "putenv", NULL, 455, &_6); + ZEPHIR_CALL_FUNCTION(NULL, "putenv", NULL, 456, &_6); zephir_check_call_status(); zephir_read_property(&_7, this_ptr, SL("_locale"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_8); ZEPHIR_CONCAT_SV(&_8, "LANGUAGE=", &_7); - ZEPHIR_CALL_FUNCTION(NULL, "putenv", NULL, 455, &_8); + ZEPHIR_CALL_FUNCTION(NULL, "putenv", NULL, 456, &_8); zephir_check_call_status(); zephir_read_property(&_9, this_ptr, SL("_locale"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_10, 6); diff --git a/ext/phalcon/translate/interpolator/indexedarray.zep.c b/ext/phalcon/translate/interpolator/indexedarray.zep.c index 4f27b1ebf60..b631409d845 100644 --- a/ext/phalcon/translate/interpolator/indexedarray.zep.c +++ b/ext/phalcon/translate/interpolator/indexedarray.zep.c @@ -77,7 +77,7 @@ PHP_METHOD(Phalcon_Translate_Interpolator_IndexedArray, replacePlaceholders) { } if (_0) { ZEPHIR_MAKE_REF(placeholders); - ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 392, placeholders, &translation); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 393, placeholders, &translation); ZEPHIR_UNREF(placeholders); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1$$3); diff --git a/ext/phalcon/url.zep.h b/ext/phalcon/url.zep.h deleted file mode 100644 index 111f0b8fe97..00000000000 --- a/ext/phalcon/url.zep.h +++ /dev/null @@ -1,134 +0,0 @@ - -extern zend_class_entry *phalcon_url_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Url); - -PHP_METHOD(Phalcon_Url, get); -PHP_METHOD(Phalcon_Url, getBasePath); -PHP_METHOD(Phalcon_Url, getBaseUri); -PHP_METHOD(Phalcon_Url, getDI); -PHP_METHOD(Phalcon_Url, getStatic); -PHP_METHOD(Phalcon_Url, getStaticBaseUri); -PHP_METHOD(Phalcon_Url, setBasePath); -PHP_METHOD(Phalcon_Url, setBaseUri); -PHP_METHOD(Phalcon_Url, setDI); -PHP_METHOD(Phalcon_Url, setStaticBaseUri); -PHP_METHOD(Phalcon_Url, path); - -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_get, 0, 0, IS_STRING, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_get, 0, 0, IS_STRING, NULL, 0) -#endif - ZEND_ARG_INFO(0, uri) - ZEND_ARG_INFO(0, args) -#if PHP_VERSION_ID >= 70200 - ZEND_ARG_TYPE_INFO(0, local, _IS_BOOL, 1) -#else - ZEND_ARG_INFO(0, local) -#endif - ZEND_ARG_INFO(0, baseUri) -ZEND_END_ARG_INFO() - -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_getbasepath, 0, 0, IS_STRING, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_getbasepath, 0, 0, IS_STRING, NULL, 0) -#endif -ZEND_END_ARG_INFO() - -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_getbaseuri, 0, 0, IS_STRING, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_getbaseuri, 0, 0, IS_STRING, NULL, 0) -#endif -ZEND_END_ARG_INFO() - -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_url_getdi, 0, 0, Phalcon\\DiInterface, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_getdi, 0, 0, IS_OBJECT, "Phalcon\\DiInterface", 0) -#endif -ZEND_END_ARG_INFO() - -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_getstatic, 0, 0, IS_STRING, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_getstatic, 0, 0, IS_STRING, NULL, 0) -#endif - ZEND_ARG_INFO(0, uri) -ZEND_END_ARG_INFO() - -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_getstaticbaseuri, 0, 0, IS_STRING, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_getstaticbaseuri, 0, 0, IS_STRING, NULL, 0) -#endif -ZEND_END_ARG_INFO() - -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_url_setbasepath, 0, 1, Phalcon\\UrlInterface, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_setbasepath, 0, 1, IS_OBJECT, "Phalcon\\UrlInterface", 0) -#endif -#if PHP_VERSION_ID >= 70200 - ZEND_ARG_TYPE_INFO(0, basePath, IS_STRING, 0) -#else - ZEND_ARG_INFO(0, basePath) -#endif -ZEND_END_ARG_INFO() - -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_url_setbaseuri, 0, 1, Phalcon\\UrlInterface, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_setbaseuri, 0, 1, IS_OBJECT, "Phalcon\\UrlInterface", 0) -#endif -#if PHP_VERSION_ID >= 70200 - ZEND_ARG_TYPE_INFO(0, baseUri, IS_STRING, 0) -#else - ZEND_ARG_INFO(0, baseUri) -#endif -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_url_setdi, 0, 0, 1) - ZEND_ARG_OBJ_INFO(0, dependencyInjector, Phalcon\\DiInterface, 0) -ZEND_END_ARG_INFO() - -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_url_setstaticbaseuri, 0, 1, Phalcon\\UrlInterface, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_setstaticbaseuri, 0, 1, IS_OBJECT, "Phalcon\\UrlInterface", 0) -#endif -#if PHP_VERSION_ID >= 70200 - ZEND_ARG_TYPE_INFO(0, staticBaseUri, IS_STRING, 0) -#else - ZEND_ARG_INFO(0, staticBaseUri) -#endif -ZEND_END_ARG_INFO() - -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_path, 0, 0, IS_STRING, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_path, 0, 0, IS_STRING, NULL, 0) -#endif -#if PHP_VERSION_ID >= 70200 - ZEND_ARG_TYPE_INFO(0, path, IS_STRING, 1) -#else - ZEND_ARG_INFO(0, path) -#endif -ZEND_END_ARG_INFO() - -ZEPHIR_INIT_FUNCS(phalcon_url_method_entry) { - PHP_ME(Phalcon_Url, get, arginfo_phalcon_url_get, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Url, getBasePath, arginfo_phalcon_url_getbasepath, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Url, getBaseUri, arginfo_phalcon_url_getbaseuri, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Url, getDI, arginfo_phalcon_url_getdi, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Url, getStatic, arginfo_phalcon_url_getstatic, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Url, getStaticBaseUri, arginfo_phalcon_url_getstaticbaseuri, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Url, setBasePath, arginfo_phalcon_url_setbasepath, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Url, setBaseUri, arginfo_phalcon_url_setbaseuri, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Url, setDI, arginfo_phalcon_url_setdi, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Url, setStaticBaseUri, arginfo_phalcon_url_setstaticbaseuri, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Url, path, arginfo_phalcon_url_path, ZEND_ACC_PUBLIC) - PHP_FE_END -}; diff --git a/ext/phalcon/url/exception.zep.h b/ext/phalcon/url/exception.zep.h deleted file mode 100644 index 37fc57d55b5..00000000000 --- a/ext/phalcon/url/exception.zep.h +++ /dev/null @@ -1,5 +0,0 @@ - -extern zend_class_entry *phalcon_url_exception_ce; - -ZEPHIR_INIT_CLASS(Phalcon_Url_Exception); - diff --git a/ext/phalcon/urlinterface.zep.h b/ext/phalcon/urlinterface.zep.h deleted file mode 100644 index e8b4f599b38..00000000000 --- a/ext/phalcon/urlinterface.zep.h +++ /dev/null @@ -1,78 +0,0 @@ - -extern zend_class_entry *phalcon_urlinterface_ce; - -ZEPHIR_INIT_CLASS(Phalcon_UrlInterface); - -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_urlinterface_get, 0, 0, IS_STRING, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_urlinterface_get, 0, 0, IS_STRING, NULL, 0) -#endif - ZEND_ARG_INFO(0, uri) - ZEND_ARG_INFO(0, args) -#if PHP_VERSION_ID >= 70200 - ZEND_ARG_TYPE_INFO(0, local, _IS_BOOL, 1) -#else - ZEND_ARG_INFO(0, local) -#endif -ZEND_END_ARG_INFO() - -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_urlinterface_getbasepath, 0, 0, IS_STRING, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_urlinterface_getbasepath, 0, 0, IS_STRING, NULL, 0) -#endif -ZEND_END_ARG_INFO() - -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_urlinterface_getbaseuri, 0, 0, IS_STRING, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_urlinterface_getbaseuri, 0, 0, IS_STRING, NULL, 0) -#endif -ZEND_END_ARG_INFO() - -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_urlinterface_setbasepath, 0, 1, Phalcon\\UrlInterface, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_urlinterface_setbasepath, 0, 1, IS_OBJECT, "Phalcon\\UrlInterface", 0) -#endif -#if PHP_VERSION_ID >= 70200 - ZEND_ARG_TYPE_INFO(0, basePath, IS_STRING, 0) -#else - ZEND_ARG_INFO(0, basePath) -#endif -ZEND_END_ARG_INFO() - -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_urlinterface_setbaseuri, 0, 1, Phalcon\\UrlInterface, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_urlinterface_setbaseuri, 0, 1, IS_OBJECT, "Phalcon\\UrlInterface", 0) -#endif -#if PHP_VERSION_ID >= 70200 - ZEND_ARG_TYPE_INFO(0, baseUri, IS_STRING, 0) -#else - ZEND_ARG_INFO(0, baseUri) -#endif -ZEND_END_ARG_INFO() - -#if PHP_VERSION_ID >= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_urlinterface_path, 0, 0, IS_STRING, 0) -#else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_urlinterface_path, 0, 0, IS_STRING, NULL, 0) -#endif -#if PHP_VERSION_ID >= 70200 - ZEND_ARG_TYPE_INFO(0, path, IS_STRING, 1) -#else - ZEND_ARG_INFO(0, path) -#endif -ZEND_END_ARG_INFO() - -ZEPHIR_INIT_FUNCS(phalcon_urlinterface_method_entry) { - PHP_ABSTRACT_ME(Phalcon_UrlInterface, get, arginfo_phalcon_urlinterface_get) - PHP_ABSTRACT_ME(Phalcon_UrlInterface, getBasePath, arginfo_phalcon_urlinterface_getbasepath) - PHP_ABSTRACT_ME(Phalcon_UrlInterface, getBaseUri, arginfo_phalcon_urlinterface_getbaseuri) - PHP_ABSTRACT_ME(Phalcon_UrlInterface, setBasePath, arginfo_phalcon_urlinterface_setbasepath) - PHP_ABSTRACT_ME(Phalcon_UrlInterface, setBaseUri, arginfo_phalcon_urlinterface_setbaseuri) - PHP_ABSTRACT_ME(Phalcon_UrlInterface, path, arginfo_phalcon_urlinterface_path) - PHP_FE_END -}; diff --git a/ext/phalcon/validation/validator/confirmation.zep.c b/ext/phalcon/validation/validator/confirmation.zep.c index 711d147b683..69bfd2af788 100644 --- a/ext/phalcon/validation/validator/confirmation.zep.c +++ b/ext/phalcon/validation/validator/confirmation.zep.c @@ -202,12 +202,12 @@ PHP_METHOD(Phalcon_Validation_Validator_Confirmation, compare) { } ZEPHIR_INIT_VAR(&_3$$3); ZVAL_STRING(&_3$$3, "utf-8"); - ZEPHIR_CALL_FUNCTION(&_4$$3, "mb_strtolower", NULL, 443, &a, &_3$$3); + ZEPHIR_CALL_FUNCTION(&_4$$3, "mb_strtolower", NULL, 444, &a, &_3$$3); zephir_check_call_status(); zephir_get_strval(&a, &_4$$3); ZEPHIR_INIT_NVAR(&_3$$3); ZVAL_STRING(&_3$$3, "utf-8"); - ZEPHIR_CALL_FUNCTION(&_5$$3, "mb_strtolower", NULL, 443, &b, &_3$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "mb_strtolower", NULL, 444, &b, &_3$$3); zephir_check_call_status(); zephir_get_strval(&b, &_5$$3); } diff --git a/ext/phalcon/validation/validator/uniqueness.zep.c b/ext/phalcon/validation/validator/uniqueness.zep.c index 818bbb27c15..9c61d99a00e 100644 --- a/ext/phalcon/validation/validator/uniqueness.zep.c +++ b/ext/phalcon/validation/validator/uniqueness.zep.c @@ -487,7 +487,7 @@ PHP_METHOD(Phalcon_Validation_Validator_Uniqueness, isUniquenessModel) { zephir_array_keys(&_9$$6, &except TSRMLS_CC); ZVAL_LONG(&_10$$6, 0); ZVAL_LONG(&_11$$6, (zephir_fast_count_int(&except TSRMLS_CC) - 1)); - ZEPHIR_CALL_FUNCTION(&_12$$6, "range", &_13, 441, &_10$$6, &_11$$6); + ZEPHIR_CALL_FUNCTION(&_12$$6, "range", &_13, 442, &_10$$6, &_11$$6); zephir_check_call_status(); _8$$6 = !ZEPHIR_IS_IDENTICAL(&_9$$6, &_12$$6); } From be2192a932f599c988d20cbc012a78b664b896d9 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Fri, 22 Feb 2019 17:11:29 -0500 Subject: [PATCH 6/7] [#13844] - Fixing mcall warnings in compilation --- phalcon/logger/formatter/syslog.zep | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/phalcon/logger/formatter/syslog.zep b/phalcon/logger/formatter/syslog.zep index 7a1956caf85..4baad2baed6 100644 --- a/phalcon/logger/formatter/syslog.zep +++ b/phalcon/logger/formatter/syslog.zep @@ -29,7 +29,9 @@ class Syslog extends AbstractFormatter */ public function format( item) -> array { - var message = item->getMessage(), + var context, message, type; + + let message = item->getMessage(), type = item->getType(), context = item->getContext(); From 52c5b2fe054e13bf0c92e2dc4a83f40bd78b2435 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Fri, 22 Feb 2019 17:11:44 -0500 Subject: [PATCH 7/7] [#13844] - Updating ext --- ext/config.m4 | 6 +- ext/config.w32 | 6 +- ext/phalcon.c | 12 +- ext/phalcon.h | 6 +- ext/phalcon/cli/dispatcher.zep.c | 22 +- ext/phalcon/config.zep.c | 32 +- ext/phalcon/config.zep.h | 2 +- ext/phalcon/di.zep.c | 67 +- ext/phalcon/di/factorydefault.zep.c | 2 +- ext/phalcon/di/injectable.zep.c | 2 +- ext/phalcon/dispatcher.zep.c | 122 ++-- ext/phalcon/dispatcher.zep.h | 14 + ext/phalcon/logger/formatter/syslog.zep.c | 4 +- ext/phalcon/mvc/model.zep.c | 293 ++++---- ext/phalcon/mvc/view.zep.c | 4 +- ext/phalcon/mvc/view/engine/php.zep.c | 2 +- ext/phalcon/mvc/view/engine/volt.zep.c | 85 ++- .../mvc/view/engine/volt/compiler.zep.c | 134 ++-- ext/phalcon/mvc/view/simple.zep.c | 6 +- .../paginator/adapter/nativearray.zep.c | 2 +- ext/phalcon/queue/beanstalk.zep.c | 60 +- ext/phalcon/registry.zep.c | 18 +- ext/phalcon/security.zep.c | 8 +- ext/phalcon/security/random.zep.c | 26 +- ext/phalcon/session/adapter/files.zep.c | 6 +- .../session/adapter/libmemcached.zep.c | 2 +- ext/phalcon/session/bag.zep.c | 2 +- ext/phalcon/session/manager.zep.c | 26 +- ext/phalcon/tag.zep.c | 42 +- ext/phalcon/tag.zep.h | 4 +- ext/phalcon/tag/select.zep.c | 6 +- ext/phalcon/text.zep.c | 40 +- ext/phalcon/translate/adapter/csv.zep.c | 4 +- ext/phalcon/translate/adapter/gettext.zep.c | 20 +- .../translate/interpolator/indexedarray.zep.c | 2 +- ext/phalcon/url.zep.c | 625 ++++++++++++++++++ ext/phalcon/url.zep.h | 134 ++++ ext/phalcon/url/exception.zep.c | 37 ++ ext/phalcon/url/exception.zep.h | 5 + ext/phalcon/urlinterface.zep.c | 68 ++ ext/phalcon/urlinterface.zep.h | 78 +++ .../validation/validator/confirmation.zep.c | 4 +- .../validation/validator/uniqueness.zep.c | 2 +- 43 files changed, 1552 insertions(+), 490 deletions(-) create mode 100644 ext/phalcon/url.zep.c create mode 100644 ext/phalcon/url.zep.h create mode 100644 ext/phalcon/url/exception.zep.c create mode 100644 ext/phalcon/url/exception.zep.h create mode 100644 ext/phalcon/urlinterface.zep.c create mode 100644 ext/phalcon/urlinterface.zep.h diff --git a/ext/config.m4 b/ext/config.m4 index ffef614e04b..ba72f641cf4 100644 --- a/ext/config.m4 +++ b/ext/config.m4 @@ -120,12 +120,12 @@ if test "$PHP_PHALCON" = "yes"; then phalcon/mvc/router.zep.c phalcon/mvc/router/groupinterface.zep.c phalcon/mvc/router/routeinterface.zep.c - phalcon/mvc/urlinterface.zep.c phalcon/mvc/view/exception.zep.c phalcon/mvc/viewinterface.zep.c phalcon/paginator/repositoryinterface.zep.c phalcon/session/baginterface.zep.c phalcon/session/managerinterface.zep.c + phalcon/urlinterface.zep.c phalcon/validation/combinedfieldsvalidator.zep.c phalcon/validationinterface.zep.c phalcon/acl.zep.c @@ -353,8 +353,6 @@ if test "$PHP_PHALCON" = "yes"; then phalcon/mvc/router/exception.zep.c phalcon/mvc/router/group.zep.c phalcon/mvc/router/route.zep.c - phalcon/mvc/url.zep.c - phalcon/mvc/url/exception.zep.c phalcon/mvc/view.zep.c phalcon/mvc/view/engine/php.zep.c phalcon/mvc/view/engine/volt.zep.c @@ -395,6 +393,8 @@ if test "$PHP_PHALCON" = "yes"; then phalcon/translate/factory.zep.c phalcon/translate/interpolator/associativearray.zep.c phalcon/translate/interpolator/indexedarray.zep.c + phalcon/url.zep.c + phalcon/url/exception.zep.c phalcon/validation.zep.c phalcon/validation/exception.zep.c phalcon/validation/validator/alnum.zep.c diff --git a/ext/config.w32 b/ext/config.w32 index b5eedd33e1d..9357471abfb 100644 --- a/ext/config.w32 +++ b/ext/config.w32 @@ -14,7 +14,7 @@ if (PHP_PHALCON != "no") { ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/model/query", "scanner.c parser.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/view/engine/volt", "parser.c scanner.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/url", "utils.c", "phalcon"); - ADD_SOURCES(configure_module_dirname + "/phalcon", "exception.zep.c factoryinterface.zep.c factory.zep.c dispatcherinterface.zep.c config.zep.c utility.zep.c diinterface.zep.c flashinterface.zep.c application.zep.c di.zep.c dispatcher.zep.c flash.zep.c cryptinterface.zep.c escaperinterface.zep.c validationinterface.zep.c acl.zep.c container.zep.c crypt.zep.c db.zep.c debug.zep.c escaper.zep.c image.zep.c kernel.zep.c loader.zep.c logger.zep.c plugin.zep.c registry.zep.c security.zep.c tag.zep.c text.zep.c translate.zep.c validation.zep.c version.zep.c 0__closure.zep.c 1__closure.zep.c 2__closure.zep.c 3__closure.zep.c 4__closure.zep.c 5__closure.zep.c 6__closure.zep.c 7__closure.zep.c 8__closure.zep.c 9__closure.zep.c 10__closure.zep.c 11__closure.zep.c 12__closure.zep.c 13__closure.zep.c 14__closure.zep.c 15__closure.zep.c 16__closure.zep.c 17__closure.zep.c 18__closure.zep.c 19__closure.zep.c 20__closure.zep.c 21__closure.zep.c 22__closure.zep.c 23__closure.zep.c 24__closure.zep.c 25__closure.zep.c 26__closure.zep.c 27__closure.zep.c", "phalcon"); + ADD_SOURCES(configure_module_dirname + "/phalcon", "exception.zep.c factoryinterface.zep.c factory.zep.c dispatcherinterface.zep.c config.zep.c utility.zep.c diinterface.zep.c flashinterface.zep.c application.zep.c di.zep.c dispatcher.zep.c flash.zep.c cryptinterface.zep.c escaperinterface.zep.c urlinterface.zep.c validationinterface.zep.c acl.zep.c container.zep.c crypt.zep.c db.zep.c debug.zep.c escaper.zep.c image.zep.c kernel.zep.c loader.zep.c logger.zep.c plugin.zep.c registry.zep.c security.zep.c tag.zep.c text.zep.c translate.zep.c url.zep.c validation.zep.c version.zep.c 0__closure.zep.c 1__closure.zep.c 2__closure.zep.c 3__closure.zep.c 4__closure.zep.c 5__closure.zep.c 6__closure.zep.c 7__closure.zep.c 8__closure.zep.c 9__closure.zep.c 10__closure.zep.c 11__closure.zep.c 12__closure.zep.c 13__closure.zep.c 14__closure.zep.c 15__closure.zep.c 16__closure.zep.c 17__closure.zep.c 18__closure.zep.c 19__closure.zep.c 20__closure.zep.c 21__closure.zep.c 22__closure.zep.c 23__closure.zep.c 24__closure.zep.c 25__closure.zep.c 26__closure.zep.c 27__closure.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/di", "injectionawareinterface.zep.c injectable.zep.c exception.zep.c factorydefault.zep.c serviceinterface.zep.c service.zep.c serviceproviderinterface.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/events", "eventsawareinterface.zep.c eventinterface.zep.c managerinterface.zep.c event.zep.c exception.zep.c manager.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/validation", "validatorinterface.zep.c validator.zep.c combinedfieldsvalidator.zep.c exception.zep.c", "phalcon"); @@ -27,7 +27,7 @@ if (PHP_PHALCON != "no") { ADD_SOURCES(configure_module_dirname + "/phalcon/annotations", "adapterinterface.zep.c adapter.zep.c readerinterface.zep.c annotation.zep.c collection.zep.c exception.zep.c factory.zep.c reader.zep.c reflection.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/logger/adapter", "adapterinterface.zep.c abstractadapter.zep.c noop.zep.c stream.zep.c syslog.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/logger/formatter", "formatterinterface.zep.c abstractformatter.zep.c json.zep.c line.zep.c syslog.zep.c", "phalcon"); - ADD_SOURCES(configure_module_dirname + "/phalcon/mvc", "entityinterface.zep.c viewbaseinterface.zep.c routerinterface.zep.c collectioninterface.zep.c controllerinterface.zep.c dispatcherinterface.zep.c modelinterface.zep.c router.zep.c urlinterface.zep.c viewinterface.zep.c application.zep.c collection.zep.c controller.zep.c dispatcher.zep.c micro.zep.c model.zep.c moduledefinitioninterface.zep.c url.zep.c view.zep.c", "phalcon"); + ADD_SOURCES(configure_module_dirname + "/phalcon/mvc", "entityinterface.zep.c viewbaseinterface.zep.c routerinterface.zep.c collectioninterface.zep.c controllerinterface.zep.c dispatcherinterface.zep.c modelinterface.zep.c router.zep.c viewinterface.zep.c application.zep.c collection.zep.c controller.zep.c dispatcher.zep.c micro.zep.c model.zep.c moduledefinitioninterface.zep.c view.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/paginator", "adapterinterface.zep.c adapter.zep.c repositoryinterface.zep.c exception.zep.c factory.zep.c repository.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/translate", "adapterinterface.zep.c adapter.zep.c interpolatorinterface.zep.c exception.zep.c factory.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/db/adapter", "pdo.zep.c", "phalcon"); @@ -89,7 +89,6 @@ if (PHP_PHALCON != "no") { ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/model/binder", "bindableinterface.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/model/metadata/strategy", "annotations.zep.c introspection.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/model/resultset", "complex.zep.c simple.zep.c", "phalcon"); - ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/url", "exception.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/view/engine", "php.zep.c volt.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/view/engine/volt", "compiler.zep.c exception.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/paginator/adapter", "model.zep.c nativearray.zep.c querybuilder.zep.c", "phalcon"); @@ -99,6 +98,7 @@ if (PHP_PHALCON != "no") { ADD_SOURCES(configure_module_dirname + "/phalcon/tag", "exception.zep.c select.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/translate/adapter", "csv.zep.c gettext.zep.c nativearray.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/translate/interpolator", "associativearray.zep.c indexedarray.zep.c", "phalcon"); + ADD_SOURCES(configure_module_dirname + "/phalcon/url", "exception.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/validation/validator", "alnum.zep.c alpha.zep.c between.zep.c callback.zep.c confirmation.zep.c creditcard.zep.c date.zep.c digit.zep.c email.zep.c exception.zep.c exclusionin.zep.c file.zep.c identical.zep.c inclusionin.zep.c ip.zep.c numericality.zep.c presenceof.zep.c regex.zep.c stringlength.zep.c uniqueness.zep.c url.zep.c", "phalcon"); ADD_FLAG("CFLAGS_PHALCON", "/D ZEPHIR_RELEASE /Oi /Ot /Oy /Ob2 /Gs /GF /Gy /GL"); ADD_FLAG("CFLAGS", "/D ZEPHIR_RELEASE /Oi /Ot /Oy /Ob2 /Gs /GF /Gy /GL"); diff --git a/ext/phalcon.c b/ext/phalcon.c index 3e32f3cd7f3..971e9476422 100644 --- a/ext/phalcon.c +++ b/ext/phalcon.c @@ -95,11 +95,11 @@ zend_class_entry *phalcon_mvc_model_transactioninterface_ce; zend_class_entry *phalcon_mvc_modelinterface_ce; zend_class_entry *phalcon_mvc_router_groupinterface_ce; zend_class_entry *phalcon_mvc_router_routeinterface_ce; -zend_class_entry *phalcon_mvc_urlinterface_ce; zend_class_entry *phalcon_mvc_viewinterface_ce; zend_class_entry *phalcon_paginator_repositoryinterface_ce; zend_class_entry *phalcon_session_baginterface_ce; zend_class_entry *phalcon_session_managerinterface_ce; +zend_class_entry *phalcon_urlinterface_ce; zend_class_entry *phalcon_validationinterface_ce; zend_class_entry *phalcon_acl_componentaware_ce; zend_class_entry *phalcon_acl_roleaware_ce; @@ -396,8 +396,6 @@ zend_class_entry *phalcon_mvc_router_annotations_ce; zend_class_entry *phalcon_mvc_router_exception_ce; zend_class_entry *phalcon_mvc_router_group_ce; zend_class_entry *phalcon_mvc_router_route_ce; -zend_class_entry *phalcon_mvc_url_ce; -zend_class_entry *phalcon_mvc_url_exception_ce; zend_class_entry *phalcon_mvc_view_ce; zend_class_entry *phalcon_mvc_view_engine_php_ce; zend_class_entry *phalcon_mvc_view_engine_volt_ce; @@ -438,6 +436,8 @@ zend_class_entry *phalcon_translate_exception_ce; zend_class_entry *phalcon_translate_factory_ce; zend_class_entry *phalcon_translate_interpolator_associativearray_ce; zend_class_entry *phalcon_translate_interpolator_indexedarray_ce; +zend_class_entry *phalcon_url_ce; +zend_class_entry *phalcon_url_exception_ce; zend_class_entry *phalcon_validation_ce; zend_class_entry *phalcon_validation_exception_ce; zend_class_entry *phalcon_validation_validator_alnum_ce; @@ -562,11 +562,11 @@ static PHP_MINIT_FUNCTION(phalcon) ZEPHIR_INIT(Phalcon_Mvc_Model_Transaction_ManagerInterface); ZEPHIR_INIT(Phalcon_Mvc_Router_GroupInterface); ZEPHIR_INIT(Phalcon_Mvc_Router_RouteInterface); - ZEPHIR_INIT(Phalcon_Mvc_UrlInterface); ZEPHIR_INIT(Phalcon_Mvc_ViewInterface); ZEPHIR_INIT(Phalcon_Paginator_RepositoryInterface); ZEPHIR_INIT(Phalcon_Session_BagInterface); ZEPHIR_INIT(Phalcon_Session_ManagerInterface); + ZEPHIR_INIT(Phalcon_UrlInterface); ZEPHIR_INIT(Phalcon_ValidationInterface); ZEPHIR_INIT(Phalcon_Acl_ComponentAware); ZEPHIR_INIT(Phalcon_Acl_RoleAware); @@ -835,8 +835,6 @@ static PHP_MINIT_FUNCTION(phalcon) ZEPHIR_INIT(Phalcon_Mvc_Router_Exception); ZEPHIR_INIT(Phalcon_Mvc_Router_Group); ZEPHIR_INIT(Phalcon_Mvc_Router_Route); - ZEPHIR_INIT(Phalcon_Mvc_Url); - ZEPHIR_INIT(Phalcon_Mvc_Url_Exception); ZEPHIR_INIT(Phalcon_Mvc_View); ZEPHIR_INIT(Phalcon_Mvc_View_Engine_Php); ZEPHIR_INIT(Phalcon_Mvc_View_Engine_Volt); @@ -877,6 +875,8 @@ static PHP_MINIT_FUNCTION(phalcon) ZEPHIR_INIT(Phalcon_Translate_Factory); ZEPHIR_INIT(Phalcon_Translate_Interpolator_AssociativeArray); ZEPHIR_INIT(Phalcon_Translate_Interpolator_IndexedArray); + ZEPHIR_INIT(Phalcon_Url); + ZEPHIR_INIT(Phalcon_Url_Exception); ZEPHIR_INIT(Phalcon_Validation); ZEPHIR_INIT(Phalcon_Validation_Exception); ZEPHIR_INIT(Phalcon_Validation_Validator_Alnum); diff --git a/ext/phalcon.h b/ext/phalcon.h index 46d6ddb97e5..e0da833dc09 100644 --- a/ext/phalcon.h +++ b/ext/phalcon.h @@ -115,12 +115,12 @@ #include "phalcon/mvc/router.zep.h" #include "phalcon/mvc/router/groupinterface.zep.h" #include "phalcon/mvc/router/routeinterface.zep.h" -#include "phalcon/mvc/urlinterface.zep.h" #include "phalcon/mvc/view/exception.zep.h" #include "phalcon/mvc/viewinterface.zep.h" #include "phalcon/paginator/repositoryinterface.zep.h" #include "phalcon/session/baginterface.zep.h" #include "phalcon/session/managerinterface.zep.h" +#include "phalcon/urlinterface.zep.h" #include "phalcon/validation/combinedfieldsvalidator.zep.h" #include "phalcon/validationinterface.zep.h" #include "phalcon/acl.zep.h" @@ -348,8 +348,6 @@ #include "phalcon/mvc/router/exception.zep.h" #include "phalcon/mvc/router/group.zep.h" #include "phalcon/mvc/router/route.zep.h" -#include "phalcon/mvc/url.zep.h" -#include "phalcon/mvc/url/exception.zep.h" #include "phalcon/mvc/view.zep.h" #include "phalcon/mvc/view/engine/php.zep.h" #include "phalcon/mvc/view/engine/volt.zep.h" @@ -390,6 +388,8 @@ #include "phalcon/translate/factory.zep.h" #include "phalcon/translate/interpolator/associativearray.zep.h" #include "phalcon/translate/interpolator/indexedarray.zep.h" +#include "phalcon/url.zep.h" +#include "phalcon/url/exception.zep.h" #include "phalcon/validation.zep.h" #include "phalcon/validation/exception.zep.h" #include "phalcon/validation/validator/alnum.zep.h" diff --git a/ext/phalcon/cli/dispatcher.zep.c b/ext/phalcon/cli/dispatcher.zep.c index 6f1ac5a703b..07ac475f402 100644 --- a/ext/phalcon/cli/dispatcher.zep.c +++ b/ext/phalcon/cli/dispatcher.zep.c @@ -434,36 +434,44 @@ PHP_METHOD(Phalcon_Cli_Dispatcher, callActionMethod) { zend_object *zephir_init_properties_Phalcon_Cli_Dispatcher(zend_class_entry *class_type TSRMLS_DC) { - zval _0, _2, _4, _1$$3, _3$$4, _5$$5; + zval _0, _2, _4, _6, _1$$3, _3$$4, _5$$5, _7$$6; ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_2); ZVAL_UNDEF(&_4); + ZVAL_UNDEF(&_6); ZVAL_UNDEF(&_1$$3); ZVAL_UNDEF(&_3$$4); ZVAL_UNDEF(&_5$$5); + ZVAL_UNDEF(&_7$$6); ZEPHIR_MM_GROW(); { zval local_this_ptr, *this_ptr = &local_this_ptr; ZEPHIR_CREATE_OBJECT(this_ptr, class_type); - zephir_read_property(&_0, this_ptr, SL("_activeMethodMap"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_0, this_ptr, SL("_camelCaseMap"), PH_NOISY_CC | PH_READONLY); if (Z_TYPE_P(&_0) == IS_NULL) { ZEPHIR_INIT_VAR(&_1$$3); array_init(&_1$$3); - zephir_update_property_zval(this_ptr, SL("_activeMethodMap"), &_1$$3); + zephir_update_property_zval(this_ptr, SL("_camelCaseMap"), &_1$$3); } - zephir_read_property(&_2, this_ptr, SL("_params"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_2, this_ptr, SL("_activeMethodMap"), PH_NOISY_CC | PH_READONLY); if (Z_TYPE_P(&_2) == IS_NULL) { ZEPHIR_INIT_VAR(&_3$$4); array_init(&_3$$4); - zephir_update_property_zval(this_ptr, SL("_params"), &_3$$4); + zephir_update_property_zval(this_ptr, SL("_activeMethodMap"), &_3$$4); } - zephir_read_property(&_4, this_ptr, SL("_options"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_4, this_ptr, SL("_params"), PH_NOISY_CC | PH_READONLY); if (Z_TYPE_P(&_4) == IS_NULL) { ZEPHIR_INIT_VAR(&_5$$5); array_init(&_5$$5); - zephir_update_property_zval(this_ptr, SL("_options"), &_5$$5); + zephir_update_property_zval(this_ptr, SL("_params"), &_5$$5); + } + zephir_read_property(&_6, this_ptr, SL("_options"), PH_NOISY_CC | PH_READONLY); + if (Z_TYPE_P(&_6) == IS_NULL) { + ZEPHIR_INIT_VAR(&_7$$6); + array_init(&_7$$6); + zephir_update_property_zval(this_ptr, SL("_options"), &_7$$6); } ZEPHIR_MM_RESTORE(); return Z_OBJ_P(this_ptr); diff --git a/ext/phalcon/config.zep.c b/ext/phalcon/config.zep.c index 8ebaafe4bf9..b2e07d9091f 100644 --- a/ext/phalcon/config.zep.c +++ b/ext/phalcon/config.zep.c @@ -409,17 +409,37 @@ PHP_METHOD(Phalcon_Config, offsetUnset) { PHP_METHOD(Phalcon_Config, merge) { zend_long ZEPHIR_LAST_CALL_STATUS; - zval *config, config_sub; + zval *configParam, configParam_sub, config, _0; zval *this_ptr = getThis(); - ZVAL_UNDEF(&config_sub); + ZVAL_UNDEF(&configParam_sub); + ZVAL_UNDEF(&config); + ZVAL_UNDEF(&_0); ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &config); + zephir_fetch_params(1, 1, 0, &configParam); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_merge", NULL, 13, config); + ZEPHIR_INIT_VAR(&_0); + zephir_gettype(&_0, configParam TSRMLS_CC); + do { + if (ZEPHIR_IS_STRING(&_0, "array")) { + ZEPHIR_INIT_VAR(&config); + object_init_ex(&config, phalcon_config_ce); + ZEPHIR_CALL_METHOD(NULL, &config, "__construct", NULL, 12, configParam); + zephir_check_call_status(); + break; + } + if (ZEPHIR_IS_STRING(&_0, "object")) { + ZEPHIR_CPY_WRT(&config, configParam); + break; + } + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_config_exception_ce, "Invalid data type for merge.", "phalcon/config.zep", 216); + return; + } while(0); + + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_merge", NULL, 13, &config); zephir_check_call_status(); RETURN_MM(); @@ -454,7 +474,7 @@ PHP_METHOD(Phalcon_Config, toArray) { array_init(&arrayConfig); ZEPHIR_CALL_FUNCTION(&_0, "get_object_vars", NULL, 14, this_ptr); zephir_check_call_status(); - zephir_is_iterable(&_0, 0, "phalcon/config.zep", 234); + zephir_is_iterable(&_0, 0, "phalcon/config.zep", 247); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_0), _2, _3, _1) { ZEPHIR_INIT_NVAR(&key); @@ -637,7 +657,7 @@ PHP_METHOD(Phalcon_Config, _merge) { zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&_0, "get_object_vars", NULL, 14, config); zephir_check_call_status(); - zephir_is_iterable(&_0, 0, "phalcon/config.zep", 322); + zephir_is_iterable(&_0, 0, "phalcon/config.zep", 335); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_0), _2, _3, _1) { ZEPHIR_INIT_NVAR(&key); diff --git a/ext/phalcon/config.zep.h b/ext/phalcon/config.zep.h index 23c27566cd0..963cc2b0568 100644 --- a/ext/phalcon/config.zep.h +++ b/ext/phalcon/config.zep.h @@ -63,7 +63,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_config_merge, 0, 1, Phalc #else ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_config_merge, 0, 1, IS_OBJECT, "Phalcon\\Config", 0) #endif - ZEND_ARG_OBJ_INFO(0, config, Phalcon\\Config, 0) + ZEND_ARG_INFO(0, configParam) ZEND_END_ARG_INFO() #if PHP_VERSION_ID >= 70200 diff --git a/ext/phalcon/di.zep.c b/ext/phalcon/di.zep.c index 9da17c0abac..9b4e35682e1 100644 --- a/ext/phalcon/di.zep.c +++ b/ext/phalcon/di.zep.c @@ -471,31 +471,31 @@ PHP_METHOD(Phalcon_Di, getService) { */ PHP_METHOD(Phalcon_Di, get) { - zend_bool _9$$8; - zval _1$$3, _10$$14; + zend_bool _10$$8; + zval _1$$3, _11$$14; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *name_param = NULL, *parameters = NULL, parameters_sub, __$null, service, eventsManager, instance, e, _0, _2$$3, _3$$4, _4$$5, _5$$7, _7$$9, _11$$14; - zval name, _6$$7, _8$$9; + zval *name_param = NULL, *parameters = NULL, parameters_sub, __$null, service, eventsManager, instance, _0, _2$$3, _3$$4, _4$$5, _5$$5, _6$$7, _8$$9, _12$$14; + zval name, _7$$7, _9$$9; zval *this_ptr = getThis(); ZVAL_UNDEF(&name); - ZVAL_UNDEF(&_6$$7); - ZVAL_UNDEF(&_8$$9); + ZVAL_UNDEF(&_7$$7); + ZVAL_UNDEF(&_9$$9); ZVAL_UNDEF(¶meters_sub); ZVAL_NULL(&__$null); ZVAL_UNDEF(&service); ZVAL_UNDEF(&eventsManager); ZVAL_UNDEF(&instance); - ZVAL_UNDEF(&e); ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_2$$3); ZVAL_UNDEF(&_3$$4); ZVAL_UNDEF(&_4$$5); - ZVAL_UNDEF(&_5$$7); - ZVAL_UNDEF(&_7$$9); - ZVAL_UNDEF(&_11$$14); + ZVAL_UNDEF(&_5$$5); + ZVAL_UNDEF(&_6$$7); + ZVAL_UNDEF(&_8$$9); + ZVAL_UNDEF(&_12$$14); ZVAL_UNDEF(&_1$$3); - ZVAL_UNDEF(&_10$$14); + ZVAL_UNDEF(&_11$$14); ZEPHIR_MM_GROW(); zephir_fetch_params(1, 1, 1, &name_param, ¶meters); @@ -546,37 +546,38 @@ PHP_METHOD(Phalcon_Di, get) { ZEPHIR_INIT_VAR(&_4$$5); ZVAL_OBJ(&_4$$5, EG(exception)); Z_ADDREF_P(&_4$$5); + ZEPHIR_INIT_VAR(&_5$$5); if (zephir_instance_of_ev(&_4$$5, phalcon_di_exception_serviceresolutionexception_ce TSRMLS_CC)) { zend_clear_exception(TSRMLS_C); - ZEPHIR_CPY_WRT(&e, &_4$$5); - ZEPHIR_INIT_VAR(&_5$$7); - object_init_ex(&_5$$7, phalcon_di_exception_ce); + ZEPHIR_CPY_WRT(&_5$$5, &_4$$5); ZEPHIR_INIT_VAR(&_6$$7); - ZEPHIR_CONCAT_SVS(&_6$$7, "Service '", &name, "' cannot be resolved"); - ZEPHIR_CALL_METHOD(NULL, &_5$$7, "__construct", NULL, 4, &_6$$7); + object_init_ex(&_6$$7, phalcon_di_exception_ce); + ZEPHIR_INIT_VAR(&_7$$7); + ZEPHIR_CONCAT_SVS(&_7$$7, "Service '", &name, "' cannot be resolved"); + ZEPHIR_CALL_METHOD(NULL, &_6$$7, "__construct", NULL, 4, &_7$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_5$$7, "phalcon/di.zep", 228 TSRMLS_CC); + zephir_throw_exception_debug(&_6$$7, "phalcon/di.zep", 228 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } } } else { if (!(zephir_class_exists(&name, 1 TSRMLS_CC))) { - ZEPHIR_INIT_VAR(&_7$$9); - object_init_ex(&_7$$9, phalcon_di_exception_ce); ZEPHIR_INIT_VAR(&_8$$9); - ZEPHIR_CONCAT_SVS(&_8$$9, "Service '", &name, "' wasn't found in the dependency injection container"); - ZEPHIR_CALL_METHOD(NULL, &_7$$9, "__construct", NULL, 4, &_8$$9); + object_init_ex(&_8$$9, phalcon_di_exception_ce); + ZEPHIR_INIT_VAR(&_9$$9); + ZEPHIR_CONCAT_SVS(&_9$$9, "Service '", &name, "' wasn't found in the dependency injection container"); + ZEPHIR_CALL_METHOD(NULL, &_8$$9, "__construct", NULL, 4, &_9$$9); zephir_check_call_status(); - zephir_throw_exception_debug(&_7$$9, "phalcon/di.zep", 235 TSRMLS_CC); + zephir_throw_exception_debug(&_8$$9, "phalcon/di.zep", 235 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - _9$$8 = Z_TYPE_P(parameters) == IS_ARRAY; - if (_9$$8) { - _9$$8 = ((zephir_fast_count_int(parameters TSRMLS_CC)) ? 1 : 0); + _10$$8 = Z_TYPE_P(parameters) == IS_ARRAY; + if (_10$$8) { + _10$$8 = ((zephir_fast_count_int(parameters TSRMLS_CC)) ? 1 : 0); } - if (_9$$8) { + if (_10$$8) { ZEPHIR_INIT_NVAR(&instance); ZEPHIR_LAST_CALL_STATUS = zephir_create_instance_params(&instance, &name, parameters TSRMLS_CC); zephir_check_call_status(); @@ -594,14 +595,14 @@ PHP_METHOD(Phalcon_Di, get) { } } if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { - ZEPHIR_INIT_VAR(&_10$$14); - zephir_create_array(&_10$$14, 3, 0 TSRMLS_CC); - zephir_array_update_string(&_10$$14, SL("name"), &name, PH_COPY | PH_SEPARATE); - zephir_array_update_string(&_10$$14, SL("parameters"), parameters, PH_COPY | PH_SEPARATE); - zephir_array_update_string(&_10$$14, SL("instance"), &instance, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_VAR(&_11$$14); - ZVAL_STRING(&_11$$14, "di:afterServiceResolve"); - ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_11$$14, this_ptr, &_10$$14); + zephir_create_array(&_11$$14, 3, 0 TSRMLS_CC); + zephir_array_update_string(&_11$$14, SL("name"), &name, PH_COPY | PH_SEPARATE); + zephir_array_update_string(&_11$$14, SL("parameters"), parameters, PH_COPY | PH_SEPARATE); + zephir_array_update_string(&_11$$14, SL("instance"), &instance, PH_COPY | PH_SEPARATE); + ZEPHIR_INIT_VAR(&_12$$14); + ZVAL_STRING(&_12$$14, "di:afterServiceResolve"); + ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", NULL, 0, &_12$$14, this_ptr, &_11$$14); zephir_check_call_status(); } RETURN_CCTOR(&instance); diff --git a/ext/phalcon/di/factorydefault.zep.c b/ext/phalcon/di/factorydefault.zep.c index 68d93536ceb..a71972c547d 100644 --- a/ext/phalcon/di/factorydefault.zep.c +++ b/ext/phalcon/di/factorydefault.zep.c @@ -218,7 +218,7 @@ PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) { ZEPHIR_INIT_NVAR(&_2); object_init_ex(&_2, phalcon_di_service_ce); ZEPHIR_INIT_NVAR(&_3); - ZVAL_STRING(&_3, "Phalcon\\Mvc\\Url"); + ZVAL_STRING(&_3, "Phalcon\\Url"); ZVAL_BOOL(&_4, 1); ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 54, &_3, &_4); zephir_check_call_status(); diff --git a/ext/phalcon/di/injectable.zep.c b/ext/phalcon/di/injectable.zep.c index 11a867043df..dfdd3e1c867 100644 --- a/ext/phalcon/di/injectable.zep.c +++ b/ext/phalcon/di/injectable.zep.c @@ -38,7 +38,7 @@ * * @property \Phalcon\Mvc\Dispatcher|\Phalcon\Mvc\DispatcherInterface $dispatcher * @property \Phalcon\Mvc\Router|\Phalcon\Mvc\RouterInterface $router - * @property \Phalcon\Mvc\Url|\Phalcon\Mvc\UrlInterface $url + * @property \Phalcon\Url|\Phalcon\UrlInterface $url * @property \Phalcon\Http\Request|\Phalcon\Http\RequestInterface $request * @property \Phalcon\Http\Response|\Phalcon\Http\ResponseInterface $response * @property \Phalcon\Http\Response\Cookies|\Phalcon\Http\Response\CookiesInterface $cookies diff --git a/ext/phalcon/dispatcher.zep.c b/ext/phalcon/dispatcher.zep.c index 62cb67d057c..0b662cfc9ea 100644 --- a/ext/phalcon/dispatcher.zep.c +++ b/ext/phalcon/dispatcher.zep.c @@ -18,8 +18,8 @@ #include "kernel/exception.h" #include "kernel/array.h" #include "kernel/fcall.h" -#include "kernel/string.h" #include "kernel/concat.h" +#include "kernel/string.h" #include "ext/spl/spl_exceptions.h" @@ -77,6 +77,8 @@ ZEPHIR_INIT_CLASS(Phalcon_Dispatcher) { zend_declare_property_null(phalcon_dispatcher_ce, SL("_activeMethodMap"), ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_null(phalcon_dispatcher_ce, SL("_camelCaseMap"), ZEND_ACC_PROTECTED TSRMLS_CC); + zend_declare_property_null(phalcon_dispatcher_ce, SL("_previousNamespaceName"), ZEND_ACC_PROTECTED TSRMLS_CC); zend_declare_property_null(phalcon_dispatcher_ce, SL("_previousHandlerName"), ZEND_ACC_PROTECTED TSRMLS_CC); @@ -378,7 +380,7 @@ PHP_METHOD(Phalcon_Dispatcher, setParams) { if (Z_TYPE_P(params) != IS_ARRAY) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_exception_ce, "Parameters must be an Array", "phalcon/dispatcher.zep", 226); + ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_exception_ce, "Parameters must be an Array", "phalcon/dispatcher.zep", 228); return; } zephir_update_property_zval(this_ptr, SL("_params"), params); @@ -511,20 +513,17 @@ PHP_METHOD(Phalcon_Dispatcher, hasParam) { */ PHP_METHOD(Phalcon_Dispatcher, getActiveMethod) { - zval activeMethodName, _0, _1, _8, _2$$3, _3$$3, _4$$3, _5$$3, _6$$3, _7$$3; + zval activeMethodName, _0, _1, _5, _2$$3, _3$$3, _4$$3; zend_long ZEPHIR_LAST_CALL_STATUS; zval *this_ptr = getThis(); ZVAL_UNDEF(&activeMethodName); ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_8); + ZVAL_UNDEF(&_5); ZVAL_UNDEF(&_2$$3); ZVAL_UNDEF(&_3$$3); ZVAL_UNDEF(&_4$$3); - ZVAL_UNDEF(&_5$$3); - ZVAL_UNDEF(&_6$$3); - ZVAL_UNDEF(&_7$$3); ZEPHIR_MM_GROW(); @@ -532,25 +531,17 @@ PHP_METHOD(Phalcon_Dispatcher, getActiveMethod) { zephir_read_property(&_0, this_ptr, SL("_activeMethodMap"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_1, this_ptr, SL("_actionName"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset_fetch(&activeMethodName, &_0, &_1, 0 TSRMLS_CC))) { - ZEPHIR_INIT_VAR(&_2$$3); zephir_read_property(&_3$$3, this_ptr, SL("_actionName"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_INIT_VAR(&_4$$3); - ZVAL_STRING(&_4$$3, "/[_-]+/"); - ZEPHIR_CALL_FUNCTION(&_5$$3, "preg_split", NULL, 58, &_4$$3, &_3$$3); - zephir_check_call_status(); - ZEPHIR_INIT_NVAR(&_4$$3); - ZVAL_STRING(&_4$$3, "ucfirst"); - ZEPHIR_CALL_FUNCTION(&_6$$3, "array_map", NULL, 59, &_4$$3, &_5$$3); + ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "tocamelcase", NULL, 0, &_3$$3); zephir_check_call_status(); - zephir_fast_join_str(&_2$$3, SL(""), &_6$$3 TSRMLS_CC); ZEPHIR_CALL_FUNCTION(&activeMethodName, "lcfirst", NULL, 55, &_2$$3); zephir_check_call_status(); - ZEPHIR_OBS_VAR(&_7$$3); - zephir_read_property(&_7$$3, this_ptr, SL("_actionName"), PH_NOISY_CC); - zephir_update_property_array(this_ptr, SL("_activeMethodMap"), &_7$$3, &activeMethodName TSRMLS_CC); + ZEPHIR_OBS_VAR(&_4$$3); + zephir_read_property(&_4$$3, this_ptr, SL("_actionName"), PH_NOISY_CC); + zephir_update_property_array(this_ptr, SL("_activeMethodMap"), &_4$$3, &activeMethodName TSRMLS_CC); } - zephir_read_property(&_8, this_ptr, SL("_actionSuffix"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CONCAT_VV(return_value, &activeMethodName, &_8); + zephir_read_property(&_5, this_ptr, SL("_actionSuffix"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CONCAT_VV(return_value, &activeMethodName, &_5); RETURN_MM(); } @@ -871,7 +862,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { if (ZEPHIR_IS_FALSE_IDENTICAL(&status)) { RETURN_MM_BOOL(0); } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 434 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 436 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -947,7 +938,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { if (_21$$15) { continue; } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 470 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 472 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -1097,7 +1088,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { zephir_check_call_status(); continue; } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 564 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 566 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -1141,7 +1132,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { zephir_check_call_status(); continue; } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 581 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 583 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -1184,7 +1175,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { if (_75$$42) { continue; } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 614 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 616 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -1231,7 +1222,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { if (_85$$47) { continue; } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 631 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 633 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -1303,7 +1294,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { if (_101$$58) { continue; } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 681 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 683 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -1344,7 +1335,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { if (_111$$63) { continue; } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 695 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 697 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -1384,7 +1375,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { if (_119$$68) { continue; } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 710 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 712 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -1418,7 +1409,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { if (_126$$72) { continue; } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 724 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 726 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -1448,7 +1439,7 @@ PHP_METHOD(Phalcon_Dispatcher, dispatch) { if (ZEPHIR_IS_FALSE_IDENTICAL(&_130$$76)) { RETURN_MM_BOOL(0); } - zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 741 TSRMLS_CC); + zephir_throw_exception_debug(&e, "phalcon/dispatcher.zep", 743 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -1499,11 +1490,11 @@ PHP_METHOD(Phalcon_Dispatcher, forward) { zephir_read_property(&_0, this_ptr, SL("_isControllerInitialize"), PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_exception_ce, "Forwarding inside a controller's initialize() method is forbidden", "phalcon/dispatcher.zep", 772); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_exception_ce, "Forwarding inside a controller's initialize() method is forbidden", "phalcon/dispatcher.zep", 774); return; } if (Z_TYPE_P(forward) != IS_ARRAY) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_exception_ce, "Forward parameter must be an Array", "phalcon/dispatcher.zep", 780); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_exception_ce, "Forward parameter must be an Array", "phalcon/dispatcher.zep", 782); return; } zephir_read_property(&_1, this_ptr, SL("_namespaceName"), PH_NOISY_CC | PH_READONLY); @@ -1578,9 +1569,9 @@ PHP_METHOD(Phalcon_Dispatcher, getHandlerClass) { zephir_read_property(&handlerName, this_ptr, SL("_handlerName"), PH_NOISY_CC); ZEPHIR_OBS_VAR(&namespaceName); zephir_read_property(&namespaceName, this_ptr, SL("_namespaceName"), PH_NOISY_CC); - if (!(zephir_memnstr_str(&handlerName, SL("\\"), "phalcon/dispatcher.zep", 837))) { - ZEPHIR_INIT_VAR(&camelizedClass); - zephir_camelize(&camelizedClass, &handlerName, NULL ); + if (!(zephir_memnstr_str(&handlerName, SL("\\"), "phalcon/dispatcher.zep", 839))) { + ZEPHIR_CALL_METHOD(&camelizedClass, this_ptr, "tocamelcase", NULL, 0, &handlerName); + zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&camelizedClass, &handlerName); } @@ -1703,30 +1694,77 @@ PHP_METHOD(Phalcon_Dispatcher, _resolveEmptyProperties) { } +PHP_METHOD(Phalcon_Dispatcher, toCamelCase) { + + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *input_param = NULL, camelCaseInput, _0, _1$$3, _2$$3, _3$$3; + zval input; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&input); + ZVAL_UNDEF(&camelCaseInput); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1$$3); + ZVAL_UNDEF(&_2$$3); + ZVAL_UNDEF(&_3$$3); + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &input_param); + + zephir_get_strval(&input, input_param); + + + ZEPHIR_OBS_VAR(&camelCaseInput); + zephir_read_property(&_0, this_ptr, SL("_camelCaseMap"), PH_NOISY_CC | PH_READONLY); + if (!(zephir_array_isset_fetch(&camelCaseInput, &_0, &input, 0 TSRMLS_CC))) { + ZEPHIR_INIT_VAR(&_1$$3); + ZVAL_STRING(&_1$$3, "/[_-]+/"); + ZEPHIR_CALL_FUNCTION(&_2$$3, "preg_split", NULL, 58, &_1$$3, &input); + zephir_check_call_status(); + ZEPHIR_INIT_NVAR(&_1$$3); + ZVAL_STRING(&_1$$3, "ucfirst"); + ZEPHIR_CALL_FUNCTION(&_3$$3, "array_map", NULL, 59, &_1$$3, &_2$$3); + zephir_check_call_status(); + ZEPHIR_INIT_NVAR(&camelCaseInput); + zephir_fast_join_str(&camelCaseInput, SL(""), &_3$$3 TSRMLS_CC); + zephir_update_property_array(this_ptr, SL("_camelCaseMap"), &input, &camelCaseInput TSRMLS_CC); + } + RETURN_CCTOR(&camelCaseInput); + +} + zend_object *zephir_init_properties_Phalcon_Dispatcher(zend_class_entry *class_type TSRMLS_DC) { - zval _0, _2, _1$$3, _3$$4; + zval _0, _2, _4, _1$$3, _3$$4, _5$$5; ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_4); ZVAL_UNDEF(&_1$$3); ZVAL_UNDEF(&_3$$4); + ZVAL_UNDEF(&_5$$5); ZEPHIR_MM_GROW(); { zval local_this_ptr, *this_ptr = &local_this_ptr; ZEPHIR_CREATE_OBJECT(this_ptr, class_type); - zephir_read_property(&_0, this_ptr, SL("_activeMethodMap"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_0, this_ptr, SL("_camelCaseMap"), PH_NOISY_CC | PH_READONLY); if (Z_TYPE_P(&_0) == IS_NULL) { ZEPHIR_INIT_VAR(&_1$$3); array_init(&_1$$3); - zephir_update_property_zval(this_ptr, SL("_activeMethodMap"), &_1$$3); + zephir_update_property_zval(this_ptr, SL("_camelCaseMap"), &_1$$3); } - zephir_read_property(&_2, this_ptr, SL("_params"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_2, this_ptr, SL("_activeMethodMap"), PH_NOISY_CC | PH_READONLY); if (Z_TYPE_P(&_2) == IS_NULL) { ZEPHIR_INIT_VAR(&_3$$4); array_init(&_3$$4); - zephir_update_property_zval(this_ptr, SL("_params"), &_3$$4); + zephir_update_property_zval(this_ptr, SL("_activeMethodMap"), &_3$$4); + } + zephir_read_property(&_4, this_ptr, SL("_params"), PH_NOISY_CC | PH_READONLY); + if (Z_TYPE_P(&_4) == IS_NULL) { + ZEPHIR_INIT_VAR(&_5$$5); + array_init(&_5$$5); + zephir_update_property_zval(this_ptr, SL("_params"), &_5$$5); } ZEPHIR_MM_RESTORE(); return Z_OBJ_P(this_ptr); diff --git a/ext/phalcon/dispatcher.zep.h b/ext/phalcon/dispatcher.zep.h index 73c03b163b4..7a6557111ef 100644 --- a/ext/phalcon/dispatcher.zep.h +++ b/ext/phalcon/dispatcher.zep.h @@ -38,6 +38,7 @@ PHP_METHOD(Phalcon_Dispatcher, getHandlerClass); PHP_METHOD(Phalcon_Dispatcher, callActionMethod); PHP_METHOD(Phalcon_Dispatcher, getBoundModels); PHP_METHOD(Phalcon_Dispatcher, _resolveEmptyProperties); +PHP_METHOD(Phalcon_Dispatcher, toCamelCase); zend_object *zephir_init_properties_Phalcon_Dispatcher(zend_class_entry *class_type TSRMLS_DC); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_dispatcher_setdi, 0, 0, 1) @@ -259,6 +260,18 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_dispatcher_getboundmodel #endif ZEND_END_ARG_INFO() +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_dispatcher_tocamelcase, 0, 1, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_dispatcher_tocamelcase, 0, 1, IS_STRING, NULL, 0) +#endif +#if PHP_VERSION_ID >= 70200 + ZEND_ARG_TYPE_INFO(0, input, IS_STRING, 0) +#else + ZEND_ARG_INFO(0, input) +#endif +ZEND_END_ARG_INFO() + ZEPHIR_INIT_FUNCS(phalcon_dispatcher_method_entry) { PHP_ME(Phalcon_Dispatcher, setDI, arginfo_phalcon_dispatcher_setdi, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Dispatcher, getDI, arginfo_phalcon_dispatcher_getdi, ZEND_ACC_PUBLIC) @@ -295,5 +308,6 @@ ZEPHIR_INIT_FUNCS(phalcon_dispatcher_method_entry) { PHP_ME(Phalcon_Dispatcher, callActionMethod, arginfo_phalcon_dispatcher_callactionmethod, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Dispatcher, getBoundModels, arginfo_phalcon_dispatcher_getboundmodels, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Dispatcher, _resolveEmptyProperties, NULL, ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Dispatcher, toCamelCase, arginfo_phalcon_dispatcher_tocamelcase, ZEND_ACC_PROTECTED) PHP_FE_END }; diff --git a/ext/phalcon/logger/formatter/syslog.zep.c b/ext/phalcon/logger/formatter/syslog.zep.c index b29318feefe..162a096657e 100644 --- a/ext/phalcon/logger/formatter/syslog.zep.c +++ b/ext/phalcon/logger/formatter/syslog.zep.c @@ -48,13 +48,13 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Formatter_Syslog) { PHP_METHOD(Phalcon_Logger_Formatter_Syslog, format) { zend_long ZEPHIR_LAST_CALL_STATUS; - zval *item, item_sub, message, type, context, _0$$3; + zval *item, item_sub, context, message, type, _0$$3; zval *this_ptr = getThis(); ZVAL_UNDEF(&item_sub); + ZVAL_UNDEF(&context); ZVAL_UNDEF(&message); ZVAL_UNDEF(&type); - ZVAL_UNDEF(&context); ZVAL_UNDEF(&_0$$3); ZEPHIR_MM_GROW(); diff --git a/ext/phalcon/mvc/model.zep.c b/ext/phalcon/mvc/model.zep.c index 71a9b51d15a..b6a06a3d753 100644 --- a/ext/phalcon/mvc/model.zep.c +++ b/ext/phalcon/mvc/model.zep.c @@ -1837,16 +1837,17 @@ PHP_METHOD(Phalcon_Mvc_Model, find) { */ PHP_METHOD(Phalcon_Mvc_Model, findFirst) { + zend_bool _0; zend_long ZEPHIR_LAST_CALL_STATUS; - zephir_fcall_cache_entry *_0 = NULL; - zval *parameters = NULL, parameters_sub, __$null, params, query, _1; + zephir_fcall_cache_entry *_1 = NULL; + zval *parameters = NULL, parameters_sub, __$null, params, query, _2; zval *this_ptr = getThis(); ZVAL_UNDEF(¶meters_sub); ZVAL_NULL(&__$null); ZVAL_UNDEF(¶ms); ZVAL_UNDEF(&query); - ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2); ZEPHIR_MM_GROW(); zephir_fetch_params(1, 0, 1, ¶meters); @@ -1857,20 +1858,28 @@ PHP_METHOD(Phalcon_Mvc_Model, findFirst) { } - if (Z_TYPE_P(parameters) != IS_ARRAY) { + _0 = Z_TYPE_P(parameters) == IS_STRING; + if (!(_0)) { + _0 = 1 == zephir_is_numeric(parameters); + } + if (Z_TYPE_P(parameters) == IS_NULL) { ZEPHIR_INIT_VAR(¶ms); array_init(¶ms); - if (Z_TYPE_P(parameters) != IS_NULL) { - zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/mvc/model.zep", 1274); - } - } else { + } else if (Z_TYPE_P(parameters) == IS_ARRAY) { ZEPHIR_CPY_WRT(¶ms, parameters); + } else if (_0) { + ZEPHIR_INIT_NVAR(¶ms); + array_init(¶ms); + zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/mvc/model.zep", 1277); + } else { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Parameters passed must be of type array, string, numeric or null", "phalcon/mvc/model.zep", 1279); + return; } - ZVAL_LONG(&_1, 1); - ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_0, 320, ¶ms, &_1); + ZVAL_LONG(&_2, 1); + ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_1, 320, ¶ms, &_2); zephir_check_call_status(); - ZVAL_BOOL(&_1, 1); - ZEPHIR_CALL_METHOD(NULL, &query, "setuniquerow", NULL, 0, &_1); + ZVAL_BOOL(&_2, 1); + ZEPHIR_CALL_METHOD(NULL, &query, "setuniquerow", NULL, 0, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(&query, "execute", NULL, 0); zephir_check_call_status(); @@ -2001,7 +2010,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getChangedFields) { ZEPHIR_OBS_VAR(&snapshot); zephir_read_property(&snapshot, this_ptr, SL("_snapshot"), PH_NOISY_CC); if (Z_TYPE_P(&snapshot) != IS_ARRAY) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record doesn't have a valid data snapshot", "phalcon/mvc/model.zep", 1356); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record doesn't have a valid data snapshot", "phalcon/mvc/model.zep", 1358); return; } ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); @@ -2017,7 +2026,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getChangedFields) { ZEPHIR_INIT_VAR(&changed); array_init(&changed); ZEPHIR_INIT_VAR(&_0); - zephir_is_iterable(&allAttributes, 0, "phalcon/mvc/model.zep", 1409); + zephir_is_iterable(&allAttributes, 0, "phalcon/mvc/model.zep", 1411); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&allAttributes), _2, _3, _1) { ZEPHIR_INIT_NVAR(&name); @@ -2029,17 +2038,17 @@ PHP_METHOD(Phalcon_Mvc_Model, getChangedFields) { ZEPHIR_INIT_NVAR(&_0); ZVAL_COPY(&_0, _1); if (!(zephir_array_isset(&snapshot, &name))) { - zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/mvc/model.zep", 1388); + zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/mvc/model.zep", 1390); continue; } ZEPHIR_OBS_NVAR(&value); if (!(zephir_fetch_property_zval(&value, this_ptr, &name, PH_SILENT_CC))) { - zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/mvc/model.zep", 1396); + zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/mvc/model.zep", 1398); continue; } - zephir_array_fetch(&_4$$6, &snapshot, &name, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1403 TSRMLS_CC); + zephir_array_fetch(&_4$$6, &snapshot, &name, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1405 TSRMLS_CC); if (!ZEPHIR_IS_IDENTICAL(&value, &_4$$6)) { - zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/mvc/model.zep", 1404); + zephir_array_append(&changed, &name, PH_SEPARATE, "phalcon/mvc/model.zep", 1406); continue; } } ZEND_HASH_FOREACH_END(); @@ -2147,7 +2156,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getMessages) { ZEPHIR_INIT_VAR(&filtered); array_init(&filtered); zephir_read_property(&_1$$3, this_ptr, SL("_errorMessages"), PH_NOISY_CC | PH_READONLY); - zephir_is_iterable(&_1$$3, 0, "phalcon/mvc/model.zep", 1470); + zephir_is_iterable(&_1$$3, 0, "phalcon/mvc/model.zep", 1472); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_1$$3), _2$$3) { ZEPHIR_INIT_NVAR(&message); @@ -2155,7 +2164,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getMessages) { ZEPHIR_CALL_METHOD(&_3$$4, &message, "getfield", NULL, 0); zephir_check_call_status(); if (ZEPHIR_IS_EQUAL(&_3$$4, filter)) { - zephir_array_append(&filtered, &message, PH_SEPARATE, "phalcon/mvc/model.zep", 1467); + zephir_array_append(&filtered, &message, PH_SEPARATE, "phalcon/mvc/model.zep", 1469); } } ZEND_HASH_FOREACH_END(); ZEPHIR_INIT_NVAR(&message); @@ -2205,7 +2214,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getModelsMetaData) { zephir_check_call_status(); ZEPHIR_CPY_WRT(&metaData, &_1$$3); if (Z_TYPE_P(&metaData) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsMetadata' is not valid", "phalcon/mvc/model.zep", 1501); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsMetadata' is not valid", "phalcon/mvc/model.zep", 1503); return; } zephir_update_property_zval(this_ptr, SL("_modelsMetaData"), &metaData); @@ -2334,7 +2343,7 @@ PHP_METHOD(Phalcon_Mvc_Model, getRelated) { ZEPHIR_CONCAT_SVSVS(&_3$$3, "There is no defined relations for the model '", &className, "' using alias '", &alias, "'"); ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 4, &_3$$3); zephir_check_call_status(); - zephir_throw_exception_debug(&_2$$3, "phalcon/mvc/model.zep", 1568 TSRMLS_CC); + zephir_throw_exception_debug(&_2$$3, "phalcon/mvc/model.zep", 1570 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -2455,21 +2464,21 @@ PHP_METHOD(Phalcon_Mvc_Model, getUpdatedFields) { ZEPHIR_OBS_VAR(&oldSnapshot); zephir_read_property(&oldSnapshot, this_ptr, SL("_oldSnapshot"), PH_NOISY_CC); if (!(ZEPHIR_GLOBAL(orm).update_snapshot_on_save)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Update snapshot on save must be enabled for this method to work properly", "phalcon/mvc/model.zep", 1632); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Update snapshot on save must be enabled for this method to work properly", "phalcon/mvc/model.zep", 1634); return; } if (Z_TYPE_P(&snapshot) != IS_ARRAY) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record doesn't have a valid data snapshot", "phalcon/mvc/model.zep", 1636); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record doesn't have a valid data snapshot", "phalcon/mvc/model.zep", 1638); return; } zephir_read_property(&_0, this_ptr, SL("_dirtyState"), PH_NOISY_CC | PH_READONLY); if (!ZEPHIR_IS_LONG(&_0, 0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Change checking cannot be performed because the object has not been persisted or is deleted", "phalcon/mvc/model.zep", 1643); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Change checking cannot be performed because the object has not been persisted or is deleted", "phalcon/mvc/model.zep", 1645); return; } ZEPHIR_INIT_VAR(&updated); array_init(&updated); - zephir_is_iterable(&snapshot, 0, "phalcon/mvc/model.zep", 1663); + zephir_is_iterable(&snapshot, 0, "phalcon/mvc/model.zep", 1665); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&snapshot), _2, _3, _1) { ZEPHIR_INIT_NVAR(&name); @@ -2481,12 +2490,12 @@ PHP_METHOD(Phalcon_Mvc_Model, getUpdatedFields) { ZEPHIR_INIT_NVAR(&value); ZVAL_COPY(&value, _1); if (!(zephir_array_isset(&oldSnapshot, &name))) { - zephir_array_append(&updated, &name, PH_SEPARATE, "phalcon/mvc/model.zep", 1653); + zephir_array_append(&updated, &name, PH_SEPARATE, "phalcon/mvc/model.zep", 1655); continue; } - zephir_array_fetch(&_4$$6, &oldSnapshot, &name, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1657 TSRMLS_CC); + zephir_array_fetch(&_4$$6, &oldSnapshot, &name, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 1659 TSRMLS_CC); if (!ZEPHIR_IS_IDENTICAL(&value, &_4$$6)) { - zephir_array_append(&updated, &name, PH_SEPARATE, "phalcon/mvc/model.zep", 1658); + zephir_array_append(&updated, &name, PH_SEPARATE, "phalcon/mvc/model.zep", 1660); continue; } } ZEND_HASH_FOREACH_END(); @@ -2946,7 +2955,7 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh) { zephir_read_property(&_0, this_ptr, SL("_dirtyState"), PH_NOISY_CC | PH_READONLY); if (!ZEPHIR_IS_LONG(&_0, 0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 1900); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 1902); return; } ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); @@ -2973,7 +2982,7 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh) { ZEPHIR_CALL_METHOD(&_2$$6, this_ptr, "_exists", NULL, 0, &metaData, &readConnection, &table); zephir_check_call_status(); if (!(zephir_is_true(&_2$$6))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 1923); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 1925); return; } ZEPHIR_OBS_NVAR(&uniqueKey); @@ -2982,14 +2991,14 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh) { ZEPHIR_OBS_VAR(&uniqueParams); zephir_read_property(&uniqueParams, this_ptr, SL("_uniqueParams"), PH_NOISY_CC); if (Z_TYPE_P(&uniqueParams) != IS_ARRAY) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 1931); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The record cannot be refreshed because it does not exist or is deleted", "phalcon/mvc/model.zep", 1933); return; } ZEPHIR_INIT_VAR(&fields); array_init(&fields); ZEPHIR_CALL_METHOD(&_3, &metaData, "getattributes", NULL, 0, this_ptr); zephir_check_call_status(); - zephir_is_iterable(&_3, 0, "phalcon/mvc/model.zep", 1945); + zephir_is_iterable(&_3, 0, "phalcon/mvc/model.zep", 1947); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_3), _4) { ZEPHIR_INIT_NVAR(&attribute); @@ -2997,7 +3006,7 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh) { ZEPHIR_INIT_NVAR(&_5$$9); zephir_create_array(&_5$$9, 1, 0 TSRMLS_CC); zephir_array_fast_append(&_5$$9, &attribute); - zephir_array_append(&fields, &_5$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 1939); + zephir_array_append(&fields, &_5$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 1941); } ZEND_HASH_FOREACH_END(); ZEPHIR_INIT_NVAR(&attribute); ZEPHIR_CALL_METHOD(&dialect, &readConnection, "getdialect", NULL, 0); @@ -3151,7 +3160,7 @@ PHP_METHOD(Phalcon_Mvc_Model, save) { zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_6$$11, "__construct", NULL, 324, this_ptr, &_7$$11); zephir_check_call_status(); - zephir_throw_exception_debug(&_6$$11, "phalcon/mvc/model.zep", 2073 TSRMLS_CC); + zephir_throw_exception_debug(&_6$$11, "phalcon/mvc/model.zep", 2075 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -3280,7 +3289,7 @@ PHP_METHOD(Phalcon_Mvc_Model, unserialize) { ZEPHIR_CALL_CE_STATIC(&dependencyInjector, phalcon_di_ce, "getdefault", &_0, 0); zephir_check_call_status(); if (Z_TYPE_P(&dependencyInjector) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injector container is required to obtain the services related to the ORM", "phalcon/mvc/model.zep", 2168); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A dependency injector container is required to obtain the services related to the ORM", "phalcon/mvc/model.zep", 2170); return; } zephir_update_property_zval(this_ptr, SL("_dependencyInjector"), &dependencyInjector); @@ -3290,7 +3299,7 @@ PHP_METHOD(Phalcon_Mvc_Model, unserialize) { zephir_check_call_status(); ZEPHIR_CPY_WRT(&manager, &_1$$3); if (Z_TYPE_P(&manager) != IS_OBJECT) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsManager' is not valid", "phalcon/mvc/model.zep", 2181); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The injected service 'modelsManager' is not valid", "phalcon/mvc/model.zep", 2183); return; } zephir_update_property_zval(this_ptr, SL("_modelsManager"), &manager); @@ -3301,13 +3310,13 @@ PHP_METHOD(Phalcon_Mvc_Model, unserialize) { if (zephir_is_true(&_1$$3)) { if (zephir_array_isset_string_fetch(&snapshot, &attributes, SL("_snapshot"), 1)) { zephir_update_property_zval(this_ptr, SL("_snapshot"), &snapshot); - zephir_array_fetch_string(&_3$$7, &attributes, SL("_attributes"), PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 2196 TSRMLS_CC); + zephir_array_fetch_string(&_3$$7, &attributes, SL("_attributes"), PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 2198 TSRMLS_CC); ZEPHIR_CPY_WRT(&attributes, &_3$$7); } else { zephir_update_property_zval(this_ptr, SL("_snapshot"), &attributes); } } - zephir_is_iterable(&attributes, 0, "phalcon/mvc/model.zep", 2209); + zephir_is_iterable(&attributes, 0, "phalcon/mvc/model.zep", 2211); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&attributes), _5$$3, _6$$3, _4$$3) { ZEPHIR_INIT_NVAR(&key); @@ -3504,7 +3513,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData) { if (Z_TYPE_P(columnMap) == IS_ARRAY) { ZEPHIR_INIT_VAR(&snapshot); array_init(&snapshot); - zephir_is_iterable(&data, 0, "phalcon/mvc/model.zep", 2298); + zephir_is_iterable(&data, 0, "phalcon/mvc/model.zep", 2300); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&data), _1$$3, _2$$3, _0$$3) { ZEPHIR_INIT_NVAR(&key); @@ -3527,7 +3536,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData) { ZEPHIR_CONCAT_SVS(&_4$$7, "Column '", &key, "' doesn't make part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_3$$7, "__construct", &_5, 4, &_4$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_3$$7, "phalcon/mvc/model.zep", 2282 TSRMLS_CC); + zephir_throw_exception_debug(&_3$$7, "phalcon/mvc/model.zep", 2284 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -3544,7 +3553,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setOldSnapshotData) { ZEPHIR_CONCAT_SVS(&_7$$11, "Column '", &key, "' doesn't make part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_6$$11, "__construct", &_5, 4, &_7$$11); zephir_check_call_status(); - zephir_throw_exception_debug(&_6$$11, "phalcon/mvc/model.zep", 2290 TSRMLS_CC); + zephir_throw_exception_debug(&_6$$11, "phalcon/mvc/model.zep", 2292 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -3607,7 +3616,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) { if (Z_TYPE_P(columnMap) == IS_ARRAY) { ZEPHIR_INIT_VAR(&snapshot); array_init(&snapshot); - zephir_is_iterable(&data, 0, "phalcon/mvc/model.zep", 2358); + zephir_is_iterable(&data, 0, "phalcon/mvc/model.zep", 2360); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&data), _1$$3, _2$$3, _0$$3) { ZEPHIR_INIT_NVAR(&key); @@ -3639,7 +3648,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) { ZEPHIR_CONCAT_SVS(&_7$$8, "Column '", &key, "' doesn't make part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_6$$8, "__construct", &_8, 4, &_7$$8); zephir_check_call_status(); - zephir_throw_exception_debug(&_6$$8, "phalcon/mvc/model.zep", 2340 TSRMLS_CC); + zephir_throw_exception_debug(&_6$$8, "phalcon/mvc/model.zep", 2342 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -3656,7 +3665,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) { ZEPHIR_CONCAT_SVS(&_10$$12, "Column '", &key, "' doesn't make part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_9$$12, "__construct", &_8, 4, &_10$$12); zephir_check_call_status(); - zephir_throw_exception_debug(&_9$$12, "phalcon/mvc/model.zep", 2349 TSRMLS_CC); + zephir_throw_exception_debug(&_9$$12, "phalcon/mvc/model.zep", 2351 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -3978,7 +3987,7 @@ PHP_METHOD(Phalcon_Mvc_Model, toArray) { zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_0, &metaData, "getattributes", NULL, 0, this_ptr); zephir_check_call_status(); - zephir_is_iterable(&_0, 0, "phalcon/mvc/model.zep", 2601); + zephir_is_iterable(&_0, 0, "phalcon/mvc/model.zep", 2603); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _1) { ZEPHIR_INIT_NVAR(&attribute); @@ -4002,7 +4011,7 @@ PHP_METHOD(Phalcon_Mvc_Model, toArray) { ZEPHIR_CONCAT_SVS(&_6$$7, "Column '", &attribute, "' doesn't make part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_5$$7, "__construct", &_7, 4, &_6$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_5$$7, "phalcon/mvc/model.zep", 2579 TSRMLS_CC); + zephir_throw_exception_debug(&_5$$7, "phalcon/mvc/model.zep", 2581 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } else { @@ -4179,7 +4188,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { ZEPHIR_CALL_METHOD(&belongsTo, &manager, "getbelongsto", NULL, 0, this_ptr); zephir_check_call_status(); error = 0; - zephir_is_iterable(&belongsTo, 0, "phalcon/mvc/model.zep", 2798); + zephir_is_iterable(&belongsTo, 0, "phalcon/mvc/model.zep", 2800); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&belongsTo), _1) { ZEPHIR_INIT_NVAR(&relation); @@ -4194,7 +4203,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { if (Z_TYPE_P(&foreignKey) == IS_ARRAY) { if (zephir_array_isset_string(&foreignKey, SL("action"))) { ZEPHIR_OBS_NVAR(&_2$$6); - zephir_array_fetch_string(&_2$$6, &foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 2700 TSRMLS_CC); + zephir_array_fetch_string(&_2$$6, &foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 2702 TSRMLS_CC); action = zephir_get_intval(&_2$$6); } } @@ -4215,7 +4224,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { ZEPHIR_CALL_METHOD(&referencedFields, &relation, "getreferencedfields", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&fields) == IS_ARRAY) { - zephir_is_iterable(&fields, 0, "phalcon/mvc/model.zep", 2738); + zephir_is_iterable(&fields, 0, "phalcon/mvc/model.zep", 2740); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _6$$8, _7$$8, _5$$8) { ZEPHIR_INIT_NVAR(&position); @@ -4228,11 +4237,11 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { ZVAL_COPY(&field, _5$$8); ZEPHIR_OBS_NVAR(&value); zephir_fetch_property_zval(&value, this_ptr, &field, PH_SILENT_CC); - zephir_array_fetch(&_8$$9, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 2731 TSRMLS_CC); + zephir_array_fetch(&_8$$9, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 2733 TSRMLS_CC); ZEPHIR_INIT_LNVAR(_9$$9); ZEPHIR_CONCAT_SVSV(&_9$$9, "[", &_8$$9, "] = ?", &position); - zephir_array_append(&conditions, &_9$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 2731); - zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2732); + zephir_array_append(&conditions, &_9$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 2733); + zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2734); if (Z_TYPE_P(&value) == IS_NULL) { numberNull++; } @@ -4245,15 +4254,15 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysRestrict) { zephir_fetch_property_zval(&value, this_ptr, &fields, PH_SILENT_CC); ZEPHIR_INIT_LNVAR(_10$$11); ZEPHIR_CONCAT_SVS(&_10$$11, "[", &referencedFields, "] = ?0"); - zephir_array_append(&conditions, &_10$$11, PH_SEPARATE, "phalcon/mvc/model.zep", 2743); - zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2744); + zephir_array_append(&conditions, &_10$$11, PH_SEPARATE, "phalcon/mvc/model.zep", 2745); + zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2746); if (Z_TYPE_P(&value) == IS_NULL) { validateWithNulls = 1; } } ZEPHIR_OBS_NVAR(&extraConditions); if (zephir_array_isset_string_fetch(&extraConditions, &foreignKey, SL("conditions"), 0)) { - zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 2755); + zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 2757); } if (validateWithNulls) { ZEPHIR_OBS_NVAR(&allowNulls); @@ -4358,7 +4367,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseCascade) { ZEPHIR_CPY_WRT(&manager, &_0); ZEPHIR_CALL_METHOD(&relations, &manager, "gethasoneandhasmany", NULL, 0, this_ptr); zephir_check_call_status(); - zephir_is_iterable(&relations, 0, "phalcon/mvc/model.zep", 2911); + zephir_is_iterable(&relations, 0, "phalcon/mvc/model.zep", 2913); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relations), _1) { ZEPHIR_INIT_NVAR(&relation); @@ -4372,7 +4381,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseCascade) { if (Z_TYPE_P(&foreignKey) == IS_ARRAY) { if (zephir_array_isset_string(&foreignKey, SL("action"))) { ZEPHIR_OBS_NVAR(&_2$$6); - zephir_array_fetch_string(&_2$$6, &foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 2850 TSRMLS_CC); + zephir_array_fetch_string(&_2$$6, &foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 2852 TSRMLS_CC); action = zephir_get_intval(&_2$$6); } } @@ -4392,7 +4401,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseCascade) { ZEPHIR_INIT_NVAR(&bindParams); array_init(&bindParams); if (Z_TYPE_P(&fields) == IS_ARRAY) { - zephir_is_iterable(&fields, 0, "phalcon/mvc/model.zep", 2880); + zephir_is_iterable(&fields, 0, "phalcon/mvc/model.zep", 2882); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _6$$8, _7$$8, _5$$8) { ZEPHIR_INIT_NVAR(&position); @@ -4405,11 +4414,11 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseCascade) { ZVAL_COPY(&field, _5$$8); ZEPHIR_OBS_NVAR(&value); zephir_fetch_property_zval(&value, this_ptr, &field, PH_SILENT_CC); - zephir_array_fetch(&_8$$9, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 2877 TSRMLS_CC); + zephir_array_fetch(&_8$$9, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 2879 TSRMLS_CC); ZEPHIR_INIT_LNVAR(_9$$9); ZEPHIR_CONCAT_SVSV(&_9$$9, "[", &_8$$9, "] = ?", &position); - zephir_array_append(&conditions, &_9$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 2877); - zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2878); + zephir_array_append(&conditions, &_9$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 2879); + zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2880); } ZEND_HASH_FOREACH_END(); ZEPHIR_INIT_NVAR(&field); ZEPHIR_INIT_NVAR(&position); @@ -4418,12 +4427,12 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseCascade) { zephir_fetch_property_zval(&value, this_ptr, &fields, PH_SILENT_CC); ZEPHIR_INIT_LNVAR(_10$$10); ZEPHIR_CONCAT_SVS(&_10$$10, "[", &referencedFields, "] = ?0"); - zephir_array_append(&conditions, &_10$$10, PH_SEPARATE, "phalcon/mvc/model.zep", 2882); - zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2883); + zephir_array_append(&conditions, &_10$$10, PH_SEPARATE, "phalcon/mvc/model.zep", 2884); + zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2885); } ZEPHIR_OBS_NVAR(&extraConditions); if (zephir_array_isset_string_fetch(&extraConditions, &foreignKey, SL("conditions"), 0)) { - zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 2890); + zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 2892); } ZEPHIR_INIT_NVAR(&_11$$3); zephir_create_array(&_11$$3, 2, 0 TSRMLS_CC); @@ -4492,7 +4501,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseRestrict) { ZEPHIR_CALL_METHOD(&relations, &manager, "gethasoneandhasmany", NULL, 0, this_ptr); zephir_check_call_status(); error = 0; - zephir_is_iterable(&relations, 0, "phalcon/mvc/model.zep", 3029); + zephir_is_iterable(&relations, 0, "phalcon/mvc/model.zep", 3031); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relations), _1) { ZEPHIR_INIT_NVAR(&relation); @@ -4506,7 +4515,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseRestrict) { if (Z_TYPE_P(&foreignKey) == IS_ARRAY) { if (zephir_array_isset_string(&foreignKey, SL("action"))) { ZEPHIR_OBS_NVAR(&_2$$6); - zephir_array_fetch_string(&_2$$6, &foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 2957 TSRMLS_CC); + zephir_array_fetch_string(&_2$$6, &foreignKey, SL("action"), PH_NOISY, "phalcon/mvc/model.zep", 2959 TSRMLS_CC); action = zephir_get_intval(&_2$$6); } } @@ -4526,7 +4535,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseRestrict) { ZEPHIR_INIT_NVAR(&bindParams); array_init(&bindParams); if (Z_TYPE_P(&fields) == IS_ARRAY) { - zephir_is_iterable(&fields, 0, "phalcon/mvc/model.zep", 2991); + zephir_is_iterable(&fields, 0, "phalcon/mvc/model.zep", 2993); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _5$$8, _6$$8, _4$$8) { ZEPHIR_INIT_NVAR(&position); @@ -4539,11 +4548,11 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseRestrict) { ZVAL_COPY(&field, _4$$8); ZEPHIR_OBS_NVAR(&value); zephir_fetch_property_zval(&value, this_ptr, &field, PH_SILENT_CC); - zephir_array_fetch(&_7$$9, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 2987 TSRMLS_CC); + zephir_array_fetch(&_7$$9, &referencedFields, &position, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 2989 TSRMLS_CC); ZEPHIR_INIT_LNVAR(_8$$9); ZEPHIR_CONCAT_SVSV(&_8$$9, "[", &_7$$9, "] = ?", &position); - zephir_array_append(&conditions, &_8$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 2987); - zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2988); + zephir_array_append(&conditions, &_8$$9, PH_SEPARATE, "phalcon/mvc/model.zep", 2989); + zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2990); } ZEND_HASH_FOREACH_END(); ZEPHIR_INIT_NVAR(&field); ZEPHIR_INIT_NVAR(&position); @@ -4552,12 +4561,12 @@ PHP_METHOD(Phalcon_Mvc_Model, _checkForeignKeysReverseRestrict) { zephir_fetch_property_zval(&value, this_ptr, &fields, PH_SILENT_CC); ZEPHIR_INIT_LNVAR(_9$$10); ZEPHIR_CONCAT_SVS(&_9$$10, "[", &referencedFields, "] = ?0"); - zephir_array_append(&conditions, &_9$$10, PH_SEPARATE, "phalcon/mvc/model.zep", 2993); - zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2994); + zephir_array_append(&conditions, &_9$$10, PH_SEPARATE, "phalcon/mvc/model.zep", 2995); + zephir_array_append(&bindParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 2996); } ZEPHIR_OBS_NVAR(&extraConditions); if (zephir_array_isset_string_fetch(&extraConditions, &foreignKey, SL("conditions"), 0)) { - zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 3001); + zephir_array_append(&conditions, &extraConditions, PH_SEPARATE, "phalcon/mvc/model.zep", 3003); } ZEPHIR_INIT_NVAR(&_11$$3); zephir_create_array(&_11$$3, 2, 0 TSRMLS_CC); @@ -4687,7 +4696,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { ZEPHIR_INIT_NVAR(&columnMap); ZVAL_NULL(&columnMap); } - zephir_is_iterable(&attributes, 0, "phalcon/mvc/model.zep", 3138); + zephir_is_iterable(&attributes, 0, "phalcon/mvc/model.zep", 3140); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _1) { ZEPHIR_INIT_NVAR(&field); @@ -4701,7 +4710,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { ZEPHIR_CONCAT_SVS(&_3$$7, "Column '", &field, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_2$$7, "__construct", &_4, 4, &_3$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_2$$7, "phalcon/mvc/model.zep", 3083 TSRMLS_CC); + zephir_throw_exception_debug(&_2$$7, "phalcon/mvc/model.zep", 3085 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -4731,25 +4740,25 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { ZEPHIR_CONCAT_SVS(&_8$$14, "Column '", &field, "' have not defined a bind data type"); ZEPHIR_CALL_METHOD(NULL, &_7$$14, "__construct", &_4, 4, &_8$$14); zephir_check_call_status(); - zephir_throw_exception_debug(&_7$$14, "phalcon/mvc/model.zep", 3112 TSRMLS_CC); + zephir_throw_exception_debug(&_7$$14, "phalcon/mvc/model.zep", 3114 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/mvc/model.zep", 3115); - zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3115); - zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 3115); + zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/mvc/model.zep", 3117); + zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3117); + zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 3117); } else { if (zephir_array_isset(&defaultValues, &field)) { ZEPHIR_CALL_METHOD(&_9$$16, connection, "getdefaultvalue", &_10, 0); zephir_check_call_status(); - zephir_array_append(&values, &_9$$16, PH_SEPARATE, "phalcon/mvc/model.zep", 3119); + zephir_array_append(&values, &_9$$16, PH_SEPARATE, "phalcon/mvc/model.zep", 3121); zephir_array_update_zval(&snapshot, &attributeField, &__$null, PH_COPY | PH_SEPARATE); } else { - zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3125); + zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3127); zephir_array_update_zval(&snapshot, &attributeField, &value, PH_COPY | PH_SEPARATE); } - zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/mvc/model.zep", 3129); - zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 3129); + zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/mvc/model.zep", 3131); + zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 3131); } } } @@ -4762,7 +4771,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { zephir_check_call_status(); useExplicitIdentity = zephir_get_boolval(&_11$$18); if (useExplicitIdentity) { - zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/mvc/model.zep", 3147); + zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/mvc/model.zep", 3149); } if (Z_TYPE_P(&columnMap) == IS_ARRAY) { ZEPHIR_OBS_NVAR(&attributeField); @@ -4773,7 +4782,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { ZEPHIR_CONCAT_SVS(&_13$$21, "Identity column '", identityField, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_12$$21, "__construct", &_4, 4, &_13$$21); zephir_check_call_status(); - zephir_throw_exception_debug(&_12$$21, "phalcon/mvc/model.zep", 3155 TSRMLS_CC); + zephir_throw_exception_debug(&_12$$21, "phalcon/mvc/model.zep", 3157 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -4788,12 +4797,12 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { } if (_14$$23) { if (useExplicitIdentity) { - zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/mvc/model.zep", 3168); - zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 3168); + zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/mvc/model.zep", 3170); + zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 3170); } } else { if (!(useExplicitIdentity)) { - zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/mvc/model.zep", 3176); + zephir_array_append(&fields, identityField, PH_SEPARATE, "phalcon/mvc/model.zep", 3178); } ZEPHIR_OBS_NVAR(&bindType); if (!(zephir_array_isset_fetch(&bindType, &bindDataTypes, identityField, 0 TSRMLS_CC))) { @@ -4803,17 +4812,17 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowInsert) { ZEPHIR_CONCAT_SVS(&_16$$28, "Identity column '", identityField, "' isn\\'t part of the table columns"); ZEPHIR_CALL_METHOD(NULL, &_15$$28, "__construct", &_4, 4, &_16$$28); zephir_check_call_status(); - zephir_throw_exception_debug(&_15$$28, "phalcon/mvc/model.zep", 3183 TSRMLS_CC); + zephir_throw_exception_debug(&_15$$28, "phalcon/mvc/model.zep", 3185 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3186); - zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 3186); + zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3188); + zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 3188); } } else { if (useExplicitIdentity) { - zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/mvc/model.zep", 3190); - zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 3190); + zephir_array_append(&values, &defaultValue, PH_SEPARATE, "phalcon/mvc/model.zep", 3192); + zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 3192); } } } @@ -4970,7 +4979,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_INIT_NVAR(&columnMap); ZVAL_NULL(&columnMap); } - zephir_is_iterable(&nonPrimary, 0, "phalcon/mvc/model.zep", 3404); + zephir_is_iterable(&nonPrimary, 0, "phalcon/mvc/model.zep", 3406); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&nonPrimary), _2) { ZEPHIR_INIT_NVAR(&field); @@ -4984,7 +4993,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_CONCAT_SVS(&_4$$9, "Column '", &field, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_3$$9, "__construct", &_5, 4, &_4$$9); zephir_check_call_status(); - zephir_throw_exception_debug(&_3$$9, "phalcon/mvc/model.zep", 3297 TSRMLS_CC); + zephir_throw_exception_debug(&_3$$9, "phalcon/mvc/model.zep", 3299 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -5000,16 +5009,16 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_CONCAT_SVS(&_7$$12, "Column '", &field, "' have not defined a bind data type"); ZEPHIR_CALL_METHOD(NULL, &_6$$12, "__construct", &_5, 4, &_7$$12); zephir_check_call_status(); - zephir_throw_exception_debug(&_6$$12, "phalcon/mvc/model.zep", 3309 TSRMLS_CC); + zephir_throw_exception_debug(&_6$$12, "phalcon/mvc/model.zep", 3311 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&value); if (zephir_fetch_property_zval(&value, this_ptr, &attributeField, PH_SILENT_CC)) { if (!(useDynamicUpdate)) { - zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/mvc/model.zep", 3323); - zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3323); - zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 3324); + zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/mvc/model.zep", 3325); + zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3325); + zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 3326); } else { ZEPHIR_OBS_NVAR(&snapshotValue); if (!(zephir_array_isset_fetch(&snapshotValue, &snapshot, &attributeField, 0 TSRMLS_CC))) { @@ -5029,7 +5038,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_CONCAT_SVS(&_9$$22, "Column '", &field, "' have not defined a data type"); ZEPHIR_CALL_METHOD(NULL, &_8$$22, "__construct", &_5, 4, &_9$$22); zephir_check_call_status(); - zephir_throw_exception_debug(&_8$$22, "phalcon/mvc/model.zep", 3349 TSRMLS_CC); + zephir_throw_exception_debug(&_8$$22, "phalcon/mvc/model.zep", 3351 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -5059,17 +5068,17 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { } } if (changed) { - zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/mvc/model.zep", 3388); - zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3388); - zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 3389); + zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/mvc/model.zep", 3390); + zephir_array_append(&values, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3390); + zephir_array_append(&bindTypes, &bindType, PH_SEPARATE, "phalcon/mvc/model.zep", 3391); } } zephir_array_update_zval(&newSnapshot, &attributeField, &value, PH_COPY | PH_SEPARATE); } else { zephir_array_update_zval(&newSnapshot, &attributeField, &__$null, PH_COPY | PH_SEPARATE); - zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/mvc/model.zep", 3396); - zephir_array_append(&values, &__$null, PH_SEPARATE, "phalcon/mvc/model.zep", 3396); - zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 3396); + zephir_array_append(&fields, &field, PH_SEPARATE, "phalcon/mvc/model.zep", 3398); + zephir_array_append(&values, &__$null, PH_SEPARATE, "phalcon/mvc/model.zep", 3398); + zephir_array_append(&bindTypes, &bindSkip, PH_SEPARATE, "phalcon/mvc/model.zep", 3398); } } } ZEND_HASH_FOREACH_END(); @@ -5090,12 +5099,12 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_CALL_METHOD(&primaryKeys, metaData, "getprimarykeyattributes", NULL, 0, this_ptr); zephir_check_call_status(); if (!(zephir_fast_count_int(&primaryKeys TSRMLS_CC))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A primary key must be defined in the model in order to perform the operation", "phalcon/mvc/model.zep", 3426); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A primary key must be defined in the model in order to perform the operation", "phalcon/mvc/model.zep", 3428); return; } ZEPHIR_INIT_NVAR(&uniqueParams); array_init(&uniqueParams); - zephir_is_iterable(&primaryKeys, 0, "phalcon/mvc/model.zep", 3451); + zephir_is_iterable(&primaryKeys, 0, "phalcon/mvc/model.zep", 3453); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&primaryKeys), _15$$31) { ZEPHIR_INIT_NVAR(&field); @@ -5109,7 +5118,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_CONCAT_SVS(&_17$$35, "Column '", &field, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_16$$35, "__construct", &_5, 4, &_17$$35); zephir_check_call_status(); - zephir_throw_exception_debug(&_16$$35, "phalcon/mvc/model.zep", 3437 TSRMLS_CC); + zephir_throw_exception_debug(&_16$$35, "phalcon/mvc/model.zep", 3439 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -5119,10 +5128,10 @@ PHP_METHOD(Phalcon_Mvc_Model, _doLowUpdate) { ZEPHIR_OBS_NVAR(&value); if (zephir_fetch_property_zval(&value, this_ptr, &attributeField, PH_SILENT_CC)) { zephir_array_update_zval(&newSnapshot, &attributeField, &value, PH_COPY | PH_SEPARATE); - zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3445); + zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3447); } else { zephir_array_update_zval(&newSnapshot, &attributeField, &__$null, PH_COPY | PH_SEPARATE); - zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/mvc/model.zep", 3448); + zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/mvc/model.zep", 3450); } } ZEND_HASH_FOREACH_END(); ZEPHIR_INIT_NVAR(&field); @@ -5247,7 +5256,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _exists) { array_init(&uniqueParams); ZEPHIR_INIT_NVAR(&uniqueTypes); array_init(&uniqueTypes); - zephir_is_iterable(&primaryKeys, 0, "phalcon/mvc/model.zep", 3562); + zephir_is_iterable(&primaryKeys, 0, "phalcon/mvc/model.zep", 3564); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&primaryKeys), _0$$3) { ZEPHIR_INIT_NVAR(&field); @@ -5261,7 +5270,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _exists) { ZEPHIR_CONCAT_SVS(&_2$$9, "Column '", &field, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_1$$9, "__construct", &_3, 4, &_2$$9); zephir_check_call_status(); - zephir_throw_exception_debug(&_1$$9, "phalcon/mvc/model.zep", 3526 TSRMLS_CC); + zephir_throw_exception_debug(&_1$$9, "phalcon/mvc/model.zep", 3528 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -5279,9 +5288,9 @@ PHP_METHOD(Phalcon_Mvc_Model, _exists) { if (_4$$11) { numberEmpty++; } - zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3544); + zephir_array_append(&uniqueParams, &value, PH_SEPARATE, "phalcon/mvc/model.zep", 3546); } else { - zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/mvc/model.zep", 3547); + zephir_array_append(&uniqueParams, &__$null, PH_SEPARATE, "phalcon/mvc/model.zep", 3549); numberEmpty++; } ZEPHIR_OBS_NVAR(&type); @@ -5292,16 +5301,16 @@ PHP_METHOD(Phalcon_Mvc_Model, _exists) { ZEPHIR_CONCAT_SVS(&_6$$14, "Column '", &field, "' isn't part of the table columns"); ZEPHIR_CALL_METHOD(NULL, &_5$$14, "__construct", &_3, 4, &_6$$14); zephir_check_call_status(); - zephir_throw_exception_debug(&_5$$14, "phalcon/mvc/model.zep", 3552 TSRMLS_CC); + zephir_throw_exception_debug(&_5$$14, "phalcon/mvc/model.zep", 3554 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&uniqueTypes, &type, PH_SEPARATE, "phalcon/mvc/model.zep", 3555); + zephir_array_append(&uniqueTypes, &type, PH_SEPARATE, "phalcon/mvc/model.zep", 3557); ZEPHIR_CALL_METHOD(&_7$$7, connection, "escapeidentifier", &_8, 0, &field); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_9$$7); ZEPHIR_CONCAT_VS(&_9$$7, &_7$$7, " = ?"); - zephir_array_append(&wherePk, &_9$$7, PH_SEPARATE, "phalcon/mvc/model.zep", 3556); + zephir_array_append(&wherePk, &_9$$7, PH_SEPARATE, "phalcon/mvc/model.zep", 3558); } ZEND_HASH_FOREACH_END(); ZEPHIR_INIT_NVAR(&field); if (numberPrimary == numberEmpty) { @@ -5349,7 +5358,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _exists) { ZVAL_NULL(&_13); ZEPHIR_CALL_METHOD(&num, connection, "fetchone", NULL, 0, &_12, &_13, &uniqueParams, &uniqueTypes); zephir_check_call_status(); - zephir_array_fetch_string(&_14, &num, SL("rowcount"), PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 3612 TSRMLS_CC); + zephir_array_fetch_string(&_14, &num, SL("rowcount"), PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 3614 TSRMLS_CC); if (zephir_is_true(&_14)) { ZEPHIR_INIT_ZVAL_NREF(_15$$22); ZVAL_LONG(&_15$$22, 0); @@ -5521,7 +5530,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _groupResult) { ZEPHIR_INIT_VAR(¶ms); array_init(¶ms); if (Z_TYPE_P(parameters) != IS_NULL) { - zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/mvc/model.zep", 3686); + zephir_array_append(¶ms, parameters, PH_SEPARATE, "phalcon/mvc/model.zep", 3688); } } else { ZEPHIR_CPY_WRT(¶ms, parameters); @@ -5661,7 +5670,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _invokeFinder) { ZEPHIR_CONCAT_SVS(&_4$$7, "The static method '", &method, "' requires one argument"); ZEPHIR_CALL_METHOD(NULL, &_3$$7, "__construct", NULL, 4, &_4$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_3$$7, "phalcon/mvc/model.zep", 3798 TSRMLS_CC); + zephir_throw_exception_debug(&_3$$7, "phalcon/mvc/model.zep", 3800 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -5698,7 +5707,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _invokeFinder) { ZEPHIR_CONCAT_SVS(&_8$$13, "Cannot resolve attribute '", &extraMethod, "' in the model"); ZEPHIR_CALL_METHOD(NULL, &_7$$13, "__construct", NULL, 4, &_8$$13); zephir_check_call_status(); - zephir_throw_exception_debug(&_7$$13, "phalcon/mvc/model.zep", 3832 TSRMLS_CC); + zephir_throw_exception_debug(&_7$$13, "phalcon/mvc/model.zep", 3834 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -5872,7 +5881,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _preSave) { ZEPHIR_CALL_METHOD(&emptyStringValues, metaData, "getemptystringattributes", NULL, 0, this_ptr); zephir_check_call_status(); error = 0; - zephir_is_iterable(¬Null, 0, "phalcon/mvc/model.zep", 4018); + zephir_is_iterable(¬Null, 0, "phalcon/mvc/model.zep", 4020); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(¬Null), _7$$12) { ZEPHIR_INIT_NVAR(&field); @@ -5886,7 +5895,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _preSave) { ZEPHIR_CONCAT_SVS(&_9$$19, "Column '", &field, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_8$$19, "__construct", &_10, 4, &_9$$19); zephir_check_call_status(); - zephir_throw_exception_debug(&_8$$19, "phalcon/mvc/model.zep", 3945 TSRMLS_CC); + zephir_throw_exception_debug(&_8$$19, "phalcon/mvc/model.zep", 3947 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -5910,7 +5919,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _preSave) { if (_12$$27) { _13$$27 = !(zephir_array_isset(&defaultValues, &field)); if (!(_13$$27)) { - zephir_array_fetch(&_14$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 3976 TSRMLS_CC); + zephir_array_fetch(&_14$$27, &defaultValues, &field, PH_NOISY | PH_READONLY, "phalcon/mvc/model.zep", 3978 TSRMLS_CC); _13$$27 = !ZEPHIR_IS_IDENTICAL(&value, &_14$$27); } _12$$27 = _13$$27; @@ -6099,7 +6108,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _preSaveRelatedRecords) { ZEPHIR_CALL_METHOD(&_1, this_ptr, "getmodelsmanager", NULL, 0); zephir_check_call_status(); ZEPHIR_CPY_WRT(&manager, &_1); - zephir_is_iterable(related, 0, "phalcon/mvc/model.zep", 4187); + zephir_is_iterable(related, 0, "phalcon/mvc/model.zep", 4189); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(related), _3, _4, _2) { ZEPHIR_INIT_NVAR(&name); @@ -6125,7 +6134,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _preSaveRelatedRecords) { } ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_9, 0, &_8$$6); zephir_check_call_status(); - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects can be stored as part of belongs-to relations", "phalcon/mvc/model.zep", 4134); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects can be stored as part of belongs-to relations", "phalcon/mvc/model.zep", 4136); return; } ZEPHIR_CALL_METHOD(&columns, &relation, "getfields", &_10, 0); @@ -6142,7 +6151,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _preSaveRelatedRecords) { } ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_14, 0, &_13$$7); zephir_check_call_status(); - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/mvc/model.zep", 4143); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/mvc/model.zep", 4145); return; } ZEPHIR_CALL_METHOD(&_15$$5, &record, "save", NULL, 0); @@ -6150,7 +6159,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _preSaveRelatedRecords) { if (!(zephir_is_true(&_15$$5))) { ZEPHIR_CALL_METHOD(&_16$$8, &record, "getmessages", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&_16$$8, 0, "phalcon/mvc/model.zep", 4174); + zephir_is_iterable(&_16$$8, 0, "phalcon/mvc/model.zep", 4176); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_16$$8), _17$$8) { ZEPHIR_INIT_NVAR(&message); @@ -6292,7 +6301,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmodelsmanager", NULL, 0); zephir_check_call_status(); ZEPHIR_CPY_WRT(&manager, &_0); - zephir_is_iterable(related, 0, "phalcon/mvc/model.zep", 4396); + zephir_is_iterable(related, 0, "phalcon/mvc/model.zep", 4398); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(related), _2, _3, _1) { ZEPHIR_INIT_NVAR(&name); @@ -6324,7 +6333,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { } ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_10, 0, &_9$$6); zephir_check_call_status(); - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects/arrays can be stored as part of has-many/has-one/has-many-to-many relations", "phalcon/mvc/model.zep", 4240); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only objects/arrays can be stored as part of has-many/has-one/has-many-to-many relations", "phalcon/mvc/model.zep", 4242); return; } ZEPHIR_CALL_METHOD(&columns, &relation, "getfields", &_11, 0); @@ -6341,7 +6350,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { } ZEPHIR_CALL_METHOD(NULL, connection, "rollback", &_15, 0, &_14$$7); zephir_check_call_status(); - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/mvc/model.zep", 4249); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not implemented", "phalcon/mvc/model.zep", 4251); return; } if (Z_TYPE_P(&record) == IS_OBJECT) { @@ -6366,7 +6375,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { ZEPHIR_CONCAT_SVS(&_19$$10, "The column '", &columns, "' needs to be present in the model"); ZEPHIR_CALL_METHOD(NULL, &_18$$10, "__construct", &_20, 4, &_19$$10); zephir_check_call_status(); - zephir_throw_exception_debug(&_18$$10, "phalcon/mvc/model.zep", 4263 TSRMLS_CC); + zephir_throw_exception_debug(&_18$$10, "phalcon/mvc/model.zep", 4265 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -6381,7 +6390,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { ZEPHIR_CALL_METHOD(&intermediateReferencedFields, &relation, "getintermediatereferencedfields", &_25, 0); zephir_check_call_status(); } - zephir_is_iterable(&relatedRecords, 0, "phalcon/mvc/model.zep", 4382); + zephir_is_iterable(&relatedRecords, 0, "phalcon/mvc/model.zep", 4384); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&relatedRecords), _26$$4) { ZEPHIR_INIT_NVAR(&recordAfter); @@ -6395,7 +6404,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { if (!(zephir_is_true(&_27$$12))) { ZEPHIR_CALL_METHOD(&_28$$14, &recordAfter, "getmessages", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&_28$$14, 0, "phalcon/mvc/model.zep", 4322); + zephir_is_iterable(&_28$$14, 0, "phalcon/mvc/model.zep", 4324); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_28$$14), _29$$14) { ZEPHIR_INIT_NVAR(&message); @@ -6434,7 +6443,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { if (!(zephir_is_true(&_35$$17))) { ZEPHIR_CALL_METHOD(&_36$$18, &intermediateModel, "getmessages", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&_36$$18, 0, "phalcon/mvc/model.zep", 4376); + zephir_is_iterable(&_36$$18, 0, "phalcon/mvc/model.zep", 4378); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_36$$18), _37$$18) { ZEPHIR_INIT_NVAR(&message); @@ -6477,7 +6486,7 @@ PHP_METHOD(Phalcon_Mvc_Model, _postSaveRelatedRecords) { ZEPHIR_CONCAT_SVSVS(&_44$$22, "There are no defined relations for the model '", &className, "' using alias '", &name, "'"); ZEPHIR_CALL_METHOD(NULL, &_43$$22, "__construct", &_20, 4, &_44$$22); zephir_check_call_status(); - zephir_throw_exception_debug(&_43$$22, "phalcon/mvc/model.zep", 4388 TSRMLS_CC); + zephir_throw_exception_debug(&_43$$22, "phalcon/mvc/model.zep", 4390 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } @@ -6536,7 +6545,7 @@ PHP_METHOD(Phalcon_Mvc_Model, allowEmptyStringValues) { ZEPHIR_INIT_VAR(&keysAttributes); array_init(&keysAttributes); - zephir_is_iterable(&attributes, 0, "phalcon/mvc/model.zep", 4428); + zephir_is_iterable(&attributes, 0, "phalcon/mvc/model.zep", 4430); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _0) { ZEPHIR_INIT_NVAR(&attribute); @@ -7110,7 +7119,7 @@ PHP_METHOD(Phalcon_Mvc_Model, skipAttributesOnCreate) { ZEPHIR_INIT_VAR(&keysAttributes); array_init(&keysAttributes); - zephir_is_iterable(&attributes, 0, "phalcon/mvc/model.zep", 4699); + zephir_is_iterable(&attributes, 0, "phalcon/mvc/model.zep", 4701); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _0) { ZEPHIR_INIT_NVAR(&attribute); @@ -7166,7 +7175,7 @@ PHP_METHOD(Phalcon_Mvc_Model, skipAttributesOnUpdate) { ZEPHIR_INIT_VAR(&keysAttributes); array_init(&keysAttributes); - zephir_is_iterable(&attributes, 0, "phalcon/mvc/model.zep", 4730); + zephir_is_iterable(&attributes, 0, "phalcon/mvc/model.zep", 4732); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _0) { ZEPHIR_INIT_NVAR(&attribute); @@ -7378,7 +7387,7 @@ PHP_METHOD(Phalcon_Mvc_Model, caseInsensitiveColumnMap) { ZEPHIR_INIT_VAR(&_0); zephir_array_keys(&_0, columnMap TSRMLS_CC); - zephir_is_iterable(&_0, 0, "phalcon/mvc/model.zep", 4861); + zephir_is_iterable(&_0, 0, "phalcon/mvc/model.zep", 4863); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _1) { ZEPHIR_INIT_NVAR(&cmKey); diff --git a/ext/phalcon/mvc/view.zep.c b/ext/phalcon/mvc/view.zep.c index eb42f1b22bc..765f343e971 100644 --- a/ext/phalcon/mvc/view.zep.c +++ b/ext/phalcon/mvc/view.zep.c @@ -953,7 +953,7 @@ PHP_METHOD(Phalcon_Mvc_View, _loadTemplateEngines) { if (ZEPHIR_IS_EMPTY(®isteredEngines)) { ZEPHIR_INIT_VAR(&_1$$4); object_init_ex(&_1$$4, phalcon_mvc_view_engine_php_ce); - ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 379, this_ptr, &dependencyInjector); + ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 378, this_ptr, &dependencyInjector); zephir_check_call_status(); zephir_array_update_string(&engines, SL(".phtml"), &_1$$4, PH_COPY | PH_SEPARATE); } else { @@ -1089,7 +1089,7 @@ PHP_METHOD(Phalcon_Mvc_View, _engineRender) { { ZEPHIR_INIT_NVAR(&viewsDir); ZVAL_COPY(&viewsDir, _2); - ZEPHIR_CALL_METHOD(&_3$$3, this_ptr, "_isabsolutepath", &_4, 380, &viewPath); + ZEPHIR_CALL_METHOD(&_3$$3, this_ptr, "_isabsolutepath", &_4, 379, &viewPath); zephir_check_call_status(); if (!(zephir_is_true(&_3$$3))) { ZEPHIR_INIT_NVAR(&viewsDirPath); diff --git a/ext/phalcon/mvc/view/engine/php.zep.c b/ext/phalcon/mvc/view/engine/php.zep.c index d36db57aee1..d77da60afbf 100644 --- a/ext/phalcon/mvc/view/engine/php.zep.c +++ b/ext/phalcon/mvc/view/engine/php.zep.c @@ -84,7 +84,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Php, render) { if (mustClean == 1) { - ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 381); + ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 380); zephir_check_call_status(); } if (Z_TYPE_P(params) == IS_ARRAY) { diff --git a/ext/phalcon/mvc/view/engine/volt.zep.c b/ext/phalcon/mvc/view/engine/volt.zep.c index 0182ef2ab99..168476bdf56 100644 --- a/ext/phalcon/mvc/view/engine/volt.zep.c +++ b/ext/phalcon/mvc/view/engine/volt.zep.c @@ -17,8 +17,8 @@ #include "kernel/exception.h" #include "kernel/memory.h" #include "kernel/fcall.h" -#include "kernel/require.h" #include "kernel/operators.h" +#include "kernel/require.h" #include "kernel/string.h" #include "kernel/array.h" #include "kernel/concat.h" @@ -108,18 +108,18 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, getCompiler) { ZEPHIR_INIT_NVAR(&compiler); object_init_ex(&compiler, phalcon_mvc_view_engine_volt_compiler_ce); zephir_read_property(&_0$$3, this_ptr, SL("_view"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(NULL, &compiler, "__construct", NULL, 382, &_0$$3); + ZEPHIR_CALL_METHOD(NULL, &compiler, "__construct", NULL, 381, &_0$$3); zephir_check_call_status(); zephir_read_property(&_1$$3, this_ptr, SL("_dependencyInjector"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&dependencyInjector, &_1$$3); if (Z_TYPE_P(&dependencyInjector) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(NULL, &compiler, "setdi", NULL, 383, &dependencyInjector); + ZEPHIR_CALL_METHOD(NULL, &compiler, "setdi", NULL, 382, &dependencyInjector); zephir_check_call_status(); } ZEPHIR_OBS_VAR(&options); zephir_read_property(&options, this_ptr, SL("_options"), PH_NOISY_CC); if (Z_TYPE_P(&options) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(NULL, &compiler, "setoptions", NULL, 384, &options); + ZEPHIR_CALL_METHOD(NULL, &compiler, "setoptions", NULL, 383, &options); zephir_check_call_status(); } zephir_update_property_zval(this_ptr, SL("_compiler"), &compiler); @@ -133,11 +133,11 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, getCompiler) { */ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, render) { - zend_string *_2$$4; - zend_ulong _1$$4; + zend_string *_6$$8; + zend_ulong _5$$8; zend_long ZEPHIR_LAST_CALL_STATUS; zend_bool mustClean; - zval *templatePath_param = NULL, *params, params_sub, *mustClean_param = NULL, compiler, compiledTemplatePath, key, value, *_0$$4, _3$$5, _4$$6, _5$$6; + zval *templatePath_param = NULL, *params, params_sub, *mustClean_param = NULL, compiler, compiledTemplatePath, eventsManager, key, value, _0$$4, _1$$4, _2$$6, _3$$6, *_4$$8, _7$$9, _8$$10, _9$$10; zval templatePath; zval *this_ptr = getThis(); @@ -145,11 +145,16 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, render) { ZVAL_UNDEF(¶ms_sub); ZVAL_UNDEF(&compiler); ZVAL_UNDEF(&compiledTemplatePath); + ZVAL_UNDEF(&eventsManager); ZVAL_UNDEF(&key); ZVAL_UNDEF(&value); - ZVAL_UNDEF(&_3$$5); - ZVAL_UNDEF(&_4$$6); - ZVAL_UNDEF(&_5$$6); + ZVAL_UNDEF(&_0$$4); + ZVAL_UNDEF(&_1$$4); + ZVAL_UNDEF(&_2$$6); + ZVAL_UNDEF(&_3$$6); + ZVAL_UNDEF(&_7$$9); + ZVAL_UNDEF(&_8$$10); + ZVAL_UNDEF(&_9$$10); ZEPHIR_MM_GROW(); zephir_fetch_params(1, 2, 1, &templatePath_param, ¶ms, &mustClean_param); @@ -172,29 +177,49 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, render) { if (mustClean) { - ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 381); + ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 380); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(&compiler, this_ptr, "getcompiler", NULL, 0); zephir_check_call_status(); + ZEPHIR_OBS_VAR(&eventsManager); + zephir_read_property(&eventsManager, this_ptr, SL("_eventsManager"), PH_NOISY_CC); + if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { + ZEPHIR_INIT_VAR(&_1$$4); + ZVAL_STRING(&_1$$4, "view:beforeCompile"); + ZEPHIR_CALL_METHOD(&_0$$4, &eventsManager, "fire", NULL, 0, &_1$$4, this_ptr); + zephir_check_call_status(); + if (ZEPHIR_IS_FALSE_IDENTICAL(&_0$$4)) { + RETURN_MM_NULL(); + } + } ZEPHIR_CALL_METHOD(NULL, &compiler, "compile", NULL, 0, &templatePath); zephir_check_call_status(); + if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { + ZEPHIR_INIT_VAR(&_3$$6); + ZVAL_STRING(&_3$$6, "view:afterCompile"); + ZEPHIR_CALL_METHOD(&_2$$6, &eventsManager, "fire", NULL, 0, &_3$$6, this_ptr); + zephir_check_call_status(); + if (ZEPHIR_IS_FALSE_IDENTICAL(&_2$$6)) { + RETURN_MM_NULL(); + } + } ZEPHIR_CALL_METHOD(&compiledTemplatePath, &compiler, "getcompiledtemplatepath", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(params) == IS_ARRAY) { - zephir_is_iterable(params, 0, "phalcon/mvc/view/engine/volt.zep", 107); - ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(params), _1$$4, _2$$4, _0$$4) + zephir_is_iterable(params, 0, "phalcon/mvc/view/engine/volt.zep", 120); + ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(params), _5$$8, _6$$8, _4$$8) { ZEPHIR_INIT_NVAR(&key); - if (_2$$4 != NULL) { - ZVAL_STR_COPY(&key, _2$$4); + if (_6$$8 != NULL) { + ZVAL_STR_COPY(&key, _6$$8); } else { - ZVAL_LONG(&key, _1$$4); + ZVAL_LONG(&key, _5$$8); } ZEPHIR_INIT_NVAR(&value); - ZVAL_COPY(&value, _0$$4); - ZEPHIR_CPY_WRT(&_3$$5, &value); - if (zephir_set_symbol(&key, &_3$$5 TSRMLS_CC) == FAILURE) { + ZVAL_COPY(&value, _4$$8); + ZEPHIR_CPY_WRT(&_7$$9, &value); + if (zephir_set_symbol(&key, &_7$$9 TSRMLS_CC) == FAILURE) { return; } } ZEND_HASH_FOREACH_END(); @@ -205,10 +230,10 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, render) { RETURN_MM_NULL(); } if (mustClean) { - zephir_read_property(&_4$$6, this_ptr, SL("_view"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_5$$6, "ob_get_contents", NULL, 116); + zephir_read_property(&_8$$10, this_ptr, SL("_view"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_FUNCTION(&_9$$10, "ob_get_contents", NULL, 116); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_4$$6, "setcontent", NULL, 0, &_5$$6); + ZEPHIR_CALL_METHOD(NULL, &_8$$10, "setcontent", NULL, 0, &_9$$10); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -272,7 +297,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, isIncluded) { } if (Z_TYPE_P(haystack) == IS_STRING) { if ((zephir_function_exists_ex(SL("mb_strpos") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&_0$$5, "mb_strpos", NULL, 385, haystack, needle); + ZEPHIR_CALL_FUNCTION(&_0$$5, "mb_strpos", NULL, 384, haystack, needle); zephir_check_call_status(); RETURN_MM_BOOL(!ZEPHIR_IS_FALSE_IDENTICAL(&_0$$5)); } @@ -280,7 +305,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, isIncluded) { zephir_fast_strpos(&_1$$4, haystack, needle, 0 ); RETURN_MM_BOOL(!ZEPHIR_IS_FALSE_IDENTICAL(&_1$$4)); } - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Invalid haystack", "phalcon/mvc/view/engine/volt.zep", 149); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Invalid haystack", "phalcon/mvc/view/engine/volt.zep", 162); return; } @@ -331,7 +356,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, convertEncoding) { _0 = ZEPHIR_IS_STRING(&to, "utf8"); } if (_0) { - ZEPHIR_RETURN_CALL_FUNCTION("utf8_encode", NULL, 386, &text); + ZEPHIR_RETURN_CALL_FUNCTION("utf8_encode", NULL, 385, &text); zephir_check_call_status(); RETURN_MM(); } @@ -354,7 +379,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, convertEncoding) { zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Any of 'mbstring' or 'iconv' is required to perform the charset conversion", "phalcon/mvc/view/engine/volt.zep", 188); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_exception_ce, "Any of 'mbstring' or 'iconv' is required to perform the charset conversion", "phalcon/mvc/view/engine/volt.zep", 201); return; } @@ -422,7 +447,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, slice) { if (_1$$5) { ZEPHIR_CALL_METHOD(&_2$$6, value, "current", &_3, 0); zephir_check_call_status(); - zephir_array_append(&slice, &_2$$6, PH_SEPARATE, "phalcon/mvc/view/engine/volt.zep", 214); + zephir_array_append(&slice, &_2$$6, PH_SEPARATE, "phalcon/mvc/view/engine/volt.zep", 227); } ZEPHIR_CALL_METHOD(NULL, value, "next", &_4, 0); zephir_check_call_status(); @@ -438,7 +463,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, slice) { } if (Z_TYPE_P(value) == IS_ARRAY) { ZVAL_LONG(&_5$$9, start); - ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 387, value, &_5$$9, &length); + ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 386, value, &_5$$9, &length); zephir_check_call_status(); RETURN_MM(); } @@ -484,7 +509,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, sort) { ZEPHIR_MAKE_REF(&value); - ZEPHIR_CALL_FUNCTION(NULL, "asort", NULL, 388, &value); + ZEPHIR_CALL_FUNCTION(NULL, "asort", NULL, 387, &value); ZEPHIR_UNREF(&value); zephir_check_call_status(); RETURN_CTOR(&value); @@ -539,7 +564,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, callMacro) { ZEPHIR_CONCAT_SVS(&_2$$3, "Macro '", &name, "' does not exist"); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 4, &_2$$3); zephir_check_call_status(); - zephir_throw_exception_debug(&_1$$3, "phalcon/mvc/view/engine/volt.zep", 278 TSRMLS_CC); + zephir_throw_exception_debug(&_1$$3, "phalcon/mvc/view/engine/volt.zep", 291 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } diff --git a/ext/phalcon/mvc/view/engine/volt/compiler.zep.c b/ext/phalcon/mvc/view/engine/volt/compiler.zep.c index 4785bfb7fe9..eaa38a989ec 100644 --- a/ext/phalcon/mvc/view/engine/volt/compiler.zep.c +++ b/ext/phalcon/mvc/view/engine/volt/compiler.zep.c @@ -629,7 +629,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, attributeReader) { } } } else { - ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", NULL, 389, &left); + ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", NULL, 388, &left); zephir_check_call_status(); ZEPHIR_OBS_VAR(&leftType); zephir_array_fetch_string(&leftType, &left, SL("type"), PH_NOISY, "phalcon/mvc/view/engine/volt/compiler.zep", 316 TSRMLS_CC); @@ -651,7 +651,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, attributeReader) { zephir_array_fetch_string(&_9$$11, &right, SL("value"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 329 TSRMLS_CC); zephir_concat_self(&exprCode, &_9$$11 TSRMLS_CC); } else { - ZEPHIR_CALL_METHOD(&_10$$12, this_ptr, "expression", NULL, 389, &right); + ZEPHIR_CALL_METHOD(&_10$$12, this_ptr, "expression", NULL, 388, &right); zephir_check_call_status(); zephir_concat_self(&exprCode, &_10$$12 TSRMLS_CC); } @@ -711,7 +711,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) { ZVAL_NULL(&funcArguments); ZEPHIR_OBS_NVAR(&funcArguments); if (zephir_array_isset_string_fetch(&funcArguments, &expr, SL("arguments"), 0)) { - ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 389, &funcArguments); + ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 388, &funcArguments); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&arguments); @@ -734,7 +734,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) { zephir_array_fast_append(&_0$$6, &funcArguments); ZEPHIR_INIT_VAR(&_1$$6); ZVAL_STRING(&_1$$6, "compileFunction"); - ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 390, &_1$$6, &_0$$6); + ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 389, &_1$$6, &_0$$6); zephir_check_call_status(); if (Z_TYPE_P(&code) == IS_STRING) { RETURN_CCTOR(&code); @@ -766,7 +766,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) { zephir_array_fetch_string(&_5$$9, &expr, SL("line"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 406 TSRMLS_CC); ZEPHIR_INIT_VAR(&_6$$9); ZEPHIR_CONCAT_SVSVSV(&_6$$9, "Invalid definition for user function '", &name, "' in ", &_4$$9, " on line ", &_5$$9); - ZEPHIR_CALL_METHOD(NULL, &_3$$9, "__construct", NULL, 391, &_6$$9); + ZEPHIR_CALL_METHOD(NULL, &_3$$9, "__construct", NULL, 390, &_6$$9); zephir_check_call_status(); zephir_throw_exception_debug(&_3$$9, "phalcon/mvc/view/engine/volt/compiler.zep", 406 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -795,7 +795,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) { ZEPHIR_OBS_VAR(&exprLevel); zephir_read_property(&exprLevel, this_ptr, SL("_exprLevel"), PH_NOISY_CC); if (Z_TYPE_P(&block) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&code, this_ptr, "_statementlistorextends", NULL, 392, &block); + ZEPHIR_CALL_METHOD(&code, this_ptr, "_statementlistorextends", NULL, 391, &block); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&exprLevel, 1)) { ZEPHIR_CPY_WRT(&escapedCode, &code); @@ -889,7 +889,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, functionCall) { ZEPHIR_CONCAT_SVSVS(return_value, "$this->callMacro('", &name, "', [", &arguments, "])"); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&_9, this_ptr, "expression", NULL, 389, &nameExpr); + ZEPHIR_CALL_METHOD(&_9, this_ptr, "expression", NULL, 388, &nameExpr); zephir_check_call_status(); ZEPHIR_CONCAT_VSVS(return_value, &_9, "(", &arguments, ")"); RETURN_MM(); @@ -964,28 +964,28 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveTest) { if (zephir_array_isset_string_fetch(&name, &testName, SL("value"), 0)) { if (ZEPHIR_IS_STRING(&name, "divisibleby")) { zephir_array_fetch_string(&_1$$12, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 677 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_0$$12, this_ptr, "expression", NULL, 389, &_1$$12); + ZEPHIR_CALL_METHOD(&_0$$12, this_ptr, "expression", NULL, 388, &_1$$12); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "(((", &left, ") % (", &_0$$12, ")) == 0)"); RETURN_MM(); } if (ZEPHIR_IS_STRING(&name, "sameas")) { zephir_array_fetch_string(&_3$$13, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 684 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_2$$13, this_ptr, "expression", NULL, 389, &_3$$13); + ZEPHIR_CALL_METHOD(&_2$$13, this_ptr, "expression", NULL, 388, &_3$$13); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "(", &left, ") === (", &_2$$13, ")"); RETURN_MM(); } if (ZEPHIR_IS_STRING(&name, "type")) { zephir_array_fetch_string(&_5$$14, &test, SL("arguments"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 691 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_4$$14, this_ptr, "expression", NULL, 389, &_5$$14); + ZEPHIR_CALL_METHOD(&_4$$14, this_ptr, "expression", NULL, 388, &_5$$14); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "gettype(", &left, ") === (", &_4$$14, ")"); RETURN_MM(); } } } - ZEPHIR_CALL_METHOD(&_6, this_ptr, "expression", NULL, 389, &test); + ZEPHIR_CALL_METHOD(&_6, this_ptr, "expression", NULL, 388, &test); zephir_check_call_status(); ZEPHIR_CONCAT_VSV(return_value, &left, " == ", &_6); RETURN_MM(); @@ -1057,7 +1057,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) { zephir_array_fetch_string(&_2$$5, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 724 TSRMLS_CC); ZEPHIR_INIT_VAR(&_3$$5); ZEPHIR_CONCAT_SVSV(&_3$$5, "Unknown filter type in ", &_1$$5, " on line ", &_2$$5); - ZEPHIR_CALL_METHOD(NULL, &_0$$5, "__construct", NULL, 391, &_3$$5); + ZEPHIR_CALL_METHOD(NULL, &_0$$5, "__construct", NULL, 390, &_3$$5); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$5, "phalcon/mvc/view/engine/volt/compiler.zep", 724 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -1091,11 +1091,11 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) { zephir_array_update_string(&_4$$7, SL("file"), &file, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_4$$7, SL("line"), &line, PH_COPY | PH_SEPARATE); ZEPHIR_MAKE_REF(&funcArguments); - ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 393, &funcArguments, &_4$$7); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 392, &funcArguments, &_4$$7); ZEPHIR_UNREF(&funcArguments); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 389, &funcArguments); + ZEPHIR_CALL_METHOD(&arguments, this_ptr, "expression", NULL, 388, &funcArguments); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&arguments, &left); @@ -1110,7 +1110,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) { zephir_array_fast_append(&_6$$9, &funcArguments); ZEPHIR_INIT_VAR(&_7$$9); ZVAL_STRING(&_7$$9, "compileFilter"); - ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 390, &_7$$9, &_6$$9); + ZEPHIR_CALL_METHOD(&code, this_ptr, "fireextensionevent", NULL, 389, &_7$$9, &_6$$9); zephir_check_call_status(); if (Z_TYPE_P(&code) == IS_STRING) { RETURN_CCTOR(&code); @@ -1142,7 +1142,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) { zephir_array_fetch_string(&_11$$12, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 808 TSRMLS_CC); ZEPHIR_INIT_VAR(&_12$$12); ZEPHIR_CONCAT_SVSVSV(&_12$$12, "Invalid definition for user filter '", &name, "' in ", &_10$$12, " on line ", &_11$$12); - ZEPHIR_CALL_METHOD(NULL, &_9$$12, "__construct", NULL, 391, &_12$$12); + ZEPHIR_CALL_METHOD(NULL, &_9$$12, "__construct", NULL, 390, &_12$$12); zephir_check_call_status(); zephir_throw_exception_debug(&_9$$12, "phalcon/mvc/view/engine/volt/compiler.zep", 808 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -1271,7 +1271,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, resolveFilter) { zephir_array_fetch_string(&_18, &filter, SL("line"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 997 TSRMLS_CC); ZEPHIR_INIT_VAR(&_19); ZEPHIR_CONCAT_SVSVSV(&_19, "Unknown filter \"", &name, "\" in ", &_17, " on line ", &_18); - ZEPHIR_CALL_METHOD(NULL, &_16, "__construct", NULL, 391, &_19); + ZEPHIR_CALL_METHOD(NULL, &_16, "__construct", NULL, 390, &_19); zephir_check_call_status(); zephir_throw_exception_debug(&_16, "phalcon/mvc/view/engine/volt/compiler.zep", 997 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -1342,7 +1342,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { zephir_array_fast_append(&_0$$4, &expr); ZEPHIR_INIT_NVAR(&_1$$4); ZVAL_STRING(&_1$$4, "resolveExpression"); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "fireextensionevent", &_2, 390, &_1$$4, &_0$$4); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "fireextensionevent", &_2, 389, &_1$$4, &_0$$4); zephir_check_call_status(); if (Z_TYPE_P(&exprCode) == IS_STRING) { break; @@ -1358,7 +1358,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { ZEPHIR_INIT_NVAR(&singleExpr); ZVAL_COPY(&singleExpr, _3$$6); zephir_array_fetch_string(&_4$$7, &singleExpr, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1031 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_5, 389, &_4$$7); + ZEPHIR_CALL_METHOD(&singleExprCode, this_ptr, "expression", &_5, 388, &_4$$7); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&name); if (zephir_array_isset_string_fetch(&name, &singleExpr, SL("name"), 0)) { @@ -1381,7 +1381,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { } ZEPHIR_OBS_NVAR(&left); if (zephir_array_isset_string_fetch(&left, &expr, SL("left"), 0)) { - ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", &_5, 389, &left); + ZEPHIR_CALL_METHOD(&leftCode, this_ptr, "expression", &_5, 388, &left); zephir_check_call_status(); } if (ZEPHIR_IS_LONG(&type, 311)) { @@ -1392,13 +1392,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { } if (ZEPHIR_IS_LONG(&type, 124)) { zephir_array_fetch_string(&_10$$13, &expr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1069 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "resolvefilter", &_11, 394, &_10$$13, &leftCode); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "resolvefilter", &_11, 393, &_10$$13, &leftCode); zephir_check_call_status(); break; } ZEPHIR_OBS_NVAR(&right); if (zephir_array_isset_string_fetch(&right, &expr, SL("right"), 0)) { - ZEPHIR_CALL_METHOD(&rightCode, this_ptr, "expression", &_5, 389, &right); + ZEPHIR_CALL_METHOD(&rightCode, this_ptr, "expression", &_5, 388, &right); zephir_check_call_status(); } ZEPHIR_INIT_NVAR(&exprCode); @@ -1574,7 +1574,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { if (ZEPHIR_IS_LONG(&type, 365)) { ZEPHIR_OBS_NVAR(&start); if (zephir_array_isset_string_fetch(&start, &expr, SL("start"), 0)) { - ZEPHIR_CALL_METHOD(&startCode, this_ptr, "expression", &_5, 389, &start); + ZEPHIR_CALL_METHOD(&startCode, this_ptr, "expression", &_5, 388, &start); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&startCode); @@ -1582,7 +1582,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { } ZEPHIR_OBS_NVAR(&end); if (zephir_array_isset_string_fetch(&end, &expr, SL("end"), 0)) { - ZEPHIR_CALL_METHOD(&endCode, this_ptr, "expression", &_5, 389, &end); + ZEPHIR_CALL_METHOD(&endCode, this_ptr, "expression", &_5, 388, &end); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&endCode); @@ -1674,7 +1674,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { } if (ZEPHIR_IS_LONG(&type, 366)) { zephir_array_fetch_string(&_19$$69, &expr, SL("ternary"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1299 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&_18$$69, this_ptr, "expression", &_5, 389, &_19$$69); + ZEPHIR_CALL_METHOD(&_18$$69, this_ptr, "expression", &_5, 388, &_19$$69); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&exprCode); ZEPHIR_CONCAT_SVSVSVS(&exprCode, "(", &_18$$69, " ? ", &leftCode, " : ", &rightCode, ")"); @@ -1701,7 +1701,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, expression) { zephir_array_fetch_string(&_22$$73, &expr, SL("line"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1315 TSRMLS_CC); ZEPHIR_INIT_LNVAR(_23$$73); ZEPHIR_CONCAT_SVSVSV(&_23$$73, "Unknown expression ", &type, " in ", &_21$$73, " on line ", &_22$$73); - ZEPHIR_CALL_METHOD(NULL, &_20$$73, "__construct", &_24, 391, &_23$$73); + ZEPHIR_CALL_METHOD(NULL, &_20$$73, "__construct", &_24, 390, &_23$$73); zephir_check_call_status(); zephir_throw_exception_debug(&_20$$73, "phalcon/mvc/view/engine/volt/compiler.zep", 1315 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -1755,7 +1755,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, _statementListOrExtends) { ZEPHIR_INIT_NVAR(&statement); } if (isStatementList == 1) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_statementlist", NULL, 395, statements); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "_statementlist", NULL, 394, statements); zephir_check_call_status(); RETURN_MM(); } @@ -1844,7 +1844,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach) { ZEPHIR_CONCAT_VV(&prefixLevel, &prefix, &level); ZEPHIR_OBS_VAR(&expr); zephir_array_fetch_string(&expr, &statement, SL("expr"), PH_NOISY, "phalcon/mvc/view/engine/volt/compiler.zep", 1401 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 389, &expr); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 388, &expr); zephir_check_call_status(); ZEPHIR_OBS_VAR(&blockStatements); zephir_array_fetch_string(&blockStatements, &statement, SL("block_statements"), PH_NOISY, "phalcon/mvc/view/engine/volt/compiler.zep", 1407 TSRMLS_CC); @@ -1879,7 +1879,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach) { } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_CALL_METHOD(&code, this_ptr, "_statementlist", NULL, 395, &blockStatements, &_2); + ZEPHIR_CALL_METHOD(&code, this_ptr, "_statementlist", NULL, 394, &blockStatements, &_2); zephir_check_call_status(); ZEPHIR_OBS_VAR(&loopContext); zephir_read_property(&loopContext, this_ptr, SL("_loopPointers"), PH_NOISY_CC); @@ -1930,7 +1930,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileForeach) { } ZEPHIR_OBS_VAR(&ifExpr); if (zephir_array_isset_string_fetch(&ifExpr, &statement, SL("if_expr"), 0)) { - ZEPHIR_CALL_METHOD(&_14$$13, this_ptr, "expression", NULL, 389, &ifExpr); + ZEPHIR_CALL_METHOD(&_14$$13, this_ptr, "expression", NULL, 388, &ifExpr); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_15$$13); ZEPHIR_CONCAT_SVS(&_15$$13, "if (", &_14$$13, ") { ?>"); @@ -2054,13 +2054,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileIf) { object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 391, &_1$$3, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 390, &_1$$3, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/mvc/view/engine/volt/compiler.zep", 1554 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 389, &expr); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 388, &expr); zephir_check_call_status(); zephir_array_fetch_string(&_4, &statement, SL("true_statements"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1560 TSRMLS_CC); if (extendsMode) { @@ -2068,7 +2068,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileIf) { } else { ZVAL_BOOL(&_5, 0); } - ZEPHIR_CALL_METHOD(&_3, this_ptr, "_statementlist", NULL, 395, &_4, &_5); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "_statementlist", NULL, 394, &_4, &_5); zephir_check_call_status(); ZEPHIR_INIT_VAR(&compilation); ZEPHIR_CONCAT_SVSV(&compilation, "", &_3); @@ -2079,7 +2079,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileIf) { } else { ZVAL_BOOL(&_7$$4, 0); } - ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "_statementlist", NULL, 395, &blockStatements, &_7$$4); + ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "_statementlist", NULL, 394, &blockStatements, &_7$$4); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_8$$4); ZEPHIR_CONCAT_SV(&_8$$4, "", &_6$$4); @@ -2131,13 +2131,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSwitch) { object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 391, &_1$$3, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 390, &_1$$3, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/mvc/view/engine/volt/compiler.zep", 1589 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 389, &expr); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 388, &expr); zephir_check_call_status(); ZEPHIR_INIT_VAR(&compilation); ZEPHIR_CONCAT_SVS(&compilation, ""); @@ -2148,7 +2148,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSwitch) { } else { ZVAL_BOOL(&_3$$4, 0); } - ZEPHIR_CALL_METHOD(&lines, this_ptr, "_statementlist", NULL, 395, &caseClauses, &_3$$4); + ZEPHIR_CALL_METHOD(&lines, this_ptr, "_statementlist", NULL, 394, &caseClauses, &_3$$4); zephir_check_call_status(); if (zephir_fast_strlen_ev(&lines) != 0) { ZEPHIR_INIT_VAR(&_4$$5); @@ -2203,13 +2203,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileCase) { object_init_ex(&_0$$4, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$4); ZVAL_STRING(&_1$$4, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 391, &_1$$4, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 390, &_1$$4, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$4, "phalcon/mvc/view/engine/volt/compiler.zep", 1649 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 389, &expr); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 388, &expr); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, ""); RETURN_MM(); @@ -2244,13 +2244,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileElseIf) { object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 391, &_1$$3, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 390, &_1$$3, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/mvc/view/engine/volt/compiler.zep", 1669 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 389, &expr); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 388, &expr); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, ""); RETURN_MM(); @@ -2312,15 +2312,15 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileCache) { object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 391, &_1$$3, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 390, &_1$$3, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/mvc/view/engine/volt/compiler.zep", 1689 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 389, &expr); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 388, &expr); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 389, &expr); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "expression", NULL, 388, &expr); zephir_check_call_status(); ZEPHIR_INIT_VAR(&compilation); ZEPHIR_CONCAT_SVS(&compilation, "di->get('viewCache'); "); @@ -2355,7 +2355,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileCache) { } else { ZVAL_BOOL(&_13, 0); } - ZEPHIR_CALL_METHOD(&_11, this_ptr, "_statementlist", NULL, 395, &_12, &_13); + ZEPHIR_CALL_METHOD(&_11, this_ptr, "_statementlist", NULL, 394, &_12, &_13); zephir_check_call_status(); zephir_concat_self(&compilation, &_11 TSRMLS_CC); ZEPHIR_OBS_NVAR(&lifetime); @@ -2429,10 +2429,10 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileSet) { ZEPHIR_INIT_NVAR(&assignment); ZVAL_COPY(&assignment, _0); zephir_array_fetch_string(&_1$$4, &assignment, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1752 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_2, 389, &_1$$4); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", &_2, 388, &_1$$4); zephir_check_call_status(); zephir_array_fetch_string(&_3$$4, &assignment, SL("variable"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1757 TSRMLS_CC); - ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_2, 389, &_3$$4); + ZEPHIR_CALL_METHOD(&target, this_ptr, "expression", &_2, 388, &_3$$4); zephir_check_call_status(); zephir_array_fetch_string(&_4$$4, &assignment, SL("op"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1763 TSRMLS_CC); do { @@ -2498,7 +2498,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileDo) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/mvc/view/engine/volt/compiler.zep", 1803); return; } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 389, &expr); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 388, &expr); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, ""); RETURN_MM(); @@ -2530,7 +2530,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileReturn) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_view_engine_volt_exception_ce, "Corrupted statement", "phalcon/mvc/view/engine/volt/compiler.zep", 1823); return; } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 389, &expr); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "expression", NULL, 388, &expr); zephir_check_call_status(); ZEPHIR_CONCAT_SVS(return_value, ""); RETURN_MM(); @@ -2576,7 +2576,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileAutoEscape) { } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_CALL_METHOD(&compilation, this_ptr, "_statementlist", NULL, 395, &_0, &_1); + ZEPHIR_CALL_METHOD(&compilation, this_ptr, "_statementlist", NULL, 394, &_0, &_1); zephir_check_call_status(); zephir_update_property_zval(this_ptr, SL("_autoescape"), &oldAutoescape); RETURN_CCTOR(&compilation); @@ -2616,13 +2616,13 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileEcho) { object_init_ex(&_0$$3, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "Corrupt statement"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 391, &_1$$3, &statement); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 390, &_1$$3, &statement); zephir_check_call_status(); zephir_throw_exception_debug(&_0$$3, "phalcon/mvc/view/engine/volt/compiler.zep", 1869 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 389, &expr); + ZEPHIR_CALL_METHOD(&exprCode, this_ptr, "expression", NULL, 388, &expr); zephir_check_call_status(); zephir_array_fetch_string(&_2, &expr, SL("type"), PH_NOISY | PH_READONLY, "phalcon/mvc/view/engine/volt/compiler.zep", 1877 TSRMLS_CC); if (ZEPHIR_IS_LONG(&_2, 350)) { @@ -2701,14 +2701,14 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileInclude) { RETURN_CCTOR(&compilation); } } - ZEPHIR_CALL_METHOD(&path, this_ptr, "expression", NULL, 389, &pathExpr); + ZEPHIR_CALL_METHOD(&path, this_ptr, "expression", NULL, 388, &pathExpr); zephir_check_call_status(); ZEPHIR_OBS_VAR(¶ms); if (!(zephir_array_isset_string_fetch(¶ms, &statement, SL("params"), 0))) { ZEPHIR_CONCAT_SVS(return_value, "partial(", &path, "); ?>"); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&_3, this_ptr, "expression", NULL, 389, ¶ms); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "expression", NULL, 388, ¶ms); zephir_check_call_status(); ZEPHIR_CONCAT_SVSVS(return_value, "partial(", &path, ", ", &_3, "); ?>"); RETURN_MM(); @@ -2774,7 +2774,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro) { object_init_ex(&_1$$4, phalcon_mvc_view_engine_volt_exception_ce); ZEPHIR_INIT_VAR(&_2$$4); ZEPHIR_CONCAT_SVS(&_2$$4, "Macro '", &name, "' is already defined"); - ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 391, &_2$$4); + ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 390, &_2$$4); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$4, "phalcon/mvc/view/engine/volt/compiler.zep", 1988 TSRMLS_CC); ZEPHIR_MM_RESTORE(); @@ -2823,7 +2823,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro) { zephir_concat_self_str(&code, SL(" } else { ") TSRMLS_CC); ZEPHIR_OBS_NVAR(&defaultValue); if (zephir_array_isset_string_fetch(&defaultValue, ¶meter, SL("default"), 0)) { - ZEPHIR_CALL_METHOD(&_12$$8, this_ptr, "expression", &_13, 389, &defaultValue); + ZEPHIR_CALL_METHOD(&_12$$8, this_ptr, "expression", &_13, 388, &defaultValue); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_14$$8); ZEPHIR_CONCAT_SVSVS(&_14$$8, "$", &variableName, " = ", &_12$$8, ";"); @@ -2846,7 +2846,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt_Compiler, compileMacro) { } else { ZVAL_BOOL(&_17$$10, 0); } - ZEPHIR_CALL_METHOD(&_16$$10, this_ptr, "_statementlist", NULL, 395, &blockStatements, &_17$$10); + ZEPHIR_CALL_METHOD(&_16$$10, this_ptr, "_statementlist", NULL, 394, &blockStatements, &_17$$10); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_18$$10); ZEPHIR_CONCAT_VS(&_18$$10, &_16$$10, "= 70200 -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_tag_geturlservice, 0, 0, Phalcon\\Mvc\\UrlInterface, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_tag_geturlservice, 0, 0, Phalcon\\UrlInterface, 0) #else -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_tag_geturlservice, 0, 0, IS_OBJECT, "Phalcon\\Mvc\\UrlInterface", 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_tag_geturlservice, 0, 0, IS_OBJECT, "Phalcon\\UrlInterface", 0) #endif ZEND_END_ARG_INFO() diff --git a/ext/phalcon/tag/select.zep.c b/ext/phalcon/tag/select.zep.c index 15d54bb356d..f6b501a4851 100644 --- a/ext/phalcon/tag/select.zep.c +++ b/ext/phalcon/tag/select.zep.c @@ -184,7 +184,7 @@ PHP_METHOD(Phalcon_Tag_Select, selectField) { ZEPHIR_GET_CONSTANT(&_10$$24, "PHP_EOL"); ZEPHIR_INIT_VAR(&_11$$24); ZEPHIR_CONCAT_SV(&_11$$24, "", &_10$$24); - ZEPHIR_CALL_SELF(&_8$$24, "_optionsfromresultset", &_9, 440, &options, &using, &value, &_11$$24); + ZEPHIR_CALL_SELF(&_8$$24, "_optionsfromresultset", &_9, 439, &options, &using, &value, &_11$$24); zephir_check_call_status(); zephir_concat_self(&code, &_8$$24 TSRMLS_CC); } else { @@ -193,7 +193,7 @@ PHP_METHOD(Phalcon_Tag_Select, selectField) { ZEPHIR_GET_CONSTANT(&_14$$26, "PHP_EOL"); ZEPHIR_INIT_VAR(&_15$$26); ZEPHIR_CONCAT_SV(&_15$$26, "", &_14$$26); - ZEPHIR_CALL_SELF(&_12$$26, "_optionsfromarray", &_13, 441, &options, &value, &_15$$26); + ZEPHIR_CALL_SELF(&_12$$26, "_optionsfromarray", &_13, 440, &options, &value, &_15$$26); zephir_check_call_status(); zephir_concat_self(&code, &_12$$26 TSRMLS_CC); } @@ -403,7 +403,7 @@ PHP_METHOD(Phalcon_Tag_Select, _optionsFromArray) { if (Z_TYPE_P(&optionText) == IS_ARRAY) { ZEPHIR_INIT_NVAR(&_4$$4); ZEPHIR_GET_CONSTANT(&_4$$4, "PHP_EOL"); - ZEPHIR_CALL_SELF(&_5$$4, "_optionsfromarray", &_6, 441, &optionText, value, &closeOption); + ZEPHIR_CALL_SELF(&_5$$4, "_optionsfromarray", &_6, 440, &optionText, value, &closeOption); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_7$$4); ZEPHIR_GET_CONSTANT(&_7$$4, "PHP_EOL"); diff --git a/ext/phalcon/text.zep.c b/ext/phalcon/text.zep.c index e399a233ced..993c6ec5bd2 100644 --- a/ext/phalcon/text.zep.c +++ b/ext/phalcon/text.zep.c @@ -263,13 +263,13 @@ PHP_METHOD(Phalcon_Text, random) { ZVAL_STRING(&_0$$3, "a"); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "z"); - ZEPHIR_CALL_FUNCTION(&_2$$3, "range", NULL, 442, &_0$$3, &_1$$3); + ZEPHIR_CALL_FUNCTION(&_2$$3, "range", NULL, 441, &_0$$3, &_1$$3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_0$$3); ZVAL_STRING(&_0$$3, "A"); ZEPHIR_INIT_NVAR(&_1$$3); ZVAL_STRING(&_1$$3, "Z"); - ZEPHIR_CALL_FUNCTION(&_3$$3, "range", NULL, 442, &_0$$3, &_1$$3); + ZEPHIR_CALL_FUNCTION(&_3$$3, "range", NULL, 441, &_0$$3, &_1$$3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&pool); zephir_fast_array_merge(&pool, &_2$$3, &_3$$3 TSRMLS_CC); @@ -278,13 +278,13 @@ PHP_METHOD(Phalcon_Text, random) { if (type == 2) { ZVAL_LONG(&_4$$4, 0); ZVAL_LONG(&_5$$4, 9); - ZEPHIR_CALL_FUNCTION(&_6$$4, "range", NULL, 442, &_4$$4, &_5$$4); + ZEPHIR_CALL_FUNCTION(&_6$$4, "range", NULL, 441, &_4$$4, &_5$$4); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_7$$4); ZVAL_STRING(&_7$$4, "a"); ZEPHIR_INIT_VAR(&_8$$4); ZVAL_STRING(&_8$$4, "f"); - ZEPHIR_CALL_FUNCTION(&_9$$4, "range", NULL, 442, &_7$$4, &_8$$4); + ZEPHIR_CALL_FUNCTION(&_9$$4, "range", NULL, 441, &_7$$4, &_8$$4); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&pool); zephir_fast_array_merge(&pool, &_6$$4, &_9$$4 TSRMLS_CC); @@ -293,14 +293,14 @@ PHP_METHOD(Phalcon_Text, random) { if (type == 3) { ZVAL_LONG(&_10$$5, 0); ZVAL_LONG(&_11$$5, 9); - ZEPHIR_CALL_FUNCTION(&pool, "range", NULL, 442, &_10$$5, &_11$$5); + ZEPHIR_CALL_FUNCTION(&pool, "range", NULL, 441, &_10$$5, &_11$$5); zephir_check_call_status(); break; } if (type == 4) { ZVAL_LONG(&_12$$6, 1); ZVAL_LONG(&_13$$6, 9); - ZEPHIR_CALL_FUNCTION(&pool, "range", NULL, 442, &_12$$6, &_13$$6); + ZEPHIR_CALL_FUNCTION(&pool, "range", NULL, 441, &_12$$6, &_13$$6); zephir_check_call_status(); break; } @@ -313,21 +313,21 @@ PHP_METHOD(Phalcon_Text, random) { } ZVAL_LONG(&_15$$8, 0); ZVAL_LONG(&_16$$8, 9); - ZEPHIR_CALL_FUNCTION(&_17$$8, "range", NULL, 442, &_15$$8, &_16$$8); + ZEPHIR_CALL_FUNCTION(&_17$$8, "range", NULL, 441, &_15$$8, &_16$$8); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_18$$8); ZVAL_STRING(&_18$$8, "a"); ZEPHIR_INIT_VAR(&_19$$8); ZVAL_STRING(&_19$$8, "z"); - ZEPHIR_CALL_FUNCTION(&_20$$8, "range", NULL, 442, &_18$$8, &_19$$8); + ZEPHIR_CALL_FUNCTION(&_20$$8, "range", NULL, 441, &_18$$8, &_19$$8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_18$$8); ZVAL_STRING(&_18$$8, "A"); ZEPHIR_INIT_NVAR(&_19$$8); ZVAL_STRING(&_19$$8, "Z"); - ZEPHIR_CALL_FUNCTION(&_21$$8, "range", NULL, 442, &_18$$8, &_19$$8); + ZEPHIR_CALL_FUNCTION(&_21$$8, "range", NULL, 441, &_18$$8, &_19$$8); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&pool, "array_merge", NULL, 443, &_17$$8, &_20$$8, &_21$$8); + ZEPHIR_CALL_FUNCTION(&pool, "array_merge", NULL, 442, &_17$$8, &_20$$8, &_21$$8); zephir_check_call_status(); break; } while(0); @@ -468,7 +468,7 @@ PHP_METHOD(Phalcon_Text, lower) { if ((zephir_function_exists_ex(SL("mb_strtolower") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("mb_strtolower", NULL, 444, &str, &encoding); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strtolower", NULL, 443, &str, &encoding); zephir_check_call_status(); RETURN_MM(); } @@ -525,7 +525,7 @@ PHP_METHOD(Phalcon_Text, upper) { if ((zephir_function_exists_ex(SL("mb_strtoupper") TSRMLS_CC) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("mb_strtoupper", NULL, 445, &str, &encoding); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strtoupper", NULL, 444, &str, &encoding); zephir_check_call_status(); RETURN_MM(); } @@ -627,7 +627,7 @@ PHP_METHOD(Phalcon_Text, concat) { ZEPHIR_INIT_VAR(&_3$$3); zephir_get_args(&_3$$3); ZVAL_LONG(&_4$$3, 3); - ZEPHIR_CALL_FUNCTION(&_5$$3, "array_slice", NULL, 387, &_3$$3, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "array_slice", NULL, 386, &_3$$3, &_4$$3); zephir_check_call_status(); zephir_is_iterable(&_5$$3, 0, "phalcon/text.zep", 253); ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_5$$3), _6$$3) @@ -763,24 +763,24 @@ PHP_METHOD(Phalcon_Text, dynamic) { } - ZEPHIR_CALL_FUNCTION(&_0, "substr_count", NULL, 446, &text, &leftDelimiter); + ZEPHIR_CALL_FUNCTION(&_0, "substr_count", NULL, 445, &text, &leftDelimiter); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "substr_count", NULL, 446, &text, &rightDelimiter); + ZEPHIR_CALL_FUNCTION(&_1, "substr_count", NULL, 445, &text, &rightDelimiter); zephir_check_call_status(); if (!ZEPHIR_IS_IDENTICAL(&_0, &_1)) { ZEPHIR_INIT_VAR(&_2$$3); object_init_ex(&_2$$3, spl_ce_RuntimeException); ZEPHIR_INIT_VAR(&_3$$3); ZEPHIR_CONCAT_SVS(&_3$$3, "Syntax error in string \"", &text, "\""); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 436, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 435, &_3$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_2$$3, "phalcon/text.zep", 280 TSRMLS_CC); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_FUNCTION(&ldS, "preg_quote", NULL, 447, &leftDelimiter); + ZEPHIR_CALL_FUNCTION(&ldS, "preg_quote", NULL, 446, &leftDelimiter); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&rdS, "preg_quote", NULL, 447, &rightDelimiter); + ZEPHIR_CALL_FUNCTION(&rdS, "preg_quote", NULL, 446, &rightDelimiter); zephir_check_call_status(); ZEPHIR_INIT_VAR(&pattern); ZEPHIR_CONCAT_SVSVVSVS(&pattern, "/", &ldS, "([^", &ldS, &rdS, "]+)", &rdS, "/"); @@ -808,11 +808,11 @@ PHP_METHOD(Phalcon_Text, dynamic) { ZEPHIR_INIT_NVAR(&words); zephir_fast_explode(&words, &separator, &_7$$6, LONG_MAX TSRMLS_CC); ZEPHIR_OBS_NVAR(&word); - ZEPHIR_CALL_FUNCTION(&_8$$6, "array_rand", &_9, 448, &words); + ZEPHIR_CALL_FUNCTION(&_8$$6, "array_rand", &_9, 447, &words); zephir_check_call_status(); zephir_array_fetch(&word, &words, &_8$$6, PH_NOISY, "phalcon/text.zep", 299 TSRMLS_CC); zephir_array_fetch_long(&_10$$6, &match, 0, PH_NOISY | PH_READONLY, "phalcon/text.zep", 300 TSRMLS_CC); - ZEPHIR_CALL_FUNCTION(&sub, "preg_quote", NULL, 447, &_10$$6, &separator); + ZEPHIR_CALL_FUNCTION(&sub, "preg_quote", NULL, 446, &_10$$6, &separator); zephir_check_call_status(); ZEPHIR_INIT_LNVAR(_11$$6); ZEPHIR_CONCAT_SVS(&_11$$6, "/", &sub, "/"); diff --git a/ext/phalcon/translate/adapter/csv.zep.c b/ext/phalcon/translate/adapter/csv.zep.c index 59956d4c75f..1bb323fbf12 100644 --- a/ext/phalcon/translate/adapter/csv.zep.c +++ b/ext/phalcon/translate/adapter/csv.zep.c @@ -85,7 +85,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_Csv, __construct) { ZVAL_STRING(&_3, ";"); ZEPHIR_INIT_VAR(&_4); ZVAL_STRING(&_4, "\""); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "_load", NULL, 449, &_1, &_2, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "_load", NULL, 448, &_1, &_2, &_3, &_4); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); @@ -144,7 +144,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_Csv, _load) { } while (1) { ZVAL_LONG(&_3$$4, length); - ZEPHIR_CALL_FUNCTION(&data, "fgetcsv", &_4, 450, &fileHandler, &_3$$4, &delimiter, &enclosure); + ZEPHIR_CALL_FUNCTION(&data, "fgetcsv", &_4, 449, &fileHandler, &_3$$4, &delimiter, &enclosure); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&data)) { break; diff --git a/ext/phalcon/translate/adapter/gettext.zep.c b/ext/phalcon/translate/adapter/gettext.zep.c index 60f48ce30ad..f0b66eb9116 100644 --- a/ext/phalcon/translate/adapter/gettext.zep.c +++ b/ext/phalcon/translate/adapter/gettext.zep.c @@ -193,7 +193,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_Gettext, query) { } - ZEPHIR_CALL_FUNCTION(&translation, "gettext", NULL, 451, &index); + ZEPHIR_CALL_FUNCTION(&translation, "gettext", NULL, 450, &index); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "replaceplaceholders", NULL, 0, &translation, placeholders); zephir_check_call_status(); @@ -306,11 +306,11 @@ PHP_METHOD(Phalcon_Translate_Adapter_Gettext, nquery) { if (!(!(Z_TYPE_P(&domain) == IS_UNDEF) && Z_STRLEN_P(&domain))) { ZVAL_LONG(&_0$$3, count); - ZEPHIR_CALL_FUNCTION(&translation, "ngettext", NULL, 452, &msgid1, &msgid2, &_0$$3); + ZEPHIR_CALL_FUNCTION(&translation, "ngettext", NULL, 451, &msgid1, &msgid2, &_0$$3); zephir_check_call_status(); } else { ZVAL_LONG(&_1$$4, count); - ZEPHIR_CALL_FUNCTION(&translation, "dngettext", NULL, 453, &domain, &msgid1, &msgid2, &_1$$4); + ZEPHIR_CALL_FUNCTION(&translation, "dngettext", NULL, 452, &domain, &msgid1, &msgid2, &_1$$4); zephir_check_call_status(); } ZEPHIR_RETURN_CALL_METHOD(this_ptr, "replaceplaceholders", NULL, 0, &translation, placeholders); @@ -335,7 +335,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_Gettext, setDomain) { - ZEPHIR_RETURN_CALL_FUNCTION("textdomain", NULL, 454, domain); + ZEPHIR_RETURN_CALL_FUNCTION("textdomain", NULL, 453, domain); zephir_check_call_status(); RETURN_MM(); @@ -356,7 +356,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_Gettext, resetDomain) { ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdefaultdomain", NULL, 0); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("textdomain", NULL, 454, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("textdomain", NULL, 453, &_0); zephir_check_call_status(); RETURN_MM(); @@ -446,7 +446,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_Gettext, setDirectory) { } ZEPHIR_INIT_NVAR(&value); ZVAL_COPY(&value, _0$$4); - ZEPHIR_CALL_FUNCTION(NULL, "bindtextdomain", &_3, 455, &key, &value); + ZEPHIR_CALL_FUNCTION(NULL, "bindtextdomain", &_3, 454, &key, &value); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); ZEPHIR_INIT_NVAR(&value); @@ -454,7 +454,7 @@ PHP_METHOD(Phalcon_Translate_Adapter_Gettext, setDirectory) { } else { ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "getdefaultdomain", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "bindtextdomain", &_3, 455, &_4$$6, directory); + ZEPHIR_CALL_FUNCTION(NULL, "bindtextdomain", &_3, 454, &_4$$6, directory); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -526,17 +526,17 @@ PHP_METHOD(Phalcon_Translate_Adapter_Gettext, setLocale) { zephir_read_property(&_3, this_ptr, SL("_locale"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_4); ZEPHIR_CONCAT_SV(&_4, "LC_ALL=", &_3); - ZEPHIR_CALL_FUNCTION(NULL, "putenv", NULL, 456, &_4); + ZEPHIR_CALL_FUNCTION(NULL, "putenv", NULL, 455, &_4); zephir_check_call_status(); zephir_read_property(&_5, this_ptr, SL("_locale"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_6); ZEPHIR_CONCAT_SV(&_6, "LANG=", &_5); - ZEPHIR_CALL_FUNCTION(NULL, "putenv", NULL, 456, &_6); + ZEPHIR_CALL_FUNCTION(NULL, "putenv", NULL, 455, &_6); zephir_check_call_status(); zephir_read_property(&_7, this_ptr, SL("_locale"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_8); ZEPHIR_CONCAT_SV(&_8, "LANGUAGE=", &_7); - ZEPHIR_CALL_FUNCTION(NULL, "putenv", NULL, 456, &_8); + ZEPHIR_CALL_FUNCTION(NULL, "putenv", NULL, 455, &_8); zephir_check_call_status(); zephir_read_property(&_9, this_ptr, SL("_locale"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_10, 6); diff --git a/ext/phalcon/translate/interpolator/indexedarray.zep.c b/ext/phalcon/translate/interpolator/indexedarray.zep.c index b631409d845..4f27b1ebf60 100644 --- a/ext/phalcon/translate/interpolator/indexedarray.zep.c +++ b/ext/phalcon/translate/interpolator/indexedarray.zep.c @@ -77,7 +77,7 @@ PHP_METHOD(Phalcon_Translate_Interpolator_IndexedArray, replacePlaceholders) { } if (_0) { ZEPHIR_MAKE_REF(placeholders); - ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 393, placeholders, &translation); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 392, placeholders, &translation); ZEPHIR_UNREF(placeholders); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1$$3); diff --git a/ext/phalcon/url.zep.c b/ext/phalcon/url.zep.c new file mode 100644 index 00000000000..a7af4cf62f2 --- /dev/null +++ b/ext/phalcon/url.zep.c @@ -0,0 +1,625 @@ + +#ifdef HAVE_CONFIG_H +#include "../ext_config.h" +#endif + +#include +#include "../php_ext.h" +#include "../ext.h" + +#include +#include +#include + +#include "kernel/main.h" +#include "kernel/string.h" +#include "kernel/memory.h" +#include "kernel/operators.h" +#include "kernel/fcall.h" +#include "kernel/array.h" +#include "kernel/exception.h" +#include "kernel/object.h" +#include "kernel/concat.h" +#include "ext/spl/spl_exceptions.h" +#include "phalcon/mvc/url/utils.h" + + +/** + * This file is part of the Phalcon Framework. + * + * (c) Phalcon Team + * + * For the full copyright and license information, please view the LICENSE.txt + * file that was distributed with this source code. + */ +/** + * Phalcon\Url + * + * This components helps in the generation of: URIs, URLs and Paths + * + * + * // Generate a URL appending the URI to the base URI + * echo $url->get("products/edit/1"); + * + * // Generate a URL for a predefined route + * echo $url->get( + * [ + * "for" => "blog-post", + * "title" => "some-cool-stuff", + * "year" => "2012", + * ] + * ); + * + */ +ZEPHIR_INIT_CLASS(Phalcon_Url) { + + ZEPHIR_REGISTER_CLASS(Phalcon, Url, phalcon, url, phalcon_url_method_entry, 0); + + /** + * @var null | string + */ + zend_declare_property_null(phalcon_url_ce, SL("baseUri"), ZEND_ACC_PROTECTED TSRMLS_CC); + + /** + * @var null | string + */ + zend_declare_property_null(phalcon_url_ce, SL("basePath"), ZEND_ACC_PROTECTED TSRMLS_CC); + + /** + * @var + */ + zend_declare_property_null(phalcon_url_ce, SL("container"), ZEND_ACC_PROTECTED TSRMLS_CC); + + zend_declare_property_null(phalcon_url_ce, SL("router"), ZEND_ACC_PROTECTED TSRMLS_CC); + + /** + * @var null | string + */ + zend_declare_property_null(phalcon_url_ce, SL("staticBaseUri"), ZEND_ACC_PROTECTED TSRMLS_CC); + + zend_class_implements(phalcon_url_ce TSRMLS_CC, 1, phalcon_urlinterface_ce); + zend_class_implements(phalcon_url_ce TSRMLS_CC, 1, phalcon_di_injectionawareinterface_ce); + return SUCCESS; + +} + +/** + * Generates a URL + * + * + * // Generate a URL appending the URI to the base URI + * echo $url->get("products/edit/1"); + * + * // Generate a URL for a predefined route + * echo $url->get( + * [ + * "for" => "blog-post", + * "title" => "some-cool-stuff", + * "year" => "2015", + * ] + * ); + * + * // Generate a URL with GET arguments (/show/products?id=1&name=Carrots) + * echo $url->get( + * "show/products", + * [ + * "id" => 1, + * "name" => "Carrots", + * ] + * ); + * + * // Generate an absolute URL by setting the third parameter as false. + * echo $url->get( + * "https://phalconphp.com/", + * null, + * false + * ); + * + */ +PHP_METHOD(Phalcon_Url, get) { + + unsigned char _20$$14, _22$$14, _27$$16; + zval strUri, _15$$14; + zend_long ZEPHIR_LAST_CALL_STATUS; + zend_bool local, _0$$3, _1$$3, _18$$14, _19$$14, _21$$14, _25$$16, _26$$16, _28$$19; + zval *uri = NULL, uri_sub, *args = NULL, args_sub, *local_param = NULL, *baseUri = NULL, baseUri_sub, __$null, router, dependencyInjector, routeName, route, queryString, _2$$4, _3$$4, _4$$4, _5$$4, _6$$9, _10$$9, _13$$9, _14$$9, _7$$11, _8$$11, _9$$11, _11$$13, _12$$13, _16$$14, _17$$14, _23$$15, _24$$15, _29$$20, _30$$20, _31$$21, _32$$22; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&uri_sub); + ZVAL_UNDEF(&args_sub); + ZVAL_UNDEF(&baseUri_sub); + ZVAL_NULL(&__$null); + ZVAL_UNDEF(&router); + ZVAL_UNDEF(&dependencyInjector); + ZVAL_UNDEF(&routeName); + ZVAL_UNDEF(&route); + ZVAL_UNDEF(&queryString); + ZVAL_UNDEF(&_2$$4); + ZVAL_UNDEF(&_3$$4); + ZVAL_UNDEF(&_4$$4); + ZVAL_UNDEF(&_5$$4); + ZVAL_UNDEF(&_6$$9); + ZVAL_UNDEF(&_10$$9); + ZVAL_UNDEF(&_13$$9); + ZVAL_UNDEF(&_14$$9); + ZVAL_UNDEF(&_7$$11); + ZVAL_UNDEF(&_8$$11); + ZVAL_UNDEF(&_9$$11); + ZVAL_UNDEF(&_11$$13); + ZVAL_UNDEF(&_12$$13); + ZVAL_UNDEF(&_16$$14); + ZVAL_UNDEF(&_17$$14); + ZVAL_UNDEF(&_23$$15); + ZVAL_UNDEF(&_24$$15); + ZVAL_UNDEF(&_29$$20); + ZVAL_UNDEF(&_30$$20); + ZVAL_UNDEF(&_31$$21); + ZVAL_UNDEF(&_32$$22); + ZVAL_UNDEF(&strUri); + ZVAL_UNDEF(&_15$$14); + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 0, 4, &uri, &args, &local_param, &baseUri); + + if (!uri) { + uri = &uri_sub; + ZEPHIR_CPY_WRT(uri, &__$null); + } else { + ZEPHIR_SEPARATE_PARAM(uri); + } + if (!args) { + args = &args_sub; + args = &__$null; + } + if (!local_param) { + local = 0; + } else { + local = zephir_get_boolval(local_param); + } + if (!baseUri) { + baseUri = &baseUri_sub; + ZEPHIR_CPY_WRT(baseUri, &__$null); + } else { + ZEPHIR_SEPARATE_PARAM(baseUri); + } + + + if (local == 0) { + _0$$3 = Z_TYPE_P(uri) == IS_STRING; + if (_0$$3) { + _1$$3 = zephir_memnstr_str(uri, SL("//"), "phalcon/url.zep", 103); + if (!(_1$$3)) { + _1$$3 = zephir_memnstr_str(uri, SL(":"), "phalcon/url.zep", 103); + } + _0$$3 = _1$$3; + } + if (_0$$3) { + ZEPHIR_INIT_VAR(&_2$$4); + ZEPHIR_INIT_VAR(&_3$$4); + ZVAL_STRING(&_3$$4, "#^((//)|([a-z0-9]+://)|([a-z0-9]+:))#i"); + ZEPHIR_INIT_VAR(&_4$$4); + ZEPHIR_INIT_VAR(&_5$$4); + ZVAL_STRING(&_5$$4, "#^((//)|([a-z0-9]+://)|([a-z0-9]+:))#i"); + zephir_preg_match(&_4$$4, &_5$$4, uri, &_2$$4, 0, 0 , 0 TSRMLS_CC); + if (zephir_is_true(&_4$$4)) { + local = 0; + } else { + local = 1; + } + } else { + local = 1; + } + } + if (Z_TYPE_P(baseUri) != IS_STRING) { + ZEPHIR_CALL_METHOD(baseUri, this_ptr, "getbaseuri", NULL, 0); + zephir_check_call_status(); + } + if (Z_TYPE_P(uri) == IS_ARRAY) { + ZEPHIR_OBS_VAR(&routeName); + if (!(zephir_array_isset_string_fetch(&routeName, uri, SL("for"), 0))) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_url_exception_ce, "It's necessary to define the route name with the parameter 'for'", "phalcon/url.zep", 121); + return; + } + zephir_read_property(&_6$$9, this_ptr, SL("router"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CPY_WRT(&router, &_6$$9); + if (Z_TYPE_P(&router) != IS_OBJECT) { + zephir_read_property(&_7$$11, this_ptr, SL("container"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CPY_WRT(&dependencyInjector, &_7$$11); + if (Z_TYPE_P(&dependencyInjector) != IS_OBJECT) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_url_exception_ce, "A dependency injector container is required to obtain the 'router' service", "phalcon/url.zep", 133); + return; + } + ZEPHIR_INIT_VAR(&_9$$11); + ZVAL_STRING(&_9$$11, "router"); + ZEPHIR_CALL_METHOD(&_8$$11, &dependencyInjector, "getshared", NULL, 0, &_9$$11); + zephir_check_call_status(); + ZEPHIR_CPY_WRT(&router, &_8$$11); + zephir_update_property_zval(this_ptr, SL("router"), &router); + } + ZEPHIR_CALL_METHOD(&_10$$9, &router, "getroutebyname", NULL, 0, &routeName); + zephir_check_call_status(); + ZEPHIR_CPY_WRT(&route, &_10$$9); + if (Z_TYPE_P(&route) != IS_OBJECT) { + ZEPHIR_INIT_VAR(&_11$$13); + object_init_ex(&_11$$13, phalcon_url_exception_ce); + ZEPHIR_INIT_VAR(&_12$$13); + ZEPHIR_CONCAT_SVS(&_12$$13, "Cannot obtain a route using the name '", &routeName, "'"); + ZEPHIR_CALL_METHOD(NULL, &_11$$13, "__construct", NULL, 4, &_12$$13); + zephir_check_call_status(); + zephir_throw_exception_debug(&_11$$13, "phalcon/url.zep", 145 TSRMLS_CC); + ZEPHIR_MM_RESTORE(); + return; + } + ZEPHIR_INIT_VAR(&_13$$9); + ZEPHIR_CALL_METHOD(&_10$$9, &route, "getpattern", NULL, 0); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&_14$$9, &route, "getreversedpaths", NULL, 0); + zephir_check_call_status(); + phalcon_replace_paths(&_13$$9, &_10$$9, &_14$$9, uri TSRMLS_CC); + ZEPHIR_CPY_WRT(uri, &_13$$9); + } + if (local) { + zephir_get_strval(&_15$$14, uri); + ZEPHIR_CPY_WRT(&strUri, &_15$$14); + ZVAL_LONG(&_16$$14, -1); + ZEPHIR_INIT_VAR(&_17$$14); + zephir_substr(&_17$$14, baseUri, -1 , 0, ZEPHIR_SUBSTR_NO_LENGTH); + _18$$14 = ZEPHIR_IS_STRING(&_17$$14, "/"); + if (_18$$14) { + _18$$14 = zephir_fast_strlen_ev(&strUri) > 2; + } + _19$$14 = _18$$14; + if (_19$$14) { + _20$$14 = ZEPHIR_STRING_OFFSET(&strUri, 0); + _19$$14 = _20$$14 == '/'; + } + _21$$14 = _19$$14; + if (_21$$14) { + _22$$14 = ZEPHIR_STRING_OFFSET(&strUri, 1); + _21$$14 = _22$$14 != '/'; + } + if (_21$$14) { + ZVAL_LONG(&_23$$15, 1); + ZEPHIR_INIT_VAR(&_24$$15); + zephir_substr(&_24$$15, &strUri, 1 , 0, ZEPHIR_SUBSTR_NO_LENGTH); + ZEPHIR_INIT_NVAR(uri); + ZEPHIR_CONCAT_VV(uri, baseUri, &_24$$15); + } else { + _25$$16 = ZEPHIR_IS_STRING(baseUri, "/"); + if (_25$$16) { + _25$$16 = zephir_fast_strlen_ev(&strUri) == 1; + } + _26$$16 = _25$$16; + if (_26$$16) { + _27$$16 = ZEPHIR_STRING_OFFSET(&strUri, 0); + _26$$16 = _27$$16 == '/'; + } + if (_26$$16) { + ZEPHIR_CPY_WRT(uri, baseUri); + } else { + ZEPHIR_INIT_NVAR(uri); + ZEPHIR_CONCAT_VV(uri, baseUri, &strUri); + } + } + } + if (zephir_is_true(args)) { + ZEPHIR_CALL_FUNCTION(&queryString, "http_build_query", NULL, 456, args); + zephir_check_call_status(); + _28$$19 = Z_TYPE_P(&queryString) == IS_STRING; + if (_28$$19) { + _28$$19 = ((zephir_fast_strlen_ev(&queryString)) ? 1 : 0); + } + if (_28$$19) { + ZEPHIR_INIT_VAR(&_29$$20); + ZVAL_STRING(&_29$$20, "?"); + ZEPHIR_INIT_VAR(&_30$$20); + zephir_fast_strpos(&_30$$20, uri, &_29$$20, 0 ); + if (!ZEPHIR_IS_FALSE_IDENTICAL(&_30$$20)) { + ZEPHIR_INIT_VAR(&_31$$21); + ZEPHIR_CONCAT_SV(&_31$$21, "&", &queryString); + zephir_concat_self(uri, &_31$$21 TSRMLS_CC); + } else { + ZEPHIR_INIT_VAR(&_32$$22); + ZEPHIR_CONCAT_SV(&_32$$22, "?", &queryString); + zephir_concat_self(uri, &_32$$22 TSRMLS_CC); + } + } + } + RETVAL_ZVAL(uri, 1, 0); + RETURN_MM(); + +} + +/** + * Returns the base path + */ +PHP_METHOD(Phalcon_Url, getBasePath) { + + zval *this_ptr = getThis(); + + + RETURN_MEMBER(getThis(), "basePath"); + +} + +/** + * Returns the prefix for all the generated urls. By default / + */ +PHP_METHOD(Phalcon_Url, getBaseUri) { + + zval *_SERVER, baseUri, phpSelf, uri, _0; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&baseUri); + ZVAL_UNDEF(&phpSelf); + ZVAL_UNDEF(&uri); + ZVAL_UNDEF(&_0); + + ZEPHIR_MM_GROW(); + zephir_get_global(&_SERVER, SL("_SERVER")); + + zephir_read_property(&_0, this_ptr, SL("baseUri"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CPY_WRT(&baseUri, &_0); + if (Z_TYPE_P(&baseUri) == IS_NULL) { + ZEPHIR_OBS_VAR(&phpSelf); + if (zephir_array_isset_string_fetch(&phpSelf, _SERVER, SL("PHP_SELF"), 0)) { + ZEPHIR_INIT_VAR(&uri); + phalcon_get_uri(&uri, &phpSelf); + } else { + ZEPHIR_INIT_NVAR(&uri); + ZVAL_NULL(&uri); + } + ZEPHIR_INIT_NVAR(&baseUri); + if (!(zephir_is_true(&uri))) { + ZVAL_STRING(&baseUri, "/"); + } else { + ZEPHIR_CONCAT_SVS(&baseUri, "/", &uri, "/"); + } + zephir_update_property_zval(this_ptr, SL("baseUri"), &baseUri); + } + RETURN_CCTOR(&baseUri); + +} + +/** + * Returns the DependencyInjector container + */ +PHP_METHOD(Phalcon_Url, getDI) { + + zval *this_ptr = getThis(); + + + RETURN_MEMBER(getThis(), "container"); + +} + +/** + * Generates a URL for a static resource + * + * + * // Generate a URL for a static resource + * echo $url->getStatic("img/logo.png"); + * + * // Generate a URL for a static predefined route + * echo $url->getStatic( + * [ + * "for" => "logo-cdn", + * ] + * ); + * + */ +PHP_METHOD(Phalcon_Url, getStatic) { + + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *uri = NULL, uri_sub, __$null, _0, _1, _2; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&uri_sub); + ZVAL_NULL(&__$null); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2); + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 0, 1, &uri); + + if (!uri) { + uri = &uri_sub; + uri = &__$null; + } + + + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getstaticbaseuri", NULL, 0); + zephir_check_call_status(); + ZVAL_NULL(&_1); + ZVAL_NULL(&_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "get", NULL, 0, uri, &_1, &_2, &_0); + zephir_check_call_status(); + RETURN_MM(); + +} + +/** + * Returns the prefix for all the generated static urls. By default / + */ +PHP_METHOD(Phalcon_Url, getStaticBaseUri) { + + zval staticBaseUri, _0; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&staticBaseUri); + ZVAL_UNDEF(&_0); + + ZEPHIR_MM_GROW(); + + zephir_read_property(&_0, this_ptr, SL("staticBaseUri"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CPY_WRT(&staticBaseUri, &_0); + if (Z_TYPE_P(&staticBaseUri) != IS_NULL) { + RETURN_CCTOR(&staticBaseUri); + } + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbaseuri", NULL, 0); + zephir_check_call_status(); + RETURN_MM(); + +} + +/** + * Sets a base path for all the generated paths + * + * + * $url->setBasePath("/var/www/htdocs/"); + * + */ +PHP_METHOD(Phalcon_Url, setBasePath) { + + zval *basePath_param = NULL; + zval basePath; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&basePath); + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &basePath_param); + + if (UNEXPECTED(Z_TYPE_P(basePath_param) != IS_STRING && Z_TYPE_P(basePath_param) != IS_NULL)) { + zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'basePath' must be of the type string") TSRMLS_CC); + RETURN_MM_NULL(); + } + if (EXPECTED(Z_TYPE_P(basePath_param) == IS_STRING)) { + zephir_get_strval(&basePath, basePath_param); + } else { + ZEPHIR_INIT_VAR(&basePath); + ZVAL_EMPTY_STRING(&basePath); + } + + + zephir_update_property_zval(this_ptr, SL("basePath"), &basePath); + RETURN_THIS(); + +} + +/** + * Sets a prefix for all the URIs to be generated + * + * + * $url->setBaseUri("/invo/"); + * + * $url->setBaseUri("/invo/index.php/"); + * + */ +PHP_METHOD(Phalcon_Url, setBaseUri) { + + zval *baseUri_param = NULL, _0; + zval baseUri; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&baseUri); + ZVAL_UNDEF(&_0); + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &baseUri_param); + + if (UNEXPECTED(Z_TYPE_P(baseUri_param) != IS_STRING && Z_TYPE_P(baseUri_param) != IS_NULL)) { + zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'baseUri' must be of the type string") TSRMLS_CC); + RETURN_MM_NULL(); + } + if (EXPECTED(Z_TYPE_P(baseUri_param) == IS_STRING)) { + zephir_get_strval(&baseUri, baseUri_param); + } else { + ZEPHIR_INIT_VAR(&baseUri); + ZVAL_EMPTY_STRING(&baseUri); + } + + + zephir_update_property_zval(this_ptr, SL("baseUri"), &baseUri); + zephir_read_property(&_0, this_ptr, SL("staticBaseUri"), PH_NOISY_CC | PH_READONLY); + if (Z_TYPE_P(&_0) == IS_NULL) { + zephir_update_property_zval(this_ptr, SL("staticBaseUri"), &baseUri); + } + RETURN_THIS(); + +} + +/** + * Sets the DependencyInjector container + */ +PHP_METHOD(Phalcon_Url, setDI) { + + zval *dependencyInjector, dependencyInjector_sub; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&dependencyInjector_sub); + + zephir_fetch_params(0, 1, 0, &dependencyInjector); + + + + zephir_update_property_zval(this_ptr, SL("container"), dependencyInjector); + +} + +/** + * Sets a prefix for all static URLs generated + * + * + * $url->setStaticBaseUri("/invo/"); + * + */ +PHP_METHOD(Phalcon_Url, setStaticBaseUri) { + + zval *staticBaseUri_param = NULL; + zval staticBaseUri; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&staticBaseUri); + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &staticBaseUri_param); + + if (UNEXPECTED(Z_TYPE_P(staticBaseUri_param) != IS_STRING && Z_TYPE_P(staticBaseUri_param) != IS_NULL)) { + zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'staticBaseUri' must be of the type string") TSRMLS_CC); + RETURN_MM_NULL(); + } + if (EXPECTED(Z_TYPE_P(staticBaseUri_param) == IS_STRING)) { + zephir_get_strval(&staticBaseUri, staticBaseUri_param); + } else { + ZEPHIR_INIT_VAR(&staticBaseUri); + ZVAL_EMPTY_STRING(&staticBaseUri); + } + + + zephir_update_property_zval(this_ptr, SL("staticBaseUri"), &staticBaseUri); + RETURN_THIS(); + +} + +/** + * Generates a local path + */ +PHP_METHOD(Phalcon_Url, path) { + + zval *path_param = NULL, _0; + zval path; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&path); + ZVAL_UNDEF(&_0); + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 0, 1, &path_param); + + if (!path_param) { + ZEPHIR_INIT_VAR(&path); + ZVAL_STRING(&path, ""); + } else { + zephir_get_strval(&path, path_param); + } + + + zephir_read_property(&_0, this_ptr, SL("basePath"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CONCAT_VV(return_value, &_0, &path); + RETURN_MM(); + +} + diff --git a/ext/phalcon/url.zep.h b/ext/phalcon/url.zep.h new file mode 100644 index 00000000000..111f0b8fe97 --- /dev/null +++ b/ext/phalcon/url.zep.h @@ -0,0 +1,134 @@ + +extern zend_class_entry *phalcon_url_ce; + +ZEPHIR_INIT_CLASS(Phalcon_Url); + +PHP_METHOD(Phalcon_Url, get); +PHP_METHOD(Phalcon_Url, getBasePath); +PHP_METHOD(Phalcon_Url, getBaseUri); +PHP_METHOD(Phalcon_Url, getDI); +PHP_METHOD(Phalcon_Url, getStatic); +PHP_METHOD(Phalcon_Url, getStaticBaseUri); +PHP_METHOD(Phalcon_Url, setBasePath); +PHP_METHOD(Phalcon_Url, setBaseUri); +PHP_METHOD(Phalcon_Url, setDI); +PHP_METHOD(Phalcon_Url, setStaticBaseUri); +PHP_METHOD(Phalcon_Url, path); + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_get, 0, 0, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_get, 0, 0, IS_STRING, NULL, 0) +#endif + ZEND_ARG_INFO(0, uri) + ZEND_ARG_INFO(0, args) +#if PHP_VERSION_ID >= 70200 + ZEND_ARG_TYPE_INFO(0, local, _IS_BOOL, 1) +#else + ZEND_ARG_INFO(0, local) +#endif + ZEND_ARG_INFO(0, baseUri) +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_getbasepath, 0, 0, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_getbasepath, 0, 0, IS_STRING, NULL, 0) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_getbaseuri, 0, 0, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_getbaseuri, 0, 0, IS_STRING, NULL, 0) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_url_getdi, 0, 0, Phalcon\\DiInterface, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_getdi, 0, 0, IS_OBJECT, "Phalcon\\DiInterface", 0) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_getstatic, 0, 0, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_getstatic, 0, 0, IS_STRING, NULL, 0) +#endif + ZEND_ARG_INFO(0, uri) +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_getstaticbaseuri, 0, 0, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_getstaticbaseuri, 0, 0, IS_STRING, NULL, 0) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_url_setbasepath, 0, 1, Phalcon\\UrlInterface, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_setbasepath, 0, 1, IS_OBJECT, "Phalcon\\UrlInterface", 0) +#endif +#if PHP_VERSION_ID >= 70200 + ZEND_ARG_TYPE_INFO(0, basePath, IS_STRING, 0) +#else + ZEND_ARG_INFO(0, basePath) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_url_setbaseuri, 0, 1, Phalcon\\UrlInterface, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_setbaseuri, 0, 1, IS_OBJECT, "Phalcon\\UrlInterface", 0) +#endif +#if PHP_VERSION_ID >= 70200 + ZEND_ARG_TYPE_INFO(0, baseUri, IS_STRING, 0) +#else + ZEND_ARG_INFO(0, baseUri) +#endif +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_url_setdi, 0, 0, 1) + ZEND_ARG_OBJ_INFO(0, dependencyInjector, Phalcon\\DiInterface, 0) +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_url_setstaticbaseuri, 0, 1, Phalcon\\UrlInterface, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_setstaticbaseuri, 0, 1, IS_OBJECT, "Phalcon\\UrlInterface", 0) +#endif +#if PHP_VERSION_ID >= 70200 + ZEND_ARG_TYPE_INFO(0, staticBaseUri, IS_STRING, 0) +#else + ZEND_ARG_INFO(0, staticBaseUri) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_path, 0, 0, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_url_path, 0, 0, IS_STRING, NULL, 0) +#endif +#if PHP_VERSION_ID >= 70200 + ZEND_ARG_TYPE_INFO(0, path, IS_STRING, 1) +#else + ZEND_ARG_INFO(0, path) +#endif +ZEND_END_ARG_INFO() + +ZEPHIR_INIT_FUNCS(phalcon_url_method_entry) { + PHP_ME(Phalcon_Url, get, arginfo_phalcon_url_get, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Url, getBasePath, arginfo_phalcon_url_getbasepath, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Url, getBaseUri, arginfo_phalcon_url_getbaseuri, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Url, getDI, arginfo_phalcon_url_getdi, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Url, getStatic, arginfo_phalcon_url_getstatic, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Url, getStaticBaseUri, arginfo_phalcon_url_getstaticbaseuri, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Url, setBasePath, arginfo_phalcon_url_setbasepath, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Url, setBaseUri, arginfo_phalcon_url_setbaseuri, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Url, setDI, arginfo_phalcon_url_setdi, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Url, setStaticBaseUri, arginfo_phalcon_url_setstaticbaseuri, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Url, path, arginfo_phalcon_url_path, ZEND_ACC_PUBLIC) + PHP_FE_END +}; diff --git a/ext/phalcon/url/exception.zep.c b/ext/phalcon/url/exception.zep.c new file mode 100644 index 00000000000..68ab3c74860 --- /dev/null +++ b/ext/phalcon/url/exception.zep.c @@ -0,0 +1,37 @@ + +#ifdef HAVE_CONFIG_H +#include "../../ext_config.h" +#endif + +#include +#include "../../php_ext.h" +#include "../../ext.h" + +#include +#include +#include + +#include "kernel/main.h" + + +/** + * This file is part of the Phalcon Framework. + * + * (c) Phalcon Team + * + * For the full copyright and license information, please view the LICENSE.txt + * file that was distributed with this source code. + */ +/** + * Phalcon\Url\Exception + * + * Exceptions thrown in Phalcon\Url will use this class + */ +ZEPHIR_INIT_CLASS(Phalcon_Url_Exception) { + + ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Url, Exception, phalcon, url_exception, phalcon_exception_ce, NULL, 0); + + return SUCCESS; + +} + diff --git a/ext/phalcon/url/exception.zep.h b/ext/phalcon/url/exception.zep.h new file mode 100644 index 00000000000..37fc57d55b5 --- /dev/null +++ b/ext/phalcon/url/exception.zep.h @@ -0,0 +1,5 @@ + +extern zend_class_entry *phalcon_url_exception_ce; + +ZEPHIR_INIT_CLASS(Phalcon_Url_Exception); + diff --git a/ext/phalcon/urlinterface.zep.c b/ext/phalcon/urlinterface.zep.c new file mode 100644 index 00000000000..7d108e68049 --- /dev/null +++ b/ext/phalcon/urlinterface.zep.c @@ -0,0 +1,68 @@ + +#ifdef HAVE_CONFIG_H +#include "../ext_config.h" +#endif + +#include +#include "../php_ext.h" +#include "../ext.h" + +#include + +#include "kernel/main.h" + + +/** + * This file is part of the Phalcon Framework. + * + * (c) Phalcon Team + * + * For the full copyright and license information, please view the LICENSE.txt + * file that was distributed with this source code. + */ +/** + * Phalcon\UrlInterface + * + * Interface for Phalcon\UrlInterface + */ +ZEPHIR_INIT_CLASS(Phalcon_UrlInterface) { + + ZEPHIR_REGISTER_INTERFACE(Phalcon, UrlInterface, phalcon, urlinterface, phalcon_urlinterface_method_entry); + + return SUCCESS; + +} + +/** + * Generates a URL + * + * @param string|array uri + * @param array|object args Optional arguments to be appended to the query string + */ +ZEPHIR_DOC_METHOD(Phalcon_UrlInterface, get); + +/** + * Returns a base path + */ +ZEPHIR_DOC_METHOD(Phalcon_UrlInterface, getBasePath); + +/** + * Returns the prefix for all the generated urls. By default / + */ +ZEPHIR_DOC_METHOD(Phalcon_UrlInterface, getBaseUri); + +/** + * Sets a base paths for all the generated paths + */ +ZEPHIR_DOC_METHOD(Phalcon_UrlInterface, setBasePath); + +/** + * Sets a prefix to all the urls generated + */ +ZEPHIR_DOC_METHOD(Phalcon_UrlInterface, setBaseUri); + +/** + * Generates a local path + */ +ZEPHIR_DOC_METHOD(Phalcon_UrlInterface, path); + diff --git a/ext/phalcon/urlinterface.zep.h b/ext/phalcon/urlinterface.zep.h new file mode 100644 index 00000000000..e8b4f599b38 --- /dev/null +++ b/ext/phalcon/urlinterface.zep.h @@ -0,0 +1,78 @@ + +extern zend_class_entry *phalcon_urlinterface_ce; + +ZEPHIR_INIT_CLASS(Phalcon_UrlInterface); + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_urlinterface_get, 0, 0, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_urlinterface_get, 0, 0, IS_STRING, NULL, 0) +#endif + ZEND_ARG_INFO(0, uri) + ZEND_ARG_INFO(0, args) +#if PHP_VERSION_ID >= 70200 + ZEND_ARG_TYPE_INFO(0, local, _IS_BOOL, 1) +#else + ZEND_ARG_INFO(0, local) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_urlinterface_getbasepath, 0, 0, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_urlinterface_getbasepath, 0, 0, IS_STRING, NULL, 0) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_urlinterface_getbaseuri, 0, 0, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_urlinterface_getbaseuri, 0, 0, IS_STRING, NULL, 0) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_urlinterface_setbasepath, 0, 1, Phalcon\\UrlInterface, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_urlinterface_setbasepath, 0, 1, IS_OBJECT, "Phalcon\\UrlInterface", 0) +#endif +#if PHP_VERSION_ID >= 70200 + ZEND_ARG_TYPE_INFO(0, basePath, IS_STRING, 0) +#else + ZEND_ARG_INFO(0, basePath) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_urlinterface_setbaseuri, 0, 1, Phalcon\\UrlInterface, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_urlinterface_setbaseuri, 0, 1, IS_OBJECT, "Phalcon\\UrlInterface", 0) +#endif +#if PHP_VERSION_ID >= 70200 + ZEND_ARG_TYPE_INFO(0, baseUri, IS_STRING, 0) +#else + ZEND_ARG_INFO(0, baseUri) +#endif +ZEND_END_ARG_INFO() + +#if PHP_VERSION_ID >= 70200 +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_urlinterface_path, 0, 0, IS_STRING, 0) +#else +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_urlinterface_path, 0, 0, IS_STRING, NULL, 0) +#endif +#if PHP_VERSION_ID >= 70200 + ZEND_ARG_TYPE_INFO(0, path, IS_STRING, 1) +#else + ZEND_ARG_INFO(0, path) +#endif +ZEND_END_ARG_INFO() + +ZEPHIR_INIT_FUNCS(phalcon_urlinterface_method_entry) { + PHP_ABSTRACT_ME(Phalcon_UrlInterface, get, arginfo_phalcon_urlinterface_get) + PHP_ABSTRACT_ME(Phalcon_UrlInterface, getBasePath, arginfo_phalcon_urlinterface_getbasepath) + PHP_ABSTRACT_ME(Phalcon_UrlInterface, getBaseUri, arginfo_phalcon_urlinterface_getbaseuri) + PHP_ABSTRACT_ME(Phalcon_UrlInterface, setBasePath, arginfo_phalcon_urlinterface_setbasepath) + PHP_ABSTRACT_ME(Phalcon_UrlInterface, setBaseUri, arginfo_phalcon_urlinterface_setbaseuri) + PHP_ABSTRACT_ME(Phalcon_UrlInterface, path, arginfo_phalcon_urlinterface_path) + PHP_FE_END +}; diff --git a/ext/phalcon/validation/validator/confirmation.zep.c b/ext/phalcon/validation/validator/confirmation.zep.c index 69bfd2af788..711d147b683 100644 --- a/ext/phalcon/validation/validator/confirmation.zep.c +++ b/ext/phalcon/validation/validator/confirmation.zep.c @@ -202,12 +202,12 @@ PHP_METHOD(Phalcon_Validation_Validator_Confirmation, compare) { } ZEPHIR_INIT_VAR(&_3$$3); ZVAL_STRING(&_3$$3, "utf-8"); - ZEPHIR_CALL_FUNCTION(&_4$$3, "mb_strtolower", NULL, 444, &a, &_3$$3); + ZEPHIR_CALL_FUNCTION(&_4$$3, "mb_strtolower", NULL, 443, &a, &_3$$3); zephir_check_call_status(); zephir_get_strval(&a, &_4$$3); ZEPHIR_INIT_NVAR(&_3$$3); ZVAL_STRING(&_3$$3, "utf-8"); - ZEPHIR_CALL_FUNCTION(&_5$$3, "mb_strtolower", NULL, 444, &b, &_3$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "mb_strtolower", NULL, 443, &b, &_3$$3); zephir_check_call_status(); zephir_get_strval(&b, &_5$$3); } diff --git a/ext/phalcon/validation/validator/uniqueness.zep.c b/ext/phalcon/validation/validator/uniqueness.zep.c index 9c61d99a00e..818bbb27c15 100644 --- a/ext/phalcon/validation/validator/uniqueness.zep.c +++ b/ext/phalcon/validation/validator/uniqueness.zep.c @@ -487,7 +487,7 @@ PHP_METHOD(Phalcon_Validation_Validator_Uniqueness, isUniquenessModel) { zephir_array_keys(&_9$$6, &except TSRMLS_CC); ZVAL_LONG(&_10$$6, 0); ZVAL_LONG(&_11$$6, (zephir_fast_count_int(&except TSRMLS_CC) - 1)); - ZEPHIR_CALL_FUNCTION(&_12$$6, "range", &_13, 442, &_10$$6, &_11$$6); + ZEPHIR_CALL_FUNCTION(&_12$$6, "range", &_13, 441, &_10$$6, &_11$$6); zephir_check_call_status(); _8$$6 = !ZEPHIR_IS_IDENTICAL(&_9$$6, &_12$$6); }