diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md index efd237bf95b..71ef940821b 100644 --- a/CHANGELOG-5.0.md +++ b/CHANGELOG-5.0.md @@ -3,6 +3,7 @@ ## Changed - Changed `Phalcon\Session\Bag::__construct()` to accept a `Phalcon\Session\Manager` as the first parameter and `name` as the second one [#15904](https://github.com/phalcon/cphalcon/issues/15904) - Changed `Phalcon\Logger\Logger` to no longer depend on PSR interfaces [#15925](https://github.com/phalcon/cphalcon/issues/15925) +- Changed `Phalcon\Cache\Cache` to no longer depend on PSR interfaces [#15927](https://github.com/phalcon/cphalcon/issues/15927) ## Fixed - Fixed `Phalcon\Html\Helper\Input\Numeric` to produce correct elements [#15896](https://github.com/phalcon/cphalcon/issues/15896) @@ -23,6 +24,9 @@ - Added - `Phalcon\Logger\LoggerInterface` - `Phalcon\Logger\AbstractLogger` to be used in the logger class but also the proxy-psr3 repo [#15925](https://github.com/phalcon/cphalcon/issues/15925) +- Added + - `Phalcon\Cache\CacheInterface` + - `Phalcon\Cache\AbstractCache` to be used in the cache class but also the proxy-psr16 repo [#15927](https://github.com/phalcon/cphalcon/issues/15927) # [5.0.0beta3](https://github.com/phalcon/cphalcon/releases/tag/v5.0.0beta3) (2022-02-06) diff --git a/ext/config.m4 b/ext/config.m4 index 936127949ba..81122e5334f 100644 --- a/ext/config.m4 +++ b/ext/config.m4 @@ -81,6 +81,7 @@ if test "$PHP_PHALCON" = "yes"; then phalcon/application/exception.zep.c phalcon/assets/asset.zep.c phalcon/assets/inline.zep.c + phalcon/cache/cacheinterface.zep.c phalcon/datamapper/pdo/connection/abstractconnection.zep.c phalcon/datamapper/pdo/exception/exception.zep.c phalcon/di/di.zep.c @@ -108,6 +109,7 @@ if test "$PHP_PHALCON" = "yes"; then phalcon/acl/componentinterface.zep.c phalcon/acl/roleinterface.zep.c phalcon/annotations/readerinterface.zep.c + phalcon/cache/abstractcache.zep.c phalcon/cli/dispatcherinterface.zep.c phalcon/cli/router/routeinterface.zep.c phalcon/cli/taskinterface.zep.c diff --git a/ext/config.w32 b/ext/config.w32 index 74deed6321e..319924c1f28 100644 --- a/ext/config.w32 +++ b/ext/config.w32 @@ -52,6 +52,7 @@ if (PHP_PHALCON != "no") { ADD_SOURCES(configure_module_dirname + "/phalcon/mvc", "viewbaseinterface.zep.c entityinterface.zep.c routerinterface.zep.c controllerinterface.zep.c dispatcherinterface.zep.c modelinterface.zep.c router.zep.c viewinterface.zep.c application.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/acl/adapter", "adapterinterface.zep.c abstractadapter.zep.c memory.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/application", "abstractapplication.zep.c exception.zep.c", "phalcon"); + ADD_SOURCES(configure_module_dirname + "/phalcon/cache", "cacheinterface.zep.c abstractcache.zep.c adapterfactory.zep.c cache.zep.c cachefactory.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/datamapper/pdo/exception", "exception.zep.c cannotdisconnect.zep.c connectionnotfound.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/domain/payload", "readableinterface.zep.c writeableinterface.zep.c payloadinterface.zep.c payload.zep.c payloadfactory.zep.c status.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/encryption/security/jwt/token", "abstractitem.zep.c enum.zep.c item.zep.c parser.zep.c signature.zep.c token.zep.c", "phalcon"); @@ -89,7 +90,6 @@ if (PHP_PHALCON != "no") { ADD_SOURCES(configure_module_dirname + "/phalcon/assets/filters", "cssmin.zep.c jsmin.zep.c none.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/assets/inline", "css.zep.c js.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/autoload", "exception.zep.c loader.zep.c", "phalcon"); - ADD_SOURCES(configure_module_dirname + "/phalcon/cache", "adapterfactory.zep.c cache.zep.c cachefactory.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/cache/exception", "exception.zep.c invalidargumentexception.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/cli/console", "exception.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/cli/dispatcher", "exception.zep.c", "phalcon"); diff --git a/ext/phalcon.c b/ext/phalcon.c index ec5a7f78ccd..4c992abb52a 100644 --- a/ext/phalcon.c +++ b/ext/phalcon.c @@ -58,6 +58,7 @@ zend_class_entry *phalcon_mvc_model_behaviorinterface_ce; zend_class_entry *phalcon_mvc_view_engine_engineinterface_ce; zend_class_entry *phalcon_mvc_viewbaseinterface_ce; zend_class_entry *phalcon_acl_adapter_adapterinterface_ce; +zend_class_entry *phalcon_cache_cacheinterface_ce; zend_class_entry *phalcon_domain_payload_readableinterface_ce; zend_class_entry *phalcon_domain_payload_writeableinterface_ce; zend_class_entry *phalcon_http_message_responsestatuscodeinterface_ce; @@ -179,6 +180,7 @@ zend_class_entry *phalcon_mvc_model_resultset_ce; zend_class_entry *phalcon_mvc_view_engine_abstractengine_ce; zend_class_entry *phalcon_session_adapter_abstractadapter_ce; zend_class_entry *phalcon_acl_adapter_abstractadapter_ce; +zend_class_entry *phalcon_cache_abstractcache_ce; zend_class_entry *phalcon_di_exception_ce; zend_class_entry *phalcon_di_factorydefault_ce; zend_class_entry *phalcon_encryption_crypt_exception_exception_ce; @@ -720,6 +722,7 @@ static PHP_MINIT_FUNCTION(phalcon) ZEPHIR_INIT(Phalcon_Mvc_ViewBaseInterface); ZEPHIR_INIT(Phalcon_Mvc_View_Engine_EngineInterface); ZEPHIR_INIT(Phalcon_Acl_Adapter_AdapterInterface); + ZEPHIR_INIT(Phalcon_Cache_CacheInterface); ZEPHIR_INIT(Phalcon_Domain_Payload_ReadableInterface); ZEPHIR_INIT(Phalcon_Domain_Payload_WriteableInterface); ZEPHIR_INIT(Phalcon_Http_Message_ResponseStatusCodeInterface); @@ -841,6 +844,7 @@ static PHP_MINIT_FUNCTION(phalcon) ZEPHIR_INIT(Phalcon_Mvc_View_Engine_AbstractEngine); ZEPHIR_INIT(Phalcon_Session_Adapter_AbstractAdapter); ZEPHIR_INIT(Phalcon_Acl_Adapter_AbstractAdapter); + ZEPHIR_INIT(Phalcon_Cache_AbstractCache); ZEPHIR_INIT(Phalcon_Di_Exception); ZEPHIR_INIT(Phalcon_Di_FactoryDefault); ZEPHIR_INIT(Phalcon_Encryption_Crypt_Exception_Exception); diff --git a/ext/phalcon.h b/ext/phalcon.h index 8ff3cb55e58..8a1fd5d1873 100644 --- a/ext/phalcon.h +++ b/ext/phalcon.h @@ -76,6 +76,7 @@ #include "phalcon/application/exception.zep.h" #include "phalcon/assets/asset.zep.h" #include "phalcon/assets/inline.zep.h" +#include "phalcon/cache/cacheinterface.zep.h" #include "phalcon/datamapper/pdo/connection/abstractconnection.zep.h" #include "phalcon/datamapper/pdo/exception/exception.zep.h" #include "phalcon/di/di.zep.h" @@ -103,6 +104,7 @@ #include "phalcon/acl/componentinterface.zep.h" #include "phalcon/acl/roleinterface.zep.h" #include "phalcon/annotations/readerinterface.zep.h" +#include "phalcon/cache/abstractcache.zep.h" #include "phalcon/cli/dispatcherinterface.zep.h" #include "phalcon/cli/router/routeinterface.zep.h" #include "phalcon/cli/taskinterface.zep.h" diff --git a/ext/phalcon/acl/adapter/abstractadapter.zep.c b/ext/phalcon/acl/adapter/abstractadapter.zep.c index 0dcf1ed0ae5..475d8a238fb 100644 --- a/ext/phalcon/acl/adapter/abstractadapter.zep.c +++ b/ext/phalcon/acl/adapter/abstractadapter.zep.c @@ -121,7 +121,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_AbstractAdapter, getDefaultAction) } /** - * Sets the default access level (Phalcon\Acl::ALLOW or Phalcon\Acl::DENY) + * Sets the default access level (Phalcon\Acl\Enum::ALLOW or Phalcon\Acl\Enum::DENY) */ PHP_METHOD(Phalcon_Acl_Adapter_AbstractAdapter, setDefaultAction) { diff --git a/ext/phalcon/acl/adapter/memory.zep.c b/ext/phalcon/acl/adapter/memory.zep.c index 9627b2d1f61..6ed0fd4bf13 100644 --- a/ext/phalcon/acl/adapter/memory.zep.c +++ b/ext/phalcon/acl/adapter/memory.zep.c @@ -299,10 +299,10 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, addComponent) } else { ZEPHIR_INIT_NVAR(&componentObject); object_init_ex(&componentObject, phalcon_acl_component_ce); - ZEPHIR_CALL_METHOD(NULL, &componentObject, "__construct", NULL, 164, componentValue); + ZEPHIR_CALL_METHOD(NULL, &componentObject, "__construct", NULL, 165, componentValue); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&componentName, &componentObject, "getname", NULL, 165); + ZEPHIR_CALL_METHOD(&componentName, &componentObject, "getname", NULL, 166); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("componentsNames"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset(&_1, &componentName))) { @@ -359,7 +359,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, addComponentAccess) zephir_read_property(&_0, this_ptr, ZEND_STRL("componentsNames"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "Component"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 166, &_0, &componentName, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 167, &_0, &componentName, &_1); zephir_check_call_status(); _2 = Z_TYPE_P(accessList) != IS_ARRAY; if (_2) { @@ -510,7 +510,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZVAL_STRING(&_1, "Role"); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "role list"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 166, &_0, &roleName, &_1, &_2); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 167, &_0, &roleName, &_1, &_2); zephir_check_call_status(); zephir_read_property(&_3, this_ptr, ZEND_STRL("roleInherits"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset(&_3, &roleName))) { @@ -574,7 +574,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZEPHIR_INIT_NVAR(&usedRoleToInherit); ZVAL_COPY(&usedRoleToInherit, _17$$12); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 167, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 168, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -590,7 +590,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZEPHIR_CALL_METHOD(&usedRoleToInherit, &_16$$12, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 167, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 168, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_16$$12, "next", NULL, 0); @@ -634,7 +634,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZEPHIR_INIT_NVAR(&usedRoleToInherit); ZVAL_COPY(&usedRoleToInherit, _26$$18); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 167, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 168, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -650,7 +650,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZEPHIR_CALL_METHOD(&usedRoleToInherit, &_25$$18, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 167, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 168, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_25$$18, "next", NULL, 0); @@ -717,7 +717,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZEPHIR_INIT_NVAR(&usedRoleToInherit); ZVAL_COPY(&usedRoleToInherit, _37$$27); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 167, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 168, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -733,7 +733,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZEPHIR_CALL_METHOD(&usedRoleToInherit, &_36$$27, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 167, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 168, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_36$$27, "next", NULL, 0); @@ -777,7 +777,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZEPHIR_INIT_NVAR(&usedRoleToInherit); ZVAL_COPY(&usedRoleToInherit, _44$$33); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 167, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 168, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -793,7 +793,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, addInherit) ZEPHIR_CALL_METHOD(&usedRoleToInherit, &_43$$33, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 167, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 168, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_43$$33, "next", NULL, 0); @@ -867,13 +867,13 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, addRole) } else if (Z_TYPE_P(role) == IS_STRING) { ZEPHIR_INIT_NVAR(&roleObject); object_init_ex(&roleObject, phalcon_acl_role_ce); - ZEPHIR_CALL_METHOD(NULL, &roleObject, "__construct", NULL, 168, role); + ZEPHIR_CALL_METHOD(NULL, &roleObject, "__construct", NULL, 169, role); zephir_check_call_status(); } else { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_acl_exception_ce, "Role must be either a string or implement RoleInterface", "phalcon/Acl/Adapter/Memory.zep", 393); return; } - ZEPHIR_CALL_METHOD(&roleName, &roleObject, "getname", NULL, 169); + ZEPHIR_CALL_METHOD(&roleName, &roleObject, "getname", NULL, 170); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("roles"), PH_NOISY_CC | PH_READONLY); if (zephir_array_isset(&_1, &roleName)) { @@ -964,7 +964,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, allow) ZEPHIR_INIT_NVAR(&role); ZVAL_COPY(&role, _2); ZVAL_LONG(&_4$$4, 1); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 170, &role, &componentName, access, &_4$$4, func); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 171, &role, &componentName, access, &_4$$4, func); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); } else { @@ -979,7 +979,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, allow) ZEPHIR_CALL_METHOD(&role, &rolesArray, "current", NULL, 0); zephir_check_call_status(); ZVAL_LONG(&_6$$5, 1); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 170, &role, &componentName, access, &_6$$5, func); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 171, &role, &componentName, access, &_6$$5, func); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &rolesArray, "next", NULL, 0); zephir_check_call_status(); @@ -1066,7 +1066,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, deny) ZEPHIR_INIT_NVAR(&role); ZVAL_COPY(&role, _2); ZVAL_LONG(&_4$$4, 0); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 170, &role, &componentName, access, &_4$$4, func); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 171, &role, &componentName, access, &_4$$4, func); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); } else { @@ -1081,7 +1081,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, deny) ZEPHIR_CALL_METHOD(&role, &rolesArray, "current", NULL, 0); zephir_check_call_status(); ZVAL_LONG(&_6$$5, 0); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 170, &role, &componentName, access, &_6$$5, func); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 171, &role, &componentName, access, &_6$$5, func); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &rolesArray, "next", NULL, 0); zephir_check_call_status(); @@ -1458,7 +1458,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) zephir_read_property(&_9$$12, this_ptr, ZEND_STRL("defaultAccess"), PH_NOISY_CC | PH_READONLY); RETURN_MM_BOOL((ZEPHIR_IS_LONG(&_9$$12, 1))); } - ZEPHIR_CALL_METHOD(&accessKey, this_ptr, "canaccess", NULL, 171, roleName, componentName, &access); + ZEPHIR_CALL_METHOD(&accessKey, this_ptr, "canaccess", NULL, 172, roleName, componentName, &access); zephir_check_call_status(); _10 = Z_TYPE_P(&accessKey) != IS_NULL; if (_10) { @@ -1487,9 +1487,9 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) if (zephir_is_callable(&funcAccess)) { ZEPHIR_INIT_VAR(&reflectionFunction); object_init_ex(&reflectionFunction, zephir_get_internal_ce(SL("reflectionfunction"))); - ZEPHIR_CALL_METHOD(NULL, &reflectionFunction, "__construct", NULL, 172, &funcAccess); + ZEPHIR_CALL_METHOD(NULL, &reflectionFunction, "__construct", NULL, 173, &funcAccess); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&reflectionParameters, &reflectionFunction, "getparameters", NULL, 173); + ZEPHIR_CALL_METHOD(&reflectionParameters, &reflectionFunction, "getparameters", NULL, 174); zephir_check_call_status(); ZEPHIR_INIT_VAR(¶meterNumber); ZVAL_LONG(¶meterNumber, zephir_fast_count_int(&reflectionParameters)); @@ -1505,7 +1505,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, isAllowed) } ZEPHIR_INIT_VAR(¶metersForFunction); array_init(¶metersForFunction); - ZEPHIR_CALL_METHOD(&numberOfRequiredParameters, &reflectionFunction, "getnumberofrequiredparameters", NULL, 174); + ZEPHIR_CALL_METHOD(&numberOfRequiredParameters, &reflectionFunction, "getnumberofrequiredparameters", NULL, 175); zephir_check_call_status(); ZEPHIR_CPY_WRT(&userParametersSizeShouldBe, ¶meterNumber); zephir_is_iterable(&reflectionParameters, 0, "phalcon/Acl/Adapter/Memory.zep", 736); @@ -1874,12 +1874,12 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, allowOrDeny) zephir_read_property(&_0, this_ptr, ZEND_STRL("roles"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "Role"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 166, &_0, &roleName, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 167, &_0, &roleName, &_1); zephir_check_call_status(); zephir_read_property(&_2, this_ptr, ZEND_STRL("componentsNames"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "Component"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 166, &_2, &componentName, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 167, &_2, &componentName, &_1); zephir_check_call_status(); zephir_read_property(&_3, this_ptr, ZEND_STRL("accessList"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&accessList, &_3); @@ -2075,7 +2075,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, canAccess) ZEPHIR_INIT_NVAR(&usedRoleToInherit); ZVAL_COPY(&usedRoleToInherit, _3$$6); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 167, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 168, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -2091,7 +2091,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, canAccess) ZEPHIR_CALL_METHOD(&usedRoleToInherit, &_2$$6, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 167, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 168, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_2$$6, "next", NULL, 0); @@ -2142,7 +2142,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, canAccess) ZEPHIR_INIT_NVAR(&usedRoleToInherit); ZVAL_COPY(&usedRoleToInherit, _13$$14); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 167, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 168, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); @@ -2158,7 +2158,7 @@ PHP_METHOD(Phalcon_Acl_Adapter_Memory, canAccess) ZEPHIR_CALL_METHOD(&usedRoleToInherit, &_12$$14, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&checkRoleToInherits); - ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 167, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 168, &checkRoleToInherits, &usedRoleToInherit); ZEPHIR_UNREF(&checkRoleToInherits); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_12$$14, "next", NULL, 0); diff --git a/ext/phalcon/annotations/adapter/apcu.zep.c b/ext/phalcon/annotations/adapter/apcu.zep.c index 0f2176124bc..7f28846fc23 100644 --- a/ext/phalcon/annotations/adapter/apcu.zep.c +++ b/ext/phalcon/annotations/adapter/apcu.zep.c @@ -142,7 +142,7 @@ PHP_METHOD(Phalcon_Annotations_Adapter_Apcu, read) ZEPHIR_INIT_VAR(&_2); ZEPHIR_CONCAT_SVV(&_2, "_PHAN", &_1, &key); zephir_fast_strtolower(&_0, &_2); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_fetch", NULL, 134, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_fetch", NULL, 135, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -192,7 +192,7 @@ PHP_METHOD(Phalcon_Annotations_Adapter_Apcu, write) ZEPHIR_CONCAT_SVV(&_2, "_PHAN", &_1, &key); zephir_fast_strtolower(&_0, &_2); zephir_read_property(&_3, this_ptr, ZEND_STRL("ttl"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_store", NULL, 135, &_0, data, &_3); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_store", NULL, 136, &_0, data, &_3); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/annotations/annotation.zep.c b/ext/phalcon/annotations/annotation.zep.c index 9574896fb0f..b71c0931e95 100644 --- a/ext/phalcon/annotations/annotation.zep.c +++ b/ext/phalcon/annotations/annotation.zep.c @@ -276,7 +276,7 @@ PHP_METHOD(Phalcon_Annotations_Annotation, getExpression) ZEPHIR_INIT_NVAR(&item); ZVAL_COPY(&item, _1$$7); zephir_array_fetch_string(&_3$$8, &item, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Annotations/Annotation.zep", 139); - ZEPHIR_CALL_METHOD(&resolvedItem, this_ptr, "getexpression", &_4, 175, &_3$$8); + ZEPHIR_CALL_METHOD(&resolvedItem, this_ptr, "getexpression", &_4, 176, &_3$$8); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&name); if (zephir_array_isset_string_fetch(&name, &item, SL("name"), 0)) { @@ -297,7 +297,7 @@ PHP_METHOD(Phalcon_Annotations_Annotation, getExpression) ZEPHIR_CALL_METHOD(&item, &_0$$7, "current", NULL, 0); zephir_check_call_status(); zephir_array_fetch_string(&_5$$11, &item, SL("expr"), PH_NOISY | PH_READONLY, "phalcon/Annotations/Annotation.zep", 139); - ZEPHIR_CALL_METHOD(&resolvedItem, this_ptr, "getexpression", &_4, 175, &_5$$11); + ZEPHIR_CALL_METHOD(&resolvedItem, this_ptr, "getexpression", &_4, 176, &_5$$11); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&name); if (zephir_array_isset_string_fetch(&name, &item, SL("name"), 0)) { @@ -314,7 +314,7 @@ PHP_METHOD(Phalcon_Annotations_Annotation, getExpression) } if (ZEPHIR_IS_LONG(&type, 300)) { object_init_ex(return_value, phalcon_annotations_annotation_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 176, &expr); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 177, &expr); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/annotations/annotationsfactory.zep.c b/ext/phalcon/annotations/annotationsfactory.zep.c index 0f8ab5b7acb..99c93c5b9c4 100644 --- a/ext/phalcon/annotations/annotationsfactory.zep.c +++ b/ext/phalcon/annotations/annotationsfactory.zep.c @@ -136,7 +136,7 @@ PHP_METHOD(Phalcon_Annotations_AnnotationsFactory, load) array_init(&_2); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "options"); - ZEPHIR_CALL_METHOD(&options, &_1, "__invoke", NULL, 177, config, &_3, &_2); + ZEPHIR_CALL_METHOD(&options, &_1, "__invoke", NULL, 178, config, &_3, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "newinstance", NULL, 0, &name, &options); zephir_check_call_status(); diff --git a/ext/phalcon/annotations/collection.zep.c b/ext/phalcon/annotations/collection.zep.c index 6e91b9173f3..a3fd89be286 100644 --- a/ext/phalcon/annotations/collection.zep.c +++ b/ext/phalcon/annotations/collection.zep.c @@ -110,7 +110,7 @@ PHP_METHOD(Phalcon_Annotations_Collection, __construct) ZVAL_COPY(&annotationData, _0); ZEPHIR_INIT_NVAR(&_2$$3); object_init_ex(&_2$$3, phalcon_annotations_annotation_ce); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", &_3, 176, &annotationData); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", &_3, 177, &annotationData); zephir_check_call_status(); zephir_array_append(&annotations, &_2$$3, PH_SEPARATE, "phalcon/Annotations/Collection.zep", 55); } ZEND_HASH_FOREACH_END(); @@ -127,7 +127,7 @@ PHP_METHOD(Phalcon_Annotations_Collection, __construct) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_4$$4); object_init_ex(&_4$$4, phalcon_annotations_annotation_ce); - ZEPHIR_CALL_METHOD(NULL, &_4$$4, "__construct", &_3, 176, &annotationData); + ZEPHIR_CALL_METHOD(NULL, &_4$$4, "__construct", &_3, 177, &annotationData); zephir_check_call_status(); zephir_array_append(&annotations, &_4$$4, PH_SEPARATE, "phalcon/Annotations/Collection.zep", 55); ZEPHIR_CALL_METHOD(NULL, &reflectionData, "next", NULL, 0); diff --git a/ext/phalcon/annotations/reader.zep.c b/ext/phalcon/annotations/reader.zep.c index 822379ac6e0..c2b1c06d29e 100644 --- a/ext/phalcon/annotations/reader.zep.c +++ b/ext/phalcon/annotations/reader.zep.c @@ -98,15 +98,15 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) array_init(&annotations); ZEPHIR_INIT_VAR(&reflection); object_init_ex(&reflection, zephir_get_internal_ce(SL("reflectionclass"))); - ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 178, &className); + ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 179, &className); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&comment, &reflection, "getdoccomment", NULL, 179); + ZEPHIR_CALL_METHOD(&comment, &reflection, "getdoccomment", NULL, 180); zephir_check_call_status(); if (Z_TYPE_P(&comment) == IS_STRING) { ZEPHIR_INIT_VAR(&classAnnotations); - ZEPHIR_CALL_METHOD(&_0$$3, &reflection, "getfilename", NULL, 180); + ZEPHIR_CALL_METHOD(&_0$$3, &reflection, "getfilename", NULL, 181); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1$$3, &reflection, "getstartline", NULL, 181); + ZEPHIR_CALL_METHOD(&_1$$3, &reflection, "getstartline", NULL, 182); zephir_check_call_status(); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&classAnnotations, &comment, &_0$$3, &_1$$3); zephir_check_call_status(); @@ -114,7 +114,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_array_update_string(&annotations, SL("class"), &classAnnotations, PH_COPY | PH_SEPARATE); } } - ZEPHIR_CALL_METHOD(&properties, &reflection, "getproperties", NULL, 182); + ZEPHIR_CALL_METHOD(&properties, &reflection, "getproperties", NULL, 183); zephir_check_call_status(); if (zephir_fast_count_int(&properties)) { line = 1; @@ -130,7 +130,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_check_call_status(); if (Z_TYPE_P(&comment) == IS_STRING) { ZEPHIR_INIT_NVAR(&propertyAnnotations); - ZEPHIR_CALL_METHOD(&_4$$7, &reflection, "getfilename", NULL, 180); + ZEPHIR_CALL_METHOD(&_4$$7, &reflection, "getfilename", NULL, 181); zephir_check_call_status(); ZVAL_LONG(&_5$$7, line); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&propertyAnnotations, &comment, &_4$$7, &_5$$7); @@ -157,7 +157,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_check_call_status(); if (Z_TYPE_P(&comment) == IS_STRING) { ZEPHIR_INIT_NVAR(&propertyAnnotations); - ZEPHIR_CALL_METHOD(&_7$$10, &reflection, "getfilename", NULL, 180); + ZEPHIR_CALL_METHOD(&_7$$10, &reflection, "getfilename", NULL, 181); zephir_check_call_status(); ZVAL_LONG(&_8$$10, line); ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(&propertyAnnotations, &comment, &_7$$10, &_8$$10); @@ -177,7 +177,7 @@ PHP_METHOD(Phalcon_Annotations_Reader, parse) zephir_array_update_string(&annotations, SL("properties"), &annotationsProperties, PH_COPY | PH_SEPARATE); } } - ZEPHIR_CALL_METHOD(&methods, &reflection, "getmethods", NULL, 183); + ZEPHIR_CALL_METHOD(&methods, &reflection, "getmethods", NULL, 184); zephir_check_call_status(); if (zephir_fast_count_int(&methods)) { ZEPHIR_INIT_VAR(&annotationsMethods); diff --git a/ext/phalcon/assets/collection.zep.c b/ext/phalcon/assets/collection.zep.c index 4827439f596..68811139051 100644 --- a/ext/phalcon/assets/collection.zep.c +++ b/ext/phalcon/assets/collection.zep.c @@ -259,7 +259,7 @@ PHP_METHOD(Phalcon_Assets_Collection, add) zephir_fetch_params(1, 1, 0, &asset); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 184, asset); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 185, asset); zephir_check_call_status(); RETURN_THIS(); } @@ -348,7 +348,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addCss) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processadd", NULL, 185, &_0, &path, isLocal, &_1, &attributes, &version, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processadd", NULL, 186, &_0, &path, isLocal, &_1, &attributes, &version, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -404,7 +404,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addInline) zephir_fetch_params(1, 1, 0, &code); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 184, code); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 185, code); zephir_check_call_status(); RETURN_THIS(); } @@ -464,7 +464,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addInlineCss) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processaddinline", NULL, 186, &_0, &content, &_1, &attributes); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processaddinline", NULL, 187, &_0, &content, &_1, &attributes); zephir_check_call_status(); RETURN_MM(); } @@ -524,7 +524,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addInlineJs) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processaddinline", NULL, 186, &_0, &content, &_1, &attributes); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processaddinline", NULL, 187, &_0, &content, &_1, &attributes); zephir_check_call_status(); RETURN_MM(); } @@ -613,7 +613,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addJs) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processadd", NULL, 185, &_0, &path, isLocal, &_1, &attributes, &version, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processadd", NULL, 186, &_0, &path, isLocal, &_1, &attributes, &version, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -1289,7 +1289,7 @@ PHP_METHOD(Phalcon_Assets_Collection, processAdd) ZEPHIR_CPY_WRT(&name, &_0); ZEPHIR_OBS_VAR(&flag); zephir_read_property(&flag, this_ptr, ZEND_STRL("isLocal"), PH_NOISY_CC); - ZEPHIR_CALL_METHOD(&attrs, this_ptr, "processattributes", NULL, 187, &attributes); + ZEPHIR_CALL_METHOD(&attrs, this_ptr, "processattributes", NULL, 188, &attributes); zephir_check_call_status(); if (Z_TYPE_P(isLocal) != IS_NULL) { ZEPHIR_INIT_NVAR(&flag); @@ -1378,7 +1378,7 @@ PHP_METHOD(Phalcon_Assets_Collection, processAddInline) ZEPHIR_INIT_VAR(&_0); ZEPHIR_CONCAT_SV(&_0, "Phalcon\\Assets\\Inline\\", &className); ZEPHIR_CPY_WRT(&name, &_0); - ZEPHIR_CALL_METHOD(&attrs, this_ptr, "processattributes", NULL, 187, &attributes); + ZEPHIR_CALL_METHOD(&attrs, this_ptr, "processattributes", NULL, 188, &attributes); zephir_check_call_status(); ZEPHIR_INIT_VAR(&asset); zephir_fetch_safe_class(&_1, &name); diff --git a/ext/phalcon/assets/manager.zep.c b/ext/phalcon/assets/manager.zep.c index 4d6bd8eba93..47d1d6a556a 100644 --- a/ext/phalcon/assets/manager.zep.c +++ b/ext/phalcon/assets/manager.zep.c @@ -177,7 +177,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addAssetByType) } - ZEPHIR_CALL_METHOD(&collection, this_ptr, "checkandcreatecollection", NULL, 188, &type); + ZEPHIR_CALL_METHOD(&collection, this_ptr, "checkandcreatecollection", NULL, 189, &type); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &collection, "add", NULL, 0, asset); zephir_check_call_status(); @@ -282,7 +282,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addCss) } else { ZVAL_BOOL(&_3, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 189, &path, &_1, &_2, &attributes, &version, &_3); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 190, &path, &_1, &_2, &attributes, &version, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); ZVAL_STRING(&_4, "css"); @@ -363,7 +363,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addInlineCodeByType) } - ZEPHIR_CALL_METHOD(&collection, this_ptr, "checkandcreatecollection", NULL, 188, &type); + ZEPHIR_CALL_METHOD(&collection, this_ptr, "checkandcreatecollection", NULL, 189, &type); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &collection, "addinline", NULL, 0, code); zephir_check_call_status(); @@ -426,7 +426,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addInlineCss) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 190, &content, &_1, &attributes); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 191, &content, &_1, &attributes); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "css"); @@ -491,7 +491,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addInlineJs) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 191, &content, &_1, &attributes); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 192, &content, &_1, &attributes); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "js"); @@ -603,7 +603,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addJs) } else { ZVAL_BOOL(&_3, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 192, &path, &_1, &_2, &attributes, &version, &_3); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 193, &path, &_1, &_2, &attributes, &version, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); ZVAL_STRING(&_4, "js"); @@ -639,7 +639,7 @@ PHP_METHOD(Phalcon_Assets_Manager, collection) zephir_get_strval(&name, name_param); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 188, &name); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 189, &name); zephir_check_call_status(); RETURN_MM(); } @@ -863,7 +863,7 @@ PHP_METHOD(Phalcon_Assets_Manager, getCss) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "css"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 188, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 189, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -887,7 +887,7 @@ PHP_METHOD(Phalcon_Assets_Manager, getJs) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "js"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 188, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "checkandcreatecollection", NULL, 189, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -1137,7 +1137,7 @@ PHP_METHOD(Phalcon_Assets_Manager, output) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_FUNCTION(&_5$$8, "is_dir", NULL, 159, &completeTargetPath); + ZEPHIR_CALL_FUNCTION(&_5$$8, "is_dir", NULL, 160, &completeTargetPath); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_5$$8)) { ZEPHIR_INIT_VAR(&_6$$10); @@ -1226,13 +1226,13 @@ PHP_METHOD(Phalcon_Assets_Manager, output) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_21$$21, &asset, "getrealsourcepath", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 193, collection, &_20$$21, &_21$$21); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 194, collection, &_20$$21, &_21$$21); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_23$$21, &asset, "getattributes", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_24$$21, &asset, "islocal", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 194, &callback, &_23$$21, &prefixedPath, &_24$$21); + ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 195, &callback, &_23$$21, &prefixedPath, &_24$$21); zephir_check_call_status(); zephir_read_property(&_26$$21, this_ptr, ZEND_STRL("implicitOutput"), PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_26$$21)) { @@ -1309,12 +1309,12 @@ PHP_METHOD(Phalcon_Assets_Manager, output) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_31$$36, &asset, "getrealsourcepath", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 193, collection, &_30$$36, &_31$$36); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 194, collection, &_30$$36, &_31$$36); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_32$$36, collection, "getattributes", &_33, 0); zephir_check_call_status(); ZVAL_BOOL(&_34$$36, 1); - ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 194, &callback, &_32$$36, &prefixedPath, &_34$$36); + ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 195, &callback, &_32$$36, &prefixedPath, &_34$$36); zephir_check_call_status(); zephir_read_property(&_34$$36, this_ptr, ZEND_STRL("implicitOutput"), PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_34$$36)) { @@ -1403,13 +1403,13 @@ PHP_METHOD(Phalcon_Assets_Manager, output) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_46$$49, &asset, "getrealsourcepath", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 193, collection, &_45$$49, &_46$$49); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 194, collection, &_45$$49, &_46$$49); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_47$$49, &asset, "getattributes", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_48$$49, &asset, "islocal", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 194, &callback, &_47$$49, &prefixedPath, &_48$$49); + ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 195, &callback, &_47$$49, &prefixedPath, &_48$$49); zephir_check_call_status(); zephir_read_property(&_49$$49, this_ptr, ZEND_STRL("implicitOutput"), PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_49$$49)) { @@ -1486,12 +1486,12 @@ PHP_METHOD(Phalcon_Assets_Manager, output) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_54$$64, &asset, "getrealsourcepath", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 193, collection, &_53$$64, &_54$$64); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 194, collection, &_53$$64, &_54$$64); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_55$$64, collection, "getattributes", &_33, 0); zephir_check_call_status(); ZVAL_BOOL(&_56$$64, 1); - ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 194, &callback, &_55$$64, &prefixedPath, &_56$$64); + ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 195, &callback, &_55$$64, &prefixedPath, &_56$$64); zephir_check_call_status(); zephir_read_property(&_56$$64, this_ptr, ZEND_STRL("implicitOutput"), PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_56$$64)) { @@ -1513,13 +1513,13 @@ PHP_METHOD(Phalcon_Assets_Manager, output) zephir_file_put_contents(NULL, &completeTargetPath, &filteredJoinedContent); ZEPHIR_CALL_METHOD(&_58$$67, collection, "gettargeturi", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 193, collection, &_58$$67, &completeTargetPath); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "calculateprefixedpath", &_22, 194, collection, &_58$$67, &completeTargetPath); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_59$$67, collection, "getattributes", &_33, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_60$$67, collection, "gettargetislocal", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 194, &callback, &_59$$67, &prefixedPath, &_60$$67); + ZEPHIR_CALL_METHOD(&html, this_ptr, "docallback", &_25, 195, &callback, &_59$$67, &prefixedPath, &_60$$67); zephir_check_call_status(); zephir_read_property(&_61$$67, this_ptr, ZEND_STRL("implicitOutput"), PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_61$$67)) { @@ -2245,7 +2245,7 @@ PHP_METHOD(Phalcon_Assets_Manager, cssLink) ZVAL_STRING(&_2, "text/css"); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "href"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processparameters", NULL, 195, parameters, &_0, &_1, &_2, &_3); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processparameters", NULL, 196, parameters, &_0, &_1, &_2, &_3); zephir_check_call_status(); RETURN_MM(); } @@ -2366,7 +2366,7 @@ PHP_METHOD(Phalcon_Assets_Manager, jsLink) ZVAL_STRING(&_2, "application/javascript"); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "src"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processparameters", NULL, 195, parameters, &_0, &_1, &_2, &_3); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processparameters", NULL, 196, parameters, &_0, &_1, &_2, &_3); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/autoload/loader.zep.c b/ext/phalcon/autoload/loader.zep.c index b7fa70f3245..e9a47a05e6f 100644 --- a/ext/phalcon/autoload/loader.zep.c +++ b/ext/phalcon/autoload/loader.zep.c @@ -369,7 +369,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, addNamespace) ZEPHIR_INIT_VAR(&_1); ZEPHIR_CONCAT_VV(&_1, &_0, &nsSeparator); ZEPHIR_CPY_WRT(&nsName, &_1); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkdirectories", NULL, 196, directories, &dirSeparator); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkdirectories", NULL, 197, directories, &dirSeparator); zephir_check_call_status(); ZEPHIR_CPY_WRT(directories, &_2); zephir_read_property(&_3, this_ptr, ZEND_STRL("namespaces"), PH_NOISY_CC | PH_READONLY); @@ -394,7 +394,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, addNamespace) } ZEPHIR_INIT_VAR(&_7); zephir_fast_array_merge(&_7, &source, &target); - ZEPHIR_CALL_FUNCTION(&_2, "array_unique", NULL, 197, &_7); + ZEPHIR_CALL_FUNCTION(&_2, "array_unique", NULL, 198, &_7); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("namespaces"), &nsName, &_2); RETURN_THIS(); @@ -445,40 +445,40 @@ PHP_METHOD(Phalcon_Autoload_Loader, autoload) zephir_update_property_zval(this_ptr, ZEND_STRL("debug"), &_0); ZEPHIR_INIT_VAR(&_1); ZEPHIR_CONCAT_SV(&_1, "Loading: ", &className); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 198, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 199, &_1); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "loader:beforeCheckClass"); ZEPHIR_CALL_METHOD(NULL, this_ptr, "firemanagerevent", NULL, 0, &_2, &className); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "autoloadcheckclasses", NULL, 199, &className); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "autoloadcheckclasses", NULL, 200, &className); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_3)) { RETURN_MM_BOOL(1); } ZEPHIR_INIT_VAR(&_4); ZEPHIR_CONCAT_SV(&_4, "Class: 404: ", &className); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 198, &_4); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 199, &_4); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_5, this_ptr, "autoloadchecknamespaces", NULL, 200, &className); + ZEPHIR_CALL_METHOD(&_5, this_ptr, "autoloadchecknamespaces", NULL, 201, &className); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_5)) { RETURN_MM_BOOL(1); } ZEPHIR_INIT_VAR(&_6); ZEPHIR_CONCAT_SV(&_6, "Namespace: 404: ", &className); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 198, &_6); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 199, &_6); zephir_check_call_status(); zephir_read_property(&_8, this_ptr, ZEND_STRL("directories"), PH_NOISY_CC | PH_READONLY); ZVAL_BOOL(&_9, 1); - ZEPHIR_CALL_METHOD(&_7, this_ptr, "autoloadcheckdirectories", NULL, 201, &_8, &className, &_9); + ZEPHIR_CALL_METHOD(&_7, this_ptr, "autoloadcheckdirectories", NULL, 202, &_8, &className, &_9); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_7)) { RETURN_MM_BOOL(1); } ZEPHIR_INIT_VAR(&_10); ZEPHIR_CONCAT_SV(&_10, "Directories: 404: ", &className); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 198, &_10); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 199, &_10); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "loader:afterCheckClass"); @@ -725,7 +725,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, register) ZVAL_STRING(&_2$$3, "autoload"); zephir_array_fast_append(&_1$$3, &_2$$3); ZVAL_BOOL(&_3$$3, (prepend ? 1 : 0)); - ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_register", NULL, 202, &_1$$3, &__$true, &_3$$3); + ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_register", NULL, 203, &_1$$3, &__$true, &_3$$3); zephir_check_call_status(); if (1) { zephir_update_property_zval(this_ptr, ZEND_STRL("isRegistered"), &__$true); @@ -875,7 +875,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, setDirectories) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addtocollection", NULL, 203, &directories, &_0, &_1, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addtocollection", NULL, 204, &directories, &_0, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -1081,7 +1081,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, setFiles) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addtocollection", NULL, 203, &files, &_0, &_1, &_2); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addtocollection", NULL, 204, &files, &_0, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -1153,7 +1153,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, setNamespaces) } ZEPHIR_INIT_NVAR(&directories); ZVAL_COPY(&directories, _1); - ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "checkdirectories", &_6, 196, &directories, &dirSeparator); + ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "checkdirectories", &_6, 197, &directories, &dirSeparator); zephir_check_call_status(); ZEPHIR_CPY_WRT(&directories, &_5$$4); ZEPHIR_CALL_METHOD(NULL, this_ptr, "addnamespace", &_7, 0, &name, &directories); @@ -1172,7 +1172,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, setNamespaces) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&directories, &namespaces, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_8$$5, this_ptr, "checkdirectories", &_6, 196, &directories, &dirSeparator); + ZEPHIR_CALL_METHOD(&_8$$5, this_ptr, "checkdirectories", &_6, 197, &directories, &dirSeparator); zephir_check_call_status(); ZEPHIR_CPY_WRT(&directories, &_8$$5); ZEPHIR_CALL_METHOD(NULL, this_ptr, "addnamespace", &_7, 0, &name, &directories); @@ -1216,7 +1216,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, unregister) ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "autoload"); zephir_array_fast_append(&_1$$3, &_2$$3); - ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_unregister", NULL, 204, &_1$$3); + ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_unregister", NULL, 205, &_1$$3); zephir_check_call_status(); if (0) { zephir_update_property_zval(this_ptr, ZEND_STRL("isRegistered"), &__$true); @@ -1262,7 +1262,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, requireFile) zephir_read_property(&_0, this_ptr, ZEND_STRL("fileCheckingCallback"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_1, "call_user_func", NULL, 205, &_0, &file); + ZEPHIR_CALL_FUNCTION(&_1, "call_user_func", NULL, 206, &_0, &file); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&_1)) { ZEPHIR_INIT_VAR(&_2$$3); @@ -1271,7 +1271,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, requireFile) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_3$$3); ZEPHIR_CONCAT_SV(&_3$$3, "Require: ", &file); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 198, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 199, &_3$$3); zephir_check_call_status(); if (zephir_require_once_zval(&file) == FAILURE) { RETURN_MM_NULL(); @@ -1280,7 +1280,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, requireFile) } ZEPHIR_INIT_VAR(&_4); ZEPHIR_CONCAT_SV(&_4, "Require: 404: ", &file); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 198, &_4); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 199, &_4); zephir_check_call_status(); RETURN_MM_BOOL(0); } @@ -1453,7 +1453,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckClasses) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_3$$3); ZEPHIR_CONCAT_SV(&_3$$3, "Class: load: ", &filePath); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 198, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", NULL, 199, &_3$$3); zephir_check_call_status(); RETURN_MM_BOOL(1); } @@ -1568,7 +1568,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckDirectories) if (isDirectory) { ZEPHIR_INIT_NVAR(&_11$$6); ZEPHIR_CONCAT_SV(&_11$$6, "Directories: ", &filePath); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 198, &_11$$6); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 199, &_11$$6); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -1598,7 +1598,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckDirectories) if (isDirectory) { ZEPHIR_INIT_NVAR(&_15$$9); ZEPHIR_CONCAT_SV(&_15$$9, "Directories: ", &filePath); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 198, &_15$$9); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 199, &_15$$9); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -1643,7 +1643,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckDirectories) if (isDirectory) { ZEPHIR_INIT_NVAR(&_21$$13); ZEPHIR_CONCAT_SV(&_21$$13, "Directories: ", &filePath); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 198, &_21$$13); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 199, &_21$$13); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -1673,7 +1673,7 @@ PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckDirectories) if (isDirectory) { ZEPHIR_INIT_NVAR(&_24$$16); ZEPHIR_CONCAT_SV(&_24$$16, "Directories: ", &filePath); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 198, &_24$$16); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 199, &_24$$16); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -1770,13 +1770,13 @@ PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckNamespaces) ZVAL_LONG(&_7$$3, zephir_fast_strlen_ev(&prefix)); ZEPHIR_INIT_NVAR(&fileName); zephir_substr(&fileName, &className, zephir_get_intval(&_7$$3), 0, ZEPHIR_SUBSTR_NO_LENGTH); - ZEPHIR_CALL_METHOD(&_8$$3, this_ptr, "autoloadcheckdirectories", &_9, 201, &directories, &fileName); + ZEPHIR_CALL_METHOD(&_8$$3, this_ptr, "autoloadcheckdirectories", &_9, 202, &directories, &fileName); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_8$$3)) { zephir_read_property(&_10$$5, this_ptr, ZEND_STRL("checkedPath"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_11$$5); ZEPHIR_CONCAT_SVSV(&_11$$5, "Namespace: ", &prefix, " - ", &_10$$5); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 198, &_11$$5); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 199, &_11$$5); zephir_check_call_status(); RETURN_MM_BOOL(1); } @@ -1805,13 +1805,13 @@ PHP_METHOD(Phalcon_Autoload_Loader, autoloadCheckNamespaces) ZVAL_LONG(&_15$$6, zephir_fast_strlen_ev(&prefix)); ZEPHIR_INIT_NVAR(&fileName); zephir_substr(&fileName, &className, zephir_get_intval(&_15$$6), 0, ZEPHIR_SUBSTR_NO_LENGTH); - ZEPHIR_CALL_METHOD(&_16$$6, this_ptr, "autoloadcheckdirectories", &_9, 201, &directories, &fileName); + ZEPHIR_CALL_METHOD(&_16$$6, this_ptr, "autoloadcheckdirectories", &_9, 202, &directories, &fileName); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_16$$6)) { zephir_read_property(&_17$$8, this_ptr, ZEND_STRL("checkedPath"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_18$$8); ZEPHIR_CONCAT_SVSV(&_18$$8, "Namespace: ", &prefix, " - ", &_17$$8); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 198, &_18$$8); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "adddebug", &_12, 199, &_18$$8); zephir_check_call_status(); RETURN_MM_BOOL(1); } diff --git a/ext/phalcon/cache/abstractcache.zep.c b/ext/phalcon/cache/abstractcache.zep.c new file mode 100644 index 00000000000..fa8a5c8e781 --- /dev/null +++ b/ext/phalcon/cache/abstractcache.zep.c @@ -0,0 +1,705 @@ + +#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/object.h" +#include "kernel/memory.h" +#include "kernel/string.h" +#include "kernel/operators.h" +#include "kernel/fcall.h" +#include "kernel/exception.h" +#include "kernel/array.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. + */ +/** + * This component offers caching capabilities for your application. + * Phalcon\Cache implements PSR-16. + * + * @property AdapterInterface $adapter + */ +ZEPHIR_INIT_CLASS(Phalcon_Cache_AbstractCache) +{ + ZEPHIR_REGISTER_CLASS(Phalcon\\Cache, AbstractCache, phalcon, cache_abstractcache, phalcon_cache_abstractcache_method_entry, ZEND_ACC_EXPLICIT_ABSTRACT_CLASS); + + /** + * The adapter + * + * @var AdapterInterface + */ + zend_declare_property_null(phalcon_cache_abstractcache_ce, SL("adapter"), ZEND_ACC_PROTECTED); + zend_class_implements(phalcon_cache_abstractcache_ce, 1, phalcon_cache_cacheinterface_ce); + return SUCCESS; +} + +/** + * Constructor. + * + * @param AdapterInterface $adapter The cache adapter + */ +PHP_METHOD(Phalcon_Cache_AbstractCache, __construct) +{ + zval *adapter, adapter_sub; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&adapter_sub); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_OBJECT_OF_CLASS(adapter, phalcon_cache_adapter_adapterinterface_ce) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + zephir_fetch_params_without_memory_grow(1, 0, &adapter); + + + zephir_update_property_zval(this_ptr, ZEND_STRL("adapter"), adapter); +} + +/** + * Returns the current adapter + * + * @return AdapterInterface + */ +PHP_METHOD(Phalcon_Cache_AbstractCache, getAdapter) +{ + zval *this_ptr = getThis(); + + + + RETURN_MEMBER(getThis(), "adapter"); +} + +/** + * Checks the key. If it contains invalid characters an exception is thrown + * + * @param mixed $key + * + * @throws InvalidArgumentException + */ +PHP_METHOD(Phalcon_Cache_AbstractCache, checkKey) +{ + zend_class_entry *_6$$3; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *key_param = NULL, exception, _0, _1, _2, _3, _4$$3, _5$$3, _7$$3; + zval key; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&key); + ZVAL_UNDEF(&exception); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_3); + ZVAL_UNDEF(&_4$$3); + ZVAL_UNDEF(&_5$$3); + ZVAL_UNDEF(&_7$$3); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_STR(key) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &key_param); + zephir_get_strval(&key, key_param); + + + ZEPHIR_INIT_VAR(&_0); + ZEPHIR_INIT_VAR(&_1); + ZVAL_STRING(&_1, "/[^A-Za-z0-9-_.]/"); + ZEPHIR_INIT_VAR(&_2); + ZEPHIR_INIT_VAR(&_3); + ZVAL_STRING(&_3, "/[^A-Za-z0-9-_.]/"); + zephir_preg_match(&_2, &_3, &key, &_0, 0, 0 , 0 ); + if (zephir_is_true(&_2)) { + ZEPHIR_CALL_METHOD(&exception, this_ptr, "getexceptionclass", NULL, 0); + zephir_check_call_status(); + ZEPHIR_INIT_VAR(&_4$$3); + zephir_fetch_safe_class(&_5$$3, &exception); + _6$$3 = zephir_fetch_class_str_ex(Z_STRVAL_P(&_5$$3), Z_STRLEN_P(&_5$$3), ZEND_FETCH_CLASS_AUTO); + if(!_6$$3) { + RETURN_MM_NULL(); + } + object_init_ex(&_4$$3, _6$$3); + ZEPHIR_INIT_VAR(&_7$$3); + ZVAL_STRING(&_7$$3, "The key contains invalid characters"); + ZEPHIR_CALL_METHOD(NULL, &_4$$3, "__construct", NULL, 0, &_7$$3); + zephir_check_call_status(); + zephir_throw_exception_debug(&_4$$3, "phalcon/Cache/AbstractCache.zep", 68); + ZEPHIR_MM_RESTORE(); + return; + } + ZEPHIR_MM_RESTORE(); +} + +/** + * Checks the key. If it contains invalid characters an exception is thrown + * + * @param mixed $keys + * + * @throws InvalidArgumentException + */ +PHP_METHOD(Phalcon_Cache_AbstractCache, checkKeys) +{ + zend_class_entry *_3$$3; + zend_bool _0; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *keys, keys_sub, exception, _1$$3, _2$$3, _4$$3; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&keys_sub); + ZVAL_UNDEF(&exception); + ZVAL_UNDEF(&_1$$3); + ZVAL_UNDEF(&_2$$3); + ZVAL_UNDEF(&_4$$3); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_ZVAL(keys) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &keys); + + + _0 = Z_TYPE_P(keys) == IS_ARRAY; + if (!(_0)) { + _0 = zephir_zval_is_traversable(keys); + } + if (!(_0)) { + ZEPHIR_CALL_METHOD(&exception, this_ptr, "getexceptionclass", NULL, 0); + zephir_check_call_status(); + ZEPHIR_INIT_VAR(&_1$$3); + zephir_fetch_safe_class(&_2$$3, &exception); + _3$$3 = zephir_fetch_class_str_ex(Z_STRVAL_P(&_2$$3), Z_STRLEN_P(&_2$$3), ZEND_FETCH_CLASS_AUTO); + if(!_3$$3) { + RETURN_MM_NULL(); + } + object_init_ex(&_1$$3, _3$$3); + ZEPHIR_INIT_VAR(&_4$$3); + ZVAL_STRING(&_4$$3, "The keys need to be an array or instance of Traversable"); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 0, &_4$$3); + zephir_check_call_status(); + zephir_throw_exception_debug(&_1$$3, "phalcon/Cache/AbstractCache.zep", 87); + ZEPHIR_MM_RESTORE(); + return; + } + ZEPHIR_MM_RESTORE(); +} + +/** + * Wipes clean the entire cache's keys. + * + * @return bool True on success and false on failure. + */ +PHP_METHOD(Phalcon_Cache_AbstractCache, doClear) +{ + zval _0; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&_0); + + + ZEPHIR_MM_GROW(); + + zephir_read_property(&_0, this_ptr, ZEND_STRL("adapter"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_RETURN_CALL_METHOD(&_0, "clear", NULL, 0); + zephir_check_call_status(); + RETURN_MM(); +} + +/** + * Delete an item from the cache by its unique key. + * + * @param string $key The unique cache key of the item to delete. + * + * @return bool True if the item was successfully removed. False if there + * was an error. + * + * @throws InvalidArgumentException MUST be thrown if the $key string is + * not a legal value. + */ +PHP_METHOD(Phalcon_Cache_AbstractCache, doDelete) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *key_param = NULL, _0; + zval key; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&key); + ZVAL_UNDEF(&_0); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_STR(key) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &key_param); + zephir_get_strval(&key, key_param); + + + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkkey", NULL, 0, &key); + zephir_check_call_status(); + zephir_read_property(&_0, this_ptr, ZEND_STRL("adapter"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_RETURN_CALL_METHOD(&_0, "delete", NULL, 0, &key); + zephir_check_call_status(); + RETURN_MM(); +} + +/** + * Deletes multiple cache items in a single operation. + * + * @param iterable $keys A list of string-based keys to be deleted. + * + * @return bool True if the items were successfully removed. False if there + * was an error. + * + * @throws InvalidArgumentException MUST be thrown if $keys is neither an + * array nor a Traversable, or if any of + * the $keys are not a legal value. + */ +PHP_METHOD(Phalcon_Cache_AbstractCache, doDeleteMultiple) +{ + zend_bool result = 0; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *keys, keys_sub, key, *_0, _1, _2$$3, _3$$3, _4$$5, _5$$5; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&keys_sub); + ZVAL_UNDEF(&key); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2$$3); + ZVAL_UNDEF(&_3$$3); + ZVAL_UNDEF(&_4$$5); + ZVAL_UNDEF(&_5$$5); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_ZVAL(keys) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &keys); + + + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkkeys", NULL, 0, keys); + zephir_check_call_status(); + result = 1; + zephir_is_iterable(keys, 0, "phalcon/Cache/AbstractCache.zep", 144); + if (Z_TYPE_P(keys) == IS_ARRAY) { + ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(keys), _0) + { + ZEPHIR_INIT_NVAR(&key); + ZVAL_COPY(&key, _0); + zephir_read_property(&_2$$3, this_ptr, ZEND_STRL("adapter"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(&_3$$3, &_2$$3, "delete", NULL, 0, &key); + zephir_check_call_status(); + if (!ZEPHIR_IS_TRUE_IDENTICAL(&_3$$3)) { + result = 0; + } + } ZEND_HASH_FOREACH_END(); + } else { + ZEPHIR_CALL_METHOD(NULL, keys, "rewind", NULL, 0); + zephir_check_call_status(); + while (1) { + ZEPHIR_CALL_METHOD(&_1, keys, "valid", NULL, 0); + zephir_check_call_status(); + if (!zend_is_true(&_1)) { + break; + } + ZEPHIR_CALL_METHOD(&key, keys, "current", NULL, 0); + zephir_check_call_status(); + zephir_read_property(&_4$$5, this_ptr, ZEND_STRL("adapter"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(&_5$$5, &_4$$5, "delete", NULL, 0, &key); + zephir_check_call_status(); + if (!ZEPHIR_IS_TRUE_IDENTICAL(&_5$$5)) { + result = 0; + } + ZEPHIR_CALL_METHOD(NULL, keys, "next", NULL, 0); + zephir_check_call_status(); + } + } + ZEPHIR_INIT_NVAR(&key); + RETURN_MM_BOOL(result); +} + +/** + * Fetches a value from the cache. + * + * @param string $key The unique key of this item in the cache. + * @param mixed $defaultValue Default value to return if the key does not exist. + * + * @return mixed The value of the item from the cache, or $default in case + * of cache miss. + * + * @throws InvalidArgumentException MUST be thrown if the $key string is + * not a legal value. + */ +PHP_METHOD(Phalcon_Cache_AbstractCache, doGet) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *key_param = NULL, *defaultValue = NULL, defaultValue_sub, __$null, _0; + zval key; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&key); + ZVAL_UNDEF(&defaultValue_sub); + ZVAL_NULL(&__$null); + ZVAL_UNDEF(&_0); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 2) + Z_PARAM_STR(key) + Z_PARAM_OPTIONAL + Z_PARAM_ZVAL_OR_NULL(defaultValue) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 1, &key_param, &defaultValue); + zephir_get_strval(&key, key_param); + if (!defaultValue) { + defaultValue = &defaultValue_sub; + defaultValue = &__$null; + } + + + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkkey", NULL, 0, &key); + zephir_check_call_status(); + zephir_read_property(&_0, this_ptr, ZEND_STRL("adapter"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_RETURN_CALL_METHOD(&_0, "get", NULL, 0, &key, defaultValue); + zephir_check_call_status(); + RETURN_MM(); +} + +/** + * Obtains multiple cache items by their unique keys. + * + * @param iterable $keys A list of keys that can obtained + * in a single operation. + * @param mixed $defaultValue Default value to return for keys + * that do not exist. + * + * @return iterable A list of key => value pairs. Cache + * keys that do not exist or are stale will have $default as value. + * + * @throws InvalidArgumentException MUST be thrown if $keys is neither an + * array nor a Traversable, or if any of the $keys are not a legal value. + */ +PHP_METHOD(Phalcon_Cache_AbstractCache, doGetMultiple) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zephir_fcall_cache_entry *_3 = NULL, *_5 = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *keys, keys_sub, *defaultValue = NULL, defaultValue_sub, __$null, element, results, *_0, _1, _2$$3, _4$$4; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&keys_sub); + ZVAL_UNDEF(&defaultValue_sub); + ZVAL_NULL(&__$null); + ZVAL_UNDEF(&element); + ZVAL_UNDEF(&results); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2$$3); + ZVAL_UNDEF(&_4$$4); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 2) + Z_PARAM_ZVAL(keys) + Z_PARAM_OPTIONAL + Z_PARAM_ZVAL_OR_NULL(defaultValue) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 1, &keys, &defaultValue); + if (!defaultValue) { + defaultValue = &defaultValue_sub; + defaultValue = &__$null; + } + + + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkkeys", NULL, 0, keys); + zephir_check_call_status(); + ZEPHIR_INIT_VAR(&results); + array_init(&results); + zephir_is_iterable(keys, 0, "phalcon/Cache/AbstractCache.zep", 191); + if (Z_TYPE_P(keys) == IS_ARRAY) { + ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(keys), _0) + { + ZEPHIR_INIT_NVAR(&element); + ZVAL_COPY(&element, _0); + ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "get", &_3, 0, &element, defaultValue); + zephir_check_call_status(); + zephir_array_update_zval(&results, &element, &_2$$3, PH_COPY | PH_SEPARATE); + } ZEND_HASH_FOREACH_END(); + } else { + ZEPHIR_CALL_METHOD(NULL, keys, "rewind", NULL, 0); + zephir_check_call_status(); + while (1) { + ZEPHIR_CALL_METHOD(&_1, keys, "valid", NULL, 0); + zephir_check_call_status(); + if (!zend_is_true(&_1)) { + break; + } + ZEPHIR_CALL_METHOD(&element, keys, "current", NULL, 0); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "get", &_5, 0, &element, defaultValue); + zephir_check_call_status(); + zephir_array_update_zval(&results, &element, &_4$$4, PH_COPY | PH_SEPARATE); + ZEPHIR_CALL_METHOD(NULL, keys, "next", NULL, 0); + zephir_check_call_status(); + } + } + ZEPHIR_INIT_NVAR(&element); + RETURN_CCTOR(&results); +} + +/** + * Determines whether an item is present in the cache. + * + * @param string $key The cache item key. + * + * @return bool + * + * @throws InvalidArgumentException MUST be thrown if the $key string is + * not a legal value. + */ +PHP_METHOD(Phalcon_Cache_AbstractCache, doHas) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *key_param = NULL, _0; + zval key; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&key); + ZVAL_UNDEF(&_0); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_STR(key) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &key_param); + zephir_get_strval(&key, key_param); + + + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkkey", NULL, 0, &key); + zephir_check_call_status(); + zephir_read_property(&_0, this_ptr, ZEND_STRL("adapter"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_RETURN_CALL_METHOD(&_0, "has", NULL, 0, &key); + zephir_check_call_status(); + RETURN_MM(); +} + +/** + * Persists data in the cache, uniquely referenced by a key with an optional + * expiration TTL time. + * + * @param string $key The key of the item to store. + * @param mixed $value The value of the item to store. + * Must be serializable. + * @param null|int|DateInterval $ttl Optional. The TTL value of this + * item. If no value is sent and the + * driver supports TTL then the library + * may set a default value for it or + * let the driver take care of that. + * + * @return bool True on success and false on failure. + * + * @throws InvalidArgumentException MUST be thrown if the $key string is not + * a legal value. + */ +PHP_METHOD(Phalcon_Cache_AbstractCache, doSet) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *key_param = NULL, *value, value_sub, *ttl = NULL, ttl_sub, __$null, _0; + zval key; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&key); + ZVAL_UNDEF(&value_sub); + ZVAL_UNDEF(&ttl_sub); + ZVAL_NULL(&__$null); + ZVAL_UNDEF(&_0); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(2, 3) + Z_PARAM_STR(key) + Z_PARAM_ZVAL(value) + Z_PARAM_OPTIONAL + Z_PARAM_ZVAL_OR_NULL(ttl) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 2, 1, &key_param, &value, &ttl); + zephir_get_strval(&key, key_param); + if (!ttl) { + ttl = &ttl_sub; + ttl = &__$null; + } + + + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkkey", NULL, 0, &key); + zephir_check_call_status(); + zephir_read_property(&_0, this_ptr, ZEND_STRL("adapter"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_RETURN_CALL_METHOD(&_0, "set", NULL, 0, &key, value, ttl); + zephir_check_call_status(); + RETURN_MM(); +} + +/** + * Persists a set of key => value pairs in the cache, with an optional TTL. + * + * @param iterable $values A list of key => value pairs for a + * multiple-set operation. + * @param null|int|DateInterval $ttl Optional. The TTL value of this + * item. If no value is sent and the + * driver supports TTL then the + * library may set a default value for + * it or let the driver take care of + * that. + * + * @return bool True on success and false on failure. + * + * @throws InvalidArgumentException MUST be thrown if $values is neither an + * array nor a Traversable, or if any of the $values are not a legal value. + */ +PHP_METHOD(Phalcon_Cache_AbstractCache, doSetMultiple) +{ + zend_string *_3; + zend_ulong _2; + zend_bool result = 0; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zephir_fcall_cache_entry *_5 = NULL, *_7 = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *values, values_sub, *ttl = NULL, ttl_sub, __$null, key, value, *_0, _1, _4$$3, _6$$5; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&values_sub); + ZVAL_UNDEF(&ttl_sub); + ZVAL_NULL(&__$null); + ZVAL_UNDEF(&key); + ZVAL_UNDEF(&value); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_4$$3); + ZVAL_UNDEF(&_6$$5); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 2) + Z_PARAM_ZVAL(values) + Z_PARAM_OPTIONAL + Z_PARAM_ZVAL_OR_NULL(ttl) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 1, &values, &ttl); + if (!ttl) { + ttl = &ttl_sub; + ttl = &__$null; + } + + + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkkeys", NULL, 0, values); + zephir_check_call_status(); + result = 1; + zephir_is_iterable(values, 0, "phalcon/Cache/AbstractCache.zep", 266); + if (Z_TYPE_P(values) == IS_ARRAY) { + ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(values), _2, _3, _0) + { + ZEPHIR_INIT_NVAR(&key); + if (_3 != NULL) { + ZVAL_STR_COPY(&key, _3); + } else { + ZVAL_LONG(&key, _2); + } + ZEPHIR_INIT_NVAR(&value); + ZVAL_COPY(&value, _0); + ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "set", &_5, 0, &key, &value, ttl); + zephir_check_call_status(); + if (!ZEPHIR_IS_TRUE_IDENTICAL(&_4$$3)) { + result = 0; + } + } ZEND_HASH_FOREACH_END(); + } else { + ZEPHIR_CALL_METHOD(NULL, values, "rewind", NULL, 0); + zephir_check_call_status(); + while (1) { + ZEPHIR_CALL_METHOD(&_1, values, "valid", NULL, 0); + zephir_check_call_status(); + if (!zend_is_true(&_1)) { + break; + } + ZEPHIR_CALL_METHOD(&key, values, "key", NULL, 0); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&value, values, "current", NULL, 0); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&_6$$5, this_ptr, "set", &_7, 0, &key, &value, ttl); + zephir_check_call_status(); + if (!ZEPHIR_IS_TRUE_IDENTICAL(&_6$$5)) { + result = 0; + } + ZEPHIR_CALL_METHOD(NULL, values, "next", NULL, 0); + zephir_check_call_status(); + } + } + ZEPHIR_INIT_NVAR(&value); + ZEPHIR_INIT_NVAR(&key); + RETURN_MM_BOOL(result); +} + +/** + * Returns the exception class that will be used for exceptions thrown + * + * @return string + */ +PHP_METHOD(Phalcon_Cache_AbstractCache, getExceptionClass) +{ +} + diff --git a/ext/phalcon/cache/abstractcache.zep.h b/ext/phalcon/cache/abstractcache.zep.h new file mode 100644 index 00000000000..f06290b7550 --- /dev/null +++ b/ext/phalcon/cache/abstractcache.zep.h @@ -0,0 +1,91 @@ + +extern zend_class_entry *phalcon_cache_abstractcache_ce; + +ZEPHIR_INIT_CLASS(Phalcon_Cache_AbstractCache); + +PHP_METHOD(Phalcon_Cache_AbstractCache, __construct); +PHP_METHOD(Phalcon_Cache_AbstractCache, getAdapter); +PHP_METHOD(Phalcon_Cache_AbstractCache, checkKey); +PHP_METHOD(Phalcon_Cache_AbstractCache, checkKeys); +PHP_METHOD(Phalcon_Cache_AbstractCache, doClear); +PHP_METHOD(Phalcon_Cache_AbstractCache, doDelete); +PHP_METHOD(Phalcon_Cache_AbstractCache, doDeleteMultiple); +PHP_METHOD(Phalcon_Cache_AbstractCache, doGet); +PHP_METHOD(Phalcon_Cache_AbstractCache, doGetMultiple); +PHP_METHOD(Phalcon_Cache_AbstractCache, doHas); +PHP_METHOD(Phalcon_Cache_AbstractCache, doSet); +PHP_METHOD(Phalcon_Cache_AbstractCache, doSetMultiple); +PHP_METHOD(Phalcon_Cache_AbstractCache, getExceptionClass); + +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_cache_abstractcache___construct, 0, 0, 1) + ZEND_ARG_OBJ_INFO(0, adapter, Phalcon\\Cache\\Adapter\\AdapterInterface, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_cache_abstractcache_getadapter, 0, 0, Phalcon\\Cache\\Adapter\\AdapterInterface, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_cache_abstractcache_checkkey, 0, 1, IS_VOID, 0) + + ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_cache_abstractcache_checkkeys, 0, 1, IS_VOID, 0) + + ZEND_ARG_INFO(0, keys) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_cache_abstractcache_doclear, 0, 0, _IS_BOOL, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_cache_abstractcache_dodelete, 0, 1, _IS_BOOL, 0) + ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_cache_abstractcache_dodeletemultiple, 0, 1, _IS_BOOL, 0) + ZEND_ARG_INFO(0, keys) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_cache_abstractcache_doget, 0, 0, 1) + ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) + ZEND_ARG_INFO(0, defaultValue) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_cache_abstractcache_dogetmultiple, 0, 0, 1) + ZEND_ARG_INFO(0, keys) + ZEND_ARG_INFO(0, defaultValue) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_cache_abstractcache_dohas, 0, 1, _IS_BOOL, 0) + ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_cache_abstractcache_doset, 0, 2, _IS_BOOL, 0) + ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) + ZEND_ARG_INFO(0, value) + ZEND_ARG_INFO(0, ttl) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_cache_abstractcache_dosetmultiple, 0, 1, _IS_BOOL, 0) + ZEND_ARG_INFO(0, values) + ZEND_ARG_INFO(0, ttl) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_cache_abstractcache_getexceptionclass, 0, 0, IS_STRING, 0) +ZEND_END_ARG_INFO() + +ZEPHIR_INIT_FUNCS(phalcon_cache_abstractcache_method_entry) { + PHP_ME(Phalcon_Cache_AbstractCache, __construct, arginfo_phalcon_cache_abstractcache___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) + PHP_ME(Phalcon_Cache_AbstractCache, getAdapter, arginfo_phalcon_cache_abstractcache_getadapter, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Cache_AbstractCache, checkKey, arginfo_phalcon_cache_abstractcache_checkkey, ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Cache_AbstractCache, checkKeys, arginfo_phalcon_cache_abstractcache_checkkeys, ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Cache_AbstractCache, doClear, arginfo_phalcon_cache_abstractcache_doclear, ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Cache_AbstractCache, doDelete, arginfo_phalcon_cache_abstractcache_dodelete, ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Cache_AbstractCache, doDeleteMultiple, arginfo_phalcon_cache_abstractcache_dodeletemultiple, ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Cache_AbstractCache, doGet, arginfo_phalcon_cache_abstractcache_doget, ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Cache_AbstractCache, doGetMultiple, arginfo_phalcon_cache_abstractcache_dogetmultiple, ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Cache_AbstractCache, doHas, arginfo_phalcon_cache_abstractcache_dohas, ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Cache_AbstractCache, doSet, arginfo_phalcon_cache_abstractcache_doset, ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Cache_AbstractCache, doSetMultiple, arginfo_phalcon_cache_abstractcache_dosetmultiple, ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Cache_AbstractCache, getExceptionClass, arginfo_phalcon_cache_abstractcache_getexceptionclass, ZEND_ACC_ABSTRACT|ZEND_ACC_PROTECTED) + PHP_FE_END +}; diff --git a/ext/phalcon/cache/cache.zep.c b/ext/phalcon/cache/cache.zep.c index f0288457aa1..e71c389a78c 100644 --- a/ext/phalcon/cache/cache.zep.c +++ b/ext/phalcon/cache/cache.zep.c @@ -12,13 +12,10 @@ #include #include "kernel/main.h" +#include "kernel/fcall.h" #include "kernel/object.h" #include "kernel/memory.h" -#include "kernel/fcall.h" #include "kernel/operators.h" -#include "kernel/array.h" -#include "kernel/string.h" -#include "kernel/exception.h" /** @@ -37,53 +34,9 @@ */ ZEPHIR_INIT_CLASS(Phalcon_Cache_Cache) { - ZEPHIR_REGISTER_CLASS(Phalcon\\Cache, Cache, phalcon, cache_cache, phalcon_cache_cache_method_entry, 0); - - /** - * The adapter - * - * @var AdapterInterface - */ - zend_declare_property_null(phalcon_cache_cache_ce, SL("adapter"), ZEND_ACC_PROTECTED); - zend_class_implements(phalcon_cache_cache_ce, 1, zephir_get_internal_ce(SL("psr\\simplecache\\cacheinterface"))); - return SUCCESS; -} - -/** - * The adapter - */ -PHP_METHOD(Phalcon_Cache_Cache, getAdapter) -{ - zval *this_ptr = getThis(); - - - - RETURN_MEMBER(getThis(), "adapter"); -} - -/** - * Constructor. - * - * @param AdapterInterface $adapter The cache adapter - */ -PHP_METHOD(Phalcon_Cache_Cache, __construct) -{ - zval *adapter, adapter_sub; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&adapter_sub); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_OBJECT_OF_CLASS(adapter, phalcon_cache_adapter_adapterinterface_ce) - ZEND_PARSE_PARAMETERS_END(); -#endif + ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Cache, Cache, phalcon, cache_cache, phalcon_cache_abstractcache_ce, phalcon_cache_cache_method_entry, 0); - - zephir_fetch_params_without_memory_grow(1, 0, &adapter); - - - zephir_update_property_zval(this_ptr, ZEND_STRL("adapter"), adapter); + return SUCCESS; } /** @@ -93,18 +46,15 @@ PHP_METHOD(Phalcon_Cache_Cache, __construct) */ PHP_METHOD(Phalcon_Cache_Cache, clear) { - zval _0; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zval *this_ptr = getThis(); - ZVAL_UNDEF(&_0); ZEPHIR_MM_GROW(); - zephir_read_property(&_0, this_ptr, ZEND_STRL("adapter"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_METHOD(&_0, "clear", NULL, 0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "doclear", NULL, 0); zephir_check_call_status(); RETURN_MM(); } @@ -122,34 +72,27 @@ PHP_METHOD(Phalcon_Cache_Cache, clear) */ PHP_METHOD(Phalcon_Cache_Cache, delete) { - zval _0; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *key = NULL, key_sub, _1; + zval *key_param = NULL; + zval key; zval *this_ptr = getThis(); - ZVAL_UNDEF(&key_sub); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&key); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(key) + Z_PARAM_STR(key) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &key); - ZEPHIR_SEPARATE_PARAM(key); + zephir_fetch_params(1, 1, 0, &key_param); + zephir_get_strval(&key, key_param); - zephir_cast_to_string(&_0, key); - ZEPHIR_CPY_WRT(key, &_0); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkkey", NULL, 0, key); - zephir_check_call_status(); - zephir_read_property(&_1, this_ptr, ZEND_STRL("adapter"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_METHOD(&_1, "delete", NULL, 0, key); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "dodelete", NULL, 0, &key); zephir_check_call_status(); RETURN_MM(); } @@ -168,19 +111,12 @@ PHP_METHOD(Phalcon_Cache_Cache, delete) */ PHP_METHOD(Phalcon_Cache_Cache, deleteMultiple) { - zend_bool result = 0; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *keys, keys_sub, key, *_0, _1, _2$$3, _3$$3, _4$$5, _5$$5; + zval *keys, keys_sub; zval *this_ptr = getThis(); ZVAL_UNDEF(&keys_sub); - ZVAL_UNDEF(&key); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2$$3); - ZVAL_UNDEF(&_3$$3); - ZVAL_UNDEF(&_4$$5); - ZVAL_UNDEF(&_5$$5); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -193,53 +129,16 @@ PHP_METHOD(Phalcon_Cache_Cache, deleteMultiple) zephir_fetch_params(1, 1, 0, &keys); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkkeys", NULL, 0, keys); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "dodeletemultiple", NULL, 0, keys); zephir_check_call_status(); - result = 1; - zephir_is_iterable(keys, 0, "phalcon/Cache/Cache.zep", 100); - if (Z_TYPE_P(keys) == IS_ARRAY) { - ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(keys), _0) - { - ZEPHIR_INIT_NVAR(&key); - ZVAL_COPY(&key, _0); - zephir_read_property(&_2$$3, this_ptr, ZEND_STRL("adapter"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&_3$$3, &_2$$3, "delete", NULL, 0, &key); - zephir_check_call_status(); - if (!(zephir_is_true(&_3$$3))) { - result = 0; - } - } ZEND_HASH_FOREACH_END(); - } else { - ZEPHIR_CALL_METHOD(NULL, keys, "rewind", NULL, 0); - zephir_check_call_status(); - while (1) { - ZEPHIR_CALL_METHOD(&_1, keys, "valid", NULL, 0); - zephir_check_call_status(); - if (!zend_is_true(&_1)) { - break; - } - ZEPHIR_CALL_METHOD(&key, keys, "current", NULL, 0); - zephir_check_call_status(); - zephir_read_property(&_4$$5, this_ptr, ZEND_STRL("adapter"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&_5$$5, &_4$$5, "delete", NULL, 0, &key); - zephir_check_call_status(); - if (!(zephir_is_true(&_5$$5))) { - result = 0; - } - ZEPHIR_CALL_METHOD(NULL, keys, "next", NULL, 0); - zephir_check_call_status(); - } - } - ZEPHIR_INIT_NVAR(&key); - RETURN_MM_BOOL(result); + RETURN_MM(); } /** * Fetches a value from the cache. * * @param string $key The unique key of this item in the cache. - * @param mixed $defaultValue Default value to return if the key does - * not exist. + * @param mixed $defaultValue Default value to return if the key does not exist. * * @return mixed The value of the item from the cache, or $default in case * of cache miss. @@ -249,21 +148,19 @@ PHP_METHOD(Phalcon_Cache_Cache, deleteMultiple) */ PHP_METHOD(Phalcon_Cache_Cache, get) { - zval _0; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *key = NULL, key_sub, *defaultValue = NULL, defaultValue_sub, __$null, _1; + zval *key_param = NULL, *defaultValue = NULL, defaultValue_sub, __$null; + zval key; zval *this_ptr = getThis(); - ZVAL_UNDEF(&key_sub); + ZVAL_UNDEF(&key); ZVAL_UNDEF(&defaultValue_sub); ZVAL_NULL(&__$null); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_0); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) - Z_PARAM_ZVAL(key) + Z_PARAM_STR(key) Z_PARAM_OPTIONAL Z_PARAM_ZVAL_OR_NULL(defaultValue) ZEND_PARSE_PARAMETERS_END(); @@ -271,20 +168,15 @@ PHP_METHOD(Phalcon_Cache_Cache, get) ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 1, &key, &defaultValue); - ZEPHIR_SEPARATE_PARAM(key); + zephir_fetch_params(1, 1, 1, &key_param, &defaultValue); + zephir_get_strval(&key, key_param); if (!defaultValue) { defaultValue = &defaultValue_sub; defaultValue = &__$null; } - zephir_cast_to_string(&_0, key); - ZEPHIR_CPY_WRT(key, &_0); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkkey", NULL, 0, key); - zephir_check_call_status(); - zephir_read_property(&_1, this_ptr, ZEND_STRL("adapter"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_METHOD(&_1, "get", NULL, 0, key, defaultValue); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "doget", NULL, 0, &key, defaultValue); zephir_check_call_status(); RETURN_MM(); } @@ -292,10 +184,10 @@ PHP_METHOD(Phalcon_Cache_Cache, get) /** * Obtains multiple cache items by their unique keys. * - * @param iterable $keys A list of keys that can obtained in a - * single operation. - * @param mixed defaultValue Default value to return for keys that do - * not exist. + * @param iterable $keys A list of keys that can obtained in a + * single operation. + * @param mixed $defaultValue Default value to return for keys that do + * not exist. * * @return iterable A list of key => value pairs. Cache * keys that do not exist or are stale will have $default as value. @@ -305,21 +197,14 @@ PHP_METHOD(Phalcon_Cache_Cache, get) */ PHP_METHOD(Phalcon_Cache_Cache, getMultiple) { - zval results; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zephir_fcall_cache_entry *_3 = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *keys, keys_sub, *defaultValue = NULL, defaultValue_sub, __$null, element, *_0, _1, _2$$3, _4$$4; + zval *keys, keys_sub, *defaultValue = NULL, defaultValue_sub, __$null; zval *this_ptr = getThis(); ZVAL_UNDEF(&keys_sub); ZVAL_UNDEF(&defaultValue_sub); ZVAL_NULL(&__$null); - ZVAL_UNDEF(&element); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2$$3); - ZVAL_UNDEF(&_4$$4); - ZVAL_UNDEF(&results); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) @@ -338,40 +223,9 @@ PHP_METHOD(Phalcon_Cache_Cache, getMultiple) } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkkeys", NULL, 0, keys); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "dogetmultiple", NULL, 0, keys, defaultValue); zephir_check_call_status(); - ZEPHIR_INIT_VAR(&results); - array_init(&results); - zephir_is_iterable(keys, 0, "phalcon/Cache/Cache.zep", 151); - if (Z_TYPE_P(keys) == IS_ARRAY) { - ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(keys), _0) - { - ZEPHIR_INIT_NVAR(&element); - ZVAL_COPY(&element, _0); - ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "get", &_3, 0, &element, defaultValue); - zephir_check_call_status(); - zephir_array_update_zval(&results, &element, &_2$$3, PH_COPY | PH_SEPARATE); - } ZEND_HASH_FOREACH_END(); - } else { - ZEPHIR_CALL_METHOD(NULL, keys, "rewind", NULL, 0); - zephir_check_call_status(); - while (1) { - ZEPHIR_CALL_METHOD(&_1, keys, "valid", NULL, 0); - zephir_check_call_status(); - if (!zend_is_true(&_1)) { - break; - } - ZEPHIR_CALL_METHOD(&element, keys, "current", NULL, 0); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "get", &_3, 0, &element, defaultValue); - zephir_check_call_status(); - zephir_array_update_zval(&results, &element, &_4$$4, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, keys, "next", NULL, 0); - zephir_check_call_status(); - } - } - ZEPHIR_INIT_NVAR(&element); - RETURN_CTOR(&results); + RETURN_MM(); } /** @@ -386,34 +240,27 @@ PHP_METHOD(Phalcon_Cache_Cache, getMultiple) */ PHP_METHOD(Phalcon_Cache_Cache, has) { - zval _0; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *key = NULL, key_sub, _1; + zval *key_param = NULL; + zval key; zval *this_ptr = getThis(); - ZVAL_UNDEF(&key_sub); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&key); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(key) + Z_PARAM_STR(key) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &key); - ZEPHIR_SEPARATE_PARAM(key); + zephir_fetch_params(1, 1, 0, &key_param); + zephir_get_strval(&key, key_param); - zephir_cast_to_string(&_0, key); - ZEPHIR_CPY_WRT(key, &_0); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkkey", NULL, 0, key); - zephir_check_call_status(); - zephir_read_property(&_1, this_ptr, ZEND_STRL("adapter"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_METHOD(&_1, "has", NULL, 0, key); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "dohas", NULL, 0, &key); zephir_check_call_status(); RETURN_MM(); } @@ -438,22 +285,20 @@ PHP_METHOD(Phalcon_Cache_Cache, has) */ PHP_METHOD(Phalcon_Cache_Cache, set) { - zval _0; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *key = NULL, key_sub, *value, value_sub, *ttl = NULL, ttl_sub, __$null, _1; + zval *key_param = NULL, *value, value_sub, *ttl = NULL, ttl_sub, __$null; + zval key; zval *this_ptr = getThis(); - ZVAL_UNDEF(&key_sub); + ZVAL_UNDEF(&key); ZVAL_UNDEF(&value_sub); ZVAL_UNDEF(&ttl_sub); ZVAL_NULL(&__$null); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_0); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(2, 3) - Z_PARAM_ZVAL(key) + Z_PARAM_STR(key) Z_PARAM_ZVAL(value) Z_PARAM_OPTIONAL Z_PARAM_ZVAL_OR_NULL(ttl) @@ -462,20 +307,15 @@ PHP_METHOD(Phalcon_Cache_Cache, set) ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 2, 1, &key, &value, &ttl); - ZEPHIR_SEPARATE_PARAM(key); + zephir_fetch_params(1, 2, 1, &key_param, &value, &ttl); + zephir_get_strval(&key, key_param); if (!ttl) { ttl = &ttl_sub; ttl = &__$null; } - zephir_cast_to_string(&_0, key); - ZEPHIR_CPY_WRT(key, &_0); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkkey", NULL, 0, key); - zephir_check_call_status(); - zephir_read_property(&_1, this_ptr, ZEND_STRL("adapter"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_METHOD(&_1, "set", NULL, 0, key, value, ttl); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "doset", NULL, 0, &key, value, ttl); zephir_check_call_status(); RETURN_MM(); } @@ -499,23 +339,14 @@ PHP_METHOD(Phalcon_Cache_Cache, set) */ PHP_METHOD(Phalcon_Cache_Cache, setMultiple) { - zend_string *_3; - zend_ulong _2; - zend_bool result = 0; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zephir_fcall_cache_entry *_5 = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *values, values_sub, *ttl = NULL, ttl_sub, __$null, key, value, *_0, _1, _4$$3, _6$$5; + zval *values, values_sub, *ttl = NULL, ttl_sub, __$null; zval *this_ptr = getThis(); ZVAL_UNDEF(&values_sub); ZVAL_UNDEF(&ttl_sub); ZVAL_NULL(&__$null); - ZVAL_UNDEF(&key); - ZVAL_UNDEF(&value); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_4$$3); - ZVAL_UNDEF(&_6$$5); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) @@ -534,132 +365,22 @@ PHP_METHOD(Phalcon_Cache_Cache, setMultiple) } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkkeys", NULL, 0, values); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "dosetmultiple", NULL, 0, values, ttl); zephir_check_call_status(); - result = 1; - zephir_is_iterable(values, 0, "phalcon/Cache/Cache.zep", 231); - if (Z_TYPE_P(values) == IS_ARRAY) { - ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(values), _2, _3, _0) - { - ZEPHIR_INIT_NVAR(&key); - if (_3 != NULL) { - ZVAL_STR_COPY(&key, _3); - } else { - ZVAL_LONG(&key, _2); - } - ZEPHIR_INIT_NVAR(&value); - ZVAL_COPY(&value, _0); - ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "set", &_5, 0, &key, &value, ttl); - zephir_check_call_status(); - if (!(zephir_is_true(&_4$$3))) { - result = 0; - } - } ZEND_HASH_FOREACH_END(); - } else { - ZEPHIR_CALL_METHOD(NULL, values, "rewind", NULL, 0); - zephir_check_call_status(); - while (1) { - ZEPHIR_CALL_METHOD(&_1, values, "valid", NULL, 0); - zephir_check_call_status(); - if (!zend_is_true(&_1)) { - break; - } - ZEPHIR_CALL_METHOD(&key, values, "key", NULL, 0); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&value, values, "current", NULL, 0); - zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_6$$5, this_ptr, "set", &_5, 0, &key, &value, ttl); - zephir_check_call_status(); - if (!(zephir_is_true(&_6$$5))) { - result = 0; - } - ZEPHIR_CALL_METHOD(NULL, values, "next", NULL, 0); - zephir_check_call_status(); - } - } - ZEPHIR_INIT_NVAR(&value); - ZEPHIR_INIT_NVAR(&key); - RETURN_MM_BOOL(result); -} - -/** - * Checks the key. If it contains invalid characters an exception is thrown - * - * @param mixed $key - * - * @throws InvalidArgumentException - */ -PHP_METHOD(Phalcon_Cache_Cache, checkKey) -{ - zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zval *key_param = NULL, _0, _1, _2, _3; - zval key; - zval *this_ptr = getThis(); - - ZVAL_UNDEF(&key); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_3); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_STR(key) - ZEND_PARSE_PARAMETERS_END(); -#endif - - - ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 0, &key_param); - zephir_get_strval(&key, key_param); - - - ZEPHIR_INIT_VAR(&_0); - ZEPHIR_INIT_VAR(&_1); - ZVAL_STRING(&_1, "/[^A-Za-z0-9-_.]/"); - ZEPHIR_INIT_VAR(&_2); - ZEPHIR_INIT_VAR(&_3); - ZVAL_STRING(&_3, "/[^A-Za-z0-9-_.]/"); - zephir_preg_match(&_2, &_3, &key, &_0, 0, 0 , 0 ); - if (zephir_is_true(&_2)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_cache_exception_invalidargumentexception_ce, "The key contains invalid characters", "phalcon/Cache/Cache.zep", 246); - return; - } - ZEPHIR_MM_RESTORE(); + RETURN_MM(); } /** - * Checks the key. If it contains invalid characters an exception is thrown - * - * @param mixed $keys + * Returns the exception class that will be used for exceptions thrown * - * @throws InvalidArgumentException + * @return string */ -PHP_METHOD(Phalcon_Cache_Cache, checkKeys) +PHP_METHOD(Phalcon_Cache_Cache, getExceptionClass) { - zend_bool _0; - zval *keys, keys_sub; zval *this_ptr = getThis(); - ZVAL_UNDEF(&keys_sub); -#if PHP_VERSION_ID >= 80000 - bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 1) - Z_PARAM_ZVAL(keys) - ZEND_PARSE_PARAMETERS_END(); -#endif - - zephir_fetch_params_without_memory_grow(1, 0, &keys); - - _0 = Z_TYPE_P(keys) == IS_ARRAY; - if (!(_0)) { - _0 = zephir_zval_is_traversable(keys); - } - if (!(_0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_cache_exception_invalidargumentexception_ce, "The keys need to be an array or instance of Traversable", "phalcon/Cache/Cache.zep", 262); - return; - } + RETURN_STRING("Phalcon\\Cache\\Exception\\InvalidArgumentException"); } diff --git a/ext/phalcon/cache/cache.zep.h b/ext/phalcon/cache/cache.zep.h index 62c25550f84..4e20ede19f2 100644 --- a/ext/phalcon/cache/cache.zep.h +++ b/ext/phalcon/cache/cache.zep.h @@ -3,8 +3,6 @@ extern zend_class_entry *phalcon_cache_cache_ce; ZEPHIR_INIT_CLASS(Phalcon_Cache_Cache); -PHP_METHOD(Phalcon_Cache_Cache, getAdapter); -PHP_METHOD(Phalcon_Cache_Cache, __construct); PHP_METHOD(Phalcon_Cache_Cache, clear); PHP_METHOD(Phalcon_Cache_Cache, delete); PHP_METHOD(Phalcon_Cache_Cache, deleteMultiple); @@ -13,21 +11,13 @@ PHP_METHOD(Phalcon_Cache_Cache, getMultiple); PHP_METHOD(Phalcon_Cache_Cache, has); PHP_METHOD(Phalcon_Cache_Cache, set); PHP_METHOD(Phalcon_Cache_Cache, setMultiple); -PHP_METHOD(Phalcon_Cache_Cache, checkKey); -PHP_METHOD(Phalcon_Cache_Cache, checkKeys); - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_cache_cache_getadapter, 0, 0, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_cache_cache___construct, 0, 0, 1) - ZEND_ARG_OBJ_INFO(0, adapter, Phalcon\\Cache\\Adapter\\AdapterInterface, 0) -ZEND_END_ARG_INFO() +PHP_METHOD(Phalcon_Cache_Cache, getExceptionClass); ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_cache_cache_clear, 0, 0, _IS_BOOL, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_cache_cache_delete, 0, 1, _IS_BOOL, 0) - ZEND_ARG_INFO(0, key) + ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_cache_cache_deletemultiple, 0, 1, _IS_BOOL, 0) @@ -35,7 +25,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_cache_cache_deletemultip ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_cache_cache_get, 0, 0, 1) - ZEND_ARG_INFO(0, key) + ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) ZEND_ARG_INFO(0, defaultValue) ZEND_END_ARG_INFO() @@ -45,11 +35,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_cache_cache_getmultiple, 0, 0, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_cache_cache_has, 0, 1, _IS_BOOL, 0) - ZEND_ARG_INFO(0, key) + ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_cache_cache_set, 0, 2, _IS_BOOL, 0) - ZEND_ARG_INFO(0, key) + ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) ZEND_ARG_INFO(0, value) ZEND_ARG_INFO(0, ttl) ZEND_END_ARG_INFO() @@ -59,23 +49,10 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_cache_cache_setmultiple, ZEND_ARG_INFO(0, ttl) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_cache_cache_checkkey, 0, 1, IS_VOID, 0) - - ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) -ZEND_END_ARG_INFO() - -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_cache_cache_checkkeys, 0, 1, IS_VOID, 0) - - ZEND_ARG_INFO(0, keys) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_cache_cache_getexceptionclass, 0, 0, IS_STRING, 0) ZEND_END_ARG_INFO() ZEPHIR_INIT_FUNCS(phalcon_cache_cache_method_entry) { -#if PHP_VERSION_ID >= 80000 - PHP_ME(Phalcon_Cache_Cache, getAdapter, arginfo_phalcon_cache_cache_getadapter, ZEND_ACC_PUBLIC) -#else - PHP_ME(Phalcon_Cache_Cache, getAdapter, NULL, ZEND_ACC_PUBLIC) -#endif - PHP_ME(Phalcon_Cache_Cache, __construct, arginfo_phalcon_cache_cache___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) PHP_ME(Phalcon_Cache_Cache, clear, arginfo_phalcon_cache_cache_clear, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Cache_Cache, delete, arginfo_phalcon_cache_cache_delete, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Cache_Cache, deleteMultiple, arginfo_phalcon_cache_cache_deletemultiple, ZEND_ACC_PUBLIC) @@ -84,7 +61,6 @@ ZEPHIR_INIT_FUNCS(phalcon_cache_cache_method_entry) { PHP_ME(Phalcon_Cache_Cache, has, arginfo_phalcon_cache_cache_has, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Cache_Cache, set, arginfo_phalcon_cache_cache_set, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Cache_Cache, setMultiple, arginfo_phalcon_cache_cache_setmultiple, ZEND_ACC_PUBLIC) - PHP_ME(Phalcon_Cache_Cache, checkKey, arginfo_phalcon_cache_cache_checkkey, ZEND_ACC_PROTECTED) - PHP_ME(Phalcon_Cache_Cache, checkKeys, arginfo_phalcon_cache_cache_checkkeys, ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Cache_Cache, getExceptionClass, arginfo_phalcon_cache_cache_getexceptionclass, ZEND_ACC_PROTECTED) PHP_FE_END }; diff --git a/ext/phalcon/cache/cachefactory.zep.c b/ext/phalcon/cache/cachefactory.zep.c index a5715d303ee..8fccf2ecd82 100644 --- a/ext/phalcon/cache/cachefactory.zep.c +++ b/ext/phalcon/cache/cachefactory.zep.c @@ -132,7 +132,7 @@ PHP_METHOD(Phalcon_Cache_CacheFactory, load) zephir_check_call_status(); ZEPHIR_CPY_WRT(config, &_0); ZEPHIR_OBS_VAR(&name); - zephir_array_fetch_string(&name, config, SL("adapter"), PH_NOISY, "phalcon/Cache/CacheFactory.zep", 76); + zephir_array_fetch_string(&name, config, SL("adapter"), PH_NOISY, "phalcon/Cache/CacheFactory.zep", 75); ZEPHIR_OBS_VAR(&options); if (!(zephir_array_isset_string_fetch(&options, config, SL("options"), 0))) { ZEPHIR_INIT_NVAR(&options); @@ -217,7 +217,7 @@ PHP_METHOD(Phalcon_Cache_CacheFactory, newInstance) ZEPHIR_CALL_METHOD(&adapter, &_0, "newinstance", NULL, 0, &name, &options); zephir_check_call_status(); object_init_ex(return_value, phalcon_cache_cache_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 206, &adapter); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 207, &adapter); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/cache/cachefactory.zep.h b/ext/phalcon/cache/cachefactory.zep.h index 0aa215effe7..dd359eabc2f 100644 --- a/ext/phalcon/cache/cachefactory.zep.h +++ b/ext/phalcon/cache/cachefactory.zep.h @@ -12,11 +12,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_cache_cachefactory___construct, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, factory, Phalcon\\Cache\\AdapterFactory, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_cache_cachefactory_load, 0, 1, Psr\\SimpleCache\\CacheInterface, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_cache_cachefactory_load, 0, 1, Phalcon\\Cache\\CacheInterface, 0) ZEND_ARG_INFO(0, config) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_cache_cachefactory_newinstance, 0, 1, Psr\\SimpleCache\\CacheInterface, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_cache_cachefactory_newinstance, 0, 1, Phalcon\\Cache\\CacheInterface, 0) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) #if PHP_VERSION_ID >= 80000 ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "[]") diff --git a/ext/phalcon/cache/cacheinterface.zep.c b/ext/phalcon/cache/cacheinterface.zep.c new file mode 100644 index 00000000000..d5ef2c53eab --- /dev/null +++ b/ext/phalcon/cache/cacheinterface.zep.c @@ -0,0 +1,139 @@ + +#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. + */ +/** + * Interface for Phalcon\Cache\Cache + */ +ZEPHIR_INIT_CLASS(Phalcon_Cache_CacheInterface) +{ + ZEPHIR_REGISTER_INTERFACE(Phalcon\\Cache, CacheInterface, phalcon, cache_cacheinterface, phalcon_cache_cacheinterface_method_entry); + + return SUCCESS; +} + +/** + * Wipes clean the entire cache's keys. + * + * @return bool True on success and false on failure. + */ +ZEPHIR_DOC_METHOD(Phalcon_Cache_CacheInterface, clear); +/** + * Delete an item from the cache by its unique key. + * + * @param string $key The unique cache key of the item to delete. + * + * @return bool True if the item was successfully removed. False if there + * was an error. + * + * @throws InvalidArgumentException MUST be thrown if the $key string is + * not a legal value. + */ +ZEPHIR_DOC_METHOD(Phalcon_Cache_CacheInterface, delete); +/** + * Deletes multiple cache items in a single operation. + * + * @param iterable $keys A list of string-based keys to be deleted. + * + * @return bool True if the items were successfully removed. False if there + * was an error. + * + * @throws InvalidArgumentException MUST be thrown if $keys is neither an + * array nor a Traversable, or if any of + * the $keys are not a legal value. + */ +ZEPHIR_DOC_METHOD(Phalcon_Cache_CacheInterface, deleteMultiple); +/** + * Fetches a value from the cache. + * + * @param string $key The unique key of this item in the cache. + * @param mixed $defaultValue Default value to return if the key does not exist. + * + * @return mixed The value of the item from the cache, or $default in case + * of cache miss. + * + * @throws InvalidArgumentException MUST be thrown if the $key string is + * not a legal value. + */ +ZEPHIR_DOC_METHOD(Phalcon_Cache_CacheInterface, get); +/** + * Obtains multiple cache items by their unique keys. + * + * @param iterable $keys A list of keys that can obtained + * in a single operation. + * @param mixed defaultValue Default value to return for keys + * that do not exist. + * + * @return iterable A list of key => value pairs. Cache + * keys that do not exist or are stale will have $default as value. + * + * @throws InvalidArgumentException MUST be thrown if $keys is neither an + * array nor a Traversable, or if any of the $keys are not a legal value. + */ +ZEPHIR_DOC_METHOD(Phalcon_Cache_CacheInterface, getMultiple); +/** + * Determines whether an item is present in the cache. + * + * @param string $key The cache item key. + * + * @return bool + * + * @throws InvalidArgumentException MUST be thrown if the $key string is + * not a legal value. + */ +ZEPHIR_DOC_METHOD(Phalcon_Cache_CacheInterface, has); +/** + * Persists data in the cache, uniquely referenced by a key with an optional + * expiration TTL time. + * + * @param string $key The key of the item to store. + * @param mixed $value The value of the item to store. + * Must be serializable. + * @param null|int|DateInterval $ttl Optional. The TTL value of this + * item. If no value is sent and the + * driver supports TTL then the library + * may set a default value for it or + * let the driver take care of that. + * + * @return bool True on success and false on failure. + * + * @throws InvalidArgumentException MUST be thrown if the $key string is not + * a legal value. + */ +ZEPHIR_DOC_METHOD(Phalcon_Cache_CacheInterface, set); +/** + * Persists a set of key => value pairs in the cache, with an optional TTL. + * + * @param iterable $values A list of key => value pairs for a + * multiple-set operation. + * @param null|int|DateInterval $ttl Optional. The TTL value of this + * item. If no value is sent and the + * driver supports TTL then the + * library may set a default value for + * it or let the driver take care of + * that. + * + * @return bool True on success and false on failure. + * + * @throws InvalidArgumentException MUST be thrown if $values is neither an + * array nor a Traversable, or if any of the $values are not a legal value. + */ +ZEPHIR_DOC_METHOD(Phalcon_Cache_CacheInterface, setMultiple); diff --git a/ext/phalcon/cache/cacheinterface.zep.h b/ext/phalcon/cache/cacheinterface.zep.h new file mode 100644 index 00000000000..61a2f57529e --- /dev/null +++ b/ext/phalcon/cache/cacheinterface.zep.h @@ -0,0 +1,52 @@ + +extern zend_class_entry *phalcon_cache_cacheinterface_ce; + +ZEPHIR_INIT_CLASS(Phalcon_Cache_CacheInterface); + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_cache_cacheinterface_clear, 0, 0, _IS_BOOL, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_cache_cacheinterface_delete, 0, 1, _IS_BOOL, 0) + ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_cache_cacheinterface_deletemultiple, 0, 1, _IS_BOOL, 0) + ZEND_ARG_INFO(0, keys) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_cache_cacheinterface_get, 0, 0, 1) + ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) + ZEND_ARG_INFO(0, defaultValue) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_cache_cacheinterface_getmultiple, 0, 0, 1) + ZEND_ARG_INFO(0, keys) + ZEND_ARG_INFO(0, defaultValue) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_cache_cacheinterface_has, 0, 1, _IS_BOOL, 0) + ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_cache_cacheinterface_set, 0, 2, _IS_BOOL, 0) + ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0) + ZEND_ARG_INFO(0, value) + ZEND_ARG_INFO(0, ttl) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_cache_cacheinterface_setmultiple, 0, 1, _IS_BOOL, 0) + ZEND_ARG_INFO(0, values) + ZEND_ARG_INFO(0, ttl) +ZEND_END_ARG_INFO() + +ZEPHIR_INIT_FUNCS(phalcon_cache_cacheinterface_method_entry) { + PHP_ABSTRACT_ME(Phalcon_Cache_CacheInterface, clear, arginfo_phalcon_cache_cacheinterface_clear) + PHP_ABSTRACT_ME(Phalcon_Cache_CacheInterface, delete, arginfo_phalcon_cache_cacheinterface_delete) + PHP_ABSTRACT_ME(Phalcon_Cache_CacheInterface, deleteMultiple, arginfo_phalcon_cache_cacheinterface_deletemultiple) + PHP_ABSTRACT_ME(Phalcon_Cache_CacheInterface, get, arginfo_phalcon_cache_cacheinterface_get) + PHP_ABSTRACT_ME(Phalcon_Cache_CacheInterface, getMultiple, arginfo_phalcon_cache_cacheinterface_getmultiple) + PHP_ABSTRACT_ME(Phalcon_Cache_CacheInterface, has, arginfo_phalcon_cache_cacheinterface_has) + PHP_ABSTRACT_ME(Phalcon_Cache_CacheInterface, set, arginfo_phalcon_cache_cacheinterface_set) + PHP_ABSTRACT_ME(Phalcon_Cache_CacheInterface, setMultiple, arginfo_phalcon_cache_cacheinterface_setmultiple) + PHP_FE_END +}; diff --git a/ext/phalcon/cache/exception/exception.zep.c b/ext/phalcon/cache/exception/exception.zep.c index ee577ce63e6..2d4f8c71f9f 100644 --- a/ext/phalcon/cache/exception/exception.zep.c +++ b/ext/phalcon/cache/exception/exception.zep.c @@ -29,7 +29,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Cache_Exception_Exception) { ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Cache\\Exception, Exception, phalcon, cache_exception_exception, zend_ce_exception, NULL, 0); - zend_class_implements(phalcon_cache_exception_exception_ce, 1, zephir_get_internal_ce(SL("psr\\simplecache\\cacheexception"))); return SUCCESS; } diff --git a/ext/phalcon/cache/exception/invalidargumentexception.zep.c b/ext/phalcon/cache/exception/invalidargumentexception.zep.c index 37fb795a6e4..e70275acf96 100644 --- a/ext/phalcon/cache/exception/invalidargumentexception.zep.c +++ b/ext/phalcon/cache/exception/invalidargumentexception.zep.c @@ -29,7 +29,6 @@ ZEPHIR_INIT_CLASS(Phalcon_Cache_Exception_InvalidArgumentException) { ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Cache\\Exception, InvalidArgumentException, phalcon, cache_exception_invalidargumentexception, zend_ce_exception, NULL, 0); - zend_class_implements(phalcon_cache_exception_invalidargumentexception_ce, 1, zephir_get_internal_ce(SL("psr\\simplecache\\invalidargumentexception"))); return SUCCESS; } diff --git a/ext/phalcon/cli/console.zep.c b/ext/phalcon/cli/console.zep.c index 2770f3b65b4..218b377ff43 100644 --- a/ext/phalcon/cli/console.zep.c +++ b/ext/phalcon/cli/console.zep.c @@ -400,7 +400,7 @@ PHP_METHOD(Phalcon_Cli_Console, setArgument) ZEPHIR_INIT_NVAR(&_3$$5); ZVAL_STRING(&_3$$5, "--"); ZVAL_LONG(&_4$$5, 2); - ZEPHIR_CALL_FUNCTION(&_5$$5, "strncmp", &_6, 207, &arg, &_3$$5, &_4$$5); + ZEPHIR_CALL_FUNCTION(&_5$$5, "strncmp", &_6, 208, &arg, &_3$$5, &_4$$5); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_5$$5, 0)) { ZEPHIR_INIT_NVAR(&_7$$6); @@ -432,7 +432,7 @@ PHP_METHOD(Phalcon_Cli_Console, setArgument) ZEPHIR_INIT_NVAR(&_18$$9); ZVAL_STRING(&_18$$9, "-"); ZVAL_LONG(&_19$$9, 1); - ZEPHIR_CALL_FUNCTION(&_20$$9, "strncmp", &_6, 207, &arg, &_18$$9, &_19$$9); + ZEPHIR_CALL_FUNCTION(&_20$$9, "strncmp", &_6, 208, &arg, &_18$$9, &_19$$9); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_20$$9, 0)) { ZVAL_LONG(&_21$$10, 1); @@ -462,7 +462,7 @@ PHP_METHOD(Phalcon_Cli_Console, setArgument) ZEPHIR_INIT_NVAR(&_23$$14); ZVAL_STRING(&_23$$14, "--"); ZVAL_LONG(&_24$$14, 2); - ZEPHIR_CALL_FUNCTION(&_25$$14, "strncmp", &_6, 207, &arg, &_23$$14, &_24$$14); + ZEPHIR_CALL_FUNCTION(&_25$$14, "strncmp", &_6, 208, &arg, &_23$$14, &_24$$14); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_25$$14, 0)) { ZEPHIR_INIT_NVAR(&_26$$15); @@ -494,7 +494,7 @@ PHP_METHOD(Phalcon_Cli_Console, setArgument) ZEPHIR_INIT_NVAR(&_37$$18); ZVAL_STRING(&_37$$18, "-"); ZVAL_LONG(&_38$$18, 1); - ZEPHIR_CALL_FUNCTION(&_39$$18, "strncmp", &_6, 207, &arg, &_37$$18, &_38$$18); + ZEPHIR_CALL_FUNCTION(&_39$$18, "strncmp", &_6, 208, &arg, &_37$$18, &_38$$18); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_39$$18, 0)) { ZVAL_LONG(&_40$$19, 1); diff --git a/ext/phalcon/cli/router.zep.c b/ext/phalcon/cli/router.zep.c index edec175e152..782c7d221a2 100644 --- a/ext/phalcon/cli/router.zep.c +++ b/ext/phalcon/cli/router.zep.c @@ -154,7 +154,7 @@ PHP_METHOD(Phalcon_Cli_Router, __construct) add_assoc_long_ex(&_1$$3, SL("task"), 1); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "#^(?::delimiter)?([a-zA-Z0-9\\_\\-]+)[:delimiter]{0,1}$#"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 208, &_2$$3, &_1$$3); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 209, &_2$$3, &_1$$3); zephir_check_call_status(); zephir_array_append(&routes, &_0$$3, PH_SEPARATE, "phalcon/Cli/Router.zep", 120); ZEPHIR_INIT_NVAR(&_2$$3); @@ -166,7 +166,7 @@ PHP_METHOD(Phalcon_Cli_Router, __construct) add_assoc_long_ex(&_3$$3, SL("params"), 3); ZEPHIR_INIT_VAR(&_4$$3); ZVAL_STRING(&_4$$3, "#^(?::delimiter)?([a-zA-Z0-9\\_\\-]+):delimiter([a-zA-Z0-9\\.\\_]+)(:delimiter.*)*$#"); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 208, &_4$$3, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 209, &_4$$3, &_3$$3); zephir_check_call_status(); zephir_array_append(&routes, &_2$$3, PH_SEPARATE, "phalcon/Cli/Router.zep", 129); } @@ -224,7 +224,7 @@ PHP_METHOD(Phalcon_Cli_Router, add) ZEPHIR_INIT_VAR(&route); object_init_ex(&route, phalcon_cli_router_route_ce); - ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 208, &pattern, paths); + ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 209, &pattern, paths); zephir_check_call_status(); zephir_update_property_array_append(this_ptr, SL("routes"), &route); RETURN_CCTOR(&route); diff --git a/ext/phalcon/cli/router/route.zep.c b/ext/phalcon/cli/router/route.zep.c index e2536a9463f..0c937dcafce 100644 --- a/ext/phalcon/cli/router/route.zep.c +++ b/ext/phalcon/cli/router/route.zep.c @@ -753,7 +753,7 @@ PHP_METHOD(Phalcon_Cli_Router_Route, getReversedPaths) ZEPHIR_MM_GROW(); zephir_read_property(&_0, this_ptr, ZEND_STRL("paths"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_FUNCTION("array_flip", NULL, 127, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("array_flip", NULL, 128, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/config/adapter/grouped.zep.c b/ext/phalcon/config/adapter/grouped.zep.c index 9992d86e0a1..884ba0dccb5 100644 --- a/ext/phalcon/config/adapter/grouped.zep.c +++ b/ext/phalcon/config/adapter/grouped.zep.c @@ -183,9 +183,9 @@ PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) if (ZEPHIR_IS_IDENTICAL(&_6$$5, &defaultAdapter)) { ZEPHIR_INIT_NVAR(&_7$$6); object_init_ex(&_7$$6, phalcon_config_configfactory_ce); - ZEPHIR_CALL_METHOD(NULL, &_7$$6, "__construct", &_8, 209); + ZEPHIR_CALL_METHOD(NULL, &_7$$6, "__construct", &_8, 210); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_9$$6, &_7$$6, "load", &_10, 210, &configName); + ZEPHIR_CALL_METHOD(&_9$$6, &_7$$6, "load", &_10, 211, &configName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "merge", &_5, 0, &_9$$6); zephir_check_call_status(); @@ -223,9 +223,9 @@ PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) } else { ZEPHIR_INIT_NVAR(&_18$$10); object_init_ex(&_18$$10, phalcon_config_configfactory_ce); - ZEPHIR_CALL_METHOD(NULL, &_18$$10, "__construct", &_8, 209); + ZEPHIR_CALL_METHOD(NULL, &_18$$10, "__construct", &_8, 210); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_19$$10, &_18$$10, "load", &_10, 210, &configInstance); + ZEPHIR_CALL_METHOD(&_19$$10, &_18$$10, "load", &_10, 211, &configInstance); zephir_check_call_status(); ZEPHIR_CPY_WRT(&configInstance, &_19$$10); } @@ -258,9 +258,9 @@ PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) if (ZEPHIR_IS_IDENTICAL(&_21$$13, &defaultAdapter)) { ZEPHIR_INIT_NVAR(&_22$$14); object_init_ex(&_22$$14, phalcon_config_configfactory_ce); - ZEPHIR_CALL_METHOD(NULL, &_22$$14, "__construct", &_8, 209); + ZEPHIR_CALL_METHOD(NULL, &_22$$14, "__construct", &_8, 210); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_23$$14, &_22$$14, "load", &_10, 210, &configName); + ZEPHIR_CALL_METHOD(&_23$$14, &_22$$14, "load", &_10, 211, &configName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "merge", &_5, 0, &_23$$14); zephir_check_call_status(); @@ -298,9 +298,9 @@ PHP_METHOD(Phalcon_Config_Adapter_Grouped, __construct) } else { ZEPHIR_INIT_NVAR(&_29$$18); object_init_ex(&_29$$18, phalcon_config_configfactory_ce); - ZEPHIR_CALL_METHOD(NULL, &_29$$18, "__construct", &_8, 209); + ZEPHIR_CALL_METHOD(NULL, &_29$$18, "__construct", &_8, 210); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_30$$18, &_29$$18, "load", &_10, 210, &configInstance); + ZEPHIR_CALL_METHOD(&_30$$18, &_29$$18, "load", &_10, 211, &configInstance); zephir_check_call_status(); ZEPHIR_CPY_WRT(&configInstance, &_30$$18); } diff --git a/ext/phalcon/config/adapter/ini.zep.c b/ext/phalcon/config/adapter/ini.zep.c index c0f0a615c5b..d5b916cbbd5 100644 --- a/ext/phalcon/config/adapter/ini.zep.c +++ b/ext/phalcon/config/adapter/ini.zep.c @@ -542,7 +542,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Ini, parseIniString) ZEPHIR_INIT_VAR(&_3); zephir_substr(&_3, &path, zephir_get_intval(&_2), 0, ZEPHIR_SUBSTR_NO_LENGTH); zephir_get_strval(&path, &_3); - ZEPHIR_CALL_METHOD(&result, this_ptr, "parseinistring", NULL, 211, &path, &castValue); + ZEPHIR_CALL_METHOD(&result, this_ptr, "parseinistring", NULL, 212, &path, &castValue); zephir_check_call_status(); zephir_create_array(return_value, 1, 0); zephir_array_update_zval(return_value, &key, &result, PH_COPY); @@ -592,7 +592,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Ini, phpParseIniFile) ZVAL_BOOL(&_0, (processSections ? 1 : 0)); ZVAL_LONG(&_1, scannerMode); - ZEPHIR_RETURN_CALL_FUNCTION("parse_ini_file", NULL, 212, &filename, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("parse_ini_file", NULL, 213, &filename, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/config/adapter/json.zep.c b/ext/phalcon/config/adapter/json.zep.c index 930f9c374c5..d54ca67a50e 100644 --- a/ext/phalcon/config/adapter/json.zep.c +++ b/ext/phalcon/config/adapter/json.zep.c @@ -98,7 +98,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Json, __construct) ZEPHIR_INIT_VAR(&_2); zephir_file_get_contents(&_2, &filePath); ZVAL_BOOL(&_3, 1); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "decode", NULL, 213, &_2, &_3); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "decode", NULL, 214, &_2, &_3); zephir_check_call_status(); ZEPHIR_CALL_PARENT(NULL, phalcon_config_adapter_json_ce, getThis(), "__construct", &_0, 0, &_1); zephir_check_call_status(); @@ -171,12 +171,12 @@ PHP_METHOD(Phalcon_Config_Adapter_Json, decode) ZVAL_LONG(&_2, options); ZEPHIR_INIT_VAR(&decoded); zephir_json_decode(&decoded, &data, zephir_get_intval(&_0) ); - ZEPHIR_CALL_FUNCTION(&_3, "json_last_error", NULL, 214); + ZEPHIR_CALL_FUNCTION(&_3, "json_last_error", NULL, 215); zephir_check_call_status(); if (UNEXPECTED(!ZEPHIR_IS_LONG_IDENTICAL(&_3, 0))) { ZEPHIR_INIT_VAR(&_4$$3); object_init_ex(&_4$$3, spl_ce_InvalidArgumentException); - ZEPHIR_CALL_FUNCTION(&_5$$3, "json_last_error_msg", NULL, 215); + ZEPHIR_CALL_FUNCTION(&_5$$3, "json_last_error_msg", NULL, 216); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_6$$3); ZEPHIR_CONCAT_SV(&_6$$3, "json_decode error: ", &_5$$3); diff --git a/ext/phalcon/config/adapter/yaml.zep.c b/ext/phalcon/config/adapter/yaml.zep.c index 3444f58511a..5a01f69c709 100644 --- a/ext/phalcon/config/adapter/yaml.zep.c +++ b/ext/phalcon/config/adapter/yaml.zep.c @@ -207,7 +207,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Yaml, phpYamlParseFile) ZEPHIR_MAKE_REF(ndocs); - ZEPHIR_RETURN_CALL_FUNCTION("yaml_parse_file", NULL, 216, filename, pos, ndocs, callbacks); + ZEPHIR_RETURN_CALL_FUNCTION("yaml_parse_file", NULL, 217, filename, pos, ndocs, callbacks); ZEPHIR_UNREF(ndocs); zephir_check_call_status(); RETURN_MM(); @@ -235,7 +235,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Yaml, phpExtensionLoaded) zephir_get_strval(&name, name_param); - ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 217, &name); + ZEPHIR_RETURN_CALL_FUNCTION("extension_loaded", NULL, 218, &name); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/config/configfactory.zep.c b/ext/phalcon/config/configfactory.zep.c index 0bd6813288d..3f6151b13d3 100644 --- a/ext/phalcon/config/configfactory.zep.c +++ b/ext/phalcon/config/configfactory.zep.c @@ -335,7 +335,7 @@ PHP_METHOD(Phalcon_Config_ConfigFactory, parseConfig) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_config_exception_ce, "Config must be array or Phalcon\\Config\\Config object", "phalcon/Config/ConfigFactory.zep", 177); return; } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkconfigarray", NULL, 218, config); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkconfigarray", NULL, 219, config); zephir_check_call_status(); RETVAL_ZVAL(config, 1, 0); RETURN_MM(); diff --git a/ext/phalcon/datamapper/pdo/connection.zep.c b/ext/phalcon/datamapper/pdo/connection.zep.c index c829b3a23b8..5d39b5e536a 100644 --- a/ext/phalcon/datamapper/pdo/connection.zep.c +++ b/ext/phalcon/datamapper/pdo/connection.zep.c @@ -180,7 +180,7 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_Connection, __construct) if (Z_TYPE_P(profiler) == IS_NULL) { ZEPHIR_INIT_NVAR(profiler); object_init_ex(profiler, phalcon_datamapper_pdo_profiler_profiler_ce); - ZEPHIR_CALL_METHOD(NULL, profiler, "__construct", NULL, 219); + ZEPHIR_CALL_METHOD(NULL, profiler, "__construct", NULL, 220); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(NULL, this_ptr, "setprofiler", NULL, 0, profiler); diff --git a/ext/phalcon/datamapper/pdo/connection/decorated.zep.c b/ext/phalcon/datamapper/pdo/connection/decorated.zep.c index af0c05e559e..15790ee1220 100644 --- a/ext/phalcon/datamapper/pdo/connection/decorated.zep.c +++ b/ext/phalcon/datamapper/pdo/connection/decorated.zep.c @@ -88,7 +88,7 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_Connection_Decorated, __construct) if (Z_TYPE_P(profiler) == IS_NULL) { ZEPHIR_INIT_NVAR(profiler); object_init_ex(profiler, phalcon_datamapper_pdo_profiler_profiler_ce); - ZEPHIR_CALL_METHOD(NULL, profiler, "__construct", NULL, 219); + ZEPHIR_CALL_METHOD(NULL, profiler, "__construct", NULL, 220); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(NULL, this_ptr, "setprofiler", NULL, 0, profiler); diff --git a/ext/phalcon/datamapper/pdo/connectionlocator.zep.c b/ext/phalcon/datamapper/pdo/connectionlocator.zep.c index b25a8baeab4..a5cd5b509fb 100644 --- a/ext/phalcon/datamapper/pdo/connectionlocator.zep.c +++ b/ext/phalcon/datamapper/pdo/connectionlocator.zep.c @@ -472,7 +472,7 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_ConnectionLocator, getConnection) ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, ""); if (ZEPHIR_IS_IDENTICAL(&_1, &requested)) { - ZEPHIR_CALL_FUNCTION(&requested, "array_rand", NULL, 220, &collection); + ZEPHIR_CALL_FUNCTION(&requested, "array_rand", NULL, 221, &collection); zephir_check_call_status(); } if (!(zephir_array_isset(&collection, &requested))) { diff --git a/ext/phalcon/datamapper/pdo/profiler/profiler.zep.c b/ext/phalcon/datamapper/pdo/profiler/profiler.zep.c index 7e866f7d140..0786e086bb5 100644 --- a/ext/phalcon/datamapper/pdo/profiler/profiler.zep.c +++ b/ext/phalcon/datamapper/pdo/profiler/profiler.zep.c @@ -195,9 +195,9 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_Profiler, finish) object_init_ex(&ex, phalcon_datamapper_pdo_exception_exception_ce); ZEPHIR_CALL_METHOD(NULL, &ex, "__construct", NULL, 31); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&finish, "hrtime", NULL, 221, &__$true); + ZEPHIR_CALL_FUNCTION(&finish, "hrtime", NULL, 222, &__$true); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1$$3, &ex, "gettraceasstring", NULL, 222); + ZEPHIR_CALL_METHOD(&_1$$3, &ex, "gettraceasstring", NULL, 223); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "backtrace"); @@ -220,7 +220,7 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_Profiler, finish) ZEPHIR_INIT_NVAR(&_5$$3); ZVAL_STRING(&_5$$3, ""); } else { - ZEPHIR_CALL_METHOD(&_5$$3, this_ptr, "encode", NULL, 223, &values); + ZEPHIR_CALL_METHOD(&_5$$3, this_ptr, "encode", NULL, 224, &values); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_9$$3); @@ -431,7 +431,7 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_Profiler, start) ZEPHIR_INIT_VAR(&_1$$3); zephir_create_array(&_1$$3, 2, 0); zephir_array_update_string(&_1$$3, SL("method"), &method, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_FUNCTION(&_2$$3, "hrtime", NULL, 221, &__$true); + ZEPHIR_CALL_FUNCTION(&_2$$3, "hrtime", NULL, 222, &__$true); zephir_check_call_status(); zephir_array_update_string(&_1$$3, SL("start"), &_2$$3, PH_COPY | PH_SEPARATE); zephir_update_property_zval(this_ptr, ZEND_STRL("context"), &_1$$3); @@ -486,12 +486,12 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_Profiler, encode) ZVAL_LONG(&_1, depth); ZEPHIR_INIT_VAR(&encoded); zephir_json_encode(&encoded, data, zephir_get_intval(&_0) ); - ZEPHIR_CALL_FUNCTION(&_2, "json_last_error", NULL, 214); + ZEPHIR_CALL_FUNCTION(&_2, "json_last_error", NULL, 215); zephir_check_call_status(); if (UNEXPECTED(!ZEPHIR_IS_LONG_IDENTICAL(&_2, 0))) { ZEPHIR_INIT_VAR(&_3$$3); object_init_ex(&_3$$3, spl_ce_InvalidArgumentException); - ZEPHIR_CALL_FUNCTION(&_4$$3, "json_last_error_msg", NULL, 215); + ZEPHIR_CALL_FUNCTION(&_4$$3, "json_last_error_msg", NULL, 216); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5$$3); ZEPHIR_CONCAT_SV(&_5$$3, "json_encode error: ", &_4$$3); diff --git a/ext/phalcon/datamapper/query/insert.zep.c b/ext/phalcon/datamapper/query/insert.zep.c index 2db8083eaf8..33428f5363a 100644 --- a/ext/phalcon/datamapper/query/insert.zep.c +++ b/ext/phalcon/datamapper/query/insert.zep.c @@ -333,7 +333,7 @@ PHP_METHOD(Phalcon_DataMapper_Query_Insert, getStatement) zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("store"), PH_NOISY_CC | PH_READONLY); zephir_array_fetch_string(&_2, &_1, SL("FROM"), PH_NOISY | PH_READONLY, "phalcon/DataMapper/Query/Insert.zep", 113); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "buildcolumns", NULL, 224); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "buildcolumns", NULL, 225); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_4, this_ptr, "buildreturning", NULL, 0); zephir_check_call_status(); diff --git a/ext/phalcon/datamapper/query/queryfactory.zep.c b/ext/phalcon/datamapper/query/queryfactory.zep.c index c2b6f3d8a70..6027aa0daa5 100644 --- a/ext/phalcon/datamapper/query/queryfactory.zep.c +++ b/ext/phalcon/datamapper/query/queryfactory.zep.c @@ -142,7 +142,7 @@ PHP_METHOD(Phalcon_DataMapper_Query_QueryFactory, newDelete) object_init_ex(return_value, phalcon_datamapper_query_delete_ce); ZEPHIR_CALL_METHOD(&_0, this_ptr, "newbind", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 225, connection, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 226, connection, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -178,7 +178,7 @@ PHP_METHOD(Phalcon_DataMapper_Query_QueryFactory, newInsert) object_init_ex(return_value, phalcon_datamapper_query_insert_ce); ZEPHIR_CALL_METHOD(&_0, this_ptr, "newbind", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 226, connection, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 227, connection, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -265,7 +265,7 @@ PHP_METHOD(Phalcon_DataMapper_Query_QueryFactory, newUpdate) object_init_ex(return_value, phalcon_datamapper_query_update_ce); ZEPHIR_CALL_METHOD(&_0, this_ptr, "newbind", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 227, connection, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 228, connection, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/datamapper/query/select.zep.c b/ext/phalcon/datamapper/query/select.zep.c index 03f88b9fbcf..b0d621b144d 100644 --- a/ext/phalcon/datamapper/query/select.zep.c +++ b/ext/phalcon/datamapper/query/select.zep.c @@ -934,7 +934,7 @@ PHP_METHOD(Phalcon_DataMapper_Query_Select, subSelect) object_init_ex(return_value, phalcon_datamapper_query_select_ce); zephir_read_property(&_0, this_ptr, ZEND_STRL("connection"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_1, this_ptr, ZEND_STRL("bind"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 228, &_0, &_1); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 229, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -1057,9 +1057,9 @@ PHP_METHOD(Phalcon_DataMapper_Query_Select, getCurrentStatement) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_2, this_ptr, "buildlimitearly", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "buildcolumns", NULL, 229); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "buildcolumns", NULL, 230); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "buildfrom", NULL, 230); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "buildfrom", NULL, 231); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_6); ZVAL_STRING(&_6, "WHERE"); diff --git a/ext/phalcon/datamapper/query/update.zep.c b/ext/phalcon/datamapper/query/update.zep.c index 401b9cc573e..9b721296d6e 100644 --- a/ext/phalcon/datamapper/query/update.zep.c +++ b/ext/phalcon/datamapper/query/update.zep.c @@ -293,7 +293,7 @@ PHP_METHOD(Phalcon_DataMapper_Query_Update, getStatement) zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("store"), PH_NOISY_CC | PH_READONLY); zephir_array_fetch_string(&_2, &_1, SL("FROM"), PH_NOISY | PH_READONLY, "phalcon/DataMapper/Query/Update.zep", 101); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "buildcolumns", NULL, 231); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "buildcolumns", NULL, 232); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5); ZVAL_STRING(&_5, "WHERE"); diff --git a/ext/phalcon/db/adapter/pdo/mysql.zep.c b/ext/phalcon/db/adapter/pdo/mysql.zep.c index 7f4fbc52e5c..d316818728f 100644 --- a/ext/phalcon/db/adapter/pdo/mysql.zep.c +++ b/ext/phalcon/db/adapter/pdo/mysql.zep.c @@ -666,7 +666,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) zephir_array_fetch_long(&columnName, &field, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 495); ZEPHIR_INIT_NVAR(&_63$$3); object_init_ex(&_63$$3, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_63$$3, "__construct", &_64, 232, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_63$$3, "__construct", &_64, 233, &columnName, &definition); zephir_check_call_status(); zephir_array_append(&columns, &_63$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Mysql.zep", 496); ZEPHIR_CPY_WRT(&oldColumn, &columnName); @@ -968,7 +968,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) zephir_array_fetch_long(&columnName, &field, 0, PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 495); ZEPHIR_INIT_NVAR(&_124$$49); object_init_ex(&_124$$49, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_124$$49, "__construct", &_64, 232, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_124$$49, "__construct", &_64, 233, &columnName, &definition); zephir_check_call_status(); zephir_array_append(&columns, &_124$$49, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Mysql.zep", 496); ZEPHIR_CPY_WRT(&oldColumn, &columnName); diff --git a/ext/phalcon/db/adapter/pdo/postgresql.zep.c b/ext/phalcon/db/adapter/pdo/postgresql.zep.c index e552d9e246c..514615e0251 100644 --- a/ext/phalcon/db/adapter/pdo/postgresql.zep.c +++ b/ext/phalcon/db/adapter/pdo/postgresql.zep.c @@ -788,7 +788,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Postgresql, describeColumns) zephir_array_fetch_long(&columnName, &field, 0, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Postgresql.zep", 524); ZEPHIR_INIT_NVAR(&_61$$3); object_init_ex(&_61$$3, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_61$$3, "__construct", &_62, 232, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_61$$3, "__construct", &_62, 233, &columnName, &definition); zephir_check_call_status(); zephir_array_append(&columns, &_61$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Postgresql.zep", 525); ZEPHIR_CPY_WRT(&oldColumn, &columnName); @@ -1087,7 +1087,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Postgresql, describeColumns) zephir_array_fetch_long(&columnName, &field, 0, PH_NOISY, "phalcon/Db/Adapter/Pdo/Postgresql.zep", 524); ZEPHIR_INIT_NVAR(&_118$$41); object_init_ex(&_118$$41, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_118$$41, "__construct", &_62, 232, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_118$$41, "__construct", &_62, 233, &columnName, &definition); zephir_check_call_status(); zephir_array_append(&columns, &_118$$41, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Postgresql.zep", 525); ZEPHIR_CPY_WRT(&oldColumn, &columnName); diff --git a/ext/phalcon/db/adapter/pdo/sqlite.zep.c b/ext/phalcon/db/adapter/pdo/sqlite.zep.c index 31c5547f5fa..eec76a0d46f 100644 --- a/ext/phalcon/db/adapter/pdo/sqlite.zep.c +++ b/ext/phalcon/db/adapter/pdo/sqlite.zep.c @@ -452,7 +452,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) zephir_array_fetch_long(&columnName, &field, 1, PH_NOISY | PH_READONLY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 307); ZEPHIR_INIT_NVAR(&_31$$3); object_init_ex(&_31$$3, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_31$$3, "__construct", &_41, 232, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_31$$3, "__construct", &_41, 233, &columnName, &definition); zephir_check_call_status(); zephir_array_append(&columns, &_31$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 308); ZEPHIR_CPY_WRT(&oldColumn, &columnName); @@ -616,7 +616,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Sqlite, describeColumns) zephir_array_fetch_long(&columnName, &field, 1, PH_NOISY, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 307); ZEPHIR_INIT_NVAR(&_69$$28); object_init_ex(&_69$$28, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_69$$28, "__construct", &_41, 232, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_69$$28, "__construct", &_41, 233, &columnName, &definition); zephir_check_call_status(); zephir_array_append(&columns, &_69$$28, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 308); ZEPHIR_CPY_WRT(&oldColumn, &columnName); diff --git a/ext/phalcon/db/adapter/pdofactory.zep.c b/ext/phalcon/db/adapter/pdofactory.zep.c index 3dba5b3f10b..656c6e8dc33 100644 --- a/ext/phalcon/db/adapter/pdofactory.zep.c +++ b/ext/phalcon/db/adapter/pdofactory.zep.c @@ -139,7 +139,7 @@ PHP_METHOD(Phalcon_Db_Adapter_PdoFactory, load) array_init(&_2); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "options"); - ZEPHIR_CALL_METHOD(&options, &_1, "__invoke", NULL, 177, config, &_3, &_2); + ZEPHIR_CALL_METHOD(&options, &_1, "__invoke", NULL, 178, config, &_3, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "newinstance", NULL, 0, &name, &options); zephir_check_call_status(); diff --git a/ext/phalcon/db/dialect/mysql.zep.c b/ext/phalcon/db/dialect/mysql.zep.c index 2fa75f803c9..f89dbfae022 100644 --- a/ext/phalcon/db/dialect/mysql.zep.c +++ b/ext/phalcon/db/dialect/mysql.zep.c @@ -143,7 +143,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, addColumn) } _8$$5 = _7$$5; if (!(_8$$5)) { - ZEPHIR_CALL_FUNCTION(&_9$$5, "is_float", NULL, 233, &defaultValue); + ZEPHIR_CALL_FUNCTION(&_9$$5, "is_float", NULL, 234, &defaultValue); zephir_check_call_status(); _8$$5 = zephir_is_true(&_9$$5); } @@ -154,7 +154,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, addColumn) } else { ZEPHIR_INIT_VAR(&_11$$7); ZVAL_STRING(&_11$$7, "\""); - ZEPHIR_CALL_FUNCTION(&_12$$7, "addcslashes", NULL, 234, &defaultValue, &_11$$7); + ZEPHIR_CALL_FUNCTION(&_12$$7, "addcslashes", NULL, 235, &defaultValue, &_11$$7); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_13$$7); ZEPHIR_CONCAT_SVS(&_13$$7, " DEFAULT \"", &_12$$7, "\""); @@ -642,7 +642,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) } _11$$10 = _10$$10; if (!(_11$$10)) { - ZEPHIR_CALL_FUNCTION(&_12$$10, "is_float", &_13, 233, &defaultValue); + ZEPHIR_CALL_FUNCTION(&_12$$10, "is_float", &_13, 234, &defaultValue); zephir_check_call_status(); _11$$10 = zephir_is_true(&_12$$10); } @@ -653,7 +653,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) } else { ZEPHIR_INIT_NVAR(&_15$$12); ZVAL_STRING(&_15$$12, "\""); - ZEPHIR_CALL_FUNCTION(&_16$$12, "addcslashes", &_17, 234, &defaultValue, &_15$$12); + ZEPHIR_CALL_FUNCTION(&_16$$12, "addcslashes", &_17, 235, &defaultValue, &_15$$12); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_18$$12); ZEPHIR_CONCAT_SVS(&_18$$12, " DEFAULT \"", &_16$$12, "\""); @@ -722,7 +722,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) } _30$$19 = _29$$19; if (!(_30$$19)) { - ZEPHIR_CALL_FUNCTION(&_31$$19, "is_float", &_13, 233, &defaultValue); + ZEPHIR_CALL_FUNCTION(&_31$$19, "is_float", &_13, 234, &defaultValue); zephir_check_call_status(); _30$$19 = zephir_is_true(&_31$$19); } @@ -733,7 +733,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, createTable) } else { ZEPHIR_INIT_NVAR(&_33$$21); ZVAL_STRING(&_33$$21, "\""); - ZEPHIR_CALL_FUNCTION(&_34$$21, "addcslashes", &_17, 234, &defaultValue, &_33$$21); + ZEPHIR_CALL_FUNCTION(&_34$$21, "addcslashes", &_17, 235, &defaultValue, &_33$$21); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_35$$21); ZEPHIR_CONCAT_SVS(&_35$$21, " DEFAULT \"", &_34$$21, "\""); @@ -1635,7 +1635,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) } ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "getcolumnsize", NULL, 0, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "checkcolumnunsigned", NULL, 235, column); + ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "checkcolumnunsigned", NULL, 236, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2$$3); ZEPHIR_CONCAT_VV(&_2$$3, &_0$$3, &_1$$3); @@ -1697,7 +1697,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) } ZEPHIR_CALL_METHOD(&_7$$18, this_ptr, "getcolumnsizeandscale", NULL, 0, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_8$$18, this_ptr, "checkcolumnunsigned", NULL, 235, column); + ZEPHIR_CALL_METHOD(&_8$$18, this_ptr, "checkcolumnunsigned", NULL, 236, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_9$$18); ZEPHIR_CONCAT_VV(&_9$$18, &_7$$18, &_8$$18); @@ -1708,9 +1708,9 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) if (ZEPHIR_IS_EMPTY(&columnSql)) { zephir_concat_self_str(&columnSql, SL("DOUBLE")); } - ZEPHIR_CALL_METHOD(&_10$$20, this_ptr, "checkcolumnsizeandscale", NULL, 236, column); + ZEPHIR_CALL_METHOD(&_10$$20, this_ptr, "checkcolumnsizeandscale", NULL, 237, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_11$$20, this_ptr, "checkcolumnunsigned", NULL, 235, column); + ZEPHIR_CALL_METHOD(&_11$$20, this_ptr, "checkcolumnunsigned", NULL, 236, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_12$$20); ZEPHIR_CONCAT_VV(&_12$$20, &_10$$20, &_11$$20); @@ -1730,9 +1730,9 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) if (ZEPHIR_IS_EMPTY(&columnSql)) { zephir_concat_self_str(&columnSql, SL("FLOAT")); } - ZEPHIR_CALL_METHOD(&_14$$24, this_ptr, "checkcolumnsizeandscale", NULL, 236, column); + ZEPHIR_CALL_METHOD(&_14$$24, this_ptr, "checkcolumnsizeandscale", NULL, 237, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_15$$24, this_ptr, "checkcolumnunsigned", NULL, 235, column); + ZEPHIR_CALL_METHOD(&_15$$24, this_ptr, "checkcolumnunsigned", NULL, 236, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_16$$24); ZEPHIR_CONCAT_VV(&_16$$24, &_14$$24, &_15$$24); @@ -1745,7 +1745,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) } ZEPHIR_CALL_METHOD(&_17$$26, this_ptr, "getcolumnsize", NULL, 0, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_18$$26, this_ptr, "checkcolumnunsigned", NULL, 235, column); + ZEPHIR_CALL_METHOD(&_18$$26, this_ptr, "checkcolumnunsigned", NULL, 236, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_19$$26); ZEPHIR_CONCAT_VV(&_19$$26, &_17$$26, &_18$$26); @@ -1782,7 +1782,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) } ZEPHIR_CALL_METHOD(&_20$$36, this_ptr, "getcolumnsize", NULL, 0, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_21$$36, this_ptr, "checkcolumnunsigned", NULL, 235, column); + ZEPHIR_CALL_METHOD(&_21$$36, this_ptr, "checkcolumnunsigned", NULL, 236, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_22$$36); ZEPHIR_CONCAT_VV(&_22$$36, &_20$$36, &_21$$36); @@ -1801,7 +1801,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) } ZEPHIR_CALL_METHOD(&_23$$40, this_ptr, "getcolumnsize", NULL, 0, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_24$$40, this_ptr, "checkcolumnunsigned", NULL, 235, column); + ZEPHIR_CALL_METHOD(&_24$$40, this_ptr, "checkcolumnunsigned", NULL, 236, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_25$$40); ZEPHIR_CONCAT_VV(&_25$$40, &_23$$40, &_24$$40); @@ -1852,7 +1852,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) } ZEPHIR_CALL_METHOD(&_30$$52, this_ptr, "getcolumnsize", NULL, 0, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_31$$52, this_ptr, "checkcolumnunsigned", NULL, 235, column); + ZEPHIR_CALL_METHOD(&_31$$52, this_ptr, "checkcolumnunsigned", NULL, 236, column); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_32$$52); ZEPHIR_CONCAT_VV(&_32$$52, &_30$$52, &_31$$52); @@ -1901,7 +1901,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) ZVAL_COPY(&value$$61, _37$$61); ZEPHIR_INIT_NVAR(&_39$$62); ZVAL_STRING(&_39$$62, "\""); - ZEPHIR_CALL_FUNCTION(&_40$$62, "addcslashes", &_41, 234, &value$$61, &_39$$62); + ZEPHIR_CALL_FUNCTION(&_40$$62, "addcslashes", &_41, 235, &value$$61, &_39$$62); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_42$$62); ZEPHIR_CONCAT_SVS(&_42$$62, "\"", &_40$$62, "\", "); @@ -1920,7 +1920,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_43$$63); ZVAL_STRING(&_43$$63, "\""); - ZEPHIR_CALL_FUNCTION(&_44$$63, "addcslashes", &_41, 234, &value$$61, &_43$$63); + ZEPHIR_CALL_FUNCTION(&_44$$63, "addcslashes", &_41, 235, &value$$61, &_43$$63); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_45$$63); ZEPHIR_CONCAT_SVS(&_45$$63, "\"", &_44$$63, "\", "); @@ -1940,7 +1940,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, getColumnDefinition) } else { ZEPHIR_INIT_VAR(&_50$$64); ZVAL_STRING(&_50$$64, "\""); - ZEPHIR_CALL_FUNCTION(&_51$$64, "addcslashes", &_41, 234, &typeValues, &_50$$64); + ZEPHIR_CALL_FUNCTION(&_51$$64, "addcslashes", &_41, 235, &typeValues, &_50$$64); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_52$$64); ZEPHIR_CONCAT_SVS(&_52$$64, "(\"", &_51$$64, "\")"); @@ -2187,7 +2187,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, modifyColumn) } _13$$8 = _12$$8; if (!(_13$$8)) { - ZEPHIR_CALL_FUNCTION(&_14$$8, "is_float", NULL, 233, &defaultValue); + ZEPHIR_CALL_FUNCTION(&_14$$8, "is_float", NULL, 234, &defaultValue); zephir_check_call_status(); _13$$8 = zephir_is_true(&_14$$8); } @@ -2198,7 +2198,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Mysql, modifyColumn) } else { ZEPHIR_INIT_VAR(&_16$$10); ZVAL_STRING(&_16$$10, "\""); - ZEPHIR_CALL_FUNCTION(&_17$$10, "addcslashes", NULL, 234, &defaultValue, &_16$$10); + ZEPHIR_CALL_FUNCTION(&_17$$10, "addcslashes", NULL, 235, &defaultValue, &_16$$10); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_18$$10); ZEPHIR_CONCAT_SVS(&_18$$10, " DEFAULT \"", &_17$$10, "\""); diff --git a/ext/phalcon/db/dialect/postgresql.zep.c b/ext/phalcon/db/dialect/postgresql.zep.c index 2a03441e640..b6f67b4299f 100644 --- a/ext/phalcon/db/dialect/postgresql.zep.c +++ b/ext/phalcon/db/dialect/postgresql.zep.c @@ -1657,7 +1657,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Postgresql, getColumnDefinition) ZVAL_COPY(&value$$38, _8$$38); ZEPHIR_INIT_NVAR(&_10$$39); ZVAL_STRING(&_10$$39, "\'"); - ZEPHIR_CALL_FUNCTION(&_11$$39, "addcslashes", &_12, 234, &value$$38, &_10$$39); + ZEPHIR_CALL_FUNCTION(&_11$$39, "addcslashes", &_12, 235, &value$$38, &_10$$39); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_13$$39); ZEPHIR_CONCAT_SVS(&_13$$39, "'", &_11$$39, "', "); @@ -1676,7 +1676,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Postgresql, getColumnDefinition) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_14$$40); ZVAL_STRING(&_14$$40, "\'"); - ZEPHIR_CALL_FUNCTION(&_15$$40, "addcslashes", &_12, 234, &value$$38, &_14$$40); + ZEPHIR_CALL_FUNCTION(&_15$$40, "addcslashes", &_12, 235, &value$$38, &_14$$40); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_16$$40); ZEPHIR_CONCAT_SVS(&_16$$40, "'", &_15$$40, "', "); @@ -1696,7 +1696,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Postgresql, getColumnDefinition) } else { ZEPHIR_INIT_VAR(&_21$$41); ZVAL_STRING(&_21$$41, "\'"); - ZEPHIR_CALL_FUNCTION(&_22$$41, "addcslashes", &_12, 234, &typeValues, &_21$$41); + ZEPHIR_CALL_FUNCTION(&_22$$41, "addcslashes", &_12, 235, &typeValues, &_21$$41); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_23$$41); ZEPHIR_CONCAT_SVS(&_23$$41, "('", &_22$$41, "')"); @@ -2305,7 +2305,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Postgresql, castDefault) } else { ZEPHIR_INIT_VAR(&_7$$6); ZVAL_STRING(&_7$$6, "\'"); - ZEPHIR_CALL_FUNCTION(&_8$$6, "addcslashes", NULL, 234, &defaultValue, &_7$$6); + ZEPHIR_CALL_FUNCTION(&_8$$6, "addcslashes", NULL, 235, &defaultValue, &_7$$6); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_9$$6); ZEPHIR_CONCAT_SVS(&_9$$6, "'", &_8$$6, "'"); diff --git a/ext/phalcon/db/dialect/sqlite.zep.c b/ext/phalcon/db/dialect/sqlite.zep.c index 25507c5cc94..c0fdaa5290a 100644 --- a/ext/phalcon/db/dialect/sqlite.zep.c +++ b/ext/phalcon/db/dialect/sqlite.zep.c @@ -129,7 +129,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Sqlite, addColumn) } else { ZEPHIR_INIT_VAR(&_7$$5); ZVAL_STRING(&_7$$5, "\""); - ZEPHIR_CALL_FUNCTION(&_8$$5, "addcslashes", NULL, 234, &defaultValue, &_7$$5); + ZEPHIR_CALL_FUNCTION(&_8$$5, "addcslashes", NULL, 235, &defaultValue, &_7$$5); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_9$$5); ZEPHIR_CONCAT_SVS(&_9$$5, " DEFAULT \"", &_8$$5, "\""); @@ -533,7 +533,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Sqlite, createTable) } else { ZEPHIR_INIT_NVAR(&_13$$12); ZVAL_STRING(&_13$$12, "\""); - ZEPHIR_CALL_FUNCTION(&_14$$12, "addcslashes", &_15, 234, &defaultValue, &_13$$12); + ZEPHIR_CALL_FUNCTION(&_14$$12, "addcslashes", &_15, 235, &defaultValue, &_13$$12); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_16$$12); ZEPHIR_CONCAT_SVS(&_16$$12, " DEFAULT \"", &_14$$12, "\""); @@ -597,7 +597,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Sqlite, createTable) } else { ZEPHIR_INIT_NVAR(&_26$$20); ZVAL_STRING(&_26$$20, "\""); - ZEPHIR_CALL_FUNCTION(&_27$$20, "addcslashes", &_15, 234, &defaultValue, &_26$$20); + ZEPHIR_CALL_FUNCTION(&_27$$20, "addcslashes", &_15, 235, &defaultValue, &_26$$20); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_28$$20); ZEPHIR_CONCAT_SVS(&_28$$20, " DEFAULT \"", &_27$$20, "\""); @@ -1614,7 +1614,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Sqlite, getColumnDefinition) ZVAL_COPY(&value$$40, _8$$40); ZEPHIR_INIT_NVAR(&_10$$41); ZVAL_STRING(&_10$$41, "\""); - ZEPHIR_CALL_FUNCTION(&_11$$41, "addcslashes", &_12, 234, &value$$40, &_10$$41); + ZEPHIR_CALL_FUNCTION(&_11$$41, "addcslashes", &_12, 235, &value$$40, &_10$$41); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_13$$41); ZEPHIR_CONCAT_SVS(&_13$$41, "\"", &_11$$41, "\", "); @@ -1633,7 +1633,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Sqlite, getColumnDefinition) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_14$$42); ZVAL_STRING(&_14$$42, "\""); - ZEPHIR_CALL_FUNCTION(&_15$$42, "addcslashes", &_12, 234, &value$$40, &_14$$42); + ZEPHIR_CALL_FUNCTION(&_15$$42, "addcslashes", &_12, 235, &value$$40, &_14$$42); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_16$$42); ZEPHIR_CONCAT_SVS(&_16$$42, "\"", &_15$$42, "\", "); @@ -1653,7 +1653,7 @@ PHP_METHOD(Phalcon_Db_Dialect_Sqlite, getColumnDefinition) } else { ZEPHIR_INIT_VAR(&_21$$43); ZVAL_STRING(&_21$$43, "\""); - ZEPHIR_CALL_FUNCTION(&_22$$43, "addcslashes", &_12, 234, &typeValues, &_21$$43); + ZEPHIR_CALL_FUNCTION(&_22$$43, "addcslashes", &_12, 235, &typeValues, &_21$$43); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_23$$43); ZEPHIR_CONCAT_SVS(&_23$$43, "(\"", &_22$$43, "\")"); diff --git a/ext/phalcon/db/profiler.zep.c b/ext/phalcon/db/profiler.zep.c index 4c4200a6f72..86165f43bb7 100644 --- a/ext/phalcon/db/profiler.zep.c +++ b/ext/phalcon/db/profiler.zep.c @@ -223,19 +223,19 @@ PHP_METHOD(Phalcon_Db_Profiler, startProfile) zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlstatement", NULL, 237, &sqlStatement); + ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlstatement", NULL, 238, &sqlStatement); zephir_check_call_status(); if (Z_TYPE_P(sqlVariables) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlvariables", NULL, 238, sqlVariables); + ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlvariables", NULL, 239, sqlVariables); zephir_check_call_status(); } if (Z_TYPE_P(sqlBindTypes) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlbindtypes", NULL, 239, sqlBindTypes); + ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlbindtypes", NULL, 240, sqlBindTypes); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_0, "hrtime", NULL, 221, &__$true); + ZEPHIR_CALL_FUNCTION(&_0, "hrtime", NULL, 222, &__$true); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setinitialtime", NULL, 240, &_0); + ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setinitialtime", NULL, 241, &_0); zephir_check_call_status(); if ((zephir_method_exists_ex(this_ptr, ZEND_STRL("beforestartprofile")) == SUCCESS)) { ZEPHIR_CALL_METHOD(NULL, this_ptr, "beforestartprofile", NULL, 0, &activeProfile); @@ -266,7 +266,7 @@ PHP_METHOD(Phalcon_Db_Profiler, stopProfile) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_FUNCTION(&finalTime, "hrtime", NULL, 221, &__$true); + ZEPHIR_CALL_FUNCTION(&finalTime, "hrtime", NULL, 222, &__$true); zephir_check_call_status(); zephir_read_property(&_0, this_ptr, ZEND_STRL("activeProfile"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&activeProfile, &_0); diff --git a/ext/phalcon/di/factorydefault.zep.c b/ext/phalcon/di/factorydefault.zep.c index 86942877a86..0dc0cf5d253 100644 --- a/ext/phalcon/di/factorydefault.zep.c +++ b/ext/phalcon/di/factorydefault.zep.c @@ -159,7 +159,7 @@ PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) zephir_array_update_string(&_1, SL("flashSession"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); object_init_ex(&_2, phalcon_di_service_ce); - ZEPHIR_CALL_METHOD(&_8, &filter, "newinstance", NULL, 120); + ZEPHIR_CALL_METHOD(&_8, &filter, "newinstance", NULL, 121); zephir_check_call_status(); ZVAL_BOOL(&_4, 1); ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_8, &_4); diff --git a/ext/phalcon/di/factorydefault/cli.zep.c b/ext/phalcon/di/factorydefault/cli.zep.c index e144f26a2bf..3685a307fef 100644 --- a/ext/phalcon/di/factorydefault/cli.zep.c +++ b/ext/phalcon/di/factorydefault/cli.zep.c @@ -108,7 +108,7 @@ PHP_METHOD(Phalcon_Di_FactoryDefault_Cli, __construct) zephir_array_update_string(&_1, SL("eventsManager"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); object_init_ex(&_2, phalcon_di_service_ce); - ZEPHIR_CALL_METHOD(&_5, &filter, "newinstance", NULL, 120); + ZEPHIR_CALL_METHOD(&_5, &filter, "newinstance", NULL, 121); zephir_check_call_status(); ZVAL_BOOL(&_4, 1); ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 105, &_5, &_4); diff --git a/ext/phalcon/di/service.zep.c b/ext/phalcon/di/service.zep.c index fde283dd4ad..e54026fb0f8 100644 --- a/ext/phalcon/di/service.zep.c +++ b/ext/phalcon/di/service.zep.c @@ -298,7 +298,7 @@ PHP_METHOD(Phalcon_Di_Service, resolve) zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&instance, &builder, "build", NULL, 241, container, &definition, parameters); + ZEPHIR_CALL_METHOD(&instance, &builder, "build", NULL, 242, container, &definition, parameters); zephir_check_call_status(); } else { found = 0; diff --git a/ext/phalcon/di/service/builder.zep.c b/ext/phalcon/di/service/builder.zep.c index 5b9f97ec6a8..226a76f0022 100644 --- a/ext/phalcon/di/service/builder.zep.c +++ b/ext/phalcon/di/service/builder.zep.c @@ -152,7 +152,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build) } else { ZEPHIR_OBS_VAR(&arguments); if (zephir_array_isset_string_fetch(&arguments, &definition, SL("arguments"), 0)) { - ZEPHIR_CALL_METHOD(&_0$$8, this_ptr, "buildparameters", NULL, 242, container, &arguments); + ZEPHIR_CALL_METHOD(&_0$$8, this_ptr, "buildparameters", NULL, 243, container, &arguments); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&instance); ZEPHIR_LAST_CALL_STATUS = zephir_create_instance_params(&instance, &className, &_0$$8); @@ -228,7 +228,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build) } if (zephir_fast_count_int(&arguments)) { ZEPHIR_INIT_NVAR(&_13$$18); - ZEPHIR_CALL_METHOD(&_14$$18, this_ptr, "buildparameters", NULL, 242, container, &arguments); + ZEPHIR_CALL_METHOD(&_14$$18, this_ptr, "buildparameters", NULL, 243, container, &arguments); zephir_check_call_status(); ZEPHIR_CALL_USER_FUNC_ARRAY(&_13$$18, &methodCall, &_14$$18); zephir_check_call_status(); @@ -296,7 +296,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build) } if (zephir_fast_count_int(&arguments)) { ZEPHIR_INIT_NVAR(&_24$$24); - ZEPHIR_CALL_METHOD(&_25$$24, this_ptr, "buildparameters", NULL, 242, container, &arguments); + ZEPHIR_CALL_METHOD(&_25$$24, this_ptr, "buildparameters", NULL, 243, container, &arguments); zephir_check_call_status(); ZEPHIR_CALL_USER_FUNC_ARRAY(&_24$$24, &methodCall, &_25$$24); zephir_check_call_status(); @@ -370,7 +370,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_37$$28, this_ptr, "buildparameter", &_38, 243, container, &propertyPosition, &propertyValue); + ZEPHIR_CALL_METHOD(&_37$$28, this_ptr, "buildparameter", &_38, 244, container, &propertyPosition, &propertyValue); zephir_check_call_status(); zephir_update_property_zval_zval(&instance, &propertyName, &_37$$28); } ZEND_HASH_FOREACH_END(); @@ -422,7 +422,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_45$$32, this_ptr, "buildparameter", &_38, 243, container, &propertyPosition, &propertyValue); + ZEPHIR_CALL_METHOD(&_45$$32, this_ptr, "buildparameter", &_38, 244, container, &propertyPosition, &propertyValue); zephir_check_call_status(); zephir_update_property_zval_zval(&instance, &propertyName, &_45$$32); ZEPHIR_CALL_METHOD(NULL, ¶mCalls, "next", NULL, 0); @@ -636,7 +636,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, buildParameters) } ZEPHIR_INIT_NVAR(&argument); ZVAL_COPY(&argument, _0); - ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "buildparameter", &_5, 243, container, &position, &argument); + ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "buildparameter", &_5, 244, container, &position, &argument); zephir_check_call_status(); zephir_array_append(&buildArguments, &_4$$3, PH_SEPARATE, "phalcon/Di/Service/Builder.zep", 320); } ZEND_HASH_FOREACH_END(); @@ -653,7 +653,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, buildParameters) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&argument, &arguments, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "buildparameter", &_5, 243, container, &position, &argument); + ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "buildparameter", &_5, 244, container, &position, &argument); zephir_check_call_status(); zephir_array_append(&buildArguments, &_6$$4, PH_SEPARATE, "phalcon/Di/Service/Builder.zep", 320); ZEPHIR_CALL_METHOD(NULL, &arguments, "next", NULL, 0); diff --git a/ext/phalcon/encryption/crypt.zep.c b/ext/phalcon/encryption/crypt.zep.c index 5cdabc7dd93..9bf732d8ab5 100644 --- a/ext/phalcon/encryption/crypt.zep.c +++ b/ext/phalcon/encryption/crypt.zep.c @@ -194,7 +194,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, __construct) if (Z_TYPE_P(padFactory) == IS_NULL) { ZEPHIR_INIT_NVAR(padFactory); object_init_ex(padFactory, phalcon_encryption_crypt_padfactory_ce); - ZEPHIR_CALL_METHOD(NULL, padFactory, "__construct", NULL, 244); + ZEPHIR_CALL_METHOD(NULL, padFactory, "__construct", NULL, 245); zephir_check_call_status(); } zephir_update_property_zval(this_ptr, ZEND_STRL("padFactory"), padFactory); @@ -303,14 +303,14 @@ PHP_METHOD(Phalcon_Encryption_Crypt, decrypt) ZVAL_STRING(&_1, "cipher"); ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkcipherhashisavailable", NULL, 0, &cipher, &_1); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&mode, this_ptr, "getmode", NULL, 245); + ZEPHIR_CALL_METHOD(&mode, this_ptr, "getmode", NULL, 246); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&blockSize, this_ptr, "getblocksize", NULL, 246, &mode); + ZEPHIR_CALL_METHOD(&blockSize, this_ptr, "getblocksize", NULL, 247, &mode); zephir_check_call_status(); ZVAL_LONG(&_0, 0); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "8bit"); - ZEPHIR_CALL_FUNCTION(&iv, "mb_substr", NULL, 247, &input, &_0, &ivLength, &_1); + ZEPHIR_CALL_FUNCTION(&iv, "mb_substr", NULL, 248, &input, &_0, &ivLength, &_1); zephir_check_call_status(); ZEPHIR_INIT_VAR(&digest); ZVAL_STRING(&digest, ""); @@ -326,18 +326,18 @@ PHP_METHOD(Phalcon_Encryption_Crypt, decrypt) ZVAL_LONG(&hashLength, zephir_fast_strlen_ev(&_3$$5)); ZEPHIR_INIT_NVAR(&_2$$5); ZVAL_STRING(&_2$$5, "8bit"); - ZEPHIR_CALL_FUNCTION(&digest, "mb_substr", NULL, 247, &input, &ivLength, &hashLength, &_2$$5); + ZEPHIR_CALL_FUNCTION(&digest, "mb_substr", NULL, 248, &input, &ivLength, &hashLength, &_2$$5); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4$$5); zephir_add_function(&_4$$5, &ivLength, &hashLength); ZEPHIR_INIT_NVAR(&_2$$5); ZVAL_STRING(&_2$$5, "8bit"); - ZEPHIR_CALL_FUNCTION(&cipherText, "mb_substr", NULL, 247, &input, &_4$$5, &__$null, &_2$$5); + ZEPHIR_CALL_FUNCTION(&cipherText, "mb_substr", NULL, 248, &input, &_4$$5, &__$null, &_2$$5); zephir_check_call_status(); } else { ZEPHIR_INIT_VAR(&_5$$6); ZVAL_STRING(&_5$$6, "8bit"); - ZEPHIR_CALL_FUNCTION(&cipherText, "mb_substr", NULL, 247, &input, &ivLength, &__$null, &_5$$6); + ZEPHIR_CALL_FUNCTION(&cipherText, "mb_substr", NULL, 248, &input, &ivLength, &__$null, &_5$$6); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(&decrypted, this_ptr, "decryptgcmccmauth", NULL, 0, &mode, &cipherText, &decryptKey, &iv); @@ -348,7 +348,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, decrypt) ZEPHIR_CPY_WRT(&decrypted, &_6); zephir_read_property(&_7, this_ptr, ZEND_STRL("useSigning"), PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_7)) { - ZEPHIR_CALL_FUNCTION(&_8$$7, "hash_hmac", NULL, 248, &hashAlgorithm, &padded, &decryptKey, &__$true); + ZEPHIR_CALL_FUNCTION(&_8$$7, "hash_hmac", NULL, 249, &hashAlgorithm, &padded, &decryptKey, &__$true); zephir_check_call_status(); if (!ZEPHIR_IS_IDENTICAL(&digest, &_8$$7)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_crypt_exception_mismatch_ce, "Hash does not match.", "phalcon/Encryption/Crypt.zep", 224); @@ -428,7 +428,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, decryptBase64) ZEPHIR_CONCAT_VV(&_4$$3, &_2$$3, &_1$$3); zephir_get_strval(&input, &_4$$3); } - ZEPHIR_CALL_FUNCTION(&_5, "base64_decode", NULL, 249, &input); + ZEPHIR_CALL_FUNCTION(&_5, "base64_decode", NULL, 250, &input); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "decrypt", NULL, 0, &_5, &key); zephir_check_call_status(); @@ -511,9 +511,9 @@ PHP_METHOD(Phalcon_Encryption_Crypt, encrypt) ZVAL_STRING(&_1, "cipher"); ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkcipherhashisavailable", NULL, 0, &cipher, &_1); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&mode, this_ptr, "getmode", NULL, 245); + ZEPHIR_CALL_METHOD(&mode, this_ptr, "getmode", NULL, 246); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&blockSize, this_ptr, "getblocksize", NULL, 246, &mode); + ZEPHIR_CALL_METHOD(&blockSize, this_ptr, "getblocksize", NULL, 247, &mode); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&iv, this_ptr, "phpopensslrandompseudobytes", NULL, 0, &ivLength); zephir_check_call_status(); @@ -529,7 +529,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, encrypt) if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { ZEPHIR_CALL_METHOD(&_2$$6, this_ptr, "gethashalgorithm", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&digest, "hash_hmac", NULL, 248, &_2$$6, &padded, &encryptKey, &__$true); + ZEPHIR_CALL_FUNCTION(&digest, "hash_hmac", NULL, 249, &_2$$6, &padded, &encryptKey, &__$true); zephir_check_call_status(); ZEPHIR_CONCAT_VVV(return_value, &iv, &digest, &encrypted); RETURN_MM(); @@ -594,7 +594,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, encryptBase64) if (safe) { ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "encrypt", NULL, 0, &input, &key); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1$$3, "base64_encode", NULL, 250, &_0$$3); + ZEPHIR_CALL_FUNCTION(&_1$$3, "base64_encode", NULL, 251, &_0$$3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "+/"); @@ -609,7 +609,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, encryptBase64) } ZEPHIR_CALL_METHOD(&_5, this_ptr, "encrypt", NULL, 0, &input, &key); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 250, &_5); + ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 251, &_5); zephir_check_call_status(); RETURN_MM(); } @@ -693,11 +693,11 @@ PHP_METHOD(Phalcon_Encryption_Crypt, getAvailableHashAlgorithms) ZEPHIR_CALL_METHOD(&_0, this_ptr, "phpfunctionexists", NULL, 0, &_1); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { - ZEPHIR_RETURN_CALL_FUNCTION("hash_hmac_algos", NULL, 251); + ZEPHIR_RETURN_CALL_FUNCTION("hash_hmac_algos", NULL, 252); zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_RETURN_CALL_FUNCTION("hash_algos", NULL, 252); + ZEPHIR_RETURN_CALL_FUNCTION("hash_algos", NULL, 253); zephir_check_call_status(); RETURN_MM(); } @@ -783,7 +783,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, isValidDecryptLength) if (ZEPHIR_IS_FALSE_IDENTICAL(&length)) { RETURN_MM_BOOL(0); } - ZEPHIR_CALL_FUNCTION(&_1, "mb_strlen", NULL, 253, &input); + ZEPHIR_CALL_FUNCTION(&_1, "mb_strlen", NULL, 254, &input); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_LE(&length, &_1)); } @@ -914,7 +914,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, setCipher) ZVAL_STRING(&_0, "cipher"); ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkcipherhashisavailable", NULL, 0, &cipher, &_0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "getivlength", NULL, 254, &cipher); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "getivlength", NULL, 255, &cipher); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("ivLength"), &_1); zephir_update_property_zval(this_ptr, ZEND_STRL("cipher"), &cipher); @@ -1128,7 +1128,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, checkCipherHashIsAvailable) object_init_ex(&_1$$5, phalcon_encryption_crypt_exception_exception_ce); ZEPHIR_INIT_VAR(&_2$$5); ZVAL_STRING(&_2$$5, "The %s algorithm '%s' is not supported on this system."); - ZEPHIR_CALL_FUNCTION(&_3$$5, "sprintf", NULL, 144, &_2$$5, &type, &cipher); + ZEPHIR_CALL_FUNCTION(&_3$$5, "sprintf", NULL, 145, &_2$$5, &type, &cipher); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$5, "__construct", NULL, 31, &_3$$5); zephir_check_call_status(); @@ -1205,10 +1205,10 @@ PHP_METHOD(Phalcon_Encryption_Crypt, cryptPadText) ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "ecb"); zephir_array_fast_append(&_1, &_2); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkismode", NULL, 255, &_1, &mode); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkismode", NULL, 256, &_1, &mode); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { - ZEPHIR_CALL_FUNCTION(&_3$$3, "mb_strlen", NULL, 253, &input); + ZEPHIR_CALL_FUNCTION(&_3$$3, "mb_strlen", NULL, 254, &input); zephir_check_call_status(); paddingSize = (blockSize - zephir_safe_mod_zval_long(&_3$$3, blockSize)); _4$$3 = paddingSize >= 256; @@ -1316,7 +1316,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, cryptUnpadText) ZEPHIR_INIT_NVAR(&_4); ZVAL_STRING(&_4, "ecb"); zephir_array_fast_append(&_3, &_4); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkismode", NULL, 255, &_3, &mode); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkismode", NULL, 256, &_3, &mode); zephir_check_call_status(); _1 = ZEPHIR_IS_TRUE_IDENTICAL(&_2); } @@ -1401,7 +1401,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, decryptGetUnpadded) ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "ecb"); zephir_array_fast_append(&_1, &_2); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkismode", NULL, 255, &_1, &mode); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkismode", NULL, 256, &_1, &mode); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { zephir_read_property(&_3$$3, this_ptr, ZEND_STRL("padding"), PH_NOISY_CC | PH_READONLY); @@ -1478,7 +1478,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, decryptGcmCcmAuth) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "gcm"); zephir_array_fast_append(&_2, &_3); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "checkismode", NULL, 255, &_2, &mode); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "checkismode", NULL, 256, &_2, &mode); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_1)) { zephir_read_property(&_4$$3, this_ptr, ZEND_STRL("authData"), PH_NOISY_CC | PH_READONLY); @@ -1493,11 +1493,11 @@ PHP_METHOD(Phalcon_Encryption_Crypt, decryptGcmCcmAuth) ZEPHIR_INIT_VAR(&encrypted); zephir_fast_str_replace(&encrypted, &authTag, &_5$$3, &cipherText); ZVAL_LONG(&_4$$3, 1); - ZEPHIR_CALL_FUNCTION(&decrypted, "openssl_decrypt", NULL, 256, &encrypted, &cipher, &decryptKey, &_4$$3, &iv, &authTag, &authData); + ZEPHIR_CALL_FUNCTION(&decrypted, "openssl_decrypt", NULL, 257, &encrypted, &cipher, &decryptKey, &_4$$3, &iv, &authTag, &authData); zephir_check_call_status(); } else { ZVAL_LONG(&_6$$4, 1); - ZEPHIR_CALL_FUNCTION(&decrypted, "openssl_decrypt", NULL, 256, &cipherText, &cipher, &decryptKey, &_6$$4, &iv); + ZEPHIR_CALL_FUNCTION(&decrypted, "openssl_decrypt", NULL, 257, &cipherText, &cipher, &decryptKey, &_6$$4, &iv); zephir_check_call_status(); } if (ZEPHIR_IS_FALSE_IDENTICAL(&decrypted)) { @@ -1561,7 +1561,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, encryptGetPadded) ZEPHIR_INIT_NVAR(&_4); ZVAL_STRING(&_4, "ecb"); zephir_array_fast_append(&_3, &_4); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkismode", NULL, 255, &_3, &mode); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkismode", NULL, 256, &_3, &mode); zephir_check_call_status(); _1 = ZEPHIR_IS_TRUE_IDENTICAL(&_2); } @@ -1639,7 +1639,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, encryptGcmCcm) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "gcm"); zephir_array_fast_append(&_2, &_3); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "checkismode", NULL, 255, &_2, &mode); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "checkismode", NULL, 256, &_2, &mode); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_1)) { zephir_read_property(&_4$$3, this_ptr, ZEND_STRL("authData"), PH_NOISY_CC | PH_READONLY); @@ -1654,13 +1654,13 @@ PHP_METHOD(Phalcon_Encryption_Crypt, encryptGcmCcm) ZEPHIR_CPY_WRT(&authTagLength, &_4$$3); ZVAL_LONG(&_4$$3, 1); ZEPHIR_MAKE_REF(&authTag); - ZEPHIR_CALL_FUNCTION(&encrypted, "openssl_encrypt", NULL, 257, &padded, &cipher, &encryptKey, &_4$$3, &iv, &authTag, &authData, &authTagLength); + ZEPHIR_CALL_FUNCTION(&encrypted, "openssl_encrypt", NULL, 258, &padded, &cipher, &encryptKey, &_4$$3, &iv, &authTag, &authData, &authTagLength); ZEPHIR_UNREF(&authTag); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("authTag"), &authTag); } else { ZVAL_LONG(&_5$$5, 1); - ZEPHIR_CALL_FUNCTION(&encrypted, "openssl_encrypt", NULL, 257, &padded, &cipher, &encryptKey, &_5$$5, &iv); + ZEPHIR_CALL_FUNCTION(&encrypted, "openssl_encrypt", NULL, 258, &padded, &cipher, &encryptKey, &_5$$5, &iv); zephir_check_call_status(); } if (ZEPHIR_IS_FALSE_IDENTICAL(&encrypted)) { @@ -1705,7 +1705,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, initializeAvailableCiphers) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_crypt_exception_exception_ce, "This class requires the openssl extension for PHP", "phalcon/Encryption/Crypt.zep", 892); return; } - ZEPHIR_CALL_FUNCTION(&available, "openssl_get_cipher_methods", NULL, 258, &__$true); + ZEPHIR_CALL_FUNCTION(&available, "openssl_get_cipher_methods", NULL, 259, &__$true); zephir_check_call_status(); ZEPHIR_INIT_VAR(&allowed); array_init(&allowed); @@ -1846,9 +1846,9 @@ PHP_METHOD(Phalcon_Encryption_Crypt, getBlockSize) zephir_read_property(&_2, this_ptr, ZEND_STRL("cipher"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, ""); - ZEPHIR_CALL_FUNCTION(&_4, "str_ireplace", NULL, 259, &_1, &_3, &_2); + ZEPHIR_CALL_FUNCTION(&_4, "str_ireplace", NULL, 260, &_1, &_3, &_2); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getivlength", NULL, 254, &_4); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getivlength", NULL, 255, &_4); zephir_check_call_status(); RETURN_MM(); } @@ -1884,7 +1884,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, getIvLength) zephir_get_strval(&cipher, cipher_param); - ZEPHIR_CALL_FUNCTION(&length, "openssl_cipher_iv_length", NULL, 260, &cipher); + ZEPHIR_CALL_FUNCTION(&length, "openssl_cipher_iv_length", NULL, 261, &cipher); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&length)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_crypt_exception_exception_ce, "Cannot calculate the initialization vector (IV) length of the cipher", "phalcon/Encryption/Crypt.zep", 962); @@ -1919,7 +1919,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, getMode) zephir_read_property(&_0, this_ptr, ZEND_STRL("cipher"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "-"); - ZEPHIR_CALL_FUNCTION(&_2, "strrpos", NULL, 123, &_0, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "strrpos", NULL, 124, &_0, &_1); zephir_check_call_status(); ZEPHIR_INIT_VAR(&position); ZVAL_LONG(&position, zephir_get_intval(&_2)); @@ -1982,7 +1982,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, phpOpensslCipherIvLength) zephir_get_strval(&cipher, cipher_param); - ZEPHIR_RETURN_CALL_FUNCTION("openssl_cipher_iv_length", NULL, 260, &cipher); + ZEPHIR_RETURN_CALL_FUNCTION("openssl_cipher_iv_length", NULL, 261, &cipher); zephir_check_call_status(); RETURN_MM(); } @@ -2009,7 +2009,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, phpOpensslRandomPseudoBytes) ZVAL_LONG(&_0, length); - ZEPHIR_RETURN_CALL_FUNCTION("openssl_random_pseudo_bytes", NULL, 261, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("openssl_random_pseudo_bytes", NULL, 262, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/encryption/crypt/padding/ansi.zep.c b/ext/phalcon/encryption/crypt/padding/ansi.zep.c index edc4321f0e0..303a7d50798 100644 --- a/ext/phalcon/encryption/crypt/padding/ansi.zep.c +++ b/ext/phalcon/encryption/crypt/padding/ansi.zep.c @@ -71,13 +71,13 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Ansi, pad) ZVAL_LONG(&_0, 0); - ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 262, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 263, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, (paddingSize - 1)); ZEPHIR_CALL_FUNCTION(&_2, "str_repeat", NULL, 1, &_1, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, paddingSize); - ZEPHIR_CALL_FUNCTION(&_3, "chr", NULL, 262, &_0); + ZEPHIR_CALL_FUNCTION(&_3, "chr", NULL, 263, &_0); zephir_check_call_status(); ZEPHIR_CONCAT_VV(return_value, &_2, &_3); RETURN_MM(); @@ -133,7 +133,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Ansi, unpad) ZVAL_LONG(&_1, 1); ZEPHIR_INIT_VAR(&last); zephir_substr(&last, &input, zephir_get_intval(&_0), 1 , 0); - ZEPHIR_CALL_FUNCTION(&ord, "ord", NULL, 263, &last); + ZEPHIR_CALL_FUNCTION(&ord, "ord", NULL, 264, &last); zephir_check_call_status(); if (ZEPHIR_LE_LONG(&ord, blockSize)) { ZEPHIR_CPY_WRT(&paddingSize, &ord); @@ -141,7 +141,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Ansi, unpad) ZVAL_STRING(&repeat, ""); if (ZEPHIR_GT_LONG(&paddingSize, 1)) { ZVAL_LONG(&_2$$4, 0); - ZEPHIR_CALL_FUNCTION(&_3$$4, "chr", NULL, 262, &_2$$4); + ZEPHIR_CALL_FUNCTION(&_3$$4, "chr", NULL, 263, &_2$$4); zephir_check_call_status(); ZVAL_LONG(&_2$$4, (zephir_get_numberval(&paddingSize) - 1)); ZEPHIR_CALL_FUNCTION(&repeat, "str_repeat", NULL, 1, &_3$$4, &_2$$4); diff --git a/ext/phalcon/encryption/crypt/padding/iso10126.zep.c b/ext/phalcon/encryption/crypt/padding/iso10126.zep.c index 628a71c002a..1e6a0f9f40f 100644 --- a/ext/phalcon/encryption/crypt/padding/iso10126.zep.c +++ b/ext/phalcon/encryption/crypt/padding/iso10126.zep.c @@ -91,15 +91,15 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Iso10126, pad) } ZEPHIR_INIT_NVAR(&counter); ZVAL_LONG(&counter, _1); - ZEPHIR_CALL_FUNCTION(&_3$$3, "rand", &_4, 264); + ZEPHIR_CALL_FUNCTION(&_3$$3, "rand", &_4, 265); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_5$$3, "chr", &_6, 262, &_3$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "chr", &_6, 263, &_3$$3); zephir_check_call_status(); zephir_concat_self(&padding, &_5$$3); } } ZVAL_LONG(&_7, paddingSize); - ZEPHIR_CALL_FUNCTION(&_8, "chr", &_6, 262, &_7); + ZEPHIR_CALL_FUNCTION(&_8, "chr", &_6, 263, &_7); zephir_check_call_status(); zephir_concat_self(&padding, &_8); RETURN_CCTOR(&padding); @@ -145,7 +145,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Iso10126, unpad) ZVAL_LONG(&_1, 1); ZEPHIR_INIT_VAR(&last); zephir_substr(&last, &input, zephir_get_intval(&_0), 1 , 0); - ZEPHIR_RETURN_CALL_FUNCTION("ord", NULL, 263, &last); + ZEPHIR_RETURN_CALL_FUNCTION("ord", NULL, 264, &last); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/encryption/crypt/padding/isoiek.zep.c b/ext/phalcon/encryption/crypt/padding/isoiek.zep.c index 0437e063a9f..025ccb698e4 100644 --- a/ext/phalcon/encryption/crypt/padding/isoiek.zep.c +++ b/ext/phalcon/encryption/crypt/padding/isoiek.zep.c @@ -71,10 +71,10 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_IsoIek, pad) ZVAL_LONG(&_0, 0x80); - ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 262, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 263, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, 0); - ZEPHIR_CALL_FUNCTION(&_2, "chr", NULL, 262, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "chr", NULL, 263, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, (paddingSize - 1)); ZEPHIR_CALL_FUNCTION(&_3, "str_repeat", NULL, 1, &_2, &_0); @@ -123,7 +123,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_IsoIek, unpad) paddingSize = 0; - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 253, &input); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 254, &input); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&inputArray, "str_split", NULL, 115, &input); zephir_check_call_status(); @@ -133,7 +133,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_IsoIek, unpad) if (_0) { zephir_array_fetch_long(&_1, &inputArray, counter, PH_NOISY | PH_READONLY, "phalcon/Encryption/Crypt/Padding/IsoIek.zep", 48); ZVAL_LONG(&_2, 0); - ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 262, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 263, &_2); zephir_check_call_status(); _0 = ZEPHIR_IS_IDENTICAL(&_1, &_3); } @@ -149,7 +149,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_IsoIek, unpad) } zephir_array_fetch_long(&_6, &inputArray, counter, PH_NOISY | PH_READONLY, "phalcon/Encryption/Crypt/Padding/IsoIek.zep", 55); ZVAL_LONG(&_2, 0x80); - ZEPHIR_CALL_FUNCTION(&_7, "chr", &_4, 262, &_2); + ZEPHIR_CALL_FUNCTION(&_7, "chr", &_4, 263, &_2); zephir_check_call_status(); if (ZEPHIR_IS_EQUAL(&_6, &_7)) { paddingSize++; diff --git a/ext/phalcon/encryption/crypt/padding/pkcs7.zep.c b/ext/phalcon/encryption/crypt/padding/pkcs7.zep.c index e2f51a02c48..d48a5093478 100644 --- a/ext/phalcon/encryption/crypt/padding/pkcs7.zep.c +++ b/ext/phalcon/encryption/crypt/padding/pkcs7.zep.c @@ -68,7 +68,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Pkcs7, pad) ZVAL_LONG(&_0, paddingSize); - ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 262, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 263, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, paddingSize); ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", NULL, 1, &_1, &_0); @@ -116,17 +116,17 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Pkcs7, unpad) blockSize = zephir_get_intval(blockSize_param); - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 253, &input); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 254, &input); zephir_check_call_status(); ZVAL_LONG(&_0, (zephir_get_numberval(&length) - 1)); ZVAL_LONG(&_1, 1); ZEPHIR_INIT_VAR(&last); zephir_substr(&last, &input, zephir_get_intval(&_0), 1 , 0); - ZEPHIR_CALL_FUNCTION(&ord, "ord", NULL, 263, &last); + ZEPHIR_CALL_FUNCTION(&ord, "ord", NULL, 264, &last); zephir_check_call_status(); if (ZEPHIR_LE_LONG(&ord, blockSize)) { ZEPHIR_CPY_WRT(&paddingSize, &ord); - ZEPHIR_CALL_FUNCTION(&_2$$3, "chr", NULL, 262, &paddingSize); + ZEPHIR_CALL_FUNCTION(&_2$$3, "chr", NULL, 263, &paddingSize); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&padding, "str_repeat", NULL, 1, &_2$$3, &paddingSize); zephir_check_call_status(); diff --git a/ext/phalcon/encryption/crypt/padding/space.zep.c b/ext/phalcon/encryption/crypt/padding/space.zep.c index 2136228b6c2..4651c17a628 100644 --- a/ext/phalcon/encryption/crypt/padding/space.zep.c +++ b/ext/phalcon/encryption/crypt/padding/space.zep.c @@ -112,7 +112,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Space, unpad) blockSize = zephir_get_intval(blockSize_param); - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 253, &input); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 254, &input); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&inputArray, "str_split", NULL, 115, &input); zephir_check_call_status(); @@ -123,7 +123,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Space, unpad) if (_0) { zephir_array_fetch_long(&_1, &inputArray, counter, PH_NOISY | PH_READONLY, "phalcon/Encryption/Crypt/Padding/Space.zep", 48); ZVAL_LONG(&_2, 32); - ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 262, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 263, &_2); zephir_check_call_status(); _0 = ZEPHIR_IS_EQUAL(&_1, &_3); } diff --git a/ext/phalcon/encryption/crypt/padding/zero.zep.c b/ext/phalcon/encryption/crypt/padding/zero.zep.c index 513d2c2b6d7..8b32fe80b43 100644 --- a/ext/phalcon/encryption/crypt/padding/zero.zep.c +++ b/ext/phalcon/encryption/crypt/padding/zero.zep.c @@ -68,7 +68,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Zero, pad) ZVAL_LONG(&_0, 0); - ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 262, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 263, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, paddingSize); ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", NULL, 1, &_1, &_0); @@ -113,7 +113,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Zero, unpad) blockSize = zephir_get_intval(blockSize_param); - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 253, &input); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 254, &input); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&inputArray, "str_split", NULL, 115, &input); zephir_check_call_status(); @@ -124,7 +124,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Zero, unpad) if (_0) { zephir_array_fetch_long(&_1, &inputArray, counter, PH_NOISY | PH_READONLY, "phalcon/Encryption/Crypt/Padding/Zero.zep", 48); ZVAL_LONG(&_2, 0); - ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 262, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 263, &_2); zephir_check_call_status(); _0 = ZEPHIR_IS_EQUAL(&_1, &_3); } diff --git a/ext/phalcon/encryption/crypt/padfactory.zep.c b/ext/phalcon/encryption/crypt/padfactory.zep.c index 9def16667aa..3953ee1ae90 100644 --- a/ext/phalcon/encryption/crypt/padfactory.zep.c +++ b/ext/phalcon/encryption/crypt/padfactory.zep.c @@ -173,7 +173,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt_PadFactory, padNumberToService) ZVAL_LONG(&_1, number); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "noop"); - ZEPHIR_RETURN_CALL_METHOD(&_0, "__invoke", NULL, 177, &map, &_1, &_2); + ZEPHIR_RETURN_CALL_METHOD(&_0, "__invoke", NULL, 178, &map, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/encryption/security.zep.c b/ext/phalcon/encryption/security.zep.c index 92d2d089b1f..6e1b10317ac 100644 --- a/ext/phalcon/encryption/security.zep.c +++ b/ext/phalcon/encryption/security.zep.c @@ -238,7 +238,7 @@ PHP_METHOD(Phalcon_Encryption_Security, checkHash) if (_0) { RETURN_MM_BOOL(0); } - ZEPHIR_RETURN_CALL_FUNCTION("password_verify", NULL, 265, &password, &passwordHash); + ZEPHIR_RETURN_CALL_FUNCTION("password_verify", NULL, 266, &password, &passwordHash); zephir_check_call_status(); RETURN_MM(); } @@ -298,13 +298,13 @@ PHP_METHOD(Phalcon_Encryption_Security, checkToken) } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "processtokenkey", NULL, 266, &tokenKey); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "processtokenkey", NULL, 267, &tokenKey); zephir_check_call_status(); zephir_get_strval(&tokenKey, &_0); if (!(!(ZEPHIR_IS_EMPTY(&tokenKey)))) { RETURN_MM_BOOL(0); } - ZEPHIR_CALL_METHOD(&userToken, this_ptr, "processusertoken", NULL, 267, &tokenKey, tokenValue); + ZEPHIR_CALL_METHOD(&userToken, this_ptr, "processusertoken", NULL, 268, &tokenKey, tokenValue); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&knownToken, this_ptr, "getrequesttoken", NULL, 0); zephir_check_call_status(); @@ -382,14 +382,14 @@ PHP_METHOD(Phalcon_Encryption_Security, computeHmac) ZVAL_BOOL(&_0, (raw ? 1 : 0)); - ZEPHIR_CALL_FUNCTION(&hmac, "hash_hmac", NULL, 248, &algo, &data, &key, &_0); + ZEPHIR_CALL_FUNCTION(&hmac, "hash_hmac", NULL, 249, &algo, &data, &key, &_0); zephir_check_call_status(); if (UNEXPECTED(!zephir_is_true(&hmac))) { ZEPHIR_INIT_VAR(&_1$$3); object_init_ex(&_1$$3, phalcon_encryption_security_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "Unknown hashing algorithm: %s"); - ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 144, &_2$$3, &algo); + ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 145, &_2$$3, &algo); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 31, &_3$$3); zephir_check_call_status(); @@ -483,7 +483,7 @@ PHP_METHOD(Phalcon_Encryption_Security, getHashInformation) zephir_get_strval(&hash, hash_param); - ZEPHIR_RETURN_CALL_FUNCTION("password_get_info", NULL, 268, &hash); + ZEPHIR_RETURN_CALL_FUNCTION("password_get_info", NULL, 269, &hash); zephir_check_call_status(); RETURN_MM(); } @@ -789,11 +789,11 @@ PHP_METHOD(Phalcon_Encryption_Security, hash) } - ZEPHIR_CALL_METHOD(&cost, this_ptr, "processcost", NULL, 269, &options); + ZEPHIR_CALL_METHOD(&cost, this_ptr, "processcost", NULL, 270, &options); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "%02s"); - ZEPHIR_CALL_FUNCTION(&formatted, "sprintf", NULL, 144, &_0, &cost); + ZEPHIR_CALL_FUNCTION(&formatted, "sprintf", NULL, 145, &_0, &cost); zephir_check_call_status(); ZEPHIR_INIT_VAR(&prefix); ZVAL_STRING(&prefix, ""); @@ -823,14 +823,14 @@ PHP_METHOD(Phalcon_Encryption_Security, hash) if (ZEPHIR_IS_LONG(&_1, 5)) { ZEPHIR_INIT_VAR(&_2$$6); ZVAL_STRING(&_2$$6, "$2a$%s$"); - ZEPHIR_CALL_FUNCTION(&prefix, "sprintf", NULL, 144, &_2$$6, &formatted); + ZEPHIR_CALL_FUNCTION(&prefix, "sprintf", NULL, 145, &_2$$6, &formatted); zephir_check_call_status(); break; } if (ZEPHIR_IS_LONG(&_1, 6)) { ZEPHIR_INIT_VAR(&_3$$7); ZVAL_STRING(&_3$$7, "$2x$%s$"); - ZEPHIR_CALL_FUNCTION(&prefix, "sprintf", NULL, 144, &_3$$7, &formatted); + ZEPHIR_CALL_FUNCTION(&prefix, "sprintf", NULL, 145, &_3$$7, &formatted); zephir_check_call_status(); break; } @@ -844,7 +844,7 @@ PHP_METHOD(Phalcon_Encryption_Security, hash) zephir_check_call_status(); ZEPHIR_INIT_VAR(&salt); ZEPHIR_CONCAT_VVS(&salt, &prefix, &_4$$9, "$"); - ZEPHIR_RETURN_CALL_FUNCTION("crypt", NULL, 270, &password, &salt); + ZEPHIR_RETURN_CALL_FUNCTION("crypt", NULL, 271, &password, &salt); zephir_check_call_status(); RETURN_MM(); } @@ -852,11 +852,11 @@ PHP_METHOD(Phalcon_Encryption_Security, hash) zephir_create_array(&_6, 1, 0); zephir_array_update_string(&_6, SL("cost"), &cost, PH_COPY | PH_SEPARATE); ZEPHIR_CPY_WRT(&options, &_6); - ZEPHIR_CALL_METHOD(&algorithm, this_ptr, "processalgorithm", NULL, 271); + ZEPHIR_CALL_METHOD(&algorithm, this_ptr, "processalgorithm", NULL, 272); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&arguments, this_ptr, "processargonoptions", NULL, 272, &options); + ZEPHIR_CALL_METHOD(&arguments, this_ptr, "processargonoptions", NULL, 273, &options); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("password_hash", NULL, 273, &password, &algorithm, &arguments); + ZEPHIR_RETURN_CALL_FUNCTION("password_hash", NULL, 274, &password, &algorithm, &arguments); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/encryption/security/jwt/builder.zep.c b/ext/phalcon/encryption/security/jwt/builder.zep.c index ff0834469d9..1685a693978 100644 --- a/ext/phalcon/encryption/security/jwt/builder.zep.c +++ b/ext/phalcon/encryption/security/jwt/builder.zep.c @@ -502,27 +502,27 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, getToken) } ZEPHIR_CALL_METHOD(&_2, this_ptr, "getclaims", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "encode", NULL, 274, &_2); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "encode", NULL, 275, &_2); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&encodedClaims, this_ptr, "encodeurl", NULL, 275, &_1); + ZEPHIR_CALL_METHOD(&encodedClaims, this_ptr, "encodeurl", NULL, 276, &_1); zephir_check_call_status(); ZEPHIR_INIT_VAR(&claims); object_init_ex(&claims, phalcon_encryption_security_jwt_token_item_ce); ZEPHIR_CALL_METHOD(&_3, this_ptr, "getclaims", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &claims, "__construct", NULL, 276, &_3, &encodedClaims); + ZEPHIR_CALL_METHOD(NULL, &claims, "__construct", NULL, 277, &_3, &encodedClaims); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_5, this_ptr, "getheaders", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "encode", NULL, 274, &_5); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "encode", NULL, 275, &_5); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&encodedHeaders, this_ptr, "encodeurl", NULL, 275, &_4); + ZEPHIR_CALL_METHOD(&encodedHeaders, this_ptr, "encodeurl", NULL, 276, &_4); zephir_check_call_status(); ZEPHIR_INIT_VAR(&headers); object_init_ex(&headers, phalcon_encryption_security_jwt_token_item_ce); ZEPHIR_CALL_METHOD(&_6, this_ptr, "getheaders", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &headers, "__construct", NULL, 276, &_6, &encodedHeaders); + ZEPHIR_CALL_METHOD(NULL, &headers, "__construct", NULL, 277, &_6, &encodedHeaders); zephir_check_call_status(); zephir_read_property(&_7, this_ptr, ZEND_STRL("signer"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_8); @@ -530,14 +530,14 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, getToken) zephir_read_property(&_9, this_ptr, ZEND_STRL("passphrase"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(&signatureHash, &_7, "sign", NULL, 0, &_8, &_9); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&encodedSignature, this_ptr, "encodeurl", NULL, 275, &signatureHash); + ZEPHIR_CALL_METHOD(&encodedSignature, this_ptr, "encodeurl", NULL, 276, &signatureHash); zephir_check_call_status(); ZEPHIR_INIT_VAR(&signature); object_init_ex(&signature, phalcon_encryption_security_jwt_token_signature_ce); - ZEPHIR_CALL_METHOD(NULL, &signature, "__construct", NULL, 277, &signatureHash, &encodedSignature); + ZEPHIR_CALL_METHOD(NULL, &signature, "__construct", NULL, 278, &signatureHash, &encodedSignature); zephir_check_call_status(); object_init_ex(return_value, phalcon_encryption_security_jwt_token_token_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 278, &headers, &claims, &signature); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 279, &headers, &claims, &signature); zephir_check_call_status(); RETURN_MM(); } @@ -1096,7 +1096,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, encodeUrl) } - ZEPHIR_CALL_FUNCTION(&_0, "base64_encode", NULL, 250, &input); + ZEPHIR_CALL_FUNCTION(&_0, "base64_encode", NULL, 251, &input); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "+/"); @@ -1160,12 +1160,12 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, encode) ZVAL_LONG(&_1, depth); ZEPHIR_INIT_VAR(&encoded); zephir_json_encode(&encoded, data, zephir_get_intval(&_0) ); - ZEPHIR_CALL_FUNCTION(&_2, "json_last_error", NULL, 214); + ZEPHIR_CALL_FUNCTION(&_2, "json_last_error", NULL, 215); zephir_check_call_status(); if (UNEXPECTED(!ZEPHIR_IS_LONG_IDENTICAL(&_2, 0))) { ZEPHIR_INIT_VAR(&_3$$3); object_init_ex(&_3$$3, spl_ce_InvalidArgumentException); - ZEPHIR_CALL_FUNCTION(&_4$$3, "json_last_error_msg", NULL, 215); + ZEPHIR_CALL_FUNCTION(&_4$$3, "json_last_error_msg", NULL, 216); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5$$3); ZEPHIR_CONCAT_SV(&_5$$3, "json_encode error: ", &_4$$3); diff --git a/ext/phalcon/encryption/security/jwt/signer/hmac.zep.c b/ext/phalcon/encryption/security/jwt/signer/hmac.zep.c index c61e33c015d..5f8b9da305f 100644 --- a/ext/phalcon/encryption/security/jwt/signer/hmac.zep.c +++ b/ext/phalcon/encryption/security/jwt/signer/hmac.zep.c @@ -177,7 +177,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Signer_Hmac, sign) } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethash", NULL, 279, &payload, &passphrase); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethash", NULL, 280, &payload, &passphrase); zephir_check_call_status(); RETURN_MM(); } @@ -244,7 +244,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Signer_Hmac, verify) } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "gethash", NULL, 279, &payload, &passphrase); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "gethash", NULL, 280, &payload, &passphrase); zephir_check_call_status(); RETURN_MM_BOOL(zephir_hash_equals(&source, &_0)); } @@ -302,7 +302,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Signer_Hmac, getHash) ZEPHIR_CALL_METHOD(&_0, this_ptr, "getalgorithm", NULL, 0); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("hash_hmac", NULL, 248, &_0, &payload, &passphrase, &__$true); + ZEPHIR_RETURN_CALL_FUNCTION("hash_hmac", NULL, 249, &_0, &payload, &passphrase, &__$true); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/encryption/security/jwt/token/parser.zep.c b/ext/phalcon/encryption/security/jwt/token/parser.zep.c index f56d0b8da8a..9b9a08a8378 100644 --- a/ext/phalcon/encryption/security/jwt/token/parser.zep.c +++ b/ext/phalcon/encryption/security/jwt/token/parser.zep.c @@ -85,7 +85,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, parse) } - ZEPHIR_CALL_METHOD(&results, this_ptr, "parsetoken", NULL, 280, &token); + ZEPHIR_CALL_METHOD(&results, this_ptr, "parsetoken", NULL, 281, &token); zephir_check_call_status(); ZEPHIR_OBS_VAR(&encodedHeaders); zephir_array_fetch_long(&encodedHeaders, &results, 0, PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 33); @@ -93,14 +93,14 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, parse) zephir_array_fetch_long(&encodedClaims, &results, 1, PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 34); ZEPHIR_OBS_VAR(&encodedSignature); zephir_array_fetch_long(&encodedSignature, &results, 2, PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 35); - ZEPHIR_CALL_METHOD(&headers, this_ptr, "decodeheaders", NULL, 281, &encodedHeaders); + ZEPHIR_CALL_METHOD(&headers, this_ptr, "decodeheaders", NULL, 282, &encodedHeaders); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&claims, this_ptr, "decodeclaims", NULL, 282, &encodedClaims); + ZEPHIR_CALL_METHOD(&claims, this_ptr, "decodeclaims", NULL, 283, &encodedClaims); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&signature, this_ptr, "decodesignature", NULL, 283, &headers, &encodedSignature); + ZEPHIR_CALL_METHOD(&signature, this_ptr, "decodesignature", NULL, 284, &headers, &encodedSignature); zephir_check_call_status(); object_init_ex(return_value, phalcon_encryption_security_jwt_token_token_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 278, &headers, &claims, &signature); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 279, &headers, &claims, &signature); zephir_check_call_status(); RETURN_MM(); } @@ -142,10 +142,10 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeClaims) zephir_get_strval(&claims, claims_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "decodeurl", NULL, 284, &claims); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "decodeurl", NULL, 285, &claims); zephir_check_call_status(); ZVAL_BOOL(&_1, 1); - ZEPHIR_CALL_METHOD(&decoded, this_ptr, "decode", NULL, 285, &_0, &_1); + ZEPHIR_CALL_METHOD(&decoded, this_ptr, "decode", NULL, 286, &_0, &_1); zephir_check_call_status(); if (Z_TYPE_P(&decoded) != IS_ARRAY) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Invalid Claims (not an array)", "phalcon/Encryption/Security/JWT/Token/Parser.zep", 59); @@ -166,7 +166,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeClaims) zephir_array_update_string(&decoded, SL("aud"), &_4$$4, PH_COPY | PH_SEPARATE); } object_init_ex(return_value, phalcon_encryption_security_jwt_token_item_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 276, &decoded, &claims); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 277, &decoded, &claims); zephir_check_call_status(); RETURN_MM(); } @@ -203,10 +203,10 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeHeaders) zephir_get_strval(&headers, headers_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "decodeurl", NULL, 284, &headers); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "decodeurl", NULL, 285, &headers); zephir_check_call_status(); ZVAL_BOOL(&_1, 1); - ZEPHIR_CALL_METHOD(&decoded, this_ptr, "decode", NULL, 285, &_0, &_1); + ZEPHIR_CALL_METHOD(&decoded, this_ptr, "decode", NULL, 286, &_0, &_1); zephir_check_call_status(); if (Z_TYPE_P(&decoded) != IS_ARRAY) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Invalid Header (not an array)", "phalcon/Encryption/Security/JWT/Token/Parser.zep", 88); @@ -217,7 +217,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeHeaders) return; } object_init_ex(return_value, phalcon_encryption_security_jwt_token_item_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 276, &decoded, &headers); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 277, &decoded, &headers); zephir_check_call_status(); RETURN_MM(); } @@ -272,11 +272,11 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeSignature) ZVAL_STRING(&decoded, ""); ZEPHIR_INIT_NVAR(&signature); } else { - ZEPHIR_CALL_METHOD(&decoded, this_ptr, "decodeurl", NULL, 284, &signature); + ZEPHIR_CALL_METHOD(&decoded, this_ptr, "decodeurl", NULL, 285, &signature); zephir_check_call_status(); } object_init_ex(return_value, phalcon_encryption_security_jwt_token_signature_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 277, &decoded, &signature); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 278, &decoded, &signature); zephir_check_call_status(); RETURN_MM(); } @@ -393,12 +393,12 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decode) ZVAL_LONG(&_2, options); ZEPHIR_INIT_VAR(&decoded); zephir_json_decode(&decoded, &data, zephir_get_intval(&_0) ); - ZEPHIR_CALL_FUNCTION(&_3, "json_last_error", NULL, 214); + ZEPHIR_CALL_FUNCTION(&_3, "json_last_error", NULL, 215); zephir_check_call_status(); if (UNEXPECTED(!ZEPHIR_IS_LONG_IDENTICAL(&_3, 0))) { ZEPHIR_INIT_VAR(&_4$$3); object_init_ex(&_4$$3, spl_ce_InvalidArgumentException); - ZEPHIR_CALL_FUNCTION(&_5$$3, "json_last_error_msg", NULL, 215); + ZEPHIR_CALL_FUNCTION(&_5$$3, "json_last_error_msg", NULL, 216); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_6$$3); ZEPHIR_CONCAT_SV(&_6$$3, "json_decode error: ", &_5$$3); @@ -466,7 +466,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeUrl) ZVAL_STRING(&_4, "+/"); ZEPHIR_CALL_FUNCTION(&_5, "strtr", NULL, 5, &input, &_3, &_4); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&data, "base64_decode", NULL, 249, &_5); + ZEPHIR_CALL_FUNCTION(&data, "base64_decode", NULL, 250, &_5); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&data)) { ZEPHIR_INIT_NVAR(&data); diff --git a/ext/phalcon/encryption/security/jwt/validator.zep.c b/ext/phalcon/encryption/security/jwt/validator.zep.c index c3256fbc141..385444d5162 100644 --- a/ext/phalcon/encryption/security/jwt/validator.zep.c +++ b/ext/phalcon/encryption/security/jwt/validator.zep.c @@ -216,7 +216,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateExpiration) _4 = zephir_is_true(&_2); if (_4) { ZVAL_LONG(&_6, timestamp); - ZEPHIR_CALL_METHOD(&_5, this_ptr, "gettimestamp", NULL, 286, &_6); + ZEPHIR_CALL_METHOD(&_5, this_ptr, "gettimestamp", NULL, 287, &_6); zephir_check_call_status(); zephir_read_property(&_6, this_ptr, ZEND_STRL("token"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(&_7, &_6, "getclaims", NULL, 0); @@ -322,7 +322,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateIssuedAt) ZVAL_LONG(&_1, timestamp); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "gettimestamp", NULL, 286, &_1); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "gettimestamp", NULL, 287, &_1); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("token"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(&_2, &_1, "getclaims", NULL, 0); @@ -426,7 +426,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Validator, validateNotBefore) ZVAL_LONG(&_1, timestamp); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "gettimestamp", NULL, 286, &_1); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "gettimestamp", NULL, 287, &_1); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("token"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(&_2, &_1, "getclaims", NULL, 0); diff --git a/ext/phalcon/encryption/security/random.zep.c b/ext/phalcon/encryption/security/random.zep.c index ffe67089177..cfbf963f461 100644 --- a/ext/phalcon/encryption/security/random.zep.c +++ b/ext/phalcon/encryption/security/random.zep.c @@ -259,7 +259,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Random, base64) ZVAL_LONG(&_1, len); ZEPHIR_CALL_METHOD(&_0, this_ptr, "bytes", NULL, 0, &_1); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 250, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 251, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -327,7 +327,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Random, base64Safe) ZVAL_LONG(&_1, len); ZEPHIR_CALL_METHOD(&_0, this_ptr, "base64", NULL, 0, &_1); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_2, "base64_encode", NULL, 250, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "base64_encode", NULL, 251, &_0); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "+/"); @@ -400,7 +400,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Random, bytes) len = 16; } ZVAL_LONG(&_0, len); - ZEPHIR_RETURN_CALL_FUNCTION("random_bytes", NULL, 287, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("random_bytes", NULL, 288, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -453,7 +453,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Random, hex) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "H*"); - ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 288, &_2, &_0); + ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 289, &_2, &_0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&_3); ZEPHIR_RETURN_CALL_FUNCTION("array_shift", NULL, 23, &_3); @@ -503,7 +503,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Random, number) } ZVAL_LONG(&_0, 0); ZVAL_LONG(&_1, len); - ZEPHIR_RETURN_CALL_FUNCTION("random_int", NULL, 289, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("random_int", NULL, 290, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -555,7 +555,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Random, uuid) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "N1a/n1b/n1c/n1d/n1e/N1f"); - ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 288, &_2, &_0); + ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 289, &_2, &_0); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&ary, "array_values", NULL, 14, &_3); zephir_check_call_status(); @@ -570,7 +570,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Random, uuid) ZEPHIR_INIT_VAR(&_7); ZVAL_STRING(&_7, "%08x-%04x-%04x-%04x-%04x%08x"); ZEPHIR_MAKE_REF(&ary); - ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 290, &ary, &_7); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 291, &ary, &_7); ZEPHIR_UNREF(&ary); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_7); @@ -636,7 +636,7 @@ PHP_METHOD(Phalcon_Encryption_Security_Random, base) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "C*"); - ZEPHIR_CALL_FUNCTION(&bytes, "unpack", NULL, 288, &_1, &_0); + ZEPHIR_CALL_FUNCTION(&bytes, "unpack", NULL, 289, &_1, &_0); zephir_check_call_status(); zephir_is_iterable(&bytes, 0, "phalcon/Encryption/Security/Random.zep", 351); if (Z_TYPE_P(&bytes) == IS_ARRAY) { diff --git a/ext/phalcon/events/manager.zep.c b/ext/phalcon/events/manager.zep.c index 31964801d3a..254915e12cc 100644 --- a/ext/phalcon/events/manager.zep.c +++ b/ext/phalcon/events/manager.zep.c @@ -139,7 +139,7 @@ PHP_METHOD(Phalcon_Events_Manager, attach) } ZVAL_LONG(&_2$$4, 1); - ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "setextractflags", NULL, 291, &_2$$4); + ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "setextractflags", NULL, 292, &_2$$4); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("events"), &eventType, &priorityQueue); } @@ -148,7 +148,7 @@ PHP_METHOD(Phalcon_Events_Manager, attach) priority = 100; } ZVAL_LONG(&_4, priority); - ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "insert", NULL, 292, handler, &_4); + ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "insert", NULL, 293, handler, &_4); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -261,7 +261,7 @@ PHP_METHOD(Phalcon_Events_Manager, detach) } ZVAL_LONG(&_2$$4, 1); - ZEPHIR_CALL_METHOD(NULL, &newPriorityQueue, "setextractflags", NULL, 291, &_2$$4); + ZEPHIR_CALL_METHOD(NULL, &newPriorityQueue, "setextractflags", NULL, 292, &_2$$4); zephir_check_call_status(); ZVAL_LONG(&_2$$4, 3); ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "setextractflags", NULL, 0, &_2$$4); @@ -282,7 +282,7 @@ PHP_METHOD(Phalcon_Events_Manager, detach) if (!ZEPHIR_IS_IDENTICAL(&_6$$5, handler)) { zephir_array_fetch_string(&_7$$6, &data, SL("data"), PH_NOISY | PH_READONLY, "phalcon/Events/Manager.zep", 136); zephir_array_fetch_string(&_8$$6, &data, SL("priority"), PH_NOISY | PH_READONLY, "phalcon/Events/Manager.zep", 138); - ZEPHIR_CALL_METHOD(NULL, &newPriorityQueue, "insert", &_9, 292, &_7$$6, &_8$$6); + ZEPHIR_CALL_METHOD(NULL, &newPriorityQueue, "insert", &_9, 293, &_7$$6, &_8$$6); zephir_check_call_status(); } } @@ -490,19 +490,19 @@ PHP_METHOD(Phalcon_Events_Manager, fire) } else { ZVAL_BOOL(&_4, 0); } - ZEPHIR_CALL_METHOD(NULL, &event, "__construct", NULL, 293, &eventName, source, data, &_4); + ZEPHIR_CALL_METHOD(NULL, &event, "__construct", NULL, 294, &eventName, source, data, &_4); zephir_check_call_status(); ZEPHIR_OBS_VAR(&fireEvents); if (zephir_array_isset_fetch(&fireEvents, &events, &type, 0)) { if (Z_TYPE_P(&fireEvents) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", NULL, 294, &fireEvents, &event); + ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", NULL, 295, &fireEvents, &event); zephir_check_call_status(); } } ZEPHIR_OBS_NVAR(&fireEvents); if (zephir_array_isset_fetch(&fireEvents, &events, &eventType, 0)) { if (Z_TYPE_P(&fireEvents) == IS_OBJECT) { - ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", NULL, 294, &fireEvents, &event); + ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", NULL, 295, &fireEvents, &event); zephir_check_call_status(); } } diff --git a/ext/phalcon/filter/filter.zep.c b/ext/phalcon/filter/filter.zep.c index 21bf2e0ae47..70ad49b04f2 100644 --- a/ext/phalcon/filter/filter.zep.c +++ b/ext/phalcon/filter/filter.zep.c @@ -262,7 +262,7 @@ PHP_METHOD(Phalcon_Filter_Filter, get) zephir_read_property(&_4$$4, this_ptr, ZEND_STRL("mapper"), PH_NOISY_CC | PH_READONLY); ZEPHIR_OBS_VAR(&definition); zephir_array_fetch(&definition, &_4$$4, &name, PH_NOISY, "phalcon/Filter/Filter.zep", 123); - ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "createinstance", NULL, 295, &definition); + ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "createinstance", NULL, 296, &definition); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("services"), &name, &_5$$4); } @@ -351,7 +351,7 @@ PHP_METHOD(Phalcon_Filter_Filter, sanitize) } else { ZVAL_BOOL(&_0$$3, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processarraysanitizers", NULL, 296, sanitizers, value, &_0$$3); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processarraysanitizers", NULL, 297, sanitizers, value, &_0$$3); zephir_check_call_status(); RETURN_MM(); } @@ -360,11 +360,11 @@ PHP_METHOD(Phalcon_Filter_Filter, sanitize) _1 = !noRecursive; } if (_1) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processarrayvalues", NULL, 297, value, sanitizers); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processarrayvalues", NULL, 298, value, sanitizers); zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "sanitizer", NULL, 298, value, sanitizers); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "sanitizer", NULL, 299, value, sanitizers); zephir_check_call_status(); RETURN_MM(); } @@ -578,7 +578,7 @@ PHP_METHOD(Phalcon_Filter_Filter, processArraySanitizers) } ZEPHIR_INIT_NVAR(&sanitizer); ZVAL_COPY(&sanitizer, _0); - ZEPHIR_CALL_METHOD(&split, this_ptr, "splitsanitizerparameters", &_4, 299, &sanitizerKey, &sanitizer); + ZEPHIR_CALL_METHOD(&split, this_ptr, "splitsanitizerparameters", &_4, 300, &sanitizerKey, &sanitizer); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&sanitizerName); zephir_array_fetch_long(&sanitizerName, &split, 0, PH_NOISY, "phalcon/Filter/Filter.zep", 279); @@ -589,10 +589,10 @@ PHP_METHOD(Phalcon_Filter_Filter, processArraySanitizers) } else { ZVAL_BOOL(&_6$$4, 0); } - ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "processvalueisarray", &_7, 300, value, &sanitizerName, &sanitizerParams, &_6$$4); + ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "processvalueisarray", &_7, 301, value, &sanitizerName, &sanitizerParams, &_6$$4); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_5$$4); - ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "processvalueisnotarray", &_8, 301, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "processvalueisnotarray", &_8, 302, value, &sanitizerName, &sanitizerParams); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_5$$4); } ZEND_HASH_FOREACH_END(); @@ -609,7 +609,7 @@ PHP_METHOD(Phalcon_Filter_Filter, processArraySanitizers) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&sanitizer, &sanitizers, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&split, this_ptr, "splitsanitizerparameters", &_4, 299, &sanitizerKey, &sanitizer); + ZEPHIR_CALL_METHOD(&split, this_ptr, "splitsanitizerparameters", &_4, 300, &sanitizerKey, &sanitizer); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&sanitizerName); zephir_array_fetch_long(&sanitizerName, &split, 0, PH_NOISY, "phalcon/Filter/Filter.zep", 279); @@ -620,10 +620,10 @@ PHP_METHOD(Phalcon_Filter_Filter, processArraySanitizers) } else { ZVAL_BOOL(&_10$$5, 0); } - ZEPHIR_CALL_METHOD(&_9$$5, this_ptr, "processvalueisarray", &_7, 300, value, &sanitizerName, &sanitizerParams, &_10$$5); + ZEPHIR_CALL_METHOD(&_9$$5, this_ptr, "processvalueisarray", &_7, 301, value, &sanitizerName, &sanitizerParams, &_10$$5); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_9$$5); - ZEPHIR_CALL_METHOD(&_9$$5, this_ptr, "processvalueisnotarray", &_8, 301, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_9$$5, this_ptr, "processvalueisnotarray", &_8, 302, value, &sanitizerName, &sanitizerParams); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_9$$5); ZEPHIR_CALL_METHOD(NULL, &sanitizers, "next", NULL, 0); @@ -704,7 +704,7 @@ PHP_METHOD(Phalcon_Filter_Filter, processArrayValues) } ZEPHIR_INIT_NVAR(&itemValue); ZVAL_COPY(&itemValue, _0); - ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "sanitizer", &_5, 298, &itemValue, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "sanitizer", &_5, 299, &itemValue, &sanitizerName, &sanitizerParams); zephir_check_call_status(); zephir_array_update_zval(&arrayValues, &itemKey, &_4$$3, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -721,7 +721,7 @@ PHP_METHOD(Phalcon_Filter_Filter, processArrayValues) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&itemValue, &values, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "sanitizer", &_5, 298, &itemValue, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "sanitizer", &_5, 299, &itemValue, &sanitizerName, &sanitizerParams); zephir_check_call_status(); zephir_array_update_zval(&arrayValues, &itemKey, &_6$$4, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &values, "next", NULL, 0); @@ -855,7 +855,7 @@ PHP_METHOD(Phalcon_Filter_Filter, processValueIsArray) _0 = !noRecursive; } if (_0) { - ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "processarrayvalues", NULL, 297, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "processarrayvalues", NULL, 298, value, &sanitizerName, &sanitizerParams); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_1$$3); } @@ -902,7 +902,7 @@ PHP_METHOD(Phalcon_Filter_Filter, processValueIsNotArray) if (Z_TYPE_P(value) != IS_ARRAY) { - ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "sanitizer", NULL, 298, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "sanitizer", NULL, 299, value, &sanitizerName, &sanitizerParams); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_0$$3); } diff --git a/ext/phalcon/filter/filterfactory.zep.c b/ext/phalcon/filter/filterfactory.zep.c index 7db2e7873ee..0d85b2082d9 100644 --- a/ext/phalcon/filter/filterfactory.zep.c +++ b/ext/phalcon/filter/filterfactory.zep.c @@ -59,7 +59,7 @@ PHP_METHOD(Phalcon_Filter_FilterFactory, newInstance) object_init_ex(return_value, phalcon_filter_filter_ce); ZEPHIR_CALL_METHOD(&_0, this_ptr, "getservices", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 302, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 303, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/absint.zep.c b/ext/phalcon/filter/sanitize/absint.zep.c index a5331d6d3c6..b53d8bf325c 100644 --- a/ext/phalcon/filter/sanitize/absint.zep.c +++ b/ext/phalcon/filter/sanitize/absint.zep.c @@ -66,10 +66,10 @@ PHP_METHOD(Phalcon_Filter_Sanitize_AbsInt, __invoke) ZVAL_LONG(&_0, 519); - ZEPHIR_CALL_FUNCTION(&_1, "filter_var", NULL, 303, input, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "filter_var", NULL, 304, input, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, zephir_get_intval(&_1)); - ZEPHIR_RETURN_CALL_FUNCTION("abs", NULL, 304, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("abs", NULL, 305, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/email.zep.c b/ext/phalcon/filter/sanitize/email.zep.c index e7dd91166e9..01c0d81d11f 100644 --- a/ext/phalcon/filter/sanitize/email.zep.c +++ b/ext/phalcon/filter/sanitize/email.zep.c @@ -66,7 +66,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_Email, __invoke) ZVAL_LONG(&_0, 517); ZVAL_LONG(&_1, 1048576); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 303, input, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 304, input, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/floatval.zep.c b/ext/phalcon/filter/sanitize/floatval.zep.c index 42c872860f0..bcde7d4da4b 100644 --- a/ext/phalcon/filter/sanitize/floatval.zep.c +++ b/ext/phalcon/filter/sanitize/floatval.zep.c @@ -72,7 +72,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_FloatVal, __invoke) zephir_create_array(&_0, 1, 0); add_assoc_long_ex(&_0, SL("flags"), 4096); ZVAL_LONG(&_1, 520); - ZEPHIR_CALL_FUNCTION(&_2, "filter_var", NULL, 303, input, &_1, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "filter_var", NULL, 304, input, &_1, &_0); zephir_check_call_status(); RETURN_MM_DOUBLE(zephir_get_doubleval(&_2)); } diff --git a/ext/phalcon/filter/sanitize/intval.zep.c b/ext/phalcon/filter/sanitize/intval.zep.c index 81dc9cfcc73..2482bcc0fa9 100644 --- a/ext/phalcon/filter/sanitize/intval.zep.c +++ b/ext/phalcon/filter/sanitize/intval.zep.c @@ -66,7 +66,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_IntVal, __invoke) ZVAL_LONG(&_0, 519); - ZEPHIR_CALL_FUNCTION(&_1, "filter_var", NULL, 303, input, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "filter_var", NULL, 304, input, &_0); zephir_check_call_status(); RETURN_MM_LONG(zephir_get_intval(&_1)); } diff --git a/ext/phalcon/filter/sanitize/lower.zep.c b/ext/phalcon/filter/sanitize/lower.zep.c index cd765518d04..0e2e316e4c7 100644 --- a/ext/phalcon/filter/sanitize/lower.zep.c +++ b/ext/phalcon/filter/sanitize/lower.zep.c @@ -87,7 +87,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_Lower, __invoke) zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 305, &input); + ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 306, &input); zephir_check_call_status(); zephir_fast_strtolower(return_value, &_2); RETURN_MM(); diff --git a/ext/phalcon/filter/sanitize/special.zep.c b/ext/phalcon/filter/sanitize/special.zep.c index 5f3d0ab7073..523a1a3ef64 100644 --- a/ext/phalcon/filter/sanitize/special.zep.c +++ b/ext/phalcon/filter/sanitize/special.zep.c @@ -64,7 +64,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_Special, __invoke) ZVAL_LONG(&_0, 515); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 303, input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 304, input, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/specialfull.zep.c b/ext/phalcon/filter/sanitize/specialfull.zep.c index a097f0cd14f..a26dc9d7269 100644 --- a/ext/phalcon/filter/sanitize/specialfull.zep.c +++ b/ext/phalcon/filter/sanitize/specialfull.zep.c @@ -64,7 +64,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_SpecialFull, __invoke) ZVAL_LONG(&_0, 522); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 303, input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 304, input, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/stringval.zep.c b/ext/phalcon/filter/sanitize/stringval.zep.c index ed711d66edb..096e271af7b 100644 --- a/ext/phalcon/filter/sanitize/stringval.zep.c +++ b/ext/phalcon/filter/sanitize/stringval.zep.c @@ -64,7 +64,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_StringVal, __invoke) ZVAL_LONG(&_0, 513); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 303, input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 304, input, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/striptags.zep.c b/ext/phalcon/filter/sanitize/striptags.zep.c index bd3a88999eb..1c92b41cd3e 100644 --- a/ext/phalcon/filter/sanitize/striptags.zep.c +++ b/ext/phalcon/filter/sanitize/striptags.zep.c @@ -75,7 +75,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_Striptags, __invoke) } - ZEPHIR_RETURN_CALL_FUNCTION("strip_tags", NULL, 306, &input); + ZEPHIR_RETURN_CALL_FUNCTION("strip_tags", NULL, 307, &input); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/upper.zep.c b/ext/phalcon/filter/sanitize/upper.zep.c index 636573af197..e83d9f2ce98 100644 --- a/ext/phalcon/filter/sanitize/upper.zep.c +++ b/ext/phalcon/filter/sanitize/upper.zep.c @@ -87,7 +87,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_Upper, __invoke) zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 305, &input); + ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 306, &input); zephir_check_call_status(); zephir_fast_strtoupper(return_value, &_2); RETURN_MM(); diff --git a/ext/phalcon/filter/sanitize/upperwords.zep.c b/ext/phalcon/filter/sanitize/upperwords.zep.c index dde1a42c9ad..b3a158857b2 100644 --- a/ext/phalcon/filter/sanitize/upperwords.zep.c +++ b/ext/phalcon/filter/sanitize/upperwords.zep.c @@ -86,9 +86,9 @@ PHP_METHOD(Phalcon_Filter_Sanitize_UpperWords, __invoke) zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 305, &input); + ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 306, &input); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("ucwords", NULL, 307, &_2); + ZEPHIR_RETURN_CALL_FUNCTION("ucwords", NULL, 308, &_2); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/url.zep.c b/ext/phalcon/filter/sanitize/url.zep.c index 47c19625944..30da13762a2 100644 --- a/ext/phalcon/filter/sanitize/url.zep.c +++ b/ext/phalcon/filter/sanitize/url.zep.c @@ -64,7 +64,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_Url, __invoke) ZVAL_LONG(&_0, 518); - ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 303, input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 304, input, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/validation.zep.c b/ext/phalcon/filter/validation.zep.c index 47a5eb75884..30e3610ab57 100644 --- a/ext/phalcon/filter/validation.zep.c +++ b/ext/phalcon/filter/validation.zep.c @@ -285,7 +285,7 @@ PHP_METHOD(Phalcon_Filter_Validation, appendMessage) ZEPHIR_CALL_METHOD(NULL, &messages, "__construct", NULL, 8); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, &messages, "appendmessage", NULL, 308, message); + ZEPHIR_CALL_METHOD(NULL, &messages, "appendmessage", NULL, 309, message); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("messages"), &messages); RETURN_THIS(); @@ -674,7 +674,7 @@ PHP_METHOD(Phalcon_Filter_Validation, getValue) zephir_camelize(&_6$$13, &field, NULL ); ZEPHIR_INIT_VAR(&method); ZEPHIR_CONCAT_SV(&method, "set", &_6$$13); - ZEPHIR_CALL_FUNCTION(&_7$$13, "property_exists", NULL, 309, &entity, &field); + ZEPHIR_CALL_FUNCTION(&_7$$13, "property_exists", NULL, 310, &entity, &field); zephir_check_call_status(); if ((zephir_method_exists(&entity, &method) == SUCCESS)) { ZEPHIR_CALL_METHOD_ZVAL(NULL, &entity, &method, NULL, 0, &value); @@ -1331,7 +1331,7 @@ PHP_METHOD(Phalcon_Filter_Validation, preChecking) { ZEPHIR_INIT_NVAR(&singleField); ZVAL_COPY(&singleField, _0$$3); - ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "prechecking", &_3, 310, &singleField, validator); + ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "prechecking", &_3, 311, &singleField, validator); zephir_check_call_status(); zephir_array_append(&results, &_2$$4, PH_SEPARATE, "phalcon/Filter/Validation.zep", 592); if (zephir_fast_in_array(&__$false, &results)) { @@ -1350,7 +1350,7 @@ PHP_METHOD(Phalcon_Filter_Validation, preChecking) } ZEPHIR_CALL_METHOD(&singleField, field, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "prechecking", &_3, 310, &singleField, validator); + ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "prechecking", &_3, 311, &singleField, validator); zephir_check_call_status(); zephir_array_append(&results, &_4$$6, PH_SEPARATE, "phalcon/Filter/Validation.zep", 592); if (zephir_fast_in_array(&__$false, &results)) { diff --git a/ext/phalcon/filter/validation/validator/alnum.zep.c b/ext/phalcon/filter/validation/validator/alnum.zep.c index 2f3c763acba..3ccfc6b6418 100644 --- a/ext/phalcon/filter/validation/validator/alnum.zep.c +++ b/ext/phalcon/filter/validation/validator/alnum.zep.c @@ -149,7 +149,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Alnum, validate) if (zephir_is_true(&_0)) { RETURN_MM_BOOL(1); } - ZEPHIR_CALL_FUNCTION(&_1, "ctype_alnum", NULL, 311, &value); + ZEPHIR_CALL_FUNCTION(&_1, "ctype_alnum", NULL, 312, &value); zephir_check_call_status(); if (!(zephir_is_true(&_1))) { ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "messagefactory", NULL, 0, validation, field); diff --git a/ext/phalcon/filter/validation/validator/callback.zep.c b/ext/phalcon/filter/validation/validator/callback.zep.c index 3588bddcd70..19043300f0f 100644 --- a/ext/phalcon/filter/validation/validator/callback.zep.c +++ b/ext/phalcon/filter/validation/validator/callback.zep.c @@ -165,7 +165,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Callback, validate) ZEPHIR_CALL_METHOD(&data, validation, "getdata", NULL, 0); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&returnedValue, "call_user_func", NULL, 205, &callback, &data); + ZEPHIR_CALL_FUNCTION(&returnedValue, "call_user_func", NULL, 206, &callback, &data); zephir_check_call_status(); _1$$3 = Z_TYPE_P(&returnedValue) == IS_OBJECT; if (_1$$3) { diff --git a/ext/phalcon/filter/validation/validator/confirmation.zep.c b/ext/phalcon/filter/validation/validator/confirmation.zep.c index d349b210067..5a45c2c5f0a 100644 --- a/ext/phalcon/filter/validation/validator/confirmation.zep.c +++ b/ext/phalcon/filter/validation/validator/confirmation.zep.c @@ -169,7 +169,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Confirmation, validate) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&valueWith, validation, "getvalue", NULL, 0, &fieldWith); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "compare", NULL, 312, &value, &valueWith); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "compare", NULL, 313, &value, &valueWith); zephir_check_call_status(); if (!(zephir_is_true(&_2))) { ZEPHIR_INIT_VAR(&_3$$4); @@ -252,7 +252,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Confirmation, compare) zephir_check_call_status(); zephir_get_strval(&b, &_5$$3); } - ZEPHIR_CALL_FUNCTION(&_6, "strcmp", NULL, 313, &a, &b); + ZEPHIR_CALL_FUNCTION(&_6, "strcmp", NULL, 314, &a, &b); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_LONG_IDENTICAL(&_6, 0)); } diff --git a/ext/phalcon/filter/validation/validator/creditcard.zep.c b/ext/phalcon/filter/validation/validator/creditcard.zep.c index 385bd48d1cd..51ac87b2b7b 100644 --- a/ext/phalcon/filter/validation/validator/creditcard.zep.c +++ b/ext/phalcon/filter/validation/validator/creditcard.zep.c @@ -149,7 +149,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_CreditCard, validate) if (zephir_is_true(&_0)) { RETURN_MM_BOOL(1); } - ZEPHIR_CALL_METHOD(&valid, this_ptr, "verifybyluhnalgorithm", NULL, 314, &value); + ZEPHIR_CALL_METHOD(&valid, this_ptr, "verifybyluhnalgorithm", NULL, 315, &value); zephir_check_call_status(); if (!(zephir_is_true(&valid))) { ZEPHIR_CALL_METHOD(&_1$$4, this_ptr, "messagefactory", NULL, 0, validation, field); @@ -209,7 +209,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_CreditCard, verifyByLuhnAlgorithm zephir_check_call_status(); zephir_get_arrval(&_1, &_0); ZEPHIR_CPY_WRT(&digits, &_1); - ZEPHIR_CALL_FUNCTION(&_3, "array_reverse", NULL, 315, &digits); + ZEPHIR_CALL_FUNCTION(&_3, "array_reverse", NULL, 316, &digits); zephir_check_call_status(); zephir_is_iterable(&_3, 0, "phalcon/Filter/Validation/Validator/CreditCard.zep", 109); if (Z_TYPE_P(&_3) == IS_ARRAY) { @@ -261,7 +261,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_CreditCard, verifyByLuhnAlgorithm ZEPHIR_INIT_NVAR(&position); ZEPHIR_CALL_FUNCTION(&_10, "str_split", NULL, 115, &hash); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&result, "array_sum", NULL, 316, &_10); + ZEPHIR_CALL_FUNCTION(&result, "array_sum", NULL, 317, &_10); zephir_check_call_status(); RETURN_MM_BOOL((zephir_safe_mod_zval_long(&result, 10) == 0)); } diff --git a/ext/phalcon/filter/validation/validator/date.zep.c b/ext/phalcon/filter/validation/validator/date.zep.c index b20b3efaa4a..5bef94c39c4 100644 --- a/ext/phalcon/filter/validation/validator/date.zep.c +++ b/ext/phalcon/filter/validation/validator/date.zep.c @@ -171,7 +171,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Date, validate) ZEPHIR_INIT_NVAR(&format); ZVAL_STRING(&format, "Y-m-d"); } - ZEPHIR_CALL_METHOD(&_3, this_ptr, "checkdate", NULL, 317, &value, &format); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "checkdate", NULL, 318, &value, &format); zephir_check_call_status(); if (!(zephir_is_true(&_3))) { ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "messagefactory", NULL, 0, validation, field); diff --git a/ext/phalcon/filter/validation/validator/digit.zep.c b/ext/phalcon/filter/validation/validator/digit.zep.c index f94948fcf15..239a0a7c01b 100644 --- a/ext/phalcon/filter/validation/validator/digit.zep.c +++ b/ext/phalcon/filter/validation/validator/digit.zep.c @@ -152,7 +152,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Digit, validate) } _1 = Z_TYPE_P(&value) == IS_LONG; if (!(_1)) { - ZEPHIR_CALL_FUNCTION(&_2, "ctype_digit", NULL, 318, &value); + ZEPHIR_CALL_FUNCTION(&_2, "ctype_digit", NULL, 319, &value); zephir_check_call_status(); _1 = zephir_is_true(&_2); } diff --git a/ext/phalcon/filter/validation/validator/email.zep.c b/ext/phalcon/filter/validation/validator/email.zep.c index badd21eb2f2..f2ad6a0219b 100644 --- a/ext/phalcon/filter/validation/validator/email.zep.c +++ b/ext/phalcon/filter/validation/validator/email.zep.c @@ -151,7 +151,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Email, validate) RETURN_MM_BOOL(1); } ZVAL_LONG(&_1, 274); - ZEPHIR_CALL_FUNCTION(&_2, "filter_var", NULL, 303, &value, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "filter_var", NULL, 304, &value, &_1); zephir_check_call_status(); if (!(zephir_is_true(&_2))) { ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "messagefactory", NULL, 0, validation, field); diff --git a/ext/phalcon/filter/validation/validator/exclusionin.zep.c b/ext/phalcon/filter/validation/validator/exclusionin.zep.c index 73b395eb129..6a6aa907eaa 100644 --- a/ext/phalcon/filter/validation/validator/exclusionin.zep.c +++ b/ext/phalcon/filter/validation/validator/exclusionin.zep.c @@ -207,7 +207,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_ExclusionIn, validate) return; } } - ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 319, &value, &domain, &strict); + ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 320, &value, &domain, &strict); zephir_check_call_status(); if (zephir_is_true(&_5)) { ZEPHIR_INIT_VAR(&replacePairs); diff --git a/ext/phalcon/filter/validation/validator/file.zep.c b/ext/phalcon/filter/validation/validator/file.zep.c index 41d97b0ea56..c4a6ffa5b0b 100644 --- a/ext/phalcon/filter/validation/validator/file.zep.c +++ b/ext/phalcon/filter/validation/validator/file.zep.c @@ -242,21 +242,21 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) if (zephir_array_isset_string(&options, SL("messageFileEmpty"))) { ZEPHIR_INIT_VAR(&_0$$3); ZVAL_STRING(&_0$$3, "messageFileEmpty"); - ZEPHIR_CALL_METHOD(&messageFileEmpty, &helper, "__invoke", NULL, 177, &options, &_0$$3); + ZEPHIR_CALL_METHOD(&messageFileEmpty, &helper, "__invoke", NULL, 178, &options, &_0$$3); zephir_check_call_status(); zephir_array_unset_string(&options, SL("messageFileEmpty"), PH_SEPARATE); } if (zephir_array_isset_string(&options, SL("messageIniSize"))) { ZEPHIR_INIT_VAR(&_1$$4); ZVAL_STRING(&_1$$4, "messageIniSize"); - ZEPHIR_CALL_METHOD(&messageIniSize, &helper, "__invoke", NULL, 177, &options, &_1$$4); + ZEPHIR_CALL_METHOD(&messageIniSize, &helper, "__invoke", NULL, 178, &options, &_1$$4); zephir_check_call_status(); zephir_array_unset_string(&options, SL("messageIniSize"), PH_SEPARATE); } if (zephir_array_isset_string(&options, SL("messageValid"))) { ZEPHIR_INIT_VAR(&_2$$5); ZVAL_STRING(&_2$$5, "messageValid"); - ZEPHIR_CALL_METHOD(&messageValid, &helper, "__invoke", NULL, 177, &options, &_2$$5); + ZEPHIR_CALL_METHOD(&messageValid, &helper, "__invoke", NULL, 178, &options, &_2$$5); zephir_check_call_status(); zephir_array_unset_string(&options, SL("messageValid"), PH_SEPARATE); } @@ -303,11 +303,11 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) if (ZEPHIR_IS_LONG_IDENTICAL(&_8$$6, 0)) { ZEPHIR_INIT_NVAR(&_16$$7); ZVAL_STRING(&_16$$7, "messageMinSize"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 177, &options, &_16$$7); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 178, &options, &_16$$7); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_16$$7); ZVAL_STRING(&_16$$7, "includedMinSize"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 177, &options, &_16$$7); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 178, &options, &_16$$7); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_min_ce); @@ -316,18 +316,18 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_array_update_string(&_17$$7, SL("size"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_17$$7, SL("message"), &message, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_17$$7, SL("included"), &included, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_18, 320, &_17$$7); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_18, 321, &_17$$7); zephir_check_call_status(); zephir_array_unset_string(&options, SL("messageMinSize"), PH_SEPARATE); zephir_array_unset_string(&options, SL("includedMinSize"), PH_SEPARATE); } else if (ZEPHIR_IS_LONG_IDENTICAL(&_10$$6, 0)) { ZEPHIR_INIT_NVAR(&_19$$8); ZVAL_STRING(&_19$$8, "messageSize"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 177, &options, &_19$$8); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 178, &options, &_19$$8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_19$$8); ZVAL_STRING(&_19$$8, "includedSize"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 177, &options, &_19$$8); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 178, &options, &_19$$8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_max_ce); @@ -336,7 +336,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_array_update_string(&_20$$8, SL("size"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_20$$8, SL("message"), &message, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_20$$8, SL("included"), &included, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_21, 321, &_20$$8); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_21, 322, &_20$$8); zephir_check_call_status(); zephir_array_unset_string(&options, SL("maxSize"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageSize"), PH_SEPARATE); @@ -344,7 +344,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) } else if (ZEPHIR_IS_LONG_IDENTICAL(&_11$$6, 0)) { ZEPHIR_INIT_NVAR(&_22$$9); ZVAL_STRING(&_22$$9, "messageEqualSize"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 177, &options, &_22$$9); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 178, &options, &_22$$9); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_equal_ce); @@ -352,14 +352,14 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_create_array(&_23$$9, 2, 0); zephir_array_update_string(&_23$$9, SL("size"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_23$$9, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_24, 322, &_23$$9); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_24, 323, &_23$$9); zephir_check_call_status(); zephir_array_unset_string(&options, SL("equalSize"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageEqualSize"), PH_SEPARATE); } else if (ZEPHIR_IS_LONG_IDENTICAL(&_12$$6, 0)) { ZEPHIR_INIT_NVAR(&_25$$10); ZVAL_STRING(&_25$$10, "messageType"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 177, &options, &_25$$10); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 178, &options, &_25$$10); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_mimetype_ce); @@ -367,18 +367,18 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_create_array(&_26$$10, 2, 0); zephir_array_update_string(&_26$$10, SL("types"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_26$$10, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_27, 323, &_26$$10); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_27, 324, &_26$$10); zephir_check_call_status(); zephir_array_unset_string(&options, SL("allowedTypes"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageType"), PH_SEPARATE); } else if (ZEPHIR_IS_LONG_IDENTICAL(&_13$$6, 0)) { ZEPHIR_INIT_NVAR(&_28$$11); ZVAL_STRING(&_28$$11, "messageMaxResolution"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 177, &options, &_28$$11); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 178, &options, &_28$$11); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_28$$11); ZVAL_STRING(&_28$$11, "includedMaxResolution"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 177, &options, &_28$$11); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 178, &options, &_28$$11); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_max_ce); @@ -387,7 +387,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_array_update_string(&_29$$11, SL("resolution"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_29$$11, SL("included"), &included, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_29$$11, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_30, 324, &_29$$11); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_30, 325, &_29$$11); zephir_check_call_status(); zephir_array_unset_string(&options, SL("maxResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("includedMaxResolution"), PH_SEPARATE); @@ -395,11 +395,11 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) } else if (ZEPHIR_IS_LONG_IDENTICAL(&_14$$6, 0)) { ZEPHIR_INIT_NVAR(&_31$$12); ZVAL_STRING(&_31$$12, "messageMinResolution"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 177, &options, &_31$$12); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 178, &options, &_31$$12); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_31$$12); ZVAL_STRING(&_31$$12, "includedMinResolution"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 177, &options, &_31$$12); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 178, &options, &_31$$12); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_min_ce); @@ -408,7 +408,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_array_update_string(&_32$$12, SL("resolution"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_32$$12, SL("included"), &included, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_32$$12, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 325, &_32$$12); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_33, 326, &_32$$12); zephir_check_call_status(); zephir_array_unset_string(&options, SL("minResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("includedMinResolution"), PH_SEPARATE); @@ -416,7 +416,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) } else if (ZEPHIR_IS_LONG_IDENTICAL(&_15$$6, 0)) { ZEPHIR_INIT_NVAR(&_34$$13); ZVAL_STRING(&_34$$13, "messageEqualResolution"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 177, &options, &_34$$13); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 178, &options, &_34$$13); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_equal_ce); @@ -424,7 +424,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_create_array(&_35$$13, 2, 0); zephir_array_update_string(&_35$$13, SL("resolution"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_35$$13, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 326, &_35$$13); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 327, &_35$$13); zephir_check_call_status(); zephir_array_unset_string(&options, SL("equalResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageEqualResolution"), PH_SEPARATE); @@ -432,15 +432,15 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) continue; } if (Z_TYPE_P(&messageFileEmpty) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagefileempty", &_37, 327, &messageFileEmpty); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagefileempty", &_37, 328, &messageFileEmpty); zephir_check_call_status(); } if (Z_TYPE_P(&messageIniSize) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessageinisize", &_38, 328, &messageIniSize); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessageinisize", &_38, 329, &messageIniSize); zephir_check_call_status(); } if (Z_TYPE_P(&messageValid) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagevalid", &_39, 329, &messageValid); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagevalid", &_39, 330, &messageValid); zephir_check_call_status(); } zephir_update_property_array_append(this_ptr, SL("validators"), &validator); @@ -489,11 +489,11 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) if (ZEPHIR_IS_LONG_IDENTICAL(&_41$$18, 0)) { ZEPHIR_INIT_NVAR(&_48$$19); ZVAL_STRING(&_48$$19, "messageMinSize"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 177, &options, &_48$$19); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 178, &options, &_48$$19); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_48$$19); ZVAL_STRING(&_48$$19, "includedMinSize"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 177, &options, &_48$$19); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 178, &options, &_48$$19); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_min_ce); @@ -502,18 +502,18 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_array_update_string(&_49$$19, SL("size"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_49$$19, SL("message"), &message, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_49$$19, SL("included"), &included, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 326, &_49$$19); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 327, &_49$$19); zephir_check_call_status(); zephir_array_unset_string(&options, SL("messageMinSize"), PH_SEPARATE); zephir_array_unset_string(&options, SL("includedMinSize"), PH_SEPARATE); } else if (ZEPHIR_IS_LONG_IDENTICAL(&_42$$18, 0)) { ZEPHIR_INIT_NVAR(&_50$$20); ZVAL_STRING(&_50$$20, "messageSize"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 177, &options, &_50$$20); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 178, &options, &_50$$20); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_50$$20); ZVAL_STRING(&_50$$20, "includedSize"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 177, &options, &_50$$20); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 178, &options, &_50$$20); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_max_ce); @@ -522,7 +522,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_array_update_string(&_51$$20, SL("size"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_51$$20, SL("message"), &message, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_51$$20, SL("included"), &included, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 326, &_51$$20); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 327, &_51$$20); zephir_check_call_status(); zephir_array_unset_string(&options, SL("maxSize"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageSize"), PH_SEPARATE); @@ -530,7 +530,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) } else if (ZEPHIR_IS_LONG_IDENTICAL(&_43$$18, 0)) { ZEPHIR_INIT_NVAR(&_52$$21); ZVAL_STRING(&_52$$21, "messageEqualSize"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 177, &options, &_52$$21); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 178, &options, &_52$$21); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_size_equal_ce); @@ -538,14 +538,14 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_create_array(&_53$$21, 2, 0); zephir_array_update_string(&_53$$21, SL("size"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_53$$21, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 326, &_53$$21); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 327, &_53$$21); zephir_check_call_status(); zephir_array_unset_string(&options, SL("equalSize"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageEqualSize"), PH_SEPARATE); } else if (ZEPHIR_IS_LONG_IDENTICAL(&_44$$18, 0)) { ZEPHIR_INIT_NVAR(&_54$$22); ZVAL_STRING(&_54$$22, "messageType"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 177, &options, &_54$$22); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 178, &options, &_54$$22); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_mimetype_ce); @@ -553,18 +553,18 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_create_array(&_55$$22, 2, 0); zephir_array_update_string(&_55$$22, SL("types"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_55$$22, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 326, &_55$$22); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 327, &_55$$22); zephir_check_call_status(); zephir_array_unset_string(&options, SL("allowedTypes"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageType"), PH_SEPARATE); } else if (ZEPHIR_IS_LONG_IDENTICAL(&_45$$18, 0)) { ZEPHIR_INIT_NVAR(&_56$$23); ZVAL_STRING(&_56$$23, "messageMaxResolution"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 177, &options, &_56$$23); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 178, &options, &_56$$23); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_56$$23); ZVAL_STRING(&_56$$23, "includedMaxResolution"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 177, &options, &_56$$23); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 178, &options, &_56$$23); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_max_ce); @@ -573,7 +573,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_array_update_string(&_57$$23, SL("resolution"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_57$$23, SL("included"), &included, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_57$$23, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 326, &_57$$23); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 327, &_57$$23); zephir_check_call_status(); zephir_array_unset_string(&options, SL("maxResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("includedMaxResolution"), PH_SEPARATE); @@ -581,11 +581,11 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) } else if (ZEPHIR_IS_LONG_IDENTICAL(&_46$$18, 0)) { ZEPHIR_INIT_NVAR(&_58$$24); ZVAL_STRING(&_58$$24, "messageMinResolution"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 177, &options, &_58$$24); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 178, &options, &_58$$24); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_58$$24); ZVAL_STRING(&_58$$24, "includedMinResolution"); - ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 177, &options, &_58$$24); + ZEPHIR_CALL_METHOD(&included, &helper, "__invoke", NULL, 178, &options, &_58$$24); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_min_ce); @@ -594,7 +594,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_array_update_string(&_59$$24, SL("resolution"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_59$$24, SL("included"), &included, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_59$$24, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 326, &_59$$24); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 327, &_59$$24); zephir_check_call_status(); zephir_array_unset_string(&options, SL("minResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("includedMinResolution"), PH_SEPARATE); @@ -602,7 +602,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) } else if (ZEPHIR_IS_LONG_IDENTICAL(&_47$$18, 0)) { ZEPHIR_INIT_NVAR(&_60$$25); ZVAL_STRING(&_60$$25, "messageEqualResolution"); - ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 177, &options, &_60$$25); + ZEPHIR_CALL_METHOD(&message, &helper, "__invoke", NULL, 178, &options, &_60$$25); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&validator); object_init_ex(&validator, phalcon_filter_validation_validator_file_resolution_equal_ce); @@ -610,7 +610,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) zephir_create_array(&_61$$25, 2, 0); zephir_array_update_string(&_61$$25, SL("resolution"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_61$$25, SL("message"), &message, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 326, &_61$$25); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_36, 327, &_61$$25); zephir_check_call_status(); zephir_array_unset_string(&options, SL("equalResolution"), PH_SEPARATE); zephir_array_unset_string(&options, SL("messageEqualResolution"), PH_SEPARATE); @@ -618,15 +618,15 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File, __construct) continue; } if (Z_TYPE_P(&messageFileEmpty) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagefileempty", &_37, 327, &messageFileEmpty); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagefileempty", &_37, 328, &messageFileEmpty); zephir_check_call_status(); } if (Z_TYPE_P(&messageIniSize) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessageinisize", &_38, 328, &messageIniSize); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessageinisize", &_38, 329, &messageIniSize); zephir_check_call_status(); } if (Z_TYPE_P(&messageValid) != IS_NULL) { - ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagevalid", &_39, 329, &messageValid); + ZEPHIR_CALL_METHOD(NULL, &validator, "setmessagevalid", &_39, 330, &messageValid); zephir_check_call_status(); } zephir_update_property_array_append(this_ptr, SL("validators"), &validator); diff --git a/ext/phalcon/filter/validation/validator/file/mimetype.zep.c b/ext/phalcon/filter/validation/validator/file/mimetype.zep.c index 925fb12410c..7457c6d3417 100644 --- a/ext/phalcon/filter/validation/validator/file/mimetype.zep.c +++ b/ext/phalcon/filter/validation/validator/file/mimetype.zep.c @@ -147,12 +147,12 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_MimeType, validate) } if ((zephir_function_exists_ex(ZEND_STRL("finfo_open")) == SUCCESS)) { ZVAL_LONG(&_2$$6, 16); - ZEPHIR_CALL_FUNCTION(&tmp, "finfo_open", NULL, 330, &_2$$6); + ZEPHIR_CALL_FUNCTION(&tmp, "finfo_open", NULL, 331, &_2$$6); zephir_check_call_status(); zephir_array_fetch_string(&_3$$6, &value, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/Validator/File/MimeType.zep", 101); - ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 331, &tmp, &_3$$6); + ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 332, &tmp, &_3$$6); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 332, &tmp); + ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 333, &tmp); zephir_check_call_status(); } else { ZEPHIR_OBS_NVAR(&mime); diff --git a/ext/phalcon/filter/validation/validator/file/resolution/equal.zep.c b/ext/phalcon/filter/validation/validator/file/resolution/equal.zep.c index 5cc6eae5c38..33fc81aa9b3 100644 --- a/ext/phalcon/filter/validation/validator/file/resolution/equal.zep.c +++ b/ext/phalcon/filter/validation/validator/file/resolution/equal.zep.c @@ -169,7 +169,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_Resolution_Equal, validate) ZEPHIR_CALL_METHOD(&value, validation, "getvalue", NULL, 0, field); zephir_check_call_status(); zephir_array_fetch_string(&_1, &value, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/Validator/File/Resolution/Equal.zep", 88); - ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 333, &_1); + ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 334, &_1); zephir_check_call_status(); ZEPHIR_OBS_VAR(&width); zephir_array_fetch_long(&width, &tmp, 0, PH_NOISY, "phalcon/Filter/Validation/Validator/File/Resolution/Equal.zep", 89); diff --git a/ext/phalcon/filter/validation/validator/file/resolution/max.zep.c b/ext/phalcon/filter/validation/validator/file/resolution/max.zep.c index c24cf09afba..66c75b1e53a 100644 --- a/ext/phalcon/filter/validation/validator/file/resolution/max.zep.c +++ b/ext/phalcon/filter/validation/validator/file/resolution/max.zep.c @@ -180,7 +180,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_Resolution_Max, validate) ZEPHIR_CALL_METHOD(&value, validation, "getvalue", NULL, 0, field); zephir_check_call_status(); zephir_array_fetch_string(&_1, &value, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/Validator/File/Resolution/Max.zep", 94); - ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 333, &_1); + ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 334, &_1); zephir_check_call_status(); ZEPHIR_OBS_VAR(&width); zephir_array_fetch_long(&width, &tmp, 0, PH_NOISY, "phalcon/Filter/Validation/Validator/File/Resolution/Max.zep", 95); diff --git a/ext/phalcon/filter/validation/validator/file/resolution/min.zep.c b/ext/phalcon/filter/validation/validator/file/resolution/min.zep.c index dc42b7acbd0..7417e9761ca 100644 --- a/ext/phalcon/filter/validation/validator/file/resolution/min.zep.c +++ b/ext/phalcon/filter/validation/validator/file/resolution/min.zep.c @@ -180,7 +180,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_File_Resolution_Min, validate) ZEPHIR_CALL_METHOD(&value, validation, "getvalue", NULL, 0, field); zephir_check_call_status(); zephir_array_fetch_string(&_1, &value, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Filter/Validation/Validator/File/Resolution/Min.zep", 94); - ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 333, &_1); + ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 334, &_1); zephir_check_call_status(); ZEPHIR_OBS_VAR(&width); zephir_array_fetch_long(&width, &tmp, 0, PH_NOISY, "phalcon/Filter/Validation/Validator/File/Resolution/Min.zep", 95); diff --git a/ext/phalcon/filter/validation/validator/inclusionin.zep.c b/ext/phalcon/filter/validation/validator/inclusionin.zep.c index 54f3685c4be..fa958d7d559 100644 --- a/ext/phalcon/filter/validation/validator/inclusionin.zep.c +++ b/ext/phalcon/filter/validation/validator/inclusionin.zep.c @@ -201,7 +201,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_InclusionIn, validate) return; } } - ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 319, &value, &domain, &strict); + ZEPHIR_CALL_FUNCTION(&_5, "in_array", NULL, 320, &value, &domain, &strict); zephir_check_call_status(); if (!(zephir_is_true(&_5))) { ZEPHIR_INIT_VAR(&replacePairs); diff --git a/ext/phalcon/filter/validation/validator/ip.zep.c b/ext/phalcon/filter/validation/validator/ip.zep.c index b91d0247857..8ba7961ae80 100644 --- a/ext/phalcon/filter/validation/validator/ip.zep.c +++ b/ext/phalcon/filter/validation/validator/ip.zep.c @@ -240,7 +240,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Ip, validate) zephir_bitwise_or_function(&_10, &_9, &allowReserved); zephir_array_update_string(&options, SL("flags"), &_10, PH_COPY | PH_SEPARATE); ZVAL_LONG(&_2, 275); - ZEPHIR_CALL_FUNCTION(&_11, "filter_var", NULL, 303, &value, &_2, &options); + ZEPHIR_CALL_FUNCTION(&_11, "filter_var", NULL, 304, &value, &_2, &options); zephir_check_call_status(); if (!(zephir_is_true(&_11))) { ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "messagefactory", NULL, 0, validation, field); diff --git a/ext/phalcon/filter/validation/validator/stringlength.zep.c b/ext/phalcon/filter/validation/validator/stringlength.zep.c index 13ab9d45528..9e678c41a8e 100644 --- a/ext/phalcon/filter/validation/validator/stringlength.zep.c +++ b/ext/phalcon/filter/validation/validator/stringlength.zep.c @@ -205,7 +205,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength, __construct) zephir_array_update_string(&_8$$4, SL("min"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_8$$4, SL("message"), &message, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_8$$4, SL("included"), &included, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_9, 334, &_8$$4); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_9, 335, &_8$$4); zephir_check_call_status(); zephir_array_unset_string(&options, SL("min"), PH_SEPARATE); zephir_array_unset_string(&options, SL("message"), PH_SEPARATE); @@ -234,7 +234,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength, __construct) zephir_array_update_string(&_10$$9, SL("max"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_10$$9, SL("message"), &message, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_10$$9, SL("included"), &included, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_11, 335, &_10$$9); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_11, 336, &_10$$9); zephir_check_call_status(); zephir_array_unset_string(&options, SL("max"), PH_SEPARATE); zephir_array_unset_string(&options, SL("message"), PH_SEPARATE); @@ -289,7 +289,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength, __construct) zephir_array_update_string(&_15$$16, SL("min"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_15$$16, SL("message"), &message, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_15$$16, SL("included"), &included, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_11, 335, &_15$$16); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_11, 336, &_15$$16); zephir_check_call_status(); zephir_array_unset_string(&options, SL("min"), PH_SEPARATE); zephir_array_unset_string(&options, SL("message"), PH_SEPARATE); @@ -318,7 +318,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength, __construct) zephir_array_update_string(&_16$$21, SL("max"), &value, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_16$$21, SL("message"), &message, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_16$$21, SL("included"), &included, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_11, 335, &_16$$21); + ZEPHIR_CALL_METHOD(NULL, &validator, "__construct", &_11, 336, &_16$$21); zephir_check_call_status(); zephir_array_unset_string(&options, SL("max"), PH_SEPARATE); zephir_array_unset_string(&options, SL("message"), PH_SEPARATE); diff --git a/ext/phalcon/filter/validation/validator/stringlength/max.zep.c b/ext/phalcon/filter/validation/validator/stringlength/max.zep.c index 22721a26cc6..4d0c7a6b2d9 100644 --- a/ext/phalcon/filter/validation/validator/stringlength/max.zep.c +++ b/ext/phalcon/filter/validation/validator/stringlength/max.zep.c @@ -174,7 +174,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength_Max, validate) RETURN_MM_BOOL(1); } if ((zephir_function_exists_ex(ZEND_STRL("mb_strlen")) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 253, &value); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 254, &value); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&length); diff --git a/ext/phalcon/filter/validation/validator/stringlength/min.zep.c b/ext/phalcon/filter/validation/validator/stringlength/min.zep.c index 3b1132448d6..e68a600d551 100644 --- a/ext/phalcon/filter/validation/validator/stringlength/min.zep.c +++ b/ext/phalcon/filter/validation/validator/stringlength/min.zep.c @@ -174,7 +174,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_StringLength_Min, validate) RETURN_MM_BOOL(1); } if ((zephir_function_exists_ex(ZEND_STRL("mb_strlen")) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 253, &value); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 254, &value); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&length); diff --git a/ext/phalcon/filter/validation/validator/uniqueness.zep.c b/ext/phalcon/filter/validation/validator/uniqueness.zep.c index 987ee3a7b7e..230e12e2106 100644 --- a/ext/phalcon/filter/validation/validator/uniqueness.zep.c +++ b/ext/phalcon/filter/validation/validator/uniqueness.zep.c @@ -648,7 +648,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Uniqueness, isUniquenessModel) zephir_array_keys(&_10$$6, &except); ZVAL_LONG(&_11$$6, 0); ZVAL_LONG(&_12$$6, (zephir_fast_count_int(&except) - 1)); - ZEPHIR_CALL_FUNCTION(&_13$$6, "range", &_14, 336, &_11$$6, &_12$$6); + ZEPHIR_CALL_FUNCTION(&_13$$6, "range", &_14, 337, &_11$$6, &_12$$6); zephir_check_call_status(); _9$$6 = !ZEPHIR_IS_IDENTICAL(&_10$$6, &_13$$6); } @@ -1052,7 +1052,7 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Uniqueness, isUniquenessModel) zephir_array_keys(&_88$$37, &except); ZVAL_LONG(&_89$$37, 0); ZVAL_LONG(&_90$$37, (zephir_fast_count_int(&except) - 1)); - ZEPHIR_CALL_FUNCTION(&_91$$37, "range", &_14, 336, &_89$$37, &_90$$37); + ZEPHIR_CALL_FUNCTION(&_91$$37, "range", &_14, 337, &_89$$37, &_90$$37); zephir_check_call_status(); _87$$37 = !ZEPHIR_IS_IDENTICAL(&_88$$37, &_91$$37); } diff --git a/ext/phalcon/filter/validation/validator/url.zep.c b/ext/phalcon/filter/validation/validator/url.zep.c index 1789f94be47..3c0022f1684 100644 --- a/ext/phalcon/filter/validation/validator/url.zep.c +++ b/ext/phalcon/filter/validation/validator/url.zep.c @@ -159,11 +159,11 @@ PHP_METHOD(Phalcon_Filter_Validation_Validator_Url, validate) zephir_read_property(&_1, this_ptr, ZEND_STRL("options"), PH_NOISY_CC | PH_READONLY); if (zephir_array_isset_string_fetch(&options, &_1, SL("options"), 0)) { ZVAL_LONG(&_2$$4, 273); - ZEPHIR_CALL_FUNCTION(&result, "filter_var", NULL, 303, &value, &_2$$4, &options); + ZEPHIR_CALL_FUNCTION(&result, "filter_var", NULL, 304, &value, &_2$$4, &options); zephir_check_call_status(); } else { ZVAL_LONG(&_3$$5, 273); - ZEPHIR_CALL_FUNCTION(&result, "filter_var", NULL, 303, &value, &_3$$5); + ZEPHIR_CALL_FUNCTION(&result, "filter_var", NULL, 304, &value, &_3$$5); zephir_check_call_status(); } if (!(zephir_is_true(&result))) { diff --git a/ext/phalcon/forms/form.zep.c b/ext/phalcon/forms/form.zep.c index d71c9a6dfed..de8b9fe7fb0 100644 --- a/ext/phalcon/forms/form.zep.c +++ b/ext/phalcon/forms/form.zep.c @@ -1408,7 +1408,7 @@ PHP_METHOD(Phalcon_Forms_Form, isValid) if (_7) { ZEPHIR_INIT_NVAR(&validation); object_init_ex(&validation, phalcon_filter_validation_ce); - ZEPHIR_CALL_METHOD(NULL, &validation, "__construct", NULL, 337); + ZEPHIR_CALL_METHOD(NULL, &validation, "__construct", NULL, 338); zephir_check_call_status(); } zephir_read_property(&_8, this_ptr, ZEND_STRL("elements"), PH_NOISY_CC | PH_READONLY); @@ -1431,7 +1431,7 @@ PHP_METHOD(Phalcon_Forms_Form, isValid) { ZEPHIR_INIT_NVAR(&validator); ZVAL_COPY(&validator, _11$$10); - ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 338, &name, &validator); + ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 339, &name, &validator); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); } else { @@ -1445,7 +1445,7 @@ PHP_METHOD(Phalcon_Forms_Form, isValid) } ZEPHIR_CALL_METHOD(&validator, &validators, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 338, &name, &validator); + ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 339, &name, &validator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &validators, "next", NULL, 0); zephir_check_call_status(); @@ -1455,7 +1455,7 @@ PHP_METHOD(Phalcon_Forms_Form, isValid) ZEPHIR_CALL_METHOD(&filters, &element, "getfilters", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&filters) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(NULL, &validation, "setfilters", &_14, 339, &name, &filters); + ZEPHIR_CALL_METHOD(NULL, &validation, "setfilters", &_14, 340, &name, &filters); zephir_check_call_status(); } } ZEND_HASH_FOREACH_END(); @@ -1483,7 +1483,7 @@ PHP_METHOD(Phalcon_Forms_Form, isValid) { ZEPHIR_INIT_NVAR(&validator); ZVAL_COPY(&validator, _15$$15); - ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 338, &name, &validator); + ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 339, &name, &validator); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); } else { @@ -1497,7 +1497,7 @@ PHP_METHOD(Phalcon_Forms_Form, isValid) } ZEPHIR_CALL_METHOD(&validator, &validators, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 338, &name, &validator); + ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_13, 339, &name, &validator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &validators, "next", NULL, 0); zephir_check_call_status(); @@ -1507,7 +1507,7 @@ PHP_METHOD(Phalcon_Forms_Form, isValid) ZEPHIR_CALL_METHOD(&filters, &element, "getfilters", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&filters) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(NULL, &validation, "setfilters", &_14, 339, &name, &filters); + ZEPHIR_CALL_METHOD(NULL, &validation, "setfilters", &_14, 340, &name, &filters); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(NULL, &_8, "next", NULL, 0); @@ -1515,7 +1515,7 @@ PHP_METHOD(Phalcon_Forms_Form, isValid) } } ZEPHIR_INIT_NVAR(&element); - ZEPHIR_CALL_METHOD(&messages, &validation, "validate", NULL, 340, data, entity); + ZEPHIR_CALL_METHOD(&messages, &validation, "validate", NULL, 341, data, entity); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_17, &messages, "count", NULL, 0); zephir_check_call_status(); diff --git a/ext/phalcon/forms/manager.zep.c b/ext/phalcon/forms/manager.zep.c index 0ce2803cc5a..556b0a83df6 100644 --- a/ext/phalcon/forms/manager.zep.c +++ b/ext/phalcon/forms/manager.zep.c @@ -83,7 +83,7 @@ PHP_METHOD(Phalcon_Forms_Manager, create) ZEPHIR_INIT_VAR(&form); object_init_ex(&form, phalcon_forms_form_ce); - ZEPHIR_CALL_METHOD(NULL, &form, "__construct", NULL, 341, entity); + ZEPHIR_CALL_METHOD(NULL, &form, "__construct", NULL, 342, entity); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("forms"), &name, &form); RETURN_CCTOR(&form); diff --git a/ext/phalcon/html/attributes.zep.c b/ext/phalcon/html/attributes.zep.c index 67a8ac35bb2..09bb057f3db 100644 --- a/ext/phalcon/html/attributes.zep.c +++ b/ext/phalcon/html/attributes.zep.c @@ -164,7 +164,7 @@ PHP_METHOD(Phalcon_Html_Attributes, renderAttributes) ZVAL_LONG(&_5$$4, 3); ZEPHIR_INIT_NVAR(&_6$$4); ZVAL_STRING(&_6$$4, "utf-8"); - ZEPHIR_CALL_FUNCTION(&_7$$4, "htmlspecialchars", &_8, 342, &value, &_5$$4, &_6$$4, &__$true); + ZEPHIR_CALL_FUNCTION(&_7$$4, "htmlspecialchars", &_8, 343, &value, &_5$$4, &_6$$4, &__$true); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_9$$4); ZEPHIR_CONCAT_VSVS(&_9$$4, &key, "=\"", &_7$$4, "\" "); @@ -192,7 +192,7 @@ PHP_METHOD(Phalcon_Html_Attributes, renderAttributes) ZVAL_LONG(&_11$$6, 3); ZEPHIR_INIT_NVAR(&_12$$6); ZVAL_STRING(&_12$$6, "utf-8"); - ZEPHIR_CALL_FUNCTION(&_13$$6, "htmlspecialchars", &_8, 342, &value, &_11$$6, &_12$$6, &__$true); + ZEPHIR_CALL_FUNCTION(&_13$$6, "htmlspecialchars", &_8, 343, &value, &_11$$6, &_12$$6, &__$true); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_14$$6); ZEPHIR_CONCAT_VSVS(&_14$$6, &key, "=\"", &_13$$6, "\" "); diff --git a/ext/phalcon/html/breadcrumbs.zep.c b/ext/phalcon/html/breadcrumbs.zep.c index 434b824ca75..7e3e7542f13 100644 --- a/ext/phalcon/html/breadcrumbs.zep.c +++ b/ext/phalcon/html/breadcrumbs.zep.c @@ -267,7 +267,7 @@ PHP_METHOD(Phalcon_Html_Breadcrumbs, render) ZEPHIR_INIT_VAR(&urls); zephir_array_keys(&urls, &elements); ZEPHIR_MAKE_REF(&urls); - ZEPHIR_CALL_FUNCTION(&lastUrl, "end", NULL, 343, &urls); + ZEPHIR_CALL_FUNCTION(&lastUrl, "end", NULL, 344, &urls); ZEPHIR_UNREF(&urls); zephir_check_call_status(); ZEPHIR_OBS_VAR(&lastLabel); diff --git a/ext/phalcon/html/escaper.zep.c b/ext/phalcon/html/escaper.zep.c index 0d28778506e..0d6c7ac17c1 100644 --- a/ext/phalcon/html/escaper.zep.c +++ b/ext/phalcon/html/escaper.zep.c @@ -125,7 +125,7 @@ PHP_METHOD(Phalcon_Html_Escaper, attributes) zephir_read_property(&_0, this_ptr, ZEND_STRL("encoding"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_1, this_ptr, ZEND_STRL("doubleEncode"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_2, 3); - ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 342, &input, &_2, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 343, &input, &_2, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -161,9 +161,9 @@ PHP_METHOD(Phalcon_Html_Escaper, css) zephir_get_strval(&input, input_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 344, &input); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 345, &input); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "doescapecss", NULL, 345, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "doescapecss", NULL, 346, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -236,7 +236,7 @@ PHP_METHOD(Phalcon_Html_Escaper, detectEncoding) { ZEPHIR_INIT_NVAR(&charset); ZVAL_COPY(&charset, _2); - ZEPHIR_CALL_FUNCTION(&_4$$5, "mb_detect_encoding", &_5, 346, &input, &charset, &__$true); + ZEPHIR_CALL_FUNCTION(&_4$$5, "mb_detect_encoding", &_5, 347, &input, &charset, &__$true); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&_4$$5)) { RETURN_CCTOR(&charset); @@ -253,7 +253,7 @@ PHP_METHOD(Phalcon_Html_Escaper, detectEncoding) } ZEPHIR_CALL_METHOD(&charset, &_0, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_6$$7, "mb_detect_encoding", &_5, 346, &input, &charset, &__$true); + ZEPHIR_CALL_FUNCTION(&_6$$7, "mb_detect_encoding", &_5, 347, &input, &charset, &__$true); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&_6$$7)) { RETURN_CCTOR(&charset); @@ -263,7 +263,7 @@ PHP_METHOD(Phalcon_Html_Escaper, detectEncoding) } } ZEPHIR_INIT_NVAR(&charset); - ZEPHIR_RETURN_CALL_FUNCTION("mb_detect_encoding", &_5, 346, &input); + ZEPHIR_RETURN_CALL_FUNCTION("mb_detect_encoding", &_5, 347, &input); zephir_check_call_status(); RETURN_MM(); } @@ -502,7 +502,7 @@ PHP_METHOD(Phalcon_Html_Escaper, html) zephir_read_property(&_0, this_ptr, ZEND_STRL("flags"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_1, this_ptr, ZEND_STRL("encoding"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_2, this_ptr, ZEND_STRL("doubleEncode"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 342, &input, &_0, &_1, &_2); + ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 343, &input, &_0, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -538,9 +538,9 @@ PHP_METHOD(Phalcon_Html_Escaper, js) zephir_get_strval(&input, input_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 344, &input); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 345, &input); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "doescapejs", NULL, 347, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "doescapejs", NULL, 348, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -576,11 +576,11 @@ PHP_METHOD(Phalcon_Html_Escaper, normalizeEncoding) zephir_get_strval(&input, input_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "detectencoding", NULL, 348, &input); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "detectencoding", NULL, 349, &input); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "UTF-32"); - ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 349, &input, &_1, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 350, &input, &_1, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -756,7 +756,7 @@ PHP_METHOD(Phalcon_Html_Escaper, url) zephir_get_strval(&input, input_param); - ZEPHIR_RETURN_CALL_FUNCTION("rawurlencode", NULL, 350, &input); + ZEPHIR_RETURN_CALL_FUNCTION("rawurlencode", NULL, 351, &input); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/html/helper/input/checkbox.zep.c b/ext/phalcon/html/helper/input/checkbox.zep.c index f043e8a97a5..4aaf36260a8 100644 --- a/ext/phalcon/html/helper/input/checkbox.zep.c +++ b/ext/phalcon/html/helper/input/checkbox.zep.c @@ -115,9 +115,9 @@ PHP_METHOD(Phalcon_Html_Helper_Input_Checkbox, __toString) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "processchecked", NULL, 121); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "processchecked", NULL, 122); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&unchecked, this_ptr, "processunchecked", NULL, 122); + ZEPHIR_CALL_METHOD(&unchecked, this_ptr, "processunchecked", NULL, 123); zephir_check_call_status(); ZEPHIR_CALL_PARENT(&element, phalcon_html_helper_input_checkbox_ce, getThis(), "__tostring", &_0, 0); zephir_check_call_status(); diff --git a/ext/phalcon/html/helper/input/select.zep.c b/ext/phalcon/html/helper/input/select.zep.c index aefbbf9a9c4..e037f3b9571 100644 --- a/ext/phalcon/html/helper/input/select.zep.c +++ b/ext/phalcon/html/helper/input/select.zep.c @@ -115,7 +115,7 @@ PHP_METHOD(Phalcon_Html_Helper_Input_Select, add) } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "processvalue", NULL, 351, &attributes, &value); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "processvalue", NULL, 352, &attributes, &value); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attributes, &_0); ZEPHIR_INIT_VAR(&_1); diff --git a/ext/phalcon/html/helper/meta.zep.c b/ext/phalcon/html/helper/meta.zep.c index 30e50e6f71d..d69eb02632c 100644 --- a/ext/phalcon/html/helper/meta.zep.c +++ b/ext/phalcon/html/helper/meta.zep.c @@ -130,7 +130,7 @@ PHP_METHOD(Phalcon_Html_Helper_Meta, addHttp) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "http-equiv"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addelement", NULL, 352, &_0, &httpEquiv, &content); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addelement", NULL, 353, &_0, &httpEquiv, &content); zephir_check_call_status(); RETURN_MM(); } @@ -170,7 +170,7 @@ PHP_METHOD(Phalcon_Html_Helper_Meta, addName) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "name"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "addelement", NULL, 352, &_0, &name, &content); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addelement", NULL, 353, &_0, &name, &content); zephir_check_call_status(); RETURN_THIS(); } @@ -210,7 +210,7 @@ PHP_METHOD(Phalcon_Html_Helper_Meta, addProperty) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "property"); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "addelement", NULL, 352, &_0, &name, &content); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addelement", NULL, 353, &_0, &name, &content); zephir_check_call_status(); RETURN_THIS(); } diff --git a/ext/phalcon/html/helper/title.zep.c b/ext/phalcon/html/helper/title.zep.c index 571cd16aac7..f705e768735 100644 --- a/ext/phalcon/html/helper/title.zep.c +++ b/ext/phalcon/html/helper/title.zep.c @@ -153,7 +153,7 @@ PHP_METHOD(Phalcon_Html_Helper_Title, __toString) zephir_read_property(&_2, this_ptr, ZEND_STRL("title"), PH_NOISY_CC); zephir_array_fast_append(&_1, &_2); zephir_read_property(&_3, this_ptr, ZEND_STRL("append"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&items, "array_merge", NULL, 353, &_0, &_1, &_3); + ZEPHIR_CALL_FUNCTION(&items, "array_merge", NULL, 354, &_0, &_1, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); zephir_read_property(&_5, this_ptr, ZEND_STRL("indent"), PH_NOISY_CC | PH_READONLY); diff --git a/ext/phalcon/html/link/link.zep.c b/ext/phalcon/html/link/link.zep.c index 8ce4be4e6e0..868729a549e 100644 --- a/ext/phalcon/html/link/link.zep.c +++ b/ext/phalcon/html/link/link.zep.c @@ -272,7 +272,7 @@ PHP_METHOD(Phalcon_Html_Link_Link, hrefIsTemplated) if (_2) { ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "}"); - ZEPHIR_CALL_FUNCTION(&_4, "strrpos", NULL, 123, &href, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "strrpos", NULL, 124, &href, &_3); zephir_check_call_status(); _2 = !ZEPHIR_IS_FALSE_IDENTICAL(&_4); } diff --git a/ext/phalcon/http/cookie.zep.c b/ext/phalcon/http/cookie.zep.c index dd5a4109e09..8b9268cf0db 100644 --- a/ext/phalcon/http/cookie.zep.c +++ b/ext/phalcon/http/cookie.zep.c @@ -311,30 +311,30 @@ PHP_METHOD(Phalcon_Http_Cookie, delete) ZEPHIR_INIT_VAR(&_8); ZVAL_STRING(&_8, "expires"); ZVAL_LONG(&_0, (zephir_get_numberval(&_3) - 691200)); - ZEPHIR_CALL_METHOD(&_7, this_ptr, "getarrval", NULL, 354, &options, &_8, &_0); + ZEPHIR_CALL_METHOD(&_7, this_ptr, "getarrval", NULL, 355, &options, &_8, &_0); zephir_check_call_status(); zephir_array_update_string(&options, SL("expires"), &_7, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_8); ZVAL_STRING(&_8, "domain"); - ZEPHIR_CALL_METHOD(&_9, this_ptr, "getarrval", NULL, 354, &options, &_8, &domain); + ZEPHIR_CALL_METHOD(&_9, this_ptr, "getarrval", NULL, 355, &options, &_8, &domain); zephir_check_call_status(); zephir_array_update_string(&options, SL("domain"), &_9, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_8); ZVAL_STRING(&_8, "path"); - ZEPHIR_CALL_METHOD(&_10, this_ptr, "getarrval", NULL, 354, &options, &_8, &path); + ZEPHIR_CALL_METHOD(&_10, this_ptr, "getarrval", NULL, 355, &options, &_8, &path); zephir_check_call_status(); zephir_array_update_string(&options, SL("path"), &_10, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_8); ZVAL_STRING(&_8, "secure"); - ZEPHIR_CALL_METHOD(&_11, this_ptr, "getarrval", NULL, 354, &options, &_8, &secure); + ZEPHIR_CALL_METHOD(&_11, this_ptr, "getarrval", NULL, 355, &options, &_8, &secure); zephir_check_call_status(); zephir_array_update_string(&options, SL("secure"), &_11, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_8); ZVAL_STRING(&_8, "httponly"); - ZEPHIR_CALL_METHOD(&_12, this_ptr, "getarrval", NULL, 354, &options, &_8, &httpOnly); + ZEPHIR_CALL_METHOD(&_12, this_ptr, "getarrval", NULL, 355, &options, &_8, &httpOnly); zephir_check_call_status(); zephir_array_update_string(&options, SL("httponly"), &_12, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 355, &name, &__$null, &options); + ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 356, &name, &__$null, &options); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -855,30 +855,30 @@ PHP_METHOD(Phalcon_Http_Cookie, send) } ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "expires"); - ZEPHIR_CALL_METHOD(&_13, this_ptr, "getarrval", NULL, 354, &options, &_3, &expire); + ZEPHIR_CALL_METHOD(&_13, this_ptr, "getarrval", NULL, 355, &options, &_3, &expire); zephir_check_call_status(); zephir_array_update_string(&options, SL("expires"), &_13, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "domain"); - ZEPHIR_CALL_METHOD(&_14, this_ptr, "getarrval", NULL, 354, &options, &_3, &domain); + ZEPHIR_CALL_METHOD(&_14, this_ptr, "getarrval", NULL, 355, &options, &_3, &domain); zephir_check_call_status(); zephir_array_update_string(&options, SL("domain"), &_14, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "path"); - ZEPHIR_CALL_METHOD(&_15, this_ptr, "getarrval", NULL, 354, &options, &_3, &path); + ZEPHIR_CALL_METHOD(&_15, this_ptr, "getarrval", NULL, 355, &options, &_3, &path); zephir_check_call_status(); zephir_array_update_string(&options, SL("path"), &_15, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "secure"); - ZEPHIR_CALL_METHOD(&_16, this_ptr, "getarrval", NULL, 354, &options, &_3, &secure); + ZEPHIR_CALL_METHOD(&_16, this_ptr, "getarrval", NULL, 355, &options, &_3, &secure); zephir_check_call_status(); zephir_array_update_string(&options, SL("secure"), &_16, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "httponly"); - ZEPHIR_CALL_METHOD(&_17, this_ptr, "getarrval", NULL, 354, &options, &_3, &httpOnly); + ZEPHIR_CALL_METHOD(&_17, this_ptr, "getarrval", NULL, 355, &options, &_3, &httpOnly); zephir_check_call_status(); zephir_array_update_string(&options, SL("httponly"), &_17, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 355, &name, &encryptValue, &options); + ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 356, &name, &encryptValue, &options); zephir_check_call_status(); RETURN_THIS(); } @@ -1262,14 +1262,14 @@ PHP_METHOD(Phalcon_Http_Cookie, assertSignKeyIsLongEnough) } - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 253, &signKey); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 254, &signKey); zephir_check_call_status(); if (UNEXPECTED(ZEPHIR_LT_LONG(&length, 32))) { ZEPHIR_INIT_VAR(&_0$$3); object_init_ex(&_0$$3, phalcon_http_cookie_exception_ce); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "The cookie's key should be at least 32 characters long. Current length is %d."); - ZEPHIR_CALL_FUNCTION(&_2$$3, "sprintf", NULL, 144, &_1$$3, &length); + ZEPHIR_CALL_FUNCTION(&_2$$3, "sprintf", NULL, 145, &_1$$3, &length); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 31, &_2$$3); zephir_check_call_status(); diff --git a/ext/phalcon/http/message/request.zep.c b/ext/phalcon/http/message/request.zep.c index c48dea657b9..2fd21bd253b 100644 --- a/ext/phalcon/http/message/request.zep.c +++ b/ext/phalcon/http/message/request.zep.c @@ -111,13 +111,13 @@ PHP_METHOD(Phalcon_Http_Message_Request, __construct) if (UNEXPECTED(ZEPHIR_IS_IDENTICAL(&_0, body))) { ZEPHIR_INIT_NVAR(body); object_init_ex(body, phalcon_http_message_stream_input_ce); - ZEPHIR_CALL_METHOD(NULL, body, "__construct", NULL, 356); + ZEPHIR_CALL_METHOD(NULL, body, "__construct", NULL, 357); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&_1, this_ptr, "processuri", NULL, 357, uri); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "processuri", NULL, 358, uri); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("uri"), &_1); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "processheaders", NULL, 358, headers); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "processheaders", NULL, 359, headers); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("headers"), &_2); ZEPHIR_CALL_METHOD(&_3, this_ptr, "processmethod", NULL, 113, &method); diff --git a/ext/phalcon/http/message/requestfactory.zep.c b/ext/phalcon/http/message/requestfactory.zep.c index 296c78b6201..d462f6bc1e0 100644 --- a/ext/phalcon/http/message/requestfactory.zep.c +++ b/ext/phalcon/http/message/requestfactory.zep.c @@ -84,7 +84,7 @@ PHP_METHOD(Phalcon_Http_Message_RequestFactory, createRequest) object_init_ex(return_value, phalcon_http_message_request_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 359, &method, uri); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 360, &method, uri); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/http/message/response.zep.c b/ext/phalcon/http/message/response.zep.c index acd22afa678..1b4605dfa0f 100644 --- a/ext/phalcon/http/message/response.zep.c +++ b/ext/phalcon/http/message/response.zep.c @@ -161,9 +161,9 @@ PHP_METHOD(Phalcon_Http_Message_Response, __construct) ZVAL_LONG(&_0, code); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "processcode", NULL, 360, &_0); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "processcode", NULL, 361, &_0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "processheaders", NULL, 358, &headers); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "processheaders", NULL, 359, &headers); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("headers"), &_1); ZEPHIR_INIT_VAR(&_3); @@ -373,14 +373,14 @@ PHP_METHOD(Phalcon_Http_Message_Response, processCode) } - ZEPHIR_CALL_METHOD(&phrases, this_ptr, "getphrases", NULL, 361); + ZEPHIR_CALL_METHOD(&phrases, this_ptr, "getphrases", NULL, 362); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkcodetype", NULL, 362, code); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkcodetype", NULL, 363, code); zephir_check_call_status(); _0 = zephir_get_intval(code); ZEPHIR_INIT_NVAR(code); ZVAL_LONG(code, _0); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkcodevalue", NULL, 363, code); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkcodevalue", NULL, 364, code); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(phrase) != IS_STRING)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "Invalid response reason", "phalcon/Http/Message/Response.zep", 225); @@ -470,7 +470,7 @@ PHP_METHOD(Phalcon_Http_Message_Response, checkCodeValue) ZVAL_LONG(&_1, code); ZVAL_LONG(&_2, 100); ZVAL_LONG(&_3, 599); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "isbetween", NULL, 364, &_1, &_2, &_3); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "isbetween", NULL, 365, &_1, &_2, &_3); zephir_check_call_status(); if (!ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { ZEPHIR_INIT_VAR(&_4$$3); diff --git a/ext/phalcon/http/message/responsefactory.zep.c b/ext/phalcon/http/message/responsefactory.zep.c index 32bb1bdc717..d021975dd81 100644 --- a/ext/phalcon/http/message/responsefactory.zep.c +++ b/ext/phalcon/http/message/responsefactory.zep.c @@ -90,10 +90,10 @@ PHP_METHOD(Phalcon_Http_Message_ResponseFactory, createResponse) ZEPHIR_INIT_VAR(&_0); object_init_ex(&_0, phalcon_http_message_response_ce); - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 365); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 366); zephir_check_call_status(); ZVAL_LONG(&_1, code); - ZEPHIR_RETURN_CALL_METHOD(&_0, "withstatus", NULL, 366, &_1, &reasonPhrase); + ZEPHIR_RETURN_CALL_METHOD(&_0, "withstatus", NULL, 367, &_1, &reasonPhrase); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/http/message/serverrequest.zep.c b/ext/phalcon/http/message/serverrequest.zep.c index 850a20821fd..086e4f6197c 100644 --- a/ext/phalcon/http/message/serverrequest.zep.c +++ b/ext/phalcon/http/message/serverrequest.zep.c @@ -334,10 +334,10 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequest, __construct) if (UNEXPECTED(ZEPHIR_IS_IDENTICAL(&_0, body))) { ZEPHIR_INIT_NVAR(body); object_init_ex(body, phalcon_http_message_stream_input_ce); - ZEPHIR_CALL_METHOD(NULL, body, "__construct", NULL, 356); + ZEPHIR_CALL_METHOD(NULL, body, "__construct", NULL, 357); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkuploadedfiles", NULL, 367, &uploadFiles); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkuploadedfiles", NULL, 368, &uploadFiles); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_1, this_ptr, "processprotocol", NULL, 38, &protocol); zephir_check_call_status(); @@ -345,10 +345,10 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequest, __construct) ZEPHIR_CALL_METHOD(&_2, this_ptr, "processmethod", NULL, 113, &method); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("method"), &_2); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "processheaders", NULL, 358, headers); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "processheaders", NULL, 359, headers); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("headers"), &_3); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "processuri", NULL, 357, uri); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "processuri", NULL, 358, uri); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("uri"), &_4); ZEPHIR_INIT_VAR(&_6); @@ -696,7 +696,7 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequest, withUploadedFiles) zephir_get_arrval(&uploadedFiles, uploadedFiles_param); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkuploadedfiles", NULL, 367, &uploadedFiles); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkuploadedfiles", NULL, 368, &uploadedFiles); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "uploadedFiles"); @@ -796,7 +796,7 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequest, checkUploadedFiles) ZEPHIR_INIT_NVAR(&file); ZVAL_COPY(&file, _0); if (UNEXPECTED(Z_TYPE_P(&file) == IS_ARRAY)) { - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkuploadedfiles", &_2, 367, &file); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkuploadedfiles", &_2, 368, &file); zephir_check_call_status(); } else { _3$$5 = Z_TYPE_P(&file) == IS_OBJECT; @@ -821,7 +821,7 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequest, checkUploadedFiles) ZEPHIR_CALL_METHOD(&file, &files, "current", NULL, 0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&file) == IS_ARRAY)) { - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkuploadedfiles", &_2, 367, &file); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkuploadedfiles", &_2, 368, &file); zephir_check_call_status(); } else { _4$$9 = Z_TYPE_P(&file) == IS_OBJECT; diff --git a/ext/phalcon/http/message/serverrequestfactory.zep.c b/ext/phalcon/http/message/serverrequestfactory.zep.c index fe16576cdfb..c75be05e4f3 100644 --- a/ext/phalcon/http/message/serverrequestfactory.zep.c +++ b/ext/phalcon/http/message/serverrequestfactory.zep.c @@ -102,7 +102,7 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, createServerRequest) object_init_ex(return_value, phalcon_http_message_serverrequest_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 368, &method, uri, &serverParams); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 369, &method, uri, &serverParams); zephir_check_call_status(); RETURN_MM(); } @@ -238,22 +238,22 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, load) if (!(ZEPHIR_IS_EMPTY(&_SERVER))) { ZEPHIR_CPY_WRT(&globalServer, &_SERVER); } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "checknullarray", NULL, 369, &server, &globalServer); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "checknullarray", NULL, 370, &server, &globalServer); zephir_check_call_status(); ZEPHIR_CPY_WRT(&server, &_0); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "checknullarray", NULL, 369, &files, &globalFiles); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "checknullarray", NULL, 370, &files, &globalFiles); zephir_check_call_status(); ZEPHIR_CPY_WRT(&files, &_1); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "checknullarray", NULL, 369, &cookies, &globalCookies); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "checknullarray", NULL, 370, &cookies, &globalCookies); zephir_check_call_status(); ZEPHIR_CPY_WRT(&cookies, &_2); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "checknullarray", NULL, 369, &get, &globalGet); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "checknullarray", NULL, 370, &get, &globalGet); zephir_check_call_status(); ZEPHIR_CPY_WRT(&get, &_3); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "checknullarray", NULL, 369, &post, &globalPost); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "checknullarray", NULL, 370, &post, &globalPost); zephir_check_call_status(); ZEPHIR_CPY_WRT(&post, &_4); - ZEPHIR_CALL_METHOD(&serverCollection, this_ptr, "parseserver", NULL, 370, &server); + ZEPHIR_CALL_METHOD(&serverCollection, this_ptr, "parseserver", NULL, 371, &server); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5); ZVAL_STRING(&_5, "REQUEST_METHOD"); @@ -261,11 +261,11 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, load) ZVAL_STRING(&_6, "GET"); ZEPHIR_CALL_METHOD(&method, &serverCollection, "get", NULL, 0, &_5, &_6); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&protocol, this_ptr, "parseprotocol", NULL, 371, &serverCollection); + ZEPHIR_CALL_METHOD(&protocol, this_ptr, "parseprotocol", NULL, 372, &serverCollection); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&headers, this_ptr, "parseheaders", NULL, 372, &serverCollection); + ZEPHIR_CALL_METHOD(&headers, this_ptr, "parseheaders", NULL, 373, &serverCollection); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&filesCollection, this_ptr, "parseuploadedfiles", NULL, 373, &files); + ZEPHIR_CALL_METHOD(&filesCollection, this_ptr, "parseuploadedfiles", NULL, 374, &files); zephir_check_call_status(); ZEPHIR_CPY_WRT(&cookiesCollection, &cookies); _7 = ZEPHIR_IS_EMPTY(&cookies); @@ -281,11 +281,11 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, load) ZVAL_STRING(&_10$$8, "cookie"); ZEPHIR_CALL_METHOD(&_9$$8, &headers, "get", NULL, 0, &_10$$8); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&cookiesCollection, this_ptr, "parsecookieheader", NULL, 374, &_9$$8); + ZEPHIR_CALL_METHOD(&cookiesCollection, this_ptr, "parsecookieheader", NULL, 375, &_9$$8); zephir_check_call_status(); } object_init_ex(return_value, phalcon_http_message_serverrequest_ce); - ZEPHIR_CALL_METHOD(&_11, this_ptr, "parseuri", NULL, 375, &serverCollection, &headers); + ZEPHIR_CALL_METHOD(&_11, this_ptr, "parseuri", NULL, 376, &serverCollection, &headers); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_12, &serverCollection, "toarray", NULL, 0); zephir_check_call_status(); @@ -295,7 +295,7 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, load) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_5); ZVAL_STRING(&_5, "php://input"); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 368, &method, &_11, &_12, &_5, &_13, &cookiesCollection, &get, &_14, &post, &protocol); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 369, &method, &_11, &_12, &_5, &_13, &cookiesCollection, &get, &_14, &post, &protocol); zephir_check_call_status(); RETURN_MM(); } @@ -316,7 +316,7 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, getHeaders) ZEPHIR_MM_GROW(); if (EXPECTED((zephir_function_exists_ex(ZEND_STRL("apache_request_headers")) == SUCCESS))) { - ZEPHIR_RETURN_CALL_FUNCTION("apache_request_headers", NULL, 376); + ZEPHIR_RETURN_CALL_FUNCTION("apache_request_headers", NULL, 377); zephir_check_call_status(); RETURN_MM(); } @@ -372,14 +372,14 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, calculateUriHost) ZEPHIR_INIT_NVAR(&_0); ZVAL_STRING(&_0, "host"); ZVAL_BOOL(&_2, 0); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "getheader", NULL, 377, headers, &_0, &_2); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "getheader", NULL, 378, headers, &_0, &_2); zephir_check_call_status(); if (UNEXPECTED(zephir_is_true(&_1))) { ZEPHIR_INIT_VAR(&_3$$3); ZVAL_STRING(&_3$$3, "host"); - ZEPHIR_CALL_METHOD(&host, this_ptr, "getheader", NULL, 377, headers, &_3$$3); + ZEPHIR_CALL_METHOD(&host, this_ptr, "getheader", NULL, 378, headers, &_3$$3); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "calculateurihostfromheader", NULL, 378, &host); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "calculateurihostfromheader", NULL, 379, &host); zephir_check_call_status(); RETURN_MM(); } @@ -669,7 +669,7 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, calculateUriScheme) ZVAL_STRING(&_1, "x-forwarded-proto"); ZEPHIR_INIT_VAR(&_8); ZVAL_STRING(&_8, "https"); - ZEPHIR_CALL_METHOD(&header, this_ptr, "getheader", NULL, 377, headers, &_1, &_8); + ZEPHIR_CALL_METHOD(&header, this_ptr, "getheader", NULL, 378, headers, &_1, &_8); zephir_check_call_status(); _9 = !zephir_is_true(&isHttps); if (!(_9)) { @@ -795,7 +795,7 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, createUploadedFile) zephir_array_fetch_string(&_4, &file, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Http/Message/ServerRequestFactory.zep", 325); zephir_array_fetch_string(&_5, &file, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Message/ServerRequestFactory.zep", 326); zephir_array_fetch_string(&_6, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Message/ServerRequestFactory.zep", 327); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 379, &_4, &_5, &_6, &name, &type); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 380, &_4, &_5, &_6, &name, &type); zephir_check_call_status(); RETURN_MM(); } @@ -897,7 +897,7 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, parseCookieHeader) ZEPHIR_CALL_FUNCTION(&_1, "strtr", NULL, 5, &cookieHeader, &_0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&cookies); - ZEPHIR_CALL_FUNCTION(NULL, "parse_str", NULL, 380, &_1, &cookies); + ZEPHIR_CALL_FUNCTION(NULL, "parse_str", NULL, 381, &_1, &cookies); ZEPHIR_UNREF(&cookies); zephir_check_call_status(); RETURN_CCTOR(&cookies); @@ -1278,7 +1278,7 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, parseServer) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "HTTP_AUTHORIZATION"); - ZEPHIR_CALL_METHOD(&_0, &collection, "has", NULL, 381, &_1); + ZEPHIR_CALL_METHOD(&_0, &collection, "has", NULL, 382, &_1); zephir_check_call_status(); _2 = !zephir_is_true(&_0); if (_2) { @@ -1291,12 +1291,12 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, parseServer) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4$$3); ZVAL_STRING(&_4$$3, "Authorization"); - ZEPHIR_CALL_METHOD(&_3$$3, &headersCollection, "has", NULL, 381, &_4$$3); + ZEPHIR_CALL_METHOD(&_3$$3, &headersCollection, "has", NULL, 382, &_4$$3); zephir_check_call_status(); if (UNEXPECTED(zephir_is_true(&_3$$3))) { ZEPHIR_INIT_VAR(&_6$$4); ZVAL_STRING(&_6$$4, "Authorization"); - ZEPHIR_CALL_METHOD(&_5$$4, &headersCollection, "get", NULL, 382, &_6$$4); + ZEPHIR_CALL_METHOD(&_5$$4, &headersCollection, "get", NULL, 383, &_6$$4); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_6$$4); ZVAL_STRING(&_6$$4, "HTTP_AUTHORIZATION"); @@ -1385,14 +1385,14 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, parseUploadedFiles) _7$$3 = zephir_array_isset_string(&file, SL("tmp_name")); } if (EXPECTED(_7$$3)) { - ZEPHIR_CALL_METHOD(&_8$$5, this_ptr, "createuploadedfile", &_9, 383, &file); + ZEPHIR_CALL_METHOD(&_8$$5, this_ptr, "createuploadedfile", &_9, 384, &file); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &collection, "set", &_6, 42, &key, &_8$$5); zephir_check_call_status(); continue; } if (UNEXPECTED(Z_TYPE_P(&file) == IS_ARRAY)) { - ZEPHIR_CALL_METHOD(&data, this_ptr, "parseuploadedfiles", &_10, 373, &file); + ZEPHIR_CALL_METHOD(&data, this_ptr, "parseuploadedfiles", &_10, 374, &file); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_11$$6, &data, "toarray", NULL, 0); zephir_check_call_status(); @@ -1430,14 +1430,14 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, parseUploadedFiles) _14$$7 = zephir_array_isset_string(&file, SL("tmp_name")); } if (EXPECTED(_14$$7)) { - ZEPHIR_CALL_METHOD(&_15$$9, this_ptr, "createuploadedfile", &_9, 383, &file); + ZEPHIR_CALL_METHOD(&_15$$9, this_ptr, "createuploadedfile", &_9, 384, &file); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &collection, "set", &_6, 42, &key, &_15$$9); zephir_check_call_status(); continue; } if (UNEXPECTED(Z_TYPE_P(&file) == IS_ARRAY)) { - ZEPHIR_CALL_METHOD(&data, this_ptr, "parseuploadedfiles", &_10, 373, &file); + ZEPHIR_CALL_METHOD(&data, this_ptr, "parseuploadedfiles", &_10, 374, &file); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_16$$10, &data, "toarray", NULL, 0); zephir_check_call_status(); @@ -1504,30 +1504,30 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, parseUri) object_init_ex(&uri, phalcon_http_message_uri_ce); ZEPHIR_CALL_METHOD(NULL, &uri, "__construct", NULL, 114); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&scheme, this_ptr, "calculateurischeme", NULL, 384, server, headers); + ZEPHIR_CALL_METHOD(&scheme, this_ptr, "calculateurischeme", NULL, 385, server, headers); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_0, &uri, "withscheme", NULL, 385, &scheme); + ZEPHIR_CALL_METHOD(&_0, &uri, "withscheme", NULL, 386, &scheme); zephir_check_call_status(); ZEPHIR_CPY_WRT(&uri, &_0); - ZEPHIR_CALL_METHOD(&split, this_ptr, "calculateurihost", NULL, 386, server, headers); + ZEPHIR_CALL_METHOD(&split, this_ptr, "calculateurihost", NULL, 387, server, headers); zephir_check_call_status(); ZEPHIR_OBS_VAR(&_1); zephir_array_fetch_long(&_1, &split, 0, PH_NOISY, "phalcon/Http/Message/ServerRequestFactory.zep", 585); if (EXPECTED(!(ZEPHIR_IS_EMPTY(&_1)))) { zephir_array_fetch_long(&_3$$3, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Message/ServerRequestFactory.zep", 586); - ZEPHIR_CALL_METHOD(&_2$$3, &uri, "withhost", NULL, 387, &_3$$3); + ZEPHIR_CALL_METHOD(&_2$$3, &uri, "withhost", NULL, 388, &_3$$3); zephir_check_call_status(); ZEPHIR_CPY_WRT(&uri, &_2$$3); ZEPHIR_OBS_VAR(&_4$$3); zephir_array_fetch_long(&_4$$3, &split, 1, PH_NOISY, "phalcon/Http/Message/ServerRequestFactory.zep", 587); if (UNEXPECTED(!(ZEPHIR_IS_EMPTY(&_4$$3)))) { zephir_array_fetch_long(&_6$$4, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Message/ServerRequestFactory.zep", 588); - ZEPHIR_CALL_METHOD(&_5$$4, &uri, "withport", NULL, 388, &_6$$4); + ZEPHIR_CALL_METHOD(&_5$$4, &uri, "withport", NULL, 389, &_6$$4); zephir_check_call_status(); ZEPHIR_CPY_WRT(&uri, &_5$$4); } } - ZEPHIR_CALL_METHOD(&path, this_ptr, "calculateuripath", NULL, 389, server); + ZEPHIR_CALL_METHOD(&path, this_ptr, "calculateuripath", NULL, 390, server); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&split); zephir_fast_explode_str(&split, SL("#"), &path, LONG_MAX); @@ -1535,18 +1535,18 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, parseUri) ZEPHIR_INIT_NVAR(&path); zephir_fast_explode_str(&path, SL("?"), &_7, LONG_MAX); zephir_array_fetch_long(&_8, &path, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Message/ServerRequestFactory.zep", 598); - ZEPHIR_CALL_METHOD(&_0, &uri, "withpath", NULL, 390, &_8); + ZEPHIR_CALL_METHOD(&_0, &uri, "withpath", NULL, 391, &_8); zephir_check_call_status(); ZEPHIR_CPY_WRT(&uri, &_0); if (UNEXPECTED(zephir_fast_count_int(&split) > 1)) { zephir_array_fetch_long(&_10$$5, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Message/ServerRequestFactory.zep", 601); - ZEPHIR_CALL_METHOD(&_9$$5, &uri, "withfragment", NULL, 391, &_10$$5); + ZEPHIR_CALL_METHOD(&_9$$5, &uri, "withfragment", NULL, 392, &_10$$5); zephir_check_call_status(); ZEPHIR_CPY_WRT(&uri, &_9$$5); } - ZEPHIR_CALL_METHOD(&query, this_ptr, "calculateuriquery", NULL, 392, server); + ZEPHIR_CALL_METHOD(&query, this_ptr, "calculateuriquery", NULL, 393, server); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_0, &uri, "withquery", NULL, 393, &query); + ZEPHIR_CALL_METHOD(&_0, &uri, "withquery", NULL, 394, &query); zephir_check_call_status(); ZEPHIR_CPY_WRT(&uri, &_0); RETURN_CCTOR(&uri); diff --git a/ext/phalcon/http/message/streamfactory.zep.c b/ext/phalcon/http/message/streamfactory.zep.c index 1abfe458d16..b47ab5443cc 100644 --- a/ext/phalcon/http/message/streamfactory.zep.c +++ b/ext/phalcon/http/message/streamfactory.zep.c @@ -103,9 +103,9 @@ PHP_METHOD(Phalcon_Http_Message_StreamFactory, createStream) return; } zephir_fwrite(NULL, &handle, &content); - ZEPHIR_CALL_FUNCTION(NULL, "rewind", NULL, 394, &handle); + ZEPHIR_CALL_FUNCTION(NULL, "rewind", NULL, 395, &handle); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "createstreamfromresource", NULL, 395, &handle); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "createstreamfromresource", NULL, 396, &handle); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/http/message/uploadedfile.zep.c b/ext/phalcon/http/message/uploadedfile.zep.c index d7cb2a5f175..8c9f6e103af 100644 --- a/ext/phalcon/http/message/uploadedfile.zep.c +++ b/ext/phalcon/http/message/uploadedfile.zep.c @@ -256,10 +256,10 @@ PHP_METHOD(Phalcon_Http_Message_UploadedFile, __construct) ZVAL_LONG(&_0, error); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkstream", NULL, 396, stream, &_0); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkstream", NULL, 397, stream, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, error); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkerror", NULL, 397, &_0); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkerror", NULL, 398, &_0); zephir_check_call_status(); ZEPHIR_INIT_ZVAL_NREF(_0); ZVAL_LONG(&_0, size); @@ -308,7 +308,7 @@ PHP_METHOD(Phalcon_Http_Message_UploadedFile, getStream) ZEPHIR_INIT_VAR(&_1$$3); object_init_ex(&_1$$3, phalcon_http_message_exception_invalidargumentexception_ce); zephir_read_property(&_3$$3, this_ptr, ZEND_STRL("error"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "geterrordescription", NULL, 398, &_3$$3); + ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "geterrordescription", NULL, 399, &_3$$3); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 40, &_2$$3); zephir_check_call_status(); @@ -415,7 +415,7 @@ PHP_METHOD(Phalcon_Http_Message_UploadedFile, moveTo) ZEPHIR_INIT_VAR(&_2$$4); object_init_ex(&_2$$4, phalcon_http_message_exception_invalidargumentexception_ce); zephir_read_property(&_4$$4, this_ptr, ZEND_STRL("error"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "geterrordescription", NULL, 398, &_4$$4); + ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "geterrordescription", NULL, 399, &_4$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_2$$4, "__construct", NULL, 40, &_3$$4); zephir_check_call_status(); @@ -429,17 +429,17 @@ PHP_METHOD(Phalcon_Http_Message_UploadedFile, moveTo) } _6 = _5; if (_6) { - ZEPHIR_CALL_FUNCTION(&_7, "dirname", NULL, 399, targetPath); + ZEPHIR_CALL_FUNCTION(&_7, "dirname", NULL, 400, targetPath); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_8, "is_dir", NULL, 159, &_7); + ZEPHIR_CALL_FUNCTION(&_8, "is_dir", NULL, 160, &_7); zephir_check_call_status(); _6 = zephir_is_true(&_8); } _9 = _6; if (_9) { - ZEPHIR_CALL_FUNCTION(&_10, "dirname", NULL, 399, targetPath); + ZEPHIR_CALL_FUNCTION(&_10, "dirname", NULL, 400, targetPath); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_11, "is_writable", NULL, 400, &_10); + ZEPHIR_CALL_FUNCTION(&_11, "is_writable", NULL, 401, &_10); zephir_check_call_status(); _9 = zephir_is_true(&_11); } @@ -449,7 +449,7 @@ PHP_METHOD(Phalcon_Http_Message_UploadedFile, moveTo) } ZEPHIR_INIT_VAR(&_12); ZVAL_STRING(&_12, "PHP_SAPI"); - ZEPHIR_CALL_FUNCTION(&sapi, "constant", NULL, 146, &_12); + ZEPHIR_CALL_FUNCTION(&sapi, "constant", NULL, 147, &_12); zephir_check_call_status(); _13 = ZEPHIR_IS_EMPTY(&sapi); if (!(_13)) { @@ -466,11 +466,11 @@ PHP_METHOD(Phalcon_Http_Message_UploadedFile, moveTo) _16 = zephir_start_with_str(&sapi, SL("phpdbg")); } if (UNEXPECTED(_16)) { - ZEPHIR_CALL_METHOD(NULL, this_ptr, "storefile", NULL, 401, targetPath); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "storefile", NULL, 402, targetPath); zephir_check_call_status(); } else { zephir_read_property(&_17$$7, this_ptr, ZEND_STRL("fileName"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_18$$7, "move_uploaded_file", NULL, 402, &_17$$7, targetPath); + ZEPHIR_CALL_FUNCTION(&_18$$7, "move_uploaded_file", NULL, 403, &_17$$7, targetPath); zephir_check_call_status(); if (!ZEPHIR_IS_TRUE_IDENTICAL(&_18$$7)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "The file cannot be moved to the target folder", "phalcon/Http/Message/UploadedFile.zep", 243); @@ -517,7 +517,7 @@ PHP_METHOD(Phalcon_Http_Message_UploadedFile, checkError) ZVAL_LONG(&_1, error); ZVAL_LONG(&_2, 0); ZVAL_LONG(&_3, 8); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "isbetween", NULL, 403, &_1, &_2, &_3); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "isbetween", NULL, 404, &_1, &_2, &_3); zephir_check_call_status(); if (UNEXPECTED(!ZEPHIR_IS_TRUE_IDENTICAL(&_0))) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "Invalid error. Must be one of the UPLOAD_ERR_* constants", "phalcon/Http/Message/UploadedFile.zep", 260); @@ -675,7 +675,7 @@ PHP_METHOD(Phalcon_Http_Message_UploadedFile, storeFile) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "Cannot write to file.", "phalcon/Http/Message/UploadedFile.zep", 331); return; } - ZEPHIR_CALL_METHOD(&stream, this_ptr, "getstream", NULL, 404); + ZEPHIR_CALL_METHOD(&stream, this_ptr, "getstream", NULL, 405); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &stream, "rewind", NULL, 0); zephir_check_call_status(); diff --git a/ext/phalcon/http/message/uploadedfilefactory.zep.c b/ext/phalcon/http/message/uploadedfilefactory.zep.c index 598bb1e53a1..84330283db2 100644 --- a/ext/phalcon/http/message/uploadedfilefactory.zep.c +++ b/ext/phalcon/http/message/uploadedfilefactory.zep.c @@ -112,7 +112,7 @@ PHP_METHOD(Phalcon_Http_Message_UploadedFileFactory, createUploadedFile) object_init_ex(return_value, phalcon_http_message_uploadedfile_ce); ZVAL_LONG(&_0, size); ZVAL_LONG(&_1, error); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 379, stream, &_0, &_1, &clientFilename, &clientMediaType); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 380, stream, &_0, &_1, &clientFilename, &clientMediaType); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/http/message/uri.zep.c b/ext/phalcon/http/message/uri.zep.c index 2abb42b2e1c..1e5fdff358d 100644 --- a/ext/phalcon/http/message/uri.zep.c +++ b/ext/phalcon/http/message/uri.zep.c @@ -283,7 +283,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, __construct) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, ""); if (UNEXPECTED(!ZEPHIR_IS_IDENTICAL(&_0, &uri))) { - ZEPHIR_CALL_FUNCTION(&urlParts, "parse_url", NULL, 129, &uri); + ZEPHIR_CALL_FUNCTION(&urlParts, "parse_url", NULL, 130, &uri); zephir_check_call_status(); if (UNEXPECTED(ZEPHIR_IS_FALSE_IDENTICAL(&urlParts))) { ZEPHIR_INIT_NVAR(&urlParts); @@ -293,9 +293,9 @@ PHP_METHOD(Phalcon_Http_Message_Uri, __construct) ZVAL_STRING(&_3$$3, "fragment"); ZEPHIR_INIT_VAR(&_4$$3); ZVAL_STRING(&_4$$3, ""); - ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "getarrval", NULL, 405, &urlParts, &_3$$3, &_4$$3); + ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "getarrval", NULL, 406, &urlParts, &_3$$3, &_4$$3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "filterfragment", NULL, 406, &_2$$3); + ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "filterfragment", NULL, 407, &_2$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("fragment"), &_1$$3); ZEPHIR_INIT_NVAR(&_3$$3); @@ -303,7 +303,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, __construct) ZVAL_STRING(&_4$$3, "host"); ZEPHIR_INIT_VAR(&_6$$3); ZVAL_STRING(&_6$$3, ""); - ZEPHIR_CALL_METHOD(&_5$$3, this_ptr, "getarrval", NULL, 405, &urlParts, &_4$$3, &_6$$3); + ZEPHIR_CALL_METHOD(&_5$$3, this_ptr, "getarrval", NULL, 406, &urlParts, &_4$$3, &_6$$3); zephir_check_call_status(); zephir_fast_strtolower(&_3$$3, &_5$$3); zephir_update_property_zval(this_ptr, ZEND_STRL("host"), &_3$$3); @@ -311,53 +311,53 @@ PHP_METHOD(Phalcon_Http_Message_Uri, __construct) ZVAL_STRING(&_4$$3, "pass"); ZEPHIR_INIT_NVAR(&_6$$3); ZVAL_STRING(&_6$$3, ""); - ZEPHIR_CALL_METHOD(&_7$$3, this_ptr, "getarrval", NULL, 405, &urlParts, &_4$$3, &_6$$3); + ZEPHIR_CALL_METHOD(&_7$$3, this_ptr, "getarrval", NULL, 406, &urlParts, &_4$$3, &_6$$3); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_8$$3, "rawurlencode", NULL, 350, &_7$$3); + ZEPHIR_CALL_FUNCTION(&_8$$3, "rawurlencode", NULL, 351, &_7$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("pass"), &_8$$3); ZEPHIR_INIT_NVAR(&_4$$3); ZVAL_STRING(&_4$$3, "path"); ZEPHIR_INIT_NVAR(&_6$$3); ZVAL_STRING(&_6$$3, ""); - ZEPHIR_CALL_METHOD(&_10$$3, this_ptr, "getarrval", NULL, 405, &urlParts, &_4$$3, &_6$$3); + ZEPHIR_CALL_METHOD(&_10$$3, this_ptr, "getarrval", NULL, 406, &urlParts, &_4$$3, &_6$$3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_9$$3, this_ptr, "filterpath", NULL, 407, &_10$$3); + ZEPHIR_CALL_METHOD(&_9$$3, this_ptr, "filterpath", NULL, 408, &_10$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("path"), &_9$$3); ZEPHIR_INIT_NVAR(&_4$$3); ZVAL_STRING(&_4$$3, "port"); ZVAL_NULL(&_13$$3); - ZEPHIR_CALL_METHOD(&_12$$3, this_ptr, "getarrval", NULL, 405, &urlParts, &_4$$3, &_13$$3); + ZEPHIR_CALL_METHOD(&_12$$3, this_ptr, "getarrval", NULL, 406, &urlParts, &_4$$3, &_13$$3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_11$$3, this_ptr, "filterport", NULL, 408, &_12$$3); + ZEPHIR_CALL_METHOD(&_11$$3, this_ptr, "filterport", NULL, 409, &_12$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("port"), &_11$$3); ZEPHIR_INIT_NVAR(&_4$$3); ZVAL_STRING(&_4$$3, "query"); ZEPHIR_INIT_NVAR(&_6$$3); ZVAL_STRING(&_6$$3, ""); - ZEPHIR_CALL_METHOD(&_15$$3, this_ptr, "getarrval", NULL, 405, &urlParts, &_4$$3, &_6$$3); + ZEPHIR_CALL_METHOD(&_15$$3, this_ptr, "getarrval", NULL, 406, &urlParts, &_4$$3, &_6$$3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_14$$3, this_ptr, "filterquery", NULL, 409, &_15$$3); + ZEPHIR_CALL_METHOD(&_14$$3, this_ptr, "filterquery", NULL, 410, &_15$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("query"), &_14$$3); ZEPHIR_INIT_NVAR(&_4$$3); ZVAL_STRING(&_4$$3, "scheme"); ZEPHIR_INIT_NVAR(&_6$$3); ZVAL_STRING(&_6$$3, ""); - ZEPHIR_CALL_METHOD(&_17$$3, this_ptr, "getarrval", NULL, 405, &urlParts, &_4$$3, &_6$$3); + ZEPHIR_CALL_METHOD(&_17$$3, this_ptr, "getarrval", NULL, 406, &urlParts, &_4$$3, &_6$$3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_16$$3, this_ptr, "filterscheme", NULL, 410, &_17$$3); + ZEPHIR_CALL_METHOD(&_16$$3, this_ptr, "filterscheme", NULL, 411, &_17$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("scheme"), &_16$$3); ZEPHIR_INIT_NVAR(&_4$$3); ZVAL_STRING(&_4$$3, "user"); ZEPHIR_INIT_NVAR(&_6$$3); ZVAL_STRING(&_6$$3, ""); - ZEPHIR_CALL_METHOD(&_18$$3, this_ptr, "getarrval", NULL, 405, &urlParts, &_4$$3, &_6$$3); + ZEPHIR_CALL_METHOD(&_18$$3, this_ptr, "getarrval", NULL, 406, &urlParts, &_4$$3, &_6$$3); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_19$$3, "rawurlencode", NULL, 350, &_18$$3); + ZEPHIR_CALL_FUNCTION(&_19$$3, "rawurlencode", NULL, 351, &_18$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("user"), &_19$$3); } @@ -401,7 +401,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, __toString) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&authority, this_ptr, "getauthority", NULL, 411); + ZEPHIR_CALL_METHOD(&authority, this_ptr, "getauthority", NULL, 412); zephir_check_call_status(); zephir_read_property(&_0, this_ptr, ZEND_STRL("path"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&path, &_0); @@ -427,21 +427,21 @@ PHP_METHOD(Phalcon_Http_Message_Uri, __toString) ZVAL_STRING(&_7, ""); ZEPHIR_INIT_VAR(&_8); ZVAL_STRING(&_8, ":"); - ZEPHIR_CALL_METHOD(&_6, this_ptr, "checkvalue", NULL, 412, &_0, &_7, &_8); + ZEPHIR_CALL_METHOD(&_6, this_ptr, "checkvalue", NULL, 413, &_0, &_7, &_8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_7); ZVAL_STRING(&_7, "//"); - ZEPHIR_CALL_METHOD(&_9, this_ptr, "checkvalue", NULL, 412, &authority, &_7); + ZEPHIR_CALL_METHOD(&_9, this_ptr, "checkvalue", NULL, 413, &authority, &_7); zephir_check_call_status(); zephir_read_property(&_11, this_ptr, ZEND_STRL("query"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_7); ZVAL_STRING(&_7, "?"); - ZEPHIR_CALL_METHOD(&_10, this_ptr, "checkvalue", NULL, 412, &_11, &_7); + ZEPHIR_CALL_METHOD(&_10, this_ptr, "checkvalue", NULL, 413, &_11, &_7); zephir_check_call_status(); zephir_read_property(&_13, this_ptr, ZEND_STRL("fragment"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_7); ZVAL_STRING(&_7, "#"); - ZEPHIR_CALL_METHOD(&_12, this_ptr, "checkvalue", NULL, 412, &_13, &_7); + ZEPHIR_CALL_METHOD(&_12, this_ptr, "checkvalue", NULL, 413, &_13, &_7); zephir_check_call_status(); ZEPHIR_INIT_VAR(&uri); ZEPHIR_CONCAT_VVVVV(&uri, &_6, &_9, &path, &_10, &_12); @@ -481,7 +481,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, getAuthority) } ZEPHIR_OBS_VAR(&authority); zephir_read_property(&authority, this_ptr, ZEND_STRL("host"), PH_NOISY_CC); - ZEPHIR_CALL_METHOD(&userInfo, this_ptr, "getuserinfo", NULL, 413); + ZEPHIR_CALL_METHOD(&userInfo, this_ptr, "getuserinfo", NULL, 414); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, ""); @@ -579,7 +579,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, withFragment) ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkstringparameter", NULL, 20, fragment); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "filterfragment", NULL, 406, fragment); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "filterfragment", NULL, 407, fragment); zephir_check_call_status(); ZEPHIR_CPY_WRT(fragment, &_0); ZEPHIR_INIT_VAR(&_1); @@ -658,7 +658,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, withPath) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "Path cannot contain a query string or fragment", "phalcon/Http/Message/Uri.zep", 288); return; } - ZEPHIR_CALL_METHOD(&_5, this_ptr, "filterpath", NULL, 407, path); + ZEPHIR_CALL_METHOD(&_5, this_ptr, "filterpath", NULL, 408, path); zephir_check_call_status(); ZEPHIR_CPY_WRT(path, &_5); ZEPHIR_INIT_VAR(&_6); @@ -710,7 +710,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, withPort) if (UNEXPECTED(Z_TYPE_P(port) != IS_NULL)) { - ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "filterport", NULL, 408, port); + ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "filterport", NULL, 409, port); zephir_check_call_status(); ZEPHIR_CPY_WRT(port, &_0$$3); _1$$3 = Z_TYPE_P(port) != IS_NULL; @@ -784,7 +784,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, withQuery) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_http_message_exception_invalidargumentexception_ce, "Query cannot contain a query fragment", "phalcon/Http/Message/Uri.zep", 351); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "filterquery", NULL, 409, query); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "filterquery", NULL, 410, query); zephir_check_call_status(); ZEPHIR_CPY_WRT(query, &_2); ZEPHIR_INIT_VAR(&_3); @@ -836,12 +836,12 @@ PHP_METHOD(Phalcon_Http_Message_Uri, withScheme) ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkstringparameter", NULL, 20, scheme); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "filterscheme", NULL, 410, scheme); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "filterscheme", NULL, 411, scheme); zephir_check_call_status(); ZEPHIR_CPY_WRT(scheme, &_0); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "scheme"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processwith", NULL, 414, scheme, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processwith", NULL, 415, scheme, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -895,11 +895,11 @@ PHP_METHOD(Phalcon_Http_Message_Uri, withUserInfo) ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkstringparameter", NULL, 20, user); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_0, "rawurlencode", NULL, 350, user); + ZEPHIR_CALL_FUNCTION(&_0, "rawurlencode", NULL, 351, user); zephir_check_call_status(); ZEPHIR_CPY_WRT(user, &_0); if (UNEXPECTED(Z_TYPE_P(password) != IS_NULL)) { - ZEPHIR_CALL_FUNCTION(&_1$$4, "rawurlencode", NULL, 350, password); + ZEPHIR_CALL_FUNCTION(&_1$$4, "rawurlencode", NULL, 351, password); zephir_check_call_status(); ZEPHIR_CPY_WRT(password, &_1$$4); } @@ -948,7 +948,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, withHost) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "host"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processwith", NULL, 414, host, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processwith", NULL, 415, host, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -1084,7 +1084,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, filterFragment) } - ZEPHIR_RETURN_CALL_FUNCTION("rawurlencode", NULL, 350, &fragment); + ZEPHIR_RETURN_CALL_FUNCTION("rawurlencode", NULL, 351, &fragment); zephir_check_call_status(); RETURN_MM(); } @@ -1182,7 +1182,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, filterPath) } ZEPHIR_INIT_NVAR(&element); ZVAL_COPY(&element, _2); - ZEPHIR_CALL_FUNCTION(&_6$$4, "rawurlencode", &_7, 350, &element); + ZEPHIR_CALL_FUNCTION(&_6$$4, "rawurlencode", &_7, 351, &element); zephir_check_call_status(); zephir_array_update_zval(&parts, &key, &_6$$4, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -1199,7 +1199,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, filterPath) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&element, &parts, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_8$$5, "rawurlencode", &_7, 350, &element); + ZEPHIR_CALL_FUNCTION(&_8$$5, "rawurlencode", &_7, 351, &element); zephir_check_call_status(); zephir_array_update_zval(&parts, &key, &_8$$5, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &parts, "next", NULL, 0); @@ -1359,21 +1359,21 @@ PHP_METHOD(Phalcon_Http_Message_Uri, filterQuery) } ZEPHIR_INIT_NVAR(&part); ZVAL_COPY(&part, _3); - ZEPHIR_CALL_METHOD(&split, this_ptr, "splitqueryvalue", &_7, 415, &part); + ZEPHIR_CALL_METHOD(&split, this_ptr, "splitqueryvalue", &_7, 416, &part); zephir_check_call_status(); zephir_array_fetch_long(&_8$$4, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Message/Uri.zep", 587); if (UNEXPECTED(Z_TYPE_P(&_8$$4) == IS_NULL)) { zephir_array_fetch_long(&_9$$5, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Message/Uri.zep", 588); - ZEPHIR_CALL_FUNCTION(&_10$$5, "rawurlencode", &_11, 350, &_9$$5); + ZEPHIR_CALL_FUNCTION(&_10$$5, "rawurlencode", &_11, 351, &_9$$5); zephir_check_call_status(); zephir_array_update_zval(&parts, &index, &_10$$5, PH_COPY | PH_SEPARATE); continue; } zephir_array_fetch_long(&_12$$4, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Message/Uri.zep", 592); - ZEPHIR_CALL_FUNCTION(&_13$$4, "rawurlencode", &_11, 350, &_12$$4); + ZEPHIR_CALL_FUNCTION(&_13$$4, "rawurlencode", &_11, 351, &_12$$4); zephir_check_call_status(); zephir_array_fetch_long(&_14$$4, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Message/Uri.zep", 592); - ZEPHIR_CALL_FUNCTION(&_15$$4, "rawurlencode", &_11, 350, &_14$$4); + ZEPHIR_CALL_FUNCTION(&_15$$4, "rawurlencode", &_11, 351, &_14$$4); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_16$$4); ZEPHIR_CONCAT_VSV(&_16$$4, &_13$$4, "=", &_15$$4); @@ -1392,21 +1392,21 @@ PHP_METHOD(Phalcon_Http_Message_Uri, filterQuery) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&part, &parts, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&split, this_ptr, "splitqueryvalue", &_7, 415, &part); + ZEPHIR_CALL_METHOD(&split, this_ptr, "splitqueryvalue", &_7, 416, &part); zephir_check_call_status(); zephir_array_fetch_long(&_17$$6, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Message/Uri.zep", 587); if (UNEXPECTED(Z_TYPE_P(&_17$$6) == IS_NULL)) { zephir_array_fetch_long(&_18$$7, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Message/Uri.zep", 588); - ZEPHIR_CALL_FUNCTION(&_19$$7, "rawurlencode", &_11, 350, &_18$$7); + ZEPHIR_CALL_FUNCTION(&_19$$7, "rawurlencode", &_11, 351, &_18$$7); zephir_check_call_status(); zephir_array_update_zval(&parts, &index, &_19$$7, PH_COPY | PH_SEPARATE); continue; } zephir_array_fetch_long(&_20$$6, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Message/Uri.zep", 592); - ZEPHIR_CALL_FUNCTION(&_21$$6, "rawurlencode", &_11, 350, &_20$$6); + ZEPHIR_CALL_FUNCTION(&_21$$6, "rawurlencode", &_11, 351, &_20$$6); zephir_check_call_status(); zephir_array_fetch_long(&_22$$6, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Message/Uri.zep", 592); - ZEPHIR_CALL_FUNCTION(&_23$$6, "rawurlencode", &_11, 350, &_22$$6); + ZEPHIR_CALL_FUNCTION(&_23$$6, "rawurlencode", &_11, 351, &_22$$6); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_24$$6); ZEPHIR_CONCAT_VSV(&_24$$6, &_21$$6, "=", &_23$$6); diff --git a/ext/phalcon/http/request.zep.c b/ext/phalcon/http/request.zep.c index ddbb071129c..449c6eceb80 100644 --- a/ext/phalcon/http/request.zep.c +++ b/ext/phalcon/http/request.zep.c @@ -221,7 +221,7 @@ PHP_METHOD(Phalcon_Http_Request, get) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 416, &_REQUEST, &name, filters, defaultValue, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 417, &_REQUEST, &name, filters, defaultValue, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -247,7 +247,7 @@ PHP_METHOD(Phalcon_Http_Request, getAcceptableContent) ZVAL_STRING(&_0, "HTTP_ACCEPT"); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "accept"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 417, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 418, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -274,13 +274,13 @@ PHP_METHOD(Phalcon_Http_Request, getBasicAuth) ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "PHP_AUTH_USER"); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 418, &_1); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 419, &_1); zephir_check_call_status(); _2 = !zephir_is_true(&_0); if (!(_2)) { ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "PHP_AUTH_PW"); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "hasserver", NULL, 418, &_1); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "hasserver", NULL, 419, &_1); zephir_check_call_status(); _2 = !zephir_is_true(&_3); } @@ -322,7 +322,7 @@ PHP_METHOD(Phalcon_Http_Request, getBestAccept) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "accept"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 419, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 420, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -348,7 +348,7 @@ PHP_METHOD(Phalcon_Http_Request, getBestCharset) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "charset"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 419, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 420, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -374,7 +374,7 @@ PHP_METHOD(Phalcon_Http_Request, getBestLanguage) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "language"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 419, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 420, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -463,7 +463,7 @@ PHP_METHOD(Phalcon_Http_Request, getClientAddress) ZEPHIR_INIT_VAR(&address); ZVAL_NULL(&address); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 420); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 421); zephir_check_call_status(); if (trustForwardedHeader) { ZEPHIR_OBS_NVAR(&address); @@ -510,7 +510,7 @@ PHP_METHOD(Phalcon_Http_Request, getClientCharsets) ZVAL_STRING(&_0, "HTTP_ACCEPT_CHARSET"); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "charset"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 417, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 418, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -531,7 +531,7 @@ PHP_METHOD(Phalcon_Http_Request, getContentType) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 420); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 421); zephir_check_call_status(); if (!(zephir_array_isset_string_fetch(&contentType, &server, SL("CONTENT_TYPE"), 1))) { RETURN_MM_NULL(); @@ -570,7 +570,7 @@ PHP_METHOD(Phalcon_Http_Request, getDigestAuth) ZEPHIR_INIT_VAR(&auth); array_init(&auth); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 420); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 421); zephir_check_call_status(); ZEPHIR_OBS_VAR(&digest); if (zephir_array_isset_string_fetch(&digest, &server, SL("PHP_AUTH_DIGEST"), 0)) { @@ -925,7 +925,7 @@ PHP_METHOD(Phalcon_Http_Request, getHeader) zephir_check_call_status(); ZEPHIR_INIT_VAR(&name); zephir_fast_strtoupper(&name, &_2); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 420); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 421); zephir_check_call_status(); ZEPHIR_OBS_VAR(&value); if (zephir_array_isset_fetch(&value, &server, &name, 0)) { @@ -1019,7 +1019,7 @@ PHP_METHOD(Phalcon_Http_Request, getHeaders) zephir_array_update_string(&contentHeaders, SL("CONTENT_TYPE"), &__$true, PH_COPY | PH_SEPARATE); zephir_array_update_string(&contentHeaders, SL("CONTENT_LENGTH"), &__$true, PH_COPY | PH_SEPARATE); zephir_array_update_string(&contentHeaders, SL("CONTENT_MD5"), &__$true, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 420); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 421); zephir_check_call_status(); zephir_is_iterable(&server, 0, "phalcon/Http/Request.zep", 441); if (Z_TYPE_P(&server) == IS_ARRAY) { @@ -1045,7 +1045,7 @@ PHP_METHOD(Phalcon_Http_Request, getHeaders) ZVAL_STRING(&_9$$4, " "); zephir_fast_str_replace(&_5$$4, &_8$$4, &_9$$4, &_7$$4); zephir_fast_strtolower(&_4$$4, &_5$$4); - ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 307, &_4$$4); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 308, &_4$$4); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_11$$4); ZEPHIR_INIT_NVAR(&_12$$4); @@ -1069,7 +1069,7 @@ PHP_METHOD(Phalcon_Http_Request, getHeaders) ZVAL_STRING(&_18$$5, " "); zephir_fast_str_replace(&_16$$5, &_17$$5, &_18$$5, &name); zephir_fast_strtolower(&_15$$5, &_16$$5); - ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 307, &_15$$5); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 308, &_15$$5); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_19$$5); ZEPHIR_INIT_NVAR(&_20$$5); @@ -1106,7 +1106,7 @@ PHP_METHOD(Phalcon_Http_Request, getHeaders) ZVAL_STRING(&_27$$7, " "); zephir_fast_str_replace(&_23$$7, &_26$$7, &_27$$7, &_25$$7); zephir_fast_strtolower(&_22$$7, &_23$$7); - ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 307, &_22$$7); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 308, &_22$$7); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_28$$7); ZEPHIR_INIT_NVAR(&_29$$7); @@ -1130,7 +1130,7 @@ PHP_METHOD(Phalcon_Http_Request, getHeaders) ZVAL_STRING(&_35$$8, " "); zephir_fast_str_replace(&_33$$8, &_34$$8, &_35$$8, &name); zephir_fast_strtolower(&_32$$8, &_33$$8); - ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 307, &_32$$8); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 308, &_32$$8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_36$$8); ZEPHIR_INIT_NVAR(&_37$$8); @@ -1268,7 +1268,7 @@ PHP_METHOD(Phalcon_Http_Request, getHttpHost) object_init_ex(&_12$$7, spl_ce_UnexpectedValueException); ZEPHIR_INIT_VAR(&_13$$7); ZEPHIR_CONCAT_SV(&_13$$7, "Invalid host ", &host); - ZEPHIR_CALL_METHOD(NULL, &_12$$7, "__construct", NULL, 421, &_13$$7); + ZEPHIR_CALL_METHOD(NULL, &_12$$7, "__construct", NULL, 422, &_13$$7); zephir_check_call_status(); zephir_throw_exception_debug(&_12$$7, "phalcon/Http/Request.zep", 525); ZEPHIR_MM_RESTORE(); @@ -1297,7 +1297,7 @@ PHP_METHOD(Phalcon_Http_Request, getHTTPReferer) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 420); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 421); zephir_check_call_status(); if (!(zephir_array_isset_string_fetch(&httpReferer, &server, SL("HTTP_REFERER"), 1))) { RETURN_MM_STRING(""); @@ -1367,7 +1367,7 @@ PHP_METHOD(Phalcon_Http_Request, getLanguages) ZVAL_STRING(&_0, "HTTP_ACCEPT_LANGUAGE"); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "language"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 417, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 418, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -1407,7 +1407,7 @@ PHP_METHOD(Phalcon_Http_Request, getMethod) zephir_get_global(&_REQUEST, SL("_REQUEST")); ZEPHIR_INIT_VAR(&returnMethod); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 420); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 421); zephir_check_call_status(); ZEPHIR_OBS_VAR(&requestMethod); if (EXPECTED(zephir_array_isset_string_fetch(&requestMethod, &server, SL("REQUEST_METHOD"), 0))) { @@ -1421,7 +1421,7 @@ PHP_METHOD(Phalcon_Http_Request, getMethod) if (ZEPHIR_IS_IDENTICAL(&_0, &returnMethod)) { ZEPHIR_INIT_VAR(&_1$$5); ZVAL_STRING(&_1$$5, "X-HTTP-METHOD-OVERRIDE"); - ZEPHIR_CALL_METHOD(&overridedMethod, this_ptr, "getheader", NULL, 422, &_1$$5); + ZEPHIR_CALL_METHOD(&overridedMethod, this_ptr, "getheader", NULL, 423, &_1$$5); zephir_check_call_status(); zephir_read_property(&_2$$5, this_ptr, ZEND_STRL("httpMethodParameterOverride"), PH_NOISY_CC | PH_READONLY); if (!(ZEPHIR_IS_EMPTY(&overridedMethod))) { @@ -1481,7 +1481,7 @@ PHP_METHOD(Phalcon_Http_Request, getPort) if (zephir_memnstr_str(&host, SL(":"), "phalcon/Http/Request.zep", 634)) { ZEPHIR_INIT_VAR(&_3$$4); ZVAL_STRING(&_3$$4, ":"); - ZEPHIR_CALL_FUNCTION(&pos, "strrpos", NULL, 123, &host, &_3$$4); + ZEPHIR_CALL_FUNCTION(&pos, "strrpos", NULL, 124, &host, &_3$$4); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&pos)) { ZVAL_LONG(&_4$$5, (zephir_get_numberval(&pos) + 1)); @@ -1590,7 +1590,7 @@ PHP_METHOD(Phalcon_Http_Request, getPost) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 416, &_POST, &name, filters, defaultValue, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 417, &_POST, &name, filters, defaultValue, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -1684,7 +1684,7 @@ PHP_METHOD(Phalcon_Http_Request, getPut) if (_0$$3) { ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "json"); - ZEPHIR_CALL_FUNCTION(&_2$$3, "stripos", NULL, 423, &contentType, &_1$$3); + ZEPHIR_CALL_FUNCTION(&_2$$3, "stripos", NULL, 424, &contentType, &_1$$3); zephir_check_call_status(); _0$$3 = !ZEPHIR_IS_FALSE(&_2$$3); } @@ -1702,7 +1702,7 @@ PHP_METHOD(Phalcon_Http_Request, getPut) ZEPHIR_CALL_METHOD(&_4$$6, this_ptr, "getrawbody", NULL, 0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&put); - ZEPHIR_CALL_FUNCTION(NULL, "parse_str", NULL, 380, &_4$$6, &put); + ZEPHIR_CALL_FUNCTION(NULL, "parse_str", NULL, 381, &_4$$6, &put); ZEPHIR_UNREF(&put); zephir_check_call_status(); } @@ -1718,7 +1718,7 @@ PHP_METHOD(Phalcon_Http_Request, getPut) } else { ZVAL_BOOL(&_6, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 416, &put, &name, filters, defaultValue, &_5, &_6); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 417, &put, &name, filters, defaultValue, &_5, &_6); zephir_check_call_status(); RETURN_MM(); } @@ -1813,7 +1813,7 @@ PHP_METHOD(Phalcon_Http_Request, getQuery) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 416, &_GET, &name, filters, defaultValue, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 417, &_GET, &name, filters, defaultValue, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -1914,7 +1914,7 @@ PHP_METHOD(Phalcon_Http_Request, getServer) } - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 420); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 421); zephir_check_call_status(); if (!(zephir_array_isset_fetch(&serverValue, &server, &name, 1))) { RETURN_MM_NULL(); @@ -1946,7 +1946,7 @@ PHP_METHOD(Phalcon_Http_Request, getServerAddress) if (Z_TYPE_P(&serverAddr) == IS_NULL) { ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "localhost"); - ZEPHIR_RETURN_CALL_FUNCTION("gethostbyname", NULL, 424, &_1$$3); + ZEPHIR_RETURN_CALL_FUNCTION("gethostbyname", NULL, 425, &_1$$3); zephir_check_call_status(); RETURN_MM(); } @@ -2103,7 +2103,7 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) zephir_array_fetch_string(&_7$$5, &input, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 861); zephir_array_fetch_string(&_8$$5, &input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 862); zephir_array_fetch_string(&_9$$5, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 863); - ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 425, &_5$$5, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &prefix); + ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 426, &_5$$5, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &prefix); zephir_check_call_status(); zephir_is_iterable(&smoothInput, 0, "phalcon/Http/Request.zep", 890); if (Z_TYPE_P(&smoothInput) == IS_ARRAY) { @@ -2138,7 +2138,7 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) ZEPHIR_INIT_NVAR(&_16$$8); object_init_ex(&_16$$8, phalcon_http_request_file_ce); zephir_array_fetch_string(&_17$$8, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 881); - ZEPHIR_CALL_METHOD(NULL, &_16$$8, "__construct", &_18, 426, &dataFile, &_17$$8); + ZEPHIR_CALL_METHOD(NULL, &_16$$8, "__construct", &_18, 427, &dataFile, &_17$$8); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&_19$$8); zephir_array_fetch_string(&_19$$8, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 878); @@ -2147,7 +2147,7 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) ZEPHIR_INIT_NVAR(&_20$$9); object_init_ex(&_20$$9, phalcon_http_request_file_ce); zephir_array_fetch_string(&_21$$9, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 886); - ZEPHIR_CALL_METHOD(NULL, &_20$$9, "__construct", &_18, 426, &dataFile, &_21$$9); + ZEPHIR_CALL_METHOD(NULL, &_20$$9, "__construct", &_18, 427, &dataFile, &_21$$9); zephir_check_call_status(); zephir_array_append(&files, &_20$$9, PH_SEPARATE, "phalcon/Http/Request.zep", 886); } @@ -2192,7 +2192,7 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) ZEPHIR_INIT_NVAR(&_26$$12); object_init_ex(&_26$$12, phalcon_http_request_file_ce); zephir_array_fetch_string(&_27$$12, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 881); - ZEPHIR_CALL_METHOD(NULL, &_26$$12, "__construct", &_18, 426, &dataFile, &_27$$12); + ZEPHIR_CALL_METHOD(NULL, &_26$$12, "__construct", &_18, 427, &dataFile, &_27$$12); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&_28$$12); zephir_array_fetch_string(&_28$$12, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 878); @@ -2201,7 +2201,7 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) ZEPHIR_INIT_NVAR(&_29$$13); object_init_ex(&_29$$13, phalcon_http_request_file_ce); zephir_array_fetch_string(&_30$$13, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 886); - ZEPHIR_CALL_METHOD(NULL, &_29$$13, "__construct", &_18, 426, &dataFile, &_30$$13); + ZEPHIR_CALL_METHOD(NULL, &_29$$13, "__construct", &_18, 427, &dataFile, &_30$$13); zephir_check_call_status(); zephir_array_append(&files, &_29$$13, PH_SEPARATE, "phalcon/Http/Request.zep", 886); } @@ -2221,13 +2221,13 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) if (namedKeys == 1) { ZEPHIR_INIT_NVAR(&_33$$16); object_init_ex(&_33$$16, phalcon_http_request_file_ce); - ZEPHIR_CALL_METHOD(NULL, &_33$$16, "__construct", &_18, 426, &input, &prefix); + ZEPHIR_CALL_METHOD(NULL, &_33$$16, "__construct", &_18, 427, &input, &prefix); zephir_check_call_status(); zephir_array_update_zval(&files, &prefix, &_33$$16, PH_COPY | PH_SEPARATE); } else { ZEPHIR_INIT_NVAR(&_34$$17); object_init_ex(&_34$$17, phalcon_http_request_file_ce); - ZEPHIR_CALL_METHOD(NULL, &_34$$17, "__construct", &_18, 426, &input, &prefix); + ZEPHIR_CALL_METHOD(NULL, &_34$$17, "__construct", &_18, 427, &input, &prefix); zephir_check_call_status(); zephir_array_append(&files, &_34$$17, PH_SEPARATE, "phalcon/Http/Request.zep", 895); } @@ -2255,7 +2255,7 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) zephir_array_fetch_string(&_38$$19, &input, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 861); zephir_array_fetch_string(&_39$$19, &input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 862); zephir_array_fetch_string(&_40$$19, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 863); - ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 425, &_36$$19, &_37$$19, &_38$$19, &_39$$19, &_40$$19, &prefix); + ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 426, &_36$$19, &_37$$19, &_38$$19, &_39$$19, &_40$$19, &prefix); zephir_check_call_status(); zephir_is_iterable(&smoothInput, 0, "phalcon/Http/Request.zep", 890); if (Z_TYPE_P(&smoothInput) == IS_ARRAY) { @@ -2291,7 +2291,7 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) ZEPHIR_INIT_NVAR(&_47$$22); object_init_ex(&_47$$22, phalcon_http_request_file_ce); zephir_array_fetch_string(&_48$$22, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 881); - ZEPHIR_CALL_METHOD(NULL, &_47$$22, "__construct", &_18, 426, &dataFile, &_48$$22); + ZEPHIR_CALL_METHOD(NULL, &_47$$22, "__construct", &_18, 427, &dataFile, &_48$$22); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&_49$$22); zephir_array_fetch_string(&_49$$22, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 878); @@ -2300,7 +2300,7 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) ZEPHIR_INIT_NVAR(&_50$$23); object_init_ex(&_50$$23, phalcon_http_request_file_ce); zephir_array_fetch_string(&_51$$23, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 886); - ZEPHIR_CALL_METHOD(NULL, &_50$$23, "__construct", &_18, 426, &dataFile, &_51$$23); + ZEPHIR_CALL_METHOD(NULL, &_50$$23, "__construct", &_18, 427, &dataFile, &_51$$23); zephir_check_call_status(); zephir_array_append(&files, &_50$$23, PH_SEPARATE, "phalcon/Http/Request.zep", 886); } @@ -2345,7 +2345,7 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) ZEPHIR_INIT_NVAR(&_56$$26); object_init_ex(&_56$$26, phalcon_http_request_file_ce); zephir_array_fetch_string(&_57$$26, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 881); - ZEPHIR_CALL_METHOD(NULL, &_56$$26, "__construct", &_18, 426, &dataFile, &_57$$26); + ZEPHIR_CALL_METHOD(NULL, &_56$$26, "__construct", &_18, 427, &dataFile, &_57$$26); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&_58$$26); zephir_array_fetch_string(&_58$$26, &file, SL("key"), PH_NOISY, "phalcon/Http/Request.zep", 878); @@ -2354,7 +2354,7 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) ZEPHIR_INIT_NVAR(&_59$$27); object_init_ex(&_59$$27, phalcon_http_request_file_ce); zephir_array_fetch_string(&_60$$27, &file, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 886); - ZEPHIR_CALL_METHOD(NULL, &_59$$27, "__construct", &_18, 426, &dataFile, &_60$$27); + ZEPHIR_CALL_METHOD(NULL, &_59$$27, "__construct", &_18, 427, &dataFile, &_60$$27); zephir_check_call_status(); zephir_array_append(&files, &_59$$27, PH_SEPARATE, "phalcon/Http/Request.zep", 886); } @@ -2374,13 +2374,13 @@ PHP_METHOD(Phalcon_Http_Request, getUploadedFiles) if (namedKeys == 1) { ZEPHIR_INIT_NVAR(&_63$$30); object_init_ex(&_63$$30, phalcon_http_request_file_ce); - ZEPHIR_CALL_METHOD(NULL, &_63$$30, "__construct", &_18, 426, &input, &prefix); + ZEPHIR_CALL_METHOD(NULL, &_63$$30, "__construct", &_18, 427, &input, &prefix); zephir_check_call_status(); zephir_array_update_zval(&files, &prefix, &_63$$30, PH_COPY | PH_SEPARATE); } else { ZEPHIR_INIT_NVAR(&_64$$31); object_init_ex(&_64$$31, phalcon_http_request_file_ce); - ZEPHIR_CALL_METHOD(NULL, &_64$$31, "__construct", &_18, 426, &input, &prefix); + ZEPHIR_CALL_METHOD(NULL, &_64$$31, "__construct", &_18, 427, &input, &prefix); zephir_check_call_status(); zephir_array_append(&files, &_64$$31, PH_SEPARATE, "phalcon/Http/Request.zep", 895); } @@ -2593,13 +2593,13 @@ PHP_METHOD(Phalcon_Http_Request, hasHeader) zephir_check_call_status(); ZEPHIR_INIT_VAR(&name); zephir_fast_strtoupper(&name, &_2); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "hasserver", NULL, 418, &name); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "hasserver", NULL, 419, &name); zephir_check_call_status(); _4 = zephir_is_true(&_3); if (!(_4)) { ZEPHIR_INIT_VAR(&_6); ZEPHIR_CONCAT_SV(&_6, "HTTP_", &name); - ZEPHIR_CALL_METHOD(&_5, this_ptr, "hasserver", NULL, 418, &_6); + ZEPHIR_CALL_METHOD(&_5, this_ptr, "hasserver", NULL, 419, &_6); zephir_check_call_status(); _4 = zephir_is_true(&_5); } @@ -2753,7 +2753,7 @@ PHP_METHOD(Phalcon_Http_Request, hasServer) } - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 420); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 421); zephir_check_call_status(); RETURN_MM_BOOL(zephir_array_isset(&server, &name)); } @@ -2778,7 +2778,7 @@ PHP_METHOD(Phalcon_Http_Request, isAjax) ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "HTTP_X_REQUESTED_WITH"); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 418, &_1); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 419, &_1); zephir_check_call_status(); _2 = zephir_is_true(&_0); if (_2) { @@ -2807,7 +2807,7 @@ PHP_METHOD(Phalcon_Http_Request, isConnect) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 427); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 428); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "CONNECT")); } @@ -2828,7 +2828,7 @@ PHP_METHOD(Phalcon_Http_Request, isDelete) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 427); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 428); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "DELETE")); } @@ -2849,7 +2849,7 @@ PHP_METHOD(Phalcon_Http_Request, isGet) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 427); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 428); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "GET")); } @@ -2870,7 +2870,7 @@ PHP_METHOD(Phalcon_Http_Request, isHead) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 427); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 428); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "HEAD")); } @@ -2918,7 +2918,7 @@ PHP_METHOD(Phalcon_Http_Request, isMethod) } - ZEPHIR_CALL_METHOD(&httpMethod, this_ptr, "getmethod", NULL, 427); + ZEPHIR_CALL_METHOD(&httpMethod, this_ptr, "getmethod", NULL, 428); zephir_check_call_status(); if (Z_TYPE_P(methods) == IS_STRING) { _0$$3 = strict; @@ -2952,7 +2952,7 @@ PHP_METHOD(Phalcon_Http_Request, isMethod) } else { ZVAL_BOOL(&_7$$6, 0); } - ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "ismethod", &_8, 428, &method, &_7$$6); + ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "ismethod", &_8, 429, &method, &_7$$6); zephir_check_call_status(); if (zephir_is_true(&_6$$6)) { RETURN_MM_BOOL(1); @@ -2974,7 +2974,7 @@ PHP_METHOD(Phalcon_Http_Request, isMethod) } else { ZVAL_BOOL(&_10$$8, 0); } - ZEPHIR_CALL_METHOD(&_9$$8, this_ptr, "ismethod", &_8, 428, &method, &_10$$8); + ZEPHIR_CALL_METHOD(&_9$$8, this_ptr, "ismethod", &_8, 429, &method, &_10$$8); zephir_check_call_status(); if (zephir_is_true(&_9$$8)) { RETURN_MM_BOOL(1); @@ -3009,7 +3009,7 @@ PHP_METHOD(Phalcon_Http_Request, isOptions) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 427); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 428); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "OPTIONS")); } @@ -3030,7 +3030,7 @@ PHP_METHOD(Phalcon_Http_Request, isPatch) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 427); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 428); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "PATCH")); } @@ -3051,7 +3051,7 @@ PHP_METHOD(Phalcon_Http_Request, isPost) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 427); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 428); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "POST")); } @@ -3072,7 +3072,7 @@ PHP_METHOD(Phalcon_Http_Request, isPut) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 427); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 428); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "PUT")); } @@ -3093,7 +3093,7 @@ PHP_METHOD(Phalcon_Http_Request, isPurge) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 427); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 428); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "PURGE")); } @@ -3150,7 +3150,7 @@ PHP_METHOD(Phalcon_Http_Request, isSoap) ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "HTTP_SOAPACTION"); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 418, &_1); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 419, &_1); zephir_check_call_status(); if (zephir_is_true(&_0)) { RETURN_MM_BOOL(1); @@ -3179,7 +3179,7 @@ PHP_METHOD(Phalcon_Http_Request, isTrace) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 427); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 428); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_STRING_IDENTICAL(&_0, "TRACE")); } @@ -3288,7 +3288,7 @@ PHP_METHOD(Phalcon_Http_Request, numFiles) } else { ZVAL_BOOL(&_4$$8, 0); } - ZEPHIR_CALL_METHOD(&_3$$8, this_ptr, "hasfilehelper", &_5, 429, &error, &_4$$8); + ZEPHIR_CALL_METHOD(&_3$$8, this_ptr, "hasfilehelper", &_5, 430, &error, &_4$$8); zephir_check_call_status(); numberFiles += zephir_get_numberval(&_3$$8); } @@ -3322,7 +3322,7 @@ PHP_METHOD(Phalcon_Http_Request, numFiles) } else { ZVAL_BOOL(&_8$$13, 0); } - ZEPHIR_CALL_METHOD(&_7$$13, this_ptr, "hasfilehelper", &_5, 429, &error, &_8$$13); + ZEPHIR_CALL_METHOD(&_7$$13, this_ptr, "hasfilehelper", &_5, 430, &error, &_8$$13); zephir_check_call_status(); numberFiles += zephir_get_numberval(&_7$$13); } @@ -3416,7 +3416,7 @@ PHP_METHOD(Phalcon_Http_Request, setParameterFilters) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 430); + ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 431); zephir_check_call_status(); zephir_is_iterable(&filters, 0, "phalcon/Http/Request.zep", 1272); if (Z_TYPE_P(&filters) == IS_ARRAY) { @@ -3754,7 +3754,7 @@ PHP_METHOD(Phalcon_Http_Request, getHelper) RETURN_MM(); } if (Z_TYPE_P(filters) != IS_NULL) { - ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 430); + ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 431); zephir_check_call_status(); if (noRecursive) { ZVAL_BOOL(&_3$$6, 1); @@ -3826,7 +3826,7 @@ PHP_METHOD(Phalcon_Http_Request, hasFileHelper) } else { ZVAL_BOOL(&_4$$7, 0); } - ZEPHIR_CALL_METHOD(&_3$$7, this_ptr, "hasfilehelper", &_5, 429, &value, &_4$$7); + ZEPHIR_CALL_METHOD(&_3$$7, this_ptr, "hasfilehelper", &_5, 430, &value, &_4$$7); zephir_check_call_status(); numberFiles += zephir_get_numberval(&_3$$7); } @@ -3857,7 +3857,7 @@ PHP_METHOD(Phalcon_Http_Request, hasFileHelper) } else { ZVAL_BOOL(&_8$$11, 0); } - ZEPHIR_CALL_METHOD(&_7$$11, this_ptr, "hasfilehelper", &_5, 429, &value, &_8$$11); + ZEPHIR_CALL_METHOD(&_7$$11, this_ptr, "hasfilehelper", &_5, 430, &value, &_8$$11); zephir_check_call_status(); numberFiles += zephir_get_numberval(&_7$$11); } @@ -4243,7 +4243,7 @@ PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders) ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdi", NULL, 0); zephir_check_call_status(); ZEPHIR_CPY_WRT(&container, &_0); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 420); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 421); zephir_check_call_status(); if (Z_TYPE_P(&container) == IS_OBJECT) { ZEPHIR_INIT_VAR(&_2$$3); @@ -4279,13 +4279,13 @@ PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders) } ZEPHIR_INIT_VAR(&_9); ZVAL_STRING(&_9, "PHP_AUTH_USER"); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 418, &_9); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 419, &_9); zephir_check_call_status(); _10 = zephir_is_true(&_0); if (_10) { ZEPHIR_INIT_NVAR(&_9); ZVAL_STRING(&_9, "PHP_AUTH_PW"); - ZEPHIR_CALL_METHOD(&_11, this_ptr, "hasserver", NULL, 418, &_9); + ZEPHIR_CALL_METHOD(&_11, this_ptr, "hasserver", NULL, 419, &_9); zephir_check_call_status(); _10 = zephir_is_true(&_11); } @@ -4303,11 +4303,11 @@ PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders) } else { ZEPHIR_INIT_VAR(&_16$$8); ZVAL_STRING(&_16$$8, "HTTP_AUTHORIZATION"); - ZEPHIR_CALL_METHOD(&_15$$8, this_ptr, "hasserver", NULL, 418, &_16$$8); + ZEPHIR_CALL_METHOD(&_15$$8, this_ptr, "hasserver", NULL, 419, &_16$$8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_16$$8); ZVAL_STRING(&_16$$8, "REDIRECT_HTTP_AUTHORIZATION"); - ZEPHIR_CALL_METHOD(&_17$$8, this_ptr, "hasserver", NULL, 418, &_16$$8); + ZEPHIR_CALL_METHOD(&_17$$8, this_ptr, "hasserver", NULL, 419, &_16$$8); zephir_check_call_status(); if (zephir_is_true(&_15$$8)) { ZEPHIR_INIT_VAR(&_18$$9); @@ -4323,29 +4323,29 @@ PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders) if (zephir_is_true(&authHeader)) { ZEPHIR_INIT_VAR(&_20$$11); ZVAL_STRING(&_20$$11, "basic "); - ZEPHIR_CALL_FUNCTION(&_21$$11, "stripos", NULL, 423, &authHeader, &_20$$11); + ZEPHIR_CALL_FUNCTION(&_21$$11, "stripos", NULL, 424, &authHeader, &_20$$11); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_20$$11); ZVAL_STRING(&_20$$11, "digest "); - ZEPHIR_CALL_FUNCTION(&_22$$11, "stripos", NULL, 423, &authHeader, &_20$$11); + ZEPHIR_CALL_FUNCTION(&_22$$11, "stripos", NULL, 424, &authHeader, &_20$$11); zephir_check_call_status(); _23$$11 = ZEPHIR_IS_LONG_IDENTICAL(&_22$$11, 0); if (_23$$11) { ZEPHIR_INIT_NVAR(&_20$$11); ZVAL_STRING(&_20$$11, "PHP_AUTH_DIGEST"); - ZEPHIR_CALL_METHOD(&_24$$11, this_ptr, "hasserver", NULL, 418, &_20$$11); + ZEPHIR_CALL_METHOD(&_24$$11, this_ptr, "hasserver", NULL, 419, &_20$$11); zephir_check_call_status(); _23$$11 = !zephir_is_true(&_24$$11); } ZEPHIR_INIT_NVAR(&_20$$11); ZVAL_STRING(&_20$$11, "bearer "); - ZEPHIR_CALL_FUNCTION(&_25$$11, "stripos", NULL, 423, &authHeader, &_20$$11); + ZEPHIR_CALL_FUNCTION(&_25$$11, "stripos", NULL, 424, &authHeader, &_20$$11); zephir_check_call_status(); if (ZEPHIR_IS_LONG_IDENTICAL(&_21$$11, 0)) { ZVAL_LONG(&_26$$12, 6); ZEPHIR_INIT_VAR(&_27$$12); zephir_substr(&_27$$12, &authHeader, 6 , 0, ZEPHIR_SUBSTR_NO_LENGTH); - ZEPHIR_CALL_FUNCTION(&_28$$12, "base64_decode", NULL, 249, &_27$$12); + ZEPHIR_CALL_FUNCTION(&_28$$12, "base64_decode", NULL, 250, &_27$$12); zephir_check_call_status(); ZEPHIR_INIT_VAR(&exploded); zephir_fast_explode_str(&exploded, SL(":"), &_28$$12, 2 ); @@ -4369,7 +4369,7 @@ PHP_METHOD(Phalcon_Http_Request, resolveAuthorizationHeaders) zephir_array_fetch_string(&_32$$17, &headers, SL("Php-Auth-Pw"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1502); ZEPHIR_INIT_VAR(&_33$$17); ZEPHIR_CONCAT_VSV(&_33$$17, &_31$$17, ":", &_32$$17); - ZEPHIR_CALL_FUNCTION(&_34$$17, "base64_encode", NULL, 250, &_33$$17); + ZEPHIR_CALL_FUNCTION(&_34$$17, "base64_encode", NULL, 251, &_33$$17); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_35$$17); ZEPHIR_CONCAT_SV(&_35$$17, "Basic ", &_34$$17); @@ -4508,7 +4508,7 @@ PHP_METHOD(Phalcon_Http_Request, smoothFiles) zephir_array_fetch(&_8$$5, &tmp_names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1554); zephir_array_fetch(&_9$$5, &sizes, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1555); zephir_array_fetch(&_10$$5, &errors, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1556); - ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 425, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &_10$$5, &p); + ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 426, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &_10$$5, &p); zephir_check_call_status(); zephir_is_iterable(&parentFiles, 0, "phalcon/Http/Request.zep", 1563); if (Z_TYPE_P(&parentFiles) == IS_ARRAY) { @@ -4577,7 +4577,7 @@ PHP_METHOD(Phalcon_Http_Request, smoothFiles) zephir_array_fetch(&_18$$10, &tmp_names, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1554); zephir_array_fetch(&_19$$10, &sizes, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1555); zephir_array_fetch(&_20$$10, &errors, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1556); - ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 425, &_16$$10, &_17$$10, &_18$$10, &_19$$10, &_20$$10, &p); + ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 426, &_16$$10, &_17$$10, &_18$$10, &_19$$10, &_20$$10, &p); zephir_check_call_status(); zephir_is_iterable(&parentFiles, 0, "phalcon/Http/Request.zep", 1563); if (Z_TYPE_P(&parentFiles) == IS_ARRAY) { diff --git a/ext/phalcon/http/request/file.zep.c b/ext/phalcon/http/request/file.zep.c index 5082d3e8fb3..05700c88377 100644 --- a/ext/phalcon/http/request/file.zep.c +++ b/ext/phalcon/http/request/file.zep.c @@ -173,7 +173,7 @@ PHP_METHOD(Phalcon_Http_Request_File, __construct) zephir_update_property_zval(this_ptr, ZEND_STRL("name"), &name); ZEPHIR_INIT_VAR(&_0$$3); ZVAL_STRING(&_0$$3, "PATHINFO_EXTENSION"); - ZEPHIR_CALL_FUNCTION(&_1$$3, "defined", NULL, 145, &_0$$3); + ZEPHIR_CALL_FUNCTION(&_1$$3, "defined", NULL, 146, &_0$$3); zephir_check_call_status(); if (zephir_is_true(&_1$$3)) { ZVAL_LONG(&_2$$4, 4); @@ -184,22 +184,22 @@ PHP_METHOD(Phalcon_Http_Request_File, __construct) } ZEPHIR_INIT_VAR(&_5); ZVAL_STRING(&_5, "tmp_name"); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "getarrval", NULL, 431, &file, &_5); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "getarrval", NULL, 432, &file, &_5); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("tmp"), &_4); ZEPHIR_INIT_NVAR(&_5); ZVAL_STRING(&_5, "size"); - ZEPHIR_CALL_METHOD(&_6, this_ptr, "getarrval", NULL, 431, &file, &_5); + ZEPHIR_CALL_METHOD(&_6, this_ptr, "getarrval", NULL, 432, &file, &_5); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("size"), &_6); ZEPHIR_INIT_NVAR(&_5); ZVAL_STRING(&_5, "type"); - ZEPHIR_CALL_METHOD(&_7, this_ptr, "getarrval", NULL, 431, &file, &_5); + ZEPHIR_CALL_METHOD(&_7, this_ptr, "getarrval", NULL, 432, &file, &_5); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &_7); ZEPHIR_INIT_NVAR(&_5); ZVAL_STRING(&_5, "error"); - ZEPHIR_CALL_METHOD(&_8, this_ptr, "getarrval", NULL, 431, &file, &_5); + ZEPHIR_CALL_METHOD(&_8, this_ptr, "getarrval", NULL, 432, &file, &_5); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("error"), &_8); if (zephir_is_true(key)) { @@ -238,15 +238,15 @@ PHP_METHOD(Phalcon_Http_Request_File, getRealType) ZEPHIR_MM_GROW(); ZVAL_LONG(&_0, 16); - ZEPHIR_CALL_FUNCTION(&finfo, "finfo_open", NULL, 330, &_0); + ZEPHIR_CALL_FUNCTION(&finfo, "finfo_open", NULL, 331, &_0); zephir_check_call_status(); if (Z_TYPE_P(&finfo) != IS_RESOURCE) { RETURN_MM_STRING(""); } zephir_read_property(&_0, this_ptr, ZEND_STRL("tmp"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 331, &finfo, &_0); + ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 332, &finfo, &_0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 332, &finfo); + ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 333, &finfo); zephir_check_call_status(); RETURN_CCTOR(&mime); } @@ -351,7 +351,7 @@ PHP_METHOD(Phalcon_Http_Request_File, moveTo) zephir_read_property(&_0, this_ptr, ZEND_STRL("tmp"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_FUNCTION("move_uploaded_file", NULL, 402, &_0, &destination); + ZEPHIR_RETURN_CALL_FUNCTION("move_uploaded_file", NULL, 403, &_0, &destination); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/http/response.zep.c b/ext/phalcon/http/response.zep.c index 1b952de3655..052307a93cf 100644 --- a/ext/phalcon/http/response.zep.c +++ b/ext/phalcon/http/response.zep.c @@ -502,7 +502,7 @@ PHP_METHOD(Phalcon_Http_Response, redirect) if (_0$$5) { ZEPHIR_INIT_VAR(&_1$$5); ZVAL_STRING(&_1$$5, "://"); - ZEPHIR_CALL_FUNCTION(&_2$$5, "strstr", NULL, 432, location, &_1$$5); + ZEPHIR_CALL_FUNCTION(&_2$$5, "strstr", NULL, 433, location, &_1$$5); zephir_check_call_status(); _0$$5 = zephir_is_true(&_2$$5); } @@ -667,7 +667,7 @@ PHP_METHOD(Phalcon_Http_Response, send) _3$$5 = ((zephir_fast_strlen_ev(&file)) ? 1 : 0); } if (_3$$5) { - ZEPHIR_CALL_FUNCTION(NULL, "readfile", NULL, 433, &file); + ZEPHIR_CALL_FUNCTION(NULL, "readfile", NULL, 434, &file); zephir_check_call_status(); } } @@ -1159,16 +1159,16 @@ PHP_METHOD(Phalcon_Http_Response, setFileToSend) ZEPHIR_INIT_VAR(&basePathEncoding); ZVAL_STRING(&basePathEncoding, "ASCII"); if (Z_TYPE_P(attachmentName) != IS_STRING) { - ZEPHIR_CALL_METHOD(&basePath, this_ptr, "getbasename", NULL, 434, &filePath); + ZEPHIR_CALL_METHOD(&basePath, this_ptr, "getbasename", NULL, 435, &filePath); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&basePath, attachmentName); } if (zephir_is_true(attachment)) { if ((zephir_function_exists_ex(ZEND_STRL("mb_detect_encoding")) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&_0$$6, "mb_detect_order", NULL, 435); + ZEPHIR_CALL_FUNCTION(&_0$$6, "mb_detect_order", NULL, 436); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&basePathEncoding, "mb_detect_encoding", NULL, 346, &basePath, &_0$$6, &__$true); + ZEPHIR_CALL_FUNCTION(&basePathEncoding, "mb_detect_encoding", NULL, 347, &basePath, &_0$$6, &__$true); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_1$$5); @@ -1184,7 +1184,7 @@ PHP_METHOD(Phalcon_Http_Response, setFileToSend) ZEPHIR_CALL_METHOD(NULL, this_ptr, "setrawheader", NULL, 0, &_1$$5); zephir_check_call_status(); if (!ZEPHIR_IS_STRING(&basePathEncoding, "ASCII")) { - ZEPHIR_CALL_FUNCTION(&_2$$7, "rawurlencode", NULL, 350, &basePath); + ZEPHIR_CALL_FUNCTION(&_2$$7, "rawurlencode", NULL, 351, &basePath); zephir_check_call_status(); ZEPHIR_CPY_WRT(&basePath, &_2$$7); ZEPHIR_INIT_VAR(&_3$$7); @@ -1196,7 +1196,7 @@ PHP_METHOD(Phalcon_Http_Response, setFileToSend) } else { ZEPHIR_INIT_VAR(&_5$$8); ZVAL_STRING(&_5$$8, "\15\17\\\""); - ZEPHIR_CALL_FUNCTION(&_6$$8, "addcslashes", NULL, 234, &basePath, &_5$$8); + ZEPHIR_CALL_FUNCTION(&_6$$8, "addcslashes", NULL, 235, &basePath, &_5$$8); zephir_check_call_status(); ZEPHIR_CPY_WRT(&basePath, &_6$$8); ZEPHIR_INIT_VAR(&_7$$8); @@ -1376,7 +1376,7 @@ PHP_METHOD(Phalcon_Http_Response, setJsonContent) zephir_check_call_status(); ZVAL_LONG(&_2, jsonOptions); ZVAL_LONG(&_3, depth); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "encode", NULL, 436, content, &_2, &_3); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "encode", NULL, 437, content, &_2, &_3); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "setcontent", NULL, 0, &_1); zephir_check_call_status(); @@ -1546,7 +1546,7 @@ PHP_METHOD(Phalcon_Http_Response, setStatusCode) if (_6$$3) { ZEPHIR_INIT_NVAR(&_7$$3); ZVAL_STRING(&_7$$3, "HTTP/"); - ZEPHIR_CALL_FUNCTION(&_8$$3, "strstr", &_9, 432, &key, &_7$$3); + ZEPHIR_CALL_FUNCTION(&_8$$3, "strstr", &_9, 433, &key, &_7$$3); zephir_check_call_status(); _6$$3 = zephir_is_true(&_8$$3); } @@ -1573,7 +1573,7 @@ PHP_METHOD(Phalcon_Http_Response, setStatusCode) if (_11$$5) { ZEPHIR_INIT_NVAR(&_12$$5); ZVAL_STRING(&_12$$5, "HTTP/"); - ZEPHIR_CALL_FUNCTION(&_13$$5, "strstr", &_9, 432, &key, &_12$$5); + ZEPHIR_CALL_FUNCTION(&_13$$5, "strstr", &_9, 433, &key, &_12$$5); zephir_check_call_status(); _11$$5 = zephir_is_true(&_13$$5); } @@ -1804,7 +1804,7 @@ PHP_METHOD(Phalcon_Http_Response, getBasename) ZVAL_STRING(&_2, "/"); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "@"); - ZEPHIR_CALL_FUNCTION(&_4, "preg_quote", NULL, 437, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "preg_quote", NULL, 438, &_2, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5); ZEPHIR_CONCAT_SVS(&_5, "@[^", &_4, "]+$@"); @@ -1820,7 +1820,7 @@ PHP_METHOD(Phalcon_Http_Response, getBasename) if (zephir_is_true(suffix)) { ZEPHIR_INIT_VAR(&_6$$3); ZVAL_STRING(&_6$$3, "@"); - ZEPHIR_CALL_FUNCTION(&_7$$3, "preg_quote", NULL, 437, suffix, &_6$$3); + ZEPHIR_CALL_FUNCTION(&_7$$3, "preg_quote", NULL, 438, suffix, &_6$$3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_8$$3); ZEPHIR_CONCAT_SVS(&_8$$3, "@", &_7$$3, "$@"); @@ -1880,12 +1880,12 @@ PHP_METHOD(Phalcon_Http_Response, encode) ZVAL_LONG(&_1, depth); ZEPHIR_INIT_VAR(&encoded); zephir_json_encode(&encoded, data, zephir_get_intval(&_0) ); - ZEPHIR_CALL_FUNCTION(&_2, "json_last_error", NULL, 214); + ZEPHIR_CALL_FUNCTION(&_2, "json_last_error", NULL, 215); zephir_check_call_status(); if (UNEXPECTED(!ZEPHIR_IS_LONG_IDENTICAL(&_2, 0))) { ZEPHIR_INIT_VAR(&_3$$3); object_init_ex(&_3$$3, spl_ce_InvalidArgumentException); - ZEPHIR_CALL_FUNCTION(&_4$$3, "json_last_error_msg", NULL, 215); + ZEPHIR_CALL_FUNCTION(&_4$$3, "json_last_error_msg", NULL, 216); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5$$3); ZEPHIR_CONCAT_SV(&_5$$3, "json_encode error: ", &_4$$3); diff --git a/ext/phalcon/http/response/cookies.zep.c b/ext/phalcon/http/response/cookies.zep.c index d160df43ec1..d9c6b81a1df 100644 --- a/ext/phalcon/http/response/cookies.zep.c +++ b/ext/phalcon/http/response/cookies.zep.c @@ -403,7 +403,7 @@ PHP_METHOD(Phalcon_Http_Response_Cookies, send) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_FUNCTION(&_0, "headers_sent", NULL, 438); + ZEPHIR_CALL_FUNCTION(&_0, "headers_sent", NULL, 439); zephir_check_call_status(); _1 = ZEPHIR_IS_TRUE_IDENTICAL(&_0); if (!(_1)) { diff --git a/ext/phalcon/http/response/headers.zep.c b/ext/phalcon/http/response/headers.zep.c index c0db70eb6e3..0508dbdd3da 100644 --- a/ext/phalcon/http/response/headers.zep.c +++ b/ext/phalcon/http/response/headers.zep.c @@ -217,7 +217,7 @@ PHP_METHOD(Phalcon_Http_Response_Headers, send) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_FUNCTION(&_0, "headers_sent", NULL, 438); + ZEPHIR_CALL_FUNCTION(&_0, "headers_sent", NULL, 439); zephir_check_call_status(); _1 = ZEPHIR_IS_TRUE_IDENTICAL(&_0); if (!(_1)) { @@ -243,7 +243,7 @@ PHP_METHOD(Phalcon_Http_Response_Headers, send) if (Z_TYPE_P(&value) != IS_NULL) { ZEPHIR_INIT_NVAR(&_8$$5); ZEPHIR_CONCAT_VSV(&_8$$5, &header, ": ", &value); - ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 439, &_8$$5, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 440, &_8$$5, &__$true); zephir_check_call_status(); } else { _10$$6 = zephir_memnstr_str(&header, SL(":"), "phalcon/Http/Response/Headers.zep", 99); @@ -255,12 +255,12 @@ PHP_METHOD(Phalcon_Http_Response_Headers, send) _10$$6 = ZEPHIR_IS_STRING(&_13$$6, "HTTP/"); } if (_10$$6) { - ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 439, &header, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 440, &header, &__$true); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&_14$$8); ZEPHIR_CONCAT_VS(&_14$$8, &header, ": "); - ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 439, &_14$$8, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 440, &_14$$8, &__$true); zephir_check_call_status(); } } @@ -281,7 +281,7 @@ PHP_METHOD(Phalcon_Http_Response_Headers, send) if (Z_TYPE_P(&value) != IS_NULL) { ZEPHIR_INIT_NVAR(&_15$$10); ZEPHIR_CONCAT_VSV(&_15$$10, &header, ": ", &value); - ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 439, &_15$$10, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 440, &_15$$10, &__$true); zephir_check_call_status(); } else { _16$$11 = zephir_memnstr_str(&header, SL(":"), "phalcon/Http/Response/Headers.zep", 99); @@ -293,12 +293,12 @@ PHP_METHOD(Phalcon_Http_Response_Headers, send) _16$$11 = ZEPHIR_IS_STRING(&_19$$11, "HTTP/"); } if (_16$$11) { - ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 439, &header, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 440, &header, &__$true); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&_20$$13); ZEPHIR_CONCAT_VS(&_20$$13, &header, ": "); - ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 439, &_20$$13, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 440, &_20$$13, &__$true); zephir_check_call_status(); } } diff --git a/ext/phalcon/image/adapter/gd.zep.c b/ext/phalcon/image/adapter/gd.zep.c index be76caaa130..b73b0933a4f 100644 --- a/ext/phalcon/image/adapter/gd.zep.c +++ b/ext/phalcon/image/adapter/gd.zep.c @@ -137,7 +137,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("realpath"), &_3$$4); zephir_read_property(&_4$$4, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&imageinfo, "getimagesize", NULL, 333, &_4$$4); + ZEPHIR_CALL_FUNCTION(&imageinfo, "getimagesize", NULL, 334, &_4$$4); zephir_check_call_status(); if (zephir_is_true(&imageinfo)) { zephir_array_fetch_long(&_5$$5, &imageinfo, 0, PH_NOISY | PH_READONLY, "phalcon/Image/Adapter/Gd.zep", 38); @@ -153,35 +153,35 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) do { if (ZEPHIR_IS_LONG(&_9$$4, 1)) { zephir_read_property(&_10$$6, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_11$$6, "imagecreatefromgif", NULL, 440, &_10$$6); + ZEPHIR_CALL_FUNCTION(&_11$$6, "imagecreatefromgif", NULL, 441, &_10$$6); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &_11$$6); break; } if (ZEPHIR_IS_LONG(&_9$$4, 2)) { zephir_read_property(&_12$$7, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_13$$7, "imagecreatefromjpeg", NULL, 441, &_12$$7); + ZEPHIR_CALL_FUNCTION(&_13$$7, "imagecreatefromjpeg", NULL, 442, &_12$$7); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &_13$$7); break; } if (ZEPHIR_IS_LONG(&_9$$4, 3)) { zephir_read_property(&_14$$8, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_15$$8, "imagecreatefrompng", NULL, 442, &_14$$8); + ZEPHIR_CALL_FUNCTION(&_15$$8, "imagecreatefrompng", NULL, 443, &_14$$8); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &_15$$8); break; } if (ZEPHIR_IS_LONG(&_9$$4, 15)) { zephir_read_property(&_16$$9, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_17$$9, "imagecreatefromwbmp", NULL, 443, &_16$$9); + ZEPHIR_CALL_FUNCTION(&_17$$9, "imagecreatefromwbmp", NULL, 444, &_16$$9); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &_17$$9); break; } if (ZEPHIR_IS_LONG(&_9$$4, 16)) { zephir_read_property(&_18$$10, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_19$$10, "imagecreatefromxbm", NULL, 444, &_18$$10); + ZEPHIR_CALL_FUNCTION(&_19$$10, "imagecreatefromxbm", NULL, 445, &_18$$10); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &_19$$10); break; @@ -204,7 +204,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) } while(0); zephir_read_property(&_24$$4, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 445, &_24$$4, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 446, &_24$$4, &__$true); zephir_check_call_status(); } else { _25$$13 = !width; @@ -225,14 +225,14 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) } ZVAL_LONG(&_29$$13, width); ZVAL_LONG(&_30$$13, height); - ZEPHIR_CALL_FUNCTION(&_31$$13, "imagecreatetruecolor", NULL, 446, &_29$$13, &_30$$13); + ZEPHIR_CALL_FUNCTION(&_31$$13, "imagecreatetruecolor", NULL, 447, &_29$$13, &_30$$13); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &_31$$13); zephir_read_property(&_29$$13, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 447, &_29$$13, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 448, &_29$$13, &__$true); zephir_check_call_status(); zephir_read_property(&_30$$13, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 445, &_30$$13, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 446, &_30$$13, &__$true); zephir_check_call_status(); zephir_read_property(&_32$$13, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); zephir_update_property_zval(this_ptr, ZEND_STRL("realpath"), &_32$$13); @@ -269,7 +269,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, __destruct) zephir_read_property(&_0, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&image, &_0); if (Z_TYPE_P(&image) == IS_RESOURCE) { - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 448, &image); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 449, &image); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -355,13 +355,13 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, getVersion) ZVAL_NULL(&version); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "GD_VERSION"); - ZEPHIR_CALL_FUNCTION(&_1, "defined", NULL, 145, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "defined", NULL, 146, &_0); zephir_check_call_status(); if (zephir_is_true(&_1)) { ZEPHIR_INIT_NVAR(&version); ZEPHIR_GET_CONSTANT(&version, "GD_VERSION"); } else { - ZEPHIR_CALL_FUNCTION(&info, "gd_info", NULL, 449); + ZEPHIR_CALL_FUNCTION(&info, "gd_info", NULL, 450); zephir_check_call_status(); ZEPHIR_INIT_VAR(&matches); ZVAL_NULL(&matches); @@ -424,7 +424,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processBackground) ZEPHIR_INIT_VAR(&_0); ZVAL_DOUBLE(&_1, ((zephir_safe_div_long_long((opacity * 127), 100)) - (double) (127))); - ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 304, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 305, &_1); zephir_check_call_status(); zephir_round(&_0, &_2, NULL, NULL); opacity = zephir_get_intval(&_0); @@ -436,9 +436,9 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processBackground) ZVAL_LONG(&_5, g); ZVAL_LONG(&_6, b); ZVAL_LONG(&_7, opacity); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 450, &background, &_4, &_5, &_6, &_7); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 451, &background, &_4, &_5, &_6, &_7); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 447, &background, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 448, &background, &__$true); zephir_check_call_status(); zephir_read_property(&_4, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_5, this_ptr, ZEND_STRL("width"), PH_NOISY_CC | PH_READONLY); @@ -447,11 +447,11 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processBackground) ZVAL_LONG(&_8, 0); ZVAL_LONG(&_9, 0); ZVAL_LONG(&_10, 0); - ZEPHIR_CALL_FUNCTION(&_11, "imagecopy", NULL, 451, &background, &_4, &_7, &_8, &_9, &_10, &_5, &_6); + ZEPHIR_CALL_FUNCTION(&_11, "imagecopy", NULL, 452, &background, &_4, &_7, &_8, &_9, &_10, &_5, &_6); zephir_check_call_status(); if (zephir_is_true(&_11)) { zephir_read_property(&_12$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 448, &_12$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 449, &_12$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &background); } @@ -488,7 +488,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processBlur) } zephir_read_property(&_0$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_1$$3, 7); - ZEPHIR_CALL_FUNCTION(NULL, "imagefilter", &_2, 452, &_0$$3, &_1$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagefilter", &_2, 453, &_0$$3, &_1$$3); zephir_check_call_status(); i++; } @@ -524,11 +524,11 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processCreate) ZVAL_LONG(&_0, width); ZVAL_LONG(&_1, height); - ZEPHIR_CALL_FUNCTION(&image, "imagecreatetruecolor", NULL, 446, &_0, &_1); + ZEPHIR_CALL_FUNCTION(&image, "imagecreatetruecolor", NULL, 447, &_0, &_1); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 447, &image, &__$false); + ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 448, &image, &__$false); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 445, &image, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 446, &image, &__$true); zephir_check_call_status(); RETURN_CCTOR(&image); } @@ -581,16 +581,16 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processCrop) ZVAL_LONG(&_0, height); zephir_array_update_string(&rect, SL("height"), &_0, PH_COPY | PH_SEPARATE); zephir_read_property(&_1, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&image, "imagecrop", NULL, 453, &_1, &rect); + ZEPHIR_CALL_FUNCTION(&image, "imagecrop", NULL, 454, &_1, &rect); zephir_check_call_status(); zephir_read_property(&_2, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 448, &_2); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 449, &_2); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &image); - ZEPHIR_CALL_FUNCTION(&_3, "imagesx", NULL, 454, &image); + ZEPHIR_CALL_FUNCTION(&_3, "imagesx", NULL, 455, &image); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("width"), &_3); - ZEPHIR_CALL_FUNCTION(&_4, "imagesy", NULL, 455, &image); + ZEPHIR_CALL_FUNCTION(&_4, "imagesy", NULL, 456, &image); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("height"), &_4); ZEPHIR_MM_RESTORE(); @@ -623,12 +623,12 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processFlip) if (direction == 11) { zephir_read_property(&_0$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_1$$3, 1); - ZEPHIR_CALL_FUNCTION(NULL, "imageflip", NULL, 456, &_0$$3, &_1$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imageflip", NULL, 457, &_0$$3, &_1$$3); zephir_check_call_status(); } else { zephir_read_property(&_2$$4, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_3$$4, 2); - ZEPHIR_CALL_FUNCTION(NULL, "imageflip", NULL, 456, &_2$$4, &_3$$4); + ZEPHIR_CALL_FUNCTION(NULL, "imageflip", NULL, 457, &_2$$4, &_3$$4); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -693,32 +693,32 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processMask) ZEPHIR_CALL_METHOD(&_0, mask, "render", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&maskImage, "imagecreatefromstring", NULL, 457, &_0); + ZEPHIR_CALL_FUNCTION(&maskImage, "imagecreatefromstring", NULL, 458, &_0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "imagesx", NULL, 454, &maskImage); + ZEPHIR_CALL_FUNCTION(&_1, "imagesx", NULL, 455, &maskImage); zephir_check_call_status(); mask_width = zephir_get_intval(&_1); - ZEPHIR_CALL_FUNCTION(&_2, "imagesy", NULL, 455, &maskImage); + ZEPHIR_CALL_FUNCTION(&_2, "imagesy", NULL, 456, &maskImage); zephir_check_call_status(); mask_height = zephir_get_intval(&_2); alpha = 127; - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 445, &maskImage, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 446, &maskImage, &__$true); zephir_check_call_status(); zephir_read_property(&_3, this_ptr, ZEND_STRL("width"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_4, this_ptr, ZEND_STRL("height"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(&newimage, this_ptr, "processcreate", NULL, 0, &_3, &_4); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 445, &newimage, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 446, &newimage, &__$true); zephir_check_call_status(); ZVAL_LONG(&_5, 0); ZVAL_LONG(&_6, 0); ZVAL_LONG(&_7, 0); ZVAL_LONG(&_8, alpha); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 450, &newimage, &_5, &_6, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 451, &newimage, &_5, &_6, &_7, &_8); zephir_check_call_status(); ZVAL_LONG(&_5, 0); ZVAL_LONG(&_6, 0); - ZEPHIR_CALL_FUNCTION(NULL, "imagefill", NULL, 458, &newimage, &_5, &_6, &color); + ZEPHIR_CALL_FUNCTION(NULL, "imagefill", NULL, 459, &newimage, &_5, &_6, &color); zephir_check_call_status(); zephir_read_property(&_5, this_ptr, ZEND_STRL("width"), PH_NOISY_CC | PH_READONLY); _9 = !ZEPHIR_IS_LONG(&_5, mask_width); @@ -729,7 +729,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processMask) if (_9) { zephir_read_property(&_10$$3, this_ptr, ZEND_STRL("width"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_11$$3, this_ptr, ZEND_STRL("height"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&tempImage, "imagecreatetruecolor", NULL, 446, &_10$$3, &_11$$3); + ZEPHIR_CALL_FUNCTION(&tempImage, "imagecreatetruecolor", NULL, 447, &_10$$3, &_11$$3); zephir_check_call_status(); zephir_read_property(&_12$$3, this_ptr, ZEND_STRL("width"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_13$$3, this_ptr, ZEND_STRL("height"), PH_NOISY_CC | PH_READONLY); @@ -739,9 +739,9 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processMask) ZVAL_LONG(&_17$$3, 0); ZVAL_LONG(&_18$$3, mask_width); ZVAL_LONG(&_19$$3, mask_height); - ZEPHIR_CALL_FUNCTION(NULL, "imagecopyresampled", NULL, 459, &tempImage, &maskImage, &_14$$3, &_15$$3, &_16$$3, &_17$$3, &_12$$3, &_13$$3, &_18$$3, &_19$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopyresampled", NULL, 460, &tempImage, &maskImage, &_14$$3, &_15$$3, &_16$$3, &_17$$3, &_12$$3, &_13$$3, &_18$$3, &_19$$3); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 448, &maskImage); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 449, &maskImage); zephir_check_call_status(); ZEPHIR_CPY_WRT(&maskImage, &tempImage); } @@ -759,9 +759,9 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processMask) } ZVAL_LONG(&_21$$5, x); ZVAL_LONG(&_22$$5, y); - ZEPHIR_CALL_FUNCTION(&index, "imagecolorat", &_23, 460, &maskImage, &_21$$5, &_22$$5); + ZEPHIR_CALL_FUNCTION(&index, "imagecolorat", &_23, 461, &maskImage, &_21$$5, &_22$$5); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorsforindex", &_24, 461, &maskImage, &index); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorsforindex", &_24, 462, &maskImage, &index); zephir_check_call_status(); if (zephir_array_isset_string(&color, SL("red"))) { zephir_array_fetch_string(&_25$$6, &color, SL("red"), PH_NOISY | PH_READONLY, "phalcon/Image/Adapter/Gd.zep", 291); @@ -771,10 +771,10 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processMask) zephir_read_property(&_21$$5, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_22$$5, x); ZVAL_LONG(&_27$$5, y); - ZEPHIR_CALL_FUNCTION(&index, "imagecolorat", &_23, 460, &_21$$5, &_22$$5, &_27$$5); + ZEPHIR_CALL_FUNCTION(&index, "imagecolorat", &_23, 461, &_21$$5, &_22$$5, &_27$$5); zephir_check_call_status(); zephir_read_property(&_22$$5, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorsforindex", &_24, 461, &_22$$5, &index); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorsforindex", &_24, 462, &_22$$5, &index); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&r); zephir_array_fetch_string(&r, &color, SL("red"), PH_NOISY, "phalcon/Image/Adapter/Gd.zep", 296); @@ -783,20 +783,20 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processMask) ZEPHIR_OBS_NVAR(&b); zephir_array_fetch_string(&b, &color, SL("blue"), PH_NOISY, "phalcon/Image/Adapter/Gd.zep", 298); ZVAL_LONG(&_27$$5, alpha); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 450, &newimage, &r, &g, &b, &_27$$5); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 451, &newimage, &r, &g, &b, &_27$$5); zephir_check_call_status(); ZVAL_LONG(&_27$$5, x); ZVAL_LONG(&_28$$5, y); - ZEPHIR_CALL_FUNCTION(NULL, "imagesetpixel", &_29, 462, &newimage, &_27$$5, &_28$$5, &color); + ZEPHIR_CALL_FUNCTION(NULL, "imagesetpixel", &_29, 463, &newimage, &_27$$5, &_28$$5, &color); zephir_check_call_status(); y++; } x++; } zephir_read_property(&_8, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 448, &_8); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 449, &_8); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 448, &maskImage); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 449, &maskImage); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &newimage); ZEPHIR_MM_RESTORE(); @@ -861,7 +861,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processPixelate) zephir_read_property(&_5$$4, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_6$$4, x1); ZVAL_LONG(&_7$$4, y1); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorat", &_8, 460, &_5$$4, &_6$$4, &_7$$4); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorat", &_8, 461, &_5$$4, &_6$$4, &_7$$4); zephir_check_call_status(); x2 = (x + amount); y2 = (y + amount); @@ -870,7 +870,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processPixelate) ZVAL_LONG(&_9$$4, y); ZVAL_LONG(&_10$$4, x2); ZVAL_LONG(&_11$$4, y2); - ZEPHIR_CALL_FUNCTION(NULL, "imagefilledrectangle", &_12, 463, &_6$$4, &_7$$4, &_9$$4, &_10$$4, &_11$$4, &color); + ZEPHIR_CALL_FUNCTION(NULL, "imagefilledrectangle", &_12, 464, &_6$$4, &_7$$4, &_9$$4, &_10$$4, &_11$$4, &color); zephir_check_call_status(); y += amount; } @@ -937,7 +937,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processReflection) ZEPHIR_INIT_VAR(&_0); ZVAL_DOUBLE(&_1, ((zephir_safe_div_long_long((opacity * 127), 100)) - (double) (127))); - ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 304, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 305, &_1); zephir_check_call_status(); zephir_round(&_0, &_2, NULL, NULL); opacity = zephir_get_intval(&_0); @@ -958,7 +958,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processReflection) ZVAL_LONG(&_8, 0); ZVAL_LONG(&_9, 0); ZVAL_LONG(&_10, 0); - ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", NULL, 451, &reflection, &_4, &_7, &_8, &_9, &_10, &_5, &_6); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", NULL, 452, &reflection, &_4, &_7, &_8, &_9, &_10, &_5, &_6); zephir_check_call_status(); offset = 0; while (1) { @@ -991,14 +991,14 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processReflection) ZVAL_LONG(&_22$$5, 0); ZVAL_LONG(&_23$$5, src_y); ZVAL_LONG(&_24$$5, 1); - ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", NULL, 451, &line, &_18$$5, &_20$$5, &_21$$5, &_22$$5, &_23$$5, &_19$$5, &_24$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", NULL, 452, &line, &_18$$5, &_20$$5, &_21$$5, &_22$$5, &_23$$5, &_19$$5, &_24$$5); zephir_check_call_status(); ZVAL_LONG(&_20$$5, 4); ZVAL_LONG(&_21$$5, 0); ZVAL_LONG(&_22$$5, 0); ZVAL_LONG(&_23$$5, 0); ZVAL_LONG(&_24$$5, dst_opacity); - ZEPHIR_CALL_FUNCTION(NULL, "imagefilter", &_25, 452, &line, &_20$$5, &_21$$5, &_22$$5, &_23$$5, &_24$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagefilter", &_25, 453, &line, &_20$$5, &_21$$5, &_22$$5, &_23$$5, &_24$$5); zephir_check_call_status(); zephir_read_property(&_20$$5, this_ptr, ZEND_STRL("width"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_21$$5, 0); @@ -1006,18 +1006,18 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processReflection) ZVAL_LONG(&_23$$5, 0); ZVAL_LONG(&_24$$5, 0); ZVAL_LONG(&_26$$5, 1); - ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", NULL, 451, &reflection, &line, &_21$$5, &_22$$5, &_23$$5, &_24$$5, &_20$$5, &_26$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", NULL, 452, &reflection, &line, &_21$$5, &_22$$5, &_23$$5, &_24$$5, &_20$$5, &_26$$5); zephir_check_call_status(); offset++; } zephir_read_property(&_7, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 448, &_7); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 449, &_7); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &reflection); - ZEPHIR_CALL_FUNCTION(&_27, "imagesx", NULL, 454, &reflection); + ZEPHIR_CALL_FUNCTION(&_27, "imagesx", NULL, 455, &reflection); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("width"), &_27); - ZEPHIR_CALL_FUNCTION(&_28, "imagesy", NULL, 455, &reflection); + ZEPHIR_CALL_FUNCTION(&_28, "imagesy", NULL, 456, &reflection); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("height"), &_28); ZEPHIR_MM_RESTORE(); @@ -1068,56 +1068,56 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processRender) ZEPHIR_INIT_VAR(&_0); zephir_fast_strtolower(&_0, &ext); zephir_get_strval(&ext, &_0); - ZEPHIR_CALL_FUNCTION(NULL, "ob_start", NULL, 464); + ZEPHIR_CALL_FUNCTION(NULL, "ob_start", NULL, 465); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "gif"); - ZEPHIR_CALL_FUNCTION(&_2, "strcmp", NULL, 313, &ext, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "strcmp", NULL, 314, &ext, &_1); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "jpg"); - ZEPHIR_CALL_FUNCTION(&_3, "strcmp", NULL, 313, &ext, &_1); + ZEPHIR_CALL_FUNCTION(&_3, "strcmp", NULL, 314, &ext, &_1); zephir_check_call_status(); _4 = ZEPHIR_IS_LONG(&_3, 0); if (!(_4)) { ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "jpeg"); - ZEPHIR_CALL_FUNCTION(&_5, "strcmp", NULL, 313, &ext, &_1); + ZEPHIR_CALL_FUNCTION(&_5, "strcmp", NULL, 314, &ext, &_1); zephir_check_call_status(); _4 = ZEPHIR_IS_LONG(&_5, 0); } ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "png"); - ZEPHIR_CALL_FUNCTION(&_6, "strcmp", NULL, 313, &ext, &_1); + ZEPHIR_CALL_FUNCTION(&_6, "strcmp", NULL, 314, &ext, &_1); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "wbmp"); - ZEPHIR_CALL_FUNCTION(&_7, "strcmp", NULL, 313, &ext, &_1); + ZEPHIR_CALL_FUNCTION(&_7, "strcmp", NULL, 314, &ext, &_1); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "xbm"); - ZEPHIR_CALL_FUNCTION(&_8, "strcmp", NULL, 313, &ext, &_1); + ZEPHIR_CALL_FUNCTION(&_8, "strcmp", NULL, 314, &ext, &_1); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_2, 0)) { zephir_read_property(&_9$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagegif", NULL, 465, &_9$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagegif", NULL, 466, &_9$$3); zephir_check_call_status(); } else if (_4) { zephir_read_property(&_10$$4, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_11$$4, quality); - ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 466, &_10$$4, &__$null, &_11$$4); + ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 467, &_10$$4, &__$null, &_11$$4); zephir_check_call_status(); } else if (ZEPHIR_IS_LONG(&_6, 0)) { zephir_read_property(&_12$$5, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagepng", NULL, 467, &_12$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagepng", NULL, 468, &_12$$5); zephir_check_call_status(); } else if (ZEPHIR_IS_LONG(&_7, 0)) { zephir_read_property(&_13$$6, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagewbmp", NULL, 468, &_13$$6); + ZEPHIR_CALL_FUNCTION(NULL, "imagewbmp", NULL, 469, &_13$$6); zephir_check_call_status(); } else if (ZEPHIR_IS_LONG(&_8, 0)) { zephir_read_property(&_14$$7, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagexbm", NULL, 469, &_14$$7, &__$null); + ZEPHIR_CALL_FUNCTION(NULL, "imagexbm", NULL, 470, &_14$$7, &__$null); zephir_check_call_status(); } else { ZEPHIR_INIT_VAR(&_15$$8); @@ -1130,7 +1130,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processRender) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", NULL, 470); + ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", NULL, 471); zephir_check_call_status(); RETURN_MM(); } @@ -1166,16 +1166,16 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processResize) zephir_read_property(&_0, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_1, width); ZVAL_LONG(&_2, height); - ZEPHIR_CALL_FUNCTION(&image, "imagescale", NULL, 471, &_0, &_1, &_2); + ZEPHIR_CALL_FUNCTION(&image, "imagescale", NULL, 472, &_0, &_1, &_2); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 448, &_1); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 449, &_1); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &image); - ZEPHIR_CALL_FUNCTION(&_3, "imagesx", NULL, 454, &image); + ZEPHIR_CALL_FUNCTION(&_3, "imagesx", NULL, 455, &image); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("width"), &_3); - ZEPHIR_CALL_FUNCTION(&_4, "imagesy", NULL, 455, &image); + ZEPHIR_CALL_FUNCTION(&_4, "imagesy", NULL, 456, &image); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("height"), &_4); ZEPHIR_MM_RESTORE(); @@ -1221,18 +1221,18 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processRotate) ZVAL_LONG(&_2, 0); ZVAL_LONG(&_3, 0); ZVAL_LONG(&_4, 127); - ZEPHIR_CALL_FUNCTION(&transparent, "imagecolorallocatealpha", NULL, 450, &_0, &_1, &_2, &_3, &_4); + ZEPHIR_CALL_FUNCTION(&transparent, "imagecolorallocatealpha", NULL, 451, &_0, &_1, &_2, &_3, &_4); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_2, (360 - degrees)); ZVAL_LONG(&_3, 1); - ZEPHIR_CALL_FUNCTION(&image, "imagerotate", NULL, 472, &_1, &_2, &transparent, &_3); + ZEPHIR_CALL_FUNCTION(&image, "imagerotate", NULL, 473, &_1, &_2, &transparent, &_3); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 445, &image, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 446, &image, &__$true); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&width, "imagesx", NULL, 454, &image); + ZEPHIR_CALL_FUNCTION(&width, "imagesx", NULL, 455, &image); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&height, "imagesy", NULL, 455, &image); + ZEPHIR_CALL_FUNCTION(&height, "imagesy", NULL, 456, &image); zephir_check_call_status(); zephir_read_property(&_2, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_3, 0); @@ -1240,11 +1240,11 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processRotate) ZVAL_LONG(&_5, 0); ZVAL_LONG(&_6, 0); ZVAL_LONG(&_7, 100); - ZEPHIR_CALL_FUNCTION(&_8, "imagecopymerge", NULL, 473, &_2, &image, &_3, &_4, &_5, &_6, &width, &height, &_7); + ZEPHIR_CALL_FUNCTION(&_8, "imagecopymerge", NULL, 474, &_2, &image, &_3, &_4, &_5, &_6, &width, &height, &_7); zephir_check_call_status(); if (zephir_is_true(&_8)) { zephir_read_property(&_9$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 448, &_9$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 449, &_9$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &image); zephir_update_property_zval(this_ptr, ZEND_STRL("width"), &width); @@ -1312,7 +1312,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processSave) zephir_check_call_status(); if (!(zephir_is_true(&ext))) { zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("type"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&ext, "image_type_to_extension", NULL, 474, &_1$$3, &__$false); + ZEPHIR_CALL_FUNCTION(&ext, "image_type_to_extension", NULL, 475, &_1$$3, &__$false); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_2); @@ -1320,30 +1320,30 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processSave) ZEPHIR_CPY_WRT(&ext, &_2); ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "gif"); - ZEPHIR_CALL_FUNCTION(&_3, "strcmp", NULL, 313, &ext, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "strcmp", NULL, 314, &ext, &_2); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_3, 0)) { ZEPHIR_INIT_ZVAL_NREF(_4$$4); ZVAL_LONG(&_4$$4, 1); zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &_4$$4); zephir_read_property(&_4$$4, this_ptr, ZEND_STRL("type"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_5$$4, "image_type_to_mime_type", NULL, 475, &_4$$4); + ZEPHIR_CALL_FUNCTION(&_5$$4, "image_type_to_mime_type", NULL, 476, &_4$$4); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("mime"), &_5$$4); zephir_read_property(&_6$$4, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagegif", NULL, 465, &_6$$4, &file); + ZEPHIR_CALL_FUNCTION(NULL, "imagegif", NULL, 466, &_6$$4, &file); zephir_check_call_status(); RETURN_MM_BOOL(1); } ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "jpg"); - ZEPHIR_CALL_FUNCTION(&_7, "strcmp", NULL, 313, &ext, &_2); + ZEPHIR_CALL_FUNCTION(&_7, "strcmp", NULL, 314, &ext, &_2); zephir_check_call_status(); _8 = ZEPHIR_IS_LONG(&_7, 0); if (!(_8)) { ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "jpeg"); - ZEPHIR_CALL_FUNCTION(&_9, "strcmp", NULL, 313, &ext, &_2); + ZEPHIR_CALL_FUNCTION(&_9, "strcmp", NULL, 314, &ext, &_2); zephir_check_call_status(); _8 = ZEPHIR_IS_LONG(&_9, 0); } @@ -1352,7 +1352,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processSave) ZVAL_LONG(&_10$$5, 2); zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &_10$$5); zephir_read_property(&_10$$5, this_ptr, ZEND_STRL("type"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_11$$5, "image_type_to_mime_type", NULL, 475, &_10$$5); + ZEPHIR_CALL_FUNCTION(&_11$$5, "image_type_to_mime_type", NULL, 476, &_10$$5); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("mime"), &_11$$5); if (quality >= 0) { @@ -1363,63 +1363,63 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processSave) } zephir_read_property(&_12$$6, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_13$$6, quality); - ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 466, &_12$$6, &file, &_13$$6); + ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 467, &_12$$6, &file, &_13$$6); zephir_check_call_status(); } else { zephir_read_property(&_14$$9, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 466, &_14$$9, &file); + ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 467, &_14$$9, &file); zephir_check_call_status(); } RETURN_MM_BOOL(1); } ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "png"); - ZEPHIR_CALL_FUNCTION(&_15, "strcmp", NULL, 313, &ext, &_2); + ZEPHIR_CALL_FUNCTION(&_15, "strcmp", NULL, 314, &ext, &_2); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_15, 0)) { ZEPHIR_INIT_ZVAL_NREF(_16$$10); ZVAL_LONG(&_16$$10, 3); zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &_16$$10); zephir_read_property(&_16$$10, this_ptr, ZEND_STRL("type"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_17$$10, "image_type_to_mime_type", NULL, 475, &_16$$10); + ZEPHIR_CALL_FUNCTION(&_17$$10, "image_type_to_mime_type", NULL, 476, &_16$$10); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("mime"), &_17$$10); zephir_read_property(&_18$$10, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagepng", NULL, 467, &_18$$10, &file); + ZEPHIR_CALL_FUNCTION(NULL, "imagepng", NULL, 468, &_18$$10, &file); zephir_check_call_status(); RETURN_MM_BOOL(1); } ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "wbmp"); - ZEPHIR_CALL_FUNCTION(&_19, "strcmp", NULL, 313, &ext, &_2); + ZEPHIR_CALL_FUNCTION(&_19, "strcmp", NULL, 314, &ext, &_2); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_19, 0)) { ZEPHIR_INIT_ZVAL_NREF(_20$$11); ZVAL_LONG(&_20$$11, 15); zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &_20$$11); zephir_read_property(&_20$$11, this_ptr, ZEND_STRL("type"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_21$$11, "image_type_to_mime_type", NULL, 475, &_20$$11); + ZEPHIR_CALL_FUNCTION(&_21$$11, "image_type_to_mime_type", NULL, 476, &_20$$11); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("mime"), &_21$$11); zephir_read_property(&_22$$11, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagewbmp", NULL, 468, &_22$$11, &file); + ZEPHIR_CALL_FUNCTION(NULL, "imagewbmp", NULL, 469, &_22$$11, &file); zephir_check_call_status(); RETURN_MM_BOOL(1); } ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "xbm"); - ZEPHIR_CALL_FUNCTION(&_23, "strcmp", NULL, 313, &ext, &_2); + ZEPHIR_CALL_FUNCTION(&_23, "strcmp", NULL, 314, &ext, &_2); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_23, 0)) { ZEPHIR_INIT_ZVAL_NREF(_24$$12); ZVAL_LONG(&_24$$12, 16); zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &_24$$12); zephir_read_property(&_24$$12, this_ptr, ZEND_STRL("type"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_25$$12, "image_type_to_mime_type", NULL, 475, &_24$$12); + ZEPHIR_CALL_FUNCTION(&_25$$12, "image_type_to_mime_type", NULL, 476, &_24$$12); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("mime"), &_25$$12); zephir_read_property(&_26$$12, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagexbm", NULL, 469, &_26$$12, &file); + ZEPHIR_CALL_FUNCTION(NULL, "imagexbm", NULL, 470, &_26$$12, &file); zephir_check_call_status(); RETURN_MM_BOOL(1); } @@ -1471,7 +1471,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processSharpen) ZEPHIR_INIT_VAR(&_0); ZVAL_LONG(&_1, (-18 + ((amount * 0.08)))); - ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 304, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 305, &_1); zephir_check_call_status(); ZVAL_LONG(&_1, 2); zephir_round(&_0, &_2, &_1, NULL); @@ -1517,15 +1517,15 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processSharpen) zephir_read_property(&_5, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_6, (amount - 8)); ZVAL_LONG(&_7, 0); - ZEPHIR_CALL_FUNCTION(&_8, "imageconvolution", NULL, 476, &_5, &matrix, &_6, &_7); + ZEPHIR_CALL_FUNCTION(&_8, "imageconvolution", NULL, 477, &_5, &matrix, &_6, &_7); zephir_check_call_status(); if (zephir_is_true(&_8)) { zephir_read_property(&_9$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_10$$3, "imagesx", NULL, 454, &_9$$3); + ZEPHIR_CALL_FUNCTION(&_10$$3, "imagesx", NULL, 455, &_9$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("width"), &_10$$3); zephir_read_property(&_11$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_12$$3, "imagesy", NULL, 455, &_11$$3); + ZEPHIR_CALL_FUNCTION(&_12$$3, "imagesy", NULL, 456, &_11$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("height"), &_12$$3); } @@ -1605,14 +1605,14 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processText) topRightY = 0; ZEPHIR_INIT_VAR(&_0); ZVAL_DOUBLE(&_1, ((zephir_safe_div_long_long((opacity * 127), 100)) - (double) (127))); - ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 304, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 305, &_1); zephir_check_call_status(); zephir_round(&_0, &_2, NULL, NULL); opacity = zephir_get_intval(&_0); if (!(ZEPHIR_IS_EMPTY(&fontfile))) { ZVAL_LONG(&_3$$3, size); ZVAL_LONG(&_4$$3, 0); - ZEPHIR_CALL_FUNCTION(&space, "imagettfbbox", NULL, 477, &_3$$3, &_4$$3, &fontfile, &text); + ZEPHIR_CALL_FUNCTION(&space, "imagettfbbox", NULL, 478, &_3$$3, &_4$$3, &fontfile, &text); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&space)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_image_exception_ce, "Call to imagettfbbox() failed", "phalcon/Image/Adapter/Gd.zep", 618); @@ -1633,11 +1633,11 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processText) topRightY = zephir_get_intval(&_8$$5); } ZVAL_LONG(&_3$$3, (topRightX - bottomLeftX)); - ZEPHIR_CALL_FUNCTION(&_9$$3, "abs", NULL, 304, &_3$$3); + ZEPHIR_CALL_FUNCTION(&_9$$3, "abs", NULL, 305, &_3$$3); zephir_check_call_status(); width = (zephir_get_numberval(&_9$$3) + 10); ZVAL_LONG(&_3$$3, (topRightY - bottomLeftY)); - ZEPHIR_CALL_FUNCTION(&_10$$3, "abs", NULL, 304, &_3$$3); + ZEPHIR_CALL_FUNCTION(&_10$$3, "abs", NULL, 305, &_3$$3); zephir_check_call_status(); height = (zephir_get_numberval(&_10$$3) + 10); if (offsetX < 0) { @@ -1653,7 +1653,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processText) ZVAL_LONG(&_13$$3, g); ZVAL_LONG(&_14$$3, b); ZVAL_LONG(&_15$$3, opacity); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 450, &_3$$3, &_4$$3, &_13$$3, &_14$$3, &_15$$3); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 451, &_3$$3, &_4$$3, &_13$$3, &_14$$3, &_15$$3); zephir_check_call_status(); angle = 0; zephir_read_property(&_4$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); @@ -1661,15 +1661,15 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processText) ZVAL_LONG(&_14$$3, angle); ZVAL_LONG(&_15$$3, offsetX); ZVAL_LONG(&_16$$3, offsetY); - ZEPHIR_CALL_FUNCTION(NULL, "imagettftext", NULL, 478, &_4$$3, &_13$$3, &_14$$3, &_15$$3, &_16$$3, &color, &fontfile, &text); + ZEPHIR_CALL_FUNCTION(NULL, "imagettftext", NULL, 479, &_4$$3, &_13$$3, &_14$$3, &_15$$3, &_16$$3, &color, &fontfile, &text); zephir_check_call_status(); } else { ZVAL_LONG(&_17$$8, size); - ZEPHIR_CALL_FUNCTION(&_18$$8, "imagefontwidth", NULL, 479, &_17$$8); + ZEPHIR_CALL_FUNCTION(&_18$$8, "imagefontwidth", NULL, 480, &_17$$8); zephir_check_call_status(); width = (zephir_get_intval(&_18$$8) * zephir_fast_strlen_ev(&text)); ZVAL_LONG(&_17$$8, size); - ZEPHIR_CALL_FUNCTION(&_19$$8, "imagefontheight", NULL, 480, &_17$$8); + ZEPHIR_CALL_FUNCTION(&_19$$8, "imagefontheight", NULL, 481, &_17$$8); zephir_check_call_status(); height = zephir_get_intval(&_19$$8); if (offsetX < 0) { @@ -1685,13 +1685,13 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processText) ZVAL_LONG(&_23$$8, g); ZVAL_LONG(&_24$$8, b); ZVAL_LONG(&_25$$8, opacity); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 450, &_17$$8, &_22$$8, &_23$$8, &_24$$8, &_25$$8); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 451, &_17$$8, &_22$$8, &_23$$8, &_24$$8, &_25$$8); zephir_check_call_status(); zephir_read_property(&_22$$8, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_23$$8, size); ZVAL_LONG(&_24$$8, offsetX); ZVAL_LONG(&_25$$8, offsetY); - ZEPHIR_CALL_FUNCTION(NULL, "imagestring", NULL, 481, &_22$$8, &_23$$8, &_24$$8, &_25$$8, &text, &color); + ZEPHIR_CALL_FUNCTION(NULL, "imagestring", NULL, 482, &_22$$8, &_23$$8, &_24$$8, &_25$$8, &text, &color); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); @@ -1746,20 +1746,20 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processWatermark) ZEPHIR_CALL_METHOD(&_0, watermark, "render", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&overlay, "imagecreatefromstring", NULL, 457, &_0); + ZEPHIR_CALL_FUNCTION(&overlay, "imagecreatefromstring", NULL, 458, &_0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 445, &overlay, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 446, &overlay, &__$true); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "imagesx", NULL, 454, &overlay); + ZEPHIR_CALL_FUNCTION(&_1, "imagesx", NULL, 455, &overlay); zephir_check_call_status(); width = zephir_get_intval(&_1); - ZEPHIR_CALL_FUNCTION(&_2, "imagesy", NULL, 455, &overlay); + ZEPHIR_CALL_FUNCTION(&_2, "imagesy", NULL, 456, &overlay); zephir_check_call_status(); height = zephir_get_intval(&_2); if (opacity < 100) { ZEPHIR_INIT_VAR(&_3$$3); ZVAL_DOUBLE(&_4$$3, ((zephir_safe_div_long_long((opacity * 127), 100)) - (double) (127))); - ZEPHIR_CALL_FUNCTION(&_5$$3, "abs", NULL, 304, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "abs", NULL, 305, &_4$$3); zephir_check_call_status(); zephir_round(&_3$$3, &_5$$3, NULL, NULL); opacity = zephir_get_intval(&_3$$3); @@ -1767,20 +1767,20 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processWatermark) ZVAL_LONG(&_6$$3, 127); ZVAL_LONG(&_7$$3, 127); ZVAL_LONG(&_8$$3, opacity); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 450, &overlay, &_4$$3, &_6$$3, &_7$$3, &_8$$3); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 451, &overlay, &_4$$3, &_6$$3, &_7$$3, &_8$$3); zephir_check_call_status(); ZVAL_LONG(&_4$$3, 3); - ZEPHIR_CALL_FUNCTION(NULL, "imagelayereffect", NULL, 482, &overlay, &_4$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagelayereffect", NULL, 483, &overlay, &_4$$3); zephir_check_call_status(); ZVAL_LONG(&_4$$3, 0); ZVAL_LONG(&_6$$3, 0); ZVAL_LONG(&_7$$3, width); ZVAL_LONG(&_8$$3, height); - ZEPHIR_CALL_FUNCTION(NULL, "imagefilledrectangle", NULL, 463, &overlay, &_4$$3, &_6$$3, &_7$$3, &_8$$3, &color); + ZEPHIR_CALL_FUNCTION(NULL, "imagefilledrectangle", NULL, 464, &overlay, &_4$$3, &_6$$3, &_7$$3, &_8$$3, &color); zephir_check_call_status(); } zephir_read_property(&_9, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 447, &_9, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 448, &_9, &__$true); zephir_check_call_status(); zephir_read_property(&_10, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_11, offsetX); @@ -1789,10 +1789,10 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processWatermark) ZVAL_LONG(&_14, 0); ZVAL_LONG(&_15, width); ZVAL_LONG(&_16, height); - ZEPHIR_CALL_FUNCTION(&_17, "imagecopy", NULL, 451, &_10, &overlay, &_11, &_12, &_13, &_14, &_15, &_16); + ZEPHIR_CALL_FUNCTION(&_17, "imagecopy", NULL, 452, &_10, &overlay, &_11, &_12, &_13, &_14, &_15, &_16); zephir_check_call_status(); if (zephir_is_true(&_17)) { - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 448, &overlay); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 449, &overlay); zephir_check_call_status(); } ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/image/adapter/imagick.zep.c b/ext/phalcon/image/adapter/imagick.zep.c index e1f4b991f52..3dd389d3e88 100644 --- a/ext/phalcon/image/adapter/imagick.zep.c +++ b/ext/phalcon/image/adapter/imagick.zep.c @@ -186,7 +186,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, __construct) zephir_read_property(&_13$$6, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_14$$6); ZVAL_STRING(&_14$$6, "Imagick::ALPHACHANNEL_SET"); - ZEPHIR_CALL_FUNCTION(&_15$$6, "constant", NULL, 146, &_14$$6); + ZEPHIR_CALL_FUNCTION(&_15$$6, "constant", NULL, 147, &_14$$6); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_13$$6, "setimagealphachannel", NULL, 0, &_15$$6); zephir_check_call_status(); @@ -330,12 +330,12 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, check) } ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "Imagick::IMAGICK_EXTNUM"); - ZEPHIR_CALL_FUNCTION(&_3, "defined", NULL, 145, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "defined", NULL, 146, &_2); zephir_check_call_status(); if (zephir_is_true(&_3)) { ZEPHIR_INIT_VAR(&_4$$5); ZVAL_STRING(&_4$$5, "Imagick::IMAGICK_EXTNUM"); - ZEPHIR_CALL_FUNCTION(&_5$$5, "constant", NULL, 146, &_4$$5); + ZEPHIR_CALL_FUNCTION(&_5$$5, "constant", NULL, 147, &_4$$5); zephir_check_call_status(); zephir_update_static_property_ce(phalcon_image_adapter_imagick_ce, ZEND_STRL("version"), &_5$$5); } @@ -454,7 +454,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processBackground) ZVAL_LONG(&_1, r); ZVAL_LONG(&_2, g); ZVAL_LONG(&_3, b); - ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 144, &_0, &_1, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 145, &_0, &_1, &_2, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&pixel1); object_init_ex(&pixel1, zephir_get_internal_ce(SL("imagickpixel"))); @@ -484,7 +484,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processBackground) if (!(zephir_is_true(&_7$$3))) { ZEPHIR_INIT_NVAR(&_9$$4); ZVAL_STRING(&_9$$4, "Imagick::ALPHACHANNEL_SET"); - ZEPHIR_CALL_FUNCTION(&_10$$4, "constant", &_11, 146, &_9$$4); + ZEPHIR_CALL_FUNCTION(&_10$$4, "constant", &_11, 147, &_9$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &background, "setimagealphachannel", &_12, 0, &_10$$4); zephir_check_call_status(); @@ -493,11 +493,11 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processBackground) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_14$$3); ZVAL_STRING(&_14$$3, "Imagick::EVALUATE_MULTIPLY"); - ZEPHIR_CALL_FUNCTION(&_15$$3, "constant", &_11, 146, &_14$$3); + ZEPHIR_CALL_FUNCTION(&_15$$3, "constant", &_11, 147, &_14$$3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_14$$3); ZVAL_STRING(&_14$$3, "Imagick::CHANNEL_ALPHA"); - ZEPHIR_CALL_FUNCTION(&_16$$3, "constant", &_11, 146, &_14$$3); + ZEPHIR_CALL_FUNCTION(&_16$$3, "constant", &_11, 147, &_14$$3); zephir_check_call_status(); ZVAL_LONG(&_17$$3, opacity); ZEPHIR_CALL_METHOD(NULL, &background, "evaluateimage", &_18, 0, &_15$$3, &_17$$3, &_16$$3); @@ -510,7 +510,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processBackground) zephir_read_property(&_21$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_14$$3); ZVAL_STRING(&_14$$3, "Imagick::COMPOSITE_DISSOLVE"); - ZEPHIR_CALL_FUNCTION(&_22$$3, "constant", &_11, 146, &_14$$3); + ZEPHIR_CALL_FUNCTION(&_22$$3, "constant", &_11, 147, &_14$$3); zephir_check_call_status(); ZVAL_LONG(&_23$$3, 0); ZVAL_LONG(&_24$$3, 0); @@ -846,7 +846,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processMask) zephir_read_property(&_4$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_5$$3); ZVAL_STRING(&_5$$3, "Imagick::COMPOSITE_DSTIN"); - ZEPHIR_CALL_FUNCTION(&_6$$3, "constant", &_7, 146, &_5$$3); + ZEPHIR_CALL_FUNCTION(&_6$$3, "constant", &_7, 147, &_5$$3); zephir_check_call_status(); ZVAL_LONG(&_8$$3, 0); ZVAL_LONG(&_9$$3, 0); @@ -1080,7 +1080,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) while (1) { ZEPHIR_INIT_NVAR(&_19$$7); ZVAL_STRING(&_19$$7, "Imagick::COMPOSITE_DSTOUT"); - ZEPHIR_CALL_FUNCTION(&_20$$7, "constant", &_21, 146, &_19$$7); + ZEPHIR_CALL_FUNCTION(&_20$$7, "constant", &_21, 147, &_19$$7); zephir_check_call_status(); ZVAL_LONG(&_22$$7, 0); ZVAL_LONG(&_23$$7, 0); @@ -1092,11 +1092,11 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) } ZEPHIR_INIT_NVAR(&_19$$7); ZVAL_STRING(&_19$$7, "Imagick::EVALUATE_MULTIPLY"); - ZEPHIR_CALL_FUNCTION(&_25$$7, "constant", &_21, 146, &_19$$7); + ZEPHIR_CALL_FUNCTION(&_25$$7, "constant", &_21, 147, &_19$$7); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_19$$7); ZVAL_STRING(&_19$$7, "Imagick::CHANNEL_ALPHA"); - ZEPHIR_CALL_FUNCTION(&_26$$7, "constant", &_21, 146, &_19$$7); + ZEPHIR_CALL_FUNCTION(&_26$$7, "constant", &_21, 147, &_19$$7); zephir_check_call_status(); ZVAL_LONG(&_22$$7, opacity); ZEPHIR_CALL_METHOD(NULL, &reflection, "evaluateimage", &_27, 0, &_25$$7, &_22$$7, &_26$$7); @@ -1132,7 +1132,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_36$$10); ZVAL_STRING(&_36$$10, "Imagick::ALPHACHANNEL_SET"); - ZEPHIR_CALL_FUNCTION(&_37$$10, "constant", &_21, 146, &_36$$10); + ZEPHIR_CALL_FUNCTION(&_37$$10, "constant", &_21, 147, &_36$$10); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &image, "setimagealphachannel", &_38, 0, &_37$$10); zephir_check_call_status(); @@ -1149,7 +1149,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) zephir_read_property(&_44$$10, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_36$$10); ZVAL_STRING(&_36$$10, "Imagick::COMPOSITE_SRC"); - ZEPHIR_CALL_FUNCTION(&_45$$10, "constant", &_21, 146, &_36$$10); + ZEPHIR_CALL_FUNCTION(&_45$$10, "constant", &_21, 147, &_36$$10); zephir_check_call_status(); ZVAL_LONG(&_46$$10, 0); ZVAL_LONG(&_47$$10, 0); @@ -1175,7 +1175,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processReflection) while (1) { ZEPHIR_INIT_NVAR(&_50$$13); ZVAL_STRING(&_50$$13, "Imagick::COMPOSITE_OVER"); - ZEPHIR_CALL_FUNCTION(&_51$$13, "constant", &_21, 146, &_50$$13); + ZEPHIR_CALL_FUNCTION(&_51$$13, "constant", &_21, 147, &_50$$13); zephir_check_call_status(); zephir_read_property(&_52$$13, this_ptr, ZEND_STRL("height"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_53$$13, 0); @@ -1297,7 +1297,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processRender) if (_8$$4) { ZEPHIR_INIT_VAR(&_10$$5); ZVAL_STRING(&_10$$5, "Imagick::COMPRESSION_JPEG"); - ZEPHIR_CALL_FUNCTION(&_11$$5, "constant", NULL, 146, &_10$$5); + ZEPHIR_CALL_FUNCTION(&_11$$5, "constant", NULL, 147, &_10$$5); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &image, "setimagecompression", NULL, 0, &_11$$5); zephir_check_call_status(); @@ -1546,7 +1546,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processSave) zephir_read_property(&_15$$4, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_16$$4); ZVAL_STRING(&_16$$4, "Imagick::COMPRESSION_JPEG"); - ZEPHIR_CALL_FUNCTION(&_17$$4, "constant", NULL, 146, &_16$$4); + ZEPHIR_CALL_FUNCTION(&_17$$4, "constant", NULL, 147, &_16$$4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_15$$4, "setimagecompression", NULL, 0, &_17$$4); zephir_check_call_status(); @@ -1707,7 +1707,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) ZVAL_LONG(&_1, r); ZVAL_LONG(&_2, g); ZVAL_LONG(&_3, b); - ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 144, &_0, &_1, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 145, &_0, &_1, &_2, &_3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_0); object_init_ex(&_0, zephir_get_internal_ce(SL("imagickpixel"))); @@ -1739,7 +1739,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) ZVAL_LONG(offsetY, 0); ZEPHIR_INIT_VAR(&_6$$7); ZVAL_STRING(&_6$$7, "Imagick::GRAVITY_CENTER"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 146, &_6$$7); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 147, &_6$$7); zephir_check_call_status(); } else { if (Z_TYPE_P(offsetY) == IS_LONG) { @@ -1752,13 +1752,13 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) ZVAL_LONG(offsetY, (y * -1)); ZEPHIR_INIT_VAR(&_7$$11); ZVAL_STRING(&_7$$11, "Imagick::GRAVITY_SOUTHEAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 146, &_7$$11); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 147, &_7$$11); zephir_check_call_status(); } else { ZVAL_LONG(offsetX, 0); ZEPHIR_INIT_VAR(&_8$$12); ZVAL_STRING(&_8$$12, "Imagick::GRAVITY_NORTHEAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 146, &_8$$12); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 147, &_8$$12); zephir_check_call_status(); } } else { @@ -1769,13 +1769,13 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) ZVAL_LONG(offsetY, (y * -1)); ZEPHIR_INIT_VAR(&_9$$14); ZVAL_STRING(&_9$$14, "Imagick::GRAVITY_SOUTH"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 146, &_9$$14); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 147, &_9$$14); zephir_check_call_status(); } else { ZVAL_LONG(offsetX, 0); ZEPHIR_INIT_VAR(&_10$$15); ZVAL_STRING(&_10$$15, "Imagick::GRAVITY_NORTH"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 146, &_10$$15); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 147, &_10$$15); zephir_check_call_status(); } } @@ -1794,13 +1794,13 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) ZVAL_LONG(offsetY, 0); ZEPHIR_INIT_VAR(&_11$$21); ZVAL_STRING(&_11$$21, "Imagick::GRAVITY_SOUTHEAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 146, &_11$$21); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 147, &_11$$21); zephir_check_call_status(); } else { ZVAL_LONG(offsetY, 0); ZEPHIR_INIT_VAR(&_12$$22); ZVAL_STRING(&_12$$22, "Imagick::GRAVITY_SOUTH"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 146, &_12$$22); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 147, &_12$$22); zephir_check_call_status(); } } else { @@ -1811,13 +1811,13 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) ZVAL_LONG(offsetY, 0); ZEPHIR_INIT_VAR(&_13$$24); ZVAL_STRING(&_13$$24, "Imagick::GRAVITY_EAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 146, &_13$$24); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 147, &_13$$24); zephir_check_call_status(); } else { ZVAL_LONG(offsetY, 0); ZEPHIR_INIT_VAR(&_14$$25); ZVAL_STRING(&_14$$25, "Imagick::GRAVITY_WEST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 146, &_14$$25); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 147, &_14$$25); zephir_check_call_status(); } } @@ -1833,13 +1833,13 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) ZVAL_LONG(offsetY, (y * -1)); ZEPHIR_INIT_VAR(&_15$$29); ZVAL_STRING(&_15$$29, "Imagick::GRAVITY_SOUTHEAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 146, &_15$$29); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 147, &_15$$29); zephir_check_call_status(); } else { ZVAL_LONG(offsetX, (x * -1)); ZEPHIR_INIT_VAR(&_16$$30); ZVAL_STRING(&_16$$30, "Imagick::GRAVITY_NORTHEAST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 146, &_16$$30); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 147, &_16$$30); zephir_check_call_status(); } } else { @@ -1850,13 +1850,13 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processText) ZVAL_LONG(offsetY, (y * -1)); ZEPHIR_INIT_VAR(&_17$$32); ZVAL_STRING(&_17$$32, "Imagick::GRAVITY_SOUTHWEST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 146, &_17$$32); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 147, &_17$$32); zephir_check_call_status(); } else { ZVAL_LONG(offsetX, 0); ZEPHIR_INIT_VAR(&_18$$33); ZVAL_STRING(&_18$$33, "Imagick::GRAVITY_NORTHWEST"); - ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 146, &_18$$33); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 147, &_18$$33); zephir_check_call_status(); } } @@ -1942,11 +1942,11 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processWatermark) zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "Imagick::EVALUATE_MULTIPLY"); - ZEPHIR_CALL_FUNCTION(&_2, "constant", NULL, 146, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "constant", NULL, 147, &_1); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "Imagick::CHANNEL_ALPHA"); - ZEPHIR_CALL_FUNCTION(&_3, "constant", NULL, 146, &_1); + ZEPHIR_CALL_FUNCTION(&_3, "constant", NULL, 147, &_1); zephir_check_call_status(); ZVAL_LONG(&_4, opacity); ZEPHIR_CALL_METHOD(NULL, &watermark, "evaluateimage", NULL, 0, &_2, &_4, &_3); @@ -1959,7 +1959,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processWatermark) zephir_read_property(&_6$$3, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_NVAR(&_7$$3); ZVAL_STRING(&_7$$3, "Imagick::COMPOSITE_OVER"); - ZEPHIR_CALL_FUNCTION(&_8$$3, "constant", NULL, 146, &_7$$3); + ZEPHIR_CALL_FUNCTION(&_8$$3, "constant", NULL, 147, &_7$$3); zephir_check_call_status(); ZVAL_LONG(&_9$$3, offsetX); ZVAL_LONG(&_10$$3, offsetY); diff --git a/ext/phalcon/image/imagefactory.zep.c b/ext/phalcon/image/imagefactory.zep.c index 81814de7ac1..7a87ae53f6a 100644 --- a/ext/phalcon/image/imagefactory.zep.c +++ b/ext/phalcon/image/imagefactory.zep.c @@ -131,17 +131,17 @@ PHP_METHOD(Phalcon_Image_ImageFactory, load) zephir_array_unset_string(config, SL("adapter"), PH_SEPARATE); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "file"); - ZEPHIR_CALL_METHOD(&file, this_ptr, "getarrval", NULL, 483, config, &_1); + ZEPHIR_CALL_METHOD(&file, this_ptr, "getarrval", NULL, 484, config, &_1); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "height"); ZVAL_NULL(&_2); - ZEPHIR_CALL_METHOD(&height, this_ptr, "getarrval", NULL, 483, config, &_1, &_2); + ZEPHIR_CALL_METHOD(&height, this_ptr, "getarrval", NULL, 484, config, &_1, &_2); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "width"); ZVAL_NULL(&_2); - ZEPHIR_CALL_METHOD(&width, this_ptr, "getarrval", NULL, 483, config, &_1, &_2); + ZEPHIR_CALL_METHOD(&width, this_ptr, "getarrval", NULL, 484, config, &_1, &_2); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "newinstance", NULL, 0, &name, &file, &width, &height); zephir_check_call_status(); diff --git a/ext/phalcon/logger/abstractlogger.zep.c b/ext/phalcon/logger/abstractlogger.zep.c index 9b6e76af7a9..129488d0ffe 100644 --- a/ext/phalcon/logger/abstractlogger.zep.c +++ b/ext/phalcon/logger/abstractlogger.zep.c @@ -151,7 +151,7 @@ PHP_METHOD(Phalcon_Logger_AbstractLogger, __construct) if (Z_TYPE_P(timezone) == IS_NULL) { - ZEPHIR_CALL_FUNCTION(&defaultTimezone, "date_default_timezone_get", NULL, 124); + ZEPHIR_CALL_FUNCTION(&defaultTimezone, "date_default_timezone_get", NULL, 125); zephir_check_call_status(); if (UNEXPECTED(1 == ZEPHIR_IS_EMPTY(&defaultTimezone))) { ZEPHIR_INIT_NVAR(&defaultTimezone); @@ -560,11 +560,11 @@ PHP_METHOD(Phalcon_Logger_AbstractLogger, addMessage) ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 0, &_4$$3, &_3$$3); zephir_check_call_status(); ZVAL_LONG(&_5$$3, level); - ZEPHIR_CALL_METHOD(NULL, &item, "__construct", NULL, 125, &message, &levelName, &_5$$3, &_2$$3, &context); + ZEPHIR_CALL_METHOD(NULL, &item, "__construct", NULL, 126, &message, &levelName, &_5$$3, &_2$$3, &context); zephir_check_call_status(); zephir_read_property(&_5$$3, this_ptr, ZEND_STRL("adapters"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_6$$3, this_ptr, ZEND_STRL("excluded"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&collection, "array_diff_key", NULL, 126, &_5$$3, &_6$$3); + ZEPHIR_CALL_FUNCTION(&collection, "array_diff_key", NULL, 127, &_5$$3, &_6$$3); zephir_check_call_status(); zephir_is_iterable(&collection, 0, "phalcon/Logger/AbstractLogger.zep", 305); if (Z_TYPE_P(&collection) == IS_ARRAY) { @@ -652,7 +652,7 @@ PHP_METHOD(Phalcon_Logger_AbstractLogger, getLevelNumber) zephir_fast_strtoupper(&levelName, level); ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "getlevels", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&levels, "array_flip", NULL, 127, &_0$$3); + ZEPHIR_CALL_FUNCTION(&levels, "array_flip", NULL, 128, &_0$$3); zephir_check_call_status(); if (zephir_array_isset(&levels, &levelName)) { zephir_array_fetch(&_1$$4, &levels, &levelName, PH_NOISY | PH_READONLY, "phalcon/Logger/AbstractLogger.zep", 330); diff --git a/ext/phalcon/logger/adapter/stream.zep.c b/ext/phalcon/logger/adapter/stream.zep.c index fc62c3f592a..e866bc6c774 100644 --- a/ext/phalcon/logger/adapter/stream.zep.c +++ b/ext/phalcon/logger/adapter/stream.zep.c @@ -146,7 +146,7 @@ PHP_METHOD(Phalcon_Logger_Adapter_Stream, __construct) } ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "r"); - ZEPHIR_CALL_FUNCTION(&_1, "mb_strpos", NULL, 484, &mode, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "mb_strpos", NULL, 485, &mode, &_0); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&_1)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_logger_exception_ce, "Adapter cannot be opened in read mode", "phalcon/Logger/Adapter/Stream.zep", 84); @@ -237,7 +237,7 @@ PHP_METHOD(Phalcon_Logger_Adapter_Stream, process) zephir_read_property(&_7$$4, this_ptr, ZEND_STRL("mode"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_8$$4); ZEPHIR_CONCAT_SVSVS(&_8$$4, "The file '", &_6$$4, "' cannot be opened with mode '", &_7$$4, "'"); - ZEPHIR_CALL_METHOD(NULL, &_5$$4, "__construct", NULL, 485, &_8$$4); + ZEPHIR_CALL_METHOD(NULL, &_5$$4, "__construct", NULL, 486, &_8$$4); zephir_check_call_status(); zephir_throw_exception_debug(&_5$$4, "phalcon/Logger/Adapter/Stream.zep", 128); ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/logger/adapter/syslog.zep.c b/ext/phalcon/logger/adapter/syslog.zep.c index 48d08db88f7..5772ce9d3eb 100644 --- a/ext/phalcon/logger/adapter/syslog.zep.c +++ b/ext/phalcon/logger/adapter/syslog.zep.c @@ -143,7 +143,7 @@ PHP_METHOD(Phalcon_Logger_Adapter_Syslog, close) if (!(zephir_is_true(&_0))) { RETURN_MM_BOOL(1); } - ZEPHIR_RETURN_CALL_FUNCTION("closelog", NULL, 486); + ZEPHIR_RETURN_CALL_FUNCTION("closelog", NULL, 487); zephir_check_call_status(); RETURN_MM(); } @@ -207,9 +207,9 @@ PHP_METHOD(Phalcon_Logger_Adapter_Syslog, process) zephir_cast_to_string(&_6$$3, &_5$$3); ZEPHIR_INIT_VAR(&_7$$3); ZVAL_STRING(&_7$$3, "Cannot open syslog for name [%s] and facility [%s]"); - ZEPHIR_CALL_FUNCTION(&_8$$3, "sprintf", NULL, 144, &_7$$3, &_4$$3, &_6$$3); + ZEPHIR_CALL_FUNCTION(&_8$$3, "sprintf", NULL, 145, &_7$$3, &_4$$3, &_6$$3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 485, &_8$$3); + ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 486, &_8$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_3$$3, "phalcon/Logger/Adapter/Syslog.zep", 106); ZEPHIR_MM_RESTORE(); @@ -222,9 +222,9 @@ PHP_METHOD(Phalcon_Logger_Adapter_Syslog, process) } ZEPHIR_CALL_METHOD(&_9, item, "getlevel", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&level, this_ptr, "logleveltosyslog", NULL, 487, &_9); + ZEPHIR_CALL_METHOD(&level, this_ptr, "logleveltosyslog", NULL, 488, &_9); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "syslog", NULL, 488, &level, &message); + ZEPHIR_CALL_FUNCTION(NULL, "syslog", NULL, 489, &level, &message); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -270,7 +270,7 @@ PHP_METHOD(Phalcon_Logger_Adapter_Syslog, openlog) ZVAL_LONG(&_0, option); ZVAL_LONG(&_1, facility); - ZEPHIR_RETURN_CALL_FUNCTION("openlog", NULL, 489, &ident, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("openlog", NULL, 490, &ident, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/logger/loggerfactory.zep.c b/ext/phalcon/logger/loggerfactory.zep.c index 5fd5e2fd56b..238b1265c8f 100644 --- a/ext/phalcon/logger/loggerfactory.zep.c +++ b/ext/phalcon/logger/loggerfactory.zep.c @@ -282,7 +282,7 @@ PHP_METHOD(Phalcon_Logger_LoggerFactory, newInstance) object_init_ex(return_value, phalcon_logger_logger_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 490, &name, &adapters, timezone); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 491, &name, &adapters, timezone); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/messages/messages.zep.c b/ext/phalcon/messages/messages.zep.c index c8fed37eed7..dc0262690e5 100644 --- a/ext/phalcon/messages/messages.zep.c +++ b/ext/phalcon/messages/messages.zep.c @@ -559,7 +559,7 @@ PHP_METHOD(Phalcon_Messages_Messages, offsetUnset) zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("messages"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_2$$3, 1); ZEPHIR_MAKE_REF(&_1$$3); - ZEPHIR_CALL_FUNCTION(NULL, "array_splice", NULL, 491, &_1$$3, index, &_2$$3); + ZEPHIR_CALL_FUNCTION(NULL, "array_splice", NULL, 492, &_1$$3, index, &_2$$3); ZEPHIR_UNREF(&_1$$3); zephir_check_call_status(); } diff --git a/ext/phalcon/mvc/micro.zep.c b/ext/phalcon/mvc/micro.zep.c index f03b10d3c25..789d5bf0fb5 100644 --- a/ext/phalcon/mvc/micro.zep.c +++ b/ext/phalcon/mvc/micro.zep.c @@ -581,11 +581,11 @@ PHP_METHOD(Phalcon_Mvc_Micro, getService) if (Z_TYPE_P(&container) != IS_OBJECT) { ZEPHIR_INIT_NVAR(&container); object_init_ex(&container, phalcon_di_factorydefault_ce); - ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 492); + ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 493); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container); } - ZEPHIR_RETURN_CALL_METHOD(&container, "get", NULL, 493, &serviceName); + ZEPHIR_RETURN_CALL_METHOD(&container, "get", NULL, 494, &serviceName); zephir_check_call_status(); RETURN_MM(); } @@ -632,11 +632,11 @@ PHP_METHOD(Phalcon_Mvc_Micro, getSharedService) if (Z_TYPE_P(&container) != IS_OBJECT) { ZEPHIR_INIT_NVAR(&container); object_init_ex(&container, phalcon_di_factorydefault_ce); - ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 492); + ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 493); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container); } - ZEPHIR_RETURN_CALL_METHOD(&container, "getshared", NULL, 494, &serviceName); + ZEPHIR_RETURN_CALL_METHOD(&container, "getshared", NULL, 495, &serviceName); zephir_check_call_status(); RETURN_MM(); } @@ -1436,11 +1436,11 @@ PHP_METHOD(Phalcon_Mvc_Micro, hasService) if (Z_TYPE_P(&container) != IS_OBJECT) { ZEPHIR_INIT_NVAR(&container); object_init_ex(&container, phalcon_di_factorydefault_ce); - ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 492); + ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 493); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container); } - ZEPHIR_RETURN_CALL_METHOD(&container, "has", NULL, 495, &serviceName); + ZEPHIR_RETURN_CALL_METHOD(&container, "has", NULL, 496, &serviceName); zephir_check_call_status(); RETURN_MM(); } @@ -1602,7 +1602,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, mount) if (zephir_is_true(&_0)) { ZEPHIR_INIT_VAR(&lazyHandler); object_init_ex(&lazyHandler, phalcon_mvc_micro_lazyloader_ce); - ZEPHIR_CALL_METHOD(NULL, &lazyHandler, "__construct", NULL, 496, &mainHandler); + ZEPHIR_CALL_METHOD(NULL, &lazyHandler, "__construct", NULL, 497, &mainHandler); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&lazyHandler, &mainHandler); @@ -1881,11 +1881,11 @@ PHP_METHOD(Phalcon_Mvc_Micro, offsetUnset) if (Z_TYPE_P(&container) != IS_OBJECT) { ZEPHIR_INIT_NVAR(&container); object_init_ex(&container, phalcon_di_factorydefault_ce); - ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 492); + ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 493); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container); } - ZEPHIR_CALL_METHOD(NULL, &container, "remove", NULL, 497, alias); + ZEPHIR_CALL_METHOD(NULL, &container, "remove", NULL, 498, alias); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -2288,7 +2288,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, setService) if (Z_TYPE_P(&container) != IS_OBJECT) { ZEPHIR_INIT_NVAR(&container); object_init_ex(&container, phalcon_di_factorydefault_ce); - ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 492); + ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 493); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container); } @@ -2297,7 +2297,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, setService) } else { ZVAL_BOOL(&_0, 0); } - ZEPHIR_RETURN_CALL_METHOD(&container, "set", NULL, 498, &serviceName, definition, &_0); + ZEPHIR_RETURN_CALL_METHOD(&container, "set", NULL, 499, &serviceName, definition, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/mvc/model.zep.c b/ext/phalcon/mvc/model.zep.c index ca5c4c22edd..ae5ce9c148d 100644 --- a/ext/phalcon/mvc/model.zep.c +++ b/ext/phalcon/mvc/model.zep.c @@ -288,7 +288,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __call) zephir_get_arrval(&arguments, arguments_param); - ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 499, &method, &arguments); + ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 500, &method, &arguments); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&records)) { RETURN_CCTOR(&records); @@ -354,7 +354,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __callStatic) zephir_get_arrval(&arguments, arguments_param); - ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 499, &method, &arguments); + ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 500, &method, &arguments); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&records)) { RETURN_CCTOR(&records); @@ -696,13 +696,13 @@ PHP_METHOD(Phalcon_Mvc_Model, __set) } } - ZEPHIR_CALL_METHOD(&_14, this_ptr, "possiblesetter", NULL, 500, &property, value); + ZEPHIR_CALL_METHOD(&_14, this_ptr, "possiblesetter", NULL, 501, &property, value); zephir_check_call_status(); if (zephir_is_true(&_14)) { RETVAL_ZVAL(value, 1, 0); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_15, "property_exists", NULL, 309, this_ptr, &property); + ZEPHIR_CALL_FUNCTION(&_15, "property_exists", NULL, 310, this_ptr, &property); zephir_check_call_status(); if (zephir_is_true(&_15)) { ZEPHIR_CALL_METHOD(&manager, this_ptr, "getmodelsmanager", NULL, 0); @@ -1015,7 +1015,7 @@ PHP_METHOD(Phalcon_Mvc_Model, assign) _7$$12 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map; } if (_7$$12) { - ZEPHIR_CALL_SELF(&_8$$13, "caseinsensitivecolumnmap", &_9, 501, &columnMap, &attribute); + ZEPHIR_CALL_SELF(&_8$$13, "caseinsensitivecolumnmap", &_9, 502, &columnMap, &attribute); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attribute, &_8$$13); } @@ -1047,7 +1047,7 @@ PHP_METHOD(Phalcon_Mvc_Model, assign) } _13$$18 = zephir_is_true(&disableAssignSetters); if (!(_13$$18)) { - ZEPHIR_CALL_METHOD(&_14$$18, this_ptr, "possiblesetter", &_15, 500, &attributeField, &value); + ZEPHIR_CALL_METHOD(&_14$$18, this_ptr, "possiblesetter", &_15, 501, &attributeField, &value); zephir_check_call_status(); _13$$18 = !zephir_is_true(&_14$$18); } @@ -1072,7 +1072,7 @@ PHP_METHOD(Phalcon_Mvc_Model, assign) _16$$22 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map; } if (_16$$22) { - ZEPHIR_CALL_SELF(&_17$$23, "caseinsensitivecolumnmap", &_9, 501, &columnMap, &attribute); + ZEPHIR_CALL_SELF(&_17$$23, "caseinsensitivecolumnmap", &_9, 502, &columnMap, &attribute); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attribute, &_17$$23); } @@ -1104,7 +1104,7 @@ PHP_METHOD(Phalcon_Mvc_Model, assign) } _20$$28 = zephir_is_true(&disableAssignSetters); if (!(_20$$28)) { - ZEPHIR_CALL_METHOD(&_21$$28, this_ptr, "possiblesetter", &_15, 500, &attributeField, &value); + ZEPHIR_CALL_METHOD(&_21$$28, this_ptr, "possiblesetter", &_15, 501, &attributeField, &value); zephir_check_call_status(); _20$$28 = !zephir_is_true(&_21$$28); } @@ -1718,7 +1718,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate) _4$$7 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map; } if (_4$$7) { - ZEPHIR_CALL_SELF(&_5$$8, "caseinsensitivecolumnmap", &_6, 501, columnMap, &key); + ZEPHIR_CALL_SELF(&_5$$8, "caseinsensitivecolumnmap", &_6, 502, columnMap, &key); zephir_check_call_status(); ZEPHIR_CPY_WRT(&key, &_5$$8); } @@ -1770,7 +1770,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate) _10$$16 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map; } if (_10$$16) { - ZEPHIR_CALL_SELF(&_11$$17, "caseinsensitivecolumnmap", &_6, 501, columnMap, &key); + ZEPHIR_CALL_SELF(&_11$$17, "caseinsensitivecolumnmap", &_6, 502, columnMap, &key); zephir_check_call_status(); ZEPHIR_CPY_WRT(&key, &_11$$17); } @@ -2022,7 +2022,7 @@ PHP_METHOD(Phalcon_Mvc_Model, create) ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "getwriteconnection", NULL, 502); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "getwriteconnection", NULL, 503); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_0, this_ptr, "has", NULL, 0, &metaData, &_1); zephir_check_call_status(); @@ -2121,7 +2121,7 @@ PHP_METHOD(Phalcon_Mvc_Model, delete) ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&writeConnection, this_ptr, "getwriteconnection", NULL, 502); + ZEPHIR_CALL_METHOD(&writeConnection, this_ptr, "getwriteconnection", NULL, 503); zephir_check_call_status(); ZEPHIR_INIT_ZVAL_NREF(_0); ZVAL_LONG(&_0, 3); @@ -2130,7 +2130,7 @@ PHP_METHOD(Phalcon_Mvc_Model, delete) array_init(&_1); zephir_update_property_zval(this_ptr, ZEND_STRL("errorMessages"), &_1); if (ZEPHIR_GLOBAL(orm).virtual_foreign_keys) { - ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "checkforeignkeysreverserestrict", NULL, 503); + ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "checkforeignkeysreverserestrict", NULL, 504); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&_2$$3)) { RETURN_MM_BOOL(0); @@ -2292,9 +2292,9 @@ PHP_METHOD(Phalcon_Mvc_Model, delete) RETURN_MM_BOOL(1); } } - ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 504); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 505); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 505); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 506); zephir_check_call_status(); if (zephir_is_true(&schema)) { ZEPHIR_INIT_VAR(&table); @@ -2309,7 +2309,7 @@ PHP_METHOD(Phalcon_Mvc_Model, delete) ZEPHIR_CALL_METHOD(&success, &writeConnection, "delete", NULL, 0, &table, &_27, &values, &bindTypes); zephir_check_call_status(); if (ZEPHIR_GLOBAL(orm).virtual_foreign_keys) { - ZEPHIR_CALL_METHOD(&_28$$25, this_ptr, "checkforeignkeysreversecascade", NULL, 506); + ZEPHIR_CALL_METHOD(&_28$$25, this_ptr, "checkforeignkeysreversecascade", NULL, 507); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&_28$$25)) { RETURN_MM_BOOL(0); @@ -2349,7 +2349,7 @@ PHP_METHOD(Phalcon_Mvc_Model, dump) ZEPHIR_MM_GROW(); - ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 507, this_ptr); + ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 508, this_ptr); zephir_check_call_status(); RETURN_MM(); } @@ -2571,7 +2571,7 @@ PHP_METHOD(Phalcon_Mvc_Model, find) } else { ZEPHIR_CPY_WRT(¶ms, parameters); } - ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_0, 508, ¶ms); + ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_0, 509, ¶ms); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&resultset, &query, "execute", NULL, 0); zephir_check_call_status(); @@ -2722,7 +2722,7 @@ PHP_METHOD(Phalcon_Mvc_Model, findFirst) return; } ZVAL_LONG(&_3, 1); - ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_2, 508, ¶ms, &_3); + ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_2, 509, ¶ms, &_3); zephir_check_call_status(); ZVAL_BOOL(&_3, 1); ZEPHIR_CALL_METHOD(NULL, &query, "setuniquerow", NULL, 0, &_3); @@ -3615,7 +3615,7 @@ PHP_METHOD(Phalcon_Mvc_Model, hasChanged) RETURN_MM_BOOL(zephir_fast_in_array(fieldName, &changedFields)); } if (Z_TYPE_P(fieldName) == IS_ARRAY) { - ZEPHIR_CALL_FUNCTION(&intersect, "array_intersect", NULL, 509, fieldName, &changedFields); + ZEPHIR_CALL_FUNCTION(&intersect, "array_intersect", NULL, 510, fieldName, &changedFields); zephir_check_call_status(); if (allFields) { RETURN_MM_BOOL(ZEPHIR_IS_EQUAL(&intersect, fieldName)); @@ -3688,7 +3688,7 @@ PHP_METHOD(Phalcon_Mvc_Model, hasUpdated) RETURN_MM_BOOL(zephir_fast_in_array(fieldName, &updatedFields)); } if (Z_TYPE_P(fieldName) == IS_ARRAY) { - ZEPHIR_CALL_FUNCTION(&intersect, "array_intersect", NULL, 509, fieldName, &updatedFields); + ZEPHIR_CALL_FUNCTION(&intersect, "array_intersect", NULL, 510, fieldName, &updatedFields); zephir_check_call_status(); if (allFields) { RETURN_MM_BOOL(ZEPHIR_IS_EQUAL(&intersect, fieldName)); @@ -3903,12 +3903,12 @@ PHP_METHOD(Phalcon_Mvc_Model, query) zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 510, container); + ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 511, container); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_3); zephir_get_called_class(&_3); - ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 511, &_3); + ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 0, &_3); zephir_check_call_status(); RETURN_CCTOR(&criteria); } @@ -4012,9 +4012,9 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh) zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("modelsManager"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&manager, &_1); - ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 504); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 505); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 505); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 506); zephir_check_call_status(); if (zephir_is_true(&schema)) { ZEPHIR_INIT_VAR(&table); @@ -4173,7 +4173,7 @@ PHP_METHOD(Phalcon_Mvc_Model, save) ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&writeConnection, this_ptr, "getwriteconnection", NULL, 502); + ZEPHIR_CALL_METHOD(&writeConnection, this_ptr, "getwriteconnection", NULL, 503); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "prepareSave"); @@ -4189,9 +4189,9 @@ PHP_METHOD(Phalcon_Mvc_Model, save) RETURN_MM_BOOL(0); } } - ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 504); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 505); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 505); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 506); zephir_check_call_status(); if (zephir_is_true(&schema)) { ZEPHIR_INIT_VAR(&table); @@ -4853,7 +4853,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) _4$$4 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map; } if (_4$$4) { - ZEPHIR_CALL_SELF(&_5$$6, "caseinsensitivecolumnmap", &_6, 501, columnMap, &key); + ZEPHIR_CALL_SELF(&_5$$6, "caseinsensitivecolumnmap", &_6, 502, columnMap, &key); zephir_check_call_status(); ZEPHIR_CPY_WRT(&key, &_5$$6); } @@ -4912,7 +4912,7 @@ PHP_METHOD(Phalcon_Mvc_Model, setSnapshotData) _12$$12 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map; } if (_12$$12) { - ZEPHIR_CALL_SELF(&_13$$14, "caseinsensitivecolumnmap", &_6, 501, columnMap, &key); + ZEPHIR_CALL_SELF(&_13$$14, "caseinsensitivecolumnmap", &_6, 502, columnMap, &key); zephir_check_call_status(); ZEPHIR_CPY_WRT(&key, &_13$$14); } @@ -5333,7 +5333,7 @@ PHP_METHOD(Phalcon_Mvc_Model, toArray) _3$$4 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map; } if (_3$$4) { - ZEPHIR_CALL_SELF(&_4$$5, "caseinsensitivecolumnmap", &_5, 501, &columnMap, &attribute); + ZEPHIR_CALL_SELF(&_4$$5, "caseinsensitivecolumnmap", &_5, 502, &columnMap, &attribute); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attribute, &_4$$5); } @@ -5384,7 +5384,7 @@ PHP_METHOD(Phalcon_Mvc_Model, toArray) _9$$14 = ZEPHIR_GLOBAL(orm).case_insensitive_column_map; } if (_9$$14) { - ZEPHIR_CALL_SELF(&_10$$15, "caseinsensitivecolumnmap", &_5, 501, &columnMap, &attribute); + ZEPHIR_CALL_SELF(&_10$$15, "caseinsensitivecolumnmap", &_5, 502, &columnMap, &attribute); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attribute, &_10$$15); } @@ -6590,9 +6590,9 @@ PHP_METHOD(Phalcon_Mvc_Model, doLowInsert) ZEPHIR_CALL_METHOD(&sequenceName, this_ptr, "getsequencename", NULL, 0); zephir_check_call_status(); } else { - ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 505); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 506); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 504); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 505); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&sequenceName); if (ZEPHIR_IS_EMPTY(&schema)) { @@ -7432,9 +7432,9 @@ PHP_METHOD(Phalcon_Mvc_Model, has) zephir_read_property(&_22$$27, this_ptr, ZEND_STRL("uniqueTypes"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&uniqueTypes, &_22$$27); } - ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 504); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 505); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 505); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 506); zephir_check_call_status(); if (zephir_is_true(&schema)) { ZEPHIR_INIT_VAR(&table); diff --git a/ext/phalcon/mvc/model/binder.zep.c b/ext/phalcon/mvc/model/binder.zep.c index dcae26b4908..0be1fba8655 100644 --- a/ext/phalcon/mvc/model/binder.zep.c +++ b/ext/phalcon/mvc/model/binder.zep.c @@ -435,12 +435,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection) zephir_check_call_status(); } else { object_init_ex(&reflection, zephir_get_internal_ce(SL("reflectionfunction"))); - ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 172, handler); + ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 173, handler); zephir_check_call_status(); } zephir_read_property(&_0, this_ptr, ZEND_STRL("cache"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&cache, &_0); - ZEPHIR_CALL_METHOD(&methodParams, &reflection, "getparameters", NULL, 173); + ZEPHIR_CALL_METHOD(&methodParams, &reflection, "getparameters", NULL, 174); zephir_check_call_status(); ZEPHIR_INIT_VAR(¶msKeys); zephir_array_keys(¶msKeys, ¶ms); diff --git a/ext/phalcon/mvc/model/criteria.zep.c b/ext/phalcon/mvc/model/criteria.zep.c index 335b3e9b16a..e1c4aa28e1a 100644 --- a/ext/phalcon/mvc/model/criteria.zep.c +++ b/ext/phalcon/mvc/model/criteria.zep.c @@ -783,7 +783,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, fromInput) zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 510, container); + ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 511, container); zephir_check_call_status(); if (zephir_fast_count_int(&conditions)) { ZEPHIR_INIT_VAR(&_16$$16); @@ -795,7 +795,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, fromInput) ZEPHIR_CALL_METHOD(NULL, &criteria, "bind", NULL, 0, &bind); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 511, &modelName); + ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 0, &modelName); zephir_check_call_status(); RETURN_CCTOR(&criteria); } @@ -1459,11 +1459,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, limit) ZVAL_LONG(&_0, limit); - ZEPHIR_CALL_FUNCTION(&_1, "abs", NULL, 304, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "abs", NULL, 305, &_0); zephir_check_call_status(); limit = zephir_get_numberval(&_1); ZVAL_LONG(&_0, offset); - ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 304, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 305, &_0); zephir_check_call_status(); offset = zephir_get_numberval(&_2); if (UNEXPECTED(limit == 0)) { diff --git a/ext/phalcon/mvc/model/manager.zep.c b/ext/phalcon/mvc/model/manager.zep.c index b345344b22c..2243a7798ba 100644 --- a/ext/phalcon/mvc/model/manager.zep.c +++ b/ext/phalcon/mvc/model/manager.zep.c @@ -675,10 +675,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, isVisibleModelProperty) array_init(&publicProperties); ZEPHIR_INIT_VAR(&classReflection); object_init_ex(&classReflection, zephir_get_internal_ce(SL("reflectionclass"))); - ZEPHIR_CALL_METHOD(NULL, &classReflection, "__construct", NULL, 178, &className); + ZEPHIR_CALL_METHOD(NULL, &classReflection, "__construct", NULL, 179, &className); zephir_check_call_status(); ZVAL_LONG(&_1$$3, 1); - ZEPHIR_CALL_METHOD(&reflectionProperties, &classReflection, "getproperties", NULL, 182, &_1$$3); + ZEPHIR_CALL_METHOD(&reflectionProperties, &classReflection, "getproperties", NULL, 183, &_1$$3); zephir_check_call_status(); zephir_is_iterable(&reflectionProperties, 0, "phalcon/Mvc/Model/Manager.zep", 434); if (Z_TYPE_P(&reflectionProperties) == IS_ARRAY) { diff --git a/ext/phalcon/mvc/model/query.zep.c b/ext/phalcon/mvc/model/query.zep.c index f46958629d5..8162687719e 100644 --- a/ext/phalcon/mvc/model/query.zep.c +++ b/ext/phalcon/mvc/model/query.zep.c @@ -100,7 +100,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Model_Query) */ zend_declare_property_null(phalcon_mvc_model_query_ce, SL("bindTypes"), ZEND_ACC_PROTECTED); /** - * @var \Psr\SimpleCache\CacheInterface|null + * @var mixed|null */ zend_declare_property_null(phalcon_mvc_model_query_ce, SL("cache"), ZEND_ACC_PROTECTED); /** @@ -358,9 +358,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, clean) */ PHP_METHOD(Phalcon_Mvc_Model_Query, execute) { + zval _7$$8; + zend_bool _4$$3; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *bindParams_param = NULL, *bindTypes_param = NULL, uniqueRow, cacheOptions, key, cacheService, cache, result, preparedResult, defaultBindParams, mergedParams, defaultBindTypes, mergedTypes, type, lifetime, intermediate, _0, _1$$3, _2$$9, _3$$19, _4$$19; + zval *bindParams_param = NULL, *bindTypes_param = NULL, uniqueRow, cacheOptions, key, cacheService, cache, result, preparedResult, defaultBindParams, mergedParams, defaultBindTypes, mergedTypes, type, lifetime, intermediate, _0, _1$$3, _2$$3, _3$$3, _5$$3, _6$$8, _8$$9, _9$$19, _10$$19; zval bindParams, bindTypes; zval *this_ptr = getThis(); @@ -382,9 +384,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, execute) ZVAL_UNDEF(&intermediate); ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1$$3); - ZVAL_UNDEF(&_2$$9); - ZVAL_UNDEF(&_3$$19); - ZVAL_UNDEF(&_4$$19); + ZVAL_UNDEF(&_2$$3); + ZVAL_UNDEF(&_3$$3); + ZVAL_UNDEF(&_5$$3); + ZVAL_UNDEF(&_6$$8); + ZVAL_UNDEF(&_8$$9); + ZVAL_UNDEF(&_9$$19); + ZVAL_UNDEF(&_10$$19); + ZVAL_UNDEF(&_7$$8); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(0, 2) @@ -417,12 +424,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, execute) ZEPHIR_CPY_WRT(&cacheOptions, &_0); if (Z_TYPE_P(&cacheOptions) != IS_NULL) { if (UNEXPECTED(Z_TYPE_P(&cacheOptions) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid caching options", "phalcon/Mvc/Model/Query.zep", 275); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid caching options", "phalcon/Mvc/Model/Query.zep", 274); return; } ZEPHIR_OBS_VAR(&key); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&key, &cacheOptions, SL("key"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A cache key must be provided to identify the cached resultset in the cache backend", "phalcon/Mvc/Model/Query.zep", 284); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A cache key must be provided to identify the cached resultset in the cache backend", "phalcon/Mvc/Model/Query.zep", 283); return; } ZEPHIR_OBS_VAR(&lifetime); @@ -438,19 +445,38 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, execute) zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("container"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(&cache, &_1$$3, "getshared", NULL, 0, &cacheService); zephir_check_call_status(); - if (UNEXPECTED(!((zephir_is_instance_of(&cache, SL("Psr\\SimpleCache\\CacheInterface")))))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cache service must be an object implementing Psr\\SimpleCache\\CacheInterface", "phalcon/Mvc/Model/Query.zep", 301); + ZEPHIR_INIT_VAR(&_2$$3); + ZVAL_STRING(&_2$$3, "Phalcon\\Cache\\CacheInterface"); + ZEPHIR_CALL_FUNCTION(&_3$$3, "is_a", NULL, 118, &cache, &_2$$3); + zephir_check_call_status(); + _4$$3 = !ZEPHIR_IS_TRUE_IDENTICAL(&_3$$3); + if (_4$$3) { + ZEPHIR_INIT_NVAR(&_2$$3); + ZVAL_STRING(&_2$$3, "Psr\\SimpleCache\\CacheInterface"); + ZEPHIR_CALL_FUNCTION(&_5$$3, "is_a", NULL, 118, &cache, &_2$$3); + zephir_check_call_status(); + _4$$3 = !ZEPHIR_IS_TRUE_IDENTICAL(&_5$$3); + } + if (UNEXPECTED(_4$$3)) { + ZEPHIR_INIT_VAR(&_6$$8); + object_init_ex(&_6$$8, phalcon_mvc_model_exception_ce); + ZEPHIR_INIT_VAR(&_7$$8); + ZEPHIR_CONCAT_SS(&_7$$8, "Cache service must be an object implementing ", "Phalcon\\Cache\\CacheInterface or Psr\\SimpleCache\\CacheInterface"); + ZEPHIR_CALL_METHOD(NULL, &_6$$8, "__construct", NULL, 31, &_7$$8); + zephir_check_call_status(); + zephir_throw_exception_debug(&_6$$8, "phalcon/Mvc/Model/Query.zep", 306); + ZEPHIR_MM_RESTORE(); return; } ZEPHIR_CALL_METHOD(&result, &cache, "get", NULL, 0, &key); zephir_check_call_status(); if (!(ZEPHIR_IS_EMPTY(&result))) { if (UNEXPECTED(Z_TYPE_P(&result) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cache didn't return a valid resultset", "phalcon/Mvc/Model/Query.zep", 310); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cache didn't return a valid resultset", "phalcon/Mvc/Model/Query.zep", 315); return; } - ZVAL_BOOL(&_2$$9, 0); - ZEPHIR_CALL_METHOD(NULL, &result, "setisfresh", NULL, 0, &_2$$9); + ZVAL_BOOL(&_8$$9, 0); + ZEPHIR_CALL_METHOD(NULL, &result, "setisfresh", NULL, 0, &_8$$9); zephir_check_call_status(); if (zephir_is_true(&uniqueRow)) { ZEPHIR_CALL_METHOD(&preparedResult, &result, "getfirst", NULL, 0); @@ -499,20 +525,20 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, execute) zephir_check_call_status(); break; } - ZEPHIR_INIT_VAR(&_3$$19); - object_init_ex(&_3$$19, phalcon_mvc_model_exception_ce); - ZEPHIR_INIT_VAR(&_4$$19); - ZEPHIR_CONCAT_SV(&_4$$19, "Unknown statement ", &type); - ZEPHIR_CALL_METHOD(NULL, &_3$$19, "__construct", NULL, 31, &_4$$19); + ZEPHIR_INIT_VAR(&_9$$19); + object_init_ex(&_9$$19, phalcon_mvc_model_exception_ce); + ZEPHIR_INIT_VAR(&_10$$19); + ZEPHIR_CONCAT_SV(&_10$$19, "Unknown statement ", &type); + ZEPHIR_CALL_METHOD(NULL, &_9$$19, "__construct", NULL, 31, &_10$$19); zephir_check_call_status(); - zephir_throw_exception_debug(&_3$$19, "phalcon/Mvc/Model/Query.zep", 393); + zephir_throw_exception_debug(&_9$$19, "phalcon/Mvc/Model/Query.zep", 398); ZEPHIR_MM_RESTORE(); return; } while(0); if (Z_TYPE_P(&cacheOptions) != IS_NULL) { if (!ZEPHIR_IS_LONG(&type, 309)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only PHQL statements that return resultsets can be cached", "phalcon/Mvc/Model/Query.zep", 406); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Only PHQL statements that return resultsets can be cached", "phalcon/Mvc/Model/Query.zep", 411); return; } ZEPHIR_CALL_METHOD(NULL, &cache, "set", NULL, 0, &key, &result, &lifetime); @@ -684,7 +710,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSql) zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "This type of statement generates multiple SQL statements", "phalcon/Mvc/Model/Query.zep", 512); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "This type of statement generates multiple SQL statements", "phalcon/Mvc/Model/Query.zep", 517); return; } @@ -761,7 +787,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, parse) zephir_read_static_property_ce(&_2$$5, phalcon_mvc_model_query_ce, SL("internalPhqlCache"), PH_NOISY_CC | PH_READONLY); if (zephir_array_isset_fetch(&irPhql, &_2$$5, &uniqueId, 0)) { if (Z_TYPE_P(&irPhql) == IS_ARRAY) { - zephir_array_fetch_string(&_3$$7, &ast, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 565); + zephir_array_fetch_string(&_3$$7, &ast, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 570); zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &_3$$7); RETURN_CCTOR(&irPhql); } @@ -798,7 +824,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, parse) ZEPHIR_CONCAT_SVSV(&_5$$13, "Unknown statement ", &type, ", when preparing: ", &phql); ZEPHIR_CALL_METHOD(NULL, &_4$$13, "__construct", NULL, 31, &_5$$13); zephir_check_call_status(); - zephir_throw_exception_debug(&_4$$13, "phalcon/Mvc/Model/Query.zep", 599); + zephir_throw_exception_debug(&_4$$13, "phalcon/Mvc/Model/Query.zep", 604); ZEPHIR_MM_RESTORE(); return; } while(0); @@ -806,7 +832,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, parse) } } if (UNEXPECTED(Z_TYPE_P(&irPhql) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted AST", "phalcon/Mvc/Model/Query.zep", 605); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted AST", "phalcon/Mvc/Model/Query.zep", 610); return; } if (Z_TYPE_P(&uniqueId) == IS_LONG) { @@ -941,7 +967,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, setDI) ZEPHIR_CALL_METHOD(&manager, container, "getshared", NULL, 0, &_0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&manager) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Injected service 'modelsManager' is invalid", "phalcon/Mvc/Model/Query.zep", 669); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Injected service 'modelsManager' is invalid", "phalcon/Mvc/Model/Query.zep", 674); return; } ZEPHIR_INIT_NVAR(&_0); @@ -949,7 +975,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, setDI) ZEPHIR_CALL_METHOD(&metaData, container, "getshared", NULL, 0, &_0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&metaData) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Injected service 'modelsMetaData' is invalid", "phalcon/Mvc/Model/Query.zep", 675); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Injected service 'modelsMetaData' is invalid", "phalcon/Mvc/Model/Query.zep", 680); return; } zephir_update_property_zval(this_ptr, ZEND_STRL("manager"), &manager); @@ -1153,13 +1179,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeDelete) ZEPHIR_OBS_VAR(&models); - zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 743); + zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 748); if (UNEXPECTED(zephir_array_isset_long(&models, 1))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Delete from several models at the same time is still not supported", "phalcon/Mvc/Model/Query.zep", 748); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Delete from several models at the same time is still not supported", "phalcon/Mvc/Model/Query.zep", 753); return; } ZEPHIR_OBS_VAR(&modelName); - zephir_array_fetch_long(&modelName, &models, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 751); + zephir_array_fetch_long(&modelName, &models, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 756); ZEPHIR_OBS_VAR(&model); zephir_read_property(&_0, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset_fetch(&model, &_0, &modelName, 0))) { @@ -1291,7 +1317,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_OBS_VAR(&modelName); - zephir_array_fetch_string(&modelName, &intermediate, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 832); + zephir_array_fetch_string(&modelName, &intermediate, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 837); zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&manager, &_0); ZEPHIR_OBS_VAR(&model); @@ -1320,16 +1346,16 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) } } ZEPHIR_OBS_VAR(&values); - zephir_array_fetch_string(&values, &intermediate, SL("values"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 867); + zephir_array_fetch_string(&values, &intermediate, SL("values"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 872); if (UNEXPECTED(zephir_fast_count_int(&fields) != zephir_fast_count_int(&values))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The column count does not match the values count", "phalcon/Mvc/Model/Query.zep", 876); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The column count does not match the values count", "phalcon/Mvc/Model/Query.zep", 881); return; } ZEPHIR_CALL_METHOD(&dialect, &connection, "getdialect", NULL, 0); zephir_check_call_status(); ZEPHIR_INIT_VAR(&insertValues); array_init(&insertValues); - zephir_is_iterable(&values, 0, "phalcon/Mvc/Model/Query.zep", 947); + zephir_is_iterable(&values, 0, "phalcon/Mvc/Model/Query.zep", 952); if (Z_TYPE_P(&values) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&values), _4, _5, _2) { @@ -1342,8 +1368,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_INIT_NVAR(&value); ZVAL_COPY(&value, _2); ZEPHIR_OBS_NVAR(&exprValue); - zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 886); - zephir_array_fetch_string(&_6$$8, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 888); + zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 891); + zephir_array_fetch_string(&_6$$8, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 893); do { if (ZEPHIR_IS_LONG(&_6$$8, 260) || ZEPHIR_IS_LONG(&_6$$8, 258) || ZEPHIR_IS_LONG(&_6$$8, 259)) { ZEPHIR_CALL_METHOD(&insertValue, &dialect, "getsqlexpression", &_7, 0, &exprValue); @@ -1372,7 +1398,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_CONCAT_SVS(&_13$$12, "Bound parameter '", &wildcard, "' cannot be replaced because it isn't in the placeholders list"); ZEPHIR_CALL_METHOD(NULL, &_12$$12, "__construct", &_14, 31, &_13$$12); zephir_check_call_status(); - zephir_throw_exception_debug(&_12$$12, "phalcon/Mvc/Model/Query.zep", 912); + zephir_throw_exception_debug(&_12$$12, "phalcon/Mvc/Model/Query.zep", 917); ZEPHIR_MM_RESTORE(); return; } @@ -1388,7 +1414,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) } while(0); ZEPHIR_OBS_NVAR(&fieldName); - zephir_array_fetch(&fieldName, &fields, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 925); + zephir_array_fetch(&fieldName, &fields, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 930); _18$$8 = automaticFields; if (_18$$8) { _18$$8 = Z_TYPE_P(&columnMap) == IS_ARRAY; @@ -1402,7 +1428,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_CONCAT_SVS(&_20$$15, "Column '", &fieldName, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_19$$15, "__construct", &_14, 31, &_20$$15); zephir_check_call_status(); - zephir_throw_exception_debug(&_19$$15, "phalcon/Mvc/Model/Query.zep", 935); + zephir_throw_exception_debug(&_19$$15, "phalcon/Mvc/Model/Query.zep", 940); ZEPHIR_MM_RESTORE(); return; } @@ -1425,8 +1451,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_CALL_METHOD(&value, &values, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&exprValue); - zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 886); - zephir_array_fetch_string(&_21$$17, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 888); + zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 891); + zephir_array_fetch_string(&_21$$17, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 893); do { if (ZEPHIR_IS_LONG(&_21$$17, 260) || ZEPHIR_IS_LONG(&_21$$17, 258) || ZEPHIR_IS_LONG(&_21$$17, 259)) { ZEPHIR_CALL_METHOD(&insertValue, &dialect, "getsqlexpression", &_22, 0, &exprValue); @@ -1455,7 +1481,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_CONCAT_SVS(&_28$$21, "Bound parameter '", &wildcard, "' cannot be replaced because it isn't in the placeholders list"); ZEPHIR_CALL_METHOD(NULL, &_27$$21, "__construct", &_14, 31, &_28$$21); zephir_check_call_status(); - zephir_throw_exception_debug(&_27$$21, "phalcon/Mvc/Model/Query.zep", 912); + zephir_throw_exception_debug(&_27$$21, "phalcon/Mvc/Model/Query.zep", 917); ZEPHIR_MM_RESTORE(); return; } @@ -1471,7 +1497,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) } while(0); ZEPHIR_OBS_NVAR(&fieldName); - zephir_array_fetch(&fieldName, &fields, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 925); + zephir_array_fetch(&fieldName, &fields, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 930); _31$$17 = automaticFields; if (_31$$17) { _31$$17 = Z_TYPE_P(&columnMap) == IS_ARRAY; @@ -1485,7 +1511,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeInsert) ZEPHIR_CONCAT_SVS(&_33$$24, "Column '", &fieldName, "' isn't part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_32$$24, "__construct", &_14, 31, &_33$$24); zephir_check_call_status(); - zephir_throw_exception_debug(&_32$$24, "phalcon/Mvc/Model/Query.zep", 935); + zephir_throw_exception_debug(&_32$$24, "phalcon/Mvc/Model/Query.zep", 940); ZEPHIR_MM_RESTORE(); return; } @@ -1662,8 +1688,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_VAR(&connectionTypes); array_init(&connectionTypes); ZEPHIR_OBS_VAR(&models); - zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 984); - zephir_is_iterable(&models, 0, "phalcon/Mvc/Model/Query.zep", 1012); + zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 989); + zephir_is_iterable(&models, 0, "phalcon/Mvc/Model/Query.zep", 1017); if (Z_TYPE_P(&models) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&models), _1) { @@ -1683,7 +1709,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_check_call_status(); zephir_array_update_zval(&connectionTypes, &_6$$5, &__$true, PH_COPY | PH_SEPARATE); if (UNEXPECTED(zephir_fast_count_int(&connectionTypes) == 2)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cannot use models of different database systems in the same query", "phalcon/Mvc/Model/Query.zep", 1007); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cannot use models of different database systems in the same query", "phalcon/Mvc/Model/Query.zep", 1012); return; } } @@ -1713,7 +1739,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_check_call_status(); zephir_array_update_zval(&connectionTypes, &_9$$9, &__$true, PH_COPY | PH_SEPARATE); if (UNEXPECTED(zephir_fast_count_int(&connectionTypes) == 2)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cannot use models of different database systems in the same query", "phalcon/Mvc/Model/Query.zep", 1007); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Cannot use models of different database systems in the same query", "phalcon/Mvc/Model/Query.zep", 1012); return; } } @@ -1723,23 +1749,23 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) } ZEPHIR_INIT_NVAR(&modelName); ZEPHIR_OBS_VAR(&columns); - zephir_array_fetch_string(&columns, &intermediate, SL("columns"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1012); + zephir_array_fetch_string(&columns, &intermediate, SL("columns"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1017); haveObjects = 0; haveScalars = 0; isComplex = 0; numberObjects = 0; ZEPHIR_CPY_WRT(&columns1, &columns); - zephir_is_iterable(&columns, 0, "phalcon/Mvc/Model/Query.zep", 1040); + zephir_is_iterable(&columns, 0, "phalcon/Mvc/Model/Query.zep", 1045); if (Z_TYPE_P(&columns) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&columns), _10) { ZEPHIR_INIT_NVAR(&column); ZVAL_COPY(&column, _10); if (UNEXPECTED(Z_TYPE_P(&column) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid column definition", "phalcon/Mvc/Model/Query.zep", 1024); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid column definition", "phalcon/Mvc/Model/Query.zep", 1029); return; } - zephir_array_fetch_string(&_12$$11, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1027); + zephir_array_fetch_string(&_12$$11, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1032); if (ZEPHIR_IS_STRING(&_12$$11, "scalar")) { if (!(zephir_array_isset_string(&column, SL("balias")))) { isComplex = 1; @@ -1762,10 +1788,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_CALL_METHOD(&column, &columns, "current", NULL, 0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&column) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid column definition", "phalcon/Mvc/Model/Query.zep", 1024); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid column definition", "phalcon/Mvc/Model/Query.zep", 1029); return; } - zephir_array_fetch_string(&_13$$16, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1027); + zephir_array_fetch_string(&_13$$16, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1032); if (ZEPHIR_IS_STRING(&_13$$16, "scalar")) { if (!(zephir_array_isset_string(&column, SL("balias")))) { isComplex = 1; @@ -1803,7 +1829,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) array_init(&simpleColumnMap); zephir_read_property(&_0, this_ptr, ZEND_STRL("metaData"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&metaData, &_0); - zephir_is_iterable(&columns, 0, "phalcon/Mvc/Model/Query.zep", 1146); + zephir_is_iterable(&columns, 0, "phalcon/Mvc/Model/Query.zep", 1151); if (Z_TYPE_P(&columns) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&columns), _16, _17, _14) { @@ -1816,11 +1842,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&column); ZVAL_COPY(&column, _14); ZEPHIR_OBS_NVAR(&sqlColumn); - zephir_array_fetch_string(&sqlColumn, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1063); - zephir_array_fetch_string(&_18$$28, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1066); + zephir_array_fetch_string(&sqlColumn, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1068); + zephir_array_fetch_string(&_18$$28, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1071); if (ZEPHIR_IS_STRING(&_18$$28, "object")) { ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &column, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1067); + zephir_array_fetch_string(&modelName, &column, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1072); ZEPHIR_OBS_NVAR(&instance); zephir_read_property(&_19$$29, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset_fetch(&instance, &_19$$29, &modelName, 0))) { @@ -1838,7 +1864,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&columnMap); ZVAL_NULL(&columnMap); } - zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1103); + zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1108); if (Z_TYPE_P(&attributes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _23$$31) { @@ -1851,7 +1877,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&_26$$34); ZEPHIR_CONCAT_SVSV(&_26$$34, "_", &sqlColumn, "_", &attribute); zephir_array_fast_append(&_25$$34, &_26$$34); - zephir_array_append(&selectColumns, &_25$$34, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1096); + zephir_array_append(&selectColumns, &_25$$34, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1101); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &attributes, "rewind", NULL, 0); @@ -1871,7 +1897,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&_28$$35); ZEPHIR_CONCAT_SVSV(&_28$$35, "_", &sqlColumn, "_", &attribute); zephir_array_fast_append(&_27$$35, &_28$$35); - zephir_array_append(&selectColumns, &_27$$35, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1096); + zephir_array_append(&selectColumns, &_27$$35, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1101); ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0); zephir_check_call_status(); } @@ -1889,7 +1915,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_array_update_multi(&columns1, &_31$$36, SL("zs"), 3, &aliasCopy, SL("keepSnapshots")); } } else { - zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1120); + zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1125); if (Z_TYPE_P(&attributes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _32$$37) { @@ -1899,7 +1925,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_34$$38, 2, 0); zephir_array_fast_append(&_34$$38, &attribute); zephir_array_fast_append(&_34$$38, &sqlColumn); - zephir_array_append(&selectColumns, &_34$$38, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1118); + zephir_array_append(&selectColumns, &_34$$38, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1123); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &attributes, "rewind", NULL, 0); @@ -1916,7 +1942,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_35$$39, 2, 0); zephir_array_fast_append(&_35$$39, &attribute); zephir_array_fast_append(&_35$$39, &sqlColumn); - zephir_array_append(&selectColumns, &_35$$39, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1118); + zephir_array_append(&selectColumns, &_35$$39, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1123); ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0); zephir_check_call_status(); } @@ -1939,7 +1965,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_array_fast_append(&_37$$42, &aliasCopy); ZEPHIR_CPY_WRT(&columnAlias, &_37$$42); } - zephir_array_append(&selectColumns, &columnAlias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1131); + zephir_array_append(&selectColumns, &columnAlias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1136); } _38$$28 = !isComplex; if (_38$$28) { @@ -1968,11 +1994,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_CALL_METHOD(&column, &columns, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&sqlColumn); - zephir_array_fetch_string(&sqlColumn, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1063); - zephir_array_fetch_string(&_39$$46, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1066); + zephir_array_fetch_string(&sqlColumn, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1068); + zephir_array_fetch_string(&_39$$46, &column, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1071); if (ZEPHIR_IS_STRING(&_39$$46, "object")) { ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &column, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1067); + zephir_array_fetch_string(&modelName, &column, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1072); ZEPHIR_OBS_NVAR(&instance); zephir_read_property(&_40$$47, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset_fetch(&instance, &_40$$47, &modelName, 0))) { @@ -1990,7 +2016,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&columnMap); ZVAL_NULL(&columnMap); } - zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1103); + zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1108); if (Z_TYPE_P(&attributes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _44$$49) { @@ -2003,7 +2029,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&_47$$52); ZEPHIR_CONCAT_SVSV(&_47$$52, "_", &sqlColumn, "_", &attribute); zephir_array_fast_append(&_46$$52, &_47$$52); - zephir_array_append(&selectColumns, &_46$$52, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1096); + zephir_array_append(&selectColumns, &_46$$52, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1101); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &attributes, "rewind", NULL, 0); @@ -2023,7 +2049,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&_49$$53); ZEPHIR_CONCAT_SVSV(&_49$$53, "_", &sqlColumn, "_", &attribute); zephir_array_fast_append(&_48$$53, &_49$$53); - zephir_array_append(&selectColumns, &_48$$53, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1096); + zephir_array_append(&selectColumns, &_48$$53, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1101); ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0); zephir_check_call_status(); } @@ -2041,7 +2067,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_array_update_multi(&columns1, &_52$$54, SL("zs"), 3, &aliasCopy, SL("keepSnapshots")); } } else { - zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1120); + zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Query.zep", 1125); if (Z_TYPE_P(&attributes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _53$$55) { @@ -2051,7 +2077,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_55$$56, 2, 0); zephir_array_fast_append(&_55$$56, &attribute); zephir_array_fast_append(&_55$$56, &sqlColumn); - zephir_array_append(&selectColumns, &_55$$56, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1118); + zephir_array_append(&selectColumns, &_55$$56, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1123); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &attributes, "rewind", NULL, 0); @@ -2068,7 +2094,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_56$$57, 2, 0); zephir_array_fast_append(&_56$$57, &attribute); zephir_array_fast_append(&_56$$57, &sqlColumn); - zephir_array_append(&selectColumns, &_56$$57, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1118); + zephir_array_append(&selectColumns, &_56$$57, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1123); ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0); zephir_check_call_status(); } @@ -2090,7 +2116,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_array_fast_append(&_58$$60, &aliasCopy); ZEPHIR_CPY_WRT(&columnAlias, &_58$$60); } - zephir_array_append(&selectColumns, &columnAlias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1131); + zephir_array_append(&selectColumns, &columnAlias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1136); } _59$$46 = !isComplex; if (_59$$46) { @@ -2115,7 +2141,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_VAR(&bindCounts); array_init(&bindCounts); zephir_array_update_string(&intermediate, SL("columns"), &selectColumns, PH_COPY | PH_SEPARATE); - zephir_is_iterable(&bindParams, 0, "phalcon/Mvc/Model/Query.zep", 1167); + zephir_is_iterable(&bindParams, 0, "phalcon/Mvc/Model/Query.zep", 1172); if (Z_TYPE_P(&bindParams) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&bindParams), _62, _63, _60) { @@ -2173,7 +2199,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&wildcard); ZEPHIR_INIT_VAR(&processedTypes); array_init(&processedTypes); - zephir_is_iterable(&bindTypes, 0, "phalcon/Mvc/Model/Query.zep", 1180); + zephir_is_iterable(&bindTypes, 0, "phalcon/Mvc/Model/Query.zep", 1185); if (Z_TYPE_P(&bindTypes) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&bindTypes), _68, _69, _66) { @@ -2278,7 +2304,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) array_init(&simpleColumnMap); ZEPHIR_CALL_METHOD(&_74$$90, &metaData, "getattributes", NULL, 0, &resultObject); zephir_check_call_status(); - zephir_is_iterable(&_74$$90, 0, "phalcon/Mvc/Model/Query.zep", 1268); + zephir_is_iterable(&_74$$90, 0, "phalcon/Mvc/Model/Query.zep", 1273); if (Z_TYPE_P(&_74$$90) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_74$$90), _75$$90) { @@ -2288,7 +2314,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_77$$91, 2, 0); zephir_array_fast_append(&_77$$91, &attribute); ZEPHIR_OBS_NVAR(&_78$$91); - zephir_array_fetch(&_78$$91, &typesColumnMap, &attribute, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1266); + zephir_array_fetch(&_78$$91, &typesColumnMap, &attribute, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1271); zephir_array_fast_append(&_77$$91, &_78$$91); zephir_array_update_zval(&simpleColumnMap, &attribute, &_77$$91, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -2307,7 +2333,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_79$$92, 2, 0); zephir_array_fast_append(&_79$$92, &attribute); ZEPHIR_OBS_NVAR(&_80$$92); - zephir_array_fetch(&_80$$92, &typesColumnMap, &attribute, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1266); + zephir_array_fetch(&_80$$92, &typesColumnMap, &attribute, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1271); zephir_array_fast_append(&_79$$92, &_80$$92); zephir_array_update_zval(&simpleColumnMap, &attribute, &_79$$92, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &_74$$90, "next", NULL, 0); @@ -2317,7 +2343,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_INIT_NVAR(&attribute); } else { array_init(&simpleColumnMap); - zephir_is_iterable(&columnMap, 0, "phalcon/Mvc/Model/Query.zep", 1277); + zephir_is_iterable(&columnMap, 0, "phalcon/Mvc/Model/Query.zep", 1282); if (Z_TYPE_P(&columnMap) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&columnMap), _83$$93, _84$$93, _81$$93) { @@ -2333,7 +2359,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_85$$94, 2, 0); zephir_array_fast_append(&_85$$94, &attribute); ZEPHIR_OBS_NVAR(&_86$$94); - zephir_array_fetch(&_86$$94, &typesColumnMap, &column, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1275); + zephir_array_fetch(&_86$$94, &typesColumnMap, &column, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1280); zephir_array_fast_append(&_85$$94, &_86$$94); zephir_array_update_zval(&simpleColumnMap, &column, &_85$$94, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -2354,7 +2380,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) zephir_create_array(&_87$$95, 2, 0); zephir_array_fast_append(&_87$$95, &attribute); ZEPHIR_OBS_NVAR(&_88$$95); - zephir_array_fetch(&_88$$95, &typesColumnMap, &column, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1275); + zephir_array_fetch(&_88$$95, &typesColumnMap, &column, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1280); zephir_array_fast_append(&_87$$95, &_88$$95); zephir_array_update_zval(&simpleColumnMap, &column, &_87$$95, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &columnMap, "next", NULL, 0); @@ -2384,7 +2410,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_CONCAT_SVS(&_92$$98, "Resultset class \"", &resultsetClassName, "\" not found"); ZEPHIR_CALL_METHOD(NULL, &_91$$98, "__construct", NULL, 31, &_92$$98); zephir_check_call_status(); - zephir_throw_exception_debug(&_91$$98, "phalcon/Mvc/Model/Query.zep", 1293); + zephir_throw_exception_debug(&_91$$98, "phalcon/Mvc/Model/Query.zep", 1298); ZEPHIR_MM_RESTORE(); return; } @@ -2399,7 +2425,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeSelect) ZEPHIR_CONCAT_SVS(&_96$$99, "Resultset class \"", &resultsetClassName, "\" must be an implementation of Phalcon\\Mvc\\Model\\ResultsetInterface"); ZEPHIR_CALL_METHOD(NULL, &_95$$99, "__construct", NULL, 31, &_96$$99); zephir_check_call_status(); - zephir_throw_exception_debug(&_95$$99, "phalcon/Mvc/Model/Query.zep", 1299); + zephir_throw_exception_debug(&_95$$99, "phalcon/Mvc/Model/Query.zep", 1304); ZEPHIR_MM_RESTORE(); return; } @@ -2510,13 +2536,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) ZEPHIR_OBS_VAR(&models); - zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1347); + zephir_array_fetch_string(&models, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1352); if (UNEXPECTED(zephir_array_isset_long(&models, 1))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Updating several models at the same time is still not supported", "phalcon/Mvc/Model/Query.zep", 1352); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Updating several models at the same time is still not supported", "phalcon/Mvc/Model/Query.zep", 1357); return; } ZEPHIR_OBS_VAR(&modelName); - zephir_array_fetch_long(&modelName, &models, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1355); + zephir_array_fetch_long(&modelName, &models, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1360); ZEPHIR_OBS_VAR(&model); zephir_read_property(&_0, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset_fetch(&model, &_0, &modelName, 0))) { @@ -2529,14 +2555,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) ZEPHIR_CALL_METHOD(&dialect, &connection, "getdialect", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_VAR(&fields); - zephir_array_fetch_string(&fields, &intermediate, SL("fields"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1374); + zephir_array_fetch_string(&fields, &intermediate, SL("fields"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1379); ZEPHIR_OBS_VAR(&values); - zephir_array_fetch_string(&values, &intermediate, SL("values"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1375); + zephir_array_fetch_string(&values, &intermediate, SL("values"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1380); ZEPHIR_INIT_VAR(&updateValues); array_init(&updateValues); ZEPHIR_CPY_WRT(&selectBindParams, &bindParams); ZEPHIR_CPY_WRT(&selectBindTypes, &bindTypes); - zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 1447); + zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 1452); if (Z_TYPE_P(&fields) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _4, _5, _2) { @@ -2549,17 +2575,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) ZEPHIR_INIT_NVAR(&field); ZVAL_COPY(&field, _2); ZEPHIR_OBS_NVAR(&value); - zephir_array_fetch(&value, &values, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1390); + zephir_array_fetch(&value, &values, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1395); ZEPHIR_OBS_NVAR(&exprValue); - zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1391); + zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1396); if (zephir_array_isset_string(&field, SL("balias"))) { ZEPHIR_OBS_NVAR(&fieldName); - zephir_array_fetch_string(&fieldName, &field, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1394); + zephir_array_fetch_string(&fieldName, &field, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1399); } else { ZEPHIR_OBS_NVAR(&fieldName); - zephir_array_fetch_string(&fieldName, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1396); + zephir_array_fetch_string(&fieldName, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1401); } - zephir_array_fetch_string(&_6$$5, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1399); + zephir_array_fetch_string(&_6$$5, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1404); do { if (ZEPHIR_IS_LONG(&_6$$5, 260) || ZEPHIR_IS_LONG(&_6$$5, 258) || ZEPHIR_IS_LONG(&_6$$5, 259)) { ZEPHIR_CALL_METHOD(&updateValue, &dialect, "getsqlexpression", &_7, 0, &exprValue); @@ -2588,7 +2614,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) ZEPHIR_CONCAT_SVS(&_13$$11, "Bound parameter '", &wildcard, "' cannot be replaced because it's not in the placeholders list"); ZEPHIR_CALL_METHOD(NULL, &_12$$11, "__construct", &_14, 31, &_13$$11); zephir_check_call_status(); - zephir_throw_exception_debug(&_12$$11, "phalcon/Mvc/Model/Query.zep", 1422); + zephir_throw_exception_debug(&_12$$11, "phalcon/Mvc/Model/Query.zep", 1427); ZEPHIR_MM_RESTORE(); return; } @@ -2597,7 +2623,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) break; } if (ZEPHIR_IS_LONG(&_6$$5, 277)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not supported", "phalcon/Mvc/Model/Query.zep", 1431); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not supported", "phalcon/Mvc/Model/Query.zep", 1436); return; } ZEPHIR_INIT_NVAR(&updateValue); @@ -2625,17 +2651,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) ZEPHIR_CALL_METHOD(&field, &fields, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&value); - zephir_array_fetch(&value, &values, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1390); + zephir_array_fetch(&value, &values, &number, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1395); ZEPHIR_OBS_NVAR(&exprValue); - zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1391); + zephir_array_fetch_string(&exprValue, &value, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1396); if (zephir_array_isset_string(&field, SL("balias"))) { ZEPHIR_OBS_NVAR(&fieldName); - zephir_array_fetch_string(&fieldName, &field, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1394); + zephir_array_fetch_string(&fieldName, &field, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1399); } else { ZEPHIR_OBS_NVAR(&fieldName); - zephir_array_fetch_string(&fieldName, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1396); + zephir_array_fetch_string(&fieldName, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1401); } - zephir_array_fetch_string(&_18$$14, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1399); + zephir_array_fetch_string(&_18$$14, &value, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1404); do { if (ZEPHIR_IS_LONG(&_18$$14, 260) || ZEPHIR_IS_LONG(&_18$$14, 258) || ZEPHIR_IS_LONG(&_18$$14, 259)) { ZEPHIR_CALL_METHOD(&updateValue, &dialect, "getsqlexpression", &_19, 0, &exprValue); @@ -2664,7 +2690,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) ZEPHIR_CONCAT_SVS(&_25$$20, "Bound parameter '", &wildcard, "' cannot be replaced because it's not in the placeholders list"); ZEPHIR_CALL_METHOD(NULL, &_24$$20, "__construct", &_14, 31, &_25$$20); zephir_check_call_status(); - zephir_throw_exception_debug(&_24$$20, "phalcon/Mvc/Model/Query.zep", 1422); + zephir_throw_exception_debug(&_24$$20, "phalcon/Mvc/Model/Query.zep", 1427); ZEPHIR_MM_RESTORE(); return; } @@ -2673,7 +2699,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, executeUpdate) break; } if (ZEPHIR_IS_LONG(&_18$$14, 277)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not supported", "phalcon/Mvc/Model/Query.zep", 1431); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Not supported", "phalcon/Mvc/Model/Query.zep", 1436); return; } ZEPHIR_INIT_NVAR(&updateValue); @@ -2766,7 +2792,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getCallArgument) ZEPHIR_OBS_COPY_OR_DUP(&argument, argument_param); - zephir_array_fetch_string(&_0, &argument, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1509); + zephir_array_fetch_string(&_0, &argument, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1514); if (ZEPHIR_IS_LONG(&_0, 352)) { zephir_create_array(return_value, 1, 0); add_assoc_stringl_ex(return_value, SL("type"), SL("all")); @@ -2825,8 +2851,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression) ZEPHIR_INIT_VAR(&whenClauses); array_init(&whenClauses); - zephir_array_fetch_string(&_0, &expr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1527); - zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model/Query.zep", 1542); + zephir_array_fetch_string(&_0, &expr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1532); + zephir_is_iterable(&_0, 0, "phalcon/Mvc/Model/Query.zep", 1547); if (Z_TYPE_P(&_0) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_0), _1) { @@ -2836,24 +2862,24 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression) ZEPHIR_INIT_NVAR(&_3$$4); zephir_create_array(&_3$$4, 3, 0); add_assoc_stringl_ex(&_3$$4, SL("type"), SL("when")); - zephir_array_fetch_string(&_5$$4, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1531); + zephir_array_fetch_string(&_5$$4, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1536); ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "getexpression", &_6, 0, &_5$$4); zephir_check_call_status(); zephir_array_update_string(&_3$$4, SL("expr"), &_4$$4, PH_COPY | PH_SEPARATE); - zephir_array_fetch_string(&_7$$4, &whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1532); + zephir_array_fetch_string(&_7$$4, &whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1537); ZEPHIR_CALL_METHOD(&_4$$4, this_ptr, "getexpression", &_6, 0, &_7$$4); zephir_check_call_status(); zephir_array_update_string(&_3$$4, SL("then"), &_4$$4, PH_COPY | PH_SEPARATE); - zephir_array_append(&whenClauses, &_3$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1533); + zephir_array_append(&whenClauses, &_3$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1538); } else { ZEPHIR_INIT_NVAR(&_8$$5); zephir_create_array(&_8$$5, 2, 0); add_assoc_stringl_ex(&_8$$5, SL("type"), SL("else")); - zephir_array_fetch_string(&_10$$5, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1537); + zephir_array_fetch_string(&_10$$5, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1542); ZEPHIR_CALL_METHOD(&_9$$5, this_ptr, "getexpression", &_6, 0, &_10$$5); zephir_check_call_status(); zephir_array_update_string(&_8$$5, SL("expr"), &_9$$5, PH_COPY | PH_SEPARATE); - zephir_array_append(&whenClauses, &_8$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1538); + zephir_array_append(&whenClauses, &_8$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1543); } } ZEND_HASH_FOREACH_END(); } else { @@ -2871,24 +2897,24 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression) ZEPHIR_INIT_NVAR(&_11$$7); zephir_create_array(&_11$$7, 3, 0); add_assoc_stringl_ex(&_11$$7, SL("type"), SL("when")); - zephir_array_fetch_string(&_13$$7, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1531); + zephir_array_fetch_string(&_13$$7, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1536); ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "getexpression", &_6, 0, &_13$$7); zephir_check_call_status(); zephir_array_update_string(&_11$$7, SL("expr"), &_12$$7, PH_COPY | PH_SEPARATE); - zephir_array_fetch_string(&_14$$7, &whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1532); + zephir_array_fetch_string(&_14$$7, &whenExpr, SL("right"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1537); ZEPHIR_CALL_METHOD(&_12$$7, this_ptr, "getexpression", &_6, 0, &_14$$7); zephir_check_call_status(); zephir_array_update_string(&_11$$7, SL("then"), &_12$$7, PH_COPY | PH_SEPARATE); - zephir_array_append(&whenClauses, &_11$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1533); + zephir_array_append(&whenClauses, &_11$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1538); } else { ZEPHIR_INIT_NVAR(&_15$$8); zephir_create_array(&_15$$8, 2, 0); add_assoc_stringl_ex(&_15$$8, SL("type"), SL("else")); - zephir_array_fetch_string(&_17$$8, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1537); + zephir_array_fetch_string(&_17$$8, &whenExpr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1542); ZEPHIR_CALL_METHOD(&_16$$8, this_ptr, "getexpression", &_6, 0, &_17$$8); zephir_check_call_status(); zephir_array_update_string(&_15$$8, SL("expr"), &_16$$8, PH_COPY | PH_SEPARATE); - zephir_array_append(&whenClauses, &_15$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1538); + zephir_array_append(&whenClauses, &_15$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 1543); } ZEPHIR_CALL_METHOD(NULL, &_0, "next", NULL, 0); zephir_check_call_status(); @@ -2897,7 +2923,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getCaseExpression) ZEPHIR_INIT_NVAR(&whenExpr); zephir_create_array(return_value, 3, 0); add_assoc_stringl_ex(return_value, SL("type"), SL("case")); - zephir_array_fetch_string(&_19, &expr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1544); + zephir_array_fetch_string(&_19, &expr, SL("left"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1549); ZEPHIR_CALL_METHOD(&_18, this_ptr, "getexpression", &_6, 0, &_19); zephir_check_call_status(); zephir_array_update_string(return_value, SL("expr"), &_18, PH_COPY | PH_SEPARATE); @@ -3248,7 +3274,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) zephir_create_array(&_18$$25, 2, 0); add_assoc_stringl_ex(&_18$$25, SL("type"), SL("literal")); ZEPHIR_OBS_VAR(&_19$$25); - zephir_array_fetch_string(&_19$$25, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1760); + zephir_array_fetch_string(&_19$$25, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1765); zephir_array_update_string(&_18$$25, SL("value"), &_19$$25, PH_COPY | PH_SEPARATE); ZEPHIR_CPY_WRT(&exprReturn, &_18$$25); break; @@ -3271,9 +3297,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) } if (ZEPHIR_IS_LONG(&exprType, 260)) { ZEPHIR_OBS_VAR(&value); - zephir_array_fetch_string(&value, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1781); + zephir_array_fetch_string(&value, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1786); if (quoting) { - if (zephir_memnstr_str(&value, SL("'"), "phalcon/Mvc/Model/Query.zep", 1788)) { + if (zephir_memnstr_str(&value, SL("'"), "phalcon/Mvc/Model/Query.zep", 1793)) { ZEPHIR_INIT_VAR(&escapedValue); phalcon_orm_singlequotes(&escapedValue, &value); } else { @@ -3296,7 +3322,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) zephir_create_array(&_23$$33, 2, 0); add_assoc_stringl_ex(&_23$$33, SL("type"), SL("placeholder")); ZEPHIR_INIT_VAR(&_24$$33); - zephir_array_fetch_string(&_25$$33, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1809); + zephir_array_fetch_string(&_25$$33, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1814); ZEPHIR_INIT_VAR(&_26$$33); ZVAL_STRING(&_26$$33, "?"); ZEPHIR_INIT_VAR(&_27$$33); @@ -3310,7 +3336,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZEPHIR_INIT_VAR(&_28$$34); zephir_create_array(&_28$$34, 2, 0); add_assoc_stringl_ex(&_28$$34, SL("type"), SL("placeholder")); - zephir_array_fetch_string(&_29$$34, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1818); + zephir_array_fetch_string(&_29$$34, &expr, SL("value"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 1823); ZEPHIR_INIT_VAR(&_30$$34); ZEPHIR_CONCAT_SV(&_30$$34, ":", &_29$$34); zephir_array_update_string(&_28$$34, SL("value"), &_30$$34, PH_COPY | PH_SEPARATE); @@ -3319,14 +3345,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) } if (ZEPHIR_IS_LONG(&exprType, 277)) { ZEPHIR_OBS_NVAR(&value); - zephir_array_fetch_string(&value, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1823); - if (zephir_memnstr_str(&value, SL(":"), "phalcon/Mvc/Model/Query.zep", 1825)) { + zephir_array_fetch_string(&value, &expr, SL("value"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1828); + if (zephir_memnstr_str(&value, SL(":"), "phalcon/Mvc/Model/Query.zep", 1830)) { ZEPHIR_INIT_VAR(&valueParts); zephir_fast_explode_str(&valueParts, SL(":"), &value, LONG_MAX); ZEPHIR_OBS_VAR(&name); - zephir_array_fetch_long(&name, &valueParts, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1827); + zephir_array_fetch_long(&name, &valueParts, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1832); ZEPHIR_OBS_VAR(&bindType); - zephir_array_fetch_long(&bindType, &valueParts, 1, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1828); + zephir_array_fetch_long(&bindType, &valueParts, 1, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 1833); do { if (ZEPHIR_IS_STRING(&bindType, "str")) { ZEPHIR_INIT_VAR(&_31$$37); @@ -3416,7 +3442,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZEPHIR_CONCAT_SV(&_51$$44, "Bind value is required for array type placeholder: ", &name); ZEPHIR_CALL_METHOD(NULL, &_50$$44, "__construct", NULL, 31, &_51$$44); zephir_check_call_status(); - zephir_throw_exception_debug(&_50$$44, "phalcon/Mvc/Model/Query.zep", 1898); + zephir_throw_exception_debug(&_50$$44, "phalcon/Mvc/Model/Query.zep", 1903); ZEPHIR_MM_RESTORE(); return; } @@ -3427,7 +3453,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZEPHIR_CONCAT_SV(&_53$$45, "Bind type requires an array in placeholder: ", &name); ZEPHIR_CALL_METHOD(NULL, &_52$$45, "__construct", NULL, 31, &_53$$45); zephir_check_call_status(); - zephir_throw_exception_debug(&_52$$45, "phalcon/Mvc/Model/Query.zep", 1904); + zephir_throw_exception_debug(&_52$$45, "phalcon/Mvc/Model/Query.zep", 1909); ZEPHIR_MM_RESTORE(); return; } @@ -3438,7 +3464,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZEPHIR_CONCAT_SV(&_55$$46, "At least one value must be bound in placeholder: ", &name); ZEPHIR_CALL_METHOD(NULL, &_54$$46, "__construct", NULL, 31, &_55$$46); zephir_check_call_status(); - zephir_throw_exception_debug(&_54$$46, "phalcon/Mvc/Model/Query.zep", 1910); + zephir_throw_exception_debug(&_54$$46, "phalcon/Mvc/Model/Query.zep", 1915); ZEPHIR_MM_RESTORE(); return; } @@ -3459,7 +3485,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZEPHIR_CONCAT_SV(&_59$$47, "Unknown bind type: ", &bindType); ZEPHIR_CALL_METHOD(NULL, &_58$$47, "__construct", NULL, 31, &_59$$47); zephir_check_call_status(); - zephir_throw_exception_debug(&_58$$47, "phalcon/Mvc/Model/Query.zep", 1925); + zephir_throw_exception_debug(&_58$$47, "phalcon/Mvc/Model/Query.zep", 1930); ZEPHIR_MM_RESTORE(); return; } while(0); @@ -3641,7 +3667,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) zephir_create_array(&_79$$66, 2, 0); add_assoc_stringl_ex(&_79$$66, SL("type"), SL("literal")); ZEPHIR_OBS_VAR(&_80$$66); - zephir_array_fetch_string(&_80$$66, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2101); + zephir_array_fetch_string(&_80$$66, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2106); zephir_array_update_string(&_79$$66, SL("value"), &_80$$66, PH_COPY | PH_SEPARATE); ZEPHIR_CPY_WRT(&exprReturn, &_79$$66); break; @@ -3673,7 +3699,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZEPHIR_CONCAT_SV(&_85$$70, "Unknown expression type ", &exprType); ZEPHIR_CALL_METHOD(NULL, &_84$$70, "__construct", NULL, 31, &_85$$70); zephir_check_call_status(); - zephir_throw_exception_debug(&_84$$70, "phalcon/Mvc/Model/Query.zep", 2124); + zephir_throw_exception_debug(&_84$$70, "phalcon/Mvc/Model/Query.zep", 2129); ZEPHIR_MM_RESTORE(); return; } while(0); @@ -3688,7 +3714,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) if (zephir_array_isset_long(&expr, 0)) { ZEPHIR_INIT_VAR(&listItems); array_init(&listItems); - zephir_is_iterable(&expr, 0, "phalcon/Mvc/Model/Query.zep", 2147); + zephir_is_iterable(&expr, 0, "phalcon/Mvc/Model/Query.zep", 2152); if (Z_TYPE_P(&expr) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&expr), _86$$72) { @@ -3696,7 +3722,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) ZVAL_COPY(&exprListItem, _86$$72); ZEPHIR_CALL_METHOD(&_88$$73, this_ptr, "getexpression", NULL, 0, &exprListItem); zephir_check_call_status(); - zephir_array_append(&listItems, &_88$$73, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2144); + zephir_array_append(&listItems, &_88$$73, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2149); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &expr, "rewind", NULL, 0); @@ -3711,7 +3737,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_89$$74, this_ptr, "getexpression", NULL, 0, &exprListItem); zephir_check_call_status(); - zephir_array_append(&listItems, &_89$$74, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2144); + zephir_array_append(&listItems, &_89$$74, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2149); ZEPHIR_CALL_METHOD(NULL, &expr, "next", NULL, 0); zephir_check_call_status(); } @@ -3722,7 +3748,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getExpression) zephir_array_fast_append(return_value, &listItems); RETURN_MM(); } - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Unknown expression", "phalcon/Mvc/Model/Query.zep", 2153); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Unknown expression", "phalcon/Mvc/Model/Query.zep", 2158); return; } @@ -3774,7 +3800,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) if (zephir_array_isset_long(&arguments, 0)) { ZEPHIR_INIT_VAR(&functionArgs); array_init(&functionArgs); - zephir_is_iterable(&arguments, 0, "phalcon/Mvc/Model/Query.zep", 2179); + zephir_is_iterable(&arguments, 0, "phalcon/Mvc/Model/Query.zep", 2184); if (Z_TYPE_P(&arguments) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&arguments), _0$$6) { @@ -3782,7 +3808,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) ZVAL_COPY(&argument, _0$$6); ZEPHIR_CALL_METHOD(&_2$$7, this_ptr, "getcallargument", &_3, 0, &argument); zephir_check_call_status(); - zephir_array_append(&functionArgs, &_2$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2177); + zephir_array_append(&functionArgs, &_2$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2182); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &arguments, "rewind", NULL, 0); @@ -3797,7 +3823,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_4$$8, this_ptr, "getcallargument", &_3, 0, &argument); zephir_check_call_status(); - zephir_array_append(&functionArgs, &_4$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2177); + zephir_array_append(&functionArgs, &_4$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2182); ZEPHIR_CALL_METHOD(NULL, &arguments, "next", NULL, 0); zephir_check_call_status(); } @@ -3815,7 +3841,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) zephir_create_array(return_value, 4, 0); add_assoc_stringl_ex(return_value, SL("type"), SL("functionCall")); ZEPHIR_OBS_VAR(&_7$$10); - zephir_array_fetch_string(&_7$$10, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2189); + zephir_array_fetch_string(&_7$$10, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2194); zephir_array_update_string(return_value, SL("name"), &_7$$10, PH_COPY | PH_SEPARATE); zephir_array_update_string(return_value, SL("arguments"), &functionArgs, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_VAR(&_8$$10); @@ -3826,7 +3852,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) zephir_create_array(return_value, 3, 0); add_assoc_stringl_ex(return_value, SL("type"), SL("functionCall")); ZEPHIR_OBS_VAR(&_9$$11); - zephir_array_fetch_string(&_9$$11, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2196); + zephir_array_fetch_string(&_9$$11, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2201); zephir_array_update_string(return_value, SL("name"), &_9$$11, PH_COPY | PH_SEPARATE); zephir_array_update_string(return_value, SL("arguments"), &functionArgs, PH_COPY | PH_SEPARATE); RETURN_MM(); @@ -3835,7 +3861,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getFunctionCall) zephir_create_array(return_value, 2, 0); add_assoc_stringl_ex(return_value, SL("type"), SL("functionCall")); ZEPHIR_OBS_VAR(&_10); - zephir_array_fetch_string(&_10, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2205); + zephir_array_fetch_string(&_10, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2210); zephir_array_update_string(return_value, SL("name"), &_10, PH_COPY | PH_SEPARATE); RETURN_MM(); } @@ -3876,7 +3902,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getGroupClause) if (zephir_array_isset_long(&group, 0)) { ZEPHIR_INIT_VAR(&groupParts); array_init(&groupParts); - zephir_is_iterable(&group, 0, "phalcon/Mvc/Model/Query.zep", 2225); + zephir_is_iterable(&group, 0, "phalcon/Mvc/Model/Query.zep", 2230); if (Z_TYPE_P(&group) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&group), _0$$3) { @@ -3884,7 +3910,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getGroupClause) ZVAL_COPY(&groupItem, _0$$3); ZEPHIR_CALL_METHOD(&_2$$4, this_ptr, "getexpression", &_3, 0, &groupItem); zephir_check_call_status(); - zephir_array_append(&groupParts, &_2$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2223); + zephir_array_append(&groupParts, &_2$$4, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2228); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &group, "rewind", NULL, 0); @@ -3899,7 +3925,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getGroupClause) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_4$$5, this_ptr, "getexpression", &_3, 0, &groupItem); zephir_check_call_status(); - zephir_array_append(&groupParts, &_4$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2223); + zephir_array_append(&groupParts, &_4$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2228); ZEPHIR_CALL_METHOD(NULL, &group, "next", NULL, 0); zephir_check_call_status(); } @@ -3998,10 +4024,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoin) ZEPHIR_OBS_VAR(&qualified); if (zephir_array_isset_string_fetch(&qualified, &join, SL("qualified"), 0)) { - zephir_array_fetch_string(&_0$$3, &qualified, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2261); + zephir_array_fetch_string(&_0$$3, &qualified, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2266); if (ZEPHIR_IS_LONG(&_0$$3, 355)) { ZEPHIR_OBS_VAR(&modelName); - zephir_array_fetch_string(&modelName, &qualified, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2262); + zephir_array_fetch_string(&modelName, &qualified, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2267); ZEPHIR_CALL_METHOD(&model, manager, "load", NULL, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0); @@ -4016,7 +4042,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoin) RETURN_MM(); } } - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 2277); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 2282); return; } @@ -4051,7 +4077,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoinType) ZEPHIR_OBS_VAR(&type); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&type, &join, SL("type"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 2288); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 2293); return; } do { @@ -4079,7 +4105,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoinType) ZEPHIR_CONCAT_SVSV(&_2, "Unknown join type ", &type, ", when preparing: ", &_1); ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 31, &_2); zephir_check_call_status(); - zephir_throw_exception_debug(&_0, "phalcon/Mvc/Model/Query.zep", 2310); + zephir_throw_exception_debug(&_0, "phalcon/Mvc/Model/Query.zep", 2315); ZEPHIR_MM_RESTORE(); return; } @@ -4253,7 +4279,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&manager, &_0); ZEPHIR_OBS_VAR(&tables); - zephir_array_fetch_string(&tables, &select, SL("tables"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2346); + zephir_array_fetch_string(&tables, &select, SL("tables"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2351); if (!(zephir_array_isset_long(&tables, 0))) { ZEPHIR_INIT_VAR(&selectTables); zephir_create_array(&selectTables, 1, 0); @@ -4262,7 +4288,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CPY_WRT(&selectTables, &tables); } ZEPHIR_OBS_VAR(&joins); - zephir_array_fetch_string(&joins, &select, SL("joins"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2354); + zephir_array_fetch_string(&joins, &select, SL("joins"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2359); if (!(zephir_array_isset_long(&joins, 0))) { ZEPHIR_INIT_VAR(&selectJoins); zephir_create_array(&selectJoins, 1, 0); @@ -4270,7 +4296,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } else { ZEPHIR_CPY_WRT(&selectJoins, &joins); } - zephir_is_iterable(&selectJoins, 0, "phalcon/Mvc/Model/Query.zep", 2505); + zephir_is_iterable(&selectJoins, 0, "phalcon/Mvc/Model/Query.zep", 2510); if (Z_TYPE_P(&selectJoins) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&selectJoins), _1) { @@ -4279,13 +4305,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CALL_METHOD(&joinData, this_ptr, "getjoin", &_3, 0, &manager, &joinItem); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&source); - zephir_array_fetch_string(&source, &joinData, SL("source"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2368); + zephir_array_fetch_string(&source, &joinData, SL("source"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2373); ZEPHIR_OBS_NVAR(&schema); - zephir_array_fetch_string(&schema, &joinData, SL("schema"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2369); + zephir_array_fetch_string(&schema, &joinData, SL("schema"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2374); ZEPHIR_OBS_NVAR(&model); - zephir_array_fetch_string(&model, &joinData, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2370); + zephir_array_fetch_string(&model, &joinData, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2375); ZEPHIR_OBS_NVAR(&realModelName); - zephir_array_fetch_string(&realModelName, &joinData, SL("modelName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2371); + zephir_array_fetch_string(&realModelName, &joinData, SL("modelName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2376); ZEPHIR_INIT_NVAR(&completeSource); zephir_create_array(&completeSource, 2, 0); zephir_array_fast_append(&completeSource, &source); @@ -4295,7 +4321,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_OBS_NVAR(&aliasExpr); if (zephir_array_isset_string_fetch(&aliasExpr, &joinItem, SL("alias"), 0)) { ZEPHIR_OBS_NVAR(&alias); - zephir_array_fetch_string(&alias, &aliasExpr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2383); + zephir_array_fetch_string(&alias, &aliasExpr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2388); if (UNEXPECTED(zephir_array_isset(&joinModels, &alias))) { ZEPHIR_INIT_NVAR(&_5$$9); object_init_ex(&_5$$9, phalcon_mvc_model_exception_ce); @@ -4304,11 +4330,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSV(&_7$$9, "Cannot use '", &alias, "' as join alias because it was already used, when preparing: ", &_6$$9); ZEPHIR_CALL_METHOD(NULL, &_5$$9, "__construct", &_8, 31, &_7$$9); zephir_check_call_status(); - zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/Model/Query.zep", 2391); + zephir_throw_exception_debug(&_5$$9, "phalcon/Mvc/Model/Query.zep", 2396); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2397); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2402); zephir_array_update_zval(&joinTypes, &alias, &joinType, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&joinModels, &alias, &realModelName, PH_COPY | PH_SEPARATE); @@ -4327,7 +4353,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSV(&_11$$11, "Cannot use '", &realModelName, "' as join alias because it was already used, when preparing: ", &_10$$11); ZEPHIR_CALL_METHOD(NULL, &_9$$11, "__construct", &_8, 31, &_11$$11); zephir_check_call_status(); - zephir_throw_exception_debug(&_9$$11, "phalcon/Mvc/Model/Query.zep", 2450); + zephir_throw_exception_debug(&_9$$11, "phalcon/Mvc/Model/Query.zep", 2455); ZEPHIR_MM_RESTORE(); return; } @@ -4357,13 +4383,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CALL_METHOD(&joinData, this_ptr, "getjoin", &_3, 0, &manager, &joinItem); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&source); - zephir_array_fetch_string(&source, &joinData, SL("source"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2368); + zephir_array_fetch_string(&source, &joinData, SL("source"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2373); ZEPHIR_OBS_NVAR(&schema); - zephir_array_fetch_string(&schema, &joinData, SL("schema"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2369); + zephir_array_fetch_string(&schema, &joinData, SL("schema"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2374); ZEPHIR_OBS_NVAR(&model); - zephir_array_fetch_string(&model, &joinData, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2370); + zephir_array_fetch_string(&model, &joinData, SL("model"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2375); ZEPHIR_OBS_NVAR(&realModelName); - zephir_array_fetch_string(&realModelName, &joinData, SL("modelName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2371); + zephir_array_fetch_string(&realModelName, &joinData, SL("modelName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2376); ZEPHIR_INIT_NVAR(&_12$$12); zephir_create_array(&_12$$12, 2, 0); zephir_array_fast_append(&_12$$12, &source); @@ -4374,7 +4400,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_OBS_NVAR(&aliasExpr); if (zephir_array_isset_string_fetch(&aliasExpr, &joinItem, SL("alias"), 0)) { ZEPHIR_OBS_NVAR(&alias); - zephir_array_fetch_string(&alias, &aliasExpr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2383); + zephir_array_fetch_string(&alias, &aliasExpr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2388); if (UNEXPECTED(zephir_array_isset(&joinModels, &alias))) { ZEPHIR_INIT_NVAR(&_13$$14); object_init_ex(&_13$$14, phalcon_mvc_model_exception_ce); @@ -4383,11 +4409,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSV(&_15$$14, "Cannot use '", &alias, "' as join alias because it was already used, when preparing: ", &_14$$14); ZEPHIR_CALL_METHOD(NULL, &_13$$14, "__construct", &_8, 31, &_15$$14); zephir_check_call_status(); - zephir_throw_exception_debug(&_13$$14, "phalcon/Mvc/Model/Query.zep", 2391); + zephir_throw_exception_debug(&_13$$14, "phalcon/Mvc/Model/Query.zep", 2396); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2397); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2402); zephir_array_update_zval(&joinTypes, &alias, &joinType, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&joinModels, &alias, &realModelName, PH_COPY | PH_SEPARATE); @@ -4406,7 +4432,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSV(&_18$$16, "Cannot use '", &realModelName, "' as join alias because it was already used, when preparing: ", &_17$$16); ZEPHIR_CALL_METHOD(NULL, &_16$$16, "__construct", &_8, 31, &_18$$16); zephir_check_call_status(); - zephir_throw_exception_debug(&_16$$16, "phalcon/Mvc/Model/Query.zep", 2450); + zephir_throw_exception_debug(&_16$$16, "phalcon/Mvc/Model/Query.zep", 2455); ZEPHIR_MM_RESTORE(); return; } @@ -4432,7 +4458,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_update_property_zval(this_ptr, ZEND_STRL("sqlModelsAliases"), &sqlModelsAliases); zephir_update_property_zval(this_ptr, ZEND_STRL("sqlAliasesModelsInstances"), &sqlAliasesModelsInstances); zephir_update_property_zval(this_ptr, ZEND_STRL("modelsInstances"), &modelsInstances); - zephir_is_iterable(&joinPrepared, 0, "phalcon/Mvc/Model/Query.zep", 2525); + zephir_is_iterable(&joinPrepared, 0, "phalcon/Mvc/Model/Query.zep", 2530); if (Z_TYPE_P(&joinPrepared) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&joinPrepared), _21, _22, _19) { @@ -4479,7 +4505,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_read_property(&_0, this_ptr, ZEND_STRL("enableImplicitJoins"), PH_NOISY_CC | PH_READONLY); if (!(zephir_is_true(&_0))) { ZEPHIR_INIT_VAR(&_26$$21); - zephir_is_iterable(&joinPrepared, 0, "phalcon/Mvc/Model/Query.zep", 2537); + zephir_is_iterable(&joinPrepared, 0, "phalcon/Mvc/Model/Query.zep", 2542); if (Z_TYPE_P(&joinPrepared) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&joinPrepared), _29$$21, _30$$21, _27$$21) { @@ -4492,11 +4518,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&_26$$21); ZVAL_COPY(&_26$$21, _27$$21); ZEPHIR_OBS_NVAR(&joinType); - zephir_array_fetch(&joinType, &joinTypes, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2527); + zephir_array_fetch(&joinType, &joinTypes, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2532); ZEPHIR_OBS_NVAR(&joinSource); - zephir_array_fetch(&joinSource, &joinSources, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2528); + zephir_array_fetch(&joinSource, &joinSources, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2533); ZEPHIR_OBS_NVAR(&preCondition); - zephir_array_fetch(&preCondition, &joinPreCondition, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2529); + zephir_array_fetch(&preCondition, &joinPreCondition, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2534); ZEPHIR_INIT_NVAR(&_31$$22); zephir_create_array(&_31$$22, 3, 0); zephir_array_update_string(&_31$$22, SL("type"), &joinType, PH_COPY | PH_SEPARATE); @@ -4505,7 +4531,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_create_array(&_32$$22, 1, 0); zephir_array_fast_append(&_32$$22, &preCondition); zephir_array_update_string(&_31$$22, SL("conditions"), &_32$$22, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_31$$22, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2534); + zephir_array_append(&sqlJoins, &_31$$22, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2539); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &joinPrepared, "rewind", NULL, 0); @@ -4521,11 +4547,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CALL_METHOD(&_26$$21, &joinPrepared, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&joinType); - zephir_array_fetch(&joinType, &joinTypes, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2527); + zephir_array_fetch(&joinType, &joinTypes, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2532); ZEPHIR_OBS_NVAR(&joinSource); - zephir_array_fetch(&joinSource, &joinSources, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2528); + zephir_array_fetch(&joinSource, &joinSources, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2533); ZEPHIR_OBS_NVAR(&preCondition); - zephir_array_fetch(&preCondition, &joinPreCondition, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2529); + zephir_array_fetch(&preCondition, &joinPreCondition, &joinAliasName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2534); ZEPHIR_INIT_NVAR(&_33$$23); zephir_create_array(&_33$$23, 3, 0); zephir_array_update_string(&_33$$23, SL("type"), &joinType, PH_COPY | PH_SEPARATE); @@ -4534,7 +4560,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_create_array(&_34$$23, 1, 0); zephir_array_fast_append(&_34$$23, &preCondition); zephir_array_update_string(&_33$$23, SL("conditions"), &_34$$23, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_33$$23, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2534); + zephir_array_append(&sqlJoins, &_33$$23, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2539); ZEPHIR_CALL_METHOD(NULL, &joinPrepared, "next", NULL, 0); zephir_check_call_status(); } @@ -4545,15 +4571,15 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_INIT_NVAR(&fromModels); array_init(&fromModels); - zephir_is_iterable(&selectTables, 0, "phalcon/Mvc/Model/Query.zep", 2552); + zephir_is_iterable(&selectTables, 0, "phalcon/Mvc/Model/Query.zep", 2557); if (Z_TYPE_P(&selectTables) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&selectTables), _35) { ZEPHIR_INIT_NVAR(&tableItem); ZVAL_COPY(&tableItem, _35); - zephir_array_fetch_string(&_37$$24, &tableItem, SL("qualifiedName"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2546); + zephir_array_fetch_string(&_37$$24, &tableItem, SL("qualifiedName"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2551); ZEPHIR_OBS_NVAR(&_38$$24); - zephir_array_fetch_string(&_38$$24, &_37$$24, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2546); + zephir_array_fetch_string(&_38$$24, &_37$$24, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2551); zephir_array_update_zval(&fromModels, &_38$$24, &__$true, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); } else { @@ -4567,9 +4593,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_CALL_METHOD(&tableItem, &selectTables, "current", NULL, 0); zephir_check_call_status(); - zephir_array_fetch_string(&_39$$25, &tableItem, SL("qualifiedName"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2546); + zephir_array_fetch_string(&_39$$25, &tableItem, SL("qualifiedName"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2551); ZEPHIR_OBS_NVAR(&_40$$25); - zephir_array_fetch_string(&_40$$25, &_39$$25, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2546); + zephir_array_fetch_string(&_40$$25, &_39$$25, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2551); zephir_array_update_zval(&fromModels, &_40$$25, &__$true, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &selectTables, "next", NULL, 0); zephir_check_call_status(); @@ -4577,7 +4603,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_INIT_NVAR(&tableItem); ZEPHIR_INIT_VAR(&_41); - zephir_is_iterable(&fromModels, 0, "phalcon/Mvc/Model/Query.zep", 2672); + zephir_is_iterable(&fromModels, 0, "phalcon/Mvc/Model/Query.zep", 2677); if (Z_TYPE_P(&fromModels) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fromModels), _44, _45, _42) { @@ -4589,7 +4615,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_INIT_NVAR(&_41); ZVAL_COPY(&_41, _42); - zephir_is_iterable(&joinModels, 0, "phalcon/Mvc/Model/Query.zep", 2670); + zephir_is_iterable(&joinModels, 0, "phalcon/Mvc/Model/Query.zep", 2675); if (Z_TYPE_P(&joinModels) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&joinModels), _48$$26, _49$$26, _46$$26) { @@ -4602,13 +4628,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&joinModel); ZVAL_COPY(&joinModel, _46$$26); ZEPHIR_OBS_NVAR(&joinSource); - zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2557); + zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2562); ZEPHIR_OBS_NVAR(&joinType); - zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2562); + zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2567); ZEPHIR_OBS_NVAR(&preCondition); if (!(zephir_array_isset_fetch(&preCondition, &joinPreCondition, &joinAlias, 0))) { ZEPHIR_OBS_NVAR(&modelNameAlias); - zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2571); + zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2576); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_50, 0, &fromModelName, &modelNameAlias); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&relation)) { @@ -4623,17 +4649,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSVSV(&_54$$31, "There is more than one relation between models '", &fromModelName, "' and '", &joinModel, "', the join must be done using an alias, when preparing: ", &_53$$31); ZEPHIR_CALL_METHOD(NULL, &_52$$31, "__construct", &_8, 31, &_54$$31); zephir_check_call_status(); - zephir_throw_exception_debug(&_52$$31, "phalcon/Mvc/Model/Query.zep", 2597); + zephir_throw_exception_debug(&_52$$31, "phalcon/Mvc/Model/Query.zep", 2602); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&relation); - zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2603); + zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2608); } } if (Z_TYPE_P(&relation) == IS_OBJECT) { ZEPHIR_OBS_NVAR(&modelAlias); - zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2614); + zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2619); ZEPHIR_CALL_METHOD(&_55$$32, &relation, "isthrough", NULL, 0); zephir_check_call_status(); if (!(zephir_is_true(&_55$$32))) { @@ -4644,13 +4670,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_check_call_status(); } if (zephir_array_isset_long(&sqlJoin, 0)) { - zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2644); + zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2649); if (Z_TYPE_P(&sqlJoin) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&sqlJoin), _58$$35) { ZEPHIR_INIT_NVAR(&sqlJoinItem); ZVAL_COPY(&sqlJoinItem, _58$$35); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2642); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "rewind", NULL, 0); @@ -4663,14 +4689,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_CALL_METHOD(&sqlJoinItem, &sqlJoin, "current", NULL, 0); zephir_check_call_status(); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2642); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647); ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "next", NULL, 0); zephir_check_call_status(); } } ZEPHIR_INIT_NVAR(&sqlJoinItem); } else { - zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2645); + zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2650); } } else { ZEPHIR_INIT_NVAR(&_60$$39); @@ -4680,7 +4706,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&_61$$39); array_init(&_61$$39); zephir_array_update_string(&_60$$39, SL("conditions"), &_61$$39, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_60$$39, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2656); + zephir_array_append(&sqlJoins, &_60$$39, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2661); } } else { ZEPHIR_INIT_NVAR(&_62$$40); @@ -4691,7 +4717,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_create_array(&_63$$40, 1, 0); zephir_array_fast_append(&_63$$40, &preCondition); zephir_array_update_string(&_62$$40, SL("conditions"), &_63$$40, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_62$$40, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2667); + zephir_array_append(&sqlJoins, &_62$$40, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2672); } } ZEND_HASH_FOREACH_END(); } else { @@ -4708,13 +4734,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CALL_METHOD(&joinModel, &joinModels, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&joinSource); - zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2557); + zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2562); ZEPHIR_OBS_NVAR(&joinType); - zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2562); + zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2567); ZEPHIR_OBS_NVAR(&preCondition); if (!(zephir_array_isset_fetch(&preCondition, &joinPreCondition, &joinAlias, 0))) { ZEPHIR_OBS_NVAR(&modelNameAlias); - zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2571); + zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2576); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_64, 0, &fromModelName, &modelNameAlias); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&relation)) { @@ -4729,17 +4755,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSVSV(&_68$$45, "There is more than one relation between models '", &fromModelName, "' and '", &joinModel, "', the join must be done using an alias, when preparing: ", &_67$$45); ZEPHIR_CALL_METHOD(NULL, &_66$$45, "__construct", &_8, 31, &_68$$45); zephir_check_call_status(); - zephir_throw_exception_debug(&_66$$45, "phalcon/Mvc/Model/Query.zep", 2597); + zephir_throw_exception_debug(&_66$$45, "phalcon/Mvc/Model/Query.zep", 2602); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&relation); - zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2603); + zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2608); } } if (Z_TYPE_P(&relation) == IS_OBJECT) { ZEPHIR_OBS_NVAR(&modelAlias); - zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2614); + zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2619); ZEPHIR_CALL_METHOD(&_69$$46, &relation, "isthrough", NULL, 0); zephir_check_call_status(); if (!(zephir_is_true(&_69$$46))) { @@ -4750,13 +4776,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_check_call_status(); } if (zephir_array_isset_long(&sqlJoin, 0)) { - zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2644); + zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2649); if (Z_TYPE_P(&sqlJoin) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&sqlJoin), _70$$49) { ZEPHIR_INIT_NVAR(&sqlJoinItem); ZVAL_COPY(&sqlJoinItem, _70$$49); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2642); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "rewind", NULL, 0); @@ -4769,14 +4795,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_CALL_METHOD(&sqlJoinItem, &sqlJoin, "current", NULL, 0); zephir_check_call_status(); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2642); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647); ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "next", NULL, 0); zephir_check_call_status(); } } ZEPHIR_INIT_NVAR(&sqlJoinItem); } else { - zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2645); + zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2650); } } else { ZEPHIR_INIT_NVAR(&_72$$53); @@ -4786,7 +4812,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&_73$$53); array_init(&_73$$53); zephir_array_update_string(&_72$$53, SL("conditions"), &_73$$53, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_72$$53, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2656); + zephir_array_append(&sqlJoins, &_72$$53, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2661); } } else { ZEPHIR_INIT_NVAR(&_74$$54); @@ -4797,7 +4823,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_create_array(&_75$$54, 1, 0); zephir_array_fast_append(&_75$$54, &preCondition); zephir_array_update_string(&_74$$54, SL("conditions"), &_75$$54, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_74$$54, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2667); + zephir_array_append(&sqlJoins, &_74$$54, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2672); } ZEPHIR_CALL_METHOD(NULL, &joinModels, "next", NULL, 0); zephir_check_call_status(); @@ -4819,7 +4845,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_41, &fromModels, "current", NULL, 0); zephir_check_call_status(); - zephir_is_iterable(&joinModels, 0, "phalcon/Mvc/Model/Query.zep", 2670); + zephir_is_iterable(&joinModels, 0, "phalcon/Mvc/Model/Query.zep", 2675); if (Z_TYPE_P(&joinModels) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&joinModels), _78$$55, _79$$55, _76$$55) { @@ -4832,13 +4858,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&joinModel); ZVAL_COPY(&joinModel, _76$$55); ZEPHIR_OBS_NVAR(&joinSource); - zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2557); + zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2562); ZEPHIR_OBS_NVAR(&joinType); - zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2562); + zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2567); ZEPHIR_OBS_NVAR(&preCondition); if (!(zephir_array_isset_fetch(&preCondition, &joinPreCondition, &joinAlias, 0))) { ZEPHIR_OBS_NVAR(&modelNameAlias); - zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2571); + zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2576); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_80, 0, &fromModelName, &modelNameAlias); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&relation)) { @@ -4853,17 +4879,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSVSV(&_84$$60, "There is more than one relation between models '", &fromModelName, "' and '", &joinModel, "', the join must be done using an alias, when preparing: ", &_83$$60); ZEPHIR_CALL_METHOD(NULL, &_82$$60, "__construct", &_8, 31, &_84$$60); zephir_check_call_status(); - zephir_throw_exception_debug(&_82$$60, "phalcon/Mvc/Model/Query.zep", 2597); + zephir_throw_exception_debug(&_82$$60, "phalcon/Mvc/Model/Query.zep", 2602); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&relation); - zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2603); + zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2608); } } if (Z_TYPE_P(&relation) == IS_OBJECT) { ZEPHIR_OBS_NVAR(&modelAlias); - zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2614); + zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2619); ZEPHIR_CALL_METHOD(&_85$$61, &relation, "isthrough", NULL, 0); zephir_check_call_status(); if (!(zephir_is_true(&_85$$61))) { @@ -4874,13 +4900,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_check_call_status(); } if (zephir_array_isset_long(&sqlJoin, 0)) { - zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2644); + zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2649); if (Z_TYPE_P(&sqlJoin) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&sqlJoin), _86$$64) { ZEPHIR_INIT_NVAR(&sqlJoinItem); ZVAL_COPY(&sqlJoinItem, _86$$64); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2642); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "rewind", NULL, 0); @@ -4893,14 +4919,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_CALL_METHOD(&sqlJoinItem, &sqlJoin, "current", NULL, 0); zephir_check_call_status(); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2642); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647); ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "next", NULL, 0); zephir_check_call_status(); } } ZEPHIR_INIT_NVAR(&sqlJoinItem); } else { - zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2645); + zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2650); } } else { ZEPHIR_INIT_NVAR(&_88$$68); @@ -4910,7 +4936,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&_89$$68); array_init(&_89$$68); zephir_array_update_string(&_88$$68, SL("conditions"), &_89$$68, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_88$$68, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2656); + zephir_array_append(&sqlJoins, &_88$$68, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2661); } } else { ZEPHIR_INIT_NVAR(&_90$$69); @@ -4921,7 +4947,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_create_array(&_91$$69, 1, 0); zephir_array_fast_append(&_91$$69, &preCondition); zephir_array_update_string(&_90$$69, SL("conditions"), &_91$$69, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_90$$69, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2667); + zephir_array_append(&sqlJoins, &_90$$69, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2672); } } ZEND_HASH_FOREACH_END(); } else { @@ -4938,13 +4964,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CALL_METHOD(&joinModel, &joinModels, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&joinSource); - zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2557); + zephir_array_fetch(&joinSource, &joinSources, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2562); ZEPHIR_OBS_NVAR(&joinType); - zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2562); + zephir_array_fetch(&joinType, &joinTypes, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2567); ZEPHIR_OBS_NVAR(&preCondition); if (!(zephir_array_isset_fetch(&preCondition, &joinPreCondition, &joinAlias, 0))) { ZEPHIR_OBS_NVAR(&modelNameAlias); - zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2571); + zephir_array_fetch(&modelNameAlias, &sqlAliasesModels, &joinAlias, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2576); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_92, 0, &fromModelName, &modelNameAlias); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&relation)) { @@ -4959,17 +4985,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_CONCAT_SVSVSV(&_96$$74, "There is more than one relation between models '", &fromModelName, "' and '", &joinModel, "', the join must be done using an alias, when preparing: ", &_95$$74); ZEPHIR_CALL_METHOD(NULL, &_94$$74, "__construct", &_8, 31, &_96$$74); zephir_check_call_status(); - zephir_throw_exception_debug(&_94$$74, "phalcon/Mvc/Model/Query.zep", 2597); + zephir_throw_exception_debug(&_94$$74, "phalcon/Mvc/Model/Query.zep", 2602); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&relation); - zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2603); + zephir_array_fetch_long(&relation, &relations, 0, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2608); } } if (Z_TYPE_P(&relation) == IS_OBJECT) { ZEPHIR_OBS_NVAR(&modelAlias); - zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2614); + zephir_array_fetch(&modelAlias, &sqlModelsAliases, &fromModelName, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2619); ZEPHIR_CALL_METHOD(&_97$$75, &relation, "isthrough", NULL, 0); zephir_check_call_status(); if (!(zephir_is_true(&_97$$75))) { @@ -4980,13 +5006,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_check_call_status(); } if (zephir_array_isset_long(&sqlJoin, 0)) { - zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2644); + zephir_is_iterable(&sqlJoin, 0, "phalcon/Mvc/Model/Query.zep", 2649); if (Z_TYPE_P(&sqlJoin) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&sqlJoin), _98$$78) { ZEPHIR_INIT_NVAR(&sqlJoinItem); ZVAL_COPY(&sqlJoinItem, _98$$78); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2642); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "rewind", NULL, 0); @@ -4999,14 +5025,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) } ZEPHIR_CALL_METHOD(&sqlJoinItem, &sqlJoin, "current", NULL, 0); zephir_check_call_status(); - zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2642); + zephir_array_append(&sqlJoins, &sqlJoinItem, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2647); ZEPHIR_CALL_METHOD(NULL, &sqlJoin, "next", NULL, 0); zephir_check_call_status(); } } ZEPHIR_INIT_NVAR(&sqlJoinItem); } else { - zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2645); + zephir_array_append(&sqlJoins, &sqlJoin, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2650); } } else { ZEPHIR_INIT_NVAR(&_100$$82); @@ -5016,7 +5042,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) ZEPHIR_INIT_NVAR(&_101$$82); array_init(&_101$$82); zephir_array_update_string(&_100$$82, SL("conditions"), &_101$$82, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_100$$82, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2656); + zephir_array_append(&sqlJoins, &_100$$82, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2661); } } else { ZEPHIR_INIT_NVAR(&_102$$83); @@ -5027,7 +5053,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getJoins) zephir_create_array(&_103$$83, 1, 0); zephir_array_fast_append(&_103$$83, &preCondition); zephir_array_update_string(&_102$$83, SL("conditions"), &_103$$83, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoins, &_102$$83, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2667); + zephir_array_append(&sqlJoins, &_102$$83, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2672); } ZEPHIR_CALL_METHOD(NULL, &joinModels, "next", NULL, 0); zephir_check_call_status(); @@ -5157,7 +5183,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin) ZEPHIR_CALL_METHOD(&referencedModelName, relation, "getreferencedmodel", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&fields) == IS_ARRAY) { - zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 2789); + zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 2794); if (Z_TYPE_P(&fields) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _3$$3, _4$$3, _1$$3) { @@ -5177,12 +5203,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin) ZEPHIR_CONCAT_SVSVSV(&_7$$5, "The number of fields must be equal to the number of referenced fields in join ", &modelAlias, "-", &joinAlias, ", when preparing: ", &_6$$5); ZEPHIR_CALL_METHOD(NULL, &_5$$5, "__construct", &_8, 31, &_7$$5); zephir_check_call_status(); - zephir_throw_exception_debug(&_5$$5, "phalcon/Mvc/Model/Query.zep", 2756); + zephir_throw_exception_debug(&_5$$5, "phalcon/Mvc/Model/Query.zep", 2761); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&intermediateField); - zephir_array_fetch(&intermediateField, &intermediateFields, &position, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2762); + zephir_array_fetch(&intermediateField, &intermediateFields, &position, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2767); ZEPHIR_INIT_NVAR(&sqlEqualsJoinCondition); zephir_create_array(&sqlEqualsJoinCondition, 4, 0); add_assoc_stringl_ex(&sqlEqualsJoinCondition, SL("type"), SL("binary-op")); @@ -5225,12 +5251,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getMultiJoin) ZEPHIR_CONCAT_SVSVSV(&_15$$7, "The number of fields must be equal to the number of referenced fields in join ", &modelAlias, "-", &joinAlias, ", when preparing: ", &_14$$7); ZEPHIR_CALL_METHOD(NULL, &_13$$7, "__construct", &_8, 31, &_15$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_13$$7, "phalcon/Mvc/Model/Query.zep", 2756); + zephir_throw_exception_debug(&_13$$7, "phalcon/Mvc/Model/Query.zep", 2761); ZEPHIR_MM_RESTORE(); return; } ZEPHIR_OBS_NVAR(&intermediateField); - zephir_array_fetch(&intermediateField, &intermediateFields, &position, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2762); + zephir_array_fetch(&intermediateField, &intermediateFields, &position, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2767); ZEPHIR_INIT_NVAR(&_16$$6); zephir_create_array(&_16$$6, 4, 0); add_assoc_stringl_ex(&_16$$6, SL("type"), SL("binary-op")); @@ -5382,13 +5408,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getOrderClause) } ZEPHIR_INIT_VAR(&orderParts); array_init(&orderParts); - zephir_is_iterable(&orderColumns, 0, "phalcon/Mvc/Model/Query.zep", 2898); + zephir_is_iterable(&orderColumns, 0, "phalcon/Mvc/Model/Query.zep", 2903); if (Z_TYPE_P(&orderColumns) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&orderColumns), _0) { ZEPHIR_INIT_NVAR(&orderItem); ZVAL_COPY(&orderItem, _0); - zephir_array_fetch_string(&_2$$5, &orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2880); + zephir_array_fetch_string(&_2$$5, &orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2885); ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "getexpression", &_3, 0, &_2$$5); zephir_check_call_status(); if (zephir_array_isset_string_fetch(&orderSort, &orderItem, SL("sort"), 1)) { @@ -5414,7 +5440,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getOrderClause) zephir_array_fast_append(&_7$$9, &orderPartExpr); ZEPHIR_CPY_WRT(&orderPartSort, &_7$$9); } - zephir_array_append(&orderParts, &orderPartSort, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2895); + zephir_array_append(&orderParts, &orderPartSort, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2900); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &orderColumns, "rewind", NULL, 0); @@ -5427,7 +5453,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getOrderClause) } ZEPHIR_CALL_METHOD(&orderItem, &orderColumns, "current", NULL, 0); zephir_check_call_status(); - zephir_array_fetch_string(&_8$$10, &orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2880); + zephir_array_fetch_string(&_8$$10, &orderItem, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2885); ZEPHIR_CALL_METHOD(&orderPartExpr, this_ptr, "getexpression", &_3, 0, &_8$$10); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&orderSort); @@ -5455,7 +5481,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getOrderClause) zephir_array_fast_append(&_13$$14, &orderPartExpr); ZEPHIR_CPY_WRT(&orderPartSort, &_13$$14); } - zephir_array_append(&orderParts, &orderPartSort, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2895); + zephir_array_append(&orderParts, &orderPartSort, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 2900); ZEPHIR_CALL_METHOD(NULL, &orderColumns, "next", NULL, 0); zephir_check_call_status(); } @@ -5543,13 +5569,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_OBS_VAR(&columnName); - zephir_array_fetch_string(&columnName, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2912); + zephir_array_fetch_string(&columnName, &expr, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 2917); zephir_read_property(&_0, this_ptr, ZEND_STRL("nestingLevel"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&nestingLevel, &_0); zephir_read_property(&_0, this_ptr, ZEND_STRL("sqlColumnAliases"), PH_NOISY_CC | PH_READONLY); if (zephir_array_isset(&_0, &nestingLevel)) { zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("sqlColumnAliases"), PH_NOISY_CC | PH_READONLY); - zephir_array_fetch(&_2$$3, &_1$$3, &nestingLevel, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2920); + zephir_array_fetch(&_2$$3, &_1$$3, &nestingLevel, PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2925); ZEPHIR_CPY_WRT(&sqlColumnAliases, &_2$$3); } else { ZEPHIR_INIT_NVAR(&sqlColumnAliases); @@ -5559,7 +5585,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) if (_3) { _4 = !(zephir_array_isset_string(&expr, SL("domain"))); if (!(_4)) { - zephir_array_fetch_string(&_5, &expr, SL("domain"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2925); + zephir_array_fetch_string(&_5, &expr, SL("domain"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 2930); _4 = ZEPHIR_IS_EMPTY(&_5); } _3 = _4; @@ -5585,7 +5611,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_10$$7, "Unknown model or alias '", &columnDomain, "' (11), when preparing: ", &_9$$7); ZEPHIR_CALL_METHOD(NULL, &_8$$7, "__construct", NULL, 31, &_10$$7); zephir_check_call_status(); - zephir_throw_exception_debug(&_8$$7, "phalcon/Mvc/Model/Query.zep", 2946); + zephir_throw_exception_debug(&_8$$7, "phalcon/Mvc/Model/Query.zep", 2951); ZEPHIR_MM_RESTORE(); return; } @@ -5601,7 +5627,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_14$$9, "There is no model related to model or alias '", &columnDomain, "', when executing: ", &_13$$9); ZEPHIR_CALL_METHOD(NULL, &_12$$9, "__construct", NULL, 31, &_14$$9); zephir_check_call_status(); - zephir_throw_exception_debug(&_12$$9, "phalcon/Mvc/Model/Query.zep", 2965); + zephir_throw_exception_debug(&_12$$9, "phalcon/Mvc/Model/Query.zep", 2970); ZEPHIR_MM_RESTORE(); return; } @@ -5621,7 +5647,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSVSV(&_17$$12, "Column '", &columnName, "' doesn't belong to the model or alias '", &columnDomain, "', when executing: ", &_16$$12); ZEPHIR_CALL_METHOD(NULL, &_15$$12, "__construct", NULL, 31, &_17$$12); zephir_check_call_status(); - zephir_throw_exception_debug(&_15$$12, "phalcon/Mvc/Model/Query.zep", 2977); + zephir_throw_exception_debug(&_15$$12, "phalcon/Mvc/Model/Query.zep", 2982); ZEPHIR_MM_RESTORE(); return; } @@ -5633,7 +5659,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_INIT_VAR(&hasModel); ZVAL_BOOL(&hasModel, 0); zephir_read_property(&_18$$14, this_ptr, ZEND_STRL("modelsInstances"), PH_NOISY_CC | PH_READONLY); - zephir_is_iterable(&_18$$14, 0, "phalcon/Mvc/Model/Query.zep", 3011); + zephir_is_iterable(&_18$$14, 0, "phalcon/Mvc/Model/Query.zep", 3016); if (Z_TYPE_P(&_18$$14) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_18$$14), _19$$14) { @@ -5651,7 +5677,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_25$$17, "The column '", &columnName, "' is ambiguous, when preparing: ", &_24$$17); ZEPHIR_CALL_METHOD(NULL, &_23$$17, "__construct", NULL, 31, &_25$$17); zephir_check_call_status(); - zephir_throw_exception_debug(&_23$$17, "phalcon/Mvc/Model/Query.zep", 3000); + zephir_throw_exception_debug(&_23$$17, "phalcon/Mvc/Model/Query.zep", 3005); ZEPHIR_MM_RESTORE(); return; } @@ -5681,7 +5707,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_30$$20, "The column '", &columnName, "' is ambiguous, when preparing: ", &_29$$20); ZEPHIR_CALL_METHOD(NULL, &_28$$20, "__construct", NULL, 31, &_30$$20); zephir_check_call_status(); - zephir_throw_exception_debug(&_28$$20, "phalcon/Mvc/Model/Query.zep", 3000); + zephir_throw_exception_debug(&_28$$20, "phalcon/Mvc/Model/Query.zep", 3005); ZEPHIR_MM_RESTORE(); return; } @@ -5700,14 +5726,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_33$$21, "Column '", &columnName, "' doesn't belong to any of the selected models (1), when preparing: ", &_32$$21); ZEPHIR_CALL_METHOD(NULL, &_31$$21, "__construct", NULL, 31, &_33$$21); zephir_check_call_status(); - zephir_throw_exception_debug(&_31$$21, "phalcon/Mvc/Model/Query.zep", 3014); + zephir_throw_exception_debug(&_31$$21, "phalcon/Mvc/Model/Query.zep", 3019); ZEPHIR_MM_RESTORE(); return; } zephir_read_property(&_34$$14, this_ptr, ZEND_STRL("models"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&models, &_34$$14); if (UNEXPECTED(Z_TYPE_P(&models) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The models list was not loaded correctly", "phalcon/Mvc/Model/Query.zep", 3025); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The models list was not loaded correctly", "phalcon/Mvc/Model/Query.zep", 3030); return; } ZEPHIR_INIT_VAR(&className); @@ -5721,7 +5747,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_37$$23, "Can't obtain model's source from models list: '", &className, "', when preparing: ", &_36$$23); ZEPHIR_CALL_METHOD(NULL, &_35$$23, "__construct", NULL, 31, &_37$$23); zephir_check_call_status(); - zephir_throw_exception_debug(&_35$$23, "phalcon/Mvc/Model/Query.zep", 3036); + zephir_throw_exception_debug(&_35$$23, "phalcon/Mvc/Model/Query.zep", 3041); ZEPHIR_MM_RESTORE(); return; } @@ -5742,7 +5768,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getQualified) ZEPHIR_CONCAT_SVSV(&_40$$27, "Column '", &columnName, "' doesn't belong to any of the selected models (3), when preparing: ", &_39$$27); ZEPHIR_CALL_METHOD(NULL, &_38$$27, "__construct", NULL, 31, &_40$$27); zephir_check_call_status(); - zephir_throw_exception_debug(&_38$$27, "phalcon/Mvc/Model/Query.zep", 3055); + zephir_throw_exception_debug(&_38$$27, "phalcon/Mvc/Model/Query.zep", 3060); ZEPHIR_MM_RESTORE(); return; } @@ -5828,7 +5854,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getReadConnection) ZEPHIR_CALL_METHOD(&connection, model, "selectreadconnection", NULL, 0, &intermediate, &bindParams, &bindTypes); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&connection) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "selectReadConnection did not return a connection", "phalcon/Mvc/Model/Query.zep", 3099); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "selectReadConnection did not return a connection", "phalcon/Mvc/Model/Query.zep", 3104); return; } RETURN_CCTOR(&connection); @@ -5900,10 +5926,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getRelatedRecords) zephir_array_fast_append(&_0, &_1); zephir_array_update_string(&selectIr, SL("columns"), &_0, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_VAR(&_4); - zephir_array_fetch_string(&_4, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3129); + zephir_array_fetch_string(&_4, &intermediate, SL("models"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3134); zephir_array_update_string(&selectIr, SL("models"), &_4, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_NVAR(&_4); - zephir_array_fetch_string(&_4, &intermediate, SL("tables"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3131); + zephir_array_fetch_string(&_4, &intermediate, SL("tables"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3136); zephir_array_update_string(&selectIr, SL("tables"), &_4, PH_COPY | PH_SEPARATE); ZEPHIR_OBS_VAR(&whereConditions); if (zephir_array_isset_string_fetch(&whereConditions, &intermediate, SL("where"), 0)) { @@ -5992,7 +6018,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) ZEPHIR_OBS_VAR(&columnType); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&columnType, &column, SL("type"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3171); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3176); return; } ZEPHIR_INIT_VAR(&sqlColumns); @@ -6001,7 +6027,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) zephir_array_isset_string_fetch(&eager, &column, SL("eager"), 0); if (ZEPHIR_IS_LONG(&columnType, 352)) { zephir_read_property(&_0$$4, this_ptr, ZEND_STRL("models"), PH_NOISY_CC | PH_READONLY); - zephir_is_iterable(&_0$$4, 0, "phalcon/Mvc/Model/Query.zep", 3201); + zephir_is_iterable(&_0$$4, 0, "phalcon/Mvc/Model/Query.zep", 3206); if (Z_TYPE_P(&_0$$4) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_0$$4), _3$$4, _4$$4, _1$$4) { @@ -6023,10 +6049,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) zephir_array_update_string(&sqlColumn, SL("balias"), &_5$$5, PH_COPY | PH_SEPARATE); if (Z_TYPE_P(&eager) != IS_NULL) { zephir_array_update_string(&sqlColumn, SL("eager"), &eager, PH_COPY | PH_SEPARATE); - zephir_array_fetch_string(&_7$$6, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3195); + zephir_array_fetch_string(&_7$$6, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3200); zephir_array_update_string(&sqlColumn, SL("eagerType"), &_7$$6, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3198); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3203); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &_0$$4, "rewind", NULL, 0); @@ -6052,10 +6078,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) ZEPHIR_CPY_WRT(&sqlColumn, &_8$$7); if (Z_TYPE_P(&eager) != IS_NULL) { zephir_array_update_string(&sqlColumn, SL("eager"), &eager, PH_COPY | PH_SEPARATE); - zephir_array_fetch_string(&_10$$8, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3195); + zephir_array_fetch_string(&_10$$8, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3200); zephir_array_update_string(&sqlColumn, SL("eagerType"), &_10$$8, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3198); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3203); ZEPHIR_CALL_METHOD(NULL, &_0$$4, "next", NULL, 0); zephir_check_call_status(); } @@ -6065,14 +6091,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) RETURN_CTOR(&sqlColumns); } if (UNEXPECTED(!(zephir_array_isset_string(&column, SL("column"))))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3205); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3210); return; } if (ZEPHIR_IS_LONG(&columnType, 353)) { zephir_read_property(&_11$$10, this_ptr, ZEND_STRL("sqlAliases"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&sqlAliases, &_11$$10); ZEPHIR_OBS_VAR(&columnDomain); - zephir_array_fetch_string(&columnDomain, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3217); + zephir_array_fetch_string(&columnDomain, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3222); ZEPHIR_OBS_NVAR(&source); if (UNEXPECTED(!(zephir_array_isset_fetch(&source, &sqlAliases, &columnDomain, 0)))) { ZEPHIR_INIT_VAR(&_12$$11); @@ -6082,7 +6108,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) ZEPHIR_CONCAT_SVSV(&_14$$11, "Unknown model or alias '", &columnDomain, "' (2), when preparing: ", &_13$$11); ZEPHIR_CALL_METHOD(NULL, &_12$$11, "__construct", NULL, 31, &_14$$11); zephir_check_call_status(); - zephir_throw_exception_debug(&_12$$11, "phalcon/Mvc/Model/Query.zep", 3222); + zephir_throw_exception_debug(&_12$$11, "phalcon/Mvc/Model/Query.zep", 3227); ZEPHIR_MM_RESTORE(); return; } @@ -6092,7 +6118,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) zephir_read_property(&_11$$10, this_ptr, ZEND_STRL("sqlAliasesModels"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&sqlAliasesModels, &_11$$10); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch(&modelName, &sqlAliasesModels, &columnDomain, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3236); + zephir_array_fetch(&modelName, &sqlAliasesModels, &columnDomain, PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3241); if (Z_TYPE_P(&preparedAlias) != IS_STRING) { if (ZEPHIR_IS_EQUAL(&columnDomain, &modelName)) { ZEPHIR_CALL_FUNCTION(&preparedAlias, "lcfirst", &_6, 104, &modelName); @@ -6110,10 +6136,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) ZEPHIR_CPY_WRT(&sqlColumn, &_15$$10); if (Z_TYPE_P(&eager) != IS_NULL) { zephir_array_update_string(&sqlColumn, SL("eager"), &eager, PH_COPY | PH_SEPARATE); - zephir_array_fetch_string(&_16$$15, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3263); + zephir_array_fetch_string(&_16$$15, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3268); zephir_array_update_string(&sqlColumn, SL("eagerType"), &_16$$15, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3266); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3271); RETURN_CTOR(&sqlColumns); } if (ZEPHIR_IS_LONG(&columnType, 354)) { @@ -6122,7 +6148,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) add_assoc_stringl_ex(&_17$$16, SL("type"), SL("scalar")); ZEPHIR_CPY_WRT(&sqlColumn, &_17$$16); ZEPHIR_OBS_VAR(&columnData); - zephir_array_fetch_string(&columnData, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3280); + zephir_array_fetch_string(&columnData, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3285); ZEPHIR_CALL_METHOD(&sqlExprColumn, this_ptr, "getexpression", NULL, 0, &columnData); zephir_check_call_status(); ZEPHIR_OBS_VAR(&balias); @@ -6132,11 +6158,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) } if (Z_TYPE_P(&eager) != IS_NULL) { zephir_array_update_string(&sqlColumn, SL("eager"), &eager, PH_COPY | PH_SEPARATE); - zephir_array_fetch_string(&_18$$18, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3293); + zephir_array_fetch_string(&_18$$18, &column, SL("eagerType"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3298); zephir_array_update_string(&sqlColumn, SL("eagerType"), &_18$$18, PH_COPY | PH_SEPARATE); } zephir_array_update_string(&sqlColumn, SL("column"), &sqlExprColumn, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3297); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3302); RETURN_CTOR(&sqlColumns); } ZEPHIR_INIT_VAR(&_19); @@ -6145,7 +6171,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSelectColumn) ZEPHIR_CONCAT_SV(&_20, "Unknown type of column ", &columnType); ZEPHIR_CALL_METHOD(NULL, &_19, "__construct", NULL, 31, &_20); zephir_check_call_status(); - zephir_throw_exception_debug(&_19, "phalcon/Mvc/Model/Query.zep", 3302); + zephir_throw_exception_debug(&_19, "phalcon/Mvc/Model/Query.zep", 3307); ZEPHIR_MM_RESTORE(); return; } @@ -6260,7 +6286,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) } else { ZEPHIR_INIT_VAR(&sqlJoinPartialConditions); array_init(&sqlJoinPartialConditions); - zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 3392); + zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 3397); if (Z_TYPE_P(&fields) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&fields), _7$$4, _8$$4, _5$$4) { @@ -6281,7 +6307,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) ZEPHIR_CONCAT_SVSVSV(&_11$$6, "The number of fields must be equal to the number of referenced fields in join ", &modelAlias, "-", &joinAlias, ", when preparing: ", &_10$$6); ZEPHIR_CALL_METHOD(NULL, &_9$$6, "__construct", &_12, 31, &_11$$6); zephir_check_call_status(); - zephir_throw_exception_debug(&_9$$6, "phalcon/Mvc/Model/Query.zep", 3364); + zephir_throw_exception_debug(&_9$$6, "phalcon/Mvc/Model/Query.zep", 3369); ZEPHIR_MM_RESTORE(); return; } @@ -6305,7 +6331,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) ZEPHIR_CALL_METHOD(&_14$$5, this_ptr, "getqualified", NULL, 0, &_16$$5); zephir_check_call_status(); zephir_array_update_string(&_13$$5, SL("right"), &_14$$5, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoinPartialConditions, &_13$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3389); + zephir_array_append(&sqlJoinPartialConditions, &_13$$5, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3394); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &fields, "rewind", NULL, 0); @@ -6329,7 +6355,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) ZEPHIR_CONCAT_SVSVSV(&_19$$8, "The number of fields must be equal to the number of referenced fields in join ", &modelAlias, "-", &joinAlias, ", when preparing: ", &_18$$8); ZEPHIR_CALL_METHOD(NULL, &_17$$8, "__construct", &_12, 31, &_19$$8); zephir_check_call_status(); - zephir_throw_exception_debug(&_17$$8, "phalcon/Mvc/Model/Query.zep", 3364); + zephir_throw_exception_debug(&_17$$8, "phalcon/Mvc/Model/Query.zep", 3369); ZEPHIR_MM_RESTORE(); return; } @@ -6353,7 +6379,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getSingleJoin) ZEPHIR_CALL_METHOD(&_21$$7, this_ptr, "getqualified", NULL, 0, &_23$$7); zephir_check_call_status(); zephir_array_update_string(&_20$$7, SL("right"), &_21$$7, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlJoinPartialConditions, &_20$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3389); + zephir_array_append(&sqlJoinPartialConditions, &_20$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3394); ZEPHIR_CALL_METHOD(NULL, &fields, "next", NULL, 0); zephir_check_call_status(); } @@ -6403,7 +6429,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getTable) ZEPHIR_OBS_VAR(&modelName); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&modelName, &qualifiedName, SL("name"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3414); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3419); return; } ZEPHIR_CALL_METHOD(&model, manager, "load", NULL, 0, &modelName); @@ -6491,7 +6517,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, getWriteConnection) ZEPHIR_CALL_METHOD(&connection, model, "selectwriteconnection", NULL, 0, &intermediate, &bindParams, &bindTypes); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&connection) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "selectWriteConnection did not return a connection", "phalcon/Mvc/Model/Query.zep", 3452); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "selectWriteConnection did not return a connection", "phalcon/Mvc/Model/Query.zep", 3457); return; } RETURN_CCTOR(&connection); @@ -6553,12 +6579,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete) ZEPHIR_CPY_WRT(&ast, &_0); ZEPHIR_OBS_VAR(&delete); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&delete, &ast, SL("delete"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted DELETE AST", "phalcon/Mvc/Model/Query.zep", 3474); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted DELETE AST", "phalcon/Mvc/Model/Query.zep", 3479); return; } ZEPHIR_OBS_VAR(&tables); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&tables, &delete, SL("tables"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted DELETE AST", "phalcon/Mvc/Model/Query.zep", 3478); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted DELETE AST", "phalcon/Mvc/Model/Query.zep", 3483); return; } ZEPHIR_INIT_VAR(&models); @@ -6582,16 +6608,16 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete) } zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&manager, &_0); - zephir_is_iterable(&deleteTables, 0, "phalcon/Mvc/Model/Query.zep", 3538); + zephir_is_iterable(&deleteTables, 0, "phalcon/Mvc/Model/Query.zep", 3543); if (Z_TYPE_P(&deleteTables) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&deleteTables), _1) { ZEPHIR_INIT_NVAR(&table); ZVAL_COPY(&table, _1); ZEPHIR_OBS_NVAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3502); + zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3507); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3503); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3508); ZEPHIR_CALL_METHOD(&model, &manager, "load", &_3, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0); @@ -6615,17 +6641,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete) ZEPHIR_OBS_NVAR(&alias); if (zephir_array_isset_string_fetch(&alias, &table, SL("alias"), 0)) { zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE); - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3520); - zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3521); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3525); + zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3526); zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&models, &alias, &modelName, PH_COPY | PH_SEPARATE); } else { zephir_array_update_zval(&sqlAliases, &modelName, &source, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliasesModelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3527); + zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3532); zephir_array_update_zval(&models, &modelName, &source, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3531); + zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3536); zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); } else { @@ -6640,9 +6666,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete) ZEPHIR_CALL_METHOD(&table, &deleteTables, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3502); + zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3507); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3503); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3508); ZEPHIR_CALL_METHOD(&model, &manager, "load", &_6, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0); @@ -6665,17 +6691,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareDelete) ZEPHIR_OBS_NVAR(&alias); if (zephir_array_isset_string_fetch(&alias, &table, SL("alias"), 0)) { zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE); - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3520); - zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3521); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3525); + zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3526); zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&models, &alias, &modelName, PH_COPY | PH_SEPARATE); } else { zephir_array_update_zval(&sqlAliases, &modelName, &source, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliasesModelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3527); + zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3532); zephir_array_update_zval(&models, &modelName, &source, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3531); + zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3536); zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &deleteTables, "next", NULL, 0); zephir_check_call_status(); @@ -6763,23 +6789,23 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) zephir_read_property(&_0, this_ptr, ZEND_STRL("ast"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&ast, &_0); if (UNEXPECTED(!(zephir_array_isset_string(&ast, SL("qualifiedName"))))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3572); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3577); return; } if (UNEXPECTED(!(zephir_array_isset_string(&ast, SL("values"))))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3576); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3581); return; } ZEPHIR_OBS_VAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &ast, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3579); + zephir_array_fetch_string(&qualifiedName, &ast, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3584); if (UNEXPECTED(!(zephir_array_isset_string(&qualifiedName, SL("name"))))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3583); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted INSERT AST", "phalcon/Mvc/Model/Query.zep", 3588); return; } zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&manager, &_0); ZEPHIR_OBS_VAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3587); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3592); ZEPHIR_CALL_METHOD(&model, &manager, "load", NULL, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0); @@ -6796,8 +6822,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) notQuoting = 0; ZEPHIR_INIT_VAR(&exprValues); array_init(&exprValues); - zephir_array_fetch_string(&_2, &ast, SL("values"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3600); - zephir_is_iterable(&_2, 0, "phalcon/Mvc/Model/Query.zep", 3608); + zephir_array_fetch_string(&_2, &ast, SL("values"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3605); + zephir_is_iterable(&_2, 0, "phalcon/Mvc/Model/Query.zep", 3613); if (Z_TYPE_P(&_2) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_2), _3) { @@ -6806,7 +6832,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_INIT_NVAR(&_5$$7); zephir_create_array(&_5$$7, 2, 0); ZEPHIR_OBS_NVAR(&_6$$7); - zephir_array_fetch_string(&_6$$7, &exprValue, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3603); + zephir_array_fetch_string(&_6$$7, &exprValue, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3608); zephir_array_update_string(&_5$$7, SL("type"), &_6$$7, PH_COPY | PH_SEPARATE); if (notQuoting) { ZVAL_BOOL(&_8$$7, 1); @@ -6816,7 +6842,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_CALL_METHOD(&_7$$7, this_ptr, "getexpression", &_9, 0, &exprValue, &_8$$7); zephir_check_call_status(); zephir_array_update_string(&_5$$7, SL("value"), &_7$$7, PH_COPY | PH_SEPARATE); - zephir_array_append(&exprValues, &_5$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3605); + zephir_array_append(&exprValues, &_5$$7, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3610); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &_2, "rewind", NULL, 0); @@ -6832,7 +6858,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_INIT_NVAR(&_10$$8); zephir_create_array(&_10$$8, 2, 0); ZEPHIR_OBS_NVAR(&_11$$8); - zephir_array_fetch_string(&_11$$8, &exprValue, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3603); + zephir_array_fetch_string(&_11$$8, &exprValue, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3608); zephir_array_update_string(&_10$$8, SL("type"), &_11$$8, PH_COPY | PH_SEPARATE); if (notQuoting) { ZVAL_BOOL(&_13$$8, 1); @@ -6842,7 +6868,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_CALL_METHOD(&_12$$8, this_ptr, "getexpression", &_9, 0, &exprValue, &_13$$8); zephir_check_call_status(); zephir_array_update_string(&_10$$8, SL("value"), &_12$$8, PH_COPY | PH_SEPARATE); - zephir_array_append(&exprValues, &_10$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3605); + zephir_array_append(&exprValues, &_10$$8, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3610); ZEPHIR_CALL_METHOD(NULL, &_2, "next", NULL, 0); zephir_check_call_status(); } @@ -6858,14 +6884,14 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) if (zephir_array_isset_string_fetch(&fields, &ast, SL("fields"), 0)) { ZEPHIR_INIT_VAR(&sqlFields); array_init(&sqlFields); - zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 3632); + zephir_is_iterable(&fields, 0, "phalcon/Mvc/Model/Query.zep", 3637); if (Z_TYPE_P(&fields) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&fields), _14$$9) { ZEPHIR_INIT_NVAR(&field); ZVAL_COPY(&field, _14$$9); ZEPHIR_OBS_NVAR(&name); - zephir_array_fetch_string(&name, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3619); + zephir_array_fetch_string(&name, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3624); ZEPHIR_CALL_METHOD(&_16$$10, &metaData, "hasattribute", &_17, 0, &model, &name); zephir_check_call_status(); if (UNEXPECTED(!zephir_is_true(&_16$$10))) { @@ -6876,11 +6902,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_CONCAT_SVSVSV(&_20$$11, "The model '", &modelName, "' doesn't have the attribute '", &name, "', when preparing: ", &_19$$11); ZEPHIR_CALL_METHOD(NULL, &_18$$11, "__construct", &_21, 31, &_20$$11); zephir_check_call_status(); - zephir_throw_exception_debug(&_18$$11, "phalcon/Mvc/Model/Query.zep", 3625); + zephir_throw_exception_debug(&_18$$11, "phalcon/Mvc/Model/Query.zep", 3630); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&sqlFields, &name, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3629); + zephir_array_append(&sqlFields, &name, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3634); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &fields, "rewind", NULL, 0); @@ -6894,7 +6920,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_CALL_METHOD(&field, &fields, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&name); - zephir_array_fetch_string(&name, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3619); + zephir_array_fetch_string(&name, &field, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3624); ZEPHIR_CALL_METHOD(&_22$$12, &metaData, "hasattribute", &_23, 0, &model, &name); zephir_check_call_status(); if (UNEXPECTED(!zephir_is_true(&_22$$12))) { @@ -6905,11 +6931,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareInsert) ZEPHIR_CONCAT_SVSVSV(&_26$$13, "The model '", &modelName, "' doesn't have the attribute '", &name, "', when preparing: ", &_25$$13); ZEPHIR_CALL_METHOD(NULL, &_24$$13, "__construct", &_21, 31, &_26$$13); zephir_check_call_status(); - zephir_throw_exception_debug(&_24$$13, "phalcon/Mvc/Model/Query.zep", 3625); + zephir_throw_exception_debug(&_24$$13, "phalcon/Mvc/Model/Query.zep", 3630); ZEPHIR_MM_RESTORE(); return; } - zephir_array_append(&sqlFields, &name, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3629); + zephir_array_append(&sqlFields, &name, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3634); ZEPHIR_CALL_METHOD(NULL, &fields, "next", NULL, 0); zephir_check_call_status(); } @@ -7115,12 +7141,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) } ZEPHIR_OBS_VAR(&tables); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&tables, &select, SL("tables"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3668); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3673); return; } ZEPHIR_OBS_VAR(&columns); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&columns, &select, SL("columns"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3672); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted SELECT AST", "phalcon/Mvc/Model/Query.zep", 3677); return; } RETURN_ON_FAILURE(zephir_property_incr(this_ptr, SL("nestingLevel"))); @@ -7161,26 +7187,26 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_read_property(&_1, this_ptr, ZEND_STRL("metaData"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&metaData, &_1); if (UNEXPECTED(Z_TYPE_P(&manager) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A models-manager is required to execute the query", "phalcon/Mvc/Model/Query.zep", 3739); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A models-manager is required to execute the query", "phalcon/Mvc/Model/Query.zep", 3744); return; } if (UNEXPECTED(Z_TYPE_P(&metaData) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A meta-data is required to execute the query", "phalcon/Mvc/Model/Query.zep", 3745); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "A meta-data is required to execute the query", "phalcon/Mvc/Model/Query.zep", 3750); return; } number = 0; ZEPHIR_INIT_VAR(&automaticJoins); array_init(&automaticJoins); - zephir_is_iterable(&selectedModels, 0, "phalcon/Mvc/Model/Query.zep", 3875); + zephir_is_iterable(&selectedModels, 0, "phalcon/Mvc/Model/Query.zep", 3880); if (Z_TYPE_P(&selectedModels) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&selectedModels), _2) { ZEPHIR_INIT_NVAR(&selectedModel); ZVAL_COPY(&selectedModel, _2); ZEPHIR_OBS_NVAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &selectedModel, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3753); + zephir_array_fetch_string(&qualifiedName, &selectedModel, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3758); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3754); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3759); ZEPHIR_CALL_METHOD(&model, &manager, "load", &_4, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&schema, &model, "getschema", NULL, 0); @@ -7205,7 +7231,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SVSV(&_7$$17, "Alias '", &alias, "' is used more than once, when preparing: ", &_6$$17); ZEPHIR_CALL_METHOD(NULL, &_5$$17, "__construct", &_8, 31, &_7$$17); zephir_check_call_status(); - zephir_throw_exception_debug(&_5$$17, "phalcon/Mvc/Model/Query.zep", 3779); + zephir_throw_exception_debug(&_5$$17, "phalcon/Mvc/Model/Query.zep", 3784); ZEPHIR_MM_RESTORE(); return; } @@ -7214,7 +7240,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_array_update_zval(&sqlModelsAliases, &modelName, &alias, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE); if (Z_TYPE_P(&completeSource) == IS_ARRAY) { - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3791); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3796); } else { ZEPHIR_INIT_NVAR(&_9$$19); zephir_create_array(&_9$$19, 3, 0); @@ -7241,7 +7267,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) } else { ZEPHIR_CPY_WRT(&withs, &with); } - zephir_is_iterable(&withs, 0, "phalcon/Mvc/Model/Query.zep", 3867); + zephir_is_iterable(&withs, 0, "phalcon/Mvc/Model/Query.zep", 3872); if (Z_TYPE_P(&withs) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&withs), _10$$21) { @@ -7253,7 +7279,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_13$$24, "AA", &_12$$24); ZEPHIR_CPY_WRT(&joinAlias, &_13$$24); ZEPHIR_OBS_NVAR(&relationModel); - zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3817); + zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3822); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_14, 0, &modelName, &relationModel); zephir_check_call_status(); if (Z_TYPE_P(&relation) == IS_OBJECT) { @@ -7276,7 +7302,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SVSVSV(&_19$$27, "Can't find a relationship between '", &modelName, "' and '", &relationModel, "' when preparing: ", &_18$$27); ZEPHIR_CALL_METHOD(NULL, &_17$$27, "__construct", &_8, 31, &_19$$27); zephir_check_call_status(); - zephir_throw_exception_debug(&_17$$27, "phalcon/Mvc/Model/Query.zep", 3837); + zephir_throw_exception_debug(&_17$$27, "phalcon/Mvc/Model/Query.zep", 3842); ZEPHIR_MM_RESTORE(); return; } @@ -7296,7 +7322,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_array_update_string(&_21$$24, SL("eager"), &alias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_21$$24, SL("eagerType"), &eagerType, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_21$$24, SL("balias"), &bestAlias, PH_COPY | PH_SEPARATE); - zephir_array_append(&selectColumns, &_21$$24, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3851); + zephir_array_append(&selectColumns, &_21$$24, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3856); ZEPHIR_INIT_NVAR(&_22$$24); zephir_create_array(&_22$$24, 3, 0); add_assoc_long_ex(&_22$$24, SL("type"), 360); @@ -7310,7 +7336,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) add_assoc_long_ex(&_23$$24, SL("type"), 355); zephir_array_update_string(&_23$$24, SL("name"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_22$$24, SL("alias"), &_23$$24, PH_COPY | PH_SEPARATE); - zephir_array_append(&automaticJoins, &_22$$24, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3863); + zephir_array_append(&automaticJoins, &_22$$24, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3868); number++; } ZEND_HASH_FOREACH_END(); } else { @@ -7330,7 +7356,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_25$$28, "AA", &_24$$28); ZEPHIR_CPY_WRT(&joinAlias, &_25$$28); ZEPHIR_OBS_NVAR(&relationModel); - zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3817); + zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3822); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_26, 0, &modelName, &relationModel); zephir_check_call_status(); if (Z_TYPE_P(&relation) == IS_OBJECT) { @@ -7353,7 +7379,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SVSVSV(&_31$$31, "Can't find a relationship between '", &modelName, "' and '", &relationModel, "' when preparing: ", &_30$$31); ZEPHIR_CALL_METHOD(NULL, &_29$$31, "__construct", &_8, 31, &_31$$31); zephir_check_call_status(); - zephir_throw_exception_debug(&_29$$31, "phalcon/Mvc/Model/Query.zep", 3837); + zephir_throw_exception_debug(&_29$$31, "phalcon/Mvc/Model/Query.zep", 3842); ZEPHIR_MM_RESTORE(); return; } @@ -7373,7 +7399,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_array_update_string(&_33$$28, SL("eager"), &alias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_33$$28, SL("eagerType"), &eagerType, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_33$$28, SL("balias"), &bestAlias, PH_COPY | PH_SEPARATE); - zephir_array_append(&selectColumns, &_33$$28, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3851); + zephir_array_append(&selectColumns, &_33$$28, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3856); ZEPHIR_INIT_NVAR(&_34$$28); zephir_create_array(&_34$$28, 3, 0); add_assoc_long_ex(&_34$$28, SL("type"), 360); @@ -7387,7 +7413,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) add_assoc_long_ex(&_35$$28, SL("type"), 355); zephir_array_update_string(&_35$$28, SL("name"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_34$$28, SL("alias"), &_35$$28, PH_COPY | PH_SEPARATE); - zephir_array_append(&automaticJoins, &_34$$28, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3863); + zephir_array_append(&automaticJoins, &_34$$28, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3868); number++; ZEPHIR_CALL_METHOD(NULL, &withs, "next", NULL, 0); zephir_check_call_status(); @@ -7395,8 +7421,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) } ZEPHIR_INIT_NVAR(&withItem); } - zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3869); - zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3870); + zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3874); + zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3875); zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); } else { @@ -7411,9 +7437,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CALL_METHOD(&selectedModel, &selectedModels, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &selectedModel, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3753); + zephir_array_fetch_string(&qualifiedName, &selectedModel, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3758); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3754); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3759); ZEPHIR_CALL_METHOD(&model, &manager, "load", &_36, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&schema, &model, "getschema", NULL, 0); @@ -7439,7 +7465,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SVSV(&_40$$36, "Alias '", &alias, "' is used more than once, when preparing: ", &_39$$36); ZEPHIR_CALL_METHOD(NULL, &_38$$36, "__construct", &_8, 31, &_40$$36); zephir_check_call_status(); - zephir_throw_exception_debug(&_38$$36, "phalcon/Mvc/Model/Query.zep", 3779); + zephir_throw_exception_debug(&_38$$36, "phalcon/Mvc/Model/Query.zep", 3784); ZEPHIR_MM_RESTORE(); return; } @@ -7448,7 +7474,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_array_update_zval(&sqlModelsAliases, &modelName, &alias, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE); if (Z_TYPE_P(&completeSource) == IS_ARRAY) { - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3791); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3796); } else { ZEPHIR_INIT_NVAR(&_41$$38); zephir_create_array(&_41$$38, 3, 0); @@ -7476,7 +7502,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) } else { ZEPHIR_CPY_WRT(&withs, &with); } - zephir_is_iterable(&withs, 0, "phalcon/Mvc/Model/Query.zep", 3867); + zephir_is_iterable(&withs, 0, "phalcon/Mvc/Model/Query.zep", 3872); if (Z_TYPE_P(&withs) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&withs), _43$$40) { @@ -7488,7 +7514,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_46$$43, "AA", &_45$$43); ZEPHIR_CPY_WRT(&joinAlias, &_46$$43); ZEPHIR_OBS_NVAR(&relationModel); - zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3817); + zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3822); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_47, 0, &modelName, &relationModel); zephir_check_call_status(); if (Z_TYPE_P(&relation) == IS_OBJECT) { @@ -7511,7 +7537,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SVSVSV(&_52$$46, "Can't find a relationship between '", &modelName, "' and '", &relationModel, "' when preparing: ", &_51$$46); ZEPHIR_CALL_METHOD(NULL, &_50$$46, "__construct", &_8, 31, &_52$$46); zephir_check_call_status(); - zephir_throw_exception_debug(&_50$$46, "phalcon/Mvc/Model/Query.zep", 3837); + zephir_throw_exception_debug(&_50$$46, "phalcon/Mvc/Model/Query.zep", 3842); ZEPHIR_MM_RESTORE(); return; } @@ -7531,7 +7557,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_array_update_string(&_54$$43, SL("eager"), &alias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_54$$43, SL("eagerType"), &eagerType, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_54$$43, SL("balias"), &bestAlias, PH_COPY | PH_SEPARATE); - zephir_array_append(&selectColumns, &_54$$43, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3851); + zephir_array_append(&selectColumns, &_54$$43, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3856); ZEPHIR_INIT_NVAR(&_55$$43); zephir_create_array(&_55$$43, 3, 0); add_assoc_long_ex(&_55$$43, SL("type"), 360); @@ -7545,7 +7571,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) add_assoc_long_ex(&_56$$43, SL("type"), 355); zephir_array_update_string(&_56$$43, SL("name"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_55$$43, SL("alias"), &_56$$43, PH_COPY | PH_SEPARATE); - zephir_array_append(&automaticJoins, &_55$$43, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3863); + zephir_array_append(&automaticJoins, &_55$$43, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3868); number++; } ZEND_HASH_FOREACH_END(); } else { @@ -7565,7 +7591,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_58$$47, "AA", &_57$$47); ZEPHIR_CPY_WRT(&joinAlias, &_58$$47); ZEPHIR_OBS_NVAR(&relationModel); - zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3817); + zephir_array_fetch_string(&relationModel, &withItem, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 3822); ZEPHIR_CALL_METHOD(&relation, &manager, "getrelationbyalias", &_59, 0, &modelName, &relationModel); zephir_check_call_status(); if (Z_TYPE_P(&relation) == IS_OBJECT) { @@ -7588,7 +7614,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SVSVSV(&_64$$50, "Can't find a relationship between '", &modelName, "' and '", &relationModel, "' when preparing: ", &_63$$50); ZEPHIR_CALL_METHOD(NULL, &_62$$50, "__construct", &_8, 31, &_64$$50); zephir_check_call_status(); - zephir_throw_exception_debug(&_62$$50, "phalcon/Mvc/Model/Query.zep", 3837); + zephir_throw_exception_debug(&_62$$50, "phalcon/Mvc/Model/Query.zep", 3842); ZEPHIR_MM_RESTORE(); return; } @@ -7608,7 +7634,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_array_update_string(&_66$$47, SL("eager"), &alias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_66$$47, SL("eagerType"), &eagerType, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_66$$47, SL("balias"), &bestAlias, PH_COPY | PH_SEPARATE); - zephir_array_append(&selectColumns, &_66$$47, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3851); + zephir_array_append(&selectColumns, &_66$$47, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3856); ZEPHIR_INIT_NVAR(&_67$$47); zephir_create_array(&_67$$47, 3, 0); add_assoc_long_ex(&_67$$47, SL("type"), 360); @@ -7622,7 +7648,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) add_assoc_long_ex(&_68$$47, SL("type"), 355); zephir_array_update_string(&_68$$47, SL("name"), &joinAlias, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_67$$47, SL("alias"), &_68$$47, PH_COPY | PH_SEPARATE); - zephir_array_append(&automaticJoins, &_67$$47, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3863); + zephir_array_append(&automaticJoins, &_67$$47, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3868); number++; ZEPHIR_CALL_METHOD(NULL, &withs, "next", NULL, 0); zephir_check_call_status(); @@ -7630,8 +7656,8 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) } ZEPHIR_INIT_NVAR(&withItem); } - zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3869); - zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3870); + zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3874); + zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3875); zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &selectedModels, "next", NULL, 0); zephir_check_call_status(); @@ -7692,7 +7718,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_fast_array_merge(&_81$$55, &joins, &automaticJoins); zephir_array_update_string(&select, SL("joins"), &_81$$55, PH_COPY | PH_SEPARATE); } else { - zephir_array_append(&automaticJoins, &joins, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3906); + zephir_array_append(&automaticJoins, &joins, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3911); zephir_array_update_string(&select, SL("joins"), &automaticJoins, PH_COPY | PH_SEPARATE); } } @@ -7711,7 +7737,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) position = 0; ZEPHIR_INIT_VAR(&sqlColumnAliases); array_init(&sqlColumnAliases); - zephir_is_iterable(&selectColumns, 0, "phalcon/Mvc/Model/Query.zep", 3957); + zephir_is_iterable(&selectColumns, 0, "phalcon/Mvc/Model/Query.zep", 3962); if (Z_TYPE_P(&selectColumns) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&selectColumns), _82) { @@ -7719,7 +7745,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZVAL_COPY(&column, _82); ZEPHIR_CALL_METHOD(&_84$$60, this_ptr, "getselectcolumn", &_85, 0, &column); zephir_check_call_status(); - zephir_is_iterable(&_84$$60, 0, "phalcon/Mvc/Model/Query.zep", 3955); + zephir_is_iterable(&_84$$60, 0, "phalcon/Mvc/Model/Query.zep", 3960); if (Z_TYPE_P(&_84$$60) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_84$$60), _86$$60) { @@ -7736,7 +7762,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) if (zephir_array_isset_string_fetch(&alias, &sqlColumn, SL("balias"), 0)) { zephir_array_update_zval(&sqlColumns, &alias, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_string(&_88$$65, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3945); + zephir_array_fetch_string(&_88$$65, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3950); if (ZEPHIR_IS_STRING(&_88$$65, "scalar")) { ZEPHIR_INIT_NVAR(&_89$$66); ZVAL_LONG(&_89$$66, position); @@ -7744,7 +7770,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_90$$66, "_", &_89$$66); zephir_array_update_zval(&sqlColumns, &_90$$66, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3948); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3953); } } } @@ -7772,7 +7798,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) if (zephir_array_isset_string_fetch(&alias, &sqlColumn, SL("balias"), 0)) { zephir_array_update_zval(&sqlColumns, &alias, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_string(&_91$$72, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3945); + zephir_array_fetch_string(&_91$$72, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3950); if (ZEPHIR_IS_STRING(&_91$$72, "scalar")) { ZEPHIR_INIT_NVAR(&_92$$73); ZVAL_LONG(&_92$$73, position); @@ -7780,7 +7806,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_93$$73, "_", &_92$$73); zephir_array_update_zval(&sqlColumns, &_93$$73, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3948); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3953); } } } @@ -7804,7 +7830,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_94$$75, this_ptr, "getselectcolumn", &_85, 0, &column); zephir_check_call_status(); - zephir_is_iterable(&_94$$75, 0, "phalcon/Mvc/Model/Query.zep", 3955); + zephir_is_iterable(&_94$$75, 0, "phalcon/Mvc/Model/Query.zep", 3960); if (Z_TYPE_P(&_94$$75) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&_94$$75), _95$$75) { @@ -7821,7 +7847,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) if (zephir_array_isset_string_fetch(&alias, &sqlColumn, SL("balias"), 0)) { zephir_array_update_zval(&sqlColumns, &alias, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_string(&_97$$80, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3945); + zephir_array_fetch_string(&_97$$80, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3950); if (ZEPHIR_IS_STRING(&_97$$80, "scalar")) { ZEPHIR_INIT_NVAR(&_98$$81); ZVAL_LONG(&_98$$81, position); @@ -7829,7 +7855,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_99$$81, "_", &_98$$81); zephir_array_update_zval(&sqlColumns, &_99$$81, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3948); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3953); } } } @@ -7857,7 +7883,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) if (zephir_array_isset_string_fetch(&alias, &sqlColumn, SL("balias"), 0)) { zephir_array_update_zval(&sqlColumns, &alias, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_fetch_string(&_100$$87, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3945); + zephir_array_fetch_string(&_100$$87, &sqlColumn, SL("type"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 3950); if (ZEPHIR_IS_STRING(&_100$$87, "scalar")) { ZEPHIR_INIT_NVAR(&_101$$88); ZVAL_LONG(&_101$$88, position); @@ -7865,7 +7891,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareSelect) ZEPHIR_CONCAT_SV(&_102$$88, "_", &_101$$88); zephir_array_update_zval(&sqlColumns, &_102$$88, &sqlColumn, PH_COPY | PH_SEPARATE); } else { - zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3948); + zephir_array_append(&sqlColumns, &sqlColumn, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 3953); } } } @@ -8015,17 +8041,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_CPY_WRT(&ast, &_0); ZEPHIR_OBS_VAR(&update); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&update, &ast, SL("update"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4034); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4039); return; } ZEPHIR_OBS_VAR(&tables); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&tables, &update, SL("tables"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4038); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4043); return; } ZEPHIR_OBS_VAR(&values); if (UNEXPECTED(!(zephir_array_isset_string_fetch(&values, &update, SL("values"), 0)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4042); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Corrupted UPDATE AST", "phalcon/Mvc/Model/Query.zep", 4047); return; } ZEPHIR_INIT_VAR(&models); @@ -8049,16 +8075,16 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) } zephir_read_property(&_0, this_ptr, ZEND_STRL("manager"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&manager, &_0); - zephir_is_iterable(&updateTables, 0, "phalcon/Mvc/Model/Query.zep", 4108); + zephir_is_iterable(&updateTables, 0, "phalcon/Mvc/Model/Query.zep", 4113); if (Z_TYPE_P(&updateTables) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&updateTables), _1) { ZEPHIR_INIT_NVAR(&table); ZVAL_COPY(&table, _1); ZEPHIR_OBS_NVAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4066); + zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4071); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4067); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4072); ZEPHIR_CALL_METHOD(&model, &manager, "load", &_3, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0); @@ -8082,17 +8108,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_OBS_NVAR(&alias); if (zephir_array_isset_string_fetch(&alias, &table, SL("alias"), 0)) { zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE); - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4090); - zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4091); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4095); + zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4096); zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&models, &alias, &modelName, PH_COPY | PH_SEPARATE); } else { zephir_array_update_zval(&sqlAliases, &modelName, &source, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliasesModelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4097); + zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4102); zephir_array_update_zval(&models, &modelName, &source, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4101); + zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4106); zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); } else { @@ -8107,9 +8133,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_CALL_METHOD(&table, &updateTables, "current", NULL, 0); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&qualifiedName); - zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4066); + zephir_array_fetch_string(&qualifiedName, &table, SL("qualifiedName"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4071); ZEPHIR_OBS_NVAR(&modelName); - zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4067); + zephir_array_fetch_string(&modelName, &qualifiedName, SL("name"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4072); ZEPHIR_CALL_METHOD(&model, &manager, "load", &_6, 0, &modelName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&source, &model, "getsource", NULL, 0); @@ -8132,17 +8158,17 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_OBS_NVAR(&alias); if (zephir_array_isset_string_fetch(&alias, &table, SL("alias"), 0)) { zephir_array_update_zval(&sqlAliases, &alias, &alias, PH_COPY | PH_SEPARATE); - zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4090); - zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4091); + zephir_array_append(&completeSource, &alias, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4095); + zephir_array_append(&sqlTables, &completeSource, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4096); zephir_array_update_zval(&sqlAliasesModelsInstances, &alias, &model, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&models, &alias, &modelName, PH_COPY | PH_SEPARATE); } else { zephir_array_update_zval(&sqlAliases, &modelName, &source, PH_COPY | PH_SEPARATE); zephir_array_update_zval(&sqlAliasesModelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4097); + zephir_array_append(&sqlTables, &source, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4102); zephir_array_update_zval(&models, &modelName, &source, PH_COPY | PH_SEPARATE); } - zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4101); + zephir_array_append(&sqlModels, &modelName, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4106); zephir_array_update_zval(&modelsInstances, &modelName, &model, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &updateTables, "next", NULL, 0); zephir_check_call_status(); @@ -8165,13 +8191,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_CPY_WRT(&updateValues, &values); } notQuoting = 0; - zephir_is_iterable(&updateValues, 0, "phalcon/Mvc/Model/Query.zep", 4132); + zephir_is_iterable(&updateValues, 0, "phalcon/Mvc/Model/Query.zep", 4137); if (Z_TYPE_P(&updateValues) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&updateValues), _9) { ZEPHIR_INIT_NVAR(&updateValue); ZVAL_COPY(&updateValue, _9); - zephir_array_fetch_string(&_12$$20, &updateValue, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 4124); + zephir_array_fetch_string(&_12$$20, &updateValue, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 4129); if (notQuoting) { ZVAL_BOOL(&_13$$20, 1); } else { @@ -8179,13 +8205,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) } ZEPHIR_CALL_METHOD(&_11$$20, this_ptr, "getexpression", &_14, 0, &_12$$20, &_13$$20); zephir_check_call_status(); - zephir_array_append(&sqlFields, &_11$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4124); + zephir_array_append(&sqlFields, &_11$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4129); ZEPHIR_OBS_NVAR(&exprColumn); - zephir_array_fetch_string(&exprColumn, &updateValue, SL("expr"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4125); + zephir_array_fetch_string(&exprColumn, &updateValue, SL("expr"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4130); ZEPHIR_INIT_NVAR(&_15$$20); zephir_create_array(&_15$$20, 2, 0); ZEPHIR_OBS_NVAR(&_16$$20); - zephir_array_fetch_string(&_16$$20, &exprColumn, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4127); + zephir_array_fetch_string(&_16$$20, &exprColumn, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4132); zephir_array_update_string(&_15$$20, SL("type"), &_16$$20, PH_COPY | PH_SEPARATE); if (notQuoting) { ZVAL_BOOL(&_18$$20, 1); @@ -8195,7 +8221,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_CALL_METHOD(&_17$$20, this_ptr, "getexpression", &_14, 0, &exprColumn, &_18$$20); zephir_check_call_status(); zephir_array_update_string(&_15$$20, SL("value"), &_17$$20, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlValues, &_15$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4129); + zephir_array_append(&sqlValues, &_15$$20, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4134); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &updateValues, "rewind", NULL, 0); @@ -8208,7 +8234,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) } ZEPHIR_CALL_METHOD(&updateValue, &updateValues, "current", NULL, 0); zephir_check_call_status(); - zephir_array_fetch_string(&_20$$21, &updateValue, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 4124); + zephir_array_fetch_string(&_20$$21, &updateValue, SL("column"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Query.zep", 4129); if (notQuoting) { ZVAL_BOOL(&_21$$21, 1); } else { @@ -8216,13 +8242,13 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) } ZEPHIR_CALL_METHOD(&_19$$21, this_ptr, "getexpression", &_14, 0, &_20$$21, &_21$$21); zephir_check_call_status(); - zephir_array_append(&sqlFields, &_19$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4124); + zephir_array_append(&sqlFields, &_19$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4129); ZEPHIR_OBS_NVAR(&exprColumn); - zephir_array_fetch_string(&exprColumn, &updateValue, SL("expr"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4125); + zephir_array_fetch_string(&exprColumn, &updateValue, SL("expr"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4130); ZEPHIR_INIT_NVAR(&_22$$21); zephir_create_array(&_22$$21, 2, 0); ZEPHIR_OBS_NVAR(&_23$$21); - zephir_array_fetch_string(&_23$$21, &exprColumn, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4127); + zephir_array_fetch_string(&_23$$21, &exprColumn, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Query.zep", 4132); zephir_array_update_string(&_22$$21, SL("type"), &_23$$21, PH_COPY | PH_SEPARATE); if (notQuoting) { ZVAL_BOOL(&_25$$21, 1); @@ -8232,7 +8258,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query, _prepareUpdate) ZEPHIR_CALL_METHOD(&_24$$21, this_ptr, "getexpression", &_14, 0, &exprColumn, &_25$$21); zephir_check_call_status(); zephir_array_update_string(&_22$$21, SL("value"), &_24$$21, PH_COPY | PH_SEPARATE); - zephir_array_append(&sqlValues, &_22$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4129); + zephir_array_append(&sqlValues, &_22$$21, PH_SEPARATE, "phalcon/Mvc/Model/Query.zep", 4134); ZEPHIR_CALL_METHOD(NULL, &updateValues, "next", NULL, 0); zephir_check_call_status(); } diff --git a/ext/phalcon/mvc/model/query/builder.zep.c b/ext/phalcon/mvc/model/query/builder.zep.c index 76aeb2043e7..c63e3202599 100644 --- a/ext/phalcon/mvc/model/query/builder.zep.c +++ b/ext/phalcon/mvc/model/query/builder.zep.c @@ -2495,7 +2495,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, limit) ZVAL_LONG(&_0, limit); - ZEPHIR_CALL_FUNCTION(&_1, "abs", NULL, 304, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "abs", NULL, 305, &_0); zephir_check_call_status(); limit = zephir_get_numberval(&_1); if (UNEXPECTED(limit == 0)) { @@ -2506,7 +2506,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, limit) zephir_update_property_zval(this_ptr, ZEND_STRL("limit"), &_0); if (zephir_is_numeric(offset)) { ZVAL_LONG(&_2$$4, zephir_get_intval(offset)); - ZEPHIR_CALL_FUNCTION(&_3$$4, "abs", NULL, 304, &_2$$4); + ZEPHIR_CALL_FUNCTION(&_3$$4, "abs", NULL, 305, &_2$$4); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("offset"), &_3$$4); } @@ -3351,7 +3351,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, conditionBetween) object_init_ex(&_1$$3, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "Operator % is not available."); - ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 144, &_2$$3, &operator); + ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 145, &_2$$3, &operator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 31, &_3$$3); zephir_check_call_status(); @@ -3473,7 +3473,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, conditionIn) object_init_ex(&_1$$3, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "Operator % is not available."); - ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 144, &_2$$3, &operator); + ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 145, &_2$$3, &operator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 31, &_3$$3); zephir_check_call_status(); @@ -3634,7 +3634,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, conditionNotBetween) object_init_ex(&_1$$3, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "Operator % is not available."); - ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 144, &_2$$3, &operator); + ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 145, &_2$$3, &operator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 31, &_3$$3); zephir_check_call_status(); @@ -3756,7 +3756,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, conditionNotIn) object_init_ex(&_1$$3, phalcon_mvc_model_exception_ce); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "Operator % is not available."); - ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 144, &_2$$3, &operator); + ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 145, &_2$$3, &operator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 31, &_3$$3); zephir_check_call_status(); diff --git a/ext/phalcon/mvc/model/resultset.zep.c b/ext/phalcon/mvc/model/resultset.zep.c index 1fa1c514719..d3dee98b547 100644 --- a/ext/phalcon/mvc/model/resultset.zep.c +++ b/ext/phalcon/mvc/model/resultset.zep.c @@ -19,6 +19,7 @@ #include "kernel/operators.h" #include "kernel/fcall.h" #include "kernel/exception.h" +#include "kernel/concat.h" #include "kernel/array.h" #include "Zend/zend_closures.h" @@ -142,16 +143,16 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Model_Resultset) /** * Phalcon\Mvc\Model\Resultset constructor * - * @param ResultInterface|false result - * @param CacheInterface|null cache + * @param ResultInterface|false $result + * @param mixed|null $cache */ PHP_METHOD(Phalcon_Mvc_Model_Resultset, __construct) { - zend_bool _5; - zval _4; + zend_bool _11, _4$$4; + zval _10, _7$$5; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS, prefetchRecords = 0; - zval *result, result_sub, *cache = NULL, cache_sub, __$null, rowCount, rows, _2, _0$$3, _1$$3, _3$$5, _6$$8; + zval *result, result_sub, *cache = NULL, cache_sub, __$null, rowCount, rows, _8, _0$$3, _1$$3, _2$$4, _3$$4, _5$$4, _6$$5, _9$$6, _12$$9; zval *this_ptr = getThis(); ZVAL_UNDEF(&result_sub); @@ -159,18 +160,23 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset, __construct) ZVAL_NULL(&__$null); ZVAL_UNDEF(&rowCount); ZVAL_UNDEF(&rows); - ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_8); ZVAL_UNDEF(&_0$$3); ZVAL_UNDEF(&_1$$3); - ZVAL_UNDEF(&_3$$5); - ZVAL_UNDEF(&_6$$8); - ZVAL_UNDEF(&_4); + ZVAL_UNDEF(&_2$$4); + ZVAL_UNDEF(&_3$$4); + ZVAL_UNDEF(&_5$$4); + ZVAL_UNDEF(&_6$$5); + ZVAL_UNDEF(&_9$$6); + ZVAL_UNDEF(&_12$$9); + ZVAL_UNDEF(&_10); + ZVAL_UNDEF(&_7$$5); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 2) Z_PARAM_ZVAL(result) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(cache, zephir_get_internal_ce(SL("psr\\simplecache\\cacheinterface"))) + Z_PARAM_ZVAL_OR_NULL(cache) ZEND_PARSE_PARAMETERS_END(); #endif @@ -194,37 +200,60 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset, __construct) } zephir_update_property_zval(this_ptr, ZEND_STRL("result"), result); if (Z_TYPE_P(cache) != IS_NULL) { + ZEPHIR_INIT_VAR(&_2$$4); + ZVAL_STRING(&_2$$4, "Phalcon\\Cache\\CacheInterface"); + ZEPHIR_CALL_FUNCTION(&_3$$4, "is_a", NULL, 118, cache, &_2$$4); + zephir_check_call_status(); + _4$$4 = !ZEPHIR_IS_TRUE_IDENTICAL(&_3$$4); + if (_4$$4) { + ZEPHIR_INIT_NVAR(&_2$$4); + ZVAL_STRING(&_2$$4, "Psr\\SimpleCache\\CacheInterface"); + ZEPHIR_CALL_FUNCTION(&_5$$4, "is_a", NULL, 118, cache, &_2$$4); + zephir_check_call_status(); + _4$$4 = !ZEPHIR_IS_TRUE_IDENTICAL(&_5$$4); + } + if (UNEXPECTED(_4$$4)) { + ZEPHIR_INIT_VAR(&_6$$5); + object_init_ex(&_6$$5, phalcon_mvc_model_exception_ce); + ZEPHIR_INIT_VAR(&_7$$5); + ZEPHIR_CONCAT_SS(&_7$$5, "Cache service must be an object implementing ", "Phalcon\\Cache\\CacheInterface or Psr\\SimpleCache\\CacheInterface"); + ZEPHIR_CALL_METHOD(NULL, &_6$$5, "__construct", NULL, 31, &_7$$5); + zephir_check_call_status(); + zephir_throw_exception_debug(&_6$$5, "phalcon/Mvc/Model/Resultset.zep", 164); + ZEPHIR_MM_RESTORE(); + return; + } zephir_update_property_zval(this_ptr, ZEND_STRL("cache"), cache); } - ZVAL_LONG(&_2, 2); - ZEPHIR_CALL_METHOD(NULL, result, "setfetchmode", NULL, 0, &_2); + ZVAL_LONG(&_8, 2); + ZEPHIR_CALL_METHOD(NULL, result, "setfetchmode", NULL, 0, &_8); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&rowCount, result, "numrows", NULL, 0); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("count"), &rowCount); if (ZEPHIR_IS_LONG(&rowCount, 0)) { - ZEPHIR_INIT_VAR(&_3$$5); - array_init(&_3$$5); - zephir_update_property_zval(this_ptr, ZEND_STRL("rows"), &_3$$5); + ZEPHIR_INIT_VAR(&_9$$6); + array_init(&_9$$6); + zephir_update_property_zval(this_ptr, ZEND_STRL("rows"), &_9$$6); RETURN_MM_NULL(); } - ZEPHIR_INIT_VAR(&_4); - ZEPHIR_INIT_NVAR(&_4); - ZVAL_STRING(&_4, "ZEPHIR_GLOBAL(orm).resultset_prefetch_records"); - prefetchRecords = zephir_get_intval_ex(&_4); - _5 = prefetchRecords > 0; - if (_5) { - _5 = ZEPHIR_LE_LONG(&rowCount, prefetchRecords); + ZEPHIR_INIT_VAR(&_10); + ZEPHIR_INIT_NVAR(&_10); + ZVAL_STRING(&_10, "ZEPHIR_GLOBAL(orm).resultset_prefetch_records"); + prefetchRecords = zephir_get_intval_ex(&_10); + _11 = prefetchRecords > 0; + if (_11) { + _11 = ZEPHIR_LE_LONG(&rowCount, prefetchRecords); } - if (_5) { + if (_11) { ZEPHIR_CALL_METHOD(&rows, result, "fetchall", NULL, 0); zephir_check_call_status(); if (Z_TYPE_P(&rows) == IS_ARRAY) { zephir_update_property_zval(this_ptr, ZEND_STRL("rows"), &rows); } else { - ZEPHIR_INIT_VAR(&_6$$8); - array_init(&_6$$8); - zephir_update_property_zval(this_ptr, ZEND_STRL("rows"), &_6$$8); + ZEPHIR_INIT_VAR(&_12$$9); + array_init(&_12$$9); + zephir_update_property_zval(this_ptr, ZEND_STRL("rows"), &_12$$9); } } ZEPHIR_MM_RESTORE(); @@ -285,7 +314,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset, delete) ZVAL_NULL(&connection); result = 1; transaction = 0; - ZEPHIR_CALL_METHOD(NULL, this_ptr, "rewind", NULL, 118); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "rewind", NULL, 119); zephir_check_call_status(); while (1) { ZEPHIR_CALL_METHOD(&_0, this_ptr, "valid", &_1, 0); @@ -297,7 +326,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset, delete) zephir_check_call_status(); if (transaction == 0) { if (UNEXPECTED(!((zephir_method_exists_ex(&record, ZEND_STRL("getwriteconnection")) == SUCCESS)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The returned record is not valid", "phalcon/Mvc/Model/Resultset.zep", 228); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The returned record is not valid", "phalcon/Mvc/Model/Resultset.zep", 238); return; } ZEPHIR_CALL_METHOD(&connection, &record, "getwriteconnection", NULL, 0); @@ -384,7 +413,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset, filter) ZEPHIR_INIT_VAR(&records); array_init(&records); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "rewind", NULL, 118); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "rewind", NULL, 119); zephir_check_call_status(); while (1) { ZEPHIR_CALL_METHOD(&_0, this_ptr, "valid", &_1, 0); @@ -409,7 +438,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset, filter) zephir_check_call_status(); continue; } - zephir_array_append(&records, &processedRecord, PH_SEPARATE, "phalcon/Mvc/Model/Resultset.zep", 322); + zephir_array_append(&records, &processedRecord, PH_SEPARATE, "phalcon/Mvc/Model/Resultset.zep", 332); ZEPHIR_CALL_METHOD(NULL, this_ptr, "next", &_5, 0); zephir_check_call_status(); } @@ -471,7 +500,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset, getFirst) RETURN_MM_NULL(); } ZVAL_LONG(&_1, 0); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "seek", NULL, 119, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "seek", NULL, 120, &_1); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "current", NULL, 0); zephir_check_call_status(); @@ -512,7 +541,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset, getLast) RETURN_MM_NULL(); } ZVAL_LONG(&_0, (zephir_get_numberval(&count) - 1)); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "seek", NULL, 119, &_0); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "seek", NULL, 120, &_0); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "current", NULL, 0); zephir_check_call_status(); @@ -599,7 +628,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset, jsonSerialize) ZEPHIR_INIT_VAR(&records); array_init(&records); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "rewind", NULL, 118); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "rewind", NULL, 119); zephir_check_call_status(); while (1) { ZEPHIR_CALL_METHOD(&_0, this_ptr, "valid", &_1, 0); @@ -616,9 +645,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset, jsonSerialize) if (_3$$3) { ZEPHIR_CALL_METHOD(&_4$$4, ¤t, "jsonserialize", NULL, 0); zephir_check_call_status(); - zephir_array_append(&records, &_4$$4, PH_SEPARATE, "phalcon/Mvc/Model/Resultset.zep", 447); + zephir_array_append(&records, &_4$$4, PH_SEPARATE, "phalcon/Mvc/Model/Resultset.zep", 457); } else { - zephir_array_append(&records, ¤t, PH_SEPARATE, "phalcon/Mvc/Model/Resultset.zep", 449); + zephir_array_append(&records, ¤t, PH_SEPARATE, "phalcon/Mvc/Model/Resultset.zep", 459); } ZEPHIR_CALL_METHOD(NULL, this_ptr, "next", &_5, 0); zephir_check_call_status(); @@ -667,7 +696,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset, next) zephir_read_property(&_0, this_ptr, ZEND_STRL("pointer"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_1, (zephir_get_numberval(&_0) + 1)); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "seek", NULL, 119, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "seek", NULL, 120, &_1); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -698,10 +727,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset, offsetGet) zephir_read_property(&_0, this_ptr, ZEND_STRL("count"), PH_NOISY_CC | PH_READONLY); if (UNEXPECTED(ZEPHIR_GE(index, &_0))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The index does not exist in the cursor", "phalcon/Mvc/Model/Resultset.zep", 487); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The index does not exist in the cursor", "phalcon/Mvc/Model/Resultset.zep", 497); return; } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "seek", NULL, 119, index); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "seek", NULL, 120, index); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "current", NULL, 0); zephir_check_call_status(); @@ -758,7 +787,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset, offsetSet) zephir_fetch_params_without_memory_grow(2, 0, &index, &value); - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_model_exception_ce, "Cursor is an immutable ArrayAccess object", "phalcon/Mvc/Model/Resultset.zep", 514); + ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_model_exception_ce, "Cursor is an immutable ArrayAccess object", "phalcon/Mvc/Model/Resultset.zep", 524); return; } @@ -782,7 +811,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset, offsetUnset) zephir_fetch_params_without_memory_grow(1, 0, &offset); - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_model_exception_ce, "Cursor is an immutable ArrayAccess object", "phalcon/Mvc/Model/Resultset.zep", 522); + ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_mvc_model_exception_ce, "Cursor is an immutable ArrayAccess object", "phalcon/Mvc/Model/Resultset.zep", 532); return; } @@ -802,7 +831,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset, rewind) ZEPHIR_MM_GROW(); ZVAL_LONG(&_0, 0); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "seek", NULL, 119, &_0); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "seek", NULL, 120, &_0); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -1009,7 +1038,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset, update) ZEPHIR_INIT_VAR(&connection); ZVAL_NULL(&connection); transaction = 0; - ZEPHIR_CALL_METHOD(NULL, this_ptr, "rewind", NULL, 118); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "rewind", NULL, 119); zephir_check_call_status(); while (1) { ZEPHIR_CALL_METHOD(&_0, this_ptr, "valid", &_1, 0); @@ -1021,7 +1050,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset, update) zephir_check_call_status(); if (transaction == 0) { if (UNEXPECTED(!((zephir_method_exists_ex(&record, ZEND_STRL("getwriteconnection")) == SUCCESS)))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The returned record is not valid", "phalcon/Mvc/Model/Resultset.zep", 639); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The returned record is not valid", "phalcon/Mvc/Model/Resultset.zep", 649); return; } ZEPHIR_CALL_METHOD(&connection, &record, "getwriteconnection", NULL, 0); diff --git a/ext/phalcon/mvc/model/resultset.zep.h b/ext/phalcon/mvc/model/resultset.zep.h index a470ea84a3b..8503fcff940 100644 --- a/ext/phalcon/mvc/model/resultset.zep.h +++ b/ext/phalcon/mvc/model/resultset.zep.h @@ -31,7 +31,7 @@ zend_object *zephir_init_properties_Phalcon_Mvc_Model_Resultset(zend_class_entry ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_resultset___construct, 0, 0, 1) ZEND_ARG_INFO(0, result) - ZEND_ARG_OBJ_INFO(0, cache, Psr\\SimpleCache\\CacheInterface, 1) + ZEND_ARG_INFO(0, cache) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_count, 0, 0, IS_LONG, 0) @@ -45,7 +45,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultset_filt ZEND_ARG_INFO(0, filter) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_model_resultset_getcache, 0, 0, Psr\\SimpleCache\\CacheInterface, 1) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_model_resultset_getcache, 0, 0, Phalcon\\Mvc\\Model\\CacheInterface, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_resultset_getfirst, 0, 0, 0) diff --git a/ext/phalcon/mvc/model/resultset/complex.zep.c b/ext/phalcon/mvc/model/resultset/complex.zep.c index e3945721a8c..c4a44ae1bdf 100644 --- a/ext/phalcon/mvc/model/resultset/complex.zep.c +++ b/ext/phalcon/mvc/model/resultset/complex.zep.c @@ -58,9 +58,9 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Model_Resultset_Complex) /** * Phalcon\Mvc\Model\Resultset\Complex constructor * - * @param array columnTypes - * @param ResultInterface|null result - * @param CacheInterface|null cache + * @param array $columnTypes + * @param ResultInterface|null $result + * @param mixed|null $cache */ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, __construct) { @@ -80,7 +80,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, __construct) Z_PARAM_ZVAL(columnTypes) Z_PARAM_OPTIONAL Z_PARAM_OBJECT_OF_CLASS_OR_NULL(result, phalcon_db_resultinterface_ce) - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(cache, zephir_get_internal_ce(SL("psr\\simplecache\\cacheinterface"))) + Z_PARAM_ZVAL_OR_NULL(cache) ZEND_PARSE_PARAMETERS_END(); #endif @@ -210,7 +210,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current) dirtyState = 0; zephir_read_property(&_1, this_ptr, ZEND_STRL("columnTypes"), PH_NOISY_CC | PH_READONLY); - zephir_is_iterable(&_1, 0, "phalcon/Mvc/Model/Resultset/Complex.zep", 267); + zephir_is_iterable(&_1, 0, "phalcon/Mvc/Model/Resultset/Complex.zep", 266); if (Z_TYPE_P(&_1) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_1), _4, _5, _2) { @@ -223,21 +223,21 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current) ZEPHIR_INIT_NVAR(&column); ZVAL_COPY(&column, _2); if (UNEXPECTED(Z_TYPE_P(&column) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Column type is corrupt", "phalcon/Mvc/Model/Resultset/Complex.zep", 139); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Column type is corrupt", "phalcon/Mvc/Model/Resultset/Complex.zep", 138); return; } ZEPHIR_OBS_NVAR(&type); - zephir_array_fetch_string(&type, &column, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 142); + zephir_array_fetch_string(&type, &column, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 141); if (ZEPHIR_IS_STRING(&type, "object")) { ZEPHIR_OBS_NVAR(&source); - zephir_array_fetch_string(&source, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 148); + zephir_array_fetch_string(&source, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 147); ZEPHIR_OBS_NVAR(&attributes); - zephir_array_fetch_string(&attributes, &column, SL("attributes"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 149); + zephir_array_fetch_string(&attributes, &column, SL("attributes"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 148); ZEPHIR_OBS_NVAR(&columnMap); - zephir_array_fetch_string(&columnMap, &column, SL("columnMap"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 150); + zephir_array_fetch_string(&columnMap, &column, SL("columnMap"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 149); ZEPHIR_INIT_NVAR(&rowModel); array_init(&rowModel); - zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Resultset/Complex.zep", 168); + zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Resultset/Complex.zep", 167); if (Z_TYPE_P(&attributes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _6$$11) { @@ -246,7 +246,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current) ZEPHIR_OBS_NVAR(&columnValue); ZEPHIR_INIT_NVAR(&_8$$12); ZEPHIR_CONCAT_SVSV(&_8$$12, "_", &source, "_", &attribute); - zephir_array_fetch(&columnValue, &row, &_8$$12, PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 161); + zephir_array_fetch(&columnValue, &row, &_8$$12, PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 160); zephir_array_update_zval(&rowModel, &attribute, &columnValue, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); } else { @@ -263,7 +263,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current) ZEPHIR_OBS_NVAR(&columnValue); ZEPHIR_INIT_NVAR(&_9$$13); ZEPHIR_CONCAT_SVSV(&_9$$13, "_", &source, "_", &attribute); - zephir_array_fetch(&columnValue, &row, &_9$$13, PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 161); + zephir_array_fetch(&columnValue, &row, &_9$$13, PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 160); zephir_array_update_zval(&rowModel, &attribute, &columnValue, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0); zephir_check_call_status(); @@ -279,22 +279,22 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current) } if (ZEPHIR_GLOBAL(orm).late_state_binding) { ZEPHIR_OBS_NVAR(&_10$$16); - zephir_array_fetch_string(&_10$$16, &column, SL("instance"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 178); + zephir_array_fetch_string(&_10$$16, &column, SL("instance"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 177); if (zephir_instance_of_ev(&_10$$16, phalcon_mvc_model_ce)) { - zephir_array_fetch_string(&_11$$17, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 179); + zephir_array_fetch_string(&_11$$17, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 178); ZEPHIR_INIT_NVAR(&modelName); zephir_get_class(&modelName, &_11$$17, 0); } else { ZEPHIR_INIT_NVAR(&modelName); ZVAL_STRING(&modelName, "Phalcon\\Mvc\\Model"); } - zephir_array_fetch_string(&_12$$16, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 185); + zephir_array_fetch_string(&_12$$16, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 184); ZVAL_LONG(&_13$$16, dirtyState); _14$$16 = zephir_fetch_class(&modelName); ZEPHIR_CALL_CE_STATIC(&value, _14$$16, "cloneresultmap", NULL, 0, &_12$$16, &rowModel, &columnMap, &_13$$16, &keepSnapshots); zephir_check_call_status(); } else { - zephir_array_fetch_string(&_16$$19, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 199); + zephir_array_fetch_string(&_16$$19, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 198); ZVAL_LONG(&_17$$19, dirtyState); ZEPHIR_CALL_CE_STATIC(&value, phalcon_mvc_model_ce, "cloneresultmap", &_15, 0, &_16$$19, &rowModel, &columnMap, &_17$$19, &keepSnapshots); zephir_check_call_status(); @@ -307,12 +307,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current) } while(0); ZEPHIR_OBS_NVAR(&attribute); - zephir_array_fetch_string(&attribute, &column, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 223); + zephir_array_fetch_string(&attribute, &column, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 222); } else { ZEPHIR_OBS_NVAR(&sqlAlias); if (zephir_array_isset_string_fetch(&sqlAlias, &column, SL("sqlAlias"), 0)) { ZEPHIR_OBS_NVAR(&value); - zephir_array_fetch(&value, &row, &sqlAlias, PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 231); + zephir_array_fetch(&value, &row, &sqlAlias, PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 230); } else { ZEPHIR_OBS_NVAR(&value); zephir_array_isset_fetch(&value, &row, &alias, 0); @@ -354,21 +354,21 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current) ZEPHIR_CALL_METHOD(&column, &_1, "current", NULL, 0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&column) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Column type is corrupt", "phalcon/Mvc/Model/Resultset/Complex.zep", 139); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Column type is corrupt", "phalcon/Mvc/Model/Resultset/Complex.zep", 138); return; } ZEPHIR_OBS_NVAR(&type); - zephir_array_fetch_string(&type, &column, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 142); + zephir_array_fetch_string(&type, &column, SL("type"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 141); if (ZEPHIR_IS_STRING(&type, "object")) { ZEPHIR_OBS_NVAR(&source); - zephir_array_fetch_string(&source, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 148); + zephir_array_fetch_string(&source, &column, SL("column"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 147); ZEPHIR_OBS_NVAR(&attributes); - zephir_array_fetch_string(&attributes, &column, SL("attributes"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 149); + zephir_array_fetch_string(&attributes, &column, SL("attributes"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 148); ZEPHIR_OBS_NVAR(&columnMap); - zephir_array_fetch_string(&columnMap, &column, SL("columnMap"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 150); + zephir_array_fetch_string(&columnMap, &column, SL("columnMap"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 149); ZEPHIR_INIT_NVAR(&rowModel); array_init(&rowModel); - zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Resultset/Complex.zep", 168); + zephir_is_iterable(&attributes, 0, "phalcon/Mvc/Model/Resultset/Complex.zep", 167); if (Z_TYPE_P(&attributes) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&attributes), _21$$31) { @@ -377,7 +377,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current) ZEPHIR_OBS_NVAR(&columnValue); ZEPHIR_INIT_NVAR(&_23$$32); ZEPHIR_CONCAT_SVSV(&_23$$32, "_", &source, "_", &attribute); - zephir_array_fetch(&columnValue, &row, &_23$$32, PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 161); + zephir_array_fetch(&columnValue, &row, &_23$$32, PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 160); zephir_array_update_zval(&rowModel, &attribute, &columnValue, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); } else { @@ -394,7 +394,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current) ZEPHIR_OBS_NVAR(&columnValue); ZEPHIR_INIT_NVAR(&_24$$33); ZEPHIR_CONCAT_SVSV(&_24$$33, "_", &source, "_", &attribute); - zephir_array_fetch(&columnValue, &row, &_24$$33, PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 161); + zephir_array_fetch(&columnValue, &row, &_24$$33, PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 160); zephir_array_update_zval(&rowModel, &attribute, &columnValue, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(NULL, &attributes, "next", NULL, 0); zephir_check_call_status(); @@ -410,22 +410,22 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current) } if (ZEPHIR_GLOBAL(orm).late_state_binding) { ZEPHIR_OBS_NVAR(&_25$$36); - zephir_array_fetch_string(&_25$$36, &column, SL("instance"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 178); + zephir_array_fetch_string(&_25$$36, &column, SL("instance"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 177); if (zephir_instance_of_ev(&_25$$36, phalcon_mvc_model_ce)) { - zephir_array_fetch_string(&_26$$37, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 179); + zephir_array_fetch_string(&_26$$37, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 178); ZEPHIR_INIT_NVAR(&modelName); zephir_get_class(&modelName, &_26$$37, 0); } else { ZEPHIR_INIT_NVAR(&modelName); ZVAL_STRING(&modelName, "Phalcon\\Mvc\\Model"); } - zephir_array_fetch_string(&_27$$36, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 185); + zephir_array_fetch_string(&_27$$36, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 184); ZVAL_LONG(&_28$$36, dirtyState); _29$$36 = zephir_fetch_class(&modelName); ZEPHIR_CALL_CE_STATIC(&value, _29$$36, "cloneresultmap", NULL, 0, &_27$$36, &rowModel, &columnMap, &_28$$36, &keepSnapshots); zephir_check_call_status(); } else { - zephir_array_fetch_string(&_30$$39, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 199); + zephir_array_fetch_string(&_30$$39, &column, SL("instance"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 198); ZVAL_LONG(&_31$$39, dirtyState); ZEPHIR_CALL_CE_STATIC(&value, phalcon_mvc_model_ce, "cloneresultmap", &_15, 0, &_30$$39, &rowModel, &columnMap, &_31$$39, &keepSnapshots); zephir_check_call_status(); @@ -438,12 +438,12 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, current) } while(0); ZEPHIR_OBS_NVAR(&attribute); - zephir_array_fetch_string(&attribute, &column, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 223); + zephir_array_fetch_string(&attribute, &column, SL("balias"), PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 222); } else { ZEPHIR_OBS_NVAR(&sqlAlias); if (zephir_array_isset_string_fetch(&sqlAlias, &column, SL("sqlAlias"), 0)) { ZEPHIR_OBS_NVAR(&value); - zephir_array_fetch(&value, &row, &sqlAlias, PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 231); + zephir_array_fetch(&value, &row, &sqlAlias, PH_NOISY, "phalcon/Mvc/Model/Resultset/Complex.zep", 230); } else { ZEPHIR_OBS_NVAR(&value); zephir_array_isset_fetch(&value, &row, &alias, 0); @@ -503,7 +503,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, toArray) ZEPHIR_INIT_VAR(&records); array_init(&records); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "rewind", NULL, 118); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "rewind", NULL, 119); zephir_check_call_status(); while (1) { ZEPHIR_CALL_METHOD(&_0, this_ptr, "valid", &_1, 0); @@ -513,7 +513,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, toArray) } ZEPHIR_CALL_METHOD(¤t, this_ptr, "current", &_2, 0); zephir_check_call_status(); - zephir_array_append(&records, ¤t, PH_SEPARATE, "phalcon/Mvc/Model/Resultset/Complex.zep", 287); + zephir_array_append(&records, ¤t, PH_SEPARATE, "phalcon/Mvc/Model/Resultset/Complex.zep", 286); ZEPHIR_CALL_METHOD(NULL, this_ptr, "next", &_3, 0); zephir_check_call_status(); } @@ -560,7 +560,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, serialize) ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_1, 0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Complex.zep", 316); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Complex.zep", 315); return; } ZEPHIR_INIT_VAR(&_3); @@ -643,7 +643,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, unserialize) ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_0, 0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Complex.zep", 361); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Complex.zep", 360); return; } ZEPHIR_INIT_VAR(&_2); @@ -665,20 +665,20 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, unserialize) zephir_check_call_status(); } if (UNEXPECTED(Z_TYPE_P(&resultset) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid serialization data", "phalcon/Mvc/Model/Resultset/Complex.zep", 374); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid serialization data", "phalcon/Mvc/Model/Resultset/Complex.zep", 373); return; } - zephir_array_fetch_string(&_5, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 377); + zephir_array_fetch_string(&_5, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 376); zephir_update_property_zval(this_ptr, ZEND_STRL("rows"), &_5); - zephir_array_fetch_string(&_6, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 378); + zephir_array_fetch_string(&_6, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 377); ZEPHIR_INIT_ZVAL_NREF(_7); ZVAL_LONG(&_7, zephir_fast_count_int(&_6)); zephir_update_property_zval(this_ptr, ZEND_STRL("count"), &_7); - zephir_array_fetch_string(&_8, &resultset, SL("cache"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 379); + zephir_array_fetch_string(&_8, &resultset, SL("cache"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 378); zephir_update_property_zval(this_ptr, ZEND_STRL("cache"), &_8); - zephir_array_fetch_string(&_9, &resultset, SL("columnTypes"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 380); + zephir_array_fetch_string(&_9, &resultset, SL("columnTypes"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 379); zephir_update_property_zval(this_ptr, ZEND_STRL("columnTypes"), &_9); - zephir_array_fetch_string(&_10, &resultset, SL("hydrateMode"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 381); + zephir_array_fetch_string(&_10, &resultset, SL("hydrateMode"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Complex.zep", 380); zephir_update_property_zval(this_ptr, ZEND_STRL("hydrateMode"), &_10); ZEPHIR_MM_RESTORE(); } diff --git a/ext/phalcon/mvc/model/resultset/complex.zep.h b/ext/phalcon/mvc/model/resultset/complex.zep.h index 1eaa8a13efb..22bb22c1610 100644 --- a/ext/phalcon/mvc/model/resultset/complex.zep.h +++ b/ext/phalcon/mvc/model/resultset/complex.zep.h @@ -12,7 +12,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Complex, unserialize); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex___construct, 0, 0, 1) ZEND_ARG_INFO(0, columnTypes) ZEND_ARG_OBJ_INFO(0, result, Phalcon\\Db\\ResultInterface, 1) - ZEND_ARG_OBJ_INFO(0, cache, Psr\\SimpleCache\\CacheInterface, 1) + ZEND_ARG_INFO(0, cache) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_resultset_complex_current, 0, 0, 0) diff --git a/ext/phalcon/mvc/model/resultset/simple.zep.c b/ext/phalcon/mvc/model/resultset/simple.zep.c index d816a38635e..6c65c82e95c 100644 --- a/ext/phalcon/mvc/model/resultset/simple.zep.c +++ b/ext/phalcon/mvc/model/resultset/simple.zep.c @@ -60,7 +60,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Mvc_Model_Resultset_Simple) * @param array columnMap * @param ModelInterface|Row model * @param \Phalcon\Db\ResultInterface|false result - * @param CacheInterface|null cache + * @param mixed|null cache * @param bool keepSnapshots false */ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, __construct) @@ -86,7 +86,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, __construct) Z_PARAM_ZVAL(model) Z_PARAM_ZVAL(result) Z_PARAM_OPTIONAL - Z_PARAM_OBJECT_OF_CLASS_OR_NULL(cache, zephir_get_internal_ce(SL("psr\\simplecache\\cacheinterface"))) + Z_PARAM_ZVAL_OR_NULL(cache) Z_PARAM_BOOL(keepSnapshots) ZEND_PARSE_PARAMETERS_END(); #endif @@ -303,7 +303,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) ZEPHIR_INIT_VAR(&renamedRecords); array_init(&renamedRecords); if (Z_TYPE_P(&records) == IS_ARRAY) { - zephir_is_iterable(&records, 0, "phalcon/Mvc/Model/Resultset/Simple.zep", 241); + zephir_is_iterable(&records, 0, "phalcon/Mvc/Model/Resultset/Simple.zep", 240); if (Z_TYPE_P(&records) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&records), _4$$7) { @@ -311,7 +311,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) ZVAL_COPY(&record, _4$$7); ZEPHIR_INIT_NVAR(&renamed); array_init(&renamed); - zephir_is_iterable(&record, 0, "phalcon/Mvc/Model/Resultset/Simple.zep", 239); + zephir_is_iterable(&record, 0, "phalcon/Mvc/Model/Resultset/Simple.zep", 238); if (Z_TYPE_P(&record) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&record), _8$$8, _9$$8, _6$$8) { @@ -331,7 +331,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) ZEPHIR_CONCAT_SVS(&_11$$10, "Column '", &key, "' is not part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_10$$10, "__construct", &_12, 31, &_11$$10); zephir_check_call_status(); - zephir_throw_exception_debug(&_10$$10, "phalcon/Mvc/Model/Resultset/Simple.zep", 222); + zephir_throw_exception_debug(&_10$$10, "phalcon/Mvc/Model/Resultset/Simple.zep", 221); ZEPHIR_MM_RESTORE(); return; } @@ -344,7 +344,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) ZEPHIR_CONCAT_SVS(&_14$$12, "Column '", &key, "' is not part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_13$$12, "__construct", &_12, 31, &_14$$12); zephir_check_call_status(); - zephir_throw_exception_debug(&_13$$12, "phalcon/Mvc/Model/Resultset/Simple.zep", 229); + zephir_throw_exception_debug(&_13$$12, "phalcon/Mvc/Model/Resultset/Simple.zep", 228); ZEPHIR_MM_RESTORE(); return; } @@ -372,7 +372,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) ZEPHIR_CONCAT_SVS(&_16$$14, "Column '", &key, "' is not part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_15$$14, "__construct", &_12, 31, &_16$$14); zephir_check_call_status(); - zephir_throw_exception_debug(&_15$$14, "phalcon/Mvc/Model/Resultset/Simple.zep", 222); + zephir_throw_exception_debug(&_15$$14, "phalcon/Mvc/Model/Resultset/Simple.zep", 221); ZEPHIR_MM_RESTORE(); return; } @@ -385,7 +385,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) ZEPHIR_CONCAT_SVS(&_18$$16, "Column '", &key, "' is not part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_17$$16, "__construct", &_12, 31, &_18$$16); zephir_check_call_status(); - zephir_throw_exception_debug(&_17$$16, "phalcon/Mvc/Model/Resultset/Simple.zep", 229); + zephir_throw_exception_debug(&_17$$16, "phalcon/Mvc/Model/Resultset/Simple.zep", 228); ZEPHIR_MM_RESTORE(); return; } @@ -397,7 +397,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) } ZEPHIR_INIT_NVAR(&value); ZEPHIR_INIT_NVAR(&key); - zephir_array_append(&renamedRecords, &renamed, PH_SEPARATE, "phalcon/Mvc/Model/Resultset/Simple.zep", 239); + zephir_array_append(&renamedRecords, &renamed, PH_SEPARATE, "phalcon/Mvc/Model/Resultset/Simple.zep", 238); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &records, "rewind", NULL, 0); @@ -412,7 +412,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) zephir_check_call_status(); ZEPHIR_INIT_NVAR(&renamed); array_init(&renamed); - zephir_is_iterable(&record, 0, "phalcon/Mvc/Model/Resultset/Simple.zep", 239); + zephir_is_iterable(&record, 0, "phalcon/Mvc/Model/Resultset/Simple.zep", 238); if (Z_TYPE_P(&record) == IS_ARRAY) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&record), _21$$17, _22$$17, _19$$17) { @@ -432,7 +432,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) ZEPHIR_CONCAT_SVS(&_24$$19, "Column '", &key, "' is not part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_23$$19, "__construct", &_12, 31, &_24$$19); zephir_check_call_status(); - zephir_throw_exception_debug(&_23$$19, "phalcon/Mvc/Model/Resultset/Simple.zep", 222); + zephir_throw_exception_debug(&_23$$19, "phalcon/Mvc/Model/Resultset/Simple.zep", 221); ZEPHIR_MM_RESTORE(); return; } @@ -445,7 +445,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) ZEPHIR_CONCAT_SVS(&_26$$21, "Column '", &key, "' is not part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_25$$21, "__construct", &_12, 31, &_26$$21); zephir_check_call_status(); - zephir_throw_exception_debug(&_25$$21, "phalcon/Mvc/Model/Resultset/Simple.zep", 229); + zephir_throw_exception_debug(&_25$$21, "phalcon/Mvc/Model/Resultset/Simple.zep", 228); ZEPHIR_MM_RESTORE(); return; } @@ -473,7 +473,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) ZEPHIR_CONCAT_SVS(&_28$$23, "Column '", &key, "' is not part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_27$$23, "__construct", &_12, 31, &_28$$23); zephir_check_call_status(); - zephir_throw_exception_debug(&_27$$23, "phalcon/Mvc/Model/Resultset/Simple.zep", 222); + zephir_throw_exception_debug(&_27$$23, "phalcon/Mvc/Model/Resultset/Simple.zep", 221); ZEPHIR_MM_RESTORE(); return; } @@ -486,7 +486,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) ZEPHIR_CONCAT_SVS(&_30$$25, "Column '", &key, "' is not part of the column map"); ZEPHIR_CALL_METHOD(NULL, &_29$$25, "__construct", &_12, 31, &_30$$25); zephir_check_call_status(); - zephir_throw_exception_debug(&_29$$25, "phalcon/Mvc/Model/Resultset/Simple.zep", 229); + zephir_throw_exception_debug(&_29$$25, "phalcon/Mvc/Model/Resultset/Simple.zep", 228); ZEPHIR_MM_RESTORE(); return; } @@ -498,7 +498,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, toArray) } ZEPHIR_INIT_NVAR(&value); ZEPHIR_INIT_NVAR(&key); - zephir_array_append(&renamedRecords, &renamed, PH_SEPARATE, "phalcon/Mvc/Model/Resultset/Simple.zep", 239); + zephir_array_append(&renamedRecords, &renamed, PH_SEPARATE, "phalcon/Mvc/Model/Resultset/Simple.zep", 238); ZEPHIR_CALL_METHOD(NULL, &records, "next", NULL, 0); zephir_check_call_status(); } @@ -538,7 +538,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, serialize) ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_0, 0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Simple.zep", 262); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Simple.zep", 261); return; } ZEPHIR_INIT_VAR(&data); @@ -626,7 +626,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, unserialize) ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_di_ce, "getdefault", &_0, 0); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&container) != IS_OBJECT)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Simple.zep", 300); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The dependency injector container is not valid", "phalcon/Mvc/Model/Resultset/Simple.zep", 299); return; } ZEPHIR_INIT_VAR(&_2); @@ -648,22 +648,22 @@ PHP_METHOD(Phalcon_Mvc_Model_Resultset_Simple, unserialize) zephir_check_call_status(); } if (UNEXPECTED(Z_TYPE_P(&resultset) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid serialization data", "phalcon/Mvc/Model/Resultset/Simple.zep", 313); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "Invalid serialization data", "phalcon/Mvc/Model/Resultset/Simple.zep", 312); return; } - zephir_array_fetch_string(&_5, &resultset, SL("model"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 316); + zephir_array_fetch_string(&_5, &resultset, SL("model"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 315); zephir_update_property_zval(this_ptr, ZEND_STRL("model"), &_5); - zephir_array_fetch_string(&_6, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 317); + zephir_array_fetch_string(&_6, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 316); zephir_update_property_zval(this_ptr, ZEND_STRL("rows"), &_6); - zephir_array_fetch_string(&_7, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 318); + zephir_array_fetch_string(&_7, &resultset, SL("rows"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 317); ZEPHIR_INIT_ZVAL_NREF(_8); ZVAL_LONG(&_8, zephir_fast_count_int(&_7)); zephir_update_property_zval(this_ptr, ZEND_STRL("count"), &_8); - zephir_array_fetch_string(&_9, &resultset, SL("cache"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 319); + zephir_array_fetch_string(&_9, &resultset, SL("cache"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 318); zephir_update_property_zval(this_ptr, ZEND_STRL("cache"), &_9); - zephir_array_fetch_string(&_10, &resultset, SL("columnMap"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 320); + zephir_array_fetch_string(&_10, &resultset, SL("columnMap"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 319); zephir_update_property_zval(this_ptr, ZEND_STRL("columnMap"), &_10); - zephir_array_fetch_string(&_11, &resultset, SL("hydrateMode"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 321); + zephir_array_fetch_string(&_11, &resultset, SL("hydrateMode"), PH_NOISY | PH_READONLY, "phalcon/Mvc/Model/Resultset/Simple.zep", 320); zephir_update_property_zval(this_ptr, ZEND_STRL("hydrateMode"), &_11); if (zephir_array_isset_string_fetch(&keepSnapshots, &resultset, SL("keepSnapshots"), 1)) { zephir_update_property_zval(this_ptr, ZEND_STRL("keepSnapshots"), &keepSnapshots); diff --git a/ext/phalcon/mvc/model/resultset/simple.zep.h b/ext/phalcon/mvc/model/resultset/simple.zep.h index 023b2e294ce..af554655343 100644 --- a/ext/phalcon/mvc/model/resultset/simple.zep.h +++ b/ext/phalcon/mvc/model/resultset/simple.zep.h @@ -13,7 +13,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_resultset_simple___construct, 0 ZEND_ARG_INFO(0, columnMap) ZEND_ARG_INFO(0, model) ZEND_ARG_INFO(0, result) - ZEND_ARG_OBJ_INFO(0, cache, Psr\\SimpleCache\\CacheInterface, 1) + ZEND_ARG_INFO(0, cache) ZEND_ARG_TYPE_INFO(0, keepSnapshots, _IS_BOOL, 0) ZEND_END_ARG_INFO() diff --git a/ext/phalcon/mvc/model/resultsetinterface.zep.h b/ext/phalcon/mvc/model/resultsetinterface.zep.h index 399cb4117d2..f756de09e06 100644 --- a/ext/phalcon/mvc/model/resultsetinterface.zep.h +++ b/ext/phalcon/mvc/model/resultsetinterface.zep.h @@ -11,7 +11,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_mvc_model_resultsetinter ZEND_ARG_INFO(0, filter) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_mvc_model_resultsetinterface_getcache, 0, 0, Psr\\SimpleCache\\CacheInterface, 1) +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_resultsetinterface_getcache, 0, 0, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_mvc_model_resultsetinterface_getfirst, 0, 0, 0) diff --git a/ext/phalcon/mvc/model/row.zep.c b/ext/phalcon/mvc/model/row.zep.c index bb8d9fc2de7..35d4ed02f11 100644 --- a/ext/phalcon/mvc/model/row.zep.c +++ b/ext/phalcon/mvc/model/row.zep.c @@ -263,7 +263,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Row, toArray) ZEPHIR_MM_GROW(); - ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 507, this_ptr); + ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 508, this_ptr); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/mvc/router.zep.c b/ext/phalcon/mvc/router.zep.c index 35e50a683f8..b47ef273dd1 100644 --- a/ext/phalcon/mvc/router.zep.c +++ b/ext/phalcon/mvc/router.zep.c @@ -277,7 +277,7 @@ PHP_METHOD(Phalcon_Mvc_Router, __construct) add_assoc_long_ex(&_1$$3, SL("controller"), 1); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "#^/([\\w0-9\\_\\-]+)[/]{0,1}$#u"); - ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 128, &_2$$3, &_1$$3); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 129, &_2$$3, &_1$$3); zephir_check_call_status(); zephir_array_append(&routes, &_0$$3, PH_SEPARATE, "phalcon/Mvc/Router.zep", 171); ZEPHIR_INIT_NVAR(&_2$$3); @@ -289,7 +289,7 @@ PHP_METHOD(Phalcon_Mvc_Router, __construct) add_assoc_long_ex(&_3$$3, SL("params"), 3); ZEPHIR_INIT_VAR(&_4$$3); ZVAL_STRING(&_4$$3, "#^/([\\w0-9\\_\\-]+)/([\\w0-9\\.\\_]+)(/.*)*$#u"); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 128, &_4$$3, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 129, &_4$$3, &_3$$3); zephir_check_call_status(); zephir_array_append(&routes, &_2$$3, PH_SEPARATE, "phalcon/Mvc/Router.zep", 180); } @@ -385,7 +385,7 @@ PHP_METHOD(Phalcon_Mvc_Router, add) ZEPHIR_INIT_VAR(&route); object_init_ex(&route, phalcon_mvc_router_route_ce); - ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 128, &pattern, paths, httpMethods); + ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 129, &pattern, paths, httpMethods); zephir_check_call_status(); ZVAL_LONG(&_0, position); ZEPHIR_CALL_METHOD(NULL, this_ptr, "attach", NULL, 0, &route, &_0); @@ -1626,7 +1626,7 @@ PHP_METHOD(Phalcon_Mvc_Router, handle) ZVAL_LONG(&_0, 5); - ZEPHIR_CALL_FUNCTION(&_1, "parse_url", NULL, 129, &uri, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "parse_url", NULL, 130, &uri, &_0); zephir_check_call_status(); zephir_get_strval(&uri, &_1); zephir_read_property(&_0, this_ptr, ZEND_STRL("removeExtraSlashes"), PH_NOISY_CC | PH_READONLY); diff --git a/ext/phalcon/mvc/router/annotations.zep.c b/ext/phalcon/mvc/router/annotations.zep.c index 1c9fc6da1fa..7c2fa46a3e8 100644 --- a/ext/phalcon/mvc/router/annotations.zep.c +++ b/ext/phalcon/mvc/router/annotations.zep.c @@ -340,7 +340,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) if (!(ZEPHIR_IS_EMPTY(&prefix))) { ZEPHIR_INIT_NVAR(&route); object_init_ex(&route, phalcon_mvc_router_route_ce); - ZEPHIR_CALL_METHOD(NULL, &route, "__construct", &_4, 128, &prefix); + ZEPHIR_CALL_METHOD(NULL, &route, "__construct", &_4, 129, &prefix); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_5$$6, &route, "getcompiledpattern", &_6, 0); zephir_check_call_status(); @@ -546,7 +546,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Annotations, handle) if (!(ZEPHIR_IS_EMPTY(&prefix))) { ZEPHIR_INIT_NVAR(&route); object_init_ex(&route, phalcon_mvc_router_route_ce); - ZEPHIR_CALL_METHOD(NULL, &route, "__construct", &_4, 128, &prefix); + ZEPHIR_CALL_METHOD(NULL, &route, "__construct", &_4, 129, &prefix); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_28$$29, &route, "getcompiledpattern", &_6, 0); zephir_check_call_status(); @@ -870,7 +870,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Annotations, processActionAnnotation) zephir_read_property(&_2, this_ptr, ZEND_STRL("actionPreformatCallback"), PH_NOISY_CC | PH_READONLY); if (Z_TYPE_P(&_2) != IS_NULL) { zephir_read_property(&_3$$6, this_ptr, ZEND_STRL("actionPreformatCallback"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_4$$6, "call_user_func", NULL, 205, &_3$$6, &proxyActionName); + ZEPHIR_CALL_FUNCTION(&_4$$6, "call_user_func", NULL, 206, &_3$$6, &proxyActionName); zephir_check_call_status(); ZEPHIR_CPY_WRT(&proxyActionName, &_4$$6); } diff --git a/ext/phalcon/mvc/router/group.zep.c b/ext/phalcon/mvc/router/group.zep.c index 122e32ed07c..c0bd0d5be96 100644 --- a/ext/phalcon/mvc/router/group.zep.c +++ b/ext/phalcon/mvc/router/group.zep.c @@ -1101,7 +1101,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Group, addRoute) zephir_read_property(&_1, this_ptr, ZEND_STRL("prefix"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_2); ZEPHIR_CONCAT_VV(&_2, &_1, &pattern); - ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 128, &_2, &mergedPaths, httpMethods); + ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 129, &_2, &mergedPaths, httpMethods); zephir_check_call_status(); zephir_update_property_array_append(this_ptr, SL("routes"), &route); ZEPHIR_CALL_METHOD(NULL, &route, "setgroup", NULL, 0, this_ptr); diff --git a/ext/phalcon/mvc/router/route.zep.c b/ext/phalcon/mvc/router/route.zep.c index e5fce4aeb2d..76cead05a0f 100644 --- a/ext/phalcon/mvc/router/route.zep.c +++ b/ext/phalcon/mvc/router/route.zep.c @@ -758,7 +758,7 @@ PHP_METHOD(Phalcon_Mvc_Router_Route, getReversedPaths) ZEPHIR_MM_GROW(); zephir_read_property(&_0, this_ptr, ZEND_STRL("paths"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_FUNCTION("array_flip", NULL, 127, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("array_flip", NULL, 128, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/mvc/view.zep.c b/ext/phalcon/mvc/view.zep.c index 40948719b5c..0c16c175911 100644 --- a/ext/phalcon/mvc/view.zep.c +++ b/ext/phalcon/mvc/view.zep.c @@ -764,11 +764,11 @@ PHP_METHOD(Phalcon_Mvc_View, getPartial) } - ZEPHIR_CALL_FUNCTION(NULL, "ob_start", NULL, 464); + ZEPHIR_CALL_FUNCTION(NULL, "ob_start", NULL, 465); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "partial", NULL, 0, &partialPath, params); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", NULL, 470); + ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", NULL, 471); zephir_check_call_status(); RETURN_MM(); } @@ -2039,7 +2039,7 @@ PHP_METHOD(Phalcon_Mvc_View, start) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_FUNCTION(NULL, "ob_start", NULL, 464); + ZEPHIR_CALL_FUNCTION(NULL, "ob_start", NULL, 465); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("content"), &__$null); RETURN_THIS(); @@ -2586,7 +2586,7 @@ PHP_METHOD(Phalcon_Mvc_View, loadTemplateEngines) ZEPHIR_CALL_CE_STATIC(&_7$$9, _8$$9, "bind", &_9, 0, &engineService, &di); zephir_check_call_status(); ZEPHIR_CPY_WRT(&engineService, &_7$$9); - ZEPHIR_CALL_FUNCTION(&_7$$9, "call_user_func", &_10, 205, &engineService, this_ptr); + ZEPHIR_CALL_FUNCTION(&_7$$9, "call_user_func", &_10, 206, &engineService, this_ptr); zephir_check_call_status(); zephir_array_update_zval(&engines, &extension, &_7$$9, PH_COPY | PH_SEPARATE); } else { @@ -2631,7 +2631,7 @@ PHP_METHOD(Phalcon_Mvc_View, loadTemplateEngines) ZEPHIR_CALL_CE_STATIC(&_16$$15, _17$$15, "bind", &_9, 0, &engineService, &di); zephir_check_call_status(); ZEPHIR_CPY_WRT(&engineService, &_16$$15); - ZEPHIR_CALL_FUNCTION(&_16$$15, "call_user_func", &_10, 205, &engineService, this_ptr); + ZEPHIR_CALL_FUNCTION(&_16$$15, "call_user_func", &_10, 206, &engineService, this_ptr); zephir_check_call_status(); zephir_array_update_zval(&engines, &extension, &_16$$15, PH_COPY | PH_SEPARATE); } else { diff --git a/ext/phalcon/mvc/view/engine/volt.zep.c b/ext/phalcon/mvc/view/engine/volt.zep.c index 6816a0773f2..7567372536d 100644 --- a/ext/phalcon/mvc/view/engine/volt.zep.c +++ b/ext/phalcon/mvc/view/engine/volt.zep.c @@ -126,7 +126,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, callMacro) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_RETURN_CALL_FUNCTION("call_user_func", NULL, 205, ¯o, &arguments); + ZEPHIR_RETURN_CALL_FUNCTION("call_user_func", NULL, 206, ¯o, &arguments); zephir_check_call_status(); RETURN_MM(); } @@ -195,12 +195,12 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, convertEncoding) _1 = ZEPHIR_IS_STRING_IDENTICAL(&from, "utf8"); } if (_1) { - ZEPHIR_RETURN_CALL_FUNCTION("utf8_decode", NULL, 305, &text); + ZEPHIR_RETURN_CALL_FUNCTION("utf8_decode", NULL, 306, &text); zephir_check_call_status(); RETURN_MM(); } if ((zephir_function_exists_ex(ZEND_STRL("mb_convert_encoding")) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 349, &text, &from, &to); + ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 350, &text, &from, &to); zephir_check_call_status(); RETURN_MM(); } @@ -320,7 +320,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, isIncluded) } if (Z_TYPE_P(haystack) == IS_STRING) { if ((zephir_function_exists_ex(ZEND_STRL("mb_strpos")) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&_0$$5, "mb_strpos", NULL, 484, haystack, needle); + ZEPHIR_CALL_FUNCTION(&_0$$5, "mb_strpos", NULL, 485, haystack, needle); zephir_check_call_status(); RETURN_MM_BOOL(!ZEPHIR_IS_FALSE_IDENTICAL(&_0$$5)); } @@ -368,7 +368,7 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, length) RETURN_MM_LONG(zephir_fast_count_int(item)); } if ((zephir_function_exists_ex(ZEND_STRL("mb_strlen")) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("mb_strlen", NULL, 253, item); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strlen", NULL, 254, item); zephir_check_call_status(); RETURN_MM(); } @@ -789,12 +789,12 @@ PHP_METHOD(Phalcon_Mvc_View_Engine_Volt, slice) if ((zephir_function_exists_ex(ZEND_STRL("mb_substr")) == SUCCESS)) { if (Z_TYPE_P(&length) != IS_NULL) { ZVAL_LONG(&_6$$11, start); - ZEPHIR_RETURN_CALL_FUNCTION("mb_substr", NULL, 247, value, &_6$$11, &length); + ZEPHIR_RETURN_CALL_FUNCTION("mb_substr", NULL, 248, value, &_6$$11, &length); zephir_check_call_status(); RETURN_MM(); } ZVAL_LONG(&_7$$10, start); - ZEPHIR_RETURN_CALL_FUNCTION("mb_substr", NULL, 247, value, &_7$$10); + ZEPHIR_RETURN_CALL_FUNCTION("mb_substr", NULL, 248, value, &_7$$10); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/mvc/view/engine/volt/compiler.zep.c b/ext/phalcon/mvc/view/engine/volt/compiler.zep.c index b45647674aa..ff3f5783747 100644 --- a/ext/phalcon/mvc/view/engine/volt/compiler.zep.c +++ b/ext/phalcon/mvc/view/engine/volt/compiler.zep.c @@ -3961,7 +3961,7 @@ 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, 290, &funcArguments, &_4$$7); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 291, &funcArguments, &_4$$7); ZEPHIR_UNREF(&funcArguments); zephir_check_call_status(); } diff --git a/ext/phalcon/mvc/view/simple.zep.c b/ext/phalcon/mvc/view/simple.zep.c index d3c638bf61e..22be4a46582 100644 --- a/ext/phalcon/mvc/view/simple.zep.c +++ b/ext/phalcon/mvc/view/simple.zep.c @@ -417,7 +417,7 @@ PHP_METHOD(Phalcon_Mvc_View_Simple, partial) } - ZEPHIR_CALL_FUNCTION(NULL, "ob_start", NULL, 464); + ZEPHIR_CALL_FUNCTION(NULL, "ob_start", NULL, 465); zephir_check_call_status(); if (Z_TYPE_P(params) == IS_ARRAY) { zephir_read_property(&_0$$3, this_ptr, ZEND_STRL("viewParams"), PH_NOISY_CC | PH_READONLY); @@ -534,7 +534,7 @@ PHP_METHOD(Phalcon_Mvc_View_Simple, render) ZEPHIR_INIT_VAR(&_0); ZEPHIR_CREATE_SYMBOL_TABLE(); - ZEPHIR_CALL_FUNCTION(NULL, "ob_start", NULL, 464); + ZEPHIR_CALL_FUNCTION(NULL, "ob_start", NULL, 465); zephir_check_call_status(); zephir_read_property(&_1, this_ptr, ZEND_STRL("viewParams"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&viewParams, &_1); @@ -879,7 +879,7 @@ PHP_METHOD(Phalcon_Mvc_View_Simple, loadTemplateEngines) ZEPHIR_CALL_CE_STATIC(&_7$$9, _8$$9, "bind", &_9, 0, &engineService, &di); zephir_check_call_status(); ZEPHIR_CPY_WRT(&engineService, &_7$$9); - ZEPHIR_CALL_FUNCTION(&engineObject, "call_user_func", &_10, 205, &engineService, this_ptr); + ZEPHIR_CALL_FUNCTION(&engineObject, "call_user_func", &_10, 206, &engineService, this_ptr); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&engineObject, &engineService); @@ -922,7 +922,7 @@ PHP_METHOD(Phalcon_Mvc_View_Simple, loadTemplateEngines) ZEPHIR_CALL_CE_STATIC(&_15$$15, _16$$15, "bind", &_9, 0, &engineService, &di); zephir_check_call_status(); ZEPHIR_CPY_WRT(&engineService, &_15$$15); - ZEPHIR_CALL_FUNCTION(&engineObject, "call_user_func", &_10, 205, &engineService, this_ptr); + ZEPHIR_CALL_FUNCTION(&engineObject, "call_user_func", &_10, 206, &engineService, this_ptr); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&engineObject, &engineService); diff --git a/ext/phalcon/paginator/adapter/model.zep.c b/ext/phalcon/paginator/adapter/model.zep.c index 2bc990915f9..ffe5103af44 100644 --- a/ext/phalcon/paginator/adapter/model.zep.c +++ b/ext/phalcon/paginator/adapter/model.zep.c @@ -165,7 +165,7 @@ PHP_METHOD(Phalcon_Paginator_Adapter_Model, paginate) ZEPHIR_INIT_VAR(&_6); ZVAL_STRING(&_6, "count"); zephir_array_fast_append(&_5, &_6); - ZEPHIR_CALL_FUNCTION(&_7, "call_user_func", NULL, 205, &_5, ¶meters); + ZEPHIR_CALL_FUNCTION(&_7, "call_user_func", NULL, 206, &_5, ¶meters); zephir_check_call_status(); rowcount = zephir_get_intval(&_7); if (zephir_safe_mod_long_long(rowcount, limit) != 0) { @@ -186,7 +186,7 @@ PHP_METHOD(Phalcon_Paginator_Adapter_Model, paginate) ZEPHIR_INIT_VAR(&_11$$8); ZVAL_STRING(&_11$$8, "find"); zephir_array_fast_append(&_10$$8, &_11$$8); - ZEPHIR_CALL_FUNCTION(&_12$$8, "call_user_func", NULL, 205, &_10$$8, ¶meters); + ZEPHIR_CALL_FUNCTION(&_12$$8, "call_user_func", NULL, 206, &_10$$8, ¶meters); zephir_check_call_status(); ZEPHIR_CPY_WRT(&pageItems, &_12$$8); } diff --git a/ext/phalcon/session/adapter/stream.zep.c b/ext/phalcon/session/adapter/stream.zep.c index 2ea58b83900..698f1409818 100644 --- a/ext/phalcon/session/adapter/stream.zep.c +++ b/ext/phalcon/session/adapter/stream.zep.c @@ -182,7 +182,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, destroy) _2 = zephir_is_true(&_3); } if (_2) { - ZEPHIR_CALL_FUNCTION(NULL, "unlink", NULL, 150, &file); + ZEPHIR_CALL_FUNCTION(NULL, "unlink", NULL, 151, &file); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -254,7 +254,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, gc) _9$$3 = ZEPHIR_LT(&_10$$3, &time); } if (_9$$3) { - ZEPHIR_CALL_FUNCTION(NULL, "unlink", &_11, 150, &file); + ZEPHIR_CALL_FUNCTION(NULL, "unlink", &_11, 151, &file); zephir_check_call_status(); } } ZEND_HASH_FOREACH_END(); @@ -282,7 +282,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, gc) _14$$5 = ZEPHIR_LT(&_15$$5, &time); } if (_14$$5) { - ZEPHIR_CALL_FUNCTION(NULL, "unlink", &_11, 150, &file); + ZEPHIR_CALL_FUNCTION(NULL, "unlink", &_11, 151, &file); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(NULL, &_3, "next", NULL, 0); @@ -367,7 +367,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, read) ZEPHIR_CALL_METHOD(&pointer, this_ptr, "phpfopen", NULL, 0, &name, &_3$$3); zephir_check_call_status(); ZVAL_LONG(&_4$$3, 1); - ZEPHIR_CALL_FUNCTION(&_5$$3, "flock", NULL, 158, &pointer, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "flock", NULL, 159, &pointer, &_4$$3); zephir_check_call_status(); if (zephir_is_true(&_5$$3)) { ZEPHIR_CALL_METHOD(&data, this_ptr, "phpfilegetcontents", NULL, 0, &name); @@ -637,7 +637,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, phpFilePutContents) ZVAL_LONG(&_0, flags); - ZEPHIR_RETURN_CALL_FUNCTION("file_put_contents", NULL, 161, &filename, data, &_0, context); + ZEPHIR_RETURN_CALL_FUNCTION("file_put_contents", NULL, 162, &filename, data, &_0, context); zephir_check_call_status(); RETURN_MM(); } @@ -748,7 +748,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, phpIsWritable) zephir_get_strval(&filename, filename_param); - ZEPHIR_RETURN_CALL_FUNCTION("is_writable", NULL, 400, &filename); + ZEPHIR_RETURN_CALL_FUNCTION("is_writable", NULL, 401, &filename); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/session/manager.zep.c b/ext/phalcon/session/manager.zep.c index 43b9f8b3913..049a46abea4 100644 --- a/ext/phalcon/session/manager.zep.c +++ b/ext/phalcon/session/manager.zep.c @@ -868,7 +868,7 @@ PHP_METHOD(Phalcon_Session_Manager, phpHeadersSent) ZEPHIR_MM_GROW(); - ZEPHIR_RETURN_CALL_FUNCTION("headers_sent", NULL, 438); + ZEPHIR_RETURN_CALL_FUNCTION("headers_sent", NULL, 439); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/storage/adapter/apcu.zep.c b/ext/phalcon/storage/adapter/apcu.zep.c index ad9aa9bee5f..40f33eea8aa 100644 --- a/ext/phalcon/storage/adapter/apcu.zep.c +++ b/ext/phalcon/storage/adapter/apcu.zep.c @@ -658,7 +658,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuDec) ZVAL_LONG(&_0, step); ZVAL_LONG(&_1, ttl); ZEPHIR_MAKE_REF(success); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_dec", NULL, 130, key, &_0, success, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_dec", NULL, 131, key, &_0, success, &_1); ZEPHIR_UNREF(success); zephir_check_call_status(); RETURN_MM(); @@ -684,7 +684,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuDelete) zephir_fetch_params(1, 1, 0, &key); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_delete", NULL, 131, key); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_delete", NULL, 132, key); zephir_check_call_status(); RETURN_MM(); } @@ -709,7 +709,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuExists) zephir_fetch_params(1, 1, 0, &key); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_exists", NULL, 132, key); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_exists", NULL, 133, key); zephir_check_call_status(); RETURN_MM(); } @@ -759,7 +759,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuInc) ZVAL_LONG(&_0, step); ZVAL_LONG(&_1, ttl); ZEPHIR_MAKE_REF(success); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_inc", NULL, 133, key, &_0, success, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_inc", NULL, 134, key, &_0, success, &_1); ZEPHIR_UNREF(success); zephir_check_call_status(); RETURN_MM(); @@ -794,7 +794,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuFetch) ZEPHIR_MAKE_REF(success); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_fetch", NULL, 134, key, success); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_fetch", NULL, 135, key, success); ZEPHIR_UNREF(success); zephir_check_call_status(); RETURN_MM(); @@ -859,7 +859,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, phpApcuStore) ZVAL_LONG(&_0, ttl); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_store", NULL, 135, key, payload, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_store", NULL, 136, key, payload, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/storage/adapter/libmemcached.zep.c b/ext/phalcon/storage/adapter/libmemcached.zep.c index 378b0f3bae0..47cdddad513 100644 --- a/ext/phalcon/storage/adapter/libmemcached.zep.c +++ b/ext/phalcon/storage/adapter/libmemcached.zep.c @@ -331,14 +331,14 @@ PHP_METHOD(Phalcon_Storage_Adapter_Libmemcached, getAdapter) ZEPHIR_INIT_NVAR(&_7$$4); zephir_fast_array_merge(&_7$$4, &failover, &client); ZEPHIR_CPY_WRT(&client, &_7$$4); - ZEPHIR_CALL_METHOD(&_9$$4, this_ptr, "setoptions", NULL, 136, &connection, &client); + ZEPHIR_CALL_METHOD(&_9$$4, this_ptr, "setoptions", NULL, 137, &connection, &client); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_10$$4, &_9$$4, "setservers", NULL, 137, &connection, &servers); + ZEPHIR_CALL_METHOD(&_10$$4, &_9$$4, "setservers", NULL, 138, &connection, &servers); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_10$$4, "setsasl", NULL, 138, &connection, &saslUser, &saslPass); + ZEPHIR_CALL_METHOD(NULL, &_10$$4, "setsasl", NULL, 139, &connection, &saslUser, &saslPass); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "setserializer", NULL, 139, &connection); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setserializer", NULL, 140, &connection); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("adapter"), &connection); } diff --git a/ext/phalcon/storage/adapter/redis.zep.c b/ext/phalcon/storage/adapter/redis.zep.c index 85cdaaff756..aff7e37fa91 100644 --- a/ext/phalcon/storage/adapter/redis.zep.c +++ b/ext/phalcon/storage/adapter/redis.zep.c @@ -340,17 +340,17 @@ PHP_METHOD(Phalcon_Storage_Adapter_Redis, getAdapter) object_init_ex(&connection, zephir_get_internal_ce(SL("redis"))); ZEPHIR_CALL_METHOD(NULL, &connection, "__construct", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "checkconnect", NULL, 140, &connection); + ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "checkconnect", NULL, 141, &connection); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_2$$3, &_1$$3, "checkauth", NULL, 141, &connection); + ZEPHIR_CALL_METHOD(&_2$$3, &_1$$3, "checkauth", NULL, 142, &connection); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "checkindex", NULL, 142, &connection); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "checkindex", NULL, 143, &connection); zephir_check_call_status(); zephir_read_property(&_3$$3, this_ptr, ZEND_STRL("prefix"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_4$$3, 2); ZEPHIR_CALL_METHOD(NULL, &connection, "setoption", NULL, 0, &_4$$3, &_3$$3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "setserializer", NULL, 143, &connection); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setserializer", NULL, 144, &connection); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("adapter"), &connection); } @@ -810,7 +810,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Redis, checkConnect) object_init_ex(&_4$$5, phalcon_storage_exception_ce); ZEPHIR_INIT_VAR(&_5$$5); ZVAL_STRING(&_5$$5, "Could not connect to the Redisd server [%s:%s]"); - ZEPHIR_CALL_FUNCTION(&_6$$5, "sprintf", NULL, 144, &_5$$5, &host, &port); + ZEPHIR_CALL_FUNCTION(&_6$$5, "sprintf", NULL, 145, &_5$$5, &host, &port); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_4$$5, "__construct", NULL, 31, &_6$$5); zephir_check_call_status(); @@ -916,34 +916,34 @@ PHP_METHOD(Phalcon_Storage_Adapter_Redis, setSerializer) add_assoc_long_ex(&map, SL("redis_php"), 1); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "\\Redis::SERIALIZER_IGBINARY"); - ZEPHIR_CALL_FUNCTION(&_1, "defined", NULL, 145, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "defined", NULL, 146, &_0); zephir_check_call_status(); if (zephir_is_true(&_1)) { ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "\\Redis::SERIALIZER_IGBINARY"); - ZEPHIR_CALL_FUNCTION(&_3$$3, "constant", NULL, 146, &_2$$3); + ZEPHIR_CALL_FUNCTION(&_3$$3, "constant", NULL, 147, &_2$$3); zephir_check_call_status(); zephir_array_update_string(&map, SL("redis_igbinary"), &_3$$3, PH_COPY | PH_SEPARATE); } ZEPHIR_INIT_NVAR(&_0); ZVAL_STRING(&_0, "\\Redis::SERIALIZER_MSGPACK"); - ZEPHIR_CALL_FUNCTION(&_4, "defined", NULL, 145, &_0); + ZEPHIR_CALL_FUNCTION(&_4, "defined", NULL, 146, &_0); zephir_check_call_status(); if (zephir_is_true(&_4)) { ZEPHIR_INIT_VAR(&_5$$4); ZVAL_STRING(&_5$$4, "\\Redis::SERIALIZER_MSGPACK"); - ZEPHIR_CALL_FUNCTION(&_6$$4, "constant", NULL, 146, &_5$$4); + ZEPHIR_CALL_FUNCTION(&_6$$4, "constant", NULL, 147, &_5$$4); zephir_check_call_status(); zephir_array_update_string(&map, SL("redis_msgpack"), &_6$$4, PH_COPY | PH_SEPARATE); } ZEPHIR_INIT_NVAR(&_0); ZVAL_STRING(&_0, "\\Redis::SERIALIZER_JSON"); - ZEPHIR_CALL_FUNCTION(&_7, "defined", NULL, 145, &_0); + ZEPHIR_CALL_FUNCTION(&_7, "defined", NULL, 146, &_0); zephir_check_call_status(); if (zephir_is_true(&_7)) { ZEPHIR_INIT_VAR(&_8$$5); ZVAL_STRING(&_8$$5, "\\Redis::SERIALIZER_JSON"); - ZEPHIR_CALL_FUNCTION(&_9$$5, "constant", NULL, 146, &_8$$5); + ZEPHIR_CALL_FUNCTION(&_9$$5, "constant", NULL, 147, &_8$$5); zephir_check_call_status(); zephir_array_update_string(&map, SL("redis_json"), &_9$$5, PH_COPY | PH_SEPARATE); } diff --git a/ext/phalcon/storage/adapter/stream.zep.c b/ext/phalcon/storage/adapter/stream.zep.c index e4a64672376..c55d1d55872 100644 --- a/ext/phalcon/storage/adapter/stream.zep.c +++ b/ext/phalcon/storage/adapter/stream.zep.c @@ -114,7 +114,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, __construct) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_storage_exception_ce, "The 'storageDir' must be specified in the options", "phalcon/Storage/Adapter/Stream.zep", 63); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "getdirseparator", NULL, 147, &storageDir); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "getdirseparator", NULL, 148, &storageDir); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("storageDir"), &_2); ZEPHIR_CALL_PARENT(NULL, phalcon_storage_adapter_stream_ce, getThis(), "__construct", &_3, 0, factory, &options); @@ -153,9 +153,9 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, clear) result = 1; zephir_read_property(&_0, this_ptr, ZEND_STRL("storageDir"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdirseparator", NULL, 147, &_0); + ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdirseparator", NULL, 148, &_0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&iterator, this_ptr, "getiterator", NULL, 148, &directory); + ZEPHIR_CALL_METHOD(&iterator, this_ptr, "getiterator", NULL, 149, &directory); zephir_check_call_status(); zephir_is_iterable(&iterator, 0, "phalcon/Storage/Adapter/Stream.zep", 94); if (Z_TYPE_P(&iterator) == IS_ARRAY) { @@ -319,9 +319,9 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, delete) if (!ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { RETURN_MM_BOOL(0); } - ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 149, &key); + ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 150, &key); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("unlink", NULL, 150, &filepath); + ZEPHIR_RETURN_CALL_FUNCTION("unlink", NULL, 151, &filepath); zephir_check_call_status(); RETURN_MM(); } @@ -378,17 +378,17 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, get) } - ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 149, &key); + ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 150, &key); zephir_check_call_status(); if (1 != (zephir_file_exists(&filepath) == SUCCESS)) { RETVAL_ZVAL(defaultValue, 1, 0); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&payload, this_ptr, "getpayload", NULL, 151, &filepath); + ZEPHIR_CALL_METHOD(&payload, this_ptr, "getpayload", NULL, 152, &filepath); zephir_check_call_status(); _0 = ZEPHIR_IS_EMPTY(&payload); if (!(_0)) { - ZEPHIR_CALL_METHOD(&_1, this_ptr, "isexpired", NULL, 152, &payload); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "isexpired", NULL, 153, &payload); zephir_check_call_status(); _0 = zephir_is_true(&_1); } @@ -465,7 +465,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getKeys) ZEPHIR_INIT_VAR(&files); array_init(&files); - ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 153); + ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 154); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_0, this_ptr, "phpfileexists", NULL, 0, &directory); zephir_check_call_status(); @@ -473,7 +473,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getKeys) array_init(return_value); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&iterator, this_ptr, "getiterator", NULL, 148, &directory); + ZEPHIR_CALL_METHOD(&iterator, this_ptr, "getiterator", NULL, 149, &directory); zephir_check_call_status(); zephir_is_iterable(&iterator, 0, "phalcon/Storage/Adapter/Stream.zep", 200); if (Z_TYPE_P(&iterator) == IS_ARRAY) { @@ -564,19 +564,19 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, has) } - ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 149, &key); + ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 150, &key); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_0, this_ptr, "phpfileexists", NULL, 0, &filepath); zephir_check_call_status(); if (UNEXPECTED(!ZEPHIR_IS_TRUE_IDENTICAL(&_0))) { RETURN_MM_BOOL(0); } - ZEPHIR_CALL_METHOD(&payload, this_ptr, "getpayload", NULL, 151, &filepath); + ZEPHIR_CALL_METHOD(&payload, this_ptr, "getpayload", NULL, 152, &filepath); zephir_check_call_status(); if (UNEXPECTED(ZEPHIR_IS_EMPTY(&payload))) { RETURN_MM_BOOL(0); } - ZEPHIR_CALL_METHOD(&_1, this_ptr, "isexpired", NULL, 152, &payload); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "isexpired", NULL, 153, &payload); zephir_check_call_status(); RETURN_MM_BOOL(!zephir_is_true(&_1)); } @@ -725,7 +725,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, set) ZEPHIR_CALL_METHOD(&_2, this_ptr, "getserializeddata", NULL, 0, value); zephir_check_call_status(); zephir_array_update_string(&payload, SL("content"), &_2, PH_COPY | PH_SEPARATE); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "storepayload", NULL, 154, &payload, &key); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "storepayload", NULL, 155, &payload, &key); zephir_check_call_status(); RETURN_MM(); } @@ -784,7 +784,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, setForever) ZEPHIR_CALL_METHOD(&_1, this_ptr, "getserializeddata", NULL, 0, value); zephir_check_call_status(); zephir_array_update_string(&payload, SL("content"), &_1, PH_COPY | PH_SEPARATE); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "storepayload", NULL, 154, &payload, &key); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "storepayload", NULL, 155, &payload, &key); zephir_check_call_status(); RETURN_MM(); } @@ -845,18 +845,18 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getDir) zephir_read_property(&_1, this_ptr, ZEND_STRL("prefix"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_2); ZEPHIR_CONCAT_VV(&_2, &_0, &_1); - ZEPHIR_CALL_METHOD(&dirPrefix, this_ptr, "getdirseparator", NULL, 147, &_2); + ZEPHIR_CALL_METHOD(&dirPrefix, this_ptr, "getdirseparator", NULL, 148, &_2); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_3); zephir_read_property(&_4, this_ptr, ZEND_STRL("prefix"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_5); ZVAL_STRING(&_5, ""); zephir_fast_str_replace(&_3, &_4, &_5, &key); - ZEPHIR_CALL_METHOD(&dirFromFile, this_ptr, "getdirfromfile", NULL, 155, &_3); + ZEPHIR_CALL_METHOD(&dirFromFile, this_ptr, "getdirfromfile", NULL, 156, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_6); ZEPHIR_CONCAT_VV(&_6, &dirPrefix, &dirFromFile); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getdirseparator", NULL, 147, &_6); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getdirseparator", NULL, 148, &_6); zephir_check_call_status(); RETURN_MM(); } @@ -902,7 +902,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getFilepath) } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdir", NULL, 153, &key); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdir", NULL, 154, &key); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); zephir_read_property(&_2, this_ptr, ZEND_STRL("prefix"), PH_NOISY_CC | PH_READONLY); @@ -956,10 +956,10 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getIterator) ZEPHIR_INIT_VAR(&_0); object_init_ex(&_0, spl_ce_RecursiveDirectoryIterator); ZVAL_LONG(&_1, 4096); - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 156, &dir, &_1); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 157, &dir, &_1); zephir_check_call_status(); ZVAL_LONG(&_1, 2); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 157, &_0, &_1); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 158, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -1020,7 +1020,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getPayload) RETURN_MM(); } ZVAL_LONG(&_1, 1); - ZEPHIR_CALL_FUNCTION(&_2, "flock", NULL, 158, &pointer, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "flock", NULL, 159, &pointer, &_1); zephir_check_call_status(); if (EXPECTED(ZEPHIR_IS_TRUE_IDENTICAL(&_2))) { ZEPHIR_CALL_METHOD(&payload, this_ptr, "phpfilegetcontents", NULL, 0, &filepath); @@ -1173,13 +1173,13 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, storePayload) ZEPHIR_CALL_FUNCTION(&_0, "serialize", NULL, 15, &payload); zephir_check_call_status(); ZEPHIR_CPY_WRT(&payload, &_0); - ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 153, &key); + ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 154, &key); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_0, "is_dir", NULL, 159, &directory); + ZEPHIR_CALL_FUNCTION(&_0, "is_dir", NULL, 160, &directory); zephir_check_call_status(); if (!(zephir_is_true(&_0))) { ZVAL_LONG(&_1$$3, 0777); - ZEPHIR_CALL_FUNCTION(NULL, "mkdir", NULL, 160, &directory, &_1$$3, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "mkdir", NULL, 161, &directory, &_1$$3, &__$true); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_3); @@ -1282,7 +1282,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, phpFilePutContents) ZVAL_LONG(&_0, flags); - ZEPHIR_RETURN_CALL_FUNCTION("file_put_contents", NULL, 161, &filename, data, &_0, context); + ZEPHIR_RETURN_CALL_FUNCTION("file_put_contents", NULL, 162, &filename, data, &_0, context); zephir_check_call_status(); RETURN_MM(); } @@ -1339,7 +1339,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, phpUnlink) zephir_get_strval(&filename, filename_param); - ZEPHIR_RETURN_CALL_FUNCTION("unlink", NULL, 150, &filename); + ZEPHIR_RETURN_CALL_FUNCTION("unlink", NULL, 151, &filename); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/storage/serializer/base64.zep.c b/ext/phalcon/storage/serializer/base64.zep.c index 9a165c23c40..d774a4e8b05 100644 --- a/ext/phalcon/storage/serializer/base64.zep.c +++ b/ext/phalcon/storage/serializer/base64.zep.c @@ -60,7 +60,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Base64, serialize) return; } zephir_read_property(&_1, this_ptr, ZEND_STRL("data"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 250, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 251, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -156,7 +156,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Base64, phpBase64Decode) ZVAL_BOOL(&_0, (strict ? 1 : 0)); - ZEPHIR_RETURN_CALL_FUNCTION("base64_decode", NULL, 249, &input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("base64_decode", NULL, 250, &input, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/storage/serializer/igbinary.zep.c b/ext/phalcon/storage/serializer/igbinary.zep.c index 3e15ecf2062..885bfd53245 100644 --- a/ext/phalcon/storage/serializer/igbinary.zep.c +++ b/ext/phalcon/storage/serializer/igbinary.zep.c @@ -194,7 +194,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, phpIgbinarySerialize) zephir_fetch_params(1, 1, 0, &value); - ZEPHIR_RETURN_CALL_FUNCTION("igbinary_serialize", NULL, 162, value); + ZEPHIR_RETURN_CALL_FUNCTION("igbinary_serialize", NULL, 163, value); zephir_check_call_status(); RETURN_MM(); } @@ -258,7 +258,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Igbinary, doUnserialize) zephir_fetch_params(1, 1, 0, &value); - ZEPHIR_RETURN_CALL_FUNCTION("igbinary_unserialize", NULL, 163, value); + ZEPHIR_RETURN_CALL_FUNCTION("igbinary_unserialize", NULL, 164, value); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/storage/serializer/json.zep.c b/ext/phalcon/storage/serializer/json.zep.c index 6ba4f323ac8..a77e8ad5b94 100644 --- a/ext/phalcon/storage/serializer/json.zep.c +++ b/ext/phalcon/storage/serializer/json.zep.c @@ -200,12 +200,12 @@ PHP_METHOD(Phalcon_Storage_Serializer_Json, getDecode) ZVAL_LONG(&_2, options); ZEPHIR_INIT_VAR(&decoded); zephir_json_decode(&decoded, &data, zephir_get_intval(&_0) ); - ZEPHIR_CALL_FUNCTION(&_3, "json_last_error", NULL, 214); + ZEPHIR_CALL_FUNCTION(&_3, "json_last_error", NULL, 215); zephir_check_call_status(); if (UNEXPECTED(!ZEPHIR_IS_LONG_IDENTICAL(&_3, 0))) { ZEPHIR_INIT_VAR(&_4$$3); object_init_ex(&_4$$3, spl_ce_InvalidArgumentException); - ZEPHIR_CALL_FUNCTION(&_5$$3, "json_last_error_msg", NULL, 215); + ZEPHIR_CALL_FUNCTION(&_5$$3, "json_last_error_msg", NULL, 216); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_6$$3); ZEPHIR_CONCAT_SV(&_6$$3, "json_decode error: ", &_5$$3); @@ -265,12 +265,12 @@ PHP_METHOD(Phalcon_Storage_Serializer_Json, getEncode) ZVAL_LONG(&_1, depth); ZEPHIR_INIT_VAR(&encoded); zephir_json_encode(&encoded, data, zephir_get_intval(&_0) ); - ZEPHIR_CALL_FUNCTION(&_2, "json_last_error", NULL, 214); + ZEPHIR_CALL_FUNCTION(&_2, "json_last_error", NULL, 215); zephir_check_call_status(); if (UNEXPECTED(!ZEPHIR_IS_LONG_IDENTICAL(&_2, 0))) { ZEPHIR_INIT_VAR(&_3$$3); object_init_ex(&_3$$3, spl_ce_InvalidArgumentException); - ZEPHIR_CALL_FUNCTION(&_4$$3, "json_last_error_msg", NULL, 215); + ZEPHIR_CALL_FUNCTION(&_4$$3, "json_last_error_msg", NULL, 216); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5$$3); ZEPHIR_CONCAT_SV(&_5$$3, "json_encode error: ", &_4$$3); diff --git a/ext/phalcon/support/debug.zep.c b/ext/phalcon/support/debug.zep.c index fe097543c61..489e5a68ed0 100644 --- a/ext/phalcon/support/debug.zep.c +++ b/ext/phalcon/support/debug.zep.c @@ -1554,7 +1554,7 @@ PHP_METHOD(Phalcon_Support_Debug, showTraceItem) } else { ZEPHIR_INIT_VAR(&classReflection); object_init_ex(&classReflection, zephir_get_internal_ce(SL("reflectionclass"))); - ZEPHIR_CALL_METHOD(NULL, &classReflection, "__construct", NULL, 178, &className); + ZEPHIR_CALL_METHOD(NULL, &classReflection, "__construct", NULL, 179, &className); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_8$$5, &classReflection, "isinternal", NULL, 0); zephir_check_call_status(); @@ -1587,7 +1587,7 @@ PHP_METHOD(Phalcon_Support_Debug, showTraceItem) if ((zephir_function_exists(&functionName) == SUCCESS)) { ZEPHIR_INIT_VAR(&functionReflection); object_init_ex(&functionReflection, zephir_get_internal_ce(SL("reflectionfunction"))); - ZEPHIR_CALL_METHOD(NULL, &functionReflection, "__construct", NULL, 172, &functionName); + ZEPHIR_CALL_METHOD(NULL, &functionReflection, "__construct", NULL, 173, &functionName); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_14$$10, &functionReflection, "isinternal", NULL, 0); zephir_check_call_status(); diff --git a/ext/phalcon/support/debug/dump.zep.c b/ext/phalcon/support/debug/dump.zep.c index 442956f04cd..3191334ef97 100644 --- a/ext/phalcon/support/debug/dump.zep.c +++ b/ext/phalcon/support/debug/dump.zep.c @@ -890,7 +890,7 @@ PHP_METHOD(Phalcon_Support_Debug_Dump, output) ZEPHIR_CONCAT_VS(&_45$$11, &_44$$11, "[skipped]\n"); zephir_concat_self(&output, &_45$$11); } else if (_42$$9) { - ZEPHIR_CALL_FUNCTION(&_46$$12, "get_object_vars", NULL, 507, variable); + ZEPHIR_CALL_FUNCTION(&_46$$12, "get_object_vars", NULL, 508, variable); zephir_check_call_status(); zephir_is_iterable(&_46$$12, 0, "phalcon/Support/Debug/Dump.zep", 263); if (Z_TYPE_P(&_46$$12) == IS_ARRAY) { @@ -981,10 +981,10 @@ PHP_METHOD(Phalcon_Support_Debug_Dump, output) } else { ZEPHIR_INIT_VAR(&reflect$$15); object_init_ex(&reflect$$15, zephir_get_internal_ce(SL("reflectionclass"))); - ZEPHIR_CALL_METHOD(NULL, &reflect$$15, "__construct", NULL, 178, variable); + ZEPHIR_CALL_METHOD(NULL, &reflect$$15, "__construct", NULL, 179, variable); zephir_check_call_status(); ZVAL_LONG(&_67$$15, ((1 | 2) | 4)); - ZEPHIR_CALL_METHOD(&props$$15, &reflect$$15, "getproperties", NULL, 182, &_67$$15); + ZEPHIR_CALL_METHOD(&props$$15, &reflect$$15, "getproperties", NULL, 183, &_67$$15); zephir_check_call_status(); zephir_is_iterable(&props$$15, 0, "phalcon/Support/Debug/Dump.zep", 289); if (Z_TYPE_P(&props$$15) == IS_ARRAY) { @@ -1262,7 +1262,7 @@ PHP_METHOD(Phalcon_Support_Debug_Dump, output) ZEPHIR_CONCAT_VV(return_value, &output, &_145$$26); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_147, "is_float", NULL, 233, variable); + ZEPHIR_CALL_FUNCTION(&_147, "is_float", NULL, 234, variable); zephir_check_call_status(); if (zephir_is_true(&_147)) { ZEPHIR_INIT_VAR(&_148$$27); @@ -1423,12 +1423,12 @@ PHP_METHOD(Phalcon_Support_Debug_Dump, encode) ZVAL_LONG(&_1, depth); ZEPHIR_INIT_VAR(&encoded); zephir_json_encode(&encoded, data, zephir_get_intval(&_0) ); - ZEPHIR_CALL_FUNCTION(&_2, "json_last_error", NULL, 214); + ZEPHIR_CALL_FUNCTION(&_2, "json_last_error", NULL, 215); zephir_check_call_status(); if (UNEXPECTED(!ZEPHIR_IS_LONG_IDENTICAL(&_2, 0))) { ZEPHIR_INIT_VAR(&_3$$3); object_init_ex(&_3$$3, spl_ce_InvalidArgumentException); - ZEPHIR_CALL_FUNCTION(&_4$$3, "json_last_error_msg", NULL, 215); + ZEPHIR_CALL_FUNCTION(&_4$$3, "json_last_error_msg", NULL, 216); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5$$3); ZEPHIR_CONCAT_SV(&_5$$3, "json_encode error: ", &_4$$3); diff --git a/ext/phalcon/support/helper/arr/blacklist.zep.c b/ext/phalcon/support/helper/arr/blacklist.zep.c index 834d031b326..1b18501bd47 100644 --- a/ext/phalcon/support/helper/arr/blacklist.zep.c +++ b/ext/phalcon/support/helper/arr/blacklist.zep.c @@ -76,9 +76,9 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_Blacklist, __invoke) zephir_create_closure_ex(&_0, NULL, phalcon_15__closure_ce, SL("__invoke")); ZEPHIR_CALL_METHOD(&blackListed, this_ptr, "tofilter", NULL, 0, &blackList, &_0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "array_flip", NULL, 127, &blackListed); + ZEPHIR_CALL_FUNCTION(&_1, "array_flip", NULL, 128, &blackListed); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("array_diff_key", NULL, 126, &collection, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("array_diff_key", NULL, 127, &collection, &_1); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/support/helper/arr/group.zep.c b/ext/phalcon/support/helper/arr/group.zep.c index 919ed56e50c..81c487eb810 100644 --- a/ext/phalcon/support/helper/arr/group.zep.c +++ b/ext/phalcon/support/helper/arr/group.zep.c @@ -193,7 +193,7 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_Group, processCallable) ZEPHIR_CALL_METHOD(&_0, this_ptr, "iscallable", NULL, 0, method); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { - ZEPHIR_CALL_FUNCTION(&key, "call_user_func", NULL, 205, method, element); + ZEPHIR_CALL_FUNCTION(&key, "call_user_func", NULL, 206, method, element); zephir_check_call_status(); zephir_array_update_multi(&output, element, SL("za"), 2, &key); } diff --git a/ext/phalcon/support/helper/arr/isunique.zep.c b/ext/phalcon/support/helper/arr/isunique.zep.c index ac4f3721485..6005d43e7e2 100644 --- a/ext/phalcon/support/helper/arr/isunique.zep.c +++ b/ext/phalcon/support/helper/arr/isunique.zep.c @@ -65,7 +65,7 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_IsUnique, __invoke) zephir_get_arrval(&collection, collection_param); - ZEPHIR_CALL_FUNCTION(&_0, "array_unique", NULL, 197, &collection); + ZEPHIR_CALL_FUNCTION(&_0, "array_unique", NULL, 198, &collection); zephir_check_call_status(); RETURN_MM_BOOL(zephir_fast_count_int(&collection) == zephir_fast_count_int(&_0)); } diff --git a/ext/phalcon/support/helper/arr/last.zep.c b/ext/phalcon/support/helper/arr/last.zep.c index ca8dc4cb5e5..fd66e694fae 100644 --- a/ext/phalcon/support/helper/arr/last.zep.c +++ b/ext/phalcon/support/helper/arr/last.zep.c @@ -77,7 +77,7 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_Last, __invoke) ZEPHIR_CALL_METHOD(&filtered, this_ptr, "tofilter", NULL, 0, &collection, method); zephir_check_call_status(); ZEPHIR_MAKE_REF(&filtered); - ZEPHIR_RETURN_CALL_FUNCTION("end", NULL, 343, &filtered); + ZEPHIR_RETURN_CALL_FUNCTION("end", NULL, 344, &filtered); ZEPHIR_UNREF(&filtered); zephir_check_call_status(); RETURN_MM(); diff --git a/ext/phalcon/support/helper/arr/whitelist.zep.c b/ext/phalcon/support/helper/arr/whitelist.zep.c index 6e3db3b54ef..8f7d20b7042 100644 --- a/ext/phalcon/support/helper/arr/whitelist.zep.c +++ b/ext/phalcon/support/helper/arr/whitelist.zep.c @@ -76,7 +76,7 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_Whitelist, __invoke) zephir_create_closure_ex(&_0, NULL, phalcon_16__closure_ce, SL("__invoke")); ZEPHIR_CALL_METHOD(&filtered, this_ptr, "tofilter", NULL, 0, &whiteList, &_0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "array_flip", NULL, 127, &filtered); + ZEPHIR_CALL_FUNCTION(&_1, "array_flip", NULL, 128, &filtered); zephir_check_call_status(); ZEPHIR_RETURN_CALL_FUNCTION("array_intersect_key", NULL, 2, &collection, &_1); zephir_check_call_status(); diff --git a/ext/phalcon/support/helper/file/basename.zep.c b/ext/phalcon/support/helper/file/basename.zep.c index d501d0b9beb..8550d09fdd2 100644 --- a/ext/phalcon/support/helper/file/basename.zep.c +++ b/ext/phalcon/support/helper/file/basename.zep.c @@ -100,7 +100,7 @@ PHP_METHOD(Phalcon_Support_Helper_File_Basename, __invoke) ZVAL_STRING(&_2, "/"); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "@"); - ZEPHIR_CALL_FUNCTION(&_4, "preg_quote", NULL, 437, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "preg_quote", NULL, 438, &_2, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5); ZEPHIR_CONCAT_SVS(&_5, "@[^", &_4, "]+$@"); @@ -116,7 +116,7 @@ PHP_METHOD(Phalcon_Support_Helper_File_Basename, __invoke) if (1 != ZEPHIR_IS_EMPTY(&suffix)) { ZEPHIR_INIT_VAR(&_6$$3); ZVAL_STRING(&_6$$3, "@"); - ZEPHIR_CALL_FUNCTION(&_7$$3, "preg_quote", NULL, 437, &suffix, &_6$$3); + ZEPHIR_CALL_FUNCTION(&_7$$3, "preg_quote", NULL, 438, &suffix, &_6$$3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_8$$3); ZEPHIR_CONCAT_SVS(&_8$$3, "@", &_7$$3, "$@"); diff --git a/ext/phalcon/support/helper/json/decode.zep.c b/ext/phalcon/support/helper/json/decode.zep.c index 4974669cf0a..11df24ccbe9 100644 --- a/ext/phalcon/support/helper/json/decode.zep.c +++ b/ext/phalcon/support/helper/json/decode.zep.c @@ -107,12 +107,12 @@ PHP_METHOD(Phalcon_Support_Helper_Json_Decode, __invoke) ZVAL_LONG(&_2, options); ZEPHIR_INIT_VAR(&decoded); zephir_json_decode(&decoded, &data, zephir_get_intval(&_0) ); - ZEPHIR_CALL_FUNCTION(&_3, "json_last_error", NULL, 214); + ZEPHIR_CALL_FUNCTION(&_3, "json_last_error", NULL, 215); zephir_check_call_status(); if (!ZEPHIR_IS_LONG_IDENTICAL(&_3, 0)) { ZEPHIR_INIT_VAR(&_4$$3); object_init_ex(&_4$$3, spl_ce_InvalidArgumentException); - ZEPHIR_CALL_FUNCTION(&_5$$3, "json_last_error_msg", NULL, 215); + ZEPHIR_CALL_FUNCTION(&_5$$3, "json_last_error_msg", NULL, 216); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_6$$3); ZEPHIR_CONCAT_SV(&_6$$3, "json_decode error: ", &_5$$3); diff --git a/ext/phalcon/support/helper/json/encode.zep.c b/ext/phalcon/support/helper/json/encode.zep.c index 4b0bb936865..8dbc280ed17 100644 --- a/ext/phalcon/support/helper/json/encode.zep.c +++ b/ext/phalcon/support/helper/json/encode.zep.c @@ -107,12 +107,12 @@ PHP_METHOD(Phalcon_Support_Helper_Json_Encode, __invoke) ZVAL_LONG(&_2, depth); ZEPHIR_INIT_NVAR(&encoded); zephir_json_encode(&encoded, data, zephir_get_intval(&_1) ); - ZEPHIR_CALL_FUNCTION(&_3, "json_last_error", NULL, 214); + ZEPHIR_CALL_FUNCTION(&_3, "json_last_error", NULL, 215); zephir_check_call_status(); if (!ZEPHIR_IS_LONG_IDENTICAL(&_3, 0)) { ZEPHIR_INIT_VAR(&_4$$3); object_init_ex(&_4$$3, zephir_get_internal_ce(SL("jsonexception"))); - ZEPHIR_CALL_FUNCTION(&_5$$3, "json_last_error_msg", NULL, 215); + ZEPHIR_CALL_FUNCTION(&_5$$3, "json_last_error_msg", NULL, 216); zephir_check_call_status(); ZVAL_LONG(&_6$$3, 5); ZEPHIR_CALL_METHOD(NULL, &_4$$3, "__construct", NULL, 0, &_5$$3, &_6$$3); diff --git a/ext/phalcon/support/helper/str/concat.zep.c b/ext/phalcon/support/helper/str/concat.zep.c index 6435c9a3d2e..2e8ba565f3d 100644 --- a/ext/phalcon/support/helper/str/concat.zep.c +++ b/ext/phalcon/support/helper/str/concat.zep.c @@ -93,7 +93,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Concat, __invoke) ZEPHIR_UNREF(&arguments); zephir_check_call_status(); ZEPHIR_MAKE_REF(&arguments); - ZEPHIR_CALL_FUNCTION(&last, "end", NULL, 343, &arguments); + ZEPHIR_CALL_FUNCTION(&last, "end", NULL, 344, &arguments); ZEPHIR_UNREF(&arguments); zephir_check_call_status(); ZEPHIR_INIT_VAR(&prefix); diff --git a/ext/phalcon/support/helper/str/decapitalize.zep.c b/ext/phalcon/support/helper/str/decapitalize.zep.c index 3ae8785784b..e06876edac6 100644 --- a/ext/phalcon/support/helper/str/decapitalize.zep.c +++ b/ext/phalcon/support/helper/str/decapitalize.zep.c @@ -91,7 +91,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Decapitalize, __invoke) ZVAL_LONG(&_0, 1); - ZEPHIR_CALL_FUNCTION(&substr, "mb_substr", NULL, 247, &text, &_0); + ZEPHIR_CALL_FUNCTION(&substr, "mb_substr", NULL, 248, &text, &_0); zephir_check_call_status(); if (upperRest) { ZEPHIR_CALL_METHOD(&suffix, this_ptr, "toupper", NULL, 0, &substr, &encoding); @@ -101,7 +101,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Decapitalize, __invoke) } ZVAL_LONG(&_0, 0); ZVAL_LONG(&_2, 1); - ZEPHIR_CALL_FUNCTION(&_3, "mb_substr", NULL, 247, &text, &_0, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "mb_substr", NULL, 248, &text, &_0, &_2); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_1, this_ptr, "tolower", NULL, 0, &_3, &encoding); zephir_check_call_status(); diff --git a/ext/phalcon/support/helper/str/dirfromfile.zep.c b/ext/phalcon/support/helper/str/dirfromfile.zep.c index b600e9ad319..d7c78078210 100644 --- a/ext/phalcon/support/helper/str/dirfromfile.zep.c +++ b/ext/phalcon/support/helper/str/dirfromfile.zep.c @@ -79,12 +79,12 @@ PHP_METHOD(Phalcon_Support_Helper_Str_DirFromFile, __invoke) zephir_check_call_status(); ZVAL_LONG(&_0, 0); ZVAL_LONG(&_1, -2); - ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 247, &name, &_0, &_1); + ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 248, &name, &_0, &_1); zephir_check_call_status(); if (!zephir_is_true(&start)) { ZVAL_LONG(&_2$$3, 0); ZVAL_LONG(&_3$$3, 1); - ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 247, &name, &_2$$3, &_3$$3); + ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 248, &name, &_2$$3, &_3$$3); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_4); diff --git a/ext/phalcon/support/helper/str/dynamic.zep.c b/ext/phalcon/support/helper/str/dynamic.zep.c index db8d62c8666..6eac40be677 100644 --- a/ext/phalcon/support/helper/str/dynamic.zep.c +++ b/ext/phalcon/support/helper/str/dynamic.zep.c @@ -142,9 +142,9 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Dynamic, __invoke) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_FUNCTION(&ldS, "preg_quote", NULL, 437, &leftDelimiter); + ZEPHIR_CALL_FUNCTION(&ldS, "preg_quote", NULL, 438, &leftDelimiter); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&rdS, "preg_quote", NULL, 437, &rightDelimiter); + ZEPHIR_CALL_FUNCTION(&rdS, "preg_quote", NULL, 438, &rightDelimiter); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); ZEPHIR_CONCAT_SVSVVSVS(&_4, "/", &ldS, "([^", &ldS, &rdS, "]+)", &rdS, "/"); @@ -174,11 +174,11 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Dynamic, __invoke) ZEPHIR_INIT_NVAR(&words); zephir_fast_explode(&words, &separator, &_9$$6, LONG_MAX); ZEPHIR_OBS_NVAR(&word); - ZEPHIR_CALL_FUNCTION(&_10$$6, "array_rand", &_11, 220, &words); + ZEPHIR_CALL_FUNCTION(&_10$$6, "array_rand", &_11, 221, &words); zephir_check_call_status(); zephir_array_fetch(&word, &words, &_10$$6, PH_NOISY, "phalcon/Support/Helper/Str/Dynamic.zep", 62); zephir_array_fetch_long(&_12$$6, &match, 0, PH_NOISY | PH_READONLY, "phalcon/Support/Helper/Str/Dynamic.zep", 63); - ZEPHIR_CALL_FUNCTION(&sub, "preg_quote", NULL, 437, &_12$$6, &separator); + ZEPHIR_CALL_FUNCTION(&sub, "preg_quote", NULL, 438, &_12$$6, &separator); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_13$$6); ZEPHIR_CONCAT_SVS(&_13$$6, "/", &sub, "/"); @@ -209,11 +209,11 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Dynamic, __invoke) ZEPHIR_INIT_NVAR(&words); zephir_fast_explode(&words, &separator, &_18$$8, LONG_MAX); ZEPHIR_OBS_NVAR(&word); - ZEPHIR_CALL_FUNCTION(&_19$$8, "array_rand", &_11, 220, &words); + ZEPHIR_CALL_FUNCTION(&_19$$8, "array_rand", &_11, 221, &words); zephir_check_call_status(); zephir_array_fetch(&word, &words, &_19$$8, PH_NOISY, "phalcon/Support/Helper/Str/Dynamic.zep", 62); zephir_array_fetch_long(&_20$$8, &match, 0, PH_NOISY | PH_READONLY, "phalcon/Support/Helper/Str/Dynamic.zep", 63); - ZEPHIR_CALL_FUNCTION(&sub, "preg_quote", NULL, 437, &_20$$8, &separator); + ZEPHIR_CALL_FUNCTION(&sub, "preg_quote", NULL, 438, &_20$$8, &separator); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_21$$8); ZEPHIR_CONCAT_SVS(&_21$$8, "/", &sub, "/"); diff --git a/ext/phalcon/support/helper/str/includes.zep.c b/ext/phalcon/support/helper/str/includes.zep.c index 22ee77b1848..35b37cbc478 100644 --- a/ext/phalcon/support/helper/str/includes.zep.c +++ b/ext/phalcon/support/helper/str/includes.zep.c @@ -68,7 +68,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Includes, __invoke) zephir_get_strval(&needle, needle_param); - ZEPHIR_CALL_FUNCTION(&_0, "mb_strpos", NULL, 484, &haystack, &needle); + ZEPHIR_CALL_FUNCTION(&_0, "mb_strpos", NULL, 485, &haystack, &needle); zephir_check_call_status(); RETURN_MM_BOOL(!ZEPHIR_IS_FALSE_IDENTICAL(&_0)); } diff --git a/ext/phalcon/support/helper/str/len.zep.c b/ext/phalcon/support/helper/str/len.zep.c index 412661e29b1..b4ac1c7e7b7 100644 --- a/ext/phalcon/support/helper/str/len.zep.c +++ b/ext/phalcon/support/helper/str/len.zep.c @@ -73,7 +73,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Len, __invoke) } - ZEPHIR_RETURN_CALL_FUNCTION("mb_strlen", NULL, 253, &text, &encoding); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strlen", NULL, 254, &text, &encoding); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/support/helper/str/random.zep.c b/ext/phalcon/support/helper/str/random.zep.c index 18a914347ad..54a8b13158a 100644 --- a/ext/phalcon/support/helper/str/random.zep.c +++ b/ext/phalcon/support/helper/str/random.zep.c @@ -133,37 +133,37 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Random, __invoke) ZVAL_STRING(&_3, "a"); ZEPHIR_INIT_VAR(&_4); ZVAL_STRING(&_4, "z"); - ZEPHIR_CALL_FUNCTION(&_5, "range", NULL, 336, &_3, &_4); + ZEPHIR_CALL_FUNCTION(&_5, "range", NULL, 337, &_3, &_4); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "A"); ZEPHIR_INIT_NVAR(&_4); ZVAL_STRING(&_4, "Z"); - ZEPHIR_CALL_FUNCTION(&_6, "range", NULL, 336, &_3, &_4); + ZEPHIR_CALL_FUNCTION(&_6, "range", NULL, 337, &_3, &_4); zephir_check_call_status(); zephir_fast_array_merge(&_2, &_5, &_6); zephir_array_update_long(&pools, 1, &_2, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY); ZEPHIR_INIT_NVAR(&_2); ZVAL_LONG(&_7, 0); ZVAL_LONG(&_8, 9); - ZEPHIR_CALL_FUNCTION(&_9, "range", NULL, 336, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&_9, "range", NULL, 337, &_7, &_8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "a"); ZEPHIR_INIT_NVAR(&_4); ZVAL_STRING(&_4, "f"); - ZEPHIR_CALL_FUNCTION(&_10, "range", NULL, 336, &_3, &_4); + ZEPHIR_CALL_FUNCTION(&_10, "range", NULL, 337, &_3, &_4); zephir_check_call_status(); zephir_fast_array_merge(&_2, &_9, &_10); zephir_array_update_long(&pools, 2, &_2, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY); ZVAL_LONG(&_7, 0); ZVAL_LONG(&_8, 9); - ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 336, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 337, &_7, &_8); zephir_check_call_status(); zephir_array_update_long(&pools, 3, &_11, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY); ZVAL_LONG(&_7, 1); ZVAL_LONG(&_8, 9); - ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 336, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 337, &_7, &_8); zephir_check_call_status(); zephir_array_update_long(&pools, 4, &_11, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY); ZEPHIR_INIT_NVAR(&_2); @@ -173,21 +173,21 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Random, __invoke) zephir_array_update_long(&pools, 5, &_11, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY); ZVAL_LONG(&_7, 0); ZVAL_LONG(&_8, 9); - ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 336, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 337, &_7, &_8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "a"); ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "z"); - ZEPHIR_CALL_FUNCTION(&_12, "range", NULL, 336, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&_12, "range", NULL, 337, &_2, &_3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "A"); ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Z"); - ZEPHIR_CALL_FUNCTION(&_13, "range", NULL, 336, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&_13, "range", NULL, 337, &_2, &_3); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_14, "array_merge", NULL, 353, &_11, &_12, &_13); + ZEPHIR_CALL_FUNCTION(&_14, "array_merge", NULL, 354, &_11, &_12, &_13); zephir_check_call_status(); zephir_array_update_long(&pools, 0, &_14, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY); zephir_array_fetch_long(&_15, &pools, type, PH_NOISY | PH_READONLY, "phalcon/Support/Helper/Str/Random.zep", 66); diff --git a/ext/phalcon/support/version.zep.c b/ext/phalcon/support/version.zep.c index 3943014f782..e1b445bf3ae 100644 --- a/ext/phalcon/support/version.zep.c +++ b/ext/phalcon/support/version.zep.c @@ -270,11 +270,11 @@ PHP_METHOD(Phalcon_Support_Version, getId) zephir_array_fetch_long(&specialNumber, &version, 4, PH_NOISY, "phalcon/Support/Version.zep", 161); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "%02s"); - ZEPHIR_CALL_FUNCTION(&_1, "sprintf", NULL, 144, &_0, &medium); + ZEPHIR_CALL_FUNCTION(&_1, "sprintf", NULL, 145, &_0, &medium); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_0); ZVAL_STRING(&_0, "%02s"); - ZEPHIR_CALL_FUNCTION(&_2, "sprintf", NULL, 144, &_0, &minor); + ZEPHIR_CALL_FUNCTION(&_2, "sprintf", NULL, 145, &_0, &minor); zephir_check_call_status(); ZEPHIR_CONCAT_VVVVV(return_value, &major, &_1, &_2, &special, &specialNumber); RETURN_MM(); diff --git a/ext/phalcon/tag.zep.c b/ext/phalcon/tag.zep.c index 1cd244f4408..0de98e264cd 100644 --- a/ext/phalcon/tag.zep.c +++ b/ext/phalcon/tag.zep.c @@ -960,7 +960,7 @@ PHP_METHOD(Phalcon_Tag, getTitle) zephir_read_static_property_ce(&_6$$3, phalcon_tag_ce, SL("documentPrependTitle"), PH_NOISY_CC); ZEPHIR_CPY_WRT(&documentPrependTitle, &_6$$3); if (!(ZEPHIR_IS_EMPTY(&documentPrependTitle))) { - ZEPHIR_CALL_FUNCTION(&tmp$$5, "array_reverse", NULL, 315, &documentPrependTitle); + ZEPHIR_CALL_FUNCTION(&tmp$$5, "array_reverse", NULL, 316, &documentPrependTitle); zephir_check_call_status(); zephir_is_iterable(&tmp$$5, 0, "phalcon/Tag.zep", 443); if (Z_TYPE_P(&tmp$$5) == IS_ARRAY) { @@ -3106,7 +3106,7 @@ PHP_METHOD(Phalcon_Tag, textArea) ZVAL_STRING(&_1, "", &_2, ""); diff --git a/ext/phalcon/tag/select.zep.c b/ext/phalcon/tag/select.zep.c index e6e0aee811c..cc601b7b472 100644 --- a/ext/phalcon/tag/select.zep.c +++ b/ext/phalcon/tag/select.zep.c @@ -292,7 +292,7 @@ PHP_METHOD(Phalcon_Tag_Select, optionsFromArray) } ZEPHIR_INIT_NVAR(&optionText); ZVAL_COPY(&optionText, _0); - ZEPHIR_CALL_FUNCTION(&escaped, "htmlspecialchars", &_4, 342, &optionValue); + ZEPHIR_CALL_FUNCTION(&escaped, "htmlspecialchars", &_4, 343, &optionValue); zephir_check_call_status(); if (Z_TYPE_P(&optionText) == IS_ARRAY) { ZEPHIR_INIT_NVAR(&_5$$4); @@ -345,7 +345,7 @@ PHP_METHOD(Phalcon_Tag_Select, optionsFromArray) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&optionText, &data, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&escaped, "htmlspecialchars", &_4, 342, &optionValue); + ZEPHIR_CALL_FUNCTION(&escaped, "htmlspecialchars", &_4, 343, &optionValue); zephir_check_call_status(); if (Z_TYPE_P(&optionText) == IS_ARRAY) { ZEPHIR_INIT_NVAR(&_16$$12); diff --git a/ext/phalcon/translate/interpolator/indexedarray.zep.c b/ext/phalcon/translate/interpolator/indexedarray.zep.c index 35f41720e28..d44e339122d 100644 --- a/ext/phalcon/translate/interpolator/indexedarray.zep.c +++ b/ext/phalcon/translate/interpolator/indexedarray.zep.c @@ -92,7 +92,7 @@ PHP_METHOD(Phalcon_Translate_Interpolator_IndexedArray, replacePlaceholders) if (1 != ZEPHIR_IS_EMPTY(&placeholders)) { ZEPHIR_MAKE_REF(&placeholders); - ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 290, &placeholders, &translation); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 291, &placeholders, &translation); ZEPHIR_UNREF(&placeholders); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_0$$3); diff --git a/phalcon/Cache/AbstractCache.zep b/phalcon/Cache/AbstractCache.zep new file mode 100644 index 00000000000..2ded899a08f --- /dev/null +++ b/phalcon/Cache/AbstractCache.zep @@ -0,0 +1,275 @@ + +/** + * 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\Cache; + +use DateInterval; +use Phalcon\Cache\Adapter\AdapterInterface; +use Phalcon\Cache\Exception\InvalidArgumentException; +use Traversable; + +/** + * This component offers caching capabilities for your application. + * Phalcon\Cache implements PSR-16. + * + * @property AdapterInterface $adapter + */ +abstract class AbstractCache implements CacheInterface +{ + /** + * The adapter + * + * @var AdapterInterface + */ + protected adapter; + + /** + * Constructor. + * + * @param AdapterInterface $adapter The cache adapter + */ + public function __construct( adapter) + { + let this->adapter = adapter; + } + + /** + * Returns the current adapter + * + * @return AdapterInterface + */ + public function getAdapter() -> + { + return this->adapter; + } + + /** + * Checks the key. If it contains invalid characters an exception is thrown + * + * @param mixed $key + * + * @throws InvalidArgumentException + */ + protected function checkKey(string key) -> void + { + var exception; + + if (preg_match("/[^A-Za-z0-9-_.]/", key)) { + let exception = this->getExceptionClass(); + throw new {exception}( + "The key contains invalid characters" + ); + } + } + + /** + * Checks the key. If it contains invalid characters an exception is thrown + * + * @param mixed $keys + * + * @throws InvalidArgumentException + */ + protected function checkKeys(var keys) -> void + { + var exception; + + if (!(typeof keys === "array" || keys instanceof Traversable)) { + let exception = this->getExceptionClass(); + throw new {exception}( + "The keys need to be an array or instance of Traversable" + ); + } + } + + /** + * Wipes clean the entire cache's keys. + * + * @return bool True on success and false on failure. + */ + protected function doClear() -> bool + { + return this->adapter->clear(); + } + + /** + * Delete an item from the cache by its unique key. + * + * @param string $key The unique cache key of the item to delete. + * + * @return bool True if the item was successfully removed. False if there + * was an error. + * + * @throws InvalidArgumentException MUST be thrown if the $key string is + * not a legal value. + */ + protected function doDelete(string key) -> bool + { + this->checkKey(key); + + return this->adapter->delete(key); + } + + /** + * Deletes multiple cache items in a single operation. + * + * @param iterable $keys A list of string-based keys to be deleted. + * + * @return bool True if the items were successfully removed. False if there + * was an error. + * + * @throws InvalidArgumentException MUST be thrown if $keys is neither an + * array nor a Traversable, or if any of + * the $keys are not a legal value. + */ + protected function doDeleteMultiple(keys) -> bool + { + var key, result; + + this->checkKeys(keys); + + let result = true; + for key in keys { + if (true !== this->adapter->delete(key)) { + let result = false; + } + } + + return result; + } + + /** + * Fetches a value from the cache. + * + * @param string $key The unique key of this item in the cache. + * @param mixed $defaultValue Default value to return if the key does not exist. + * + * @return mixed The value of the item from the cache, or $default in case + * of cache miss. + * + * @throws InvalidArgumentException MUST be thrown if the $key string is + * not a legal value. + */ + protected function doGet(string key, defaultValue = null) + { + this->checkKey(key); + + return this->adapter->get(key, defaultValue); + } + + /** + * Obtains multiple cache items by their unique keys. + * + * @param iterable $keys A list of keys that can obtained + * in a single operation. + * @param mixed $defaultValue Default value to return for keys + * that do not exist. + * + * @return iterable A list of key => value pairs. Cache + * keys that do not exist or are stale will have $default as value. + * + * @throws InvalidArgumentException MUST be thrown if $keys is neither an + * array nor a Traversable, or if any of the $keys are not a legal value. + */ + protected function doGetMultiple(keys, defaultValue = null) + { + var element, results; + + this->checkKeys(keys); + + let results = []; + for element in keys { + let results[element] = this->get(element, defaultValue); + } + + return results; + } + + /** + * Determines whether an item is present in the cache. + * + * @param string $key The cache item key. + * + * @return bool + * + * @throws InvalidArgumentException MUST be thrown if the $key string is + * not a legal value. + */ + protected function doHas(string key) -> bool + { + this->checkKey(key); + + return this->adapter->has(key); + } + + /** + * Persists data in the cache, uniquely referenced by a key with an optional + * expiration TTL time. + * + * @param string $key The key of the item to store. + * @param mixed $value The value of the item to store. + * Must be serializable. + * @param null|int|DateInterval $ttl Optional. The TTL value of this + * item. If no value is sent and the + * driver supports TTL then the library + * may set a default value for it or + * let the driver take care of that. + * + * @return bool True on success and false on failure. + * + * @throws InvalidArgumentException MUST be thrown if the $key string is not + * a legal value. + */ + protected function doSet(string key, value, ttl = null) -> bool + { + this->checkKey(key); + + return this->adapter->set(key, value, ttl); + } + + /** + * Persists a set of key => value pairs in the cache, with an optional TTL. + * + * @param iterable $values A list of key => value pairs for a + * multiple-set operation. + * @param null|int|DateInterval $ttl Optional. The TTL value of this + * item. If no value is sent and the + * driver supports TTL then the + * library may set a default value for + * it or let the driver take care of + * that. + * + * @return bool True on success and false on failure. + * + * @throws InvalidArgumentException MUST be thrown if $values is neither an + * array nor a Traversable, or if any of the $values are not a legal value. + */ + protected function doSetMultiple(values, ttl = null) -> bool + { + var key, result, value; + + this->checkKeys(values); + + let result = true; + for key, value in values { + if (true !== this->set(key, value, ttl)) { + let result = false; + } + } + + return result; + } + + /** + * Returns the exception class that will be used for exceptions thrown + * + * @return string + */ + abstract protected function getExceptionClass() -> string; +} diff --git a/phalcon/Cache/Cache.zep b/phalcon/Cache/Cache.zep index 2dfaee6f037..7060afd5ae2 100644 --- a/phalcon/Cache/Cache.zep +++ b/phalcon/Cache/Cache.zep @@ -12,9 +12,6 @@ namespace Phalcon\Cache; use DateInterval; use Phalcon\Cache\Adapter\AdapterInterface; -use Phalcon\Cache\Exception\InvalidArgumentException; -use Psr\SimpleCache\CacheInterface; -use Traversable; /** * This component offers caching capabilities for your application. @@ -22,25 +19,8 @@ use Traversable; * * @property AdapterInterface $adapter */ -class Cache implements CacheInterface +class Cache extends AbstractCache { - /** - * The adapter - * - * @var AdapterInterface - */ - protected adapter { get }; - - /** - * Constructor. - * - * @param AdapterInterface $adapter The cache adapter - */ - public function __construct( adapter) - { - let this->adapter = adapter; - } - /** * Wipes clean the entire cache's keys. * @@ -48,7 +28,7 @@ class Cache implements CacheInterface */ public function clear() -> bool { - return this->adapter->clear(); + return this->doClear(); } /** @@ -62,13 +42,9 @@ class Cache implements CacheInterface * @throws InvalidArgumentException MUST be thrown if the $key string is * not a legal value. */ - public function delete(var key) -> bool + public function delete(string key) -> bool { - let key = (string) key; - - this->checkKey(key); - - return this->adapter->delete(key); + return this->doDelete(key); } /** @@ -83,29 +59,16 @@ class Cache implements CacheInterface * array nor a Traversable, or if any of * the $keys are not a legal value. */ - public function deleteMultiple(var keys) -> bool + public function deleteMultiple(keys) -> bool { - var key, result; - - this->checkKeys(keys); - - let result = true; - - for key in keys { - if !this->adapter->delete(key) { - let result = false; - } - } - - return result; + return this->doDeleteMultiple(keys); } /** * Fetches a value from the cache. * * @param string $key The unique key of this item in the cache. - * @param mixed $defaultValue Default value to return if the key does - * not exist. + * @param mixed $defaultValue Default value to return if the key does not exist. * * @return mixed The value of the item from the cache, or $default in case * of cache miss. @@ -113,22 +76,18 @@ class Cache implements CacheInterface * @throws InvalidArgumentException MUST be thrown if the $key string is * not a legal value. */ - public function get(var key, var defaultValue = null) -> var + public function get(string $key, defaultValue = null) { - let key = (string) key; - - this->checkKey(key); - - return this->adapter->get(key, defaultValue); + return this->doGet(key, defaultValue); } /** * Obtains multiple cache items by their unique keys. * - * @param iterable $keys A list of keys that can obtained in a - * single operation. - * @param mixed defaultValue Default value to return for keys that do - * not exist. + * @param iterable $keys A list of keys that can obtained in a + * single operation. + * @param mixed $defaultValue Default value to return for keys that do + * not exist. * * @return iterable A list of key => value pairs. Cache * keys that do not exist or are stale will have $default as value. @@ -136,19 +95,9 @@ class Cache implements CacheInterface * @throws InvalidArgumentException MUST be thrown if $keys is neither an * array nor a Traversable, or if any of the $keys are not a legal value. */ - public function getMultiple(var keys, var defaultValue = null) -> var + public function getMultiple(keys, defaultValue = null) { - var element; - array results; - - this->checkKeys(keys); - - let results = []; - for element in keys { - let results[element] = this->get(element, defaultValue); - } - - return results; + return this->doGetMultiple(keys, defaultValue); } /** @@ -161,13 +110,9 @@ class Cache implements CacheInterface * @throws InvalidArgumentException MUST be thrown if the $key string is * not a legal value. */ - public function has(var key) -> bool + public function has(string key) -> bool { - let key = (string) key; - - this->checkKey(key); - - return this->adapter->has(key); + return this->doHas(key); } /** @@ -188,13 +133,9 @@ class Cache implements CacheInterface * @throws InvalidArgumentException MUST be thrown if the $key string is not * a legal value. */ - public function set(var key, var value, var ttl = null) -> bool + public function set(string key, var value, var ttl = null) -> bool { - let key = (string) key; - - this->checkKey(key); - - return this->adapter->set(key, value, ttl); + return this->doSet(key, value, ttl); } /** @@ -216,50 +157,16 @@ class Cache implements CacheInterface */ public function setMultiple(var values, var ttl = null) -> bool { - var key, value; - bool result; - - this->checkKeys(values); - - let result = true; - for key, value in values { - if !this->set(key, value, ttl) { - let result = false; - } - } - - return result; - } - - /** - * Checks the key. If it contains invalid characters an exception is thrown - * - * @param mixed $key - * - * @throws InvalidArgumentException - */ - protected function checkKey(string key) -> void - { - if preg_match("/[^A-Za-z0-9-_.]/", key) { - throw new InvalidArgumentException( - "The key contains invalid characters" - ); - } + return this->doSetMultiple(values, ttl); } /** - * Checks the key. If it contains invalid characters an exception is thrown - * - * @param mixed $keys + * Returns the exception class that will be used for exceptions thrown * - * @throws InvalidArgumentException + * @return string */ - protected function checkKeys(var keys) -> void + protected function getExceptionClass() -> string { - if !(typeof keys === "array" || keys instanceof Traversable) { - throw new InvalidArgumentException( - "The keys need to be an array or instance of Traversable" - ); - } + return "Phalcon\\Cache\\Exception\\InvalidArgumentException"; } } diff --git a/phalcon/Cache/CacheFactory.zep b/phalcon/Cache/CacheFactory.zep index 2288df68efe..38872cea313 100644 --- a/phalcon/Cache/CacheFactory.zep +++ b/phalcon/Cache/CacheFactory.zep @@ -15,7 +15,6 @@ use Phalcon\Cache\Cache; use Phalcon\Cache\Exception\Exception; use Phalcon\Config\ConfigInterface; use Phalcon\Factory\AbstractConfigFactory; -use Psr\SimpleCache\CacheInterface; /** * Creates a new Cache class diff --git a/phalcon/Cache/CacheInterface.zep b/phalcon/Cache/CacheInterface.zep new file mode 100644 index 00000000000..8586267d021 --- /dev/null +++ b/phalcon/Cache/CacheInterface.zep @@ -0,0 +1,135 @@ + +/** + * 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\Cache; + +use DateInterval; +use Phalcon\Cache\Exception\InvalidArgumentException; + +/** + * Interface for Phalcon\Cache\Cache + */ +interface CacheInterface +{ + /** + * Wipes clean the entire cache's keys. + * + * @return bool True on success and false on failure. + */ + public function clear() -> bool; + + /** + * Delete an item from the cache by its unique key. + * + * @param string $key The unique cache key of the item to delete. + * + * @return bool True if the item was successfully removed. False if there + * was an error. + * + * @throws InvalidArgumentException MUST be thrown if the $key string is + * not a legal value. + */ + public function delete(string key) -> bool; + + /** + * Deletes multiple cache items in a single operation. + * + * @param iterable $keys A list of string-based keys to be deleted. + * + * @return bool True if the items were successfully removed. False if there + * was an error. + * + * @throws InvalidArgumentException MUST be thrown if $keys is neither an + * array nor a Traversable, or if any of + * the $keys are not a legal value. + */ + public function deleteMultiple(var keys) -> bool; + + /** + * Fetches a value from the cache. + * + * @param string $key The unique key of this item in the cache. + * @param mixed $defaultValue Default value to return if the key does not exist. + * + * @return mixed The value of the item from the cache, or $default in case + * of cache miss. + * + * @throws InvalidArgumentException MUST be thrown if the $key string is + * not a legal value. + */ + public function get(string key, var defaultValue = null); + + /** + * Obtains multiple cache items by their unique keys. + * + * @param iterable $keys A list of keys that can obtained + * in a single operation. + * @param mixed defaultValue Default value to return for keys + * that do not exist. + * + * @return iterable A list of key => value pairs. Cache + * keys that do not exist or are stale will have $default as value. + * + * @throws InvalidArgumentException MUST be thrown if $keys is neither an + * array nor a Traversable, or if any of the $keys are not a legal value. + */ + public function getMultiple(var keys, var defaultValue = null); + + /** + * Determines whether an item is present in the cache. + * + * @param string $key The cache item key. + * + * @return bool + * + * @throws InvalidArgumentException MUST be thrown if the $key string is + * not a legal value. + */ + public function has(string key) -> bool; + + /** + * Persists data in the cache, uniquely referenced by a key with an optional + * expiration TTL time. + * + * @param string $key The key of the item to store. + * @param mixed $value The value of the item to store. + * Must be serializable. + * @param null|int|DateInterval $ttl Optional. The TTL value of this + * item. If no value is sent and the + * driver supports TTL then the library + * may set a default value for it or + * let the driver take care of that. + * + * @return bool True on success and false on failure. + * + * @throws InvalidArgumentException MUST be thrown if the $key string is not + * a legal value. + */ + public function set(string key, var value, var ttl = null) -> bool; + + /** + * Persists a set of key => value pairs in the cache, with an optional TTL. + * + * @param iterable $values A list of key => value pairs for a + * multiple-set operation. + * @param null|int|DateInterval $ttl Optional. The TTL value of this + * item. If no value is sent and the + * driver supports TTL then the + * library may set a default value for + * it or let the driver take care of + * that. + * + * @return bool True on success and false on failure. + * + * @throws InvalidArgumentException MUST be thrown if $values is neither an + * array nor a Traversable, or if any of the $values are not a legal value. + */ + public function setMultiple(var values, var ttl = null) -> bool; +} diff --git a/phalcon/Cache/Exception/Exception.zep b/phalcon/Cache/Exception/Exception.zep index 468269e7875..94a96abe3d2 100644 --- a/phalcon/Cache/Exception/Exception.zep +++ b/phalcon/Cache/Exception/Exception.zep @@ -13,7 +13,7 @@ namespace Phalcon\Cache\Exception; /** * Exceptions thrown in Phalcon\Cache will use this class */ -class Exception extends \Exception implements \Psr\SimpleCache\CacheException +class Exception extends \Exception { } diff --git a/phalcon/Cache/Exception/InvalidArgumentException.zep b/phalcon/Cache/Exception/InvalidArgumentException.zep index 3b369c2f693..adedf84626d 100644 --- a/phalcon/Cache/Exception/InvalidArgumentException.zep +++ b/phalcon/Cache/Exception/InvalidArgumentException.zep @@ -13,7 +13,7 @@ namespace Phalcon\Cache\Exception; /** * Exceptions thrown in Phalcon\Cache will use this class */ -class InvalidArgumentException extends \Exception implements \Psr\SimpleCache\InvalidArgumentException +class InvalidArgumentException extends \Exception { } diff --git a/phalcon/Mvc/Model/Query.zep b/phalcon/Mvc/Model/Query.zep index b67ee506166..0b568ba1639 100644 --- a/phalcon/Mvc/Model/Query.zep +++ b/phalcon/Mvc/Model/Query.zep @@ -24,7 +24,6 @@ use Phalcon\Mvc\Model\Resultset\Simple; use Phalcon\Di\InjectionAwareInterface; use Phalcon\Db\DialectInterface; use Phalcon\Mvc\Model\Query\Lang; -use Psr\SimpleCache\CacheInterface; /** * Phalcon\Mvc\Model\Query @@ -100,7 +99,7 @@ class Query implements QueryInterface, InjectionAwareInterface protected bindTypes = []; /** - * @var \Psr\SimpleCache\CacheInterface|null + * @var mixed|null */ protected cache = null; @@ -297,8 +296,14 @@ class Query implements QueryInterface, InjectionAwareInterface let cache = this->container->getShared(cacheService); - if unlikely !(cache instanceof CacheInterface) { - throw new Exception("Cache service must be an object implementing Psr\SimpleCache\CacheInterface"); + if unlikely ( + true !== is_a(cache, "Phalcon\\Cache\\CacheInterface") && + true !== is_a(cache, "Psr\\SimpleCache\\CacheInterface") + ) { + throw new Exception( + "Cache service must be an object implementing " . + "Phalcon\Cache\CacheInterface or Psr\SimpleCache\CacheInterface" + ); } let result = cache->get(key); diff --git a/phalcon/Mvc/Model/Resultset.zep b/phalcon/Mvc/Model/Resultset.zep index ae846638a4d..02af10c44b4 100644 --- a/phalcon/Mvc/Model/Resultset.zep +++ b/phalcon/Mvc/Model/Resultset.zep @@ -20,7 +20,6 @@ use Phalcon\Messages\MessageInterface; use Phalcon\Mvc\Model; use Phalcon\Mvc\ModelInterface; use Phalcon\Storage\Serializer\SerializerInterface; -use Psr\SimpleCache\CacheInterface; use SeekableIterator; use Serializable; @@ -129,17 +128,17 @@ abstract class Resultset /** * Phalcon\Mvc\Model\Resultset constructor * - * @param ResultInterface|false result - * @param CacheInterface|null cache + * @param ResultInterface|false $result + * @param mixed|null $cache */ - public function __construct(result, cache = null) + public function __construct(var result, var cache = null) { var prefetchRecords, rowCount, rows; /** * 'false' is given as result for empty result-sets */ - if typeof result != "object" { + if typeof result !== "object" { let this->count = 0; let this->rows = []; @@ -155,6 +154,17 @@ abstract class Resultset * Update the related cache if any */ if cache !== null { + if unlikely ( + true !== is_a(cache, "Phalcon\\Cache\\CacheInterface") && + true !== is_a(cache, "Psr\\SimpleCache\\CacheInterface") + ) { + throw new Exception( + "Cache service must be an object implementing " . + "Phalcon\Cache\CacheInterface or Psr\SimpleCache\CacheInterface" + ); + } + + let this->cache = cache; } diff --git a/phalcon/Mvc/Model/Resultset/Complex.zep b/phalcon/Mvc/Model/Resultset/Complex.zep index 072a4811c5a..5da80d89fb8 100644 --- a/phalcon/Mvc/Model/Resultset/Complex.zep +++ b/phalcon/Mvc/Model/Resultset/Complex.zep @@ -20,7 +20,6 @@ use Phalcon\Mvc\Model\ResultsetInterface; use Phalcon\Mvc\Model\Row; use Phalcon\Mvc\ModelInterface; use Phalcon\Storage\Serializer\SerializerInterface; -use Psr\SimpleCache\CacheInterface; use stdClass; /** @@ -47,14 +46,14 @@ class Complex extends Resultset implements ResultsetInterface /** * Phalcon\Mvc\Model\Resultset\Complex constructor * - * @param array columnTypes - * @param ResultInterface|null result - * @param CacheInterface|null cache + * @param array $columnTypes + * @param ResultInterface|null $result + * @param mixed|null $cache */ public function __construct( var columnTypes, result = null, - cache = null + var cache = null ) { /** diff --git a/phalcon/Mvc/Model/Resultset/Simple.zep b/phalcon/Mvc/Model/Resultset/Simple.zep index a6cd38aca1e..bd1e7445706 100644 --- a/phalcon/Mvc/Model/Resultset/Simple.zep +++ b/phalcon/Mvc/Model/Resultset/Simple.zep @@ -18,7 +18,6 @@ use Phalcon\Mvc\Model\Resultset; use Phalcon\Mvc\Model\Row; use Phalcon\Mvc\ModelInterface; use Phalcon\Storage\Serializer\SerializerInterface; -use Psr\SimpleCache\CacheInterface; /** * Phalcon\Mvc\Model\Resultset\Simple @@ -49,14 +48,14 @@ class Simple extends Resultset * @param array columnMap * @param ModelInterface|Row model * @param \Phalcon\Db\ResultInterface|false result - * @param CacheInterface|null cache + * @param mixed|null cache * @param bool keepSnapshots false */ public function __construct( var columnMap, var model, result, - cache = null, + var cache = null, bool keepSnapshots = false ) { diff --git a/phalcon/Mvc/Model/ResultsetInterface.zep b/phalcon/Mvc/Model/ResultsetInterface.zep index 7052d397e59..8c1b2062773 100644 --- a/phalcon/Mvc/Model/ResultsetInterface.zep +++ b/phalcon/Mvc/Model/ResultsetInterface.zep @@ -13,7 +13,6 @@ namespace Phalcon\Mvc\Model; use Closure; use Phalcon\Messages\MessageInterface; use Phalcon\Mvc\ModelInterface; -use Psr\SimpleCache\CacheInterface; /** * Phalcon\Mvc\Model\ResultsetInterface @@ -45,7 +44,7 @@ interface ResultsetInterface /** * Returns the associated cache for the resultset */ - public function getCache() -> | null; + public function getCache() -> var | null; /** * Get first row in the resultset diff --git a/tests/database/Mvc/Model/FindCest.php b/tests/database/Mvc/Model/FindCest.php index 7da03b5aac8..57e5f5048fa 100644 --- a/tests/database/Mvc/Model/FindCest.php +++ b/tests/database/Mvc/Model/FindCest.php @@ -226,7 +226,8 @@ public function mvcModelFindWithCacheException(DatabaseTester $I) $I->expectThrowable( new Exception( - 'Cache service must be an object implementing Psr\SimpleCache\CacheInterface' + "Cache service must be an object implementing " . + "Phalcon\Cache\CacheInterface or Psr\SimpleCache\CacheInterface" ), function () { $options = [ diff --git a/tests/integration/Cache/Cache/ConstructCest.php b/tests/integration/Cache/Cache/ConstructCest.php index bdecd1f3243..2665f6ae9f7 100644 --- a/tests/integration/Cache/Cache/ConstructCest.php +++ b/tests/integration/Cache/Cache/ConstructCest.php @@ -17,7 +17,7 @@ use Phalcon\Cache\AdapterFactory; use Phalcon\Cache\Cache; use Phalcon\Storage\SerializerFactory; -use Psr\SimpleCache\CacheInterface; +use Phalcon\Cache\CacheInterface; class ConstructCest { diff --git a/tests/integration/Cache/CacheFactory/LoadCest.php b/tests/integration/Cache/CacheFactory/LoadCest.php index d445c119944..6031b10bd2f 100644 --- a/tests/integration/Cache/CacheFactory/LoadCest.php +++ b/tests/integration/Cache/CacheFactory/LoadCest.php @@ -19,7 +19,7 @@ use Phalcon\Cache\CacheFactory; use Phalcon\Storage\SerializerFactory; use Phalcon\Tests\Fixtures\Traits\FactoryTrait; -use Psr\SimpleCache\CacheInterface; +use Phalcon\Cache\CacheInterface; class LoadCest { diff --git a/tests/integration/Cache/CacheFactory/NewInstanceCest.php b/tests/integration/Cache/CacheFactory/NewInstanceCest.php index d3918b4bcc0..414b9660104 100644 --- a/tests/integration/Cache/CacheFactory/NewInstanceCest.php +++ b/tests/integration/Cache/CacheFactory/NewInstanceCest.php @@ -19,7 +19,7 @@ use Phalcon\Cache\CacheFactory; use Phalcon\Cache\Exception\Exception; use Phalcon\Storage\SerializerFactory; -use Psr\SimpleCache\CacheInterface; +use Phalcon\Cache\CacheInterface; use function uniqid; diff --git a/tests/unit/Logger/Logger/ConstructCest.php b/tests/unit/Logger/Logger/ConstructCest.php index 06d379429c1..daf0775dcc0 100644 --- a/tests/unit/Logger/Logger/ConstructCest.php +++ b/tests/unit/Logger/Logger/ConstructCest.php @@ -30,7 +30,7 @@ class ConstructCest * @author Phalcon Team * @since 2020-09-09 */ - public function loggerConstructImplementPsr(UnitTester $I) + public function loggerConstruct(UnitTester $I) { $I->wantToTest('Logger - __construct()');