diff --git a/ext/config.m4 b/ext/config.m4 index cfa10d8b8d..eef989933f 100644 --- a/ext/config.m4 +++ b/ext/config.m4 @@ -16,17 +16,17 @@ if test "$PHP_PHALCON" = "yes"; then phalcon/validation/abstractvalidator.zep.c phalcon/events/eventsawareinterface.zep.c phalcon/html/helper/input/abstractinput.zep.c + phalcon/factory/abstractconfigfactory.zep.c phalcon/support/collection/collectioninterface.zep.c phalcon/di/abstractinjectionaware.zep.c - phalcon/factory/abstractconfigfactory.zep.c phalcon/storage/adapter/adapterinterface.zep.c phalcon/factory/abstractfactory.zep.c phalcon/di/injectable.zep.c phalcon/forms/element/elementinterface.zep.c phalcon/forms/element/abstractelement.zep.c + phalcon/support/helper/str/abstractstr.zep.c phalcon/storage/adapter/abstractadapter.zep.c phalcon/support/collection.zep.c - phalcon/support/helper/str/abstractstr.zep.c phalcon/support/helper/arr/abstractarr.zep.c phalcon/dispatcher/dispatcherinterface.zep.c phalcon/encryption/crypt/padding/padinterface.zep.c @@ -420,7 +420,6 @@ if test "$PHP_PHALCON" = "yes"; then phalcon/kernel.zep.c phalcon/loader.zep.c phalcon/loader/exception.zep.c - phalcon/logger.zep.c phalcon/logger/adapter/noop.zep.c phalcon/logger/adapter/stream.zep.c phalcon/logger/adapter/syslog.zep.c @@ -429,6 +428,7 @@ if test "$PHP_PHALCON" = "yes"; then phalcon/logger/formatter/json.zep.c phalcon/logger/formatter/line.zep.c phalcon/logger/item.zep.c + phalcon/logger/logger.zep.c phalcon/logger/loggerfactory.zep.c phalcon/messages/exception.zep.c phalcon/messages/message.zep.c diff --git a/ext/config.w32 b/ext/config.w32 index 8c256b9f22..45c5b6d319 100644 --- a/ext/config.w32 +++ b/ext/config.w32 @@ -14,18 +14,18 @@ if (PHP_PHALCON != "no") { ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/model/query", "scanner.c parser.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/view/engine/volt", "parser.c scanner.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/url", "utils.c", "phalcon"); - ADD_SOURCES(configure_module_dirname + "/phalcon", "exception.zep.c di.zep.c container.zep.c escaper.zep.c kernel.zep.c loader.zep.c logger.zep.c registry.zep.c tag.zep.c text.zep.c url.zep.c validation.zep.c 0__closure.zep.c 1__closure.zep.c 2__closure.zep.c 3__closure.zep.c 4__closure.zep.c 5__closure.zep.c 6__closure.zep.c 7__closure.zep.c 8__closure.zep.c 9__closure.zep.c 10__closure.zep.c 11__closure.zep.c 12__closure.zep.c 13__closure.zep.c 14__closure.zep.c 15__closure.zep.c 16__closure.zep.c 17__closure.zep.c 18__closure.zep.c 19__closure.zep.c 20__closure.zep.c", "phalcon"); + ADD_SOURCES(configure_module_dirname + "/phalcon", "exception.zep.c di.zep.c container.zep.c escaper.zep.c kernel.zep.c loader.zep.c registry.zep.c tag.zep.c text.zep.c url.zep.c validation.zep.c 0__closure.zep.c 1__closure.zep.c 2__closure.zep.c 3__closure.zep.c 4__closure.zep.c 5__closure.zep.c 6__closure.zep.c 7__closure.zep.c 8__closure.zep.c 9__closure.zep.c 10__closure.zep.c 11__closure.zep.c 12__closure.zep.c 13__closure.zep.c 14__closure.zep.c 15__closure.zep.c 16__closure.zep.c 17__closure.zep.c 18__closure.zep.c 19__closure.zep.c 20__closure.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/di", "injectionawareinterface.zep.c abstractinjectionaware.zep.c injectable.zep.c diinterface.zep.c exception.zep.c factorydefault.zep.c serviceinterface.zep.c service.zep.c serviceproviderinterface.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/html/helper", "abstracthelper.zep.c abstractseries.zep.c abstractlist.zep.c ol.zep.c style.zep.c anchor.zep.c base.zep.c body.zep.c button.zep.c close.zep.c element.zep.c form.zep.c img.zep.c label.zep.c link.zep.c meta.zep.c script.zep.c title.zep.c ul.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/validation", "validatorinterface.zep.c abstractvalidator.zep.c validatorcompositeinterface.zep.c abstractvalidatorcomposite.zep.c abstractcombinedfieldsvalidator.zep.c validationinterface.zep.c exception.zep.c validatorfactory.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/events", "eventsawareinterface.zep.c abstracteventsaware.zep.c eventinterface.zep.c managerinterface.zep.c event.zep.c exception.zep.c manager.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/html/helper/input", "abstractinput.zep.c checkbox.zep.c color.zep.c date.zep.c datetime.zep.c datetimelocal.zep.c email.zep.c file.zep.c hidden.zep.c image.zep.c input.zep.c month.zep.c numeric.zep.c password.zep.c radio.zep.c range.zep.c search.zep.c select.zep.c submit.zep.c tel.zep.c text.zep.c textarea.zep.c time.zep.c url.zep.c week.zep.c", "phalcon"); - ADD_SOURCES(configure_module_dirname + "/phalcon/support/collection", "collectioninterface.zep.c exception.zep.c readonly.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/factory", "abstractconfigfactory.zep.c abstractfactory.zep.c exception.zep.c", "phalcon"); + ADD_SOURCES(configure_module_dirname + "/phalcon/support/collection", "collectioninterface.zep.c exception.zep.c readonly.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/storage/adapter", "adapterinterface.zep.c abstractadapter.zep.c apcu.zep.c libmemcached.zep.c memory.zep.c redis.zep.c stream.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/forms/element", "elementinterface.zep.c abstractelement.zep.c check.zep.c date.zep.c email.zep.c file.zep.c hidden.zep.c numeric.zep.c password.zep.c radio.zep.c select.zep.c submit.zep.c text.zep.c textarea.zep.c", "phalcon"); - ADD_SOURCES(configure_module_dirname + "/phalcon/support", "collection.zep.c debug.zep.c exception.zep.c helperfactory.zep.c version.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/support/helper/str", "abstractstr.zep.c camelize.zep.c concat.zep.c countvowels.zep.c decapitalize.zep.c decrement.zep.c dirfromfile.zep.c dirseparator.zep.c dynamic.zep.c endswith.zep.c firstbetween.zep.c friendly.zep.c humanize.zep.c includes.zep.c increment.zep.c interpolate.zep.c isanagram.zep.c islower.zep.c ispalindrome.zep.c isupper.zep.c len.zep.c lower.zep.c prefix.zep.c random.zep.c reduceslashes.zep.c startswith.zep.c suffix.zep.c ucwords.zep.c uncamelize.zep.c underscore.zep.c upper.zep.c", "phalcon"); + ADD_SOURCES(configure_module_dirname + "/phalcon/support", "collection.zep.c debug.zep.c exception.zep.c helperfactory.zep.c version.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/support/helper/arr", "abstractarr.zep.c blacklist.zep.c chunk.zep.c first.zep.c firstkey.zep.c flatten.zep.c get.zep.c group.zep.c has.zep.c isunique.zep.c last.zep.c lastkey.zep.c order.zep.c pluck.zep.c set.zep.c sliceleft.zep.c sliceright.zep.c split.zep.c toobject.zep.c validateall.zep.c validateany.zep.c whitelist.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/dispatcher", "dispatcherinterface.zep.c abstractdispatcher.zep.c exception.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/encryption/crypt/padding", "padinterface.zep.c ansi.zep.c iso10126.zep.c isoiek.zep.c noop.zep.c pkcs7.zep.c space.zep.c zero.zep.c", "phalcon"); @@ -112,7 +112,7 @@ if (PHP_PHALCON != "no") { ADD_SOURCES(configure_module_dirname + "/phalcon/http/server", "abstractmiddleware.zep.c abstractrequesthandler.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/image", "enum.zep.c exception.zep.c imagefactory.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/loader", "exception.zep.c", "phalcon"); - ADD_SOURCES(configure_module_dirname + "/phalcon/logger", "adapterfactory.zep.c exception.zep.c item.zep.c loggerfactory.zep.c", "phalcon"); + ADD_SOURCES(configure_module_dirname + "/phalcon/logger", "adapterfactory.zep.c exception.zep.c item.zep.c logger.zep.c loggerfactory.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/application", "exception.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/controller", "bindmodelinterface.zep.c", "phalcon"); ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/dispatcher", "exception.zep.c", "phalcon"); diff --git a/ext/phalcon.c b/ext/phalcon.c index f80e95d526..9bd4d899ba 100644 --- a/ext/phalcon.c +++ b/ext/phalcon.c @@ -127,14 +127,14 @@ zend_class_entry *phalcon_exception_ce; zend_class_entry *phalcon_html_helper_abstracthelper_ce; zend_class_entry *phalcon_validation_abstractvalidator_ce; zend_class_entry *phalcon_html_helper_input_abstractinput_ce; -zend_class_entry *phalcon_di_abstractinjectionaware_ce; zend_class_entry *phalcon_factory_abstractconfigfactory_ce; +zend_class_entry *phalcon_di_abstractinjectionaware_ce; zend_class_entry *phalcon_factory_abstractfactory_ce; zend_class_entry *phalcon_di_injectable_ce; zend_class_entry *phalcon_forms_element_abstractelement_ce; +zend_class_entry *phalcon_support_helper_str_abstractstr_ce; zend_class_entry *phalcon_storage_adapter_abstractadapter_ce; zend_class_entry *phalcon_support_collection_ce; -zend_class_entry *phalcon_support_helper_str_abstractstr_ce; zend_class_entry *phalcon_support_helper_arr_abstractarr_ce; zend_class_entry *phalcon_validation_validator_file_abstractfile_ce; zend_class_entry *phalcon_http_message_abstractcommon_ce; @@ -464,11 +464,11 @@ zend_class_entry *phalcon_logger_adapter_noop_ce; zend_class_entry *phalcon_logger_adapter_stream_ce; zend_class_entry *phalcon_logger_adapter_syslog_ce; zend_class_entry *phalcon_logger_adapterfactory_ce; -zend_class_entry *phalcon_logger_ce; zend_class_entry *phalcon_logger_exception_ce; zend_class_entry *phalcon_logger_formatter_json_ce; zend_class_entry *phalcon_logger_formatter_line_ce; zend_class_entry *phalcon_logger_item_ce; +zend_class_entry *phalcon_logger_logger_ce; zend_class_entry *phalcon_logger_loggerfactory_ce; zend_class_entry *phalcon_messages_exception_ce; zend_class_entry *phalcon_messages_message_ce; @@ -786,14 +786,14 @@ static PHP_MINIT_FUNCTION(phalcon) ZEPHIR_INIT(Phalcon_Html_Helper_AbstractHelper); ZEPHIR_INIT(Phalcon_Validation_AbstractValidator); ZEPHIR_INIT(Phalcon_Html_Helper_Input_AbstractInput); - ZEPHIR_INIT(Phalcon_Di_AbstractInjectionAware); ZEPHIR_INIT(Phalcon_Factory_AbstractConfigFactory); + ZEPHIR_INIT(Phalcon_Di_AbstractInjectionAware); ZEPHIR_INIT(Phalcon_Factory_AbstractFactory); ZEPHIR_INIT(Phalcon_Di_Injectable); ZEPHIR_INIT(Phalcon_Forms_Element_AbstractElement); + ZEPHIR_INIT(Phalcon_Support_Helper_Str_AbstractStr); ZEPHIR_INIT(Phalcon_Storage_Adapter_AbstractAdapter); ZEPHIR_INIT(Phalcon_Support_Collection); - ZEPHIR_INIT(Phalcon_Support_Helper_Str_AbstractStr); ZEPHIR_INIT(Phalcon_Support_Helper_Arr_AbstractArr); ZEPHIR_INIT(Phalcon_Validation_Validator_File_AbstractFile); ZEPHIR_INIT(Phalcon_Http_Message_AbstractCommon); @@ -1098,7 +1098,6 @@ static PHP_MINIT_FUNCTION(phalcon) ZEPHIR_INIT(Phalcon_Kernel); ZEPHIR_INIT(Phalcon_Loader); ZEPHIR_INIT(Phalcon_Loader_Exception); - ZEPHIR_INIT(Phalcon_Logger); ZEPHIR_INIT(Phalcon_Logger_AdapterFactory); ZEPHIR_INIT(Phalcon_Logger_Adapter_Noop); ZEPHIR_INIT(Phalcon_Logger_Adapter_Stream); @@ -1107,6 +1106,7 @@ static PHP_MINIT_FUNCTION(phalcon) ZEPHIR_INIT(Phalcon_Logger_Formatter_Json); ZEPHIR_INIT(Phalcon_Logger_Formatter_Line); ZEPHIR_INIT(Phalcon_Logger_Item); + ZEPHIR_INIT(Phalcon_Logger_Logger); ZEPHIR_INIT(Phalcon_Logger_LoggerFactory); ZEPHIR_INIT(Phalcon_Messages_Exception); ZEPHIR_INIT(Phalcon_Messages_Message); diff --git a/ext/phalcon.h b/ext/phalcon.h index 1dca7324b8..d43d238676 100644 --- a/ext/phalcon.h +++ b/ext/phalcon.h @@ -11,17 +11,17 @@ #include "phalcon/validation/abstractvalidator.zep.h" #include "phalcon/events/eventsawareinterface.zep.h" #include "phalcon/html/helper/input/abstractinput.zep.h" +#include "phalcon/factory/abstractconfigfactory.zep.h" #include "phalcon/support/collection/collectioninterface.zep.h" #include "phalcon/di/abstractinjectionaware.zep.h" -#include "phalcon/factory/abstractconfigfactory.zep.h" #include "phalcon/storage/adapter/adapterinterface.zep.h" #include "phalcon/factory/abstractfactory.zep.h" #include "phalcon/di/injectable.zep.h" #include "phalcon/forms/element/elementinterface.zep.h" #include "phalcon/forms/element/abstractelement.zep.h" +#include "phalcon/support/helper/str/abstractstr.zep.h" #include "phalcon/storage/adapter/abstractadapter.zep.h" #include "phalcon/support/collection.zep.h" -#include "phalcon/support/helper/str/abstractstr.zep.h" #include "phalcon/support/helper/arr/abstractarr.zep.h" #include "phalcon/dispatcher/dispatcherinterface.zep.h" #include "phalcon/encryption/crypt/padding/padinterface.zep.h" @@ -415,7 +415,6 @@ #include "phalcon/kernel.zep.h" #include "phalcon/loader.zep.h" #include "phalcon/loader/exception.zep.h" -#include "phalcon/logger.zep.h" #include "phalcon/logger/adapter/noop.zep.h" #include "phalcon/logger/adapter/stream.zep.h" #include "phalcon/logger/adapter/syslog.zep.h" @@ -424,6 +423,7 @@ #include "phalcon/logger/formatter/json.zep.h" #include "phalcon/logger/formatter/line.zep.h" #include "phalcon/logger/item.zep.h" +#include "phalcon/logger/logger.zep.h" #include "phalcon/logger/loggerfactory.zep.h" #include "phalcon/messages/exception.zep.h" #include "phalcon/messages/message.zep.h" diff --git a/ext/phalcon/acl/adapter/memory.zep.c b/ext/phalcon/acl/adapter/memory.zep.c index 6568b96519..fd45242e1d 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, 152, componentValue); + ZEPHIR_CALL_METHOD(NULL, &componentObject, "__construct", NULL, 154, componentValue); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&componentName, &componentObject, "getname", NULL, 153); + ZEPHIR_CALL_METHOD(&componentName, &componentObject, "getname", NULL, 155); 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, 154, &_0, &componentName, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 156, &_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, 154, &_0, &roleName, &_1, &_2); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 156, &_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, 155, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 157, &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, 155, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 157, &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, 155, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 157, &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, 155, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 157, &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, 155, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 157, &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, 155, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 157, &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, 155, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 157, &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, 155, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_19, 157, &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, 156, role); + ZEPHIR_CALL_METHOD(NULL, &roleObject, "__construct", NULL, 158, 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, 157); + ZEPHIR_CALL_METHOD(&roleName, &roleObject, "getname", NULL, 159); 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, 158, &role, &componentName, access, &_4$$4, func); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 160, &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, 158, &role, &componentName, access, &_6$$5, func); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 160, &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, 158, &role, &componentName, access, &_4$$4, func); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 160, &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, 158, &role, &componentName, access, &_6$$5, func); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "allowordeny", &_5, 160, &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, 159, roleName, componentName, &access); + ZEPHIR_CALL_METHOD(&accessKey, this_ptr, "canaccess", NULL, 161, 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, 160, &funcAccess); + ZEPHIR_CALL_METHOD(NULL, &reflectionFunction, "__construct", NULL, 162, &funcAccess); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&reflectionParameters, &reflectionFunction, "getparameters", NULL, 161); + ZEPHIR_CALL_METHOD(&reflectionParameters, &reflectionFunction, "getparameters", NULL, 163); 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, 162); + ZEPHIR_CALL_METHOD(&numberOfRequiredParameters, &reflectionFunction, "getnumberofrequiredparameters", NULL, 164); 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, 154, &_0, &roleName, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 156, &_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, 154, &_2, &componentName, &_1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkexists", NULL, 156, &_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, 155, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 157, &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, 155, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 157, &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, 155, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 157, &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, 155, &checkRoleToInherits, &usedRoleToInherit); + ZEPHIR_CALL_FUNCTION(NULL, "array_push", &_5, 157, &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 8a098e45e0..58dbf01bf8 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, 123, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_fetch", NULL, 125, &_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, 126, &_0, data, &_3); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_store", NULL, 128, &_0, data, &_3); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/annotations/adapter/stream.zep.c b/ext/phalcon/annotations/adapter/stream.zep.c index 1a94ce49c5..5ba2c5e28b 100644 --- a/ext/phalcon/annotations/adapter/stream.zep.c +++ b/ext/phalcon/annotations/adapter/stream.zep.c @@ -177,7 +177,7 @@ PHP_METHOD(Phalcon_Annotations_Adapter_Stream, read) ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 89, &_9$$6, &_10$$6); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_11, "unserialize", NULL, 16, &contents); + ZEPHIR_CALL_FUNCTION(&_11, "unserialize", NULL, 17, &contents); zephir_check_call_status(); ZEPHIR_CPY_WRT(&contents, &_11); ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 91); @@ -239,7 +239,7 @@ PHP_METHOD(Phalcon_Annotations_Adapter_Stream, write) ZEPHIR_INIT_VAR(&_3); ZEPHIR_CONCAT_VVS(&_3, &_0, &_1, ".php"); zephir_get_strval(&path, &_3); - ZEPHIR_CALL_FUNCTION(&code, "serialize", NULL, 14, data); + ZEPHIR_CALL_FUNCTION(&code, "serialize", NULL, 15, data); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); zephir_file_put_contents(&_4, &path, &code); diff --git a/ext/phalcon/annotations/annotation.zep.c b/ext/phalcon/annotations/annotation.zep.c index 28e0efc75e..32e201bde5 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, 163, &_3$$8); + ZEPHIR_CALL_METHOD(&resolvedItem, this_ptr, "getexpression", &_4, 165, &_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, 163, &_5$$11); + ZEPHIR_CALL_METHOD(&resolvedItem, this_ptr, "getexpression", &_4, 165, &_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, 164, &expr); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 166, &expr); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/annotations/annotationsfactory.zep.c b/ext/phalcon/annotations/annotationsfactory.zep.c index bf6d88521b..97838b60ba 100644 --- a/ext/phalcon/annotations/annotationsfactory.zep.c +++ b/ext/phalcon/annotations/annotationsfactory.zep.c @@ -90,16 +90,16 @@ PHP_METHOD(Phalcon_Annotations_AnnotationsFactory, __construct) PHP_METHOD(Phalcon_Annotations_AnnotationsFactory, load) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zephir_fcall_cache_entry *_1 = NULL; + zephir_fcall_cache_entry *_2 = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *config = NULL, config_sub, name, options, _0, _2, _3; + zval *config = NULL, config_sub, name, options, _0, _1, _3; zval *this_ptr = getThis(); ZVAL_UNDEF(&config_sub); ZVAL_UNDEF(&name); ZVAL_UNDEF(&options); ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_1); ZVAL_UNDEF(&_3); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; @@ -117,14 +117,19 @@ PHP_METHOD(Phalcon_Annotations_AnnotationsFactory, load) ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkconfig", NULL, 0, config); zephir_check_call_status(); ZEPHIR_CPY_WRT(config, &_0); + ZEPHIR_INIT_VAR(&_1); + ZVAL_STRING(&_1, "adapter"); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkconfigelement", NULL, 0, config, &_1); + zephir_check_call_status(); + ZEPHIR_CPY_WRT(config, &_0); ZEPHIR_OBS_VAR(&name); - zephir_array_fetch_string(&name, config, SL("adapter"), PH_NOISY, "phalcon/Annotations/AnnotationsFactory.zep", 47); + zephir_array_fetch_string(&name, config, SL("adapter"), PH_NOISY, "phalcon/Annotations/AnnotationsFactory.zep", 48); zephir_array_unset_string(config, SL("adapter"), PH_SEPARATE); - ZEPHIR_INIT_VAR(&_2); - array_init(&_2); + ZEPHIR_INIT_NVAR(&_1); + array_init(&_1); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "options"); - ZEPHIR_CALL_CE_STATIC(&options, phalcon_helper_arr_ce, "get", &_1, 81, config, &_3, &_2); + ZEPHIR_CALL_CE_STATIC(&options, phalcon_helper_arr_ce, "get", &_2, 81, config, &_3, &_1); 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 f345bee357..4fffa71680 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, 164, &annotationData); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", &_3, 166, &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, 164, &annotationData); + ZEPHIR_CALL_METHOD(NULL, &_4$$4, "__construct", &_3, 166, &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 1d36e9b044..248d2aa729 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, 165, &className); + ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 167, &className); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&comment, &reflection, "getdoccomment", NULL, 166); + ZEPHIR_CALL_METHOD(&comment, &reflection, "getdoccomment", NULL, 168); zephir_check_call_status(); if (Z_TYPE_P(&comment) == IS_STRING) { ZEPHIR_INIT_VAR(&classAnnotations); - ZEPHIR_CALL_METHOD(&_0$$3, &reflection, "getfilename", NULL, 167); + ZEPHIR_CALL_METHOD(&_0$$3, &reflection, "getfilename", NULL, 169); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1$$3, &reflection, "getstartline", NULL, 168); + ZEPHIR_CALL_METHOD(&_1$$3, &reflection, "getstartline", NULL, 170); 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, 169); + ZEPHIR_CALL_METHOD(&properties, &reflection, "getproperties", NULL, 171); 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, 167); + ZEPHIR_CALL_METHOD(&_4$$7, &reflection, "getfilename", NULL, 169); 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, 167); + ZEPHIR_CALL_METHOD(&_7$$10, &reflection, "getfilename", NULL, 169); 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, 170); + ZEPHIR_CALL_METHOD(&methods, &reflection, "getmethods", NULL, 172); zephir_check_call_status(); if (zephir_fast_count_int(&methods)) { ZEPHIR_INIT_VAR(&annotationsMethods); diff --git a/ext/phalcon/assets/asset.zep.c b/ext/phalcon/assets/asset.zep.c index d8a950994d..610bd2d3b9 100644 --- a/ext/phalcon/assets/asset.zep.c +++ b/ext/phalcon/assets/asset.zep.c @@ -478,7 +478,7 @@ PHP_METHOD(Phalcon_Assets_Asset, getRealSourcePath) if (zephir_is_true(&_0)) { ZEPHIR_INIT_VAR(&_1$$4); ZEPHIR_CONCAT_VV(&_1$$4, &basePath, &sourcePath); - ZEPHIR_RETURN_CALL_FUNCTION("realpath", NULL, 95, &_1$$4); + ZEPHIR_RETURN_CALL_FUNCTION("realpath", NULL, 97, &_1$$4); zephir_check_call_status(); RETURN_MM(); } @@ -529,7 +529,7 @@ PHP_METHOD(Phalcon_Assets_Asset, getRealTargetPath) ZEPHIR_INIT_VAR(&completePath); ZEPHIR_CONCAT_VV(&completePath, &basePath, &targetPath); if ((zephir_file_exists(&completePath) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("realpath", NULL, 95, &completePath); + ZEPHIR_RETURN_CALL_FUNCTION("realpath", NULL, 97, &completePath); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/assets/collection.zep.c b/ext/phalcon/assets/collection.zep.c index afb0d87742..1f783c3d80 100644 --- a/ext/phalcon/assets/collection.zep.c +++ b/ext/phalcon/assets/collection.zep.c @@ -353,7 +353,7 @@ PHP_METHOD(Phalcon_Assets_Collection, add) zephir_fetch_params(1, 1, 0, &asset); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 171, asset); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 173, asset); zephir_check_call_status(); RETURN_THIS(); } @@ -454,7 +454,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addCss) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 172, &path, &collectionLocal, &_1, &collectionAttributes, &version, &_2); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 174, &path, &collectionLocal, &_1, &collectionAttributes, &version, &_2); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "add", NULL, 0, &_0); zephir_check_call_status(); @@ -508,7 +508,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addInline) zephir_fetch_params(1, 1, 0, &code); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 171, code); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addasset", NULL, 173, code); zephir_check_call_status(); RETURN_THIS(); } @@ -569,7 +569,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addInlineCss) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 173, &content, &_1, &collectionAttributes); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 175, &content, &_1, &collectionAttributes); zephir_check_call_status(); zephir_update_property_array_append(this_ptr, SL("codes"), &_0); RETURN_THIS(); @@ -631,7 +631,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addInlineJs) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 174, &content, &_1, &collectionAttributes); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 176, &content, &_1, &collectionAttributes); zephir_check_call_status(); zephir_update_property_array_append(this_ptr, SL("codes"), &_0); RETURN_THIS(); @@ -735,7 +735,7 @@ PHP_METHOD(Phalcon_Assets_Collection, addJs) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 175, &path, &collectionLocal, &_1, &collectionAttributes, &version, &_2); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 177, &path, &collectionLocal, &_1, &collectionAttributes, &version, &_2); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "add", NULL, 0, &_0); zephir_check_call_status(); @@ -823,7 +823,7 @@ PHP_METHOD(Phalcon_Assets_Collection, getRealTargetPath) ZEPHIR_INIT_VAR(&completePath); ZEPHIR_CONCAT_VV(&completePath, &basePath, &targetPath); if ((zephir_file_exists(&completePath) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("realpath", NULL, 95, &completePath); + ZEPHIR_RETURN_CALL_FUNCTION("realpath", NULL, 97, &completePath); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/assets/manager.zep.c b/ext/phalcon/assets/manager.zep.c index a554749ef3..7c2c3636c2 100644 --- a/ext/phalcon/assets/manager.zep.c +++ b/ext/phalcon/assets/manager.zep.c @@ -179,11 +179,11 @@ PHP_METHOD(Phalcon_Assets_Manager, addAssetByType) if (!(zephir_array_isset_fetch(&collection, &_0, &type, 0))) { ZEPHIR_INIT_NVAR(&collection); object_init_ex(&collection, phalcon_assets_collection_ce); - ZEPHIR_CALL_METHOD(NULL, &collection, "__construct", NULL, 176); + ZEPHIR_CALL_METHOD(NULL, &collection, "__construct", NULL, 178); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("collections"), &type, &collection); } - ZEPHIR_CALL_METHOD(NULL, &collection, "add", NULL, 177, asset); + ZEPHIR_CALL_METHOD(NULL, &collection, "add", NULL, 179, asset); zephir_check_call_status(); RETURN_THIS(); } @@ -279,7 +279,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addCss) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 172, &path, local, &_1, &attributes, &version, &_2); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 174, &path, local, &_1, &attributes, &version, &_2); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "css"); @@ -361,11 +361,11 @@ PHP_METHOD(Phalcon_Assets_Manager, addInlineCodeByType) if (!(zephir_array_isset_fetch(&collection, &_0, &type, 0))) { ZEPHIR_INIT_NVAR(&collection); object_init_ex(&collection, phalcon_assets_collection_ce); - ZEPHIR_CALL_METHOD(NULL, &collection, "__construct", NULL, 176); + ZEPHIR_CALL_METHOD(NULL, &collection, "__construct", NULL, 178); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("collections"), &type, &collection); } - ZEPHIR_CALL_METHOD(NULL, &collection, "addinline", NULL, 178, code); + ZEPHIR_CALL_METHOD(NULL, &collection, "addinline", NULL, 180, code); zephir_check_call_status(); RETURN_THIS(); } @@ -414,7 +414,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addInlineCss) ZEPHIR_INIT_VAR(&_0); object_init_ex(&_0, phalcon_assets_inline_css_ce); - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 173, &content, filter, attributes); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 175, &content, filter, attributes); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "css"); @@ -467,7 +467,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addInlineJs) ZEPHIR_INIT_VAR(&_0); object_init_ex(&_0, phalcon_assets_inline_js_ce); - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 174, &content, filter, attributes); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 176, &content, filter, attributes); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "js"); @@ -567,7 +567,7 @@ PHP_METHOD(Phalcon_Assets_Manager, addJs) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 175, &path, local, &_1, &attributes, &version, &_2); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 177, &path, local, &_1, &attributes, &version, &_2); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "js"); @@ -608,7 +608,7 @@ PHP_METHOD(Phalcon_Assets_Manager, collection) if (!(zephir_array_isset_fetch(&collection, &_0, &name, 0))) { ZEPHIR_INIT_NVAR(&collection); object_init_ex(&collection, phalcon_assets_collection_ce); - ZEPHIR_CALL_METHOD(NULL, &collection, "__construct", NULL, 176); + ZEPHIR_CALL_METHOD(NULL, &collection, "__construct", NULL, 178); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("collections"), &name, &collection); } @@ -809,7 +809,7 @@ PHP_METHOD(Phalcon_Assets_Manager, getCss) zephir_read_property(&_0, this_ptr, ZEND_STRL("collections"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset_string_fetch(&collection, &_0, SL("css"), 1))) { object_init_ex(return_value, phalcon_assets_collection_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 176); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 178); zephir_check_call_status(); RETURN_MM(); } @@ -835,7 +835,7 @@ PHP_METHOD(Phalcon_Assets_Manager, getJs) zephir_read_property(&_0, this_ptr, ZEND_STRL("collections"), PH_NOISY_CC | PH_READONLY); if (!(zephir_array_isset_string_fetch(&collection, &_0, SL("js"), 1))) { object_init_ex(return_value, phalcon_assets_collection_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 176); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 178); zephir_check_call_status(); RETURN_MM(); } @@ -1033,7 +1033,7 @@ PHP_METHOD(Phalcon_Assets_Manager, output) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_FUNCTION(&_4$$9, "is_dir", NULL, 145, &completeTargetPath); + ZEPHIR_CALL_FUNCTION(&_4$$9, "is_dir", NULL, 147, &completeTargetPath); zephir_check_call_status(); if (UNEXPECTED(zephir_is_true(&_4$$9))) { ZEPHIR_INIT_VAR(&_5$$11); @@ -1118,7 +1118,7 @@ PHP_METHOD(Phalcon_Assets_Manager, output) } else { ZEPHIR_CALL_METHOD(&path, &asset, "getrealtargeturi", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "getprefixedpath", &_16, 179, collection, &path); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "getprefixedpath", &_16, 181, collection, &path); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_17$$23, &asset, "getversion", NULL, 0); zephir_check_call_status(); @@ -1249,7 +1249,7 @@ PHP_METHOD(Phalcon_Assets_Manager, output) if (!(zephir_is_true(&join))) { ZEPHIR_CALL_METHOD(&path, &asset, "getrealtargeturi", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "getprefixedpath", &_16, 179, collection, &path); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "getprefixedpath", &_16, 181, collection, &path); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_31$$44, &asset, "getversion", NULL, 0); zephir_check_call_status(); @@ -1390,7 +1390,7 @@ PHP_METHOD(Phalcon_Assets_Manager, output) } else { ZEPHIR_CALL_METHOD(&path, &asset, "getrealtargeturi", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "getprefixedpath", &_16, 179, collection, &path); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "getprefixedpath", &_16, 181, collection, &path); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_47$$63, &asset, "getversion", NULL, 0); zephir_check_call_status(); @@ -1520,7 +1520,7 @@ PHP_METHOD(Phalcon_Assets_Manager, output) if (!(zephir_is_true(&join))) { ZEPHIR_CALL_METHOD(&path, &asset, "getrealtargeturi", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "getprefixedpath", &_16, 179, collection, &path); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "getprefixedpath", &_16, 181, collection, &path); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_59$$84, &asset, "getversion", NULL, 0); zephir_check_call_status(); @@ -1595,7 +1595,7 @@ PHP_METHOD(Phalcon_Assets_Manager, output) zephir_file_put_contents(NULL, &completeTargetPath, &filteredJoinedContent); ZEPHIR_CALL_METHOD(&targetUri, collection, "gettargeturi", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "getprefixedpath", &_16, 179, collection, &targetUri); + ZEPHIR_CALL_METHOD(&prefixedPath, this_ptr, "getprefixedpath", &_16, 181, collection, &targetUri); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&version, collection, "getversion", &_20, 0); zephir_check_call_status(); diff --git a/ext/phalcon/cache/cachefactory.zep.c b/ext/phalcon/cache/cachefactory.zep.c index bb51810390..6b8753fee6 100644 --- a/ext/phalcon/cache/cachefactory.zep.c +++ b/ext/phalcon/cache/cachefactory.zep.c @@ -102,13 +102,14 @@ PHP_METHOD(Phalcon_Cache_CacheFactory, load) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *config = NULL, config_sub, name, options, _0; + zval *config = NULL, config_sub, name, options, _0, _1; zval *this_ptr = getThis(); ZVAL_UNDEF(&config_sub); ZVAL_UNDEF(&name); ZVAL_UNDEF(&options); ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -125,8 +126,13 @@ PHP_METHOD(Phalcon_Cache_CacheFactory, load) ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkconfig", NULL, 0, config); zephir_check_call_status(); ZEPHIR_CPY_WRT(config, &_0); + ZEPHIR_INIT_VAR(&_1); + ZVAL_STRING(&_1, "adapter"); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkconfigelement", NULL, 0, config, &_1); + 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", 75); + zephir_array_fetch_string(&name, config, SL("adapter"), PH_NOISY, "phalcon/Cache/CacheFactory.zep", 76); ZEPHIR_OBS_VAR(&options); if (!(zephir_array_isset_string_fetch(&options, config, SL("options"), 0))) { ZEPHIR_INIT_NVAR(&options); @@ -211,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, 180, &adapter); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 182, &adapter); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/cli/console.zep.c b/ext/phalcon/cli/console.zep.c index acea035847..d2e8820f21 100644 --- a/ext/phalcon/cli/console.zep.c +++ b/ext/phalcon/cli/console.zep.c @@ -413,7 +413,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, 181, &arg, &_3$$5, &_4$$5); + ZEPHIR_CALL_FUNCTION(&_5$$5, "strncmp", &_6, 183, &arg, &_3$$5, &_4$$5); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_5$$5, 0)) { ZEPHIR_INIT_NVAR(&_7$$6); @@ -445,7 +445,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, 181, &arg, &_18$$9, &_19$$9); + ZEPHIR_CALL_FUNCTION(&_20$$9, "strncmp", &_6, 183, &arg, &_18$$9, &_19$$9); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_20$$9, 0)) { ZVAL_LONG(&_21$$10, 1); @@ -475,7 +475,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, 181, &arg, &_23$$14, &_24$$14); + ZEPHIR_CALL_FUNCTION(&_25$$14, "strncmp", &_6, 183, &arg, &_23$$14, &_24$$14); zephir_check_call_status(); if (ZEPHIR_IS_LONG(&_25$$14, 0)) { ZEPHIR_INIT_NVAR(&_26$$15); @@ -507,7 +507,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, 181, &arg, &_37$$18, &_38$$18); + ZEPHIR_CALL_FUNCTION(&_39$$18, "strncmp", &_6, 183, &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/dispatcher.zep.c b/ext/phalcon/cli/dispatcher.zep.c index d3b9010030..e1e3fc1e3d 100644 --- a/ext/phalcon/cli/dispatcher.zep.c +++ b/ext/phalcon/cli/dispatcher.zep.c @@ -115,7 +115,7 @@ PHP_METHOD(Phalcon_Cli_Dispatcher, callActionMethod) } - ZEPHIR_CALL_FUNCTION(&_0, "array_values", NULL, 13, ¶ms); + ZEPHIR_CALL_FUNCTION(&_0, "array_values", NULL, 14, ¶ms); zephir_check_call_status(); ZEPHIR_CPY_WRT(¶ms, &_0); ZEPHIR_INIT_VAR(&_1); diff --git a/ext/phalcon/cli/router.zep.c b/ext/phalcon/cli/router.zep.c index 8b4eef152e..abf7aff3bb 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, 182, &_2$$3, &_1$$3); + ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 184, &_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, 182, &_4$$3, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 184, &_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, 182, &pattern, paths); + ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 184, &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 b2b30c21f3..9668dbb1ff 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, 183, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("array_flip", NULL, 185, &_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 f1dea7b008..1b06c353e7 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, 184); + ZEPHIR_CALL_METHOD(NULL, &_7$$6, "__construct", &_8, 186); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_9$$6, &_7$$6, "load", &_10, 185, &configName); + ZEPHIR_CALL_METHOD(&_9$$6, &_7$$6, "load", &_10, 187, &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, 184); + ZEPHIR_CALL_METHOD(NULL, &_18$$10, "__construct", &_8, 186); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_19$$10, &_18$$10, "load", &_10, 185, &configInstance); + ZEPHIR_CALL_METHOD(&_19$$10, &_18$$10, "load", &_10, 187, &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, 184); + ZEPHIR_CALL_METHOD(NULL, &_22$$14, "__construct", &_8, 186); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_23$$14, &_22$$14, "load", &_10, 185, &configName); + ZEPHIR_CALL_METHOD(&_23$$14, &_22$$14, "load", &_10, 187, &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, 184); + ZEPHIR_CALL_METHOD(NULL, &_29$$18, "__construct", &_8, 186); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_30$$18, &_29$$18, "load", &_10, 185, &configInstance); + ZEPHIR_CALL_METHOD(&_30$$18, &_29$$18, "load", &_10, 187, &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 2abf40b211..95ca035c3a 100644 --- a/ext/phalcon/config/adapter/ini.zep.c +++ b/ext/phalcon/config/adapter/ini.zep.c @@ -151,7 +151,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Ini, __construct) ZVAL_LONG(&_0, mode); - ZEPHIR_CALL_FUNCTION(&iniConfig, "parse_ini_file", NULL, 186, &filePath, &__$true, &_0); + ZEPHIR_CALL_FUNCTION(&iniConfig, "parse_ini_file", NULL, 188, &filePath, &__$true, &_0); zephir_check_call_status(); if (UNEXPECTED(ZEPHIR_IS_FALSE_IDENTICAL(&iniConfig))) { ZEPHIR_INIT_VAR(&_1$$3); @@ -541,7 +541,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, 187, &path, &castValue); + ZEPHIR_CALL_METHOD(&result, this_ptr, "parseinistring", NULL, 189, &path, &castValue); zephir_check_call_status(); zephir_create_array(return_value, 1, 0); zephir_array_update_zval(return_value, &key, &result, PH_COPY); diff --git a/ext/phalcon/config/adapter/json.zep.c b/ext/phalcon/config/adapter/json.zep.c index ee195ae10d..874ae5b739 100644 --- a/ext/phalcon/config/adapter/json.zep.c +++ b/ext/phalcon/config/adapter/json.zep.c @@ -96,7 +96,7 @@ PHP_METHOD(Phalcon_Config_Adapter_Json, __construct) ZEPHIR_INIT_VAR(&_3); zephir_file_get_contents(&_3, &filePath); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_CE_STATIC(&_1, phalcon_helper_json_ce, "decode", &_2, 188, &_3, &_4); + ZEPHIR_CALL_CE_STATIC(&_1, phalcon_helper_json_ce, "decode", &_2, 190, &_3, &_4); zephir_check_call_status(); ZEPHIR_CALL_PARENT(NULL, phalcon_config_adapter_json_ce, getThis(), "__construct", &_0, 0, &_1); zephir_check_call_status(); diff --git a/ext/phalcon/config/adapter/yaml.zep.c b/ext/phalcon/config/adapter/yaml.zep.c index 0ba3a0d1b8..3bbce831d7 100644 --- a/ext/phalcon/config/adapter/yaml.zep.c +++ b/ext/phalcon/config/adapter/yaml.zep.c @@ -128,20 +128,20 @@ PHP_METHOD(Phalcon_Config_Adapter_Yaml, __construct) ndocs = 0; ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "yaml"); - ZEPHIR_CALL_FUNCTION(&_1, "extension_loaded", NULL, 189, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "extension_loaded", NULL, 191, &_0); zephir_check_call_status(); if (UNEXPECTED(!zephir_is_true(&_1))) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_config_exception_ce, "Yaml extension not loaded", "phalcon/Config/Adapter/Yaml.zep", 64); return; } if (ZEPHIR_IS_EMPTY(&callbacks)) { - ZEPHIR_CALL_FUNCTION(&yamlConfig, "yaml_parse_file", NULL, 190, &filePath); + ZEPHIR_CALL_FUNCTION(&yamlConfig, "yaml_parse_file", NULL, 192, &filePath); zephir_check_call_status(); } else { ZVAL_LONG(&_2$$5, 0); ZVAL_LONG(&_3$$5, ndocs); ZEPHIR_MAKE_REF(&_3$$5); - ZEPHIR_CALL_FUNCTION(&yamlConfig, "yaml_parse_file", NULL, 190, &filePath, &_2$$5, &_3$$5, &callbacks); + ZEPHIR_CALL_FUNCTION(&yamlConfig, "yaml_parse_file", NULL, 192, &filePath, &_2$$5, &_3$$5, &callbacks); ZEPHIR_UNREF(&_3$$5); zephir_check_call_status(); } diff --git a/ext/phalcon/config/configfactory.zep.c b/ext/phalcon/config/configfactory.zep.c index da17772368..4afef1b304 100644 --- a/ext/phalcon/config/configfactory.zep.c +++ b/ext/phalcon/config/configfactory.zep.c @@ -138,10 +138,10 @@ PHP_METHOD(Phalcon_Config_ConfigFactory, load) ZEPHIR_OBS_VAR(&filePath); zephir_array_fetch_string(&filePath, &configArray, SL("filePath"), PH_NOISY, "phalcon/Config/ConfigFactory.zep", 62); ZVAL_LONG(&_1, 4); - ZEPHIR_CALL_FUNCTION(&_2, "pathinfo", NULL, 111, &filePath, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "pathinfo", NULL, 113, &filePath, &_1); zephir_check_call_status(); if (1 == ZEPHIR_IS_EMPTY(&_2)) { - ZEPHIR_CALL_FUNCTION(&_3$$3, "lcfirst", NULL, 97, &adapter); + ZEPHIR_CALL_FUNCTION(&_3$$3, "lcfirst", NULL, 99, &adapter); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4$$3); ZEPHIR_CONCAT_SV(&_4$$3, ".", &_3$$3); @@ -310,7 +310,7 @@ PHP_METHOD(Phalcon_Config_ConfigFactory, parseConfig) if (Z_TYPE_P(config) == IS_STRING) { ZEPHIR_CPY_WRT(&oldConfig, config); ZVAL_LONG(&_0$$3, 4); - ZEPHIR_CALL_FUNCTION(&extension, "pathinfo", NULL, 111, config, &_0$$3); + ZEPHIR_CALL_FUNCTION(&extension, "pathinfo", NULL, 113, config, &_0$$3); zephir_check_call_status(); if (1 == ZEPHIR_IS_EMPTY(&extension)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_config_exception_ce, "You need to provide the extension in the file path", "phalcon/Config/ConfigFactory.zep", 162); @@ -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", 178); return; } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkconfigarray", NULL, 191, config); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkconfigarray", NULL, 193, 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 712275c1e5..0f18d1b99a 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, 192); + ZEPHIR_CALL_METHOD(NULL, profiler, "__construct", NULL, 194); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(NULL, this_ptr, "setprofiler", NULL, 0, profiler); diff --git a/ext/phalcon/datamapper/pdo/connection/abstractconnection.zep.c b/ext/phalcon/datamapper/pdo/connection/abstractconnection.zep.c index f7b1c4dabd..d1e11a6399 100644 --- a/ext/phalcon/datamapper/pdo/connection/abstractconnection.zep.c +++ b/ext/phalcon/datamapper/pdo/connection/abstractconnection.zep.c @@ -110,7 +110,7 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_Connection_AbstractConnection, __call) ZEPHIR_CONCAT_SVSVS(&message, "Class '", &className, "' does not have a method '", name, "'"); ZEPHIR_INIT_VAR(&_1$$3); object_init_ex(&_1$$3, spl_ce_BadMethodCallException); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 96, &message); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 98, &message); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/DataMapper/Pdo/Connection/AbstractConnection.zep", 62); ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/datamapper/pdo/connection/decorated.zep.c b/ext/phalcon/datamapper/pdo/connection/decorated.zep.c index 3e27cdecb9..45b2ab31ec 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, 192); + ZEPHIR_CALL_METHOD(NULL, profiler, "__construct", NULL, 194); 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 6c4b4e6f7b..2db46e78da 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, 193, &collection); + ZEPHIR_CALL_FUNCTION(&requested, "array_rand", NULL, 195, &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 6b61faaf10..d96b6a19eb 100644 --- a/ext/phalcon/datamapper/pdo/profiler/profiler.zep.c +++ b/ext/phalcon/datamapper/pdo/profiler/profiler.zep.c @@ -192,9 +192,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, 8); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&finish, "hrtime", NULL, 194, &__$true); + ZEPHIR_CALL_FUNCTION(&finish, "hrtime", NULL, 196, &__$true); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1$$3, &ex, "gettraceasstring", NULL, 195); + ZEPHIR_CALL_METHOD(&_1$$3, &ex, "gettraceasstring", NULL, 197); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2$$3); ZVAL_STRING(&_2$$3, "backtrace"); @@ -217,7 +217,7 @@ PHP_METHOD(Phalcon_DataMapper_Pdo_Profiler_Profiler, finish) ZEPHIR_INIT_NVAR(&_5$$3); ZVAL_STRING(&_5$$3, ""); } else { - ZEPHIR_CALL_CE_STATIC(&_5$$3, phalcon_helper_json_ce, "encode", &_9, 15, &values); + ZEPHIR_CALL_CE_STATIC(&_5$$3, phalcon_helper_json_ce, "encode", &_9, 16, &values); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_10$$3); @@ -428,7 +428,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, 194, &__$true); + ZEPHIR_CALL_FUNCTION(&_2$$3, "hrtime", NULL, 196, &__$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); diff --git a/ext/phalcon/datamapper/query/insert.zep.c b/ext/phalcon/datamapper/query/insert.zep.c index bcf1bb9dff..e1eae773e3 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, 196); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "buildcolumns", NULL, 198); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_4, this_ptr, "buildreturning", NULL, 0); zephir_check_call_status(); @@ -557,7 +557,7 @@ PHP_METHOD(Phalcon_DataMapper_Query_Insert, buildColumns) ZEPHIR_INIT_NVAR(&_12); zephir_read_property(&_14, this_ptr, ZEND_STRL("store"), PH_NOISY_CC | PH_READONLY); zephir_array_fetch_string(&_15, &_14, SL("COLUMNS"), PH_NOISY | PH_READONLY, "phalcon/DataMapper/Query/Insert.zep", 183); - ZEPHIR_CALL_FUNCTION(&_16, "array_values", NULL, 13, &_15); + ZEPHIR_CALL_FUNCTION(&_16, "array_values", NULL, 14, &_15); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_17); ZVAL_STRING(&_17, ","); diff --git a/ext/phalcon/datamapper/query/queryfactory.zep.c b/ext/phalcon/datamapper/query/queryfactory.zep.c index fd495f003c..c6119c217b 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, 197, connection, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 199, 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, 198, connection, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 200, 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, 199, connection, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 201, 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 d3292d92de..1e2e534d39 100644 --- a/ext/phalcon/datamapper/query/select.zep.c +++ b/ext/phalcon/datamapper/query/select.zep.c @@ -157,7 +157,7 @@ PHP_METHOD(Phalcon_DataMapper_Query_Select, __call) object_init_ex(&_5, spl_ce_BadMethodCallException); ZEPHIR_INIT_VAR(&_6); ZEPHIR_CONCAT_SVS(&_6, "Unknown method: [", &method, "]"); - ZEPHIR_CALL_METHOD(NULL, &_5, "__construct", NULL, 96, &_6); + ZEPHIR_CALL_METHOD(NULL, &_5, "__construct", NULL, 98, &_6); zephir_check_call_status(); zephir_throw_exception_debug(&_5, "phalcon/DataMapper/Query/Select.zep", 98); ZEPHIR_MM_RESTORE(); @@ -936,7 +936,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, 200, &_0, &_1); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 202, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -1059,9 +1059,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, 201); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "buildcolumns", NULL, 203); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "buildfrom", NULL, 202); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "buildfrom", NULL, 204); 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 5c1782e96d..850b753c07 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, 203); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "buildcolumns", NULL, 205); 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 1a69fcd344..a352e66a91 100644 --- a/ext/phalcon/db/adapter/pdo/mysql.zep.c +++ b/ext/phalcon/db/adapter/pdo/mysql.zep.c @@ -612,7 +612,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", 463); ZEPHIR_INIT_NVAR(&_63$$3); object_init_ex(&_63$$3, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_63$$3, "__construct", &_64, 204, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_63$$3, "__construct", &_64, 206, &columnName, &definition); zephir_check_call_status(); zephir_array_append(&columns, &_63$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Mysql.zep", 464); ZEPHIR_CPY_WRT(&oldColumn, &columnName); @@ -914,7 +914,7 @@ PHP_METHOD(Phalcon_Db_Adapter_Pdo_Mysql, describeColumns) zephir_array_fetch_long(&columnName, &field, 0, PH_NOISY, "phalcon/Db/Adapter/Pdo/Mysql.zep", 463); ZEPHIR_INIT_NVAR(&_124$$49); object_init_ex(&_124$$49, phalcon_db_column_ce); - ZEPHIR_CALL_METHOD(NULL, &_124$$49, "__construct", &_64, 204, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_124$$49, "__construct", &_64, 206, &columnName, &definition); zephir_check_call_status(); zephir_array_append(&columns, &_124$$49, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Mysql.zep", 464); 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 31bd891154..61ba18fa6a 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, 204, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_61$$3, "__construct", &_62, 206, &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, 204, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_118$$41, "__construct", &_62, 206, &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 9f65efc776..21277b9f53 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, 204, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_31$$3, "__construct", &_41, 206, &columnName, &definition); zephir_check_call_status(); zephir_array_append(&columns, &_31$$3, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 308); ZEPHIR_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, 204, &columnName, &definition); + ZEPHIR_CALL_METHOD(NULL, &_69$$28, "__construct", &_41, 206, &columnName, &definition); zephir_check_call_status(); zephir_array_append(&columns, &_69$$28, PH_SEPARATE, "phalcon/Db/Adapter/Pdo/Sqlite.zep", 308); ZEPHIR_CPY_WRT(&oldColumn, &columnName); diff --git a/ext/phalcon/db/adapter/pdofactory.zep.c b/ext/phalcon/db/adapter/pdofactory.zep.c index 2e3a101b47..8020bf12f2 100644 --- a/ext/phalcon/db/adapter/pdofactory.zep.c +++ b/ext/phalcon/db/adapter/pdofactory.zep.c @@ -93,16 +93,16 @@ PHP_METHOD(Phalcon_Db_Adapter_PdoFactory, __construct) PHP_METHOD(Phalcon_Db_Adapter_PdoFactory, load) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zephir_fcall_cache_entry *_1 = NULL; + zephir_fcall_cache_entry *_2 = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *config = NULL, config_sub, name, options, _0, _2, _3; + zval *config = NULL, config_sub, name, options, _0, _1, _3; zval *this_ptr = getThis(); ZVAL_UNDEF(&config_sub); ZVAL_UNDEF(&name); ZVAL_UNDEF(&options); ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_1); ZVAL_UNDEF(&_3); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; @@ -120,14 +120,19 @@ PHP_METHOD(Phalcon_Db_Adapter_PdoFactory, load) ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkconfig", NULL, 0, config); zephir_check_call_status(); ZEPHIR_CPY_WRT(config, &_0); + ZEPHIR_INIT_VAR(&_1); + ZVAL_STRING(&_1, "adapter"); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkconfigelement", NULL, 0, config, &_1); + zephir_check_call_status(); + ZEPHIR_CPY_WRT(config, &_0); ZEPHIR_OBS_VAR(&name); - zephir_array_fetch_string(&name, config, SL("adapter"), PH_NOISY, "phalcon/Db/Adapter/PdoFactory.zep", 49); + zephir_array_fetch_string(&name, config, SL("adapter"), PH_NOISY, "phalcon/Db/Adapter/PdoFactory.zep", 50); zephir_array_unset_string(config, SL("adapter"), PH_SEPARATE); - ZEPHIR_INIT_VAR(&_2); - array_init(&_2); + ZEPHIR_INIT_NVAR(&_1); + array_init(&_1); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "options"); - ZEPHIR_CALL_CE_STATIC(&options, phalcon_helper_arr_ce, "get", &_1, 81, config, &_3, &_2); + ZEPHIR_CALL_CE_STATIC(&options, phalcon_helper_arr_ce, "get", &_2, 81, config, &_3, &_1); 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 9ea9117ffc..687e25cbb1 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, 205, &defaultValue); + ZEPHIR_CALL_FUNCTION(&_9$$5, "is_float", NULL, 207, &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, 206, &defaultValue, &_11$$7); + ZEPHIR_CALL_FUNCTION(&_12$$7, "addcslashes", NULL, 208, &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, 205, &defaultValue); + ZEPHIR_CALL_FUNCTION(&_12$$10, "is_float", &_13, 207, &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, 206, &defaultValue, &_15$$12); + ZEPHIR_CALL_FUNCTION(&_16$$12, "addcslashes", &_17, 208, &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, 205, &defaultValue); + ZEPHIR_CALL_FUNCTION(&_31$$19, "is_float", &_13, 207, &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, 206, &defaultValue, &_33$$21); + ZEPHIR_CALL_FUNCTION(&_34$$21, "addcslashes", &_17, 208, &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, 207, column); + ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "checkcolumnunsigned", NULL, 209, 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, 207, column); + ZEPHIR_CALL_METHOD(&_8$$18, this_ptr, "checkcolumnunsigned", NULL, 209, 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, 208, column); + ZEPHIR_CALL_METHOD(&_10$$20, this_ptr, "checkcolumnsizeandscale", NULL, 210, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_11$$20, this_ptr, "checkcolumnunsigned", NULL, 207, column); + ZEPHIR_CALL_METHOD(&_11$$20, this_ptr, "checkcolumnunsigned", NULL, 209, 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, 208, column); + ZEPHIR_CALL_METHOD(&_14$$24, this_ptr, "checkcolumnsizeandscale", NULL, 210, column); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_15$$24, this_ptr, "checkcolumnunsigned", NULL, 207, column); + ZEPHIR_CALL_METHOD(&_15$$24, this_ptr, "checkcolumnunsigned", NULL, 209, 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, 207, column); + ZEPHIR_CALL_METHOD(&_18$$26, this_ptr, "checkcolumnunsigned", NULL, 209, 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, 207, column); + ZEPHIR_CALL_METHOD(&_21$$36, this_ptr, "checkcolumnunsigned", NULL, 209, 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, 207, column); + ZEPHIR_CALL_METHOD(&_24$$40, this_ptr, "checkcolumnunsigned", NULL, 209, 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, 207, column); + ZEPHIR_CALL_METHOD(&_31$$52, this_ptr, "checkcolumnunsigned", NULL, 209, 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, 206, &value$$61, &_39$$62); + ZEPHIR_CALL_FUNCTION(&_40$$62, "addcslashes", &_41, 208, &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, 206, &value$$61, &_43$$63); + ZEPHIR_CALL_FUNCTION(&_44$$63, "addcslashes", &_41, 208, &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, 206, &typeValues, &_50$$64); + ZEPHIR_CALL_FUNCTION(&_51$$64, "addcslashes", &_41, 208, &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, 205, &defaultValue); + ZEPHIR_CALL_FUNCTION(&_14$$8, "is_float", NULL, 207, &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, 206, &defaultValue, &_16$$10); + ZEPHIR_CALL_FUNCTION(&_17$$10, "addcslashes", NULL, 208, &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 1e0dabaf09..32d0152d46 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, 206, &value$$38, &_10$$39); + ZEPHIR_CALL_FUNCTION(&_11$$39, "addcslashes", &_12, 208, &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, 206, &value$$38, &_14$$40); + ZEPHIR_CALL_FUNCTION(&_15$$40, "addcslashes", &_12, 208, &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, 206, &typeValues, &_21$$41); + ZEPHIR_CALL_FUNCTION(&_22$$41, "addcslashes", &_12, 208, &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, 206, &defaultValue, &_7$$6); + ZEPHIR_CALL_FUNCTION(&_8$$6, "addcslashes", NULL, 208, &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 656326a263..b75e246010 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, 206, &defaultValue, &_7$$5); + ZEPHIR_CALL_FUNCTION(&_8$$5, "addcslashes", NULL, 208, &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, 206, &defaultValue, &_13$$12); + ZEPHIR_CALL_FUNCTION(&_14$$12, "addcslashes", &_15, 208, &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, 206, &defaultValue, &_26$$20); + ZEPHIR_CALL_FUNCTION(&_27$$20, "addcslashes", &_15, 208, &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, 206, &value$$40, &_10$$41); + ZEPHIR_CALL_FUNCTION(&_11$$41, "addcslashes", &_12, 208, &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, 206, &value$$40, &_14$$42); + ZEPHIR_CALL_FUNCTION(&_15$$42, "addcslashes", &_12, 208, &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, 206, &typeValues, &_21$$43); + ZEPHIR_CALL_FUNCTION(&_22$$43, "addcslashes", &_12, 208, &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 fdd9c89bb6..ae63424acd 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, 209, &sqlStatement); + ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlstatement", NULL, 211, &sqlStatement); zephir_check_call_status(); if (Z_TYPE_P(sqlVariables) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlvariables", NULL, 210, sqlVariables); + ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlvariables", NULL, 212, sqlVariables); zephir_check_call_status(); } if (Z_TYPE_P(sqlBindTypes) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlbindtypes", NULL, 211, sqlBindTypes); + ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setsqlbindtypes", NULL, 213, sqlBindTypes); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_0, "hrtime", NULL, 194, &__$true); + ZEPHIR_CALL_FUNCTION(&_0, "hrtime", NULL, 196, &__$true); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setinitialtime", NULL, 212, &_0); + ZEPHIR_CALL_METHOD(NULL, &activeProfile, "setinitialtime", NULL, 214, &_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, 194, &__$true); + ZEPHIR_CALL_FUNCTION(&finalTime, "hrtime", NULL, 196, &__$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.zep.c b/ext/phalcon/di.zep.c index ac66a18de3..e3eaec36ad 100644 --- a/ext/phalcon/di.zep.c +++ b/ext/phalcon/di.zep.c @@ -179,7 +179,7 @@ PHP_METHOD(Phalcon_Di, __call) ZVAL_LONG(&_0$$3, 3); ZEPHIR_INIT_VAR(&_1$$3); zephir_substr(&_1$$3, &method, 3 , 0, ZEPHIR_SUBSTR_NO_LENGTH); - ZEPHIR_CALL_FUNCTION(&possibleService, "lcfirst", NULL, 97, &_1$$3); + ZEPHIR_CALL_FUNCTION(&possibleService, "lcfirst", NULL, 99, &_1$$3); zephir_check_call_status(); zephir_read_property(&_2$$3, this_ptr, ZEND_STRL("services"), PH_NOISY_CC | PH_READONLY); if (zephir_array_isset(&_2$$3, &possibleService)) { @@ -194,7 +194,7 @@ PHP_METHOD(Phalcon_Di, __call) ZVAL_LONG(&_3$$6, 3); ZEPHIR_INIT_VAR(&_4$$6); zephir_substr(&_4$$6, &method, 3 , 0, ZEPHIR_SUBSTR_NO_LENGTH); - ZEPHIR_CALL_FUNCTION(&_5$$6, "lcfirst", NULL, 97, &_4$$6); + ZEPHIR_CALL_FUNCTION(&_5$$6, "lcfirst", NULL, 99, &_4$$6); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "set", NULL, 0, &_5$$6, &definition); zephir_check_call_status(); @@ -273,7 +273,7 @@ PHP_METHOD(Phalcon_Di, attempt) } else { ZVAL_BOOL(&_2, 0); } - ZEPHIR_CALL_METHOD(NULL, &_1, "__construct", NULL, 98, definition, &_2); + ZEPHIR_CALL_METHOD(NULL, &_1, "__construct", NULL, 100, definition, &_2); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("services"), &name, &_1); zephir_read_property(&_3, this_ptr, ZEND_STRL("services"), PH_NOISY_CC | PH_READONLY); @@ -809,7 +809,7 @@ PHP_METHOD(Phalcon_Di, loadFromPhp) ZEPHIR_INIT_VAR(&services); object_init_ex(&services, phalcon_config_adapter_php_ce); - ZEPHIR_CALL_METHOD(NULL, &services, "__construct", NULL, 99, &filePath); + ZEPHIR_CALL_METHOD(NULL, &services, "__construct", NULL, 101, &filePath); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "loadfromconfig", NULL, 0, &services); zephir_check_call_status(); @@ -891,7 +891,7 @@ PHP_METHOD(Phalcon_Di, loadFromYaml) ZEPHIR_INIT_VAR(&services); object_init_ex(&services, phalcon_config_adapter_yaml_ce); - ZEPHIR_CALL_METHOD(NULL, &services, "__construct", NULL, 100, &filePath, &callbacks); + ZEPHIR_CALL_METHOD(NULL, &services, "__construct", NULL, 102, &filePath, &callbacks); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "loadfromconfig", NULL, 0, &services); zephir_check_call_status(); @@ -1219,7 +1219,7 @@ PHP_METHOD(Phalcon_Di, set) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 98, definition, &_1); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 100, definition, &_1); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("services"), &name, &_0); zephir_read_property(&_2, this_ptr, ZEND_STRL("services"), PH_NOISY_CC | PH_READONLY); diff --git a/ext/phalcon/di/factorydefault.zep.c b/ext/phalcon/di/factorydefault.zep.c index 64f4729839..10145b5825 100644 --- a/ext/phalcon/di/factorydefault.zep.c +++ b/ext/phalcon/di/factorydefault.zep.c @@ -77,7 +77,7 @@ PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Annotations\\Adapter\\Memory"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 98, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 100, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("annotations"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -85,7 +85,7 @@ PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Assets\\Manager"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 98, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 100, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("assets"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -93,7 +93,7 @@ PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Encryption\\Crypt"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 98, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 100, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("crypt"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -101,7 +101,7 @@ PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Http\\Response\\Cookies"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 98, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 100, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("cookies"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -109,7 +109,7 @@ PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Mvc\\Dispatcher"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 98, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 100, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("dispatcher"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -117,7 +117,7 @@ PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Escaper"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 98, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 100, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("escaper"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -125,7 +125,7 @@ PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Events\\Manager"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 98, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 100, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("eventsManager"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -133,7 +133,7 @@ PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Flash\\Direct"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 98, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 100, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("flash"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -141,15 +141,15 @@ PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Flash\\Session"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 98, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 100, &_3, &_4); zephir_check_call_status(); 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(&_5, &filter, "newinstance", NULL, 115); + ZEPHIR_CALL_METHOD(&_5, &filter, "newinstance", NULL, 117); zephir_check_call_status(); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 98, &_5, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 100, &_5, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("filter"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -157,7 +157,7 @@ PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Support\\HelperFactory"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 98, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 100, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("helper"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -165,7 +165,7 @@ PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Mvc\\Model\\Manager"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 98, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 100, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("modelsManager"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -173,7 +173,7 @@ PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Mvc\\Model\\MetaData\\Memory"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 98, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 100, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("modelsMetadata"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -181,7 +181,7 @@ PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Http\\Request"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 98, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 100, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("request"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -189,7 +189,7 @@ PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Http\\Response"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 98, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 100, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("response"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -197,7 +197,7 @@ PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Mvc\\Router"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 98, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 100, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("router"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -205,7 +205,7 @@ PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Encryption\\Security"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 98, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 100, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("security"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -213,7 +213,7 @@ PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Tag"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 98, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 100, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("tag"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -221,7 +221,7 @@ PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Mvc\\Model\\Transaction\\Manager"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 98, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 100, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("transactionManager"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -229,7 +229,7 @@ PHP_METHOD(Phalcon_Di_FactoryDefault, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Url"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 98, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 100, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("url"), &_2, PH_COPY | PH_SEPARATE); zephir_update_property_zval(this_ptr, ZEND_STRL("services"), &_1); diff --git a/ext/phalcon/di/factorydefault/cli.zep.c b/ext/phalcon/di/factorydefault/cli.zep.c index 8c97fbfe89..1a004e88ea 100644 --- a/ext/phalcon/di/factorydefault/cli.zep.c +++ b/ext/phalcon/di/factorydefault/cli.zep.c @@ -79,7 +79,7 @@ PHP_METHOD(Phalcon_Di_FactoryDefault_Cli, __construct) ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Annotations\\Adapter\\Memory"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 98, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 100, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("annotations"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -87,7 +87,7 @@ PHP_METHOD(Phalcon_Di_FactoryDefault_Cli, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Cli\\Dispatcher"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 98, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 100, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("dispatcher"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -95,7 +95,7 @@ PHP_METHOD(Phalcon_Di_FactoryDefault_Cli, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Escaper"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 98, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 100, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("escaper"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -103,15 +103,15 @@ PHP_METHOD(Phalcon_Di_FactoryDefault_Cli, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Events\\Manager"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 98, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 100, &_3, &_4); zephir_check_call_status(); 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, 115); + ZEPHIR_CALL_METHOD(&_5, &filter, "newinstance", NULL, 117); zephir_check_call_status(); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 98, &_5, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 100, &_5, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("filter"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -119,7 +119,7 @@ PHP_METHOD(Phalcon_Di_FactoryDefault_Cli, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Support\\HelperFactory"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 98, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 100, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("helper"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -127,7 +127,7 @@ PHP_METHOD(Phalcon_Di_FactoryDefault_Cli, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Mvc\\Model\\Manager"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 98, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 100, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("modelsManager"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -135,7 +135,7 @@ PHP_METHOD(Phalcon_Di_FactoryDefault_Cli, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Mvc\\Model\\MetaData\\Memory"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 98, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 100, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("modelsMetadata"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -143,7 +143,7 @@ PHP_METHOD(Phalcon_Di_FactoryDefault_Cli, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Cli\\Router"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 98, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 100, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("router"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -151,7 +151,7 @@ PHP_METHOD(Phalcon_Di_FactoryDefault_Cli, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Encryption\\Security"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 98, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 100, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("security"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_INIT_NVAR(&_2); @@ -159,7 +159,7 @@ PHP_METHOD(Phalcon_Di_FactoryDefault_Cli, __construct) ZEPHIR_INIT_NVAR(&_3); ZVAL_STRING(&_3, "Phalcon\\Mvc\\Model\\Transaction\\Manager"); ZVAL_BOOL(&_4, 1); - ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 98, &_3, &_4); + ZEPHIR_CALL_METHOD(NULL, &_2, "__construct", NULL, 100, &_3, &_4); zephir_check_call_status(); zephir_array_update_string(&_1, SL("transactionManager"), &_2, PH_COPY | PH_SEPARATE); zephir_update_property_zval(this_ptr, ZEND_STRL("services"), &_1); diff --git a/ext/phalcon/di/service.zep.c b/ext/phalcon/di/service.zep.c index 70dbe9b9a9..382f18fa77 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, 213, container, &definition, parameters); + ZEPHIR_CALL_METHOD(&instance, &builder, "build", NULL, 215, 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 2dfcfb6e79..6931b19261 100644 --- a/ext/phalcon/di/service/builder.zep.c +++ b/ext/phalcon/di/service/builder.zep.c @@ -149,7 +149,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, 214, container, &arguments); + ZEPHIR_CALL_METHOD(&_0$$8, this_ptr, "buildparameters", NULL, 216, container, &arguments); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&instance); ZEPHIR_LAST_CALL_STATUS = zephir_create_instance_params(&instance, &className, &_0$$8); @@ -224,7 +224,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build) } if (zephir_fast_count_int(&arguments)) { ZEPHIR_INIT_NVAR(&_12$$18); - ZEPHIR_CALL_METHOD(&_13$$18, this_ptr, "buildparameters", NULL, 214, container, &arguments); + ZEPHIR_CALL_METHOD(&_13$$18, this_ptr, "buildparameters", NULL, 216, container, &arguments); zephir_check_call_status(); ZEPHIR_CALL_USER_FUNC_ARRAY(&_12$$18, &methodCall, &_13$$18); zephir_check_call_status(); @@ -291,7 +291,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build) } if (zephir_fast_count_int(&arguments)) { ZEPHIR_INIT_NVAR(&_22$$24); - ZEPHIR_CALL_METHOD(&_23$$24, this_ptr, "buildparameters", NULL, 214, container, &arguments); + ZEPHIR_CALL_METHOD(&_23$$24, this_ptr, "buildparameters", NULL, 216, container, &arguments); zephir_check_call_status(); ZEPHIR_CALL_USER_FUNC_ARRAY(&_22$$24, &methodCall, &_23$$24); zephir_check_call_status(); @@ -365,7 +365,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_35$$28, this_ptr, "buildparameter", &_36, 215, container, &propertyPosition, &propertyValue); + ZEPHIR_CALL_METHOD(&_35$$28, this_ptr, "buildparameter", &_36, 217, container, &propertyPosition, &propertyValue); zephir_check_call_status(); zephir_update_property_zval_zval(&instance, &propertyName, &_35$$28); } ZEND_HASH_FOREACH_END(); @@ -417,7 +417,7 @@ PHP_METHOD(Phalcon_Di_Service_Builder, build) ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_METHOD(&_43$$32, this_ptr, "buildparameter", &_36, 215, container, &propertyPosition, &propertyValue); + ZEPHIR_CALL_METHOD(&_43$$32, this_ptr, "buildparameter", &_36, 217, container, &propertyPosition, &propertyValue); zephir_check_call_status(); zephir_update_property_zval_zval(&instance, &propertyName, &_43$$32); ZEPHIR_CALL_METHOD(NULL, ¶mCalls, "next", NULL, 0); @@ -631,7 +631,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, 215, container, &position, &argument); + ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "buildparameter", &_5, 217, container, &position, &argument); zephir_check_call_status(); zephir_array_append(&buildArguments, &_4$$3, PH_SEPARATE, "phalcon/Di/Service/Builder.zep", 319); } ZEND_HASH_FOREACH_END(); @@ -648,7 +648,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, 215, container, &position, &argument); + ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "buildparameter", &_5, 217, container, &position, &argument); zephir_check_call_status(); zephir_array_append(&buildArguments, &_6$$4, PH_SEPARATE, "phalcon/Di/Service/Builder.zep", 319); ZEPHIR_CALL_METHOD(NULL, &arguments, "next", NULL, 0); diff --git a/ext/phalcon/dispatcher/abstractdispatcher.zep.c b/ext/phalcon/dispatcher/abstractdispatcher.zep.c index 35711abd42..b2d052a1c2 100644 --- a/ext/phalcon/dispatcher/abstractdispatcher.zep.c +++ b/ext/phalcon/dispatcher/abstractdispatcher.zep.c @@ -489,7 +489,7 @@ PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, dispatch) } break; } - ZEPHIR_CALL_FUNCTION(&handlerHash, "spl_object_hash", &_37, 101, &handler); + ZEPHIR_CALL_FUNCTION(&handlerHash, "spl_object_hash", &_37, 103, &handler); zephir_check_call_status(); zephir_read_property(&_38$$10, this_ptr, ZEND_STRL("handlerHashes"), PH_NOISY_CC | PH_READONLY); isNewHandler = !((zephir_array_isset(&_38$$10, &handlerHash))); @@ -1093,7 +1093,7 @@ PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, getActiveMethod) zephir_read_property(&_3$$3, this_ptr, ZEND_STRL("actionName"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "tocamelcase", NULL, 0, &_3$$3); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&activeMethodName, "lcfirst", NULL, 97, &_2$$3); + ZEPHIR_CALL_FUNCTION(&activeMethodName, "lcfirst", NULL, 99, &_2$$3); zephir_check_call_status(); ZEPHIR_OBS_VAR(&_4$$3); zephir_read_property(&_4$$3, this_ptr, ZEND_STRL("actionName"), PH_NOISY_CC); @@ -1853,11 +1853,11 @@ PHP_METHOD(Phalcon_Dispatcher_AbstractDispatcher, toCamelCase) if (!(zephir_array_isset_fetch(&camelCaseInput, &_0, &input, 0))) { ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "/[_-]+/"); - ZEPHIR_CALL_FUNCTION(&_2$$3, "preg_split", NULL, 102, &_1$$3, &input); + ZEPHIR_CALL_FUNCTION(&_2$$3, "preg_split", NULL, 104, &_1$$3, &input); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_1$$3); ZVAL_STRING(&_1$$3, "ucfirst"); - ZEPHIR_CALL_FUNCTION(&_3$$3, "array_map", NULL, 103, &_1$$3, &_2$$3); + ZEPHIR_CALL_FUNCTION(&_3$$3, "array_map", NULL, 105, &_1$$3, &_2$$3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&camelCaseInput); zephir_fast_join_str(&camelCaseInput, SL(""), &_3$$3); diff --git a/ext/phalcon/encryption/crypt.zep.c b/ext/phalcon/encryption/crypt.zep.c index a35fbced07..f1f27b1dd9 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, 216); + ZEPHIR_CALL_METHOD(NULL, padFactory, "__construct", NULL, 218); 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, 217); + ZEPHIR_CALL_METHOD(&mode, this_ptr, "getmode", NULL, 219); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&blockSize, this_ptr, "getblocksize", NULL, 218, &mode); + ZEPHIR_CALL_METHOD(&blockSize, this_ptr, "getblocksize", NULL, 220, &mode); zephir_check_call_status(); ZVAL_LONG(&_0, 0); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "8bit"); - ZEPHIR_CALL_FUNCTION(&iv, "mb_substr", NULL, 219, &input, &_0, &ivLength, &_1); + ZEPHIR_CALL_FUNCTION(&iv, "mb_substr", NULL, 221, &input, &_0, &ivLength, &_1); zephir_check_call_status(); ZEPHIR_INIT_VAR(&digest); ZVAL_STRING(&digest, ""); @@ -320,24 +320,24 @@ PHP_METHOD(Phalcon_Encryption_Crypt, decrypt) if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { ZEPHIR_INIT_VAR(&_2$$5); ZVAL_STRING(&_2$$5, ""); - ZEPHIR_CALL_FUNCTION(&_3$$5, "hash", NULL, 220, &hashAlgorithm, &_2$$5, &__$true); + ZEPHIR_CALL_FUNCTION(&_3$$5, "hash", NULL, 222, &hashAlgorithm, &_2$$5, &__$true); zephir_check_call_status(); ZEPHIR_INIT_VAR(&hashLength); 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, 219, &input, &ivLength, &hashLength, &_2$$5); + ZEPHIR_CALL_FUNCTION(&digest, "mb_substr", NULL, 221, &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, 219, &input, &_4$$5, &__$null, &_2$$5); + ZEPHIR_CALL_FUNCTION(&cipherText, "mb_substr", NULL, 221, &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, 219, &input, &ivLength, &__$null, &_5$$6); + ZEPHIR_CALL_FUNCTION(&cipherText, "mb_substr", NULL, 221, &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, 221, &hashAlgorithm, &padded, &decryptKey, &__$true); + ZEPHIR_CALL_FUNCTION(&_8$$7, "hash_hmac", NULL, 223, &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, 222, &input); + ZEPHIR_CALL_FUNCTION(&_5, "base64_decode", NULL, 224, &input); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "decrypt", NULL, 0, &_5, &key); zephir_check_call_status(); @@ -511,11 +511,11 @@ 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, 217); + ZEPHIR_CALL_METHOD(&mode, this_ptr, "getmode", NULL, 219); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&blockSize, this_ptr, "getblocksize", NULL, 218, &mode); + ZEPHIR_CALL_METHOD(&blockSize, this_ptr, "getblocksize", NULL, 220, &mode); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&iv, "openssl_random_pseudo_bytes", NULL, 223, &ivLength); + ZEPHIR_CALL_FUNCTION(&iv, "openssl_random_pseudo_bytes", NULL, 225, &ivLength); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&iv)) { ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_crypt_exception_exception_ce, "Cannot calculate Random Pseudo Bytes", "phalcon/Encryption/Crypt.zep", 295); @@ -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, 221, &_2$$6, &padded, &encryptKey, &__$true); + ZEPHIR_CALL_FUNCTION(&digest, "hash_hmac", NULL, 223, &_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, 224, &_0$$3); + ZEPHIR_CALL_FUNCTION(&_1$$3, "base64_encode", NULL, 226, &_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, 224, &_5); + ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 226, &_5); zephir_check_call_status(); RETURN_MM(); } @@ -686,11 +686,11 @@ PHP_METHOD(Phalcon_Encryption_Crypt, getAvailableHashAlgorithms) ZEPHIR_MM_GROW(); if (1 == (zephir_function_exists_ex(ZEND_STRL("hash_hmac_algos")) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("hash_hmac_algos", NULL, 225); + ZEPHIR_RETURN_CALL_FUNCTION("hash_hmac_algos", NULL, 227); zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_RETURN_CALL_FUNCTION("hash_algos", NULL, 226); + ZEPHIR_RETURN_CALL_FUNCTION("hash_algos", NULL, 228); zephir_check_call_status(); RETURN_MM(); } @@ -863,7 +863,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, 227, &cipher); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "getivlength", NULL, 229, &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); @@ -1077,7 +1077,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, 135, &_2$$5, &type, &cipher); + ZEPHIR_CALL_FUNCTION(&_3$$5, "sprintf", NULL, 137, &_2$$5, &type, &cipher); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$5, "__construct", NULL, 8, &_3$$5); zephir_check_call_status(); @@ -1154,10 +1154,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, 228, &_1, &mode); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkismode", NULL, 230, &_1, &mode); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { - ZEPHIR_CALL_FUNCTION(&_3$$3, "mb_strlen", NULL, 229, &input); + ZEPHIR_CALL_FUNCTION(&_3$$3, "mb_strlen", NULL, 231, &input); zephir_check_call_status(); paddingSize = (blockSize - zephir_safe_mod_zval_long(&_3$$3, blockSize)); _4$$3 = paddingSize >= 256; @@ -1265,7 +1265,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, 228, &_3, &mode); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkismode", NULL, 230, &_3, &mode); zephir_check_call_status(); _1 = ZEPHIR_IS_TRUE_IDENTICAL(&_2); } @@ -1350,7 +1350,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, 228, &_1, &mode); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkismode", NULL, 230, &_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); @@ -1427,7 +1427,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, 228, &_2, &mode); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "checkismode", NULL, 230, &_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); @@ -1442,11 +1442,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, 230, &encrypted, &cipher, &decryptKey, &_4$$3, &iv, &authTag, &authData); + ZEPHIR_CALL_FUNCTION(&decrypted, "openssl_decrypt", NULL, 232, &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, 230, &cipherText, &cipher, &decryptKey, &_6$$4, &iv); + ZEPHIR_CALL_FUNCTION(&decrypted, "openssl_decrypt", NULL, 232, &cipherText, &cipher, &decryptKey, &_6$$4, &iv); zephir_check_call_status(); } if (ZEPHIR_IS_FALSE_IDENTICAL(&decrypted)) { @@ -1510,7 +1510,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, 228, &_3, &mode); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "checkismode", NULL, 230, &_3, &mode); zephir_check_call_status(); _1 = ZEPHIR_IS_TRUE_IDENTICAL(&_2); } @@ -1588,7 +1588,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, 228, &_2, &mode); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "checkismode", NULL, 230, &_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); @@ -1603,13 +1603,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, 231, &padded, &cipher, &encryptKey, &_4$$3, &iv, &authTag, &authData, &authTagLength); + ZEPHIR_CALL_FUNCTION(&encrypted, "openssl_encrypt", NULL, 233, &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, 231, &padded, &cipher, &encryptKey, &_5$$5, &iv); + ZEPHIR_CALL_FUNCTION(&encrypted, "openssl_encrypt", NULL, 233, &padded, &cipher, &encryptKey, &_5$$5, &iv); zephir_check_call_status(); } if (ZEPHIR_IS_FALSE_IDENTICAL(&encrypted)) { @@ -1648,7 +1648,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", 871); return; } - ZEPHIR_CALL_FUNCTION(&available, "openssl_get_cipher_methods", NULL, 232, &__$true); + ZEPHIR_CALL_FUNCTION(&available, "openssl_get_cipher_methods", NULL, 234, &__$true); zephir_check_call_status(); ZEPHIR_INIT_VAR(&allowed); array_init(&allowed); @@ -1789,9 +1789,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, 233, &_1, &_3, &_2); + ZEPHIR_CALL_FUNCTION(&_4, "str_ireplace", NULL, 235, &_1, &_3, &_2); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getivlength", NULL, 227, &_4); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getivlength", NULL, 229, &_4); zephir_check_call_status(); RETURN_MM(); } @@ -1827,7 +1827,7 @@ PHP_METHOD(Phalcon_Encryption_Crypt, getIvLength) zephir_get_strval(&cipher, cipher_param); - ZEPHIR_CALL_FUNCTION(&length, "openssl_cipher_iv_length", NULL, 234, &cipher); + ZEPHIR_CALL_FUNCTION(&length, "openssl_cipher_iv_length", NULL, 236, &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", 941); @@ -1862,7 +1862,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, 118, &_0, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "strrpos", NULL, 120, &_0, &_1); zephir_check_call_status(); ZEPHIR_INIT_VAR(&position); ZVAL_LONG(&position, zephir_get_intval(&_2)); diff --git a/ext/phalcon/encryption/crypt/padding/ansi.zep.c b/ext/phalcon/encryption/crypt/padding/ansi.zep.c index 827c2853e1..61363c1c02 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, 235, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 237, &_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, 235, &_0); + ZEPHIR_CALL_FUNCTION(&_3, "chr", NULL, 237, &_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, 236, &last); + ZEPHIR_CALL_FUNCTION(&ord, "ord", NULL, 238, &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, 235, &_2$$4); + ZEPHIR_CALL_FUNCTION(&_3$$4, "chr", NULL, 237, &_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 96a3fd10d2..5008e604e9 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, 237); + ZEPHIR_CALL_FUNCTION(&_3$$3, "rand", &_4, 239); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_5$$3, "chr", &_6, 235, &_3$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "chr", &_6, 237, &_3$$3); zephir_check_call_status(); zephir_concat_self(&padding, &_5$$3); } } ZVAL_LONG(&_7, paddingSize); - ZEPHIR_CALL_FUNCTION(&_8, "chr", &_6, 235, &_7); + ZEPHIR_CALL_FUNCTION(&_8, "chr", &_6, 237, &_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, 236, &last); + ZEPHIR_RETURN_CALL_FUNCTION("ord", NULL, 238, &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 859ffa513a..6a6bab8e0c 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, 235, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 237, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, 0); - ZEPHIR_CALL_FUNCTION(&_2, "chr", NULL, 235, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "chr", NULL, 237, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, (paddingSize - 1)); ZEPHIR_CALL_FUNCTION(&_3, "str_repeat", NULL, 1, &_2, &_0); @@ -123,9 +123,9 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_IsoIek, unpad) paddingSize = 0; - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 229, &input); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 231, &input); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&inputArray, "str_split", NULL, 110, &input); + ZEPHIR_CALL_FUNCTION(&inputArray, "str_split", NULL, 112, &input); zephir_check_call_status(); counter = (zephir_get_numberval(&length) - 1); while (1) { @@ -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, 235, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 237, &_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, 235, &_2); + ZEPHIR_CALL_FUNCTION(&_7, "chr", &_4, 237, &_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 4949eb0381..c80f7e936f 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, 235, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 237, &_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, 229, &input); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 231, &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, 236, &last); + ZEPHIR_CALL_FUNCTION(&ord, "ord", NULL, 238, &last); zephir_check_call_status(); if (ZEPHIR_LE_LONG(&ord, blockSize)) { ZEPHIR_CPY_WRT(&paddingSize, &ord); - ZEPHIR_CALL_FUNCTION(&_2$$3, "chr", NULL, 235, &paddingSize); + ZEPHIR_CALL_FUNCTION(&_2$$3, "chr", NULL, 237, &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 87ca9f0c02..8ca6edeb6d 100644 --- a/ext/phalcon/encryption/crypt/padding/space.zep.c +++ b/ext/phalcon/encryption/crypt/padding/space.zep.c @@ -112,9 +112,9 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Space, unpad) blockSize = zephir_get_intval(blockSize_param); - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 229, &input); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 231, &input); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&inputArray, "str_split", NULL, 110, &input); + ZEPHIR_CALL_FUNCTION(&inputArray, "str_split", NULL, 112, &input); zephir_check_call_status(); counter = (zephir_get_numberval(&length) - 1); paddingSize = 0; @@ -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, 235, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 237, &_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 a60f773cf0..ac324efbe7 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, 235, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "chr", NULL, 237, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, paddingSize); ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", NULL, 1, &_1, &_0); @@ -113,9 +113,9 @@ PHP_METHOD(Phalcon_Encryption_Crypt_Padding_Zero, unpad) blockSize = zephir_get_intval(blockSize_param); - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 229, &input); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 231, &input); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&inputArray, "str_split", NULL, 110, &input); + ZEPHIR_CALL_FUNCTION(&inputArray, "str_split", NULL, 112, &input); zephir_check_call_status(); counter = (zephir_get_numberval(&length) - 1); paddingSize = 0; @@ -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, 235, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "chr", &_4, 237, &_2); zephir_check_call_status(); _0 = ZEPHIR_IS_EQUAL(&_1, &_3); } diff --git a/ext/phalcon/encryption/security.zep.c b/ext/phalcon/encryption/security.zep.c index d72787b5bb..0ef3d5628d 100644 --- a/ext/phalcon/encryption/security.zep.c +++ b/ext/phalcon/encryption/security.zep.c @@ -228,7 +228,7 @@ PHP_METHOD(Phalcon_Encryption_Security, checkHash) if (_0) { RETURN_MM_BOOL(0); } - ZEPHIR_CALL_FUNCTION(&_1, "crypt", NULL, 238, &password, &passwordHash); + ZEPHIR_CALL_FUNCTION(&_1, "crypt", NULL, 240, &password, &passwordHash); zephir_check_call_status(); zephir_cast_to_string(&_2, &_1); ZEPHIR_CPY_WRT(&cryptedHash, &_2); @@ -297,7 +297,7 @@ PHP_METHOD(Phalcon_Encryption_Security, checkToken) } - ZEPHIR_CALL_METHOD(&session, this_ptr, "getlocalsession", NULL, 239); + ZEPHIR_CALL_METHOD(&session, this_ptr, "getlocalsession", NULL, 241); zephir_check_call_status(); _0 = zephir_is_true(&session); if (_0) { @@ -312,7 +312,7 @@ PHP_METHOD(Phalcon_Encryption_Security, checkToken) RETURN_MM_BOOL(0); } if (!(zephir_is_true(tokenValue))) { - ZEPHIR_CALL_METHOD(&request, this_ptr, "getlocalrequest", NULL, 240); + ZEPHIR_CALL_METHOD(&request, this_ptr, "getlocalrequest", NULL, 242); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2$$5); ZVAL_STRING(&_2$$5, "string"); @@ -385,14 +385,14 @@ PHP_METHOD(Phalcon_Encryption_Security, computeHmac) ZVAL_BOOL(&_0, (raw ? 1 : 0)); - ZEPHIR_CALL_FUNCTION(&hmac, "hash_hmac", NULL, 221, &algo, &data, &key, &_0); + ZEPHIR_CALL_FUNCTION(&hmac, "hash_hmac", NULL, 223, &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, 135, &_2$$3, &algo); + ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 137, &_2$$3, &algo); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 8, &_3$$3); zephir_check_call_status(); @@ -421,7 +421,7 @@ PHP_METHOD(Phalcon_Encryption_Security, destroyToken) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&session, this_ptr, "getlocalsession", NULL, 239); + ZEPHIR_CALL_METHOD(&session, this_ptr, "getlocalsession", NULL, 241); zephir_check_call_status(); if (UNEXPECTED(zephir_is_true(&session))) { zephir_read_property(&_0$$3, this_ptr, ZEND_STRL("tokenKeySessionId"), PH_NOISY_CC | PH_READONLY); @@ -514,7 +514,7 @@ PHP_METHOD(Phalcon_Encryption_Security, getSessionToken) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&session, this_ptr, "getlocalsession", NULL, 239); + ZEPHIR_CALL_METHOD(&session, this_ptr, "getlocalsession", NULL, 241); zephir_check_call_status(); if (UNEXPECTED(zephir_is_true(&session))) { zephir_read_property(&_0$$3, this_ptr, ZEND_STRL("tokenValueSessionId"), PH_NOISY_CC | PH_READONLY); @@ -613,7 +613,7 @@ PHP_METHOD(Phalcon_Encryption_Security, getToken) ZEPHIR_CALL_METHOD(&_3$$3, &_2$$3, "base64safe", NULL, 0, &_4$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("token"), &_3$$3); - ZEPHIR_CALL_METHOD(&session, this_ptr, "getlocalsession", NULL, 239); + ZEPHIR_CALL_METHOD(&session, this_ptr, "getlocalsession", NULL, 241); zephir_check_call_status(); if (UNEXPECTED(zephir_is_true(&session))) { zephir_read_property(&_5$$4, this_ptr, ZEND_STRL("tokenValueSessionId"), PH_NOISY_CC | PH_READONLY); @@ -649,7 +649,7 @@ PHP_METHOD(Phalcon_Encryption_Security, getTokenKey) zephir_read_property(&_0, this_ptr, ZEND_STRL("tokenKey"), PH_NOISY_CC | PH_READONLY); if (Z_TYPE_P(&_0) == IS_NULL) { - ZEPHIR_CALL_METHOD(&session, this_ptr, "getlocalsession", NULL, 239); + ZEPHIR_CALL_METHOD(&session, this_ptr, "getlocalsession", NULL, 241); zephir_check_call_status(); if (UNEXPECTED(zephir_is_true(&session))) { zephir_read_property(&_1$$4, this_ptr, ZEND_STRL("random"), PH_NOISY_CC | PH_READONLY); @@ -772,7 +772,7 @@ PHP_METHOD(Phalcon_Encryption_Security, hash) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_encryption_security_exception_ce, "Unable to get random bytes for the salt", "phalcon/Encryption/Security.zep", 433); return; } - ZEPHIR_RETURN_CALL_FUNCTION("crypt", NULL, 238, &password, &saltBytes); + ZEPHIR_RETURN_CALL_FUNCTION("crypt", NULL, 240, &password, &saltBytes); zephir_check_call_status(); RETURN_MM(); } @@ -793,7 +793,7 @@ PHP_METHOD(Phalcon_Encryption_Security, hash) } ZEPHIR_INIT_VAR(&_6$$15); ZEPHIR_CONCAT_SVSVS(&_6$$15, "$", &variant, "$", &saltBytes, "$"); - ZEPHIR_RETURN_CALL_FUNCTION("crypt", NULL, 238, &password, &_6$$15); + ZEPHIR_RETURN_CALL_FUNCTION("crypt", NULL, 240, &password, &_6$$15); zephir_check_call_status(); RETURN_MM(); } @@ -812,11 +812,11 @@ PHP_METHOD(Phalcon_Encryption_Security, hash) ZEPHIR_INIT_VAR(&_8$$17); ZVAL_STRING(&_8$$17, "%02s"); ZVAL_LONG(&_7$$17, workFactor); - ZEPHIR_CALL_FUNCTION(&_9$$17, "sprintf", NULL, 135, &_8$$17, &_7$$17); + ZEPHIR_CALL_FUNCTION(&_9$$17, "sprintf", NULL, 137, &_8$$17, &_7$$17); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_10$$17); ZEPHIR_CONCAT_SVSVSVS(&_10$$17, "$2", &variant, "$", &_9$$17, "$", &saltBytes, "$"); - ZEPHIR_RETURN_CALL_FUNCTION("crypt", NULL, 238, &password, &_10$$17); + ZEPHIR_RETURN_CALL_FUNCTION("crypt", NULL, 240, &password, &_10$$17); zephir_check_call_status(); RETURN_MM(); } while(0); diff --git a/ext/phalcon/encryption/security/jwt/builder.zep.c b/ext/phalcon/encryption/security/jwt/builder.zep.c index aab832cc75..ae1dfeb859 100644 --- a/ext/phalcon/encryption/security/jwt/builder.zep.c +++ b/ext/phalcon/encryption/security/jwt/builder.zep.c @@ -503,27 +503,27 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, getToken) } ZEPHIR_CALL_METHOD(&_4, this_ptr, "getclaims", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_CE_STATIC(&_2, phalcon_helper_json_ce, "encode", &_3, 15, &_4); + ZEPHIR_CALL_CE_STATIC(&_2, phalcon_helper_json_ce, "encode", &_3, 16, &_4); zephir_check_call_status(); - ZEPHIR_CALL_CE_STATIC(&encodedClaims, phalcon_helper_base64_ce, "encodeurl", &_1, 241, &_2); + ZEPHIR_CALL_CE_STATIC(&encodedClaims, phalcon_helper_base64_ce, "encodeurl", &_1, 243, &_2); zephir_check_call_status(); ZEPHIR_INIT_VAR(&claims); object_init_ex(&claims, phalcon_encryption_security_jwt_token_item_ce); ZEPHIR_CALL_METHOD(&_5, this_ptr, "getclaims", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &claims, "__construct", NULL, 242, &_5, &encodedClaims); + ZEPHIR_CALL_METHOD(NULL, &claims, "__construct", NULL, 244, &_5, &encodedClaims); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_7, this_ptr, "getheaders", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_CE_STATIC(&_6, phalcon_helper_json_ce, "encode", &_3, 15, &_7); + ZEPHIR_CALL_CE_STATIC(&_6, phalcon_helper_json_ce, "encode", &_3, 16, &_7); zephir_check_call_status(); - ZEPHIR_CALL_CE_STATIC(&encodedHeaders, phalcon_helper_base64_ce, "encodeurl", &_1, 241, &_6); + ZEPHIR_CALL_CE_STATIC(&encodedHeaders, phalcon_helper_base64_ce, "encodeurl", &_1, 243, &_6); zephir_check_call_status(); ZEPHIR_INIT_VAR(&headers); object_init_ex(&headers, phalcon_encryption_security_jwt_token_item_ce); ZEPHIR_CALL_METHOD(&_8, this_ptr, "getheaders", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &headers, "__construct", NULL, 242, &_8, &encodedHeaders); + ZEPHIR_CALL_METHOD(NULL, &headers, "__construct", NULL, 244, &_8, &encodedHeaders); zephir_check_call_status(); zephir_read_property(&_9, this_ptr, ZEND_STRL("signer"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_10); @@ -531,14 +531,14 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Builder, getToken) zephir_read_property(&_11, this_ptr, ZEND_STRL("passphrase"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(&signatureHash, &_9, "sign", NULL, 0, &_10, &_11); zephir_check_call_status(); - ZEPHIR_CALL_CE_STATIC(&encodedSignature, phalcon_helper_base64_ce, "encodeurl", &_1, 241, &signatureHash); + ZEPHIR_CALL_CE_STATIC(&encodedSignature, phalcon_helper_base64_ce, "encodeurl", &_1, 243, &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, 243, &signatureHash, &encodedSignature); + ZEPHIR_CALL_METHOD(NULL, &signature, "__construct", NULL, 245, &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, 244, &headers, &claims, &signature); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 246, &headers, &claims, &signature); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/encryption/security/jwt/signer/hmac.zep.c b/ext/phalcon/encryption/security/jwt/signer/hmac.zep.c index 96a88aa231..a7966c1034 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, 245, &payload, &passphrase); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethash", NULL, 247, &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, 245, &payload, &passphrase); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "gethash", NULL, 247, &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, 221, &_0, &payload, &passphrase, &__$true); + ZEPHIR_RETURN_CALL_FUNCTION("hash_hmac", NULL, 223, &_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 f21af3ee08..2796aaf845 100644 --- a/ext/phalcon/encryption/security/jwt/token/parser.zep.c +++ b/ext/phalcon/encryption/security/jwt/token/parser.zep.c @@ -84,7 +84,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, parse) } - ZEPHIR_CALL_METHOD(&results, this_ptr, "parsetoken", NULL, 246, &token); + ZEPHIR_CALL_METHOD(&results, this_ptr, "parsetoken", NULL, 248, &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", 36); @@ -92,14 +92,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", 37); ZEPHIR_OBS_VAR(&encodedSignature); zephir_array_fetch_long(&encodedSignature, &results, 2, PH_NOISY, "phalcon/Encryption/Security/JWT/Token/Parser.zep", 38); - ZEPHIR_CALL_METHOD(&headers, this_ptr, "decodeheaders", NULL, 247, &encodedHeaders); + ZEPHIR_CALL_METHOD(&headers, this_ptr, "decodeheaders", NULL, 249, &encodedHeaders); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&claims, this_ptr, "decodeclaims", NULL, 248, &encodedClaims); + ZEPHIR_CALL_METHOD(&claims, this_ptr, "decodeclaims", NULL, 250, &encodedClaims); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&signature, this_ptr, "decodesignature", NULL, 249, &headers, &encodedSignature); + ZEPHIR_CALL_METHOD(&signature, this_ptr, "decodesignature", NULL, 251, &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, 244, &headers, &claims, &signature); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 246, &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_CE_STATIC(&_1, phalcon_helper_base64_ce, "decodeurl", &_2, 250, &claims); + ZEPHIR_CALL_CE_STATIC(&_1, phalcon_helper_base64_ce, "decodeurl", &_2, 252, &claims); zephir_check_call_status(); ZVAL_BOOL(&_3, 1); - ZEPHIR_CALL_CE_STATIC(&decoded, phalcon_helper_json_ce, "decode", &_0, 188, &_1, &_3); + ZEPHIR_CALL_CE_STATIC(&decoded, phalcon_helper_json_ce, "decode", &_0, 190, &_1, &_3); 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", 62); @@ -166,7 +166,7 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeClaims) zephir_array_update_string(&decoded, SL("aud"), &_6$$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, 242, &decoded, &claims); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 244, &decoded, &claims); zephir_check_call_status(); RETURN_MM(); } @@ -204,10 +204,10 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeHeaders) zephir_get_strval(&headers, headers_param); - ZEPHIR_CALL_CE_STATIC(&_1, phalcon_helper_base64_ce, "decodeurl", &_2, 250, &headers); + ZEPHIR_CALL_CE_STATIC(&_1, phalcon_helper_base64_ce, "decodeurl", &_2, 252, &headers); zephir_check_call_status(); ZVAL_BOOL(&_3, 1); - ZEPHIR_CALL_CE_STATIC(&decoded, phalcon_helper_json_ce, "decode", &_0, 188, &_1, &_3); + ZEPHIR_CALL_CE_STATIC(&decoded, phalcon_helper_json_ce, "decode", &_0, 190, &_1, &_3); 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", 91); @@ -218,7 +218,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, 242, &decoded, &headers); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 244, &decoded, &headers); zephir_check_call_status(); RETURN_MM(); } @@ -274,11 +274,11 @@ PHP_METHOD(Phalcon_Encryption_Security_JWT_Token_Parser, decodeSignature) ZVAL_STRING(&decoded, ""); ZEPHIR_INIT_NVAR(&signature); } else { - ZEPHIR_CALL_CE_STATIC(&decoded, phalcon_helper_base64_ce, "decodeurl", &_3, 250, &signature); + ZEPHIR_CALL_CE_STATIC(&decoded, phalcon_helper_base64_ce, "decodeurl", &_3, 252, &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, 243, &decoded, &signature); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 245, &decoded, &signature); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/encryption/security/jwt/validator.zep.c b/ext/phalcon/encryption/security/jwt/validator.zep.c index 6668944ab7..f76f5d2025 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, 251, &_6); + ZEPHIR_CALL_METHOD(&_5, this_ptr, "gettimestamp", NULL, 253, &_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, 251, &_1); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "gettimestamp", NULL, 253, &_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, 251, &_1); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "gettimestamp", NULL, 253, &_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 68dd8f85b6..a11913c46d 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, 224, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 226, &_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, 224, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "base64_encode", NULL, 226, &_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, 252, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("random_bytes", NULL, 254, &_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, 253, &_2, &_0); + ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 255, &_2, &_0); zephir_check_call_status(); ZEPHIR_MAKE_REF(&_3); ZEPHIR_RETURN_CALL_FUNCTION("array_shift", NULL, 24, &_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, 254, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("random_int", NULL, 256, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -555,9 +555,9 @@ 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, 253, &_2, &_0); + ZEPHIR_CALL_FUNCTION(&_3, "unpack", NULL, 255, &_2, &_0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&ary, "array_values", NULL, 13, &_3); + ZEPHIR_CALL_FUNCTION(&ary, "array_values", NULL, 14, &_3); zephir_check_call_status(); zephir_array_fetch_long(&_4, &ary, 2, PH_NOISY | PH_READONLY, "phalcon/Encryption/Security/Random.zep", 311); ZEPHIR_INIT_NVAR(&_2); @@ -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, 255, &ary, &_7); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 257, &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, 253, &_1, &_0); + ZEPHIR_CALL_FUNCTION(&bytes, "unpack", NULL, 255, &_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/escaper.zep.c b/ext/phalcon/escaper.zep.c index 9c58f8e417..cce17fb5e3 100644 --- a/ext/phalcon/escaper.zep.c +++ b/ext/phalcon/escaper.zep.c @@ -102,7 +102,7 @@ PHP_METHOD(Phalcon_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, 256, &attribute, &_2, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 258, &attribute, &_2, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -134,7 +134,7 @@ PHP_METHOD(Phalcon_Escaper, css) zephir_get_strval(&input, input_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 257, &input); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 259, &input); zephir_check_call_status(); zephir_escape_css(return_value, &_0); RETURN_MM(); @@ -204,7 +204,7 @@ PHP_METHOD(Phalcon_Escaper, detectEncoding) { ZEPHIR_INIT_NVAR(&charset); ZVAL_COPY(&charset, _2); - ZEPHIR_CALL_FUNCTION(&_4$$5, "mb_detect_encoding", &_5, 258, &str, &charset, &__$true); + ZEPHIR_CALL_FUNCTION(&_4$$5, "mb_detect_encoding", &_5, 260, &str, &charset, &__$true); zephir_check_call_status(); if (zephir_is_true(&_4$$5)) { RETURN_CCTOR(&charset); @@ -221,7 +221,7 @@ PHP_METHOD(Phalcon_Escaper, detectEncoding) } ZEPHIR_CALL_METHOD(&charset, &_0, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_6$$7, "mb_detect_encoding", &_5, 258, &str, &charset, &__$true); + ZEPHIR_CALL_FUNCTION(&_6$$7, "mb_detect_encoding", &_5, 260, &str, &charset, &__$true); zephir_check_call_status(); if (zephir_is_true(&_6$$7)) { RETURN_CCTOR(&charset); @@ -231,7 +231,7 @@ PHP_METHOD(Phalcon_Escaper, detectEncoding) } } ZEPHIR_INIT_NVAR(&charset); - ZEPHIR_RETURN_CALL_FUNCTION("mb_detect_encoding", &_5, 258, &str); + ZEPHIR_RETURN_CALL_FUNCTION("mb_detect_encoding", &_5, 260, &str); zephir_check_call_status(); RETURN_MM(); } @@ -458,7 +458,7 @@ PHP_METHOD(Phalcon_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, 256, &input, &_0, &_1, &_2); + ZEPHIR_RETURN_CALL_FUNCTION("htmlspecialchars", NULL, 258, &input, &_0, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -490,7 +490,7 @@ PHP_METHOD(Phalcon_Escaper, js) zephir_get_strval(&input, input_param); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 257, &input); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "normalizeencoding", NULL, 259, &input); zephir_check_call_status(); zephir_escape_js(return_value, &_0); RETURN_MM(); @@ -527,11 +527,11 @@ PHP_METHOD(Phalcon_Escaper, normalizeEncoding) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_escaper_exception_ce, "Extension 'mbstring' is required", "phalcon/Escaper.zep", 215); return; } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "detectencoding", NULL, 259, &str); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "detectencoding", NULL, 261, &str); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "UTF-32"); - ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 260, &str, &_1, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_encoding", NULL, 262, &str, &_1, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -690,7 +690,7 @@ PHP_METHOD(Phalcon_Escaper, url) zephir_get_strval(&url, url_param); - ZEPHIR_RETURN_CALL_FUNCTION("rawurlencode", NULL, 261, &url); + ZEPHIR_RETURN_CALL_FUNCTION("rawurlencode", NULL, 263, &url); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/events/manager.zep.c b/ext/phalcon/events/manager.zep.c index 701c96a3d5..aa2babbd79 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, 262, &_2$$4); + ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "setextractflags", NULL, 264, &_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, 263, handler, &_4); + ZEPHIR_CALL_METHOD(NULL, &priorityQueue, "insert", NULL, 265, 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, 262, &_2$$4); + ZEPHIR_CALL_METHOD(NULL, &newPriorityQueue, "setextractflags", NULL, 264, &_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, 263, &_7$$6, &_8$$6); + ZEPHIR_CALL_METHOD(NULL, &newPriorityQueue, "insert", &_9, 265, &_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, 264, &eventName, source, data, &_4); + ZEPHIR_CALL_METHOD(NULL, &event, "__construct", NULL, 266, &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, 265, &fireEvents, &event); + ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", NULL, 267, &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, 265, &fireEvents, &event); + ZEPHIR_CALL_METHOD(&status, this_ptr, "firequeue", NULL, 267, &fireEvents, &event); zephir_check_call_status(); } } diff --git a/ext/phalcon/factory/abstractconfigfactory.zep.c b/ext/phalcon/factory/abstractconfigfactory.zep.c index c3c3054a57..3c5fdd6af9 100644 --- a/ext/phalcon/factory/abstractconfigfactory.zep.c +++ b/ext/phalcon/factory/abstractconfigfactory.zep.c @@ -17,6 +17,7 @@ #include "kernel/fcall.h" #include "kernel/exception.h" #include "kernel/array.h" +#include "kernel/concat.h" #include "kernel/operators.h" @@ -43,15 +44,13 @@ PHP_METHOD(Phalcon_Factory_AbstractConfigFactory, checkConfig) zend_bool _0; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *config = NULL, config_sub, _1$$3, _2$$4, _3$$4, _4$$5, _5$$5; + zval *config = NULL, config_sub, _1$$3, _2$$4, _3$$4; zval *this_ptr = getThis(); ZVAL_UNDEF(&config_sub); ZVAL_UNDEF(&_1$$3); ZVAL_UNDEF(&_2$$4); ZVAL_UNDEF(&_3$$4); - ZVAL_UNDEF(&_4$$5); - ZVAL_UNDEF(&_5$$5); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -83,17 +82,51 @@ PHP_METHOD(Phalcon_Factory_AbstractConfigFactory, checkConfig) ZEPHIR_MM_RESTORE(); return; } - if (UNEXPECTED(!(zephir_array_isset_string(config, SL("adapter"))))) { - ZEPHIR_INIT_VAR(&_5$$5); - ZVAL_STRING(&_5$$5, "You must provide 'adapter' option in factory config parameter."); - ZEPHIR_CALL_METHOD(&_4$$5, this_ptr, "getexception", NULL, 0, &_5$$5); + RETVAL_ZVAL(config, 1, 0); + RETURN_MM(); +} + +/** + * Checks if the config has "adapter" + */ +PHP_METHOD(Phalcon_Factory_AbstractConfigFactory, checkConfigElement) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval element, _1$$3; + zval *config_param = NULL, *element_param = NULL, _0$$3; + zval config; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&config); + ZVAL_UNDEF(&_0$$3); + ZVAL_UNDEF(&element); + ZVAL_UNDEF(&_1$$3); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(2, 2) + Z_PARAM_ARRAY(config) + Z_PARAM_STR(element) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 2, 0, &config_param, &element_param); + zephir_get_arrval(&config, config_param); + zephir_get_strval(&element, element_param); + + + if (UNEXPECTED(!(zephir_array_isset(&config, &element)))) { + ZEPHIR_INIT_VAR(&_1$$3); + ZEPHIR_CONCAT_SVS(&_1$$3, "You must provide '", &element, "' option in factory config parameter."); + ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "getexception", NULL, 0, &_1$$3); zephir_check_call_status(); - zephir_throw_exception_debug(&_4$$5, "phalcon/Factory/AbstractConfigFactory.zep", 35); + zephir_throw_exception_debug(&_0$$3, "phalcon/Factory/AbstractConfigFactory.zep", 43); ZEPHIR_MM_RESTORE(); return; } - RETVAL_ZVAL(config, 1, 0); - RETURN_MM(); + RETURN_CTOR(&config); } /** diff --git a/ext/phalcon/factory/abstractconfigfactory.zep.h b/ext/phalcon/factory/abstractconfigfactory.zep.h index 597a79ff31..6ac535b3f4 100644 --- a/ext/phalcon/factory/abstractconfigfactory.zep.h +++ b/ext/phalcon/factory/abstractconfigfactory.zep.h @@ -4,6 +4,7 @@ extern zend_class_entry *phalcon_factory_abstractconfigfactory_ce; ZEPHIR_INIT_CLASS(Phalcon_Factory_AbstractConfigFactory); PHP_METHOD(Phalcon_Factory_AbstractConfigFactory, checkConfig); +PHP_METHOD(Phalcon_Factory_AbstractConfigFactory, checkConfigElement); PHP_METHOD(Phalcon_Factory_AbstractConfigFactory, getException); PHP_METHOD(Phalcon_Factory_AbstractConfigFactory, getExceptionClass); @@ -11,6 +12,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_factory_abstractconfigfa ZEND_ARG_INFO(0, config) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_factory_abstractconfigfactory_checkconfigelement, 0, 2, IS_ARRAY, 0) + ZEND_ARG_ARRAY_INFO(0, config, 0) + ZEND_ARG_TYPE_INFO(0, element, IS_STRING, 0) +ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_factory_abstractconfigfactory_getexception, 0, 1, Exception, 0) ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0) ZEND_END_ARG_INFO() @@ -20,6 +26,7 @@ ZEND_END_ARG_INFO() ZEPHIR_INIT_FUNCS(phalcon_factory_abstractconfigfactory_method_entry) { PHP_ME(Phalcon_Factory_AbstractConfigFactory, checkConfig, arginfo_phalcon_factory_abstractconfigfactory_checkconfig, ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Factory_AbstractConfigFactory, checkConfigElement, arginfo_phalcon_factory_abstractconfigfactory_checkconfigelement, ZEND_ACC_PROTECTED) PHP_ME(Phalcon_Factory_AbstractConfigFactory, getException, arginfo_phalcon_factory_abstractconfigfactory_getexception, ZEND_ACC_PROTECTED) PHP_ME(Phalcon_Factory_AbstractConfigFactory, getExceptionClass, arginfo_phalcon_factory_abstractconfigfactory_getexceptionclass, ZEND_ACC_PROTECTED) PHP_FE_END diff --git a/ext/phalcon/filter/filter.zep.c b/ext/phalcon/filter/filter.zep.c index ea8360265d..8c7fd0879d 100644 --- a/ext/phalcon/filter/filter.zep.c +++ b/ext/phalcon/filter/filter.zep.c @@ -283,7 +283,7 @@ PHP_METHOD(Phalcon_Filter_Filter, sanitize) } else { ZVAL_BOOL(&_0$$3, 0); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processarraysanitizers", NULL, 266, sanitizers, value, &_0$$3); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processarraysanitizers", NULL, 268, sanitizers, value, &_0$$3); zephir_check_call_status(); RETURN_MM(); } @@ -292,11 +292,11 @@ PHP_METHOD(Phalcon_Filter_Filter, sanitize) _1 = !noRecursive; } if (_1) { - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processarrayvalues", NULL, 267, value, sanitizers); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processarrayvalues", NULL, 269, value, sanitizers); zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "sanitizer", NULL, 268, value, sanitizers); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "sanitizer", NULL, 270, value, sanitizers); zephir_check_call_status(); RETURN_MM(); } @@ -475,7 +475,7 @@ PHP_METHOD(Phalcon_Filter_Filter, processArraySanitizers) } ZEPHIR_INIT_NVAR(&sanitizer); ZVAL_COPY(&sanitizer, _0); - ZEPHIR_CALL_METHOD(&split, this_ptr, "splitsanitizerparameters", &_4, 269, &sanitizerKey, &sanitizer); + ZEPHIR_CALL_METHOD(&split, this_ptr, "splitsanitizerparameters", &_4, 271, &sanitizerKey, &sanitizer); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&sanitizerName); zephir_array_fetch_long(&sanitizerName, &split, 0, PH_NOISY, "phalcon/Filter/Filter.zep", 226); @@ -486,10 +486,10 @@ PHP_METHOD(Phalcon_Filter_Filter, processArraySanitizers) } else { ZVAL_BOOL(&_6$$4, 0); } - ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "processvalueisarray", &_7, 270, value, &sanitizerName, &sanitizerParams, &_6$$4); + ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "processvalueisarray", &_7, 272, value, &sanitizerName, &sanitizerParams, &_6$$4); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_5$$4); - ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "processvalueisnotarray", &_8, 271, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_5$$4, this_ptr, "processvalueisnotarray", &_8, 273, value, &sanitizerName, &sanitizerParams); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_5$$4); } ZEND_HASH_FOREACH_END(); @@ -506,7 +506,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, 269, &sanitizerKey, &sanitizer); + ZEPHIR_CALL_METHOD(&split, this_ptr, "splitsanitizerparameters", &_4, 271, &sanitizerKey, &sanitizer); zephir_check_call_status(); ZEPHIR_OBS_NVAR(&sanitizerName); zephir_array_fetch_long(&sanitizerName, &split, 0, PH_NOISY, "phalcon/Filter/Filter.zep", 226); @@ -517,10 +517,10 @@ PHP_METHOD(Phalcon_Filter_Filter, processArraySanitizers) } else { ZVAL_BOOL(&_10$$5, 0); } - ZEPHIR_CALL_METHOD(&_9$$5, this_ptr, "processvalueisarray", &_7, 270, value, &sanitizerName, &sanitizerParams, &_10$$5); + ZEPHIR_CALL_METHOD(&_9$$5, this_ptr, "processvalueisarray", &_7, 272, value, &sanitizerName, &sanitizerParams, &_10$$5); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_9$$5); - ZEPHIR_CALL_METHOD(&_9$$5, this_ptr, "processvalueisnotarray", &_8, 271, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_9$$5, this_ptr, "processvalueisnotarray", &_8, 273, value, &sanitizerName, &sanitizerParams); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_9$$5); ZEPHIR_CALL_METHOD(NULL, &sanitizers, "next", NULL, 0); @@ -601,7 +601,7 @@ PHP_METHOD(Phalcon_Filter_Filter, processArrayValues) } ZEPHIR_INIT_NVAR(&itemValue); ZVAL_COPY(&itemValue, _0); - ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "sanitizer", &_5, 268, &itemValue, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_4$$3, this_ptr, "sanitizer", &_5, 270, &itemValue, &sanitizerName, &sanitizerParams); zephir_check_call_status(); zephir_array_update_zval(&arrayValues, &itemKey, &_4$$3, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -618,7 +618,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, 268, &itemValue, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "sanitizer", &_5, 270, &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); @@ -752,7 +752,7 @@ PHP_METHOD(Phalcon_Filter_Filter, processValueIsArray) _0 = !noRecursive; } if (_0) { - ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "processarrayvalues", NULL, 267, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "processarrayvalues", NULL, 269, value, &sanitizerName, &sanitizerParams); zephir_check_call_status(); ZEPHIR_CPY_WRT(value, &_1$$3); } @@ -799,7 +799,7 @@ PHP_METHOD(Phalcon_Filter_Filter, processValueIsNotArray) if (Z_TYPE_P(value) != IS_ARRAY) { - ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "sanitizer", NULL, 268, value, &sanitizerName, &sanitizerParams); + ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "sanitizer", NULL, 270, 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 35d7833693..785159ec6c 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, 272, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 274, &_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 10745b6ec1..9e04b77377 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, 273, input, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "filter_var", NULL, 275, input, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, zephir_get_intval(&_1)); - ZEPHIR_RETURN_CALL_FUNCTION("abs", NULL, 274, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("abs", NULL, 276, &_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 a66887e3d2..29258aea68 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, 273, input, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 275, 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 d55e1aa02c..44e0eea0be 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, 273, input, &_1, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "filter_var", NULL, 275, 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 4c9a09eaf7..81caad80d5 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, 273, input, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "filter_var", NULL, 275, 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 ac23b68ddc..633050a109 100644 --- a/ext/phalcon/filter/sanitize/lower.zep.c +++ b/ext/phalcon/filter/sanitize/lower.zep.c @@ -83,11 +83,11 @@ PHP_METHOD(Phalcon_Filter_Sanitize_Lower, __invoke) ZVAL_LONG(&_0$$3, 1); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "UTF-8"); - ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_case", NULL, 17, &input, &_0$$3, &_1$$3); + ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_case", NULL, 11, &input, &_0$$3, &_1$$3); zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 275, &input); + ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 277, &input); zephir_check_call_status(); zephir_fast_strtolower(return_value, &_2); RETURN_MM(); diff --git a/ext/phalcon/filter/sanitize/lowerfirst.zep.c b/ext/phalcon/filter/sanitize/lowerfirst.zep.c index 782608c51d..b28c885ed2 100644 --- a/ext/phalcon/filter/sanitize/lowerfirst.zep.c +++ b/ext/phalcon/filter/sanitize/lowerfirst.zep.c @@ -75,7 +75,7 @@ PHP_METHOD(Phalcon_Filter_Sanitize_LowerFirst, __invoke) } - ZEPHIR_RETURN_CALL_FUNCTION("lcfirst", NULL, 97, &input); + ZEPHIR_RETURN_CALL_FUNCTION("lcfirst", NULL, 99, &input); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/filter/sanitize/special.zep.c b/ext/phalcon/filter/sanitize/special.zep.c index 7bad829ed2..a6376b84e3 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, 273, input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 275, 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 6256d206da..17cfc49201 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, 273, input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 275, 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 aef41d7a88..35e1f45590 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, 273, input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 275, 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 f3afdcee28..440da4990c 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, 276, &input); + ZEPHIR_RETURN_CALL_FUNCTION("strip_tags", NULL, 278, &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 671f4755c0..5034889efe 100644 --- a/ext/phalcon/filter/sanitize/upper.zep.c +++ b/ext/phalcon/filter/sanitize/upper.zep.c @@ -83,11 +83,11 @@ PHP_METHOD(Phalcon_Filter_Sanitize_Upper, __invoke) ZVAL_LONG(&_0$$3, 0); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "UTF-8"); - ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_case", NULL, 17, &input, &_0$$3, &_1$$3); + ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_case", NULL, 11, &input, &_0$$3, &_1$$3); zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 275, &input); + ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 277, &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 eb723c2a25..9753cecf23 100644 --- a/ext/phalcon/filter/sanitize/upperwords.zep.c +++ b/ext/phalcon/filter/sanitize/upperwords.zep.c @@ -82,13 +82,13 @@ PHP_METHOD(Phalcon_Filter_Sanitize_UpperWords, __invoke) ZVAL_LONG(&_0$$3, 2); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "UTF-8"); - ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_case", NULL, 17, &input, &_0$$3, &_1$$3); + ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_case", NULL, 11, &input, &_0$$3, &_1$$3); zephir_check_call_status(); RETURN_MM(); } - ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 275, &input); + ZEPHIR_CALL_FUNCTION(&_2, "utf8_decode", NULL, 277, &input); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("ucwords", NULL, 277, &_2); + ZEPHIR_RETURN_CALL_FUNCTION("ucwords", NULL, 279, &_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 431a7c5e66..b05c4b6591 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, 273, input, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("filter_var", NULL, 275, input, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/flash/abstractflash.zep.c b/ext/phalcon/flash/abstractflash.zep.c index 66d18397fa..fa54f34ee0 100644 --- a/ext/phalcon/flash/abstractflash.zep.c +++ b/ext/phalcon/flash/abstractflash.zep.c @@ -702,9 +702,9 @@ PHP_METHOD(Phalcon_Flash_AbstractFlash, outputMessage) { ZEPHIR_INIT_NVAR(&item); ZVAL_COPY(&item, _2); - ZEPHIR_CALL_METHOD(&prepared, this_ptr, "prepareescapedmessage", &_4, 104, &item); + ZEPHIR_CALL_METHOD(&prepared, this_ptr, "prepareescapedmessage", &_4, 106, &item); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&html, this_ptr, "preparehtmlmessage", &_5, 105, &type, &prepared); + ZEPHIR_CALL_METHOD(&html, this_ptr, "preparehtmlmessage", &_5, 107, &type, &prepared); zephir_check_call_status(); zephir_read_property(&_6$$5, this_ptr, ZEND_STRL("implicitFlush"), PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_6$$5)) { @@ -725,9 +725,9 @@ PHP_METHOD(Phalcon_Flash_AbstractFlash, outputMessage) } ZEPHIR_CALL_METHOD(&item, message, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&prepared, this_ptr, "prepareescapedmessage", &_4, 104, &item); + ZEPHIR_CALL_METHOD(&prepared, this_ptr, "prepareescapedmessage", &_4, 106, &item); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&html, this_ptr, "preparehtmlmessage", &_5, 105, &type, &prepared); + ZEPHIR_CALL_METHOD(&html, this_ptr, "preparehtmlmessage", &_5, 107, &type, &prepared); zephir_check_call_status(); zephir_read_property(&_7$$8, this_ptr, ZEND_STRL("implicitFlush"), PH_NOISY_CC | PH_READONLY); if (ZEPHIR_IS_TRUE_IDENTICAL(&_7$$8)) { @@ -953,13 +953,13 @@ PHP_METHOD(Phalcon_Flash_AbstractFlash, prepareHtmlMessage) RETURN_CTOR(&message); } zephir_read_property(&_1, this_ptr, ZEND_STRL("cssClasses"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&cssClasses, this_ptr, "checkclasses", NULL, 106, &_1, &type); + ZEPHIR_CALL_METHOD(&cssClasses, this_ptr, "checkclasses", NULL, 108, &_1, &type); zephir_check_call_status(); zephir_read_property(&_2, this_ptr, ZEND_STRL("cssIconClasses"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&cssIconClasses, this_ptr, "checkclasses", NULL, 106, &_2, &type); + ZEPHIR_CALL_METHOD(&cssIconClasses, this_ptr, "checkclasses", NULL, 108, &_2, &type); zephir_check_call_status(); zephir_read_property(&_3, this_ptr, ZEND_STRL("interpolator"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "gettemplate", NULL, 107, &cssClasses, &cssIconClasses); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "gettemplate", NULL, 109, &cssClasses, &cssIconClasses); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5); zephir_create_array(&_5, 3, 0); diff --git a/ext/phalcon/forms/form.zep.c b/ext/phalcon/forms/form.zep.c index 320c943578..99b68c116e 100644 --- a/ext/phalcon/forms/form.zep.c +++ b/ext/phalcon/forms/form.zep.c @@ -1334,7 +1334,7 @@ PHP_METHOD(Phalcon_Forms_Form, isValid) if (_6) { ZEPHIR_INIT_NVAR(&validation); object_init_ex(&validation, phalcon_validation_ce); - ZEPHIR_CALL_METHOD(NULL, &validation, "__construct", NULL, 278); + ZEPHIR_CALL_METHOD(NULL, &validation, "__construct", NULL, 280); zephir_check_call_status(); } zephir_read_property(&_7, this_ptr, ZEND_STRL("elements"), PH_NOISY_CC | PH_READONLY); @@ -1357,7 +1357,7 @@ PHP_METHOD(Phalcon_Forms_Form, isValid) { ZEPHIR_INIT_NVAR(&validator); ZVAL_COPY(&validator, _10$$11); - ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_12, 279, &name, &validator); + ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_12, 281, &name, &validator); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); } else { @@ -1371,7 +1371,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", &_12, 279, &name, &validator); + ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_12, 281, &name, &validator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &validators, "next", NULL, 0); zephir_check_call_status(); @@ -1381,7 +1381,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", &_13, 280, &name, &filters); + ZEPHIR_CALL_METHOD(NULL, &validation, "setfilters", &_13, 282, &name, &filters); zephir_check_call_status(); } } ZEND_HASH_FOREACH_END(); @@ -1409,7 +1409,7 @@ PHP_METHOD(Phalcon_Forms_Form, isValid) { ZEPHIR_INIT_NVAR(&validator); ZVAL_COPY(&validator, _14$$16); - ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_12, 279, &name, &validator); + ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_12, 281, &name, &validator); zephir_check_call_status(); } ZEND_HASH_FOREACH_END(); } else { @@ -1423,7 +1423,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", &_12, 279, &name, &validator); + ZEPHIR_CALL_METHOD(NULL, &validation, "add", &_12, 281, &name, &validator); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &validators, "next", NULL, 0); zephir_check_call_status(); @@ -1433,7 +1433,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", &_13, 280, &name, &filters); + ZEPHIR_CALL_METHOD(NULL, &validation, "setfilters", &_13, 282, &name, &filters); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(NULL, &_7, "next", NULL, 0); @@ -1441,7 +1441,7 @@ PHP_METHOD(Phalcon_Forms_Form, isValid) } } ZEPHIR_INIT_NVAR(&element); - ZEPHIR_CALL_METHOD(&messages, &validation, "validate", NULL, 281, data, entity); + ZEPHIR_CALL_METHOD(&messages, &validation, "validate", NULL, 283, data, entity); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_16, &messages, "count", NULL, 0); zephir_check_call_status(); @@ -1693,7 +1693,7 @@ PHP_METHOD(Phalcon_Forms_Form, rewind) ZVAL_LONG(&_0, 0); zephir_update_property_zval(this_ptr, ZEND_STRL("position"), &_0); zephir_read_property(&_0, this_ptr, ZEND_STRL("elements"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_1, "array_values", NULL, 13, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "array_values", NULL, 14, &_0); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("elementsIndexed"), &_1); ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/forms/manager.zep.c b/ext/phalcon/forms/manager.zep.c index 12db84b8b5..180d203154 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, 282, entity); + ZEPHIR_CALL_METHOD(NULL, &form, "__construct", NULL, 284, entity); zephir_check_call_status(); zephir_update_property_array(this_ptr, SL("forms"), &name, &form); RETURN_CCTOR(&form); diff --git a/ext/phalcon/helper/arr.zep.c b/ext/phalcon/helper/arr.zep.c index 330173b9ce..432f9bcb22 100644 --- a/ext/phalcon/helper/arr.zep.c +++ b/ext/phalcon/helper/arr.zep.c @@ -82,9 +82,9 @@ PHP_METHOD(Phalcon_Helper_Arr, blackList) ZEPHIR_CALL_FUNCTION(&_1, "array_filter", NULL, 18, &blackList, &_0); zephir_check_call_status(); ZEPHIR_CPY_WRT(&blackList, &_1); - ZEPHIR_CALL_FUNCTION(&_2, "array_flip", NULL, 183, &blackList); + ZEPHIR_CALL_FUNCTION(&_2, "array_flip", NULL, 185, &blackList); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("array_diff_key", NULL, 283, &collection, &_2); + ZEPHIR_RETURN_CALL_FUNCTION("array_diff_key", NULL, 285, &collection, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -134,7 +134,7 @@ PHP_METHOD(Phalcon_Helper_Arr, chunk) ZVAL_LONG(&_0, size); ZVAL_BOOL(&_1, (preserveKeys ? 1 : 0)); - ZEPHIR_RETURN_CALL_FUNCTION("array_chunk", NULL, 284, &collection, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("array_chunk", NULL, 286, &collection, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -231,10 +231,10 @@ PHP_METHOD(Phalcon_Helper_Arr, first) } - ZEPHIR_CALL_SELF(&filtered, "filter", &_0, 285, &collection, method); + ZEPHIR_CALL_SELF(&filtered, "filter", &_0, 287, &collection, method); zephir_check_call_status(); ZEPHIR_MAKE_REF(&filtered); - ZEPHIR_RETURN_CALL_FUNCTION("reset", NULL, 286, &filtered); + ZEPHIR_RETURN_CALL_FUNCTION("reset", NULL, 288, &filtered); ZEPHIR_UNREF(&filtered); zephir_check_call_status(); RETURN_MM(); @@ -281,13 +281,13 @@ PHP_METHOD(Phalcon_Helper_Arr, firstKey) } - ZEPHIR_CALL_SELF(&filtered, "filter", &_0, 285, &collection, method); + ZEPHIR_CALL_SELF(&filtered, "filter", &_0, 287, &collection, method); zephir_check_call_status(); ZEPHIR_MAKE_REF(&filtered); - ZEPHIR_CALL_FUNCTION(NULL, "reset", NULL, 286, &filtered); + ZEPHIR_CALL_FUNCTION(NULL, "reset", NULL, 288, &filtered); ZEPHIR_UNREF(&filtered); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("key", NULL, 287, &filtered); + ZEPHIR_RETURN_CALL_FUNCTION("key", NULL, 289, &filtered); zephir_check_call_status(); RETURN_MM(); } @@ -358,13 +358,13 @@ PHP_METHOD(Phalcon_Helper_Arr, flatten) if (deep) { ZEPHIR_INIT_NVAR(&_2$$6); ZVAL_BOOL(&_5$$6, 1); - ZEPHIR_CALL_SELF(&_3$$6, "flatten", &_4, 288, &item, &_5$$6); + ZEPHIR_CALL_SELF(&_3$$6, "flatten", &_4, 290, &item, &_5$$6); zephir_check_call_status(); zephir_fast_array_merge(&_2$$6, &data, &_3$$6); ZEPHIR_CPY_WRT(&data, &_2$$6); } else { ZEPHIR_INIT_NVAR(&_6$$7); - ZEPHIR_CALL_FUNCTION(&_7$$7, "array_values", &_8, 13, &item); + ZEPHIR_CALL_FUNCTION(&_7$$7, "array_values", &_8, 14, &item); zephir_check_call_status(); zephir_fast_array_merge(&_6$$7, &data, &_7$$7); ZEPHIR_CPY_WRT(&data, &_6$$7); @@ -388,13 +388,13 @@ PHP_METHOD(Phalcon_Helper_Arr, flatten) if (deep) { ZEPHIR_INIT_NVAR(&_9$$11); ZVAL_BOOL(&_11$$11, 1); - ZEPHIR_CALL_SELF(&_10$$11, "flatten", &_4, 288, &item, &_11$$11); + ZEPHIR_CALL_SELF(&_10$$11, "flatten", &_4, 290, &item, &_11$$11); zephir_check_call_status(); zephir_fast_array_merge(&_9$$11, &data, &_10$$11); ZEPHIR_CPY_WRT(&data, &_9$$11); } else { ZEPHIR_INIT_NVAR(&_12$$12); - ZEPHIR_CALL_FUNCTION(&_13$$12, "array_values", &_8, 13, &item); + ZEPHIR_CALL_FUNCTION(&_13$$12, "array_values", &_8, 14, &item); zephir_check_call_status(); zephir_fast_array_merge(&_12$$12, &data, &_13$$12); ZEPHIR_CPY_WRT(&data, &_12$$12); @@ -467,7 +467,7 @@ PHP_METHOD(Phalcon_Helper_Arr, get) } if (UNEXPECTED(zephir_is_true(&cast))) { ZEPHIR_MAKE_REF(&value); - ZEPHIR_CALL_FUNCTION(NULL, "settype", NULL, 11, &value, &cast); + ZEPHIR_CALL_FUNCTION(NULL, "settype", NULL, 12, &value, &cast); ZEPHIR_UNREF(&value); zephir_check_call_status(); } @@ -529,7 +529,7 @@ PHP_METHOD(Phalcon_Helper_Arr, group) _3$$3 = (zephir_function_exists(method) == SUCCESS); } if (_3$$3) { - ZEPHIR_CALL_FUNCTION(&key, "call_user_func", &_4, 289, method, &element); + ZEPHIR_CALL_FUNCTION(&key, "call_user_func", &_4, 291, method, &element); zephir_check_call_status(); zephir_array_update_multi(&filtered, &element, SL("za"), 2, &key); } else if (Z_TYPE_P(&element) == IS_OBJECT) { @@ -562,7 +562,7 @@ PHP_METHOD(Phalcon_Helper_Arr, group) _6$$7 = (zephir_function_exists(method) == SUCCESS); } if (_6$$7) { - ZEPHIR_CALL_FUNCTION(&key, "call_user_func", &_4, 289, method, &element); + ZEPHIR_CALL_FUNCTION(&key, "call_user_func", &_4, 291, method, &element); zephir_check_call_status(); zephir_array_update_multi(&filtered, &element, SL("za"), 2, &key); } else if (Z_TYPE_P(&element) == IS_OBJECT) { @@ -647,7 +647,7 @@ PHP_METHOD(Phalcon_Helper_Arr, isUnique) ZEPHIR_OBS_COPY_OR_DUP(&collection, collection_param); - ZEPHIR_CALL_FUNCTION(&_0, "array_unique", NULL, 290, &collection); + ZEPHIR_CALL_FUNCTION(&_0, "array_unique", NULL, 292, &collection); zephir_check_call_status(); RETURN_MM_BOOL(zephir_fast_count_int(&collection) == zephir_fast_count_int(&_0)); } @@ -693,10 +693,10 @@ PHP_METHOD(Phalcon_Helper_Arr, last) } - ZEPHIR_CALL_SELF(&filtered, "filter", &_0, 285, &collection, method); + ZEPHIR_CALL_SELF(&filtered, "filter", &_0, 287, &collection, method); zephir_check_call_status(); ZEPHIR_MAKE_REF(&filtered); - ZEPHIR_RETURN_CALL_FUNCTION("end", NULL, 291, &filtered); + ZEPHIR_RETURN_CALL_FUNCTION("end", NULL, 293, &filtered); ZEPHIR_UNREF(&filtered); zephir_check_call_status(); RETURN_MM(); @@ -743,13 +743,13 @@ PHP_METHOD(Phalcon_Helper_Arr, lastKey) } - ZEPHIR_CALL_SELF(&filtered, "filter", &_0, 285, &collection, method); + ZEPHIR_CALL_SELF(&filtered, "filter", &_0, 287, &collection, method); zephir_check_call_status(); ZEPHIR_MAKE_REF(&filtered); - ZEPHIR_CALL_FUNCTION(NULL, "end", NULL, 291, &filtered); + ZEPHIR_CALL_FUNCTION(NULL, "end", NULL, 293, &filtered); ZEPHIR_UNREF(&filtered); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("key", NULL, 287, &filtered); + ZEPHIR_RETURN_CALL_FUNCTION("key", NULL, 289, &filtered); zephir_check_call_status(); RETURN_MM(); } @@ -844,16 +844,16 @@ PHP_METHOD(Phalcon_Helper_Arr, order) ZEPHIR_INIT_NVAR(&item); if (ZEPHIR_IS_STRING_IDENTICAL(&order, "asc")) { ZEPHIR_MAKE_REF(&sorted); - ZEPHIR_CALL_FUNCTION(NULL, "ksort", NULL, 292, &sorted); + ZEPHIR_CALL_FUNCTION(NULL, "ksort", NULL, 294, &sorted); ZEPHIR_UNREF(&sorted); zephir_check_call_status(); } else { ZEPHIR_MAKE_REF(&sorted); - ZEPHIR_CALL_FUNCTION(NULL, "krsort", NULL, 293, &sorted); + ZEPHIR_CALL_FUNCTION(NULL, "krsort", NULL, 295, &sorted); ZEPHIR_UNREF(&sorted); zephir_check_call_status(); } - ZEPHIR_RETURN_CALL_FUNCTION("array_values", NULL, 13, &sorted); + ZEPHIR_RETURN_CALL_FUNCTION("array_values", NULL, 14, &sorted); zephir_check_call_status(); RETURN_MM(); } @@ -1049,7 +1049,7 @@ PHP_METHOD(Phalcon_Helper_Arr, sliceLeft) ZVAL_LONG(&_0, 0); ZVAL_LONG(&_1, elements); - ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 294, &collection, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 296, &collection, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -1093,7 +1093,7 @@ PHP_METHOD(Phalcon_Helper_Arr, sliceRight) ZVAL_LONG(&_0, elements); - ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 294, &collection, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 296, &collection, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -1134,7 +1134,7 @@ PHP_METHOD(Phalcon_Helper_Arr, split) ZEPHIR_INIT_VAR(&_0); zephir_array_keys(&_0, &collection); zephir_array_fast_append(return_value, &_0); - ZEPHIR_CALL_FUNCTION(&_1, "array_values", NULL, 13, &collection); + ZEPHIR_CALL_FUNCTION(&_1, "array_values", NULL, 14, &collection); zephir_check_call_status(); zephir_array_fast_append(return_value, &_1); RETURN_MM(); @@ -1209,7 +1209,7 @@ PHP_METHOD(Phalcon_Helper_Arr, validateAll) } - ZEPHIR_CALL_SELF(&_0, "filter", &_1, 285, &collection, method); + ZEPHIR_CALL_SELF(&_0, "filter", &_1, 287, &collection, method); zephir_check_call_status(); RETURN_MM_BOOL(zephir_fast_count_int(&_0) == zephir_fast_count_int(&collection)); } @@ -1255,7 +1255,7 @@ PHP_METHOD(Phalcon_Helper_Arr, validateAny) } - ZEPHIR_CALL_SELF(&_0, "filter", &_1, 285, &collection, method); + ZEPHIR_CALL_SELF(&_0, "filter", &_1, 287, &collection, method); zephir_check_call_status(); RETURN_MM_BOOL(zephir_fast_count_int(&_0) > 0); } @@ -1303,7 +1303,7 @@ PHP_METHOD(Phalcon_Helper_Arr, whiteList) ZEPHIR_CALL_FUNCTION(&_1, "array_filter", NULL, 18, &whiteList, &_0); zephir_check_call_status(); ZEPHIR_CPY_WRT(&whiteList, &_1); - ZEPHIR_CALL_FUNCTION(&_2, "array_flip", NULL, 183, &whiteList); + ZEPHIR_CALL_FUNCTION(&_2, "array_flip", NULL, 185, &whiteList); zephir_check_call_status(); ZEPHIR_RETURN_CALL_FUNCTION("array_intersect_key", NULL, 2, &collection, &_2); zephir_check_call_status(); diff --git a/ext/phalcon/helper/base64.zep.c b/ext/phalcon/helper/base64.zep.c index bdc0d084cd..11d2435649 100644 --- a/ext/phalcon/helper/base64.zep.c +++ b/ext/phalcon/helper/base64.zep.c @@ -83,7 +83,7 @@ PHP_METHOD(Phalcon_Helper_Base64, encodeUrl) } - ZEPHIR_CALL_FUNCTION(&_0, "base64_encode", NULL, 224, &input); + ZEPHIR_CALL_FUNCTION(&_0, "base64_encode", NULL, 226, &input); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "+/"); @@ -159,7 +159,7 @@ PHP_METHOD(Phalcon_Helper_Base64, 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, 222, &_5); + ZEPHIR_CALL_FUNCTION(&data, "base64_decode", NULL, 224, &_5); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&data)) { ZEPHIR_INIT_NVAR(&data); diff --git a/ext/phalcon/helper/fs.zep.c b/ext/phalcon/helper/fs.zep.c index 4cd89a9213..38ac32d327 100644 --- a/ext/phalcon/helper/fs.zep.c +++ b/ext/phalcon/helper/fs.zep.c @@ -110,7 +110,7 @@ PHP_METHOD(Phalcon_Helper_Fs, basename) ZVAL_STRING(&_2, "/"); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "@"); - ZEPHIR_CALL_FUNCTION(&_4, "preg_quote", NULL, 295, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "preg_quote", NULL, 297, &_2, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5); ZEPHIR_CONCAT_SVS(&_5, "@[^", &_4, "]+$@"); @@ -126,7 +126,7 @@ PHP_METHOD(Phalcon_Helper_Fs, basename) if (zephir_is_true(suffix)) { ZEPHIR_INIT_VAR(&_6$$3); ZVAL_STRING(&_6$$3, "@"); - ZEPHIR_CALL_FUNCTION(&_7$$3, "preg_quote", NULL, 295, suffix, &_6$$3); + ZEPHIR_CALL_FUNCTION(&_7$$3, "preg_quote", NULL, 297, suffix, &_6$$3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_8$$3); ZEPHIR_CONCAT_SVS(&_8$$3, "@", &_7$$3, "$@"); diff --git a/ext/phalcon/helper/json.zep.c b/ext/phalcon/helper/json.zep.c index d1836999af..a002a89a39 100644 --- a/ext/phalcon/helper/json.zep.c +++ b/ext/phalcon/helper/json.zep.c @@ -129,12 +129,12 @@ PHP_METHOD(Phalcon_Helper_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, 296); + ZEPHIR_CALL_FUNCTION(&_3, "json_last_error", NULL, 298); 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, 297); + ZEPHIR_CALL_FUNCTION(&_5$$3, "json_last_error_msg", NULL, 299); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_6$$3); ZEPHIR_CONCAT_SV(&_6$$3, "json_decode error: ", &_5$$3); @@ -216,12 +216,12 @@ PHP_METHOD(Phalcon_Helper_Json, 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, 296); + ZEPHIR_CALL_FUNCTION(&_2, "json_last_error", NULL, 298); 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, 297); + ZEPHIR_CALL_FUNCTION(&_4$$3, "json_last_error_msg", NULL, 299); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5$$3); ZEPHIR_CONCAT_SV(&_5$$3, "json_encode error: ", &_4$$3); diff --git a/ext/phalcon/helper/str.zep.c b/ext/phalcon/helper/str.zep.c index b88f7c1331..6a88ca9248 100644 --- a/ext/phalcon/helper/str.zep.c +++ b/ext/phalcon/helper/str.zep.c @@ -169,14 +169,14 @@ PHP_METHOD(Phalcon_Helper_Str, concat) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_helper_exception_ce, "concat needs at least three parameters", "phalcon/Helper/Str.zep", 78); return; } - ZEPHIR_CALL_CE_STATIC(&delimiter, phalcon_helper_arr_ce, "first", &_0, 298, &arguments); + ZEPHIR_CALL_CE_STATIC(&delimiter, phalcon_helper_arr_ce, "first", &_0, 300, &arguments); zephir_check_call_status(); - ZEPHIR_CALL_CE_STATIC(&_1, phalcon_helper_arr_ce, "sliceright", &_2, 299, &arguments); + ZEPHIR_CALL_CE_STATIC(&_1, phalcon_helper_arr_ce, "sliceright", &_2, 301, &arguments); zephir_check_call_status(); ZEPHIR_CPY_WRT(&arguments, &_1); - ZEPHIR_CALL_CE_STATIC(&first, phalcon_helper_arr_ce, "first", &_0, 298, &arguments); + ZEPHIR_CALL_CE_STATIC(&first, phalcon_helper_arr_ce, "first", &_0, 300, &arguments); zephir_check_call_status(); - ZEPHIR_CALL_CE_STATIC(&last, phalcon_helper_arr_ce, "last", &_3, 300, &arguments); + ZEPHIR_CALL_CE_STATIC(&last, phalcon_helper_arr_ce, "last", &_3, 302, &arguments); zephir_check_call_status(); ZEPHIR_INIT_VAR(&prefix); ZVAL_STRING(&prefix, ""); @@ -184,12 +184,12 @@ PHP_METHOD(Phalcon_Helper_Str, concat) ZVAL_STRING(&suffix, ""); ZEPHIR_INIT_VAR(&data); array_init(&data); - ZEPHIR_CALL_SELF(&_1, "startswith", &_4, 301, &first, &delimiter); + ZEPHIR_CALL_SELF(&_1, "startswith", &_4, 303, &first, &delimiter); zephir_check_call_status(); if (zephir_is_true(&_1)) { ZEPHIR_CPY_WRT(&prefix, &delimiter); } - ZEPHIR_CALL_SELF(&_5, "endswith", &_6, 302, &last, &delimiter); + ZEPHIR_CALL_SELF(&_5, "endswith", &_6, 304, &last, &delimiter); zephir_check_call_status(); if (zephir_is_true(&_5)) { ZEPHIR_CPY_WRT(&suffix, &delimiter); @@ -360,7 +360,7 @@ PHP_METHOD(Phalcon_Helper_Str, decapitalize) if ((zephir_function_exists_ex(ZEND_STRL("mb_substr")) == SUCCESS)) { ZVAL_LONG(&_0$$3, 1); - ZEPHIR_CALL_FUNCTION(&substr, "mb_substr", NULL, 219, &text, &_0$$3); + ZEPHIR_CALL_FUNCTION(&substr, "mb_substr", NULL, 221, &text, &_0$$3); zephir_check_call_status(); } else { ZVAL_LONG(&_1$$4, 1); @@ -369,7 +369,7 @@ PHP_METHOD(Phalcon_Helper_Str, decapitalize) } if (upperRest) { if ((zephir_function_exists_ex(ZEND_STRL("mb_strtoupper")) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&suffix, "mb_strtoupper", NULL, 303, &substr, &encoding); + ZEPHIR_CALL_FUNCTION(&suffix, "mb_strtoupper", NULL, 305, &substr, &encoding); zephir_check_call_status(); } else { ZEPHIR_CALL_METHOD(&suffix, &substr, "upper", NULL, 0); @@ -381,7 +381,7 @@ PHP_METHOD(Phalcon_Helper_Str, decapitalize) if ((zephir_function_exists_ex(ZEND_STRL("mb_strtolower")) == SUCCESS)) { ZVAL_LONG(&_2$$9, 0); ZVAL_LONG(&_3$$9, 1); - ZEPHIR_CALL_FUNCTION(&_4$$9, "mb_substr", NULL, 219, &text, &_2$$9, &_3$$9); + ZEPHIR_CALL_FUNCTION(&_4$$9, "mb_substr", NULL, 221, &text, &_2$$9, &_3$$9); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&_5$$9, "mb_strtolower", NULL, 10, &_4$$9, &encoding); zephir_check_call_status(); @@ -522,7 +522,7 @@ PHP_METHOD(Phalcon_Helper_Str, dirFromFile) ZVAL_LONG(&_0, 8); - ZEPHIR_CALL_FUNCTION(&name, "pathinfo", NULL, 111, &file, &_0); + ZEPHIR_CALL_FUNCTION(&name, "pathinfo", NULL, 113, &file, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, 0); ZVAL_LONG(&_1, -2); @@ -545,7 +545,7 @@ PHP_METHOD(Phalcon_Helper_Str, dirFromFile) } ZEPHIR_INIT_VAR(&_7); ZVAL_LONG(&_8, 2); - ZEPHIR_CALL_FUNCTION(&_9, "str_split", NULL, 110, &start, &_8); + ZEPHIR_CALL_FUNCTION(&_9, "str_split", NULL, 112, &start, &_8); zephir_check_call_status(); zephir_fast_join_str(&_7, SL("/"), &_9); ZEPHIR_CONCAT_VS(return_value, &_7, "/"); @@ -743,24 +743,24 @@ PHP_METHOD(Phalcon_Helper_Str, dynamic) } - ZEPHIR_CALL_FUNCTION(&_0, "substr_count", NULL, 304, &text, &leftDelimiter); + ZEPHIR_CALL_FUNCTION(&_0, "substr_count", NULL, 306, &text, &leftDelimiter); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "substr_count", NULL, 304, &text, &rightDelimiter); + ZEPHIR_CALL_FUNCTION(&_1, "substr_count", NULL, 306, &text, &rightDelimiter); zephir_check_call_status(); if (UNEXPECTED(!ZEPHIR_IS_IDENTICAL(&_0, &_1))) { ZEPHIR_INIT_VAR(&_2$$3); object_init_ex(&_2$$3, spl_ce_RuntimeException); ZEPHIR_INIT_VAR(&_3$$3); ZEPHIR_CONCAT_SVS(&_3$$3, "Syntax error in string \"", &text, "\""); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 305, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 307, &_3$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_2$$3, "phalcon/Helper/Str.zep", 290); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_FUNCTION(&ldS, "preg_quote", NULL, 295, &leftDelimiter); + ZEPHIR_CALL_FUNCTION(&ldS, "preg_quote", NULL, 297, &leftDelimiter); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&rdS, "preg_quote", NULL, 295, &rightDelimiter); + ZEPHIR_CALL_FUNCTION(&rdS, "preg_quote", NULL, 297, &rightDelimiter); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_4); ZEPHIR_CONCAT_SVSVVSVS(&_4, "/", &ldS, "([^", &ldS, &rdS, "]+)", &rdS, "/"); @@ -790,11 +790,11 @@ PHP_METHOD(Phalcon_Helper_Str, dynamic) 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, 193, &words); + ZEPHIR_CALL_FUNCTION(&_10$$6, "array_rand", &_11, 195, &words); zephir_check_call_status(); zephir_array_fetch(&word, &words, &_10$$6, PH_NOISY, "phalcon/Helper/Str.zep", 309); zephir_array_fetch_long(&_12$$6, &match, 0, PH_NOISY | PH_READONLY, "phalcon/Helper/Str.zep", 310); - ZEPHIR_CALL_FUNCTION(&sub, "preg_quote", NULL, 295, &_12$$6, &separator); + ZEPHIR_CALL_FUNCTION(&sub, "preg_quote", NULL, 297, &_12$$6, &separator); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_13$$6); ZEPHIR_CONCAT_SVS(&_13$$6, "/", &sub, "/"); @@ -825,11 +825,11 @@ PHP_METHOD(Phalcon_Helper_Str, dynamic) 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, 193, &words); + ZEPHIR_CALL_FUNCTION(&_19$$8, "array_rand", &_11, 195, &words); zephir_check_call_status(); zephir_array_fetch(&word, &words, &_19$$8, PH_NOISY, "phalcon/Helper/Str.zep", 309); zephir_array_fetch_long(&_20$$8, &match, 0, PH_NOISY | PH_READONLY, "phalcon/Helper/Str.zep", 310); - ZEPHIR_CALL_FUNCTION(&sub, "preg_quote", NULL, 295, &_20$$8, &separator); + ZEPHIR_CALL_FUNCTION(&sub, "preg_quote", NULL, 297, &_20$$8, &separator); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_21$$8); ZEPHIR_CONCAT_SVS(&_21$$8, "/", &sub, "/"); @@ -971,16 +971,16 @@ PHP_METHOD(Phalcon_Helper_Str, firstBetween) if ((zephir_function_exists_ex(ZEND_STRL("mb_strstr")) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&_0$$3, "mb_strstr", NULL, 306, &text, &start); + ZEPHIR_CALL_FUNCTION(&_0$$3, "mb_strstr", NULL, 308, &text, &start); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1$$3, "mb_strstr", NULL, 306, &_0$$3, &end, &__$true); + ZEPHIR_CALL_FUNCTION(&_1$$3, "mb_strstr", NULL, 308, &_0$$3, &end, &__$true); zephir_check_call_status(); zephir_cast_to_string(&_2$$3, &_1$$3); ZEPHIR_CPY_WRT(&text, &_2$$3); } else { - ZEPHIR_CALL_FUNCTION(&_3$$4, "strstr", NULL, 307, &text, &start); + ZEPHIR_CALL_FUNCTION(&_3$$4, "strstr", NULL, 309, &text, &start); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_4$$4, "strstr", NULL, 307, &_3$$4, &end, &__$true); + ZEPHIR_CALL_FUNCTION(&_4$$4, "strstr", NULL, 309, &_3$$4, &end, &__$true); zephir_check_call_status(); zephir_cast_to_string(&_5$$4, &_4$$4); ZEPHIR_CPY_WRT(&text, &_5$$4); @@ -1208,7 +1208,7 @@ PHP_METHOD(Phalcon_Helper_Str, friendly) ZEPHIR_INIT_VAR(&_6); ZEPHIR_INIT_VAR(&_7); zephir_array_keys(&_7, &matrix); - ZEPHIR_CALL_FUNCTION(&_8, "array_values", NULL, 13, &matrix); + ZEPHIR_CALL_FUNCTION(&_8, "array_values", NULL, 14, &matrix); zephir_check_call_status(); zephir_fast_str_replace(&_6, &_7, &_8, &text); zephir_get_strval(&text, &_6); @@ -1344,7 +1344,7 @@ PHP_METHOD(Phalcon_Helper_Str, includes) if ((zephir_function_exists_ex(ZEND_STRL("mb_strpos")) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&_0$$3, "mb_strpos", NULL, 308, &haystack, &needle); + ZEPHIR_CALL_FUNCTION(&_0$$3, "mb_strpos", NULL, 310, &haystack, &needle); zephir_check_call_status(); RETURN_MM_BOOL(!ZEPHIR_IS_FALSE_IDENTICAL(&_0$$3)); } else { @@ -1472,10 +1472,10 @@ PHP_METHOD(Phalcon_Helper_Str, isAnagram) ZVAL_LONG(&_0, 1); - ZEPHIR_CALL_FUNCTION(&_1, "count_chars", NULL, 309, &first, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "count_chars", NULL, 311, &first, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, 1); - ZEPHIR_CALL_FUNCTION(&_2, "count_chars", NULL, 309, &second, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "count_chars", NULL, 311, &second, &_0); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_IDENTICAL(&_1, &_2)); } @@ -1587,7 +1587,7 @@ PHP_METHOD(Phalcon_Helper_Str, isPalindrome) } - ZEPHIR_CALL_FUNCTION(&_0, "strrev", NULL, 310, &text); + ZEPHIR_CALL_FUNCTION(&_0, "strrev", NULL, 312, &text); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_IDENTICAL(&_0, &text)); } @@ -1651,7 +1651,7 @@ PHP_METHOD(Phalcon_Helper_Str, isUpper) if ((zephir_function_exists_ex(ZEND_STRL("mb_strtoupper")) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&_0$$3, "mb_strtoupper", NULL, 303, &text, &encoding); + ZEPHIR_CALL_FUNCTION(&_0$$3, "mb_strtoupper", NULL, 305, &text, &encoding); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_IDENTICAL(&text, &_0$$3)); } else { @@ -1814,13 +1814,13 @@ PHP_METHOD(Phalcon_Helper_Str, random) ZVAL_STRING(&_0$$3, "a"); ZEPHIR_INIT_VAR(&_1$$3); ZVAL_STRING(&_1$$3, "z"); - ZEPHIR_CALL_FUNCTION(&_2$$3, "range", NULL, 311, &_0$$3, &_1$$3); + ZEPHIR_CALL_FUNCTION(&_2$$3, "range", NULL, 313, &_0$$3, &_1$$3); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_0$$3); ZVAL_STRING(&_0$$3, "A"); ZEPHIR_INIT_NVAR(&_1$$3); ZVAL_STRING(&_1$$3, "Z"); - ZEPHIR_CALL_FUNCTION(&_3$$3, "range", NULL, 311, &_0$$3, &_1$$3); + ZEPHIR_CALL_FUNCTION(&_3$$3, "range", NULL, 313, &_0$$3, &_1$$3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&pool); zephir_fast_array_merge(&pool, &_2$$3, &_3$$3); @@ -1829,13 +1829,13 @@ PHP_METHOD(Phalcon_Helper_Str, random) if (type == 2) { ZVAL_LONG(&_4$$4, 0); ZVAL_LONG(&_5$$4, 9); - ZEPHIR_CALL_FUNCTION(&_6$$4, "range", NULL, 311, &_4$$4, &_5$$4); + ZEPHIR_CALL_FUNCTION(&_6$$4, "range", NULL, 313, &_4$$4, &_5$$4); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_7$$4); ZVAL_STRING(&_7$$4, "a"); ZEPHIR_INIT_VAR(&_8$$4); ZVAL_STRING(&_8$$4, "f"); - ZEPHIR_CALL_FUNCTION(&_9$$4, "range", NULL, 311, &_7$$4, &_8$$4); + ZEPHIR_CALL_FUNCTION(&_9$$4, "range", NULL, 313, &_7$$4, &_8$$4); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&pool); zephir_fast_array_merge(&pool, &_6$$4, &_9$$4); @@ -1844,41 +1844,41 @@ PHP_METHOD(Phalcon_Helper_Str, random) if (type == 3) { ZVAL_LONG(&_10$$5, 0); ZVAL_LONG(&_11$$5, 9); - ZEPHIR_CALL_FUNCTION(&pool, "range", NULL, 311, &_10$$5, &_11$$5); + ZEPHIR_CALL_FUNCTION(&pool, "range", NULL, 313, &_10$$5, &_11$$5); zephir_check_call_status(); break; } if (type == 4) { ZVAL_LONG(&_12$$6, 1); ZVAL_LONG(&_13$$6, 9); - ZEPHIR_CALL_FUNCTION(&pool, "range", NULL, 311, &_12$$6, &_13$$6); + ZEPHIR_CALL_FUNCTION(&pool, "range", NULL, 313, &_12$$6, &_13$$6); zephir_check_call_status(); break; } if (type == 5) { ZEPHIR_INIT_VAR(&_14$$7); ZVAL_STRING(&_14$$7, "2345679ACDEFHJKLMNPRSTUVWXYZ"); - ZEPHIR_CALL_FUNCTION(&pool, "str_split", NULL, 110, &_14$$7); + ZEPHIR_CALL_FUNCTION(&pool, "str_split", NULL, 112, &_14$$7); zephir_check_call_status(); break; } ZVAL_LONG(&_15$$8, 0); ZVAL_LONG(&_16$$8, 9); - ZEPHIR_CALL_FUNCTION(&_17$$8, "range", NULL, 311, &_15$$8, &_16$$8); + ZEPHIR_CALL_FUNCTION(&_17$$8, "range", NULL, 313, &_15$$8, &_16$$8); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_18$$8); ZVAL_STRING(&_18$$8, "a"); ZEPHIR_INIT_VAR(&_19$$8); ZVAL_STRING(&_19$$8, "z"); - ZEPHIR_CALL_FUNCTION(&_20$$8, "range", NULL, 311, &_18$$8, &_19$$8); + ZEPHIR_CALL_FUNCTION(&_20$$8, "range", NULL, 313, &_18$$8, &_19$$8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_18$$8); ZVAL_STRING(&_18$$8, "A"); ZEPHIR_INIT_NVAR(&_19$$8); ZVAL_STRING(&_19$$8, "Z"); - ZEPHIR_CALL_FUNCTION(&_21$$8, "range", NULL, 311, &_18$$8, &_19$$8); + ZEPHIR_CALL_FUNCTION(&_21$$8, "range", NULL, 313, &_18$$8, &_19$$8); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&pool, "array_merge", NULL, 312, &_17$$8, &_20$$8, &_21$$8); + ZEPHIR_CALL_FUNCTION(&pool, "array_merge", NULL, 314, &_17$$8, &_20$$8, &_21$$8); zephir_check_call_status(); break; } while(0); @@ -2200,7 +2200,7 @@ PHP_METHOD(Phalcon_Helper_Str, upper) if ((zephir_function_exists_ex(ZEND_STRL("mb_strtoupper")) == SUCCESS)) { - ZEPHIR_RETURN_CALL_FUNCTION("mb_strtoupper", NULL, 303, &text, &encoding); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strtoupper", NULL, 305, &text, &encoding); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/html/breadcrumbs.zep.c b/ext/phalcon/html/breadcrumbs.zep.c index 1fdb85b7bf..31c32ac7ea 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, 291, &urls); + ZEPHIR_CALL_FUNCTION(&lastUrl, "end", NULL, 293, &urls); ZEPHIR_UNREF(&urls); zephir_check_call_status(); ZEPHIR_OBS_VAR(&lastLabel); diff --git a/ext/phalcon/html/helper/input/checkbox.zep.c b/ext/phalcon/html/helper/input/checkbox.zep.c index 90d331c3f3..9f86cdbaaa 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, 116); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "processchecked", NULL, 118); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&unchecked, this_ptr, "processunchecked", NULL, 117); + ZEPHIR_CALL_METHOD(&unchecked, this_ptr, "processunchecked", NULL, 119); 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 ab3a57183c..22bc1e6359 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, 313, &attributes, &value); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "processvalue", NULL, 315, &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 250aecb2e2..df9c2c8749 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, 314, &_0, &httpEquiv, &content); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "addelement", NULL, 316, &_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, 314, &_0, &name, &content); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addelement", NULL, 316, &_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, 314, &_0, &name, &content); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addelement", NULL, 316, &_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 54175d22e6..53c568e6bb 100644 --- a/ext/phalcon/html/helper/title.zep.c +++ b/ext/phalcon/html/helper/title.zep.c @@ -163,7 +163,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, 312, &_0, &_1, &_3); + ZEPHIR_CALL_FUNCTION(&items, "array_merge", NULL, 314, &_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 67c261e3bf..f25237a31c 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, 118, &href, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "strrpos", NULL, 120, &href, &_3); zephir_check_call_status(); _2 = !ZEPHIR_IS_FALSE_IDENTICAL(&_4); } diff --git a/ext/phalcon/html/link/linkprovider.zep.c b/ext/phalcon/html/link/linkprovider.zep.c index 1c09b29e1a..73ab500dd5 100644 --- a/ext/phalcon/html/link/linkprovider.zep.c +++ b/ext/phalcon/html/link/linkprovider.zep.c @@ -236,7 +236,7 @@ PHP_METHOD(Phalcon_Html_Link_LinkProvider, getKey) zephir_fetch_params(1, 1, 0, &link); - ZEPHIR_RETURN_CALL_FUNCTION("spl_object_hash", NULL, 101, link); + ZEPHIR_RETURN_CALL_FUNCTION("spl_object_hash", NULL, 103, link); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/http/cookie.zep.c b/ext/phalcon/http/cookie.zep.c index 2e2a5e6323..41ddc2f134 100644 --- a/ext/phalcon/http/cookie.zep.c +++ b/ext/phalcon/http/cookie.zep.c @@ -335,7 +335,7 @@ PHP_METHOD(Phalcon_Http_Cookie, delete) ZEPHIR_CALL_CE_STATIC(&_13, phalcon_helper_arr_ce, "get", &_8, 81, &options, &_9, &httpOnly); zephir_check_call_status(); zephir_array_update_string(&options, SL("httponly"), &_13, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 315, &name, &__$null, &options); + ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 317, &name, &__$null, &options); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -917,7 +917,7 @@ PHP_METHOD(Phalcon_Http_Cookie, send) ZEPHIR_CALL_CE_STATIC(&_22, phalcon_helper_arr_ce, "get", &_18, 81, &options, &_3, &httpOnly); zephir_check_call_status(); zephir_array_update_string(&options, SL("httponly"), &_22, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 315, &name, &encryptValue, &options); + ZEPHIR_CALL_FUNCTION(NULL, "setcookie", NULL, 317, &name, &encryptValue, &options); zephir_check_call_status(); RETURN_THIS(); } @@ -1301,14 +1301,14 @@ PHP_METHOD(Phalcon_Http_Cookie, assertSignKeyIsLongEnough) } - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 229, &signKey); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 231, &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, 135, &_1$$3, &length); + ZEPHIR_CALL_FUNCTION(&_2$$3, "sprintf", NULL, 137, &_1$$3, &length); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 8, &_2$$3); zephir_check_call_status(); diff --git a/ext/phalcon/http/message/abstractrequest.zep.c b/ext/phalcon/http/message/abstractrequest.zep.c index 4322fe6da6..168b445319 100644 --- a/ext/phalcon/http/message/abstractrequest.zep.c +++ b/ext/phalcon/http/message/abstractrequest.zep.c @@ -189,7 +189,7 @@ PHP_METHOD(Phalcon_Http_Message_AbstractRequest, withMethod) zephir_fetch_params(1, 1, 0, &method); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "processmethod", NULL, 108, method); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "processmethod", NULL, 110, method); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "method"); @@ -462,13 +462,13 @@ PHP_METHOD(Phalcon_Http_Message_AbstractRequest, processUri) } if (EXPECTED(Z_TYPE_P(uri) == IS_STRING)) { object_init_ex(return_value, phalcon_http_message_uri_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 109, uri); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 111, uri); zephir_check_call_status(); RETURN_MM(); } if (Z_TYPE_P(uri) == IS_NULL) { object_init_ex(return_value, phalcon_http_message_uri_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 109); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 111); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/http/message/request.zep.c b/ext/phalcon/http/message/request.zep.c index a66fd10419..185d6ff591 100644 --- a/ext/phalcon/http/message/request.zep.c +++ b/ext/phalcon/http/message/request.zep.c @@ -111,16 +111,16 @@ 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, 316); + ZEPHIR_CALL_METHOD(NULL, body, "__construct", NULL, 318); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(&_1, this_ptr, "processuri", NULL, 317, uri); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "processuri", NULL, 319, uri); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("uri"), &_1); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "processheaders", NULL, 318, headers); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "processheaders", NULL, 320, headers); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("headers"), &_2); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "processmethod", NULL, 108, &method); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "processmethod", NULL, 110, &method); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("method"), &_3); ZEPHIR_INIT_VAR(&_5); diff --git a/ext/phalcon/http/message/requestfactory.zep.c b/ext/phalcon/http/message/requestfactory.zep.c index 077f015d78..a70ccd4da1 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, 319, &method, uri); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 321, &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 a83627fa81..0f0c43d818 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, 320, &_0); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "processcode", NULL, 322, &_0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "processheaders", NULL, 318, &headers); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "processheaders", NULL, 320, &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, 321); + ZEPHIR_CALL_METHOD(&phrases, this_ptr, "getphrases", NULL, 323); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkcodetype", NULL, 322, code); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkcodetype", NULL, 324, 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, 323, code); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkcodevalue", NULL, 325, 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", 226); @@ -471,7 +471,7 @@ PHP_METHOD(Phalcon_Http_Message_Response, checkCodeValue) ZVAL_LONG(&_2, code); ZVAL_LONG(&_3, 100); ZVAL_LONG(&_4, 599); - ZEPHIR_CALL_CE_STATIC(&_0, phalcon_helper_number_ce, "between", &_1, 324, &_2, &_3, &_4); + ZEPHIR_CALL_CE_STATIC(&_0, phalcon_helper_number_ce, "between", &_1, 326, &_2, &_3, &_4); zephir_check_call_status(); if (!ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { ZEPHIR_INIT_VAR(&_5$$3); diff --git a/ext/phalcon/http/message/responsefactory.zep.c b/ext/phalcon/http/message/responsefactory.zep.c index 4c4812d9a4..b73b11ea9b 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, 325); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 327); zephir_check_call_status(); ZVAL_LONG(&_1, code); - ZEPHIR_RETURN_CALL_METHOD(&_0, "withstatus", NULL, 326, &_1, &reasonPhrase); + ZEPHIR_RETURN_CALL_METHOD(&_0, "withstatus", NULL, 328, &_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 59a24a47ce..03247f2fb0 100644 --- a/ext/phalcon/http/message/serverrequest.zep.c +++ b/ext/phalcon/http/message/serverrequest.zep.c @@ -334,21 +334,21 @@ 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, 316); + ZEPHIR_CALL_METHOD(NULL, body, "__construct", NULL, 318); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkuploadedfiles", NULL, 327, &uploadFiles); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkuploadedfiles", NULL, 329, &uploadFiles); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_1, this_ptr, "processprotocol", NULL, 38, &protocol); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("protocolVersion"), &_1); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "processmethod", NULL, 108, &method); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "processmethod", NULL, 110, &method); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("method"), &_2); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "processheaders", NULL, 318, headers); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "processheaders", NULL, 320, headers); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("headers"), &_3); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "processuri", NULL, 317, uri); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "processuri", NULL, 319, 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, 327, &uploadedFiles); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkuploadedfiles", NULL, 329, &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, 327, &file); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkuploadedfiles", &_2, 329, &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, 327, &file); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkuploadedfiles", &_2, 329, &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 e6e8a0f353..3cd6e319da 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, 328, &method, uri, &serverParams); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 330, &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, 329, &server, &globalServer); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "checknullarray", NULL, 331, &server, &globalServer); zephir_check_call_status(); ZEPHIR_CPY_WRT(&server, &_0); - ZEPHIR_CALL_METHOD(&_1, this_ptr, "checknullarray", NULL, 329, &files, &globalFiles); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "checknullarray", NULL, 331, &files, &globalFiles); zephir_check_call_status(); ZEPHIR_CPY_WRT(&files, &_1); - ZEPHIR_CALL_METHOD(&_2, this_ptr, "checknullarray", NULL, 329, &cookies, &globalCookies); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "checknullarray", NULL, 331, &cookies, &globalCookies); zephir_check_call_status(); ZEPHIR_CPY_WRT(&cookies, &_2); - ZEPHIR_CALL_METHOD(&_3, this_ptr, "checknullarray", NULL, 329, &get, &globalGet); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "checknullarray", NULL, 331, &get, &globalGet); zephir_check_call_status(); ZEPHIR_CPY_WRT(&get, &_3); - ZEPHIR_CALL_METHOD(&_4, this_ptr, "checknullarray", NULL, 329, &post, &globalPost); + ZEPHIR_CALL_METHOD(&_4, this_ptr, "checknullarray", NULL, 331, &post, &globalPost); zephir_check_call_status(); ZEPHIR_CPY_WRT(&post, &_4); - ZEPHIR_CALL_METHOD(&serverCollection, this_ptr, "parseserver", NULL, 330, &server); + ZEPHIR_CALL_METHOD(&serverCollection, this_ptr, "parseserver", NULL, 332, &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, 331, &serverCollection); + ZEPHIR_CALL_METHOD(&protocol, this_ptr, "parseprotocol", NULL, 333, &serverCollection); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&headers, this_ptr, "parseheaders", NULL, 332, &serverCollection); + ZEPHIR_CALL_METHOD(&headers, this_ptr, "parseheaders", NULL, 334, &serverCollection); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&filesCollection, this_ptr, "parseuploadedfiles", NULL, 333, &files); + ZEPHIR_CALL_METHOD(&filesCollection, this_ptr, "parseuploadedfiles", NULL, 335, &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, 334, &_9$$8); + ZEPHIR_CALL_METHOD(&cookiesCollection, this_ptr, "parsecookieheader", NULL, 336, &_9$$8); zephir_check_call_status(); } object_init_ex(return_value, phalcon_http_message_serverrequest_ce); - ZEPHIR_CALL_METHOD(&_11, this_ptr, "parseuri", NULL, 335, &serverCollection, &headers); + ZEPHIR_CALL_METHOD(&_11, this_ptr, "parseuri", NULL, 337, &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, 328, &method, &_11, &_12, &_5, &_13, &cookiesCollection, &get, &_14, &post, &protocol); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 330, &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, 336); + ZEPHIR_RETURN_CALL_FUNCTION("apache_request_headers", NULL, 338); 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, 337, headers, &_0, &_2); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "getheader", NULL, 339, 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, 337, headers, &_3$$3); + ZEPHIR_CALL_METHOD(&host, this_ptr, "getheader", NULL, 339, headers, &_3$$3); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "calculateurihostfromheader", NULL, 338, &host); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "calculateurihostfromheader", NULL, 340, &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, 337, headers, &_1, &_8); + ZEPHIR_CALL_METHOD(&header, this_ptr, "getheader", NULL, 339, 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", 326); zephir_array_fetch_string(&_5, &file, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Message/ServerRequestFactory.zep", 327); zephir_array_fetch_string(&_6, &file, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Message/ServerRequestFactory.zep", 328); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 339, &_4, &_5, &_6, &name, &type); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 341, &_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, 340, &_1, &cookies); + ZEPHIR_CALL_FUNCTION(NULL, "parse_str", NULL, 342, &_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, 341, &_1); + ZEPHIR_CALL_METHOD(&_0, &collection, "has", NULL, 343, &_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, 341, &_4$$3); + ZEPHIR_CALL_METHOD(&_3$$3, &headersCollection, "has", NULL, 343, &_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, 342, &_6$$4); + ZEPHIR_CALL_METHOD(&_5$$4, &headersCollection, "get", NULL, 344, &_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, 343, &file); + ZEPHIR_CALL_METHOD(&_8$$5, this_ptr, "createuploadedfile", &_9, 345, &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, 333, &file); + ZEPHIR_CALL_METHOD(&data, this_ptr, "parseuploadedfiles", &_10, 335, &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, 343, &file); + ZEPHIR_CALL_METHOD(&_15$$9, this_ptr, "createuploadedfile", &_9, 345, &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, 333, &file); + ZEPHIR_CALL_METHOD(&data, this_ptr, "parseuploadedfiles", &_10, 335, &file); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_16$$10, &data, "toarray", NULL, 0); zephir_check_call_status(); @@ -1502,32 +1502,32 @@ PHP_METHOD(Phalcon_Http_Message_ServerRequestFactory, parseUri) ZEPHIR_INIT_VAR(&uri); object_init_ex(&uri, phalcon_http_message_uri_ce); - ZEPHIR_CALL_METHOD(NULL, &uri, "__construct", NULL, 109); + ZEPHIR_CALL_METHOD(NULL, &uri, "__construct", NULL, 111); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&scheme, this_ptr, "calculateurischeme", NULL, 344, server, headers); + ZEPHIR_CALL_METHOD(&scheme, this_ptr, "calculateurischeme", NULL, 346, server, headers); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_0, &uri, "withscheme", NULL, 345, &scheme); + ZEPHIR_CALL_METHOD(&_0, &uri, "withscheme", NULL, 347, &scheme); zephir_check_call_status(); ZEPHIR_CPY_WRT(&uri, &_0); - ZEPHIR_CALL_METHOD(&split, this_ptr, "calculateurihost", NULL, 346, server, headers); + ZEPHIR_CALL_METHOD(&split, this_ptr, "calculateurihost", NULL, 348, server, headers); zephir_check_call_status(); ZEPHIR_OBS_VAR(&_1); zephir_array_fetch_long(&_1, &split, 0, PH_NOISY, "phalcon/Http/Message/ServerRequestFactory.zep", 586); if (EXPECTED(!(ZEPHIR_IS_EMPTY(&_1)))) { zephir_array_fetch_long(&_3$$3, &split, 0, PH_NOISY | PH_READONLY, "phalcon/Http/Message/ServerRequestFactory.zep", 587); - ZEPHIR_CALL_METHOD(&_2$$3, &uri, "withhost", NULL, 347, &_3$$3); + ZEPHIR_CALL_METHOD(&_2$$3, &uri, "withhost", NULL, 349, &_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", 588); if (UNEXPECTED(!(ZEPHIR_IS_EMPTY(&_4$$3)))) { zephir_array_fetch_long(&_6$$4, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Message/ServerRequestFactory.zep", 589); - ZEPHIR_CALL_METHOD(&_5$$4, &uri, "withport", NULL, 348, &_6$$4); + ZEPHIR_CALL_METHOD(&_5$$4, &uri, "withport", NULL, 350, &_6$$4); zephir_check_call_status(); ZEPHIR_CPY_WRT(&uri, &_5$$4); } } - ZEPHIR_CALL_METHOD(&path, this_ptr, "calculateuripath", NULL, 349, server); + ZEPHIR_CALL_METHOD(&path, this_ptr, "calculateuripath", NULL, 351, 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", 599); - ZEPHIR_CALL_METHOD(&_0, &uri, "withpath", NULL, 350, &_8); + ZEPHIR_CALL_METHOD(&_0, &uri, "withpath", NULL, 352, &_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", 602); - ZEPHIR_CALL_METHOD(&_9$$5, &uri, "withfragment", NULL, 351, &_10$$5); + ZEPHIR_CALL_METHOD(&_9$$5, &uri, "withfragment", NULL, 353, &_10$$5); zephir_check_call_status(); ZEPHIR_CPY_WRT(&uri, &_9$$5); } - ZEPHIR_CALL_METHOD(&query, this_ptr, "calculateuriquery", NULL, 352, server); + ZEPHIR_CALL_METHOD(&query, this_ptr, "calculateuriquery", NULL, 354, server); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_0, &uri, "withquery", NULL, 353, &query); + ZEPHIR_CALL_METHOD(&_0, &uri, "withquery", NULL, 355, &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 d2b9941e84..be5d7e5c72 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, 354, &handle); + ZEPHIR_CALL_FUNCTION(NULL, "rewind", NULL, 356, &handle); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "createstreamfromresource", NULL, 355, &handle); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "createstreamfromresource", NULL, 357, &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 66843edb04..95ec552023 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, 356, stream, &_0); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkstream", NULL, 358, stream, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, error); - ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkerror", NULL, 357, &_0); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkerror", NULL, 359, &_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, 358, &_3$$3); + ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "geterrordescription", NULL, 360, &_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, 358, &_4$$4); + ZEPHIR_CALL_METHOD(&_3$$4, this_ptr, "geterrordescription", NULL, 360, &_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, 359, targetPath); + ZEPHIR_CALL_FUNCTION(&_7, "dirname", NULL, 361, targetPath); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_8, "is_dir", NULL, 145, &_7); + ZEPHIR_CALL_FUNCTION(&_8, "is_dir", NULL, 147, &_7); zephir_check_call_status(); _6 = zephir_is_true(&_8); } _9 = _6; if (_9) { - ZEPHIR_CALL_FUNCTION(&_10, "dirname", NULL, 359, targetPath); + ZEPHIR_CALL_FUNCTION(&_10, "dirname", NULL, 361, targetPath); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_11, "is_writable", NULL, 360, &_10); + ZEPHIR_CALL_FUNCTION(&_11, "is_writable", NULL, 362, &_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, 137, &_12); + ZEPHIR_CALL_FUNCTION(&sapi, "constant", NULL, 139, &_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, 361, targetPath); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "storefile", NULL, 363, 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, 362, &_17$$7, targetPath); + ZEPHIR_CALL_FUNCTION(&_18$$7, "move_uploaded_file", NULL, 364, &_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", 246); @@ -518,7 +518,7 @@ PHP_METHOD(Phalcon_Http_Message_UploadedFile, checkError) ZVAL_LONG(&_2, error); ZVAL_LONG(&_3, 0); ZVAL_LONG(&_4, 8); - ZEPHIR_CALL_CE_STATIC(&_0, phalcon_helper_number_ce, "between", &_1, 324, &_2, &_3, &_4); + ZEPHIR_CALL_CE_STATIC(&_0, phalcon_helper_number_ce, "between", &_1, 326, &_2, &_3, &_4); 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", 263); @@ -679,7 +679,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", 330); return; } - ZEPHIR_CALL_METHOD(&stream, this_ptr, "getstream", NULL, 363); + ZEPHIR_CALL_METHOD(&stream, this_ptr, "getstream", NULL, 365); 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 7f988c363c..c2fc213f1a 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, 339, stream, &_0, &_1, &clientFilename, &clientMediaType); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 341, 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 ec8440ecf8..ed7fdca0aa 100644 --- a/ext/phalcon/http/message/uri.zep.c +++ b/ext/phalcon/http/message/uri.zep.c @@ -284,7 +284,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, 120, &uri); + ZEPHIR_CALL_FUNCTION(&urlParts, "parse_url", NULL, 122, &uri); zephir_check_call_status(); if (UNEXPECTED(ZEPHIR_IS_FALSE_IDENTICAL(&urlParts))) { ZEPHIR_INIT_NVAR(&urlParts); @@ -296,7 +296,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, __construct) ZVAL_STRING(&_5$$3, ""); ZEPHIR_CALL_CE_STATIC(&_2$$3, phalcon_helper_arr_ce, "get", &_3, 81, &urlParts, &_4$$3, &_5$$3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "filterfragment", NULL, 364, &_2$$3); + ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "filterfragment", NULL, 366, &_2$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("fragment"), &_1$$3); ZEPHIR_INIT_NVAR(&_4$$3); @@ -314,7 +314,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, __construct) ZVAL_STRING(&_7$$3, ""); ZEPHIR_CALL_CE_STATIC(&_8$$3, phalcon_helper_arr_ce, "get", &_3, 81, &urlParts, &_5$$3, &_7$$3); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_9$$3, "rawurlencode", NULL, 261, &_8$$3); + ZEPHIR_CALL_FUNCTION(&_9$$3, "rawurlencode", NULL, 263, &_8$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("pass"), &_9$$3); ZEPHIR_INIT_NVAR(&_5$$3); @@ -323,7 +323,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, __construct) ZVAL_STRING(&_7$$3, ""); ZEPHIR_CALL_CE_STATIC(&_11$$3, phalcon_helper_arr_ce, "get", &_3, 81, &urlParts, &_5$$3, &_7$$3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_10$$3, this_ptr, "filterpath", NULL, 365, &_11$$3); + ZEPHIR_CALL_METHOD(&_10$$3, this_ptr, "filterpath", NULL, 367, &_11$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("path"), &_10$$3); ZEPHIR_INIT_NVAR(&_5$$3); @@ -331,7 +331,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, __construct) ZVAL_NULL(&_14$$3); ZEPHIR_CALL_CE_STATIC(&_13$$3, phalcon_helper_arr_ce, "get", &_3, 81, &urlParts, &_5$$3, &_14$$3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_12$$3, this_ptr, "filterport", NULL, 366, &_13$$3); + ZEPHIR_CALL_METHOD(&_12$$3, this_ptr, "filterport", NULL, 368, &_13$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("port"), &_12$$3); ZEPHIR_INIT_NVAR(&_5$$3); @@ -340,7 +340,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, __construct) ZVAL_STRING(&_7$$3, ""); ZEPHIR_CALL_CE_STATIC(&_16$$3, phalcon_helper_arr_ce, "get", &_3, 81, &urlParts, &_5$$3, &_7$$3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_15$$3, this_ptr, "filterquery", NULL, 367, &_16$$3); + ZEPHIR_CALL_METHOD(&_15$$3, this_ptr, "filterquery", NULL, 369, &_16$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("query"), &_15$$3); ZEPHIR_INIT_NVAR(&_5$$3); @@ -349,7 +349,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, __construct) ZVAL_STRING(&_7$$3, ""); ZEPHIR_CALL_CE_STATIC(&_18$$3, phalcon_helper_arr_ce, "get", &_3, 81, &urlParts, &_5$$3, &_7$$3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_17$$3, this_ptr, "filterscheme", NULL, 368, &_18$$3); + ZEPHIR_CALL_METHOD(&_17$$3, this_ptr, "filterscheme", NULL, 370, &_18$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("scheme"), &_17$$3); ZEPHIR_INIT_NVAR(&_5$$3); @@ -358,7 +358,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, __construct) ZVAL_STRING(&_7$$3, ""); ZEPHIR_CALL_CE_STATIC(&_19$$3, phalcon_helper_arr_ce, "get", &_3, 81, &urlParts, &_5$$3, &_7$$3); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_20$$3, "rawurlencode", NULL, 261, &_19$$3); + ZEPHIR_CALL_FUNCTION(&_20$$3, "rawurlencode", NULL, 263, &_19$$3); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("user"), &_20$$3); } @@ -402,7 +402,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, __toString) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&authority, this_ptr, "getauthority", NULL, 369); + ZEPHIR_CALL_METHOD(&authority, this_ptr, "getauthority", NULL, 371); zephir_check_call_status(); zephir_read_property(&_0, this_ptr, ZEND_STRL("path"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&path, &_0); @@ -428,21 +428,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, 370, &_0, &_7, &_8); + ZEPHIR_CALL_METHOD(&_6, this_ptr, "checkvalue", NULL, 372, &_0, &_7, &_8); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_7); ZVAL_STRING(&_7, "//"); - ZEPHIR_CALL_METHOD(&_9, this_ptr, "checkvalue", NULL, 370, &authority, &_7); + ZEPHIR_CALL_METHOD(&_9, this_ptr, "checkvalue", NULL, 372, &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, 370, &_11, &_7); + ZEPHIR_CALL_METHOD(&_10, this_ptr, "checkvalue", NULL, 372, &_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, 370, &_13, &_7); + ZEPHIR_CALL_METHOD(&_12, this_ptr, "checkvalue", NULL, 372, &_13, &_7); zephir_check_call_status(); ZEPHIR_INIT_VAR(&uri); ZEPHIR_CONCAT_VVVVV(&uri, &_6, &_9, &path, &_10, &_12); @@ -482,7 +482,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, 371); + ZEPHIR_CALL_METHOD(&userInfo, this_ptr, "getuserinfo", NULL, 373); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, ""); @@ -580,7 +580,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, withFragment) ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkstringparameter", NULL, 21, fragment); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "filterfragment", NULL, 364, fragment); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "filterfragment", NULL, 366, fragment); zephir_check_call_status(); ZEPHIR_CPY_WRT(fragment, &_0); ZEPHIR_INIT_VAR(&_1); @@ -659,7 +659,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", 290); return; } - ZEPHIR_CALL_METHOD(&_5, this_ptr, "filterpath", NULL, 365, path); + ZEPHIR_CALL_METHOD(&_5, this_ptr, "filterpath", NULL, 367, path); zephir_check_call_status(); ZEPHIR_CPY_WRT(path, &_5); ZEPHIR_INIT_VAR(&_6); @@ -711,7 +711,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, 366, port); + ZEPHIR_CALL_METHOD(&_0$$3, this_ptr, "filterport", NULL, 368, port); zephir_check_call_status(); ZEPHIR_CPY_WRT(port, &_0$$3); _1$$3 = Z_TYPE_P(port) != IS_NULL; @@ -785,7 +785,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", 353); return; } - ZEPHIR_CALL_METHOD(&_2, this_ptr, "filterquery", NULL, 367, query); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "filterquery", NULL, 369, query); zephir_check_call_status(); ZEPHIR_CPY_WRT(query, &_2); ZEPHIR_INIT_VAR(&_3); @@ -837,12 +837,12 @@ PHP_METHOD(Phalcon_Http_Message_Uri, withScheme) ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkstringparameter", NULL, 21, scheme); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_0, this_ptr, "filterscheme", NULL, 368, scheme); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "filterscheme", NULL, 370, 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, 372, scheme, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processwith", NULL, 374, scheme, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -896,11 +896,11 @@ PHP_METHOD(Phalcon_Http_Message_Uri, withUserInfo) ZEPHIR_CALL_METHOD(NULL, this_ptr, "checkstringparameter", NULL, 21, user); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_0, "rawurlencode", NULL, 261, user); + ZEPHIR_CALL_FUNCTION(&_0, "rawurlencode", NULL, 263, 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, 261, password); + ZEPHIR_CALL_FUNCTION(&_1$$4, "rawurlencode", NULL, 263, password); zephir_check_call_status(); ZEPHIR_CPY_WRT(password, &_1$$4); } @@ -949,7 +949,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, withHost) ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "host"); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processwith", NULL, 372, host, &_0); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "processwith", NULL, 374, host, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -1085,7 +1085,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, filterFragment) } - ZEPHIR_RETURN_CALL_FUNCTION("rawurlencode", NULL, 261, &fragment); + ZEPHIR_RETURN_CALL_FUNCTION("rawurlencode", NULL, 263, &fragment); zephir_check_call_status(); RETURN_MM(); } @@ -1183,7 +1183,7 @@ PHP_METHOD(Phalcon_Http_Message_Uri, filterPath) } ZEPHIR_INIT_NVAR(&element); ZVAL_COPY(&element, _2); - ZEPHIR_CALL_FUNCTION(&_6$$4, "rawurlencode", &_7, 261, &element); + ZEPHIR_CALL_FUNCTION(&_6$$4, "rawurlencode", &_7, 263, &element); zephir_check_call_status(); zephir_array_update_zval(&parts, &key, &_6$$4, PH_COPY | PH_SEPARATE); } ZEND_HASH_FOREACH_END(); @@ -1200,7 +1200,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, 261, &element); + ZEPHIR_CALL_FUNCTION(&_8$$5, "rawurlencode", &_7, 263, &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); @@ -1360,21 +1360,21 @@ PHP_METHOD(Phalcon_Http_Message_Uri, filterQuery) } ZEPHIR_INIT_NVAR(&part); ZVAL_COPY(&part, _3); - ZEPHIR_CALL_METHOD(&split, this_ptr, "splitqueryvalue", &_7, 373, &part); + ZEPHIR_CALL_METHOD(&split, this_ptr, "splitqueryvalue", &_7, 375, &part); zephir_check_call_status(); zephir_array_fetch_long(&_8$$4, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Message/Uri.zep", 589); 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", 590); - ZEPHIR_CALL_FUNCTION(&_10$$5, "rawurlencode", &_11, 261, &_9$$5); + ZEPHIR_CALL_FUNCTION(&_10$$5, "rawurlencode", &_11, 263, &_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", 594); - ZEPHIR_CALL_FUNCTION(&_13$$4, "rawurlencode", &_11, 261, &_12$$4); + ZEPHIR_CALL_FUNCTION(&_13$$4, "rawurlencode", &_11, 263, &_12$$4); zephir_check_call_status(); zephir_array_fetch_long(&_14$$4, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Message/Uri.zep", 594); - ZEPHIR_CALL_FUNCTION(&_15$$4, "rawurlencode", &_11, 261, &_14$$4); + ZEPHIR_CALL_FUNCTION(&_15$$4, "rawurlencode", &_11, 263, &_14$$4); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_16$$4); ZEPHIR_CONCAT_VSV(&_16$$4, &_13$$4, "=", &_15$$4); @@ -1393,21 +1393,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, 373, &part); + ZEPHIR_CALL_METHOD(&split, this_ptr, "splitqueryvalue", &_7, 375, &part); zephir_check_call_status(); zephir_array_fetch_long(&_17$$6, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Message/Uri.zep", 589); 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", 590); - ZEPHIR_CALL_FUNCTION(&_19$$7, "rawurlencode", &_11, 261, &_18$$7); + ZEPHIR_CALL_FUNCTION(&_19$$7, "rawurlencode", &_11, 263, &_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", 594); - ZEPHIR_CALL_FUNCTION(&_21$$6, "rawurlencode", &_11, 261, &_20$$6); + ZEPHIR_CALL_FUNCTION(&_21$$6, "rawurlencode", &_11, 263, &_20$$6); zephir_check_call_status(); zephir_array_fetch_long(&_22$$6, &split, 1, PH_NOISY | PH_READONLY, "phalcon/Http/Message/Uri.zep", 594); - ZEPHIR_CALL_FUNCTION(&_23$$6, "rawurlencode", &_11, 261, &_22$$6); + ZEPHIR_CALL_FUNCTION(&_23$$6, "rawurlencode", &_11, 263, &_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/message/urifactory.zep.c b/ext/phalcon/http/message/urifactory.zep.c index e4df0303ec..86eeb763c8 100644 --- a/ext/phalcon/http/message/urifactory.zep.c +++ b/ext/phalcon/http/message/urifactory.zep.c @@ -84,7 +84,7 @@ PHP_METHOD(Phalcon_Http_Message_UriFactory, createUri) object_init_ex(return_value, phalcon_http_message_uri_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 109, &uri); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 111, &uri); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/http/request.zep.c b/ext/phalcon/http/request.zep.c index 52de632fdc..57d8d0b5a3 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, 374, &_REQUEST, &name, filters, defaultValue, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 376, &_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, 375, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 377, &_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, 376, &_1); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 378, &_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, 376, &_1); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "hasserver", NULL, 378, &_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, 377, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 379, &_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, 377, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 379, &_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, 377, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getbestquality", NULL, 379, &_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, 378); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 380); 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, 375, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 377, &_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, 378); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 380); 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, 378); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 380); 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, 378); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 380); 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, 378); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 380); zephir_check_call_status(); zephir_is_iterable(&server, 0, "phalcon/Http/Request.zep", 442); 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, 277, &_4$$4); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 279, &_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, 277, &_15$$5); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 279, &_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, 277, &_22$$7); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 279, &_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, 277, &_32$$8); + ZEPHIR_CALL_FUNCTION(&name, "ucwords", &_10, 279, &_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, 379, &_13$$7); + ZEPHIR_CALL_METHOD(NULL, &_12$$7, "__construct", NULL, 381, &_13$$7); zephir_check_call_status(); zephir_throw_exception_debug(&_12$$7, "phalcon/Http/Request.zep", 526); ZEPHIR_MM_RESTORE(); @@ -1297,7 +1297,7 @@ PHP_METHOD(Phalcon_Http_Request, getHTTPReferer) ZEPHIR_MM_GROW(); - ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 378); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 380); 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, 375, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getqualityheader", NULL, 377, &_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, 378); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 380); 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, 380, &_1$$5); + ZEPHIR_CALL_METHOD(&overridedMethod, this_ptr, "getheader", NULL, 382, &_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", 635)) { ZEPHIR_INIT_VAR(&_3$$4); ZVAL_STRING(&_3$$4, ":"); - ZEPHIR_CALL_FUNCTION(&pos, "strrpos", NULL, 118, &host, &_3$$4); + ZEPHIR_CALL_FUNCTION(&pos, "strrpos", NULL, 120, &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, 374, &_POST, &name, filters, defaultValue, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 376, &_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, 381, &contentType, &_1$$3); + ZEPHIR_CALL_FUNCTION(&_2$$3, "stripos", NULL, 383, &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, 340, &_4$$6, &put); + ZEPHIR_CALL_FUNCTION(NULL, "parse_str", NULL, 342, &_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, 374, &put, &name, filters, defaultValue, &_5, &_6); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 376, &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, 374, &_GET, &name, filters, defaultValue, &_0, &_1); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "gethelper", NULL, 376, &_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, 378); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 380); 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, 382, &_1$$3); + ZEPHIR_RETURN_CALL_FUNCTION("gethostbyname", NULL, 384, &_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", 862); zephir_array_fetch_string(&_8$$5, &input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 863); zephir_array_fetch_string(&_9$$5, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 864); - ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 383, &_5$$5, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &prefix); + ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 385, &_5$$5, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &prefix); zephir_check_call_status(); zephir_is_iterable(&smoothInput, 0, "phalcon/Http/Request.zep", 891); 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", 882); - ZEPHIR_CALL_METHOD(NULL, &_16$$8, "__construct", &_18, 384, &dataFile, &_17$$8); + ZEPHIR_CALL_METHOD(NULL, &_16$$8, "__construct", &_18, 386, &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", 879); @@ -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", 887); - ZEPHIR_CALL_METHOD(NULL, &_20$$9, "__construct", &_18, 384, &dataFile, &_21$$9); + ZEPHIR_CALL_METHOD(NULL, &_20$$9, "__construct", &_18, 386, &dataFile, &_21$$9); zephir_check_call_status(); zephir_array_append(&files, &_20$$9, PH_SEPARATE, "phalcon/Http/Request.zep", 887); } @@ -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", 882); - ZEPHIR_CALL_METHOD(NULL, &_26$$12, "__construct", &_18, 384, &dataFile, &_27$$12); + ZEPHIR_CALL_METHOD(NULL, &_26$$12, "__construct", &_18, 386, &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", 879); @@ -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", 887); - ZEPHIR_CALL_METHOD(NULL, &_29$$13, "__construct", &_18, 384, &dataFile, &_30$$13); + ZEPHIR_CALL_METHOD(NULL, &_29$$13, "__construct", &_18, 386, &dataFile, &_30$$13); zephir_check_call_status(); zephir_array_append(&files, &_29$$13, PH_SEPARATE, "phalcon/Http/Request.zep", 887); } @@ -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, 384, &input, &prefix); + ZEPHIR_CALL_METHOD(NULL, &_33$$16, "__construct", &_18, 386, &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, 384, &input, &prefix); + ZEPHIR_CALL_METHOD(NULL, &_34$$17, "__construct", &_18, 386, &input, &prefix); zephir_check_call_status(); zephir_array_append(&files, &_34$$17, PH_SEPARATE, "phalcon/Http/Request.zep", 896); } @@ -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", 862); zephir_array_fetch_string(&_39$$19, &input, SL("size"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 863); zephir_array_fetch_string(&_40$$19, &input, SL("error"), PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 864); - ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 383, &_36$$19, &_37$$19, &_38$$19, &_39$$19, &_40$$19, &prefix); + ZEPHIR_CALL_METHOD(&smoothInput, this_ptr, "smoothfiles", &_10, 385, &_36$$19, &_37$$19, &_38$$19, &_39$$19, &_40$$19, &prefix); zephir_check_call_status(); zephir_is_iterable(&smoothInput, 0, "phalcon/Http/Request.zep", 891); 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", 882); - ZEPHIR_CALL_METHOD(NULL, &_47$$22, "__construct", &_18, 384, &dataFile, &_48$$22); + ZEPHIR_CALL_METHOD(NULL, &_47$$22, "__construct", &_18, 386, &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", 879); @@ -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", 887); - ZEPHIR_CALL_METHOD(NULL, &_50$$23, "__construct", &_18, 384, &dataFile, &_51$$23); + ZEPHIR_CALL_METHOD(NULL, &_50$$23, "__construct", &_18, 386, &dataFile, &_51$$23); zephir_check_call_status(); zephir_array_append(&files, &_50$$23, PH_SEPARATE, "phalcon/Http/Request.zep", 887); } @@ -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", 882); - ZEPHIR_CALL_METHOD(NULL, &_56$$26, "__construct", &_18, 384, &dataFile, &_57$$26); + ZEPHIR_CALL_METHOD(NULL, &_56$$26, "__construct", &_18, 386, &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", 879); @@ -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", 887); - ZEPHIR_CALL_METHOD(NULL, &_59$$27, "__construct", &_18, 384, &dataFile, &_60$$27); + ZEPHIR_CALL_METHOD(NULL, &_59$$27, "__construct", &_18, 386, &dataFile, &_60$$27); zephir_check_call_status(); zephir_array_append(&files, &_59$$27, PH_SEPARATE, "phalcon/Http/Request.zep", 887); } @@ -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, 384, &input, &prefix); + ZEPHIR_CALL_METHOD(NULL, &_63$$30, "__construct", &_18, 386, &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, 384, &input, &prefix); + ZEPHIR_CALL_METHOD(NULL, &_64$$31, "__construct", &_18, 386, &input, &prefix); zephir_check_call_status(); zephir_array_append(&files, &_64$$31, PH_SEPARATE, "phalcon/Http/Request.zep", 896); } @@ -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, 376, &name); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "hasserver", NULL, 378, &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, 376, &_6); + ZEPHIR_CALL_METHOD(&_5, this_ptr, "hasserver", NULL, 378, &_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, 378); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 380); 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, 376, &_1); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 378, &_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, 385); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 387); 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, 385); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 387); 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, 385); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 387); 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, 385); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 387); 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, 385); + ZEPHIR_CALL_METHOD(&httpMethod, this_ptr, "getmethod", NULL, 387); 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, 386, &method, &_7$$6); + ZEPHIR_CALL_METHOD(&_6$$6, this_ptr, "ismethod", &_8, 388, &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, 386, &method, &_10$$8); + ZEPHIR_CALL_METHOD(&_9$$8, this_ptr, "ismethod", &_8, 388, &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, 385); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 387); 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, 385); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 387); 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, 385); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 387); 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, 385); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 387); 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, 385); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 387); 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, 376, &_1); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 378, &_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, 385); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getmethod", NULL, 387); 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, 387, &error, &_4$$8); + ZEPHIR_CALL_METHOD(&_3$$8, this_ptr, "hasfilehelper", &_5, 389, &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, 387, &error, &_8$$13); + ZEPHIR_CALL_METHOD(&_7$$13, this_ptr, "hasfilehelper", &_5, 389, &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, 388); + ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 390); zephir_check_call_status(); zephir_is_iterable(&filters, 0, "phalcon/Http/Request.zep", 1273); 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, 388); + ZEPHIR_CALL_METHOD(&filterService, this_ptr, "getfilterservice", NULL, 390); 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, 387, &value, &_4$$7); + ZEPHIR_CALL_METHOD(&_3$$7, this_ptr, "hasfilehelper", &_5, 389, &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, 387, &value, &_8$$11); + ZEPHIR_CALL_METHOD(&_7$$11, this_ptr, "hasfilehelper", &_5, 389, &value, &_8$$11); zephir_check_call_status(); numberFiles += zephir_get_numberval(&_7$$11); } @@ -3976,7 +3976,7 @@ PHP_METHOD(Phalcon_Http_Request, getQualityHeader) ZVAL_STRING(&_1, "/,\\s*/"); ZVAL_LONG(&_2, -1); ZVAL_LONG(&_3, 1); - ZEPHIR_CALL_FUNCTION(&parts, "preg_split", NULL, 102, &_1, &_0, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&parts, "preg_split", NULL, 104, &_1, &_0, &_2, &_3); zephir_check_call_status(); zephir_is_iterable(&parts, 0, "phalcon/Http/Request.zep", 1431); if (Z_TYPE_P(&parts) == IS_ARRAY) { @@ -3992,7 +3992,7 @@ PHP_METHOD(Phalcon_Http_Request, getQualityHeader) ZVAL_STRING(&_7$$3, "/\\s*;\\s*/"); ZVAL_LONG(&_8$$3, -1); ZVAL_LONG(&_9$$3, 1); - ZEPHIR_CALL_FUNCTION(&_10$$3, "preg_split", NULL, 102, &_7$$3, &_6$$3, &_8$$3, &_9$$3); + ZEPHIR_CALL_FUNCTION(&_10$$3, "preg_split", NULL, 104, &_7$$3, &_6$$3, &_8$$3, &_9$$3); zephir_check_call_status(); zephir_is_iterable(&_10$$3, 0, "phalcon/Http/Request.zep", 1428); if (Z_TYPE_P(&_10$$3) == IS_ARRAY) { @@ -4090,7 +4090,7 @@ PHP_METHOD(Phalcon_Http_Request, getQualityHeader) ZVAL_STRING(&_30$$14, "/\\s*;\\s*/"); ZVAL_LONG(&_31$$14, -1); ZVAL_LONG(&_32$$14, 1); - ZEPHIR_CALL_FUNCTION(&_33$$14, "preg_split", NULL, 102, &_30$$14, &_29$$14, &_31$$14, &_32$$14); + ZEPHIR_CALL_FUNCTION(&_33$$14, "preg_split", NULL, 104, &_30$$14, &_29$$14, &_31$$14, &_32$$14); zephir_check_call_status(); zephir_is_iterable(&_33$$14, 0, "phalcon/Http/Request.zep", 1428); if (Z_TYPE_P(&_33$$14) == IS_ARRAY) { @@ -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, 378); + ZEPHIR_CALL_METHOD(&server, this_ptr, "getserverarray", NULL, 380); 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, 376, &_9); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "hasserver", NULL, 378, &_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, 376, &_9); + ZEPHIR_CALL_METHOD(&_11, this_ptr, "hasserver", NULL, 378, &_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, 376, &_16$$8); + ZEPHIR_CALL_METHOD(&_15$$8, this_ptr, "hasserver", NULL, 378, &_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, 376, &_16$$8); + ZEPHIR_CALL_METHOD(&_17$$8, this_ptr, "hasserver", NULL, 378, &_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, 381, &authHeader, &_20$$11); + ZEPHIR_CALL_FUNCTION(&_21$$11, "stripos", NULL, 383, &authHeader, &_20$$11); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_20$$11); ZVAL_STRING(&_20$$11, "digest "); - ZEPHIR_CALL_FUNCTION(&_22$$11, "stripos", NULL, 381, &authHeader, &_20$$11); + ZEPHIR_CALL_FUNCTION(&_22$$11, "stripos", NULL, 383, &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, 376, &_20$$11); + ZEPHIR_CALL_METHOD(&_24$$11, this_ptr, "hasserver", NULL, 378, &_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, 381, &authHeader, &_20$$11); + ZEPHIR_CALL_FUNCTION(&_25$$11, "stripos", NULL, 383, &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, 222, &_27$$12); + ZEPHIR_CALL_FUNCTION(&_28$$12, "base64_decode", NULL, 224, &_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", 1503); ZEPHIR_INIT_VAR(&_33$$17); ZEPHIR_CONCAT_VSV(&_33$$17, &_31$$17, ":", &_32$$17); - ZEPHIR_CALL_FUNCTION(&_34$$17, "base64_encode", NULL, 224, &_33$$17); + ZEPHIR_CALL_FUNCTION(&_34$$17, "base64_encode", NULL, 226, &_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", 1555); zephir_array_fetch(&_9$$5, &sizes, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1556); zephir_array_fetch(&_10$$5, &errors, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1557); - ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 383, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &_10$$5, &p); + ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 385, &_6$$5, &_7$$5, &_8$$5, &_9$$5, &_10$$5, &p); zephir_check_call_status(); zephir_is_iterable(&parentFiles, 0, "phalcon/Http/Request.zep", 1564); 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", 1555); zephir_array_fetch(&_19$$10, &sizes, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1556); zephir_array_fetch(&_20$$10, &errors, &idx, PH_NOISY | PH_READONLY, "phalcon/Http/Request.zep", 1557); - ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 383, &_16$$10, &_17$$10, &_18$$10, &_19$$10, &_20$$10, &p); + ZEPHIR_CALL_METHOD(&parentFiles, this_ptr, "smoothfiles", &_11, 385, &_16$$10, &_17$$10, &_18$$10, &_19$$10, &_20$$10, &p); zephir_check_call_status(); zephir_is_iterable(&parentFiles, 0, "phalcon/Http/Request.zep", 1564); 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 600ed68004..0a3f96ee90 100644 --- a/ext/phalcon/http/request/file.zep.c +++ b/ext/phalcon/http/request/file.zep.c @@ -174,11 +174,11 @@ 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, 136, &_0$$3); + ZEPHIR_CALL_FUNCTION(&_1$$3, "defined", NULL, 138, &_0$$3); zephir_check_call_status(); if (zephir_is_true(&_1$$3)) { ZVAL_LONG(&_2$$4, 4); - ZEPHIR_CALL_FUNCTION(&_3$$4, "pathinfo", NULL, 111, &name, &_2$$4); + ZEPHIR_CALL_FUNCTION(&_3$$4, "pathinfo", NULL, 113, &name, &_2$$4); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("extension"), &_3$$4); } @@ -239,15 +239,15 @@ PHP_METHOD(Phalcon_Http_Request_File, getRealType) ZEPHIR_MM_GROW(); ZVAL_LONG(&_0, 16); - ZEPHIR_CALL_FUNCTION(&finfo, "finfo_open", NULL, 389, &_0); + ZEPHIR_CALL_FUNCTION(&finfo, "finfo_open", NULL, 391, &_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, 390, &finfo, &_0); + ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 392, &finfo, &_0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 391, &finfo); + ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 393, &finfo); zephir_check_call_status(); RETURN_CCTOR(&mime); } @@ -352,7 +352,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, 362, &_0, &destination); + ZEPHIR_RETURN_CALL_FUNCTION("move_uploaded_file", NULL, 364, &_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 06076f360e..ce90648b31 100644 --- a/ext/phalcon/http/response.zep.c +++ b/ext/phalcon/http/response.zep.c @@ -516,7 +516,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, 307, location, &_1$$5); + ZEPHIR_CALL_FUNCTION(&_2$$5, "strstr", NULL, 309, location, &_1$$5); zephir_check_call_status(); _0$$5 = zephir_is_true(&_2$$5); } @@ -683,7 +683,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, 392, &file); + ZEPHIR_CALL_FUNCTION(NULL, "readfile", NULL, 394, &file); zephir_check_call_status(); } } @@ -1177,16 +1177,16 @@ PHP_METHOD(Phalcon_Http_Response, setFileToSend) ZEPHIR_INIT_VAR(&basePathEncoding); ZVAL_STRING(&basePathEncoding, "ASCII"); if (Z_TYPE_P(attachmentName) != IS_STRING) { - ZEPHIR_CALL_CE_STATIC(&basePath, phalcon_helper_fs_ce, "basename", &_0, 393, &filePath); + ZEPHIR_CALL_CE_STATIC(&basePath, phalcon_helper_fs_ce, "basename", &_0, 395, &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(&_1$$6, "mb_detect_order", NULL, 394); + ZEPHIR_CALL_FUNCTION(&_1$$6, "mb_detect_order", NULL, 396); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&basePathEncoding, "mb_detect_encoding", NULL, 258, &basePath, &_1$$6, &__$true); + ZEPHIR_CALL_FUNCTION(&basePathEncoding, "mb_detect_encoding", NULL, 260, &basePath, &_1$$6, &__$true); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_2$$5); @@ -1202,7 +1202,7 @@ PHP_METHOD(Phalcon_Http_Response, setFileToSend) ZEPHIR_CALL_METHOD(NULL, this_ptr, "setrawheader", NULL, 0, &_2$$5); zephir_check_call_status(); if (!ZEPHIR_IS_STRING(&basePathEncoding, "ASCII")) { - ZEPHIR_CALL_FUNCTION(&_3$$7, "rawurlencode", NULL, 261, &basePath); + ZEPHIR_CALL_FUNCTION(&_3$$7, "rawurlencode", NULL, 263, &basePath); zephir_check_call_status(); ZEPHIR_CPY_WRT(&basePath, &_3$$7); ZEPHIR_INIT_VAR(&_4$$7); @@ -1214,7 +1214,7 @@ PHP_METHOD(Phalcon_Http_Response, setFileToSend) } else { ZEPHIR_INIT_VAR(&_6$$8); ZVAL_STRING(&_6$$8, "\15\17\\\""); - ZEPHIR_CALL_FUNCTION(&_7$$8, "addcslashes", NULL, 206, &basePath, &_6$$8); + ZEPHIR_CALL_FUNCTION(&_7$$8, "addcslashes", NULL, 208, &basePath, &_6$$8); zephir_check_call_status(); ZEPHIR_CPY_WRT(&basePath, &_7$$8); ZEPHIR_INIT_VAR(&_8$$8); @@ -1397,7 +1397,7 @@ PHP_METHOD(Phalcon_Http_Response, setJsonContent) zephir_check_call_status(); ZVAL_LONG(&_3, jsonOptions); ZVAL_LONG(&_4, depth); - ZEPHIR_CALL_CE_STATIC(&_1, phalcon_helper_json_ce, "encode", &_2, 15, content, &_3, &_4); + ZEPHIR_CALL_CE_STATIC(&_1, phalcon_helper_json_ce, "encode", &_2, 16, content, &_3, &_4); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "setcontent", NULL, 0, &_1); zephir_check_call_status(); @@ -1564,7 +1564,7 @@ PHP_METHOD(Phalcon_Http_Response, setStatusCode) if (_5$$3) { ZEPHIR_INIT_NVAR(&_6$$3); ZVAL_STRING(&_6$$3, "HTTP/"); - ZEPHIR_CALL_FUNCTION(&_7$$3, "strstr", &_8, 307, &key, &_6$$3); + ZEPHIR_CALL_FUNCTION(&_7$$3, "strstr", &_8, 309, &key, &_6$$3); zephir_check_call_status(); _5$$3 = zephir_is_true(&_7$$3); } @@ -1590,7 +1590,7 @@ PHP_METHOD(Phalcon_Http_Response, setStatusCode) if (_10$$5) { ZEPHIR_INIT_NVAR(&_11$$5); ZVAL_STRING(&_11$$5, "HTTP/"); - ZEPHIR_CALL_FUNCTION(&_12$$5, "strstr", &_8, 307, &key, &_11$$5); + ZEPHIR_CALL_FUNCTION(&_12$$5, "strstr", &_8, 309, &key, &_11$$5); zephir_check_call_status(); _10$$5 = zephir_is_true(&_12$$5); } diff --git a/ext/phalcon/http/response/cookies.zep.c b/ext/phalcon/http/response/cookies.zep.c index e30306e43c..35de0475dd 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, 395); + ZEPHIR_CALL_FUNCTION(&_0, "headers_sent", NULL, 397); 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 ad4c8c8532..ea0e940291 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, 395); + ZEPHIR_CALL_FUNCTION(&_0, "headers_sent", NULL, 397); zephir_check_call_status(); _1 = ZEPHIR_IS_TRUE_IDENTICAL(&_0); if (!(_1)) { @@ -244,7 +244,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, 396, &_8$$5, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 398, &_8$$5, &__$true); zephir_check_call_status(); } else { _10$$6 = zephir_memnstr_str(&header, SL(":"), "phalcon/Http/Response/Headers.zep", 102); @@ -256,12 +256,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, 396, &header, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 398, &header, &__$true); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&_14$$8); ZEPHIR_CONCAT_VS(&_14$$8, &header, ": "); - ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 396, &_14$$8, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 398, &_14$$8, &__$true); zephir_check_call_status(); } } @@ -282,7 +282,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, 396, &_15$$10, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 398, &_15$$10, &__$true); zephir_check_call_status(); } else { _16$$11 = zephir_memnstr_str(&header, SL(":"), "phalcon/Http/Response/Headers.zep", 102); @@ -294,12 +294,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, 396, &header, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 398, &header, &__$true); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&_20$$13); ZEPHIR_CONCAT_VS(&_20$$13, &header, ": "); - ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 396, &_20$$13, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "header", &_9, 398, &_20$$13, &__$true); zephir_check_call_status(); } } diff --git a/ext/phalcon/image/adapter/abstractadapter.zep.c b/ext/phalcon/image/adapter/abstractadapter.zep.c index 11bf5ef6e8..087dfb3d67 100644 --- a/ext/phalcon/image/adapter/abstractadapter.zep.c +++ b/ext/phalcon/image/adapter/abstractadapter.zep.c @@ -231,11 +231,11 @@ PHP_METHOD(Phalcon_Image_Adapter_AbstractAdapter, background) zephir_get_strval(&color, &_8$$4); } ZVAL_LONG(&_9, 2); - ZEPHIR_CALL_FUNCTION(&_10, "str_split", NULL, 110, &color, &_9); + ZEPHIR_CALL_FUNCTION(&_10, "str_split", NULL, 112, &color, &_9); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_11); ZVAL_STRING(&_11, "hexdec"); - ZEPHIR_CALL_FUNCTION(&colors, "array_map", NULL, 103, &_11, &_10); + ZEPHIR_CALL_FUNCTION(&colors, "array_map", NULL, 105, &_11, &_10); zephir_check_call_status(); zephir_array_fetch_long(&_12, &colors, 0, PH_NOISY | PH_READONLY, "phalcon/Image/Adapter/AbstractAdapter.zep", 93); zephir_array_fetch_long(&_13, &colors, 1, PH_NOISY | PH_READONLY, "phalcon/Image/Adapter/AbstractAdapter.zep", 93); @@ -657,7 +657,7 @@ PHP_METHOD(Phalcon_Image_Adapter_AbstractAdapter, render) if (ZEPHIR_IS_EMPTY(&ext)) { zephir_read_property(&_0$$3, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); ZVAL_LONG(&_1$$3, 4); - ZEPHIR_CALL_FUNCTION(&_2$$3, "pathinfo", NULL, 111, &_0$$3, &_1$$3); + ZEPHIR_CALL_FUNCTION(&_2$$3, "pathinfo", NULL, 113, &_0$$3, &_1$$3); zephir_check_call_status(); zephir_cast_to_string(&_3$$3, &_2$$3); ZEPHIR_CPY_WRT(&ext, &_3$$3); @@ -864,14 +864,14 @@ PHP_METHOD(Phalcon_Image_Adapter_AbstractAdapter, resize) ZVAL_LONG(&_24, width); zephir_round(&_23, &_24, NULL, NULL); ZVAL_LONG(&_25, 1); - ZEPHIR_CALL_FUNCTION(&_26, "max", NULL, 112, &_23, &_25); + ZEPHIR_CALL_FUNCTION(&_26, "max", NULL, 114, &_23, &_25); zephir_check_call_status(); width = zephir_get_intval(&_26); ZEPHIR_INIT_VAR(&_27); ZVAL_LONG(&_25, height); zephir_round(&_27, &_25, NULL, NULL); ZVAL_LONG(&_28, 1); - ZEPHIR_CALL_FUNCTION(&_29, "max", NULL, 112, &_27, &_28); + ZEPHIR_CALL_FUNCTION(&_29, "max", NULL, 114, &_27, &_28); zephir_check_call_status(); height = zephir_get_intval(&_29); ZVAL_LONG(&_28, width); @@ -1124,11 +1124,11 @@ PHP_METHOD(Phalcon_Image_Adapter_AbstractAdapter, text) zephir_get_strval(&color, &_8$$7); } ZVAL_LONG(&_9, 2); - ZEPHIR_CALL_FUNCTION(&_10, "str_split", NULL, 110, &color, &_9); + ZEPHIR_CALL_FUNCTION(&_10, "str_split", NULL, 112, &color, &_9); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_11); ZVAL_STRING(&_11, "hexdec"); - ZEPHIR_CALL_FUNCTION(&colors, "array_map", NULL, 103, &_11, &_10); + ZEPHIR_CALL_FUNCTION(&colors, "array_map", NULL, 105, &_11, &_10); zephir_check_call_status(); zephir_array_fetch_long(&_12, &colors, 0, PH_NOISY | PH_READONLY, "phalcon/Image/Adapter/AbstractAdapter.zep", 449); zephir_array_fetch_long(&_13, &colors, 1, PH_NOISY | PH_READONLY, "phalcon/Image/Adapter/AbstractAdapter.zep", 450); diff --git a/ext/phalcon/image/adapter/gd.zep.c b/ext/phalcon/image/adapter/gd.zep.c index a3e0af1891..c5e42154a5 100644 --- a/ext/phalcon/image/adapter/gd.zep.c +++ b/ext/phalcon/image/adapter/gd.zep.c @@ -133,11 +133,11 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, __construct) zephir_read_property(&_1, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); if ((zephir_file_exists(&_1) == SUCCESS)) { zephir_read_property(&_2$$4, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_3$$4, "realpath", NULL, 95, &_2$$4); + ZEPHIR_CALL_FUNCTION(&_3$$4, "realpath", NULL, 97, &_2$$4); 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, 397, &_4$$4); + ZEPHIR_CALL_FUNCTION(&imageinfo, "getimagesize", NULL, 399, &_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, 398, &_10$$6); + ZEPHIR_CALL_FUNCTION(&_11$$6, "imagecreatefromgif", NULL, 400, &_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, 399, &_12$$7); + ZEPHIR_CALL_FUNCTION(&_13$$7, "imagecreatefromjpeg", NULL, 401, &_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, 400, &_14$$8); + ZEPHIR_CALL_FUNCTION(&_15$$8, "imagecreatefrompng", NULL, 402, &_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, 401, &_16$$9); + ZEPHIR_CALL_FUNCTION(&_17$$9, "imagecreatefromwbmp", NULL, 403, &_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, 402, &_18$$10); + ZEPHIR_CALL_FUNCTION(&_19$$10, "imagecreatefromxbm", NULL, 404, &_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, 403, &_24$$4, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 405, &_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, 404, &_29$$13, &_30$$13); + ZEPHIR_CALL_FUNCTION(&_31$$13, "imagecreatetruecolor", NULL, 406, &_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, 405, &_29$$13, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 407, &_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, 403, &_30$$13, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 405, &_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, 406, &image); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 408, &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, 136, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "defined", NULL, 138, &_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, 407); + ZEPHIR_CALL_FUNCTION(&info, "gd_info", NULL, 409); 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, 274, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 276, &_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, 408, &background, &_4, &_5, &_6, &_7); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 410, &background, &_4, &_5, &_6, &_7); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 405, &background, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 407, &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, 409, &background, &_4, &_7, &_8, &_9, &_10, &_5, &_6); + ZEPHIR_CALL_FUNCTION(&_11, "imagecopy", NULL, 411, &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, 406, &_12$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 408, &_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, 410, &_0$$3, &_1$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagefilter", &_2, 412, &_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, 404, &_0, &_1); + ZEPHIR_CALL_FUNCTION(&image, "imagecreatetruecolor", NULL, 406, &_0, &_1); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 405, &image, &__$false); + ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 407, &image, &__$false); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 403, &image, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 405, &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, 411, &_1, &rect); + ZEPHIR_CALL_FUNCTION(&image, "imagecrop", NULL, 413, &_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, 406, &_2); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 408, &_2); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &image); - ZEPHIR_CALL_FUNCTION(&_3, "imagesx", NULL, 412, &image); + ZEPHIR_CALL_FUNCTION(&_3, "imagesx", NULL, 414, &image); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("width"), &_3); - ZEPHIR_CALL_FUNCTION(&_4, "imagesy", NULL, 413, &image); + ZEPHIR_CALL_FUNCTION(&_4, "imagesy", NULL, 415, &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, 414, &_0$$3, &_1$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imageflip", NULL, 416, &_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, 414, &_2$$4, &_3$$4); + ZEPHIR_CALL_FUNCTION(NULL, "imageflip", NULL, 416, &_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, 415, &_0); + ZEPHIR_CALL_FUNCTION(&maskImage, "imagecreatefromstring", NULL, 417, &_0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "imagesx", NULL, 412, &maskImage); + ZEPHIR_CALL_FUNCTION(&_1, "imagesx", NULL, 414, &maskImage); zephir_check_call_status(); mask_width = zephir_get_intval(&_1); - ZEPHIR_CALL_FUNCTION(&_2, "imagesy", NULL, 413, &maskImage); + ZEPHIR_CALL_FUNCTION(&_2, "imagesy", NULL, 415, &maskImage); zephir_check_call_status(); mask_height = zephir_get_intval(&_2); alpha = 127; - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 403, &maskImage, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 405, &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, 403, &newimage, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 405, &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, 408, &newimage, &_5, &_6, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 410, &newimage, &_5, &_6, &_7, &_8); zephir_check_call_status(); ZVAL_LONG(&_5, 0); ZVAL_LONG(&_6, 0); - ZEPHIR_CALL_FUNCTION(NULL, "imagefill", NULL, 416, &newimage, &_5, &_6, &color); + ZEPHIR_CALL_FUNCTION(NULL, "imagefill", NULL, 418, &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, 404, &_10$$3, &_11$$3); + ZEPHIR_CALL_FUNCTION(&tempImage, "imagecreatetruecolor", NULL, 406, &_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, 417, &tempImage, &maskImage, &_14$$3, &_15$$3, &_16$$3, &_17$$3, &_12$$3, &_13$$3, &_18$$3, &_19$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopyresampled", NULL, 419, &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, 406, &maskImage); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 408, &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, 418, &maskImage, &_21$$5, &_22$$5); + ZEPHIR_CALL_FUNCTION(&index, "imagecolorat", &_23, 420, &maskImage, &_21$$5, &_22$$5); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&color, "imagecolorsforindex", &_24, 419, &maskImage, &index); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorsforindex", &_24, 421, &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, 418, &_21$$5, &_22$$5, &_27$$5); + ZEPHIR_CALL_FUNCTION(&index, "imagecolorat", &_23, 420, &_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, 419, &_22$$5, &index); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorsforindex", &_24, 421, &_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, 408, &newimage, &r, &g, &b, &_27$$5); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 410, &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, 420, &newimage, &_27$$5, &_28$$5, &color); + ZEPHIR_CALL_FUNCTION(NULL, "imagesetpixel", &_29, 422, &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, 406, &_8); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 408, &_8); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 406, &maskImage); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 408, &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, 418, &_5$$4, &_6$$4, &_7$$4); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorat", &_8, 420, &_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, 421, &_6$$4, &_7$$4, &_9$$4, &_10$$4, &_11$$4, &color); + ZEPHIR_CALL_FUNCTION(NULL, "imagefilledrectangle", &_12, 423, &_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, 274, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 276, &_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, 409, &reflection, &_4, &_7, &_8, &_9, &_10, &_5, &_6); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", NULL, 411, &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, 409, &line, &_18$$5, &_20$$5, &_21$$5, &_22$$5, &_23$$5, &_19$$5, &_24$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", NULL, 411, &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, 410, &line, &_20$$5, &_21$$5, &_22$$5, &_23$$5, &_24$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagefilter", &_25, 412, &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, 409, &reflection, &line, &_21$$5, &_22$$5, &_23$$5, &_24$$5, &_20$$5, &_26$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagecopy", NULL, 411, &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, 406, &_7); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 408, &_7); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &reflection); - ZEPHIR_CALL_FUNCTION(&_27, "imagesx", NULL, 412, &reflection); + ZEPHIR_CALL_FUNCTION(&_27, "imagesx", NULL, 414, &reflection); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("width"), &_27); - ZEPHIR_CALL_FUNCTION(&_28, "imagesy", NULL, 413, &reflection); + ZEPHIR_CALL_FUNCTION(&_28, "imagesy", NULL, 415, &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, 422); + ZEPHIR_CALL_FUNCTION(NULL, "ob_start", NULL, 424); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); ZVAL_STRING(&_1, "gif"); - ZEPHIR_CALL_FUNCTION(&_2, "strcmp", NULL, 423, &ext, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "strcmp", NULL, 425, &ext, &_1); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "jpg"); - ZEPHIR_CALL_FUNCTION(&_3, "strcmp", NULL, 423, &ext, &_1); + ZEPHIR_CALL_FUNCTION(&_3, "strcmp", NULL, 425, &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, 423, &ext, &_1); + ZEPHIR_CALL_FUNCTION(&_5, "strcmp", NULL, 425, &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, 423, &ext, &_1); + ZEPHIR_CALL_FUNCTION(&_6, "strcmp", NULL, 425, &ext, &_1); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "wbmp"); - ZEPHIR_CALL_FUNCTION(&_7, "strcmp", NULL, 423, &ext, &_1); + ZEPHIR_CALL_FUNCTION(&_7, "strcmp", NULL, 425, &ext, &_1); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "xbm"); - ZEPHIR_CALL_FUNCTION(&_8, "strcmp", NULL, 423, &ext, &_1); + ZEPHIR_CALL_FUNCTION(&_8, "strcmp", NULL, 425, &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, 424, &_9$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagegif", NULL, 426, &_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, 425, &_10$$4, &__$null, &_11$$4); + ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 427, &_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, 426, &_12$$5); + ZEPHIR_CALL_FUNCTION(NULL, "imagepng", NULL, 428, &_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, 427, &_13$$6); + ZEPHIR_CALL_FUNCTION(NULL, "imagewbmp", NULL, 429, &_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, 428, &_14$$7, &__$null); + ZEPHIR_CALL_FUNCTION(NULL, "imagexbm", NULL, 430, &_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, 429); + ZEPHIR_RETURN_CALL_FUNCTION("ob_get_clean", NULL, 431); 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, 430, &_0, &_1, &_2); + ZEPHIR_CALL_FUNCTION(&image, "imagescale", NULL, 432, &_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, 406, &_1); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 408, &_1); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &image); - ZEPHIR_CALL_FUNCTION(&_3, "imagesx", NULL, 412, &image); + ZEPHIR_CALL_FUNCTION(&_3, "imagesx", NULL, 414, &image); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("width"), &_3); - ZEPHIR_CALL_FUNCTION(&_4, "imagesy", NULL, 413, &image); + ZEPHIR_CALL_FUNCTION(&_4, "imagesy", NULL, 415, &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, 408, &_0, &_1, &_2, &_3, &_4); + ZEPHIR_CALL_FUNCTION(&transparent, "imagecolorallocatealpha", NULL, 410, &_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, 431, &_1, &_2, &transparent, &_3); + ZEPHIR_CALL_FUNCTION(&image, "imagerotate", NULL, 433, &_1, &_2, &transparent, &_3); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 403, &image, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 405, &image, &__$true); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&width, "imagesx", NULL, 412, &image); + ZEPHIR_CALL_FUNCTION(&width, "imagesx", NULL, 414, &image); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&height, "imagesy", NULL, 413, &image); + ZEPHIR_CALL_FUNCTION(&height, "imagesy", NULL, 415, &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, 432, &_2, &image, &_3, &_4, &_5, &_6, &width, &height, &_7); + ZEPHIR_CALL_FUNCTION(&_8, "imagecopymerge", NULL, 434, &_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, 406, &_9$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 408, &_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); @@ -1308,11 +1308,11 @@ PHP_METHOD(Phalcon_Image_Adapter_Gd, processSave) ZVAL_LONG(&_0, 4); - ZEPHIR_CALL_FUNCTION(&ext, "pathinfo", NULL, 111, &file, &_0); + ZEPHIR_CALL_FUNCTION(&ext, "pathinfo", NULL, 113, &file, &_0); 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, 433, &_1$$3, &__$false); + ZEPHIR_CALL_FUNCTION(&ext, "image_type_to_extension", NULL, 435, &_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, 423, &ext, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "strcmp", NULL, 425, &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, 434, &_4$$4); + ZEPHIR_CALL_FUNCTION(&_5$$4, "image_type_to_mime_type", NULL, 436, &_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, 424, &_6$$4, &file); + ZEPHIR_CALL_FUNCTION(NULL, "imagegif", NULL, 426, &_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, 423, &ext, &_2); + ZEPHIR_CALL_FUNCTION(&_7, "strcmp", NULL, 425, &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, 423, &ext, &_2); + ZEPHIR_CALL_FUNCTION(&_9, "strcmp", NULL, 425, &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, 434, &_10$$5); + ZEPHIR_CALL_FUNCTION(&_11$$5, "image_type_to_mime_type", NULL, 436, &_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, 425, &_12$$6, &file, &_13$$6); + ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 427, &_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, 425, &_14$$9, &file); + ZEPHIR_CALL_FUNCTION(NULL, "imagejpeg", NULL, 427, &_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, 423, &ext, &_2); + ZEPHIR_CALL_FUNCTION(&_15, "strcmp", NULL, 425, &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, 434, &_16$$10); + ZEPHIR_CALL_FUNCTION(&_17$$10, "image_type_to_mime_type", NULL, 436, &_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, 426, &_18$$10, &file); + ZEPHIR_CALL_FUNCTION(NULL, "imagepng", NULL, 428, &_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, 423, &ext, &_2); + ZEPHIR_CALL_FUNCTION(&_19, "strcmp", NULL, 425, &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, 434, &_20$$11); + ZEPHIR_CALL_FUNCTION(&_21$$11, "image_type_to_mime_type", NULL, 436, &_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, 427, &_22$$11, &file); + ZEPHIR_CALL_FUNCTION(NULL, "imagewbmp", NULL, 429, &_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, 423, &ext, &_2); + ZEPHIR_CALL_FUNCTION(&_23, "strcmp", NULL, 425, &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, 434, &_24$$12); + ZEPHIR_CALL_FUNCTION(&_25$$12, "image_type_to_mime_type", NULL, 436, &_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, 428, &_26$$12, &file); + ZEPHIR_CALL_FUNCTION(NULL, "imagexbm", NULL, 430, &_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, 274, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 276, &_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, 435, &_5, &matrix, &_6, &_7); + ZEPHIR_CALL_FUNCTION(&_8, "imageconvolution", NULL, 437, &_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, 412, &_9$$3); + ZEPHIR_CALL_FUNCTION(&_10$$3, "imagesx", NULL, 414, &_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, 413, &_11$$3); + ZEPHIR_CALL_FUNCTION(&_12$$3, "imagesy", NULL, 415, &_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, 274, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 276, &_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, 436, &_3$$3, &_4$$3, &fontfile, &text); + ZEPHIR_CALL_FUNCTION(&space, "imagettfbbox", NULL, 438, &_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, 274, &_3$$3); + ZEPHIR_CALL_FUNCTION(&_9$$3, "abs", NULL, 276, &_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, 274, &_3$$3); + ZEPHIR_CALL_FUNCTION(&_10$$3, "abs", NULL, 276, &_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, 408, &_3$$3, &_4$$3, &_13$$3, &_14$$3, &_15$$3); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 410, &_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, 437, &_4$$3, &_13$$3, &_14$$3, &_15$$3, &_16$$3, &color, &fontfile, &text); + ZEPHIR_CALL_FUNCTION(NULL, "imagettftext", NULL, 439, &_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, 438, &_17$$8); + ZEPHIR_CALL_FUNCTION(&_18$$8, "imagefontwidth", NULL, 440, &_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, 439, &_17$$8); + ZEPHIR_CALL_FUNCTION(&_19$$8, "imagefontheight", NULL, 441, &_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, 408, &_17$$8, &_22$$8, &_23$$8, &_24$$8, &_25$$8); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 410, &_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, 440, &_22$$8, &_23$$8, &_24$$8, &_25$$8, &text, &color); + ZEPHIR_CALL_FUNCTION(NULL, "imagestring", NULL, 442, &_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, 415, &_0); + ZEPHIR_CALL_FUNCTION(&overlay, "imagecreatefromstring", NULL, 417, &_0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 403, &overlay, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagesavealpha", NULL, 405, &overlay, &__$true); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "imagesx", NULL, 412, &overlay); + ZEPHIR_CALL_FUNCTION(&_1, "imagesx", NULL, 414, &overlay); zephir_check_call_status(); width = zephir_get_intval(&_1); - ZEPHIR_CALL_FUNCTION(&_2, "imagesy", NULL, 413, &overlay); + ZEPHIR_CALL_FUNCTION(&_2, "imagesy", NULL, 415, &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, 274, &_4$$3); + ZEPHIR_CALL_FUNCTION(&_5$$3, "abs", NULL, 276, &_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, 408, &overlay, &_4$$3, &_6$$3, &_7$$3, &_8$$3); + ZEPHIR_CALL_FUNCTION(&color, "imagecolorallocatealpha", NULL, 410, &overlay, &_4$$3, &_6$$3, &_7$$3, &_8$$3); zephir_check_call_status(); ZVAL_LONG(&_4$$3, 3); - ZEPHIR_CALL_FUNCTION(NULL, "imagelayereffect", NULL, 441, &overlay, &_4$$3); + ZEPHIR_CALL_FUNCTION(NULL, "imagelayereffect", NULL, 443, &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, 421, &overlay, &_4$$3, &_6$$3, &_7$$3, &_8$$3, &color); + ZEPHIR_CALL_FUNCTION(NULL, "imagefilledrectangle", NULL, 423, &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, 405, &_9, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 407, &_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, 409, &_10, &overlay, &_11, &_12, &_13, &_14, &_15, &_16); + ZEPHIR_CALL_FUNCTION(&_17, "imagecopy", NULL, 411, &_10, &overlay, &_11, &_12, &_13, &_14, &_15, &_16); zephir_check_call_status(); if (zephir_is_true(&_17)) { - ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 406, &overlay); + ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 408, &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 119f9d0cd0..46c08dcf77 100644 --- a/ext/phalcon/image/adapter/imagick.zep.c +++ b/ext/phalcon/image/adapter/imagick.zep.c @@ -160,7 +160,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, __construct) zephir_read_property(&_2, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); if ((zephir_file_exists(&_2) == SUCCESS)) { zephir_read_property(&_3$$4, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_FUNCTION(&_4$$4, "realpath", NULL, 95, &_3$$4); + ZEPHIR_CALL_FUNCTION(&_4$$4, "realpath", NULL, 97, &_3$$4); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("realpath"), &_4$$4); zephir_read_property(&_5$$4, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); @@ -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, 137, &_14$$6); + ZEPHIR_CALL_FUNCTION(&_15$$6, "constant", NULL, 139, &_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, 136, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "defined", NULL, 138, &_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, 137, &_4$$5); + ZEPHIR_CALL_FUNCTION(&_5$$5, "constant", NULL, 139, &_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, 135, &_0, &_1, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 137, &_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, 137, &_9$$4); + ZEPHIR_CALL_FUNCTION(&_10$$4, "constant", &_11, 139, &_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, 137, &_14$$3); + ZEPHIR_CALL_FUNCTION(&_15$$3, "constant", &_11, 139, &_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, 137, &_14$$3); + ZEPHIR_CALL_FUNCTION(&_16$$3, "constant", &_11, 139, &_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, 137, &_14$$3); + ZEPHIR_CALL_FUNCTION(&_22$$3, "constant", &_11, 139, &_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, 137, &_5$$3); + ZEPHIR_CALL_FUNCTION(&_6$$3, "constant", &_7, 139, &_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, 137, &_19$$7); + ZEPHIR_CALL_FUNCTION(&_20$$7, "constant", &_21, 139, &_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, 137, &_19$$7); + ZEPHIR_CALL_FUNCTION(&_25$$7, "constant", &_21, 139, &_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, 137, &_19$$7); + ZEPHIR_CALL_FUNCTION(&_26$$7, "constant", &_21, 139, &_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, 137, &_36$$10); + ZEPHIR_CALL_FUNCTION(&_37$$10, "constant", &_21, 139, &_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, 137, &_36$$10); + ZEPHIR_CALL_FUNCTION(&_45$$10, "constant", &_21, 139, &_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, 137, &_50$$13); + ZEPHIR_CALL_FUNCTION(&_51$$13, "constant", &_21, 139, &_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, 137, &_10$$5); + ZEPHIR_CALL_FUNCTION(&_11$$5, "constant", NULL, 139, &_10$$5); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &image, "setimagecompression", NULL, 0, &_11$$5); zephir_check_call_status(); @@ -1494,7 +1494,7 @@ PHP_METHOD(Phalcon_Image_Adapter_Imagick, processSave) ZVAL_LONG(&_0, 4); - ZEPHIR_CALL_FUNCTION(&ext, "pathinfo", NULL, 111, &file, &_0); + ZEPHIR_CALL_FUNCTION(&ext, "pathinfo", NULL, 113, &file, &_0); zephir_check_call_status(); zephir_read_property(&_0, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CALL_METHOD(NULL, &_0, "setformat", NULL, 0, &ext); @@ -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, 137, &_16$$4); + ZEPHIR_CALL_FUNCTION(&_17$$4, "constant", NULL, 139, &_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, 135, &_0, &_1, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&color, "sprintf", NULL, 137, &_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, 137, &_6$$7); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 139, &_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, 137, &_7$$11); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 139, &_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, 137, &_8$$12); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 139, &_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, 137, &_9$$14); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 139, &_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, 137, &_10$$15); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 139, &_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, 137, &_11$$21); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 139, &_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, 137, &_12$$22); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 139, &_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, 137, &_13$$24); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 139, &_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, 137, &_14$$25); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 139, &_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, 137, &_15$$29); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 139, &_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, 137, &_16$$30); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 139, &_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, 137, &_17$$32); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 139, &_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, 137, &_18$$33); + ZEPHIR_CALL_FUNCTION(&gravity, "constant", NULL, 139, &_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, 137, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "constant", NULL, 139, &_1); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_1); ZVAL_STRING(&_1, "Imagick::CHANNEL_ALPHA"); - ZEPHIR_CALL_FUNCTION(&_3, "constant", NULL, 137, &_1); + ZEPHIR_CALL_FUNCTION(&_3, "constant", NULL, 139, &_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, 137, &_7$$3); + ZEPHIR_CALL_FUNCTION(&_8$$3, "constant", NULL, 139, &_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 eef91f1cbf..55d3bc4845 100644 --- a/ext/phalcon/image/imagefactory.zep.c +++ b/ext/phalcon/image/imagefactory.zep.c @@ -88,9 +88,9 @@ PHP_METHOD(Phalcon_Image_ImageFactory, __construct) PHP_METHOD(Phalcon_Image_ImageFactory, load) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zephir_fcall_cache_entry *_1 = NULL; + zephir_fcall_cache_entry *_2 = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *config = NULL, config_sub, height, file, name, width, _0, _2, _3; + zval *config = NULL, config_sub, height, file, name, width, _0, _1, _3; zval *this_ptr = getThis(); ZVAL_UNDEF(&config_sub); @@ -99,7 +99,7 @@ PHP_METHOD(Phalcon_Image_ImageFactory, load) ZVAL_UNDEF(&name); ZVAL_UNDEF(&width); ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_1); ZVAL_UNDEF(&_3); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; @@ -117,26 +117,32 @@ PHP_METHOD(Phalcon_Image_ImageFactory, load) ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkconfig", NULL, 0, config); zephir_check_call_status(); ZEPHIR_CPY_WRT(config, &_0); - if (UNEXPECTED(!(zephir_array_isset_string(config, SL("file"))))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_image_exception_ce, "You must provide 'file' option in factory config parameter.", "phalcon/Image/ImageFactory.zep", 49); - return; - } + ZEPHIR_INIT_VAR(&_1); + ZVAL_STRING(&_1, "adapter"); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkconfigelement", NULL, 0, config, &_1); + zephir_check_call_status(); + ZEPHIR_CPY_WRT(config, &_0); + ZEPHIR_INIT_NVAR(&_1); + ZVAL_STRING(&_1, "file"); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkconfigelement", NULL, 0, config, &_1); + zephir_check_call_status(); + ZEPHIR_CPY_WRT(config, &_0); ZEPHIR_OBS_VAR(&name); - zephir_array_fetch_string(&name, config, SL("adapter"), PH_NOISY, "phalcon/Image/ImageFactory.zep", 52); + zephir_array_fetch_string(&name, config, SL("adapter"), PH_NOISY, "phalcon/Image/ImageFactory.zep", 48); zephir_array_unset_string(config, SL("adapter"), PH_SEPARATE); - ZEPHIR_INIT_VAR(&_2); - ZVAL_STRING(&_2, "file"); - ZEPHIR_CALL_CE_STATIC(&file, phalcon_helper_arr_ce, "get", &_1, 81, config, &_2); + ZEPHIR_INIT_NVAR(&_1); + ZVAL_STRING(&_1, "file"); + ZEPHIR_CALL_CE_STATIC(&file, phalcon_helper_arr_ce, "get", &_2, 81, config, &_1); zephir_check_call_status(); - ZEPHIR_INIT_NVAR(&_2); - ZVAL_STRING(&_2, "height"); + ZEPHIR_INIT_NVAR(&_1); + ZVAL_STRING(&_1, "height"); ZVAL_NULL(&_3); - ZEPHIR_CALL_CE_STATIC(&height, phalcon_helper_arr_ce, "get", &_1, 81, config, &_2, &_3); + ZEPHIR_CALL_CE_STATIC(&height, phalcon_helper_arr_ce, "get", &_2, 81, config, &_1, &_3); zephir_check_call_status(); - ZEPHIR_INIT_NVAR(&_2); - ZVAL_STRING(&_2, "width"); + ZEPHIR_INIT_NVAR(&_1); + ZVAL_STRING(&_1, "width"); ZVAL_NULL(&_3); - ZEPHIR_CALL_CE_STATIC(&width, phalcon_helper_arr_ce, "get", &_1, 81, config, &_2, &_3); + ZEPHIR_CALL_CE_STATIC(&width, phalcon_helper_arr_ce, "get", &_2, 81, config, &_1, &_3); 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/loader.zep.c b/ext/phalcon/loader.zep.c index ab65128c1a..367c0ad24b 100644 --- a/ext/phalcon/loader.zep.c +++ b/ext/phalcon/loader.zep.c @@ -306,7 +306,7 @@ PHP_METHOD(Phalcon_Loader, autoLoad) ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", &_16, 0, &_15$$11, this_ptr); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_17$$10, "call_user_func", &_18, 289, &fileCheckingCallback, &filePath); + ZEPHIR_CALL_FUNCTION(&_17$$10, "call_user_func", &_18, 291, &fileCheckingCallback, &filePath); zephir_check_call_status(); if (zephir_is_true(&_17$$10)) { if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { @@ -342,7 +342,7 @@ PHP_METHOD(Phalcon_Loader, autoLoad) ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", &_22, 0, &_21$$15, this_ptr); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_23$$14, "call_user_func", &_18, 289, &fileCheckingCallback, &filePath); + ZEPHIR_CALL_FUNCTION(&_23$$14, "call_user_func", &_18, 291, &fileCheckingCallback, &filePath); zephir_check_call_status(); if (zephir_is_true(&_23$$14)) { if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { @@ -393,7 +393,7 @@ PHP_METHOD(Phalcon_Loader, autoLoad) ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", &_30, 0, &_29$$20, this_ptr); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_31$$19, "call_user_func", &_18, 289, &fileCheckingCallback, &filePath); + ZEPHIR_CALL_FUNCTION(&_31$$19, "call_user_func", &_18, 291, &fileCheckingCallback, &filePath); zephir_check_call_status(); if (zephir_is_true(&_31$$19)) { if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { @@ -429,7 +429,7 @@ PHP_METHOD(Phalcon_Loader, autoLoad) ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", &_35, 0, &_34$$24, this_ptr); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_36$$23, "call_user_func", &_18, 289, &fileCheckingCallback, &filePath); + ZEPHIR_CALL_FUNCTION(&_36$$23, "call_user_func", &_18, 291, &fileCheckingCallback, &filePath); zephir_check_call_status(); if (zephir_is_true(&_36$$23)) { if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { @@ -507,7 +507,7 @@ PHP_METHOD(Phalcon_Loader, autoLoad) ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", &_48, 0, &_47$$32, this_ptr); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_49$$31, "call_user_func", &_18, 289, &fileCheckingCallback, &filePath); + ZEPHIR_CALL_FUNCTION(&_49$$31, "call_user_func", &_18, 291, &fileCheckingCallback, &filePath); zephir_check_call_status(); if (zephir_is_true(&_49$$31)) { if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { @@ -543,7 +543,7 @@ PHP_METHOD(Phalcon_Loader, autoLoad) ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", &_53, 0, &_52$$36, this_ptr); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_54$$35, "call_user_func", &_18, 289, &fileCheckingCallback, &filePath); + ZEPHIR_CALL_FUNCTION(&_54$$35, "call_user_func", &_18, 291, &fileCheckingCallback, &filePath); zephir_check_call_status(); if (zephir_is_true(&_54$$35)) { if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { @@ -594,7 +594,7 @@ PHP_METHOD(Phalcon_Loader, autoLoad) ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", &_61, 0, &_60$$41, this_ptr); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_62$$40, "call_user_func", &_18, 289, &fileCheckingCallback, &filePath); + ZEPHIR_CALL_FUNCTION(&_62$$40, "call_user_func", &_18, 291, &fileCheckingCallback, &filePath); zephir_check_call_status(); if (zephir_is_true(&_62$$40)) { if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { @@ -630,7 +630,7 @@ PHP_METHOD(Phalcon_Loader, autoLoad) ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", &_66, 0, &_65$$45, this_ptr); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_67$$44, "call_user_func", &_18, 289, &fileCheckingCallback, &filePath); + ZEPHIR_CALL_FUNCTION(&_67$$44, "call_user_func", &_18, 291, &fileCheckingCallback, &filePath); zephir_check_call_status(); if (zephir_is_true(&_67$$44)) { if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { @@ -690,7 +690,7 @@ PHP_METHOD(Phalcon_Loader, autoLoad) ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", &_76, 0, &_75$$50, this_ptr, &filePath); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_77$$49, "call_user_func", &_18, 289, &fileCheckingCallback, &filePath); + ZEPHIR_CALL_FUNCTION(&_77$$49, "call_user_func", &_18, 291, &fileCheckingCallback, &filePath); zephir_check_call_status(); if (zephir_is_true(&_77$$49)) { if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { @@ -726,7 +726,7 @@ PHP_METHOD(Phalcon_Loader, autoLoad) ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", &_81, 0, &_80$$54, this_ptr, &filePath); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_82$$53, "call_user_func", &_18, 289, &fileCheckingCallback, &filePath); + ZEPHIR_CALL_FUNCTION(&_82$$53, "call_user_func", &_18, 291, &fileCheckingCallback, &filePath); zephir_check_call_status(); if (zephir_is_true(&_82$$53)) { if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { @@ -777,7 +777,7 @@ PHP_METHOD(Phalcon_Loader, autoLoad) ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", &_89, 0, &_88$$59, this_ptr, &filePath); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_90$$58, "call_user_func", &_18, 289, &fileCheckingCallback, &filePath); + ZEPHIR_CALL_FUNCTION(&_90$$58, "call_user_func", &_18, 291, &fileCheckingCallback, &filePath); zephir_check_call_status(); if (zephir_is_true(&_90$$58)) { if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { @@ -813,7 +813,7 @@ PHP_METHOD(Phalcon_Loader, autoLoad) ZEPHIR_CALL_METHOD(NULL, &eventsManager, "fire", &_94, 0, &_93$$63, this_ptr, &filePath); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_95$$62, "call_user_func", &_18, 289, &fileCheckingCallback, &filePath); + ZEPHIR_CALL_FUNCTION(&_95$$62, "call_user_func", &_18, 291, &fileCheckingCallback, &filePath); zephir_check_call_status(); if (zephir_is_true(&_95$$62)) { if (Z_TYPE_P(&eventsManager) == IS_OBJECT) { @@ -995,7 +995,7 @@ PHP_METHOD(Phalcon_Loader, loadFiles) ZEPHIR_CALL_METHOD(NULL, &_4$$4, "fire", NULL, 0, &_5$$4, this_ptr, &filePath); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_6$$3, "call_user_func", &_7, 289, &fileCheckingCallback, &filePath); + ZEPHIR_CALL_FUNCTION(&_6$$3, "call_user_func", &_7, 291, &fileCheckingCallback, &filePath); zephir_check_call_status(); if (zephir_is_true(&_6$$3)) { ZEPHIR_OBS_NVAR(&_8$$5); @@ -1034,7 +1034,7 @@ PHP_METHOD(Phalcon_Loader, loadFiles) ZEPHIR_CALL_METHOD(NULL, &_12$$8, "fire", NULL, 0, &_13$$8, this_ptr, &filePath); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_14$$7, "call_user_func", &_7, 289, &fileCheckingCallback, &filePath); + ZEPHIR_CALL_FUNCTION(&_14$$7, "call_user_func", &_7, 291, &fileCheckingCallback, &filePath); zephir_check_call_status(); if (zephir_is_true(&_14$$7)) { ZEPHIR_OBS_NVAR(&_15$$9); @@ -1106,7 +1106,7 @@ PHP_METHOD(Phalcon_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, 442, &_1$$3, &__$true, &_3$$3); + ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_register", NULL, 444, &_1$$3, &__$true, &_3$$3); zephir_check_call_status(); if (1) { zephir_update_property_zval(this_ptr, ZEND_STRL("registered"), &__$true); @@ -1500,7 +1500,7 @@ PHP_METHOD(Phalcon_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, 443, &_1$$3); + ZEPHIR_CALL_FUNCTION(NULL, "spl_autoload_unregister", NULL, 445, &_1$$3); zephir_check_call_status(); if (0) { zephir_update_property_zval(this_ptr, ZEND_STRL("registered"), &__$true); diff --git a/ext/phalcon/logger/adapter/abstractadapter.zep.c b/ext/phalcon/logger/adapter/abstractadapter.zep.c index c5fcae0639..be2f06a854 100644 --- a/ext/phalcon/logger/adapter/abstractadapter.zep.c +++ b/ext/phalcon/logger/adapter/abstractadapter.zep.c @@ -28,6 +28,14 @@ * For the full copyright and license information, please view the LICENSE.txt * file that was distributed with this source code. */ +/** + * Class AbstractAdapter + * + * @property string $defaultFormatter + * @property FormatterInterface $formatter + * @property bool $inTransaction + * @property array $queue + */ ZEPHIR_INIT_CLASS(Phalcon_Logger_Adapter_AbstractAdapter) { ZEPHIR_REGISTER_CLASS(Phalcon\\Logger\\Adapter, AbstractAdapter, phalcon, logger_adapter_abstractadapter, phalcon_logger_adapter_abstractadapter_method_entry, ZEND_ACC_EXPLICIT_ABSTRACT_CLASS); @@ -37,11 +45,11 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Adapter_AbstractAdapter) * * @var string */ - zend_declare_property_string(phalcon_logger_adapter_abstractadapter_ce, SL("defaultFormatter"), "Line", ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_logger_adapter_abstractadapter_ce, SL("defaultFormatter"), "Phalcon\\Logger\\Formatter\\Line", ZEND_ACC_PROTECTED); /** * Formatter * - * @var FormatterInterface + * @var FormatterInterface|null */ zend_declare_property_null(phalcon_logger_adapter_abstractadapter_ce, SL("formatter"), ZEND_ACC_PROTECTED); /** @@ -64,6 +72,8 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Adapter_AbstractAdapter) /** * Destructor cleanup + * + * @throws Exception */ PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, __destruct) { @@ -79,7 +89,7 @@ PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, __destruct) zephir_read_property(&_0, this_ptr, ZEND_STRL("inTransaction"), PH_NOISY_CC | PH_READONLY); if (zephir_is_true(&_0)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_logger_exception_ce, "There is an active transaction", "phalcon/Logger/Adapter/AbstractAdapter.zep", 54); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_logger_exception_ce, "There is an active transaction", "phalcon/Logger/Adapter/AbstractAdapter.zep", 64); return; } ZEPHIR_CALL_METHOD(NULL, this_ptr, "close", NULL, 0); @@ -96,7 +106,7 @@ PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, __serialize) - ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_logger_exception_ce, "This object cannot be serialized", "phalcon/Logger/Adapter/AbstractAdapter.zep", 65); + ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_logger_exception_ce, "This object cannot be serialized", "phalcon/Logger/Adapter/AbstractAdapter.zep", 75); return; } @@ -124,12 +134,16 @@ PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, __unserialize) zephir_get_arrval(&data, data_param); - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_logger_exception_ce, "This object cannot be unserialized", "phalcon/Logger/Adapter/AbstractAdapter.zep", 73); + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_logger_exception_ce, "This object cannot be unserialized", "phalcon/Logger/Adapter/AbstractAdapter.zep", 83); return; } /** * Adds a message to the queue + * + * @param Item $item + * + * @return AdapterInterface */ PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, add) { @@ -175,34 +189,31 @@ PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, begin) /** * Commits the internal transaction + * + * @return AdapterInterface + * @throws Exception */ PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, commit) { - zval inTransaction, item, queue, _0, *_1, _2, _4; + zval item, queue, _0, *_1, _2; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zephir_fcall_cache_entry *_3 = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zval *this_ptr = getThis(); - ZVAL_UNDEF(&inTransaction); ZVAL_UNDEF(&item); ZVAL_UNDEF(&queue); ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_4); ZEPHIR_MM_GROW(); - zephir_read_property(&_0, this_ptr, ZEND_STRL("inTransaction"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CPY_WRT(&inTransaction, &_0); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checktransaction", NULL, 95); + zephir_check_call_status(); zephir_read_property(&_0, this_ptr, ZEND_STRL("queue"), PH_NOISY_CC | PH_READONLY); ZEPHIR_CPY_WRT(&queue, &_0); - if (!(zephir_is_true(&inTransaction))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_logger_exception_ce, "There is no active transaction", "phalcon/Logger/Adapter/AbstractAdapter.zep", 107); - return; - } - zephir_is_iterable(&queue, 0, "phalcon/Logger/Adapter/AbstractAdapter.zep", 118); + zephir_is_iterable(&queue, 0, "phalcon/Logger/Adapter/AbstractAdapter.zep", 132); if (Z_TYPE_P(&queue) == IS_ARRAY) { ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&queue), _1) { @@ -229,28 +240,24 @@ PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, commit) } } ZEPHIR_INIT_NVAR(&item); - ZEPHIR_INIT_NVAR(&inTransaction); - ZVAL_BOOL(&inTransaction, 0); - ZEPHIR_INIT_VAR(&_4); - array_init(&_4); - zephir_update_property_zval(this_ptr, ZEND_STRL("queue"), &_4); - zephir_update_property_zval(this_ptr, ZEND_STRL("inTransaction"), &inTransaction); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "resettransaction", NULL, 96); + zephir_check_call_status(); RETURN_THIS(); } +/** + * @return FormatterInterface + */ PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, getFormatter) { - zval _0, _1$$3, _2$$3, _3$$3; - zval className; + zval _0, _1$$3, _2$$3; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zval *this_ptr = getThis(); - ZVAL_UNDEF(&className); ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1$$3); ZVAL_UNDEF(&_2$$3); - ZVAL_UNDEF(&_3$$3); ZEPHIR_MM_GROW(); @@ -258,20 +265,18 @@ PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, getFormatter) ZEPHIR_OBS_VAR(&_0); zephir_read_property(&_0, this_ptr, ZEND_STRL("formatter"), PH_NOISY_CC); if (Z_TYPE_P(&_0) != IS_OBJECT) { - zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("defaultFormatter"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_INIT_VAR(&_2$$3); - ZEPHIR_CONCAT_SV(&_2$$3, "Phalcon\\Logger\\Formatter\\", &_1$$3); - zephir_get_strval(&className, &_2$$3); - ZEPHIR_INIT_VAR(&_3$$3); - ZEPHIR_LAST_CALL_STATUS = zephir_create_instance(&_3$$3, &className); + ZEPHIR_INIT_VAR(&_1$$3); + zephir_read_property(&_2$$3, this_ptr, ZEND_STRL("defaultFormatter"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_LAST_CALL_STATUS = zephir_create_instance(&_1$$3, &_2$$3); zephir_check_call_status(); - zephir_update_property_zval(this_ptr, ZEND_STRL("formatter"), &_3$$3); + zephir_update_property_zval(this_ptr, ZEND_STRL("formatter"), &_1$$3); } RETURN_MM_MEMBER(getThis(), "formatter"); } /** - * Returns the whether the logger is currently in an active transaction or not + * Returns the whether the logger is currently in an active transaction or + * not */ PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, inTransaction) { @@ -284,6 +289,8 @@ PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, inTransaction) /** * Processes the message in the adapter + * + * @param Item $item */ PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, process) { @@ -291,37 +298,33 @@ PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, process) /** * Rollbacks the internal transaction + * + * @return AdapterInterface + * @throws Exception */ PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, rollback) { - zval inTransaction, _0, _1; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; zval *this_ptr = getThis(); - ZVAL_UNDEF(&inTransaction); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); ZEPHIR_MM_GROW(); - zephir_read_property(&_0, this_ptr, ZEND_STRL("inTransaction"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CPY_WRT(&inTransaction, &_0); - if (!(zephir_is_true(&inTransaction))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_logger_exception_ce, "There is no active transaction", "phalcon/Logger/Adapter/AbstractAdapter.zep", 161); - return; - } - ZEPHIR_INIT_VAR(&_1); - array_init(&_1); - zephir_update_property_zval(this_ptr, ZEND_STRL("queue"), &_1); - ZEPHIR_INIT_NVAR(&inTransaction); - ZVAL_BOOL(&inTransaction, 0); - zephir_update_property_zval(this_ptr, ZEND_STRL("inTransaction"), &inTransaction); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "checktransaction", NULL, 95); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "resettransaction", NULL, 96); + zephir_check_call_status(); RETURN_THIS(); } /** * Sets the message formatter + * + * @param FormatterInterface $formatter + * + * @return AdapterInterface */ PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, setFormatter) { @@ -380,6 +383,54 @@ PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, getFormattedItem) RETURN_MM(); } +/** + * Checks if the transaction is active + * + * @throws Exception + */ +PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, checkTransaction) +{ + zval _0; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&_0); + + + + zephir_read_property(&_0, this_ptr, ZEND_STRL("inTransaction"), PH_NOISY_CC | PH_READONLY); + if (!ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(phalcon_logger_exception_ce, "There is no active transaction", "phalcon/Logger/Adapter/AbstractAdapter.zep", 213); + return; + } +} + +/** + * Resets the transaction flag and queue array + */ +PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, resetTransaction) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval __$true, __$false, _0; + zval *this_ptr = getThis(); + + ZVAL_BOOL(&__$true, 1); + ZVAL_BOOL(&__$false, 0); + ZVAL_UNDEF(&_0); + + + ZEPHIR_MM_GROW(); + + ZEPHIR_INIT_VAR(&_0); + array_init(&_0); + zephir_update_property_zval(this_ptr, ZEND_STRL("queue"), &_0); + if (0) { + zephir_update_property_zval(this_ptr, ZEND_STRL("inTransaction"), &__$true); + } else { + zephir_update_property_zval(this_ptr, ZEND_STRL("inTransaction"), &__$false); + } + ZEPHIR_MM_RESTORE(); +} + zend_object *zephir_init_properties_Phalcon_Logger_Adapter_AbstractAdapter(zend_class_entry *class_type) { zval _0, _1$$3; diff --git a/ext/phalcon/logger/adapter/abstractadapter.zep.h b/ext/phalcon/logger/adapter/abstractadapter.zep.h index e6ea65b434..5527815ee5 100644 --- a/ext/phalcon/logger/adapter/abstractadapter.zep.h +++ b/ext/phalcon/logger/adapter/abstractadapter.zep.h @@ -15,6 +15,8 @@ PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, process); PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, rollback); PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, setFormatter); PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, getFormattedItem); +PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, checkTransaction); +PHP_METHOD(Phalcon_Logger_Adapter_AbstractAdapter, resetTransaction); zend_object *zephir_init_properties_Phalcon_Logger_Adapter_AbstractAdapter(zend_class_entry *class_type); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_adapter_abstractadapter___destruct, 0, 0, 0) @@ -60,6 +62,12 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_adapter_abstracta ZEND_ARG_OBJ_INFO(0, item, Phalcon\\Logger\\Item, 0) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_adapter_abstractadapter_checktransaction, 0, 0, IS_VOID, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_adapter_abstractadapter_resettransaction, 0, 0, IS_VOID, 0) +ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_adapter_abstractadapter_zephir_init_properties_phalcon_logger_adapter_abstractadapter, 0, 0, 0) ZEND_END_ARG_INFO() @@ -80,5 +88,7 @@ ZEPHIR_INIT_FUNCS(phalcon_logger_adapter_abstractadapter_method_entry) { PHP_ME(Phalcon_Logger_Adapter_AbstractAdapter, rollback, arginfo_phalcon_logger_adapter_abstractadapter_rollback, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Logger_Adapter_AbstractAdapter, setFormatter, arginfo_phalcon_logger_adapter_abstractadapter_setformatter, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Logger_Adapter_AbstractAdapter, getFormattedItem, arginfo_phalcon_logger_adapter_abstractadapter_getformatteditem, ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Logger_Adapter_AbstractAdapter, checkTransaction, arginfo_phalcon_logger_adapter_abstractadapter_checktransaction, ZEND_ACC_PRIVATE) + PHP_ME(Phalcon_Logger_Adapter_AbstractAdapter, resetTransaction, arginfo_phalcon_logger_adapter_abstractadapter_resettransaction, ZEND_ACC_PRIVATE) PHP_FE_END }; diff --git a/ext/phalcon/logger/adapter/adapterinterface.zep.c b/ext/phalcon/logger/adapter/adapterinterface.zep.c index 50d53b28a7..25e0ec4972 100644 --- a/ext/phalcon/logger/adapter/adapterinterface.zep.c +++ b/ext/phalcon/logger/adapter/adapterinterface.zep.c @@ -34,22 +34,34 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Adapter_AdapterInterface) /** * Adds a message in the queue + * + * @param Item $item + * + * @return AdapterInterface */ ZEPHIR_DOC_METHOD(Phalcon_Logger_Adapter_AdapterInterface, add); /** * Starts a transaction + * + * @return AdapterInterface */ ZEPHIR_DOC_METHOD(Phalcon_Logger_Adapter_AdapterInterface, begin); /** * Closes the logger + * + * @return bool */ ZEPHIR_DOC_METHOD(Phalcon_Logger_Adapter_AdapterInterface, close); /** * Commits the internal transaction + * + * @return AdapterInterface */ ZEPHIR_DOC_METHOD(Phalcon_Logger_Adapter_AdapterInterface, commit); /** * Returns the internal formatter + * + * @return FormatterInterface */ ZEPHIR_DOC_METHOD(Phalcon_Logger_Adapter_AdapterInterface, getFormatter); /** @@ -61,13 +73,21 @@ ZEPHIR_DOC_METHOD(Phalcon_Logger_Adapter_AdapterInterface, getFormatter); ZEPHIR_DOC_METHOD(Phalcon_Logger_Adapter_AdapterInterface, inTransaction); /** * Processes the message in the adapter + * + * @param Item $item */ ZEPHIR_DOC_METHOD(Phalcon_Logger_Adapter_AdapterInterface, process); /** * Rollbacks the internal transaction + * + * @return AdapterInterface */ ZEPHIR_DOC_METHOD(Phalcon_Logger_Adapter_AdapterInterface, rollback); /** * Sets the message formatter + * + * @param FormatterInterface $formatter + * + * @return AdapterInterface */ ZEPHIR_DOC_METHOD(Phalcon_Logger_Adapter_AdapterInterface, setFormatter); diff --git a/ext/phalcon/logger/adapter/noop.zep.c b/ext/phalcon/logger/adapter/noop.zep.c index cfe5b6c3af..a431439e89 100644 --- a/ext/phalcon/logger/adapter/noop.zep.c +++ b/ext/phalcon/logger/adapter/noop.zep.c @@ -25,18 +25,9 @@ * file that was distributed with this source code. */ /** - * Phalcon\Logger\Adapter\Noop + * Class Noop * - * Adapter to store logs in plain text files - * - *```php - * $logger = new \Phalcon\Logger\Adapter\Noop(); - * - * $logger->log(\Phalcon\Logger::ERROR, "This is an error"); - * $logger->error("This is another error"); - * - * $logger->close(); - *``` + * @package Phalcon\Logger\Adapter */ ZEPHIR_INIT_CLASS(Phalcon_Logger_Adapter_Noop) { @@ -59,6 +50,8 @@ PHP_METHOD(Phalcon_Logger_Adapter_Noop, close) /** * Processes the message i.e. writes it to the file + * + * @param Item $item */ PHP_METHOD(Phalcon_Logger_Adapter_Noop, process) { diff --git a/ext/phalcon/logger/adapter/stream.zep.c b/ext/phalcon/logger/adapter/stream.zep.c index 0ad4198210..d31edbc3e1 100644 --- a/ext/phalcon/logger/adapter/stream.zep.c +++ b/ext/phalcon/logger/adapter/stream.zep.c @@ -18,9 +18,9 @@ #include "kernel/string.h" #include "kernel/exception.h" #include "kernel/operators.h" -#include "ext/spl/spl_exceptions.h" #include "kernel/file.h" #include "kernel/fcall.h" +#include "ext/spl/spl_exceptions.h" /** @@ -37,14 +37,19 @@ * Adapter to store logs in plain text files * *```php - * $logger = new \Phalcon\Logger\Adapter\Stream("app/logs/test.log"); + * $logger = new \Phalcon\Logger\Adapter\Stream('app/logs/test.log'); * - * $logger->log("This is a message"); - * $logger->log(\Phalcon\Logger::ERROR, "This is an error"); - * $logger->error("This is another error"); + * $logger->log('This is a message'); + * $logger->log(\Phalcon\Logger::ERROR, 'This is an error'); + * $logger->error('This is another error'); * * $logger->close(); *``` + * + * @property resource|null $handler + * @property string $mode + * @property string $name + * @property array $options */ ZEPHIR_INIT_CLASS(Phalcon_Logger_Adapter_Stream) { @@ -57,7 +62,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Adapter_Stream) */ zend_declare_property_null(phalcon_logger_adapter_stream_ce, SL("handler"), ZEND_ACC_PROTECTED); /** - * The file open mode. Defaults to "ab" + * The file open mode. Defaults to 'ab' * * @var string */ @@ -90,11 +95,12 @@ PHP_METHOD(Phalcon_Logger_Adapter_Stream, getName) } /** - * Constructor. Accepts the name and some options + * Stream constructor. + * + * @param string $name + * @param array $options * - * @param array options = [ - * 'mode' => 'ab' - * ] + * @throws Exception */ PHP_METHOD(Phalcon_Logger_Adapter_Stream, __construct) { @@ -119,15 +125,7 @@ PHP_METHOD(Phalcon_Logger_Adapter_Stream, __construct) ZEPHIR_MM_GROW(); zephir_fetch_params(1, 1, 1, &name_param, &options_param); - if (UNEXPECTED(Z_TYPE_P(name_param) != IS_STRING && Z_TYPE_P(name_param) != IS_NULL)) { - zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'name' must be of the type string")); - RETURN_MM_NULL(); - } - if (EXPECTED(Z_TYPE_P(name_param) == IS_STRING)) { - zephir_get_strval(&name, name_param); - } else { - ZEPHIR_INIT_VAR(&name); - } + zephir_get_strval(&name, name_param); if (!options_param) { ZEPHIR_INIT_VAR(&options); array_init(&options); @@ -138,8 +136,8 @@ PHP_METHOD(Phalcon_Logger_Adapter_Stream, __construct) ZEPHIR_OBS_VAR(&mode); if (zephir_array_isset_string_fetch(&mode, &options, SL("mode"), 0)) { - if (zephir_memnstr_str(&mode, SL("r"), "phalcon/Logger/Adapter/Stream.zep", 79)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_logger_exception_ce, "Adapter cannot be opened in read mode", "phalcon/Logger/Adapter/Stream.zep", 80); + if (zephir_memnstr_str(&mode, SL("r"), "phalcon/Logger/Adapter/Stream.zep", 83)) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_logger_exception_ce, "Adapter cannot be opened in read mode", "phalcon/Logger/Adapter/Stream.zep", 84); return; } } @@ -179,6 +177,8 @@ PHP_METHOD(Phalcon_Logger_Adapter_Stream, close) /** * Processes the message i.e. writes it to the file + * + * @param Item $item */ PHP_METHOD(Phalcon_Logger_Adapter_Stream, process) { @@ -224,16 +224,16 @@ PHP_METHOD(Phalcon_Logger_Adapter_Stream, process) if (!(Z_TYPE_P(&_4$$3) == IS_RESOURCE)) { zephir_update_property_zval(this_ptr, ZEND_STRL("handler"), &__$null); ZEPHIR_INIT_VAR(&_5$$4); - object_init_ex(&_5$$4, spl_ce_UnexpectedValueException); + object_init_ex(&_5$$4, spl_ce_LogicException); zephir_read_property(&_6$$4, this_ptr, ZEND_STRL("name"), PH_NOISY_CC | PH_READONLY); zephir_read_property(&_7$$4, this_ptr, ZEND_STRL("mode"), PH_NOISY_CC | PH_READONLY); ZEPHIR_INIT_VAR(&_8$$4); ZVAL_STRING(&_8$$4, "The file '%s' cannot be opened with mode '%s'"); - ZEPHIR_CALL_FUNCTION(&_9$$4, "sprintf", NULL, 135, &_8$$4, &_6$$4, &_7$$4); + ZEPHIR_CALL_FUNCTION(&_9$$4, "sprintf", NULL, 137, &_8$$4, &_6$$4, &_7$$4); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_5$$4, "__construct", NULL, 379, &_9$$4); + ZEPHIR_CALL_METHOD(NULL, &_5$$4, "__construct", NULL, 446, &_9$$4); zephir_check_call_status(); - zephir_throw_exception_debug(&_5$$4, "phalcon/Logger/Adapter/Stream.zep", 127); + zephir_throw_exception_debug(&_5$$4, "phalcon/Logger/Adapter/Stream.zep", 133); ZEPHIR_MM_RESTORE(); return; } diff --git a/ext/phalcon/logger/adapter/syslog.zep.c b/ext/phalcon/logger/adapter/syslog.zep.c index 0b432ee2da..0ee0120fe8 100644 --- a/ext/phalcon/logger/adapter/syslog.zep.c +++ b/ext/phalcon/logger/adapter/syslog.zep.c @@ -12,13 +12,13 @@ #include #include "kernel/main.h" -#include "kernel/object.h" +#include "kernel/array.h" #include "kernel/memory.h" -#include "kernel/fcall.h" +#include "kernel/object.h" #include "ext/spl/spl_exceptions.h" #include "kernel/exception.h" #include "kernel/operators.h" -#include "kernel/array.h" +#include "kernel/fcall.h" /** @@ -30,38 +30,18 @@ * file that was distributed with this source code. */ /** - * Phalcon\Logger\Adapter\Syslog - * - * Sends logs to the system logger + * Class Syslog * - * ```php - * use Phalcon\Logger; - * use Phalcon\Logger\Adapter\Syslog; - * - * // LOG_USER is the only valid log type under Windows operating systems - * $logger = new Syslog( - * "ident", - * [ - * "option" => LOG_CONS | LOG_NDELAY | LOG_PID, - * "facility" => LOG_USER, - * ] - * ); - * - * $logger->log("This is a message"); - * $logger->log(Logger::ERROR, "This is an error"); - * $logger->error("This is another error"); - *``` + * @property string $defaultFormatter + * @property int $facility + * @property string $name + * @property bool $opened + * @property int $option */ ZEPHIR_INIT_CLASS(Phalcon_Logger_Adapter_Syslog) { ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Logger\\Adapter, Syslog, phalcon, logger_adapter_syslog, phalcon_logger_adapter_abstractadapter_ce, phalcon_logger_adapter_syslog_method_entry, 0); - /** - * Name of the default formatter class - * - * @var string - */ - zend_declare_property_string(phalcon_logger_adapter_syslog_ce, SL("defaultFormatter"), "Line", ZEND_ACC_PROTECTED); /** * @var int */ @@ -82,27 +62,22 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Adapter_Syslog) } /** - * Phalcon\Logger\Adapter\Syslog constructor - * @param array options = [ - * 'option' => null, - * 'facility' => null - * ] + * Syslog constructor. + * + * @param string $name + * @param array $options */ PHP_METHOD(Phalcon_Logger_Adapter_Syslog, __construct) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zend_long ZEPHIR_LAST_CALL_STATUS; - zephir_fcall_cache_entry *_1 = NULL; zval options; - zval *name_param = NULL, *options_param = NULL, _0, _2, _3, _4; + zval *name_param = NULL, *options_param = NULL, facility, option; zval name; zval *this_ptr = getThis(); ZVAL_UNDEF(&name); - ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_3); - ZVAL_UNDEF(&_4); + ZVAL_UNDEF(&facility); + ZVAL_UNDEF(&option); ZVAL_UNDEF(&options); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; @@ -133,19 +108,19 @@ PHP_METHOD(Phalcon_Logger_Adapter_Syslog, __construct) } + ZEPHIR_OBS_VAR(&facility); + if (!(zephir_array_isset_string_fetch(&facility, &options, SL("facility"), 0))) { + ZEPHIR_INIT_NVAR(&facility); + ZVAL_LONG(&facility, 8); + } + ZEPHIR_OBS_VAR(&option); + if (!(zephir_array_isset_string_fetch(&option, &options, SL("option"), 0))) { + ZEPHIR_INIT_NVAR(&option); + ZVAL_LONG(&option, 4); + } zephir_update_property_zval(this_ptr, ZEND_STRL("name"), &name); - ZEPHIR_INIT_VAR(&_2); - ZVAL_STRING(&_2, "facility"); - ZVAL_LONG(&_3, 8); - ZEPHIR_CALL_CE_STATIC(&_0, phalcon_helper_arr_ce, "get", &_1, 81, &options, &_2, &_3); - zephir_check_call_status(); - zephir_update_property_zval(this_ptr, ZEND_STRL("facility"), &_0); - ZEPHIR_INIT_NVAR(&_2); - ZVAL_STRING(&_2, "option"); - ZVAL_LONG(&_3, 4); - ZEPHIR_CALL_CE_STATIC(&_4, phalcon_helper_arr_ce, "get", &_1, 81, &options, &_2, &_3); - zephir_check_call_status(); - zephir_update_property_zval(this_ptr, ZEND_STRL("option"), &_4); + zephir_update_property_zval(this_ptr, ZEND_STRL("option"), &option); + zephir_update_property_zval(this_ptr, ZEND_STRL("facility"), &facility); ZEPHIR_MM_RESTORE(); } @@ -175,28 +150,35 @@ PHP_METHOD(Phalcon_Logger_Adapter_Syslog, close) /** * Processes the message i.e. writes it to the syslog + * + * @param Item $item + * + * @throws LogicException */ PHP_METHOD(Phalcon_Logger_Adapter_Syslog, process) { + zval _6$$3; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *item, item_sub, __$true, __$false, name, facility, level, message, option, result, _0, _4, _1$$3, _2$$3, _3$$3; + zval *item, item_sub, __$true, __$false, level, message, result, _0, _1, _2, _9, _3$$3, _4$$3, _5$$3, _7$$3, _8$$3; zval *this_ptr = getThis(); ZVAL_UNDEF(&item_sub); ZVAL_BOOL(&__$true, 1); ZVAL_BOOL(&__$false, 0); - ZVAL_UNDEF(&name); - ZVAL_UNDEF(&facility); ZVAL_UNDEF(&level); ZVAL_UNDEF(&message); - ZVAL_UNDEF(&option); ZVAL_UNDEF(&result); ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_4); - ZVAL_UNDEF(&_1$$3); - ZVAL_UNDEF(&_2$$3); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_9); ZVAL_UNDEF(&_3$$3); + ZVAL_UNDEF(&_4$$3); + ZVAL_UNDEF(&_5$$3); + ZVAL_UNDEF(&_7$$3); + ZVAL_UNDEF(&_8$$3); + ZVAL_UNDEF(&_6$$3); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -212,23 +194,24 @@ PHP_METHOD(Phalcon_Logger_Adapter_Syslog, process) ZEPHIR_CALL_METHOD(&message, this_ptr, "getformatteditem", NULL, 0, item); zephir_check_call_status(); zephir_read_property(&_0, this_ptr, ZEND_STRL("name"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CPY_WRT(&name, &_0); - zephir_read_property(&_0, this_ptr, ZEND_STRL("facility"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CPY_WRT(&facility, &_0); - zephir_read_property(&_0, this_ptr, ZEND_STRL("option"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CPY_WRT(&option, &_0); - ZEPHIR_CALL_FUNCTION(&result, "openlog", NULL, 448, &name, &option, &facility); + zephir_read_property(&_1, this_ptr, ZEND_STRL("option"), PH_NOISY_CC | PH_READONLY); + zephir_read_property(&_2, this_ptr, ZEND_STRL("facility"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(&result, this_ptr, "openlog", NULL, 0, &_0, &_1, &_2); zephir_check_call_status(); if (!zephir_is_true(&result)) { - ZEPHIR_INIT_VAR(&_1$$3); - object_init_ex(&_1$$3, spl_ce_LogicException); - ZEPHIR_INIT_VAR(&_2$$3); - ZVAL_STRING(&_2$$3, "Cannot open syslog for name [%s] and facility [%s]"); - ZEPHIR_CALL_FUNCTION(&_3$$3, "sprintf", NULL, 135, &_2$$3, &name, &facility); + ZEPHIR_INIT_VAR(&_3$$3); + object_init_ex(&_3$$3, spl_ce_LogicException); + zephir_read_property(&_4$$3, this_ptr, ZEND_STRL("name"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_OBS_VAR(&_5$$3); + zephir_read_property(&_5$$3, this_ptr, ZEND_STRL("facility"), PH_NOISY_CC); + 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, 137, &_7$$3, &_4$$3, &_6$$3); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 449, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, &_3$$3, "__construct", NULL, 446, &_8$$3); zephir_check_call_status(); - zephir_throw_exception_debug(&_1$$3, "phalcon/Logger/Adapter/Syslog.zep", 120); + zephir_throw_exception_debug(&_3$$3, "phalcon/Logger/Adapter/Syslog.zep", 106); ZEPHIR_MM_RESTORE(); return; } @@ -237,17 +220,67 @@ PHP_METHOD(Phalcon_Logger_Adapter_Syslog, process) } else { zephir_update_property_zval(this_ptr, ZEND_STRL("opened"), &__$false); } - ZEPHIR_CALL_METHOD(&_4, item, "getlevel", NULL, 0); + ZEPHIR_CALL_METHOD(&_9, item, "getlevel", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&level, this_ptr, "logleveltosyslog", NULL, 450, &_4); + ZEPHIR_CALL_METHOD(&level, this_ptr, "logleveltosyslog", NULL, 448, &_9); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "syslog", NULL, 451, &level, &message); + ZEPHIR_CALL_FUNCTION(NULL, "syslog", NULL, 449, &level, &message); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } +/** + * Open connection to system logger + * + * @link https://php.net/manual/en/function.openlog.php + * + * @param string $ident + * @param int $option + * @param int $facility + * + * @return bool + */ +PHP_METHOD(Phalcon_Logger_Adapter_Syslog, openlog) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long option, facility, ZEPHIR_LAST_CALL_STATUS; + zval *ident_param = NULL, *option_param = NULL, *facility_param = NULL, _0, _1; + zval ident; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&ident); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(3, 3) + Z_PARAM_STR(ident) + Z_PARAM_LONG(option) + Z_PARAM_LONG(facility) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 3, 0, &ident_param, &option_param, &facility_param); + zephir_get_strval(&ident, ident_param); + option = zephir_get_intval(option_param); + facility = zephir_get_intval(facility_param); + + + ZVAL_LONG(&_0, option); + ZVAL_LONG(&_1, facility); + ZEPHIR_RETURN_CALL_FUNCTION("openlog", NULL, 450, &ident, &_0, &_1); + zephir_check_call_status(); + RETURN_MM(); +} + /** * Translates a Logger level to a Syslog level + * + * @param int $level + * + * @return int */ PHP_METHOD(Phalcon_Logger_Adapter_Syslog, logLevelToSyslog) { diff --git a/ext/phalcon/logger/adapter/syslog.zep.h b/ext/phalcon/logger/adapter/syslog.zep.h index dfd668fe2d..8f4f2d8607 100644 --- a/ext/phalcon/logger/adapter/syslog.zep.h +++ b/ext/phalcon/logger/adapter/syslog.zep.h @@ -6,6 +6,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Adapter_Syslog); PHP_METHOD(Phalcon_Logger_Adapter_Syslog, __construct); PHP_METHOD(Phalcon_Logger_Adapter_Syslog, close); PHP_METHOD(Phalcon_Logger_Adapter_Syslog, process); +PHP_METHOD(Phalcon_Logger_Adapter_Syslog, openlog); PHP_METHOD(Phalcon_Logger_Adapter_Syslog, logLevelToSyslog); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_adapter_syslog___construct, 0, 0, 1) @@ -25,6 +26,12 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_adapter_syslog_pr ZEND_ARG_OBJ_INFO(0, item, Phalcon\\Logger\\Item, 0) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_adapter_syslog_openlog, 0, 3, _IS_BOOL, 0) + ZEND_ARG_TYPE_INFO(0, ident, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, option, IS_LONG, 0) + ZEND_ARG_TYPE_INFO(0, facility, IS_LONG, 0) +ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_adapter_syslog_logleveltosyslog, 0, 1, IS_LONG, 0) ZEND_ARG_TYPE_INFO(0, level, IS_LONG, 0) ZEND_END_ARG_INFO() @@ -33,6 +40,7 @@ ZEPHIR_INIT_FUNCS(phalcon_logger_adapter_syslog_method_entry) { PHP_ME(Phalcon_Logger_Adapter_Syslog, __construct, arginfo_phalcon_logger_adapter_syslog___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) PHP_ME(Phalcon_Logger_Adapter_Syslog, close, arginfo_phalcon_logger_adapter_syslog_close, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Logger_Adapter_Syslog, process, arginfo_phalcon_logger_adapter_syslog_process, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Logger_Adapter_Syslog, openlog, arginfo_phalcon_logger_adapter_syslog_openlog, ZEND_ACC_PROTECTED) PHP_ME(Phalcon_Logger_Adapter_Syslog, logLevelToSyslog, arginfo_phalcon_logger_adapter_syslog_logleveltosyslog, ZEND_ACC_PRIVATE) PHP_FE_END }; diff --git a/ext/phalcon/logger/adapterfactory.zep.c b/ext/phalcon/logger/adapterfactory.zep.c index eb2cb7413c..eaa36bfd1f 100644 --- a/ext/phalcon/logger/adapterfactory.zep.c +++ b/ext/phalcon/logger/adapterfactory.zep.c @@ -29,6 +29,9 @@ * For the full copyright and license information, please view the LICENSE.txt * file that was distributed with this source code. */ +/** + * Factory used to create adapters used for Logging + */ ZEPHIR_INIT_CLASS(Phalcon_Logger_AdapterFactory) { ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Logger, AdapterFactory, phalcon, logger_adapterfactory, phalcon_factory_abstractfactory_ce, phalcon_logger_adapterfactory_method_entry, 0); @@ -38,6 +41,8 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_AdapterFactory) /** * AdapterFactory constructor. + * + * @param array $services */ PHP_METHOD(Phalcon_Logger_AdapterFactory, __construct) { @@ -74,6 +79,13 @@ PHP_METHOD(Phalcon_Logger_AdapterFactory, __construct) /** * Create a new instance of the adapter + * + * @param string $name + * @param string $fileName + * @param array $options + * + * @return AdapterInterface + * @throws Exception */ PHP_METHOD(Phalcon_Logger_AdapterFactory, newInstance) { diff --git a/ext/phalcon/logger/formatter/abstractformatter.zep.c b/ext/phalcon/logger/formatter/abstractformatter.zep.c index a72fdfe6d5..a8ab3ec80d 100644 --- a/ext/phalcon/logger/formatter/abstractformatter.zep.c +++ b/ext/phalcon/logger/formatter/abstractformatter.zep.c @@ -15,6 +15,7 @@ #include "kernel/object.h" #include "kernel/operators.h" #include "kernel/memory.h" +#include "kernel/fcall.h" /** @@ -25,16 +26,21 @@ * For the full copyright and license information, please view the LICENSE.txt * file that was distributed with this source code. */ +/** + * Class AbstractFormatter + * + * @property string $dateFormat + */ ZEPHIR_INIT_CLASS(Phalcon_Logger_Formatter_AbstractFormatter) { - ZEPHIR_REGISTER_CLASS(Phalcon\\Logger\\Formatter, AbstractFormatter, phalcon, logger_formatter_abstractformatter, phalcon_logger_formatter_abstractformatter_method_entry, ZEND_ACC_EXPLICIT_ABSTRACT_CLASS); + ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Logger\\Formatter, AbstractFormatter, phalcon, logger_formatter_abstractformatter, phalcon_support_helper_str_abstractstr_ce, phalcon_logger_formatter_abstractformatter_method_entry, ZEND_ACC_EXPLICIT_ABSTRACT_CLASS); /** * Default date format * * @var string */ - zend_declare_property_null(phalcon_logger_formatter_abstractformatter_ce, SL("dateFormat"), ZEND_ACC_PROTECTED); + zend_declare_property_string(phalcon_logger_formatter_abstractformatter_ce, SL("dateFormat"), "c", ZEND_ACC_PROTECTED); zend_class_implements(phalcon_logger_formatter_abstractformatter_ce, 1, phalcon_logger_formatter_formatterinterface_ce); return SUCCESS; } @@ -79,3 +85,40 @@ PHP_METHOD(Phalcon_Logger_Formatter_AbstractFormatter, setDateFormat) RETURN_THIS(); } +/** + * Returns the date formatted for the logger. + * + * @param Item $item + * + * @return string + */ +PHP_METHOD(Phalcon_Logger_Formatter_AbstractFormatter, getFormattedDate) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *item, item_sub, _0, _1; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&item_sub); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_OBJECT_OF_CLASS(item, phalcon_logger_item_ce) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &item); + + + ZEPHIR_CALL_METHOD(&_0, item, "getdatetime", NULL, 0); + zephir_check_call_status(); + zephir_read_property(&_1, this_ptr, ZEND_STRL("dateFormat"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_RETURN_CALL_METHOD(&_0, "format", NULL, 0, &_1); + zephir_check_call_status(); + RETURN_MM(); +} + diff --git a/ext/phalcon/logger/formatter/abstractformatter.zep.h b/ext/phalcon/logger/formatter/abstractformatter.zep.h index 2f0bdab60e..7e86d4f07e 100644 --- a/ext/phalcon/logger/formatter/abstractformatter.zep.h +++ b/ext/phalcon/logger/formatter/abstractformatter.zep.h @@ -5,6 +5,7 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Formatter_AbstractFormatter); PHP_METHOD(Phalcon_Logger_Formatter_AbstractFormatter, getDateFormat); PHP_METHOD(Phalcon_Logger_Formatter_AbstractFormatter, setDateFormat); +PHP_METHOD(Phalcon_Logger_Formatter_AbstractFormatter, getFormattedDate); ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_formatter_abstractformatter_getdateformat, 0, 0, IS_STRING, 0) ZEND_END_ARG_INFO() @@ -13,8 +14,13 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_formatter_abstractformatter_setdat ZEND_ARG_TYPE_INFO(0, dateFormat, IS_STRING, 0) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_formatter_abstractformatter_getformatteddate, 0, 1, IS_STRING, 0) + ZEND_ARG_OBJ_INFO(0, item, Phalcon\\Logger\\Item, 0) +ZEND_END_ARG_INFO() + ZEPHIR_INIT_FUNCS(phalcon_logger_formatter_abstractformatter_method_entry) { PHP_ME(Phalcon_Logger_Formatter_AbstractFormatter, getDateFormat, arginfo_phalcon_logger_formatter_abstractformatter_getdateformat, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Logger_Formatter_AbstractFormatter, setDateFormat, arginfo_phalcon_logger_formatter_abstractformatter_setdateformat, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Logger_Formatter_AbstractFormatter, getFormattedDate, arginfo_phalcon_logger_formatter_abstractformatter_getformatteddate, ZEND_ACC_PROTECTED) PHP_FE_END }; diff --git a/ext/phalcon/logger/formatter/formatterinterface.zep.c b/ext/phalcon/logger/formatter/formatterinterface.zep.c index 8f0685e218..5b8ec5b0ef 100644 --- a/ext/phalcon/logger/formatter/formatterinterface.zep.c +++ b/ext/phalcon/logger/formatter/formatterinterface.zep.c @@ -34,5 +34,9 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Formatter_FormatterInterface) /** * Applies a format to an item + * + * @param Item $item + * + * @return string */ ZEPHIR_DOC_METHOD(Phalcon_Logger_Formatter_FormatterInterface, format); diff --git a/ext/phalcon/logger/formatter/json.zep.c b/ext/phalcon/logger/formatter/json.zep.c index ab5ee866f6..2a1995d049 100644 --- a/ext/phalcon/logger/formatter/json.zep.c +++ b/ext/phalcon/logger/formatter/json.zep.c @@ -16,6 +16,7 @@ #include "kernel/memory.h" #include "kernel/operators.h" #include "kernel/fcall.h" +#include "kernel/string.h" #include "kernel/array.h" @@ -40,7 +41,9 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_Formatter_Json) } /** - * Phalcon\Logger\Formatter\Json construct + * Json constructor. + * + * @param string $dateFormat */ PHP_METHOD(Phalcon_Logger_Formatter_Json, __construct) { @@ -75,25 +78,27 @@ PHP_METHOD(Phalcon_Logger_Formatter_Json, __construct) /** * Applies a format to a message before sent it to the internal log + * + * @param Item $item + * + * @return string + * @throws JsonException */ PHP_METHOD(Phalcon_Logger_Formatter_Json, format) { - zval _3; + zval _2; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zephir_fcall_cache_entry *_2 = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *item, item_sub, interpolate, message, time, _0, _1, _4, _5; + zval *item, item_sub, message, options, _0, _1, _3; zval *this_ptr = getThis(); ZVAL_UNDEF(&item_sub); - ZVAL_UNDEF(&interpolate); ZVAL_UNDEF(&message); - ZVAL_UNDEF(&time); + ZVAL_UNDEF(&options); ZVAL_UNDEF(&_0); ZVAL_UNDEF(&_1); - ZVAL_UNDEF(&_4); - ZVAL_UNDEF(&_5); ZVAL_UNDEF(&_3); + ZVAL_UNDEF(&_2); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -106,33 +111,24 @@ PHP_METHOD(Phalcon_Logger_Formatter_Json, format) zephir_fetch_params(1, 1, 0, &item); - ZEPHIR_CALL_METHOD(&time, item, "gettime", NULL, 0); - zephir_check_call_status(); - ZEPHIR_INIT_VAR(&interpolate); - object_init_ex(&interpolate, phalcon_support_helper_str_interpolate_ce); - if (zephir_has_constructor(&interpolate)) { - ZEPHIR_CALL_METHOD(NULL, &interpolate, "__construct", NULL, 0); - zephir_check_call_status(); - } - + ZEPHIR_INIT_VAR(&options); + ZVAL_LONG(&options, (((((1 + 4) + 2) + 8) + 64) + 4194304)); ZEPHIR_CALL_METHOD(&_0, item, "getmessage", NULL, 0); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_1, item, "getcontext", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&message, &interpolate, "__invoke", NULL, 452, &_0, &_1); - zephir_check_call_status(); - ZEPHIR_INIT_VAR(&_3); - zephir_create_array(&_3, 3, 0); - ZEPHIR_CALL_METHOD(&_4, item, "getlevelname", NULL, 0); + ZEPHIR_CALL_METHOD(&message, this_ptr, "tointerpolate", NULL, 0, &_0, &_1); zephir_check_call_status(); - zephir_array_update_string(&_3, SL("level"), &_4, PH_COPY | PH_SEPARATE); - zephir_array_update_string(&_3, SL("message"), &message, PH_COPY | PH_SEPARATE); - zephir_read_property(&_5, this_ptr, ZEND_STRL("dateFormat"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&_4, &time, "format", NULL, 0, &_5); + ZEPHIR_INIT_VAR(&_2); + zephir_create_array(&_2, 3, 0); + ZEPHIR_CALL_METHOD(&_3, item, "getlevelname", NULL, 0); zephir_check_call_status(); - zephir_array_update_string(&_3, SL("timestamp"), &_4, PH_COPY | PH_SEPARATE); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_helper_json_ce, "encode", &_2, 15, &_3); + zephir_array_update_string(&_2, SL("level"), &_3, PH_COPY | PH_SEPARATE); + zephir_array_update_string(&_2, SL("message"), &message, PH_COPY | PH_SEPARATE); + ZEPHIR_CALL_METHOD(&_3, this_ptr, "getformatteddate", NULL, 0, item); zephir_check_call_status(); + zephir_array_update_string(&_2, SL("timestamp"), &_3, PH_COPY | PH_SEPARATE); + zephir_json_encode(return_value, &_2, zephir_get_intval(&options) ); RETURN_MM(); } diff --git a/ext/phalcon/logger/formatter/line.zep.c b/ext/phalcon/logger/formatter/line.zep.c index f852988920..8f1e182219 100644 --- a/ext/phalcon/logger/formatter/line.zep.c +++ b/ext/phalcon/logger/formatter/line.zep.c @@ -15,8 +15,8 @@ #include "kernel/object.h" #include "kernel/operators.h" #include "kernel/memory.h" -#include "kernel/fcall.h" #include "kernel/array.h" +#include "kernel/fcall.h" /** @@ -28,9 +28,9 @@ * file that was distributed with this source code. */ /** - * Phalcon\Logger\Formatter\Line + * Class Line * - * Formats messages using an one-line string + * @property string $format */ ZEPHIR_INIT_CLASS(Phalcon_Logger_Formatter_Line) { @@ -86,7 +86,10 @@ PHP_METHOD(Phalcon_Logger_Formatter_Line, setFormat) } /** - * Phalcon\Logger\Formatter\Line construct + * Line constructor. + * + * @param string $format + * @param string $dateFormat */ PHP_METHOD(Phalcon_Logger_Formatter_Line, __construct) { @@ -130,23 +133,25 @@ PHP_METHOD(Phalcon_Logger_Formatter_Line, __construct) /** * Applies a format to a message before sent it to the internal log + * + * @param Item $item + * + * @return string + * @throws Exception */ PHP_METHOD(Phalcon_Logger_Formatter_Line, format) { + zval _1; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *item, item_sub, context, format, interpolate, time, _0, _1, _2, _3; + zval *item, item_sub, message, _0, _2; zval *this_ptr = getThis(); ZVAL_UNDEF(&item_sub); - ZVAL_UNDEF(&context); - ZVAL_UNDEF(&format); - ZVAL_UNDEF(&interpolate); - ZVAL_UNDEF(&time); + ZVAL_UNDEF(&message); ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_1); ZVAL_UNDEF(&_2); - ZVAL_UNDEF(&_3); + ZVAL_UNDEF(&_1); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; ZEND_PARSE_PARAMETERS_START(1, 1) @@ -159,30 +164,23 @@ PHP_METHOD(Phalcon_Logger_Formatter_Line, format) zephir_fetch_params(1, 1, 0, &item); - ZEPHIR_CALL_METHOD(&context, item, "getcontext", NULL, 0); - zephir_check_call_status(); zephir_read_property(&_0, this_ptr, ZEND_STRL("format"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CPY_WRT(&format, &_0); - ZEPHIR_CALL_METHOD(&time, item, "gettime", NULL, 0); + ZEPHIR_INIT_VAR(&_1); + zephir_create_array(&_1, 3, 0); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "getformatteddate", NULL, 0, item); zephir_check_call_status(); - ZEPHIR_INIT_VAR(&interpolate); - object_init_ex(&interpolate, phalcon_support_helper_str_interpolate_ce); - if (zephir_has_constructor(&interpolate)) { - ZEPHIR_CALL_METHOD(NULL, &interpolate, "__construct", NULL, 0); - zephir_check_call_status(); - } - - zephir_read_property(&_0, this_ptr, ZEND_STRL("dateFormat"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&_1, &time, "format", NULL, 0, &_0); - zephir_check_call_status(); - zephir_array_update_string(&context, SL("date"), &_1, PH_COPY | PH_SEPARATE); + zephir_array_update_string(&_1, SL("%date%"), &_2, PH_COPY | PH_SEPARATE); ZEPHIR_CALL_METHOD(&_2, item, "getlevelname", NULL, 0); zephir_check_call_status(); - zephir_array_update_string(&context, SL("level"), &_2, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&_3, item, "getmessage", NULL, 0); + zephir_array_update_string(&_1, SL("%level%"), &_2, PH_COPY | PH_SEPARATE); + ZEPHIR_CALL_METHOD(&_2, item, "getmessage", NULL, 0); + zephir_check_call_status(); + zephir_array_update_string(&_1, SL("%message%"), &_2, PH_COPY | PH_SEPARATE); + ZEPHIR_CALL_FUNCTION(&message, "strtr", NULL, 5, &_0, &_1); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&_2, item, "getcontext", NULL, 0); zephir_check_call_status(); - zephir_array_update_string(&context, SL("message"), &_3, PH_COPY | PH_SEPARATE); - ZEPHIR_RETURN_CALL_METHOD(&interpolate, "__invoke", NULL, 452, &format, &context); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "tointerpolate", NULL, 0, &message, &_2); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/logger/item.zep.c b/ext/phalcon/logger/item.zep.c index ce116ab6c1..34e6e17d9e 100644 --- a/ext/phalcon/logger/item.zep.c +++ b/ext/phalcon/logger/item.zep.c @@ -31,46 +31,42 @@ * * Represents each item in a logging transaction * + * @property array $context + * @property string $message + * @property int $level + * @property string $levelName + * @property DateTimeImmutable $datetime */ ZEPHIR_INIT_CLASS(Phalcon_Logger_Item) { ZEPHIR_REGISTER_CLASS(Phalcon\\Logger, Item, phalcon, logger_item, phalcon_logger_item_method_entry, 0); /** - * Log Context - * - * @var mixed + * @var array */ zend_declare_property_null(phalcon_logger_item_ce, SL("context"), ZEND_ACC_PROTECTED); /** - * Log message - * * @var string */ zend_declare_property_null(phalcon_logger_item_ce, SL("message"), ZEND_ACC_PROTECTED); /** - * Log type - * - * @var integer + * @var int */ zend_declare_property_null(phalcon_logger_item_ce, SL("level"), ZEND_ACC_PROTECTED); /** - * Log message - * * @var string */ zend_declare_property_null(phalcon_logger_item_ce, SL("levelName"), ZEND_ACC_PROTECTED); /** - * Log timestamp - * * @var DateTimeImmutable */ - zend_declare_property_null(phalcon_logger_item_ce, SL("time"), ZEND_ACC_PROTECTED); + zend_declare_property_null(phalcon_logger_item_ce, SL("dateTime"), ZEND_ACC_PROTECTED); + phalcon_logger_item_ce->create_object = zephir_init_properties_Phalcon_Logger_Item; + return SUCCESS; } /** - * Log Context */ PHP_METHOD(Phalcon_Logger_Item, getContext) { @@ -82,7 +78,6 @@ PHP_METHOD(Phalcon_Logger_Item, getContext) } /** - * Log message */ PHP_METHOD(Phalcon_Logger_Item, getMessage) { @@ -94,7 +89,6 @@ PHP_METHOD(Phalcon_Logger_Item, getMessage) } /** - * Log type */ PHP_METHOD(Phalcon_Logger_Item, getLevel) { @@ -106,7 +100,6 @@ PHP_METHOD(Phalcon_Logger_Item, getLevel) } /** - * Log message */ PHP_METHOD(Phalcon_Logger_Item, getLevelName) { @@ -118,32 +111,37 @@ PHP_METHOD(Phalcon_Logger_Item, getLevelName) } /** - * Log timestamp */ -PHP_METHOD(Phalcon_Logger_Item, getTime) +PHP_METHOD(Phalcon_Logger_Item, getDateTime) { zval *this_ptr = getThis(); - RETURN_MEMBER(getThis(), "time"); + RETURN_MEMBER(getThis(), "dateTime"); } /** - * Phalcon\Logger\Item constructor + * Item constructor. + * + * @param string $message + * @param string $levelName + * @param int $level + * @param DateTimeImmutable $datetime + * @param array $context */ PHP_METHOD(Phalcon_Logger_Item, __construct) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zval context; zend_long level; - zval *message_param = NULL, *levelName_param = NULL, *level_param = NULL, *time, time_sub, *context_param = NULL, _0; + zval *message_param = NULL, *levelName_param = NULL, *level_param = NULL, *dateTime, dateTime_sub, *context_param = NULL, _0; zval message, levelName; zval *this_ptr = getThis(); ZVAL_UNDEF(&message); ZVAL_UNDEF(&levelName); - ZVAL_UNDEF(&time_sub); + ZVAL_UNDEF(&dateTime_sub); ZVAL_UNDEF(&_0); ZVAL_UNDEF(&context); #if PHP_VERSION_ID >= 80000 @@ -152,7 +150,7 @@ PHP_METHOD(Phalcon_Logger_Item, __construct) Z_PARAM_STR(message) Z_PARAM_STR(levelName) Z_PARAM_LONG(level) - Z_PARAM_OBJECT_OF_CLASS(time, php_date_get_immutable_ce()) + Z_PARAM_OBJECT_OF_CLASS(dateTime, php_date_get_immutable_ce()) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(context) ZEND_PARSE_PARAMETERS_END(); @@ -160,7 +158,7 @@ PHP_METHOD(Phalcon_Logger_Item, __construct) ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 4, 1, &message_param, &levelName_param, &level_param, &time, &context_param); + zephir_fetch_params(1, 4, 1, &message_param, &levelName_param, &level_param, &dateTime, &context_param); zephir_get_strval(&message, message_param); zephir_get_strval(&levelName, levelName_param); level = zephir_get_intval(level_param); @@ -177,8 +175,32 @@ PHP_METHOD(Phalcon_Logger_Item, __construct) ZEPHIR_INIT_ZVAL_NREF(_0); ZVAL_LONG(&_0, level); zephir_update_property_zval(this_ptr, ZEND_STRL("level"), &_0); - zephir_update_property_zval(this_ptr, ZEND_STRL("time"), time); + zephir_update_property_zval(this_ptr, ZEND_STRL("dateTime"), dateTime); zephir_update_property_zval(this_ptr, ZEND_STRL("context"), &context); ZEPHIR_MM_RESTORE(); } +zend_object *zephir_init_properties_Phalcon_Logger_Item(zend_class_entry *class_type) +{ + zval _0, _1$$3; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1$$3); + + + ZEPHIR_MM_GROW(); + + { + zval local_this_ptr, *this_ptr = &local_this_ptr; + ZEPHIR_CREATE_OBJECT(this_ptr, class_type); + zephir_read_property_ex(&_0, this_ptr, ZEND_STRL("context"), PH_NOISY_CC | PH_READONLY); + if (Z_TYPE_P(&_0) == IS_NULL) { + ZEPHIR_INIT_VAR(&_1$$3); + array_init(&_1$$3); + zephir_update_property_zval_ex(this_ptr, ZEND_STRL("context"), &_1$$3); + } + ZEPHIR_MM_RESTORE(); + return Z_OBJ_P(this_ptr); + } +} + diff --git a/ext/phalcon/logger/item.zep.h b/ext/phalcon/logger/item.zep.h index d4dc67bf6b..90e0554bdf 100644 --- a/ext/phalcon/logger/item.zep.h +++ b/ext/phalcon/logger/item.zep.h @@ -7,29 +7,30 @@ PHP_METHOD(Phalcon_Logger_Item, getContext); PHP_METHOD(Phalcon_Logger_Item, getMessage); PHP_METHOD(Phalcon_Logger_Item, getLevel); PHP_METHOD(Phalcon_Logger_Item, getLevelName); -PHP_METHOD(Phalcon_Logger_Item, getTime); +PHP_METHOD(Phalcon_Logger_Item, getDateTime); PHP_METHOD(Phalcon_Logger_Item, __construct); +zend_object *zephir_init_properties_Phalcon_Logger_Item(zend_class_entry *class_type); -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_item_getcontext, 0, 0, 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_item_getcontext, 0, 0, IS_ARRAY, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_item_getmessage, 0, 0, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_item_getlevel, 0, 0, 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_item_getlevel, 0, 0, IS_LONG, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_item_getlevelname, 0, 0, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_item_gettime, 0, 0, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_item_getdatetime, 0, 0, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_item___construct, 0, 0, 4) ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, levelName, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, level, IS_LONG, 0) - ZEND_ARG_OBJ_INFO(0, time, DateTimeImmutable, 0) + ZEND_ARG_OBJ_INFO(0, dateTime, DateTimeImmutable, 0) #if PHP_VERSION_ID >= 80000 ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") #else @@ -37,23 +38,18 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_item___construct, 0, 0, 4) #endif ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_item_zephir_init_properties_phalcon_logger_item, 0, 0, 0) +ZEND_END_ARG_INFO() + ZEPHIR_INIT_FUNCS(phalcon_logger_item_method_entry) { -#if PHP_VERSION_ID >= 80000 PHP_ME(Phalcon_Logger_Item, getContext, arginfo_phalcon_logger_item_getcontext, ZEND_ACC_PUBLIC) -#else - PHP_ME(Phalcon_Logger_Item, getContext, NULL, ZEND_ACC_PUBLIC) -#endif PHP_ME(Phalcon_Logger_Item, getMessage, arginfo_phalcon_logger_item_getmessage, ZEND_ACC_PUBLIC) -#if PHP_VERSION_ID >= 80000 PHP_ME(Phalcon_Logger_Item, getLevel, arginfo_phalcon_logger_item_getlevel, ZEND_ACC_PUBLIC) -#else - PHP_ME(Phalcon_Logger_Item, getLevel, NULL, ZEND_ACC_PUBLIC) -#endif PHP_ME(Phalcon_Logger_Item, getLevelName, arginfo_phalcon_logger_item_getlevelname, ZEND_ACC_PUBLIC) #if PHP_VERSION_ID >= 80000 - PHP_ME(Phalcon_Logger_Item, getTime, arginfo_phalcon_logger_item_gettime, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Logger_Item, getDateTime, arginfo_phalcon_logger_item_getdatetime, ZEND_ACC_PUBLIC) #else - PHP_ME(Phalcon_Logger_Item, getTime, NULL, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Logger_Item, getDateTime, NULL, ZEND_ACC_PUBLIC) #endif PHP_ME(Phalcon_Logger_Item, __construct, arginfo_phalcon_logger_item___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) PHP_FE_END diff --git a/ext/phalcon/logger/logger.zep.c b/ext/phalcon/logger/logger.zep.c new file mode 100644 index 0000000000..165a85a055 --- /dev/null +++ b/ext/phalcon/logger/logger.zep.c @@ -0,0 +1,1174 @@ + +#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/operators.h" +#include "kernel/fcall.h" +#include "kernel/memory.h" +#include "ext/date/php_date.h" +#include "ext/spl/spl_exceptions.h" +#include "kernel/exception.h" +#include "kernel/array.h" +#include "kernel/string.h" + + +/** + * This file is part of the Phalcon Framework. + * + * (c) Phalcon Team + * + * For the full copyright and license information, please view the LICENSE.txt + * file that was distributed with this source code. + */ +/** + * Phalcon Logger. + * + * A PSR compatible logger, with various adapters and formatters. A formatter + * interface is available as well as an adapter one. Adapters can be created + * easily using the built in AdapterFactory. A LoggerFactory is also available + * that allows developers to create new instances of the Logger or load them + * from config files (see Phalcon\Config\Config object). + * + * @package Phalcon\Logger + * + * @property AdapterInterface[] $adapters + * @property array $excluded + * @property int $logLevel + * @property string $name + * @property string $timezone + */ +ZEPHIR_INIT_CLASS(Phalcon_Logger_Logger) +{ + ZEPHIR_REGISTER_CLASS(Phalcon\\Logger, Logger, phalcon, logger_logger, phalcon_logger_logger_method_entry, 0); + + /** + * The adapter stack + * + * @var AdapterInterface[] + */ + zend_declare_property_null(phalcon_logger_logger_ce, SL("adapters"), ZEND_ACC_PROTECTED); + /** + * The excluded adapters for this log process + * + * @var array + */ + zend_declare_property_null(phalcon_logger_logger_ce, SL("excluded"), ZEND_ACC_PROTECTED); + /** + * Minimum log level for the logger + * + * @var int + */ + zend_declare_property_long(phalcon_logger_logger_ce, SL("logLevel"), 8, ZEND_ACC_PROTECTED); + /** + * @var string + */ + zend_declare_property_string(phalcon_logger_logger_ce, SL("name"), "", ZEND_ACC_PROTECTED); + /** + * @var DateTimeZone|null + */ + zend_declare_property_null(phalcon_logger_logger_ce, SL("timezone"), ZEND_ACC_PROTECTED); + phalcon_logger_logger_ce->create_object = zephir_init_properties_Phalcon_Logger_Logger; + zephir_declare_class_constant_long(phalcon_logger_logger_ce, SL("ALERT"), 2); + + zephir_declare_class_constant_long(phalcon_logger_logger_ce, SL("CRITICAL"), 1); + + zephir_declare_class_constant_long(phalcon_logger_logger_ce, SL("CUSTOM"), 8); + + zephir_declare_class_constant_long(phalcon_logger_logger_ce, SL("DEBUG"), 7); + + zephir_declare_class_constant_long(phalcon_logger_logger_ce, SL("EMERGENCY"), 0); + + zephir_declare_class_constant_long(phalcon_logger_logger_ce, SL("ERROR"), 3); + + zephir_declare_class_constant_long(phalcon_logger_logger_ce, SL("INFO"), 6); + + zephir_declare_class_constant_long(phalcon_logger_logger_ce, SL("NOTICE"), 5); + + zephir_declare_class_constant_long(phalcon_logger_logger_ce, SL("WARNING"), 4); + + zend_class_implements(phalcon_logger_logger_ce, 1, zephir_get_internal_ce(SL("psr\\log\\loggerinterface"))); + return SUCCESS; +} + +/** + * The adapter stack + */ +PHP_METHOD(Phalcon_Logger_Logger, getAdapters) +{ + zval *this_ptr = getThis(); + + + + RETURN_MEMBER(getThis(), "adapters"); +} + +/** + * Minimum log level for the logger + */ +PHP_METHOD(Phalcon_Logger_Logger, getLogLevel) +{ + zval *this_ptr = getThis(); + + + + RETURN_MEMBER(getThis(), "logLevel"); +} + +/** + */ +PHP_METHOD(Phalcon_Logger_Logger, getName) +{ + zval *this_ptr = getThis(); + + + + RETURN_MEMBER(getThis(), "name"); +} + +/** + * Constructor. + * + * @param string $name The name of the logger + * @param array $adapters The collection of adapters to be used + * for logging (default []) + * @param DateTimeZone|null $timezone Timezone. If omitted, + * date_Default_timezone_get() is used + */ +PHP_METHOD(Phalcon_Logger_Logger, __construct) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval adapters; + zval *name_param = NULL, *adapters_param = NULL, *timezone = NULL, timezone_sub, __$null, localTimeZone, _0; + zval name; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&name); + ZVAL_UNDEF(&timezone_sub); + ZVAL_NULL(&__$null); + ZVAL_UNDEF(&localTimeZone); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&adapters); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 3) + Z_PARAM_STR(name) + Z_PARAM_OPTIONAL + Z_PARAM_ARRAY(adapters) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(timezone, php_date_get_timezone_ce()) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 2, &name_param, &adapters_param, &timezone); + if (UNEXPECTED(Z_TYPE_P(name_param) != IS_STRING && Z_TYPE_P(name_param) != IS_NULL)) { + zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'name' must be of the type string")); + RETURN_MM_NULL(); + } + if (EXPECTED(Z_TYPE_P(name_param) == IS_STRING)) { + zephir_get_strval(&name, name_param); + } else { + ZEPHIR_INIT_VAR(&name); + } + if (!adapters_param) { + ZEPHIR_INIT_VAR(&adapters); + array_init(&adapters); + } else { + ZEPHIR_OBS_COPY_OR_DUP(&adapters, adapters_param); + } + if (!timezone) { + timezone = &timezone_sub; + timezone = &__$null; + } + + + ZEPHIR_CPY_WRT(&localTimeZone, timezone); + if (ZEPHIR_IS_EMPTY(timezone)) { + ZEPHIR_CALL_FUNCTION(&localTimeZone, "date_default_timezone_get", NULL, 451); + zephir_check_call_status(); + if (ZEPHIR_IS_EMPTY(&localTimeZone)) { + ZEPHIR_INIT_NVAR(&localTimeZone); + ZVAL_STRING(&localTimeZone, "UTC"); + } + } + zephir_update_property_zval(this_ptr, ZEND_STRL("name"), &name); + ZEPHIR_INIT_VAR(&_0); + object_init_ex(&_0, php_date_get_timezone_ce()); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 0, &localTimeZone); + zephir_check_call_status(); + zephir_update_property_zval(this_ptr, ZEND_STRL("timezone"), &_0); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setadapters", NULL, 0, &adapters); + zephir_check_call_status(); + ZEPHIR_MM_RESTORE(); +} + +/** + * Add an adapter to the stack. For processing we use FIFO + * + * @param string $name The name of the adapter + * @param AdapterInterface $adapter The adapter to add to the stack + * + * @return Logger + */ +PHP_METHOD(Phalcon_Logger_Logger, addAdapter) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval *name_param = NULL, *adapter, adapter_sub; + zval name; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&name); + ZVAL_UNDEF(&adapter_sub); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(2, 2) + Z_PARAM_STR(name) + Z_PARAM_OBJECT_OF_CLASS(adapter, phalcon_logger_adapter_adapterinterface_ce) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 2, 0, &name_param, &adapter); + zephir_get_strval(&name, name_param); + + + zephir_update_property_array(this_ptr, SL("adapters"), &name, adapter); + RETURN_THIS(); +} + +/** + * Action must be taken immediately. + * + * Example: Entire website down, database unavailable, etc. This should + * trigger the SMS alerts and wake you up. + * + * @param string $message + * @param array $context + * + * @return void + */ +PHP_METHOD(Phalcon_Logger_Logger, alert) +{ + zval _0; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval context; + zval *message, message_sub, *context_param = NULL, _1; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&message_sub); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&context); + ZVAL_UNDEF(&_0); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 2) + Z_PARAM_ZVAL(message) + Z_PARAM_OPTIONAL + Z_PARAM_ARRAY(context) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 1, &message, &context_param); + if (!context_param) { + ZEPHIR_INIT_VAR(&context); + array_init(&context); + } else { + zephir_get_arrval(&context, context_param); + } + + + zephir_cast_to_string(&_0, message); + ZVAL_LONG(&_1, 2); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addmessage", NULL, 0, &_1, &_0, &context); + zephir_check_call_status(); + ZEPHIR_MM_RESTORE(); +} + +/** + * Critical conditions. + * + * Example: Application component unavailable, unexpected exception. + * + * @param string $message + * @param array $context + * + * @return void + */ +PHP_METHOD(Phalcon_Logger_Logger, critical) +{ + zval _0; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval context; + zval *message, message_sub, *context_param = NULL, _1; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&message_sub); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&context); + ZVAL_UNDEF(&_0); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 2) + Z_PARAM_ZVAL(message) + Z_PARAM_OPTIONAL + Z_PARAM_ARRAY(context) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 1, &message, &context_param); + if (!context_param) { + ZEPHIR_INIT_VAR(&context); + array_init(&context); + } else { + zephir_get_arrval(&context, context_param); + } + + + zephir_cast_to_string(&_0, message); + ZVAL_LONG(&_1, 1); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addmessage", NULL, 0, &_1, &_0, &context); + zephir_check_call_status(); + ZEPHIR_MM_RESTORE(); +} + +/** + * Detailed debug information. + * + * @param string $message + * @param array $context + * + * @return void + */ +PHP_METHOD(Phalcon_Logger_Logger, debug) +{ + zval _0; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval context; + zval *message, message_sub, *context_param = NULL, _1; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&message_sub); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&context); + ZVAL_UNDEF(&_0); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 2) + Z_PARAM_ZVAL(message) + Z_PARAM_OPTIONAL + Z_PARAM_ARRAY(context) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 1, &message, &context_param); + if (!context_param) { + ZEPHIR_INIT_VAR(&context); + array_init(&context); + } else { + zephir_get_arrval(&context, context_param); + } + + + zephir_cast_to_string(&_0, message); + ZVAL_LONG(&_1, 7); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addmessage", NULL, 0, &_1, &_0, &context); + zephir_check_call_status(); + ZEPHIR_MM_RESTORE(); +} + +/** + * Runtime errors that do not require immediate action but should typically + * be logged and monitored. + * + * @param string $message + * @param array $context + * + * @return void + */ +PHP_METHOD(Phalcon_Logger_Logger, error) +{ + zval _0; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval context; + zval *message, message_sub, *context_param = NULL, _1; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&message_sub); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&context); + ZVAL_UNDEF(&_0); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 2) + Z_PARAM_ZVAL(message) + Z_PARAM_OPTIONAL + Z_PARAM_ARRAY(context) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 1, &message, &context_param); + if (!context_param) { + ZEPHIR_INIT_VAR(&context); + array_init(&context); + } else { + zephir_get_arrval(&context, context_param); + } + + + zephir_cast_to_string(&_0, message); + ZVAL_LONG(&_1, 3); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addmessage", NULL, 0, &_1, &_0, &context); + zephir_check_call_status(); + ZEPHIR_MM_RESTORE(); +} + +/** + * System is unusable. + * + * @param string $message + * @param array $context + * + * @return void + */ +PHP_METHOD(Phalcon_Logger_Logger, emergency) +{ + zval _0; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval context; + zval *message, message_sub, *context_param = NULL, _1; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&message_sub); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&context); + ZVAL_UNDEF(&_0); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 2) + Z_PARAM_ZVAL(message) + Z_PARAM_OPTIONAL + Z_PARAM_ARRAY(context) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 1, &message, &context_param); + if (!context_param) { + ZEPHIR_INIT_VAR(&context); + array_init(&context); + } else { + zephir_get_arrval(&context, context_param); + } + + + zephir_cast_to_string(&_0, message); + ZVAL_LONG(&_1, 0); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addmessage", NULL, 0, &_1, &_0, &context); + zephir_check_call_status(); + ZEPHIR_MM_RESTORE(); +} + +/** + * Exclude certain adapters. + * + * @param array $adapters + * + * @return Logger + */ +PHP_METHOD(Phalcon_Logger_Logger, excludeAdapters) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *adapters_param = NULL, __$true, adapter, registered, *_0, _1; + zval adapters; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&adapters); + ZVAL_BOOL(&__$true, 1); + ZVAL_UNDEF(&adapter); + ZVAL_UNDEF(®istered); + ZVAL_UNDEF(&_1); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(0, 1) + Z_PARAM_OPTIONAL + Z_PARAM_ARRAY(adapters) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 0, 1, &adapters_param); + if (!adapters_param) { + ZEPHIR_INIT_VAR(&adapters); + array_init(&adapters); + } else { + zephir_get_arrval(&adapters, adapters_param); + } + + + zephir_read_property(®istered, this_ptr, ZEND_STRL("adapters"), PH_NOISY_CC | PH_READONLY); + zephir_is_iterable(&adapters, 0, "phalcon/Logger/Logger.zep", 227); + if (Z_TYPE_P(&adapters) == IS_ARRAY) { + ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&adapters), _0) + { + ZEPHIR_INIT_NVAR(&adapter); + ZVAL_COPY(&adapter, _0); + if (zephir_array_isset(®istered, &adapter)) { + zephir_update_property_array(this_ptr, SL("excluded"), &adapter, &__$true); + } + } ZEND_HASH_FOREACH_END(); + } else { + ZEPHIR_CALL_METHOD(NULL, &adapters, "rewind", NULL, 0); + zephir_check_call_status(); + while (1) { + ZEPHIR_CALL_METHOD(&_1, &adapters, "valid", NULL, 0); + zephir_check_call_status(); + if (!zend_is_true(&_1)) { + break; + } + ZEPHIR_CALL_METHOD(&adapter, &adapters, "current", NULL, 0); + zephir_check_call_status(); + if (zephir_array_isset(®istered, &adapter)) { + zephir_update_property_array(this_ptr, SL("excluded"), &adapter, &__$true); + } + ZEPHIR_CALL_METHOD(NULL, &adapters, "next", NULL, 0); + zephir_check_call_status(); + } + } + ZEPHIR_INIT_NVAR(&adapter); + RETURN_THIS(); +} + +/** + * Returns an adapter from the stack + * + * @param string $name The name of the adapter + * + * @return AdapterInterface + * @throws LoggerException + */ +PHP_METHOD(Phalcon_Logger_Logger, getAdapter) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval *name_param = NULL, adapter, adapters, _0; + zval name; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&name); + ZVAL_UNDEF(&adapter); + ZVAL_UNDEF(&adapters); + ZVAL_UNDEF(&_0); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_STR(name) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &name_param); + zephir_get_strval(&name, name_param); + + + zephir_read_property(&_0, this_ptr, ZEND_STRL("adapters"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CPY_WRT(&adapters, &_0); + ZEPHIR_OBS_VAR(&adapter); + if (!(zephir_array_isset_fetch(&adapter, &adapters, &name, 0))) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_logger_exception_ce, "Adapter does not exist for this logger", "phalcon/Logger/Logger.zep", 245); + return; + } + RETURN_CCTOR(&adapter); +} + +/** + * Interesting events. + * + * Example: User logs in, SQL logs. + * + * @param string $message + * @param array $context + * + * @return void + */ +PHP_METHOD(Phalcon_Logger_Logger, info) +{ + zval _0; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval context; + zval *message, message_sub, *context_param = NULL, _1; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&message_sub); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&context); + ZVAL_UNDEF(&_0); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 2) + Z_PARAM_ZVAL(message) + Z_PARAM_OPTIONAL + Z_PARAM_ARRAY(context) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 1, &message, &context_param); + if (!context_param) { + ZEPHIR_INIT_VAR(&context); + array_init(&context); + } else { + zephir_get_arrval(&context, context_param); + } + + + zephir_cast_to_string(&_0, message); + ZVAL_LONG(&_1, 6); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addmessage", NULL, 0, &_1, &_0, &context); + zephir_check_call_status(); + ZEPHIR_MM_RESTORE(); +} + +/** + * Logs with an arbitrary level. + * + * @param mixed $level + * @param mixed $message + * @param array $context + * + * @throws LoggerException + */ +PHP_METHOD(Phalcon_Logger_Logger, log) +{ + zval _0; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval context; + zval *level, level_sub, *message, message_sub, *context_param = NULL, intLevel; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&level_sub); + ZVAL_UNDEF(&message_sub); + ZVAL_UNDEF(&intLevel); + ZVAL_UNDEF(&context); + ZVAL_UNDEF(&_0); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(2, 3) + Z_PARAM_ZVAL(level) + Z_PARAM_ZVAL(message) + Z_PARAM_OPTIONAL + Z_PARAM_ARRAY(context) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 2, 1, &level, &message, &context_param); + if (!context_param) { + ZEPHIR_INIT_VAR(&context); + array_init(&context); + } else { + zephir_get_arrval(&context, context_param); + } + + + ZEPHIR_CALL_METHOD(&intLevel, this_ptr, "getlevelnumber", NULL, 452, level); + zephir_check_call_status(); + zephir_cast_to_string(&_0, message); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addmessage", NULL, 0, &intLevel, &_0, &context); + zephir_check_call_status(); + ZEPHIR_MM_RESTORE(); +} + +/** + * Normal but significant events. + * + * @param string $message + * @param array $context + * + * @return void + */ +PHP_METHOD(Phalcon_Logger_Logger, notice) +{ + zval _0; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval context; + zval *message, message_sub, *context_param = NULL, _1; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&message_sub); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&context); + ZVAL_UNDEF(&_0); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 2) + Z_PARAM_ZVAL(message) + Z_PARAM_OPTIONAL + Z_PARAM_ARRAY(context) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 1, &message, &context_param); + if (!context_param) { + ZEPHIR_INIT_VAR(&context); + array_init(&context); + } else { + zephir_get_arrval(&context, context_param); + } + + + zephir_cast_to_string(&_0, message); + ZVAL_LONG(&_1, 5); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addmessage", NULL, 0, &_1, &_0, &context); + zephir_check_call_status(); + ZEPHIR_MM_RESTORE(); +} + +/** + * Removes an adapter from the stack + * + * @param string $name The name of the adapter + * + * @return Logger + * @throws LoggerException + */ +PHP_METHOD(Phalcon_Logger_Logger, removeAdapter) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval *name_param = NULL, adapters, _0; + zval name; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&name); + ZVAL_UNDEF(&adapters); + ZVAL_UNDEF(&_0); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_STR(name) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &name_param); + zephir_get_strval(&name, name_param); + + + zephir_read_property(&_0, this_ptr, ZEND_STRL("adapters"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CPY_WRT(&adapters, &_0); + if (1 != zephir_array_isset(&adapters, &name)) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_logger_exception_ce, "Adapter does not exist for this logger", "phalcon/Logger/Logger.zep", 312); + return; + } + zephir_array_unset(&adapters, &name, PH_SEPARATE); + zephir_update_property_zval(this_ptr, ZEND_STRL("adapters"), &adapters); + RETURN_THIS(); +} + +/** + * Sets the adapters stack overriding what is already there + * + * @param array $adapters An array of adapters + * + * @return Logger + */ +PHP_METHOD(Phalcon_Logger_Logger, setAdapters) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval *adapters_param = NULL; + zval adapters; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&adapters); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_ARRAY(adapters) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &adapters_param); + ZEPHIR_OBS_COPY_OR_DUP(&adapters, adapters_param); + + + zephir_update_property_zval(this_ptr, ZEND_STRL("adapters"), &adapters); + RETURN_THIS(); +} + +/** + * Sets the adapters stack overriding what is already there + * + * @param int $level + * + * @return Logger + */ +PHP_METHOD(Phalcon_Logger_Logger, setLogLevel) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval *level_param = NULL, levels, _0; + zend_long level, ZEPHIR_LAST_CALL_STATUS; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&levels); + ZVAL_UNDEF(&_0); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_LONG(level) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &level_param); + level = zephir_get_intval(level_param); + + + ZEPHIR_CALL_METHOD(&levels, this_ptr, "getlevels", NULL, 0); + zephir_check_call_status(); + if (!(zephir_array_isset_long(&levels, level))) { + level = 8; + } + ZEPHIR_INIT_ZVAL_NREF(_0); + ZVAL_LONG(&_0, level); + zephir_update_property_zval(this_ptr, ZEND_STRL("logLevel"), &_0); + RETURN_THIS(); +} + +/** + * Exceptional occurrences that are not errors. + * + * Example: Use of deprecated APIs, poor use of an API, undesirable things + * that are not necessarily wrong. + * + * @param string $message + * @param array $context + * + * @return void + */ +PHP_METHOD(Phalcon_Logger_Logger, warning) +{ + zval _0; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval context; + zval *message, message_sub, *context_param = NULL, _1; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&message_sub); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&context); + ZVAL_UNDEF(&_0); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 2) + Z_PARAM_ZVAL(message) + Z_PARAM_OPTIONAL + Z_PARAM_ARRAY(context) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 1, &message, &context_param); + if (!context_param) { + ZEPHIR_INIT_VAR(&context); + array_init(&context); + } else { + zephir_get_arrval(&context, context_param); + } + + + zephir_cast_to_string(&_0, message); + ZVAL_LONG(&_1, 4); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "addmessage", NULL, 0, &_1, &_0, &context); + zephir_check_call_status(); + ZEPHIR_MM_RESTORE(); +} + +/** + * Adds a message to each handler for processing + * + * @param int $level + * @param string $message + * @param array $context + * + * @return bool + * @throws Exception + * @throws LoggerException + */ +PHP_METHOD(Phalcon_Logger_Logger, addMessage) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval context; + zval message; + zval *level_param = NULL, *message_param = NULL, *context_param = NULL, adapter, adapters, excluded, item, levelName, levels, registered, _0, _1$$3, _2$$3, _3$$3, _4$$3, *_5$$3, _6$$3, _7$$6, _8$$9; + zend_long level, ZEPHIR_LAST_CALL_STATUS; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&adapter); + ZVAL_UNDEF(&adapters); + ZVAL_UNDEF(&excluded); + ZVAL_UNDEF(&item); + ZVAL_UNDEF(&levelName); + ZVAL_UNDEF(&levels); + ZVAL_UNDEF(®istered); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1$$3); + ZVAL_UNDEF(&_2$$3); + ZVAL_UNDEF(&_3$$3); + ZVAL_UNDEF(&_4$$3); + ZVAL_UNDEF(&_6$$3); + ZVAL_UNDEF(&_7$$6); + ZVAL_UNDEF(&_8$$9); + ZVAL_UNDEF(&message); + ZVAL_UNDEF(&context); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(2, 3) + Z_PARAM_LONG(level) + Z_PARAM_STR(message) + Z_PARAM_OPTIONAL + Z_PARAM_ARRAY(context) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 2, 1, &level_param, &message_param, &context_param); + level = zephir_get_intval(level_param); + zephir_get_strval(&message, message_param); + if (!context_param) { + ZEPHIR_INIT_VAR(&context); + array_init(&context); + } else { + zephir_get_arrval(&context, context_param); + } + + + zephir_read_property(&_0, this_ptr, ZEND_STRL("logLevel"), PH_NOISY_CC | PH_READONLY); + if (ZEPHIR_GE_LONG(&_0, level)) { + ZEPHIR_OBS_VAR(®istered); + zephir_read_property(®istered, this_ptr, ZEND_STRL("adapters"), PH_NOISY_CC); + zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("excluded"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CPY_WRT(&excluded, &_1$$3); + ZEPHIR_CALL_METHOD(&levels, this_ptr, "getlevels", NULL, 0); + zephir_check_call_status(); + if (1 == ZEPHIR_IS_EMPTY(®istered)) { + ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_logger_exception_ce, "No adapters specified", "phalcon/Logger/Logger.zep", 397); + return; + } + ZEPHIR_OBS_VAR(&levelName); + if (UNEXPECTED(!(zephir_array_isset_long_fetch(&levelName, &levels, level, 0)))) { + ZEPHIR_OBS_NVAR(&levelName); + zephir_array_fetch_long(&levelName, &levels, 8, PH_NOISY, "phalcon/Logger/Logger.zep", 401); + } + ZEPHIR_INIT_VAR(&item); + object_init_ex(&item, phalcon_logger_item_ce); + ZEPHIR_INIT_VAR(&_2$$3); + object_init_ex(&_2$$3, php_date_get_immutable_ce()); + zephir_read_property(&_1$$3, this_ptr, ZEND_STRL("timezone"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_INIT_VAR(&_3$$3); + ZVAL_STRING(&_3$$3, "now"); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 0, &_3$$3, &_1$$3); + zephir_check_call_status(); + ZVAL_LONG(&_4$$3, level); + ZEPHIR_CALL_METHOD(NULL, &item, "__construct", NULL, 453, &message, &levelName, &_4$$3, &_2$$3, &context); + zephir_check_call_status(); + ZEPHIR_CALL_FUNCTION(&adapters, "array_diff_key", NULL, 285, ®istered, &excluded); + zephir_check_call_status(); + zephir_is_iterable(&adapters, 0, "phalcon/Logger/Logger.zep", 427); + if (Z_TYPE_P(&adapters) == IS_ARRAY) { + ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&adapters), _5$$3) + { + ZEPHIR_INIT_NVAR(&adapter); + ZVAL_COPY(&adapter, _5$$3); + ZEPHIR_CALL_METHOD(&_7$$6, &adapter, "intransaction", NULL, 0); + zephir_check_call_status(); + if (ZEPHIR_IS_TRUE_IDENTICAL(&_7$$6)) { + ZEPHIR_CALL_METHOD(NULL, &adapter, "add", NULL, 0, &item); + zephir_check_call_status(); + } else { + ZEPHIR_CALL_METHOD(NULL, &adapter, "process", NULL, 0, &item); + zephir_check_call_status(); + } + } ZEND_HASH_FOREACH_END(); + } else { + ZEPHIR_CALL_METHOD(NULL, &adapters, "rewind", NULL, 0); + zephir_check_call_status(); + while (1) { + ZEPHIR_CALL_METHOD(&_6$$3, &adapters, "valid", NULL, 0); + zephir_check_call_status(); + if (!zend_is_true(&_6$$3)) { + break; + } + ZEPHIR_CALL_METHOD(&adapter, &adapters, "current", NULL, 0); + zephir_check_call_status(); + ZEPHIR_CALL_METHOD(&_8$$9, &adapter, "intransaction", NULL, 0); + zephir_check_call_status(); + if (ZEPHIR_IS_TRUE_IDENTICAL(&_8$$9)) { + ZEPHIR_CALL_METHOD(NULL, &adapter, "add", NULL, 0, &item); + zephir_check_call_status(); + } else { + ZEPHIR_CALL_METHOD(NULL, &adapter, "process", NULL, 0, &item); + zephir_check_call_status(); + } + ZEPHIR_CALL_METHOD(NULL, &adapters, "next", NULL, 0); + zephir_check_call_status(); + } + } + ZEPHIR_INIT_NVAR(&adapter); + ZEPHIR_INIT_NVAR(&_3$$3); + array_init(&_3$$3); + zephir_update_property_zval(this_ptr, ZEND_STRL("excluded"), &_3$$3); + } + RETURN_MM_BOOL(1); +} + +/** + * Returns an array of log levels with integer to string conversion + * + * @return string[] + */ +PHP_METHOD(Phalcon_Logger_Logger, getLevels) +{ + zval *this_ptr = getThis(); + + + + zephir_create_array(return_value, 9, 0); + add_index_stringl(return_value, 2, SL("ALERT")); + add_index_stringl(return_value, 1, SL("CRITICAL")); + add_index_stringl(return_value, 7, SL("DEBUG")); + add_index_stringl(return_value, 0, SL("EMERGENCY")); + add_index_stringl(return_value, 3, SL("ERROR")); + add_index_stringl(return_value, 6, SL("INFO")); + add_index_stringl(return_value, 5, SL("NOTICE")); + add_index_stringl(return_value, 4, SL("WARNING")); + add_index_stringl(return_value, 8, SL("CUSTOM")); + return; +} + +/** + * Converts the level from string/word to an integer + * + * @param mixed $level + * + * @return int + * @throws InvalidArgumentException + */ +PHP_METHOD(Phalcon_Logger_Logger, getLevelNumber) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zend_long ZEPHIR_LAST_CALL_STATUS; + zval *level, level_sub, levelName, levels, _0$$3, _1$$4; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&level_sub); + ZVAL_UNDEF(&levelName); + ZVAL_UNDEF(&levels); + ZVAL_UNDEF(&_0$$3); + ZVAL_UNDEF(&_1$$4); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(1, 1) + Z_PARAM_ZVAL(level) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 1, 0, &level); + + + if (Z_TYPE_P(level) == IS_STRING) { + ZEPHIR_INIT_VAR(&levelName); + 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, 185, &_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/Logger.zep", 473); + RETURN_CTOR(&_1$$4); + } + } else if (zephir_is_numeric(level)) { + ZEPHIR_CALL_METHOD(&levels, this_ptr, "getlevels", NULL, 0); + zephir_check_call_status(); + if (zephir_array_isset(&levels, level)) { + RETURN_MM_LONG(zephir_get_intval(level)); + } + } + RETURN_MM_LONG(8); +} + +zend_object *zephir_init_properties_Phalcon_Logger_Logger(zend_class_entry *class_type) +{ + zval _0, _2, _1$$3, _3$$4; + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_1$$3); + ZVAL_UNDEF(&_3$$4); + + + ZEPHIR_MM_GROW(); + + { + zval local_this_ptr, *this_ptr = &local_this_ptr; + ZEPHIR_CREATE_OBJECT(this_ptr, class_type); + zephir_read_property_ex(&_0, this_ptr, ZEND_STRL("excluded"), PH_NOISY_CC | PH_READONLY); + if (Z_TYPE_P(&_0) == IS_NULL) { + ZEPHIR_INIT_VAR(&_1$$3); + array_init(&_1$$3); + zephir_update_property_zval_ex(this_ptr, ZEND_STRL("excluded"), &_1$$3); + } + zephir_read_property_ex(&_2, this_ptr, ZEND_STRL("adapters"), PH_NOISY_CC | PH_READONLY); + if (Z_TYPE_P(&_2) == IS_NULL) { + ZEPHIR_INIT_VAR(&_3$$4); + array_init(&_3$$4); + zephir_update_property_zval_ex(this_ptr, ZEND_STRL("adapters"), &_3$$4); + } + ZEPHIR_MM_RESTORE(); + return Z_OBJ_P(this_ptr); + } +} + diff --git a/ext/phalcon/logger/logger.zep.h b/ext/phalcon/logger/logger.zep.h new file mode 100644 index 0000000000..5a532347ff --- /dev/null +++ b/ext/phalcon/logger/logger.zep.h @@ -0,0 +1,217 @@ + +extern zend_class_entry *phalcon_logger_logger_ce; + +ZEPHIR_INIT_CLASS(Phalcon_Logger_Logger); + +PHP_METHOD(Phalcon_Logger_Logger, getAdapters); +PHP_METHOD(Phalcon_Logger_Logger, getLogLevel); +PHP_METHOD(Phalcon_Logger_Logger, getName); +PHP_METHOD(Phalcon_Logger_Logger, __construct); +PHP_METHOD(Phalcon_Logger_Logger, addAdapter); +PHP_METHOD(Phalcon_Logger_Logger, alert); +PHP_METHOD(Phalcon_Logger_Logger, critical); +PHP_METHOD(Phalcon_Logger_Logger, debug); +PHP_METHOD(Phalcon_Logger_Logger, error); +PHP_METHOD(Phalcon_Logger_Logger, emergency); +PHP_METHOD(Phalcon_Logger_Logger, excludeAdapters); +PHP_METHOD(Phalcon_Logger_Logger, getAdapter); +PHP_METHOD(Phalcon_Logger_Logger, info); +PHP_METHOD(Phalcon_Logger_Logger, log); +PHP_METHOD(Phalcon_Logger_Logger, notice); +PHP_METHOD(Phalcon_Logger_Logger, removeAdapter); +PHP_METHOD(Phalcon_Logger_Logger, setAdapters); +PHP_METHOD(Phalcon_Logger_Logger, setLogLevel); +PHP_METHOD(Phalcon_Logger_Logger, warning); +PHP_METHOD(Phalcon_Logger_Logger, addMessage); +PHP_METHOD(Phalcon_Logger_Logger, getLevels); +PHP_METHOD(Phalcon_Logger_Logger, getLevelNumber); +zend_object *zephir_init_properties_Phalcon_Logger_Logger(zend_class_entry *class_type); + +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_logger_getadapters, 0, 0, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_logger_getloglevel, 0, 0, IS_LONG, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_logger_getname, 0, 0, IS_STRING, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_logger___construct, 0, 0, 1) + ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, adapters, IS_ARRAY, 0, "[]") +#else + ZEND_ARG_ARRAY_INFO(0, adapters, 0) +#endif + ZEND_ARG_OBJ_INFO(0, timezone, DateTimeZone, 1) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_logger_logger_addadapter, 0, 2, Phalcon\\Logger\\Logger, 0) + ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) + ZEND_ARG_OBJ_INFO(0, adapter, Phalcon\\Logger\\Adapter\\AdapterInterface, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_logger_alert, 0, 1, IS_VOID, 0) + + ZEND_ARG_INFO(0, message) +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") +#else + ZEND_ARG_ARRAY_INFO(0, context, 0) +#endif +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_logger_critical, 0, 1, IS_VOID, 0) + + ZEND_ARG_INFO(0, message) +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") +#else + ZEND_ARG_ARRAY_INFO(0, context, 0) +#endif +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_logger_debug, 0, 1, IS_VOID, 0) + + ZEND_ARG_INFO(0, message) +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") +#else + ZEND_ARG_ARRAY_INFO(0, context, 0) +#endif +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_logger_error, 0, 1, IS_VOID, 0) + + ZEND_ARG_INFO(0, message) +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") +#else + ZEND_ARG_ARRAY_INFO(0, context, 0) +#endif +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_logger_emergency, 0, 1, IS_VOID, 0) + + ZEND_ARG_INFO(0, message) +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") +#else + ZEND_ARG_ARRAY_INFO(0, context, 0) +#endif +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_logger_logger_excludeadapters, 0, 0, Phalcon\\Logger\\Logger, 0) +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, adapters, IS_ARRAY, 0, "[]") +#else + ZEND_ARG_ARRAY_INFO(0, adapters, 0) +#endif +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_logger_logger_getadapter, 0, 1, Phalcon\\Logger\\Adapter\\AdapterInterface, 0) + ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_logger_info, 0, 1, IS_VOID, 0) + + ZEND_ARG_INFO(0, message) +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") +#else + ZEND_ARG_ARRAY_INFO(0, context, 0) +#endif +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_logger_log, 0, 2, IS_VOID, 0) + + ZEND_ARG_INFO(0, level) + ZEND_ARG_INFO(0, message) +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") +#else + ZEND_ARG_ARRAY_INFO(0, context, 0) +#endif +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_logger_notice, 0, 1, IS_VOID, 0) + + ZEND_ARG_INFO(0, message) +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") +#else + ZEND_ARG_ARRAY_INFO(0, context, 0) +#endif +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_logger_logger_removeadapter, 0, 1, Phalcon\\Logger\\Logger, 0) + ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_logger_logger_setadapters, 0, 1, Phalcon\\Logger\\Logger, 0) + ZEND_ARG_ARRAY_INFO(0, adapters, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_logger_logger_setloglevel, 0, 1, Phalcon\\Logger\\Logger, 0) + ZEND_ARG_TYPE_INFO(0, level, IS_LONG, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_logger_warning, 0, 1, IS_VOID, 0) + + ZEND_ARG_INFO(0, message) +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") +#else + ZEND_ARG_ARRAY_INFO(0, context, 0) +#endif +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_logger_addmessage, 0, 2, _IS_BOOL, 0) + ZEND_ARG_TYPE_INFO(0, level, IS_LONG, 0) + ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0) +#if PHP_VERSION_ID >= 80000 + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "[]") +#else + ZEND_ARG_ARRAY_INFO(0, context, 0) +#endif +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_logger_getlevels, 0, 0, IS_ARRAY, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_logger_getlevelnumber, 0, 1, IS_LONG, 0) + ZEND_ARG_INFO(0, level) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_logger_zephir_init_properties_phalcon_logger_logger, 0, 0, 0) +ZEND_END_ARG_INFO() + +ZEPHIR_INIT_FUNCS(phalcon_logger_logger_method_entry) { +#if PHP_VERSION_ID >= 80000 + PHP_ME(Phalcon_Logger_Logger, getAdapters, arginfo_phalcon_logger_logger_getadapters, ZEND_ACC_PUBLIC) +#else + PHP_ME(Phalcon_Logger_Logger, getAdapters, NULL, ZEND_ACC_PUBLIC) +#endif + PHP_ME(Phalcon_Logger_Logger, getLogLevel, arginfo_phalcon_logger_logger_getloglevel, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Logger_Logger, getName, arginfo_phalcon_logger_logger_getname, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Logger_Logger, __construct, arginfo_phalcon_logger_logger___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) + PHP_ME(Phalcon_Logger_Logger, addAdapter, arginfo_phalcon_logger_logger_addadapter, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Logger_Logger, alert, arginfo_phalcon_logger_logger_alert, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Logger_Logger, critical, arginfo_phalcon_logger_logger_critical, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Logger_Logger, debug, arginfo_phalcon_logger_logger_debug, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Logger_Logger, error, arginfo_phalcon_logger_logger_error, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Logger_Logger, emergency, arginfo_phalcon_logger_logger_emergency, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Logger_Logger, excludeAdapters, arginfo_phalcon_logger_logger_excludeadapters, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Logger_Logger, getAdapter, arginfo_phalcon_logger_logger_getadapter, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Logger_Logger, info, arginfo_phalcon_logger_logger_info, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Logger_Logger, log, arginfo_phalcon_logger_logger_log, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Logger_Logger, notice, arginfo_phalcon_logger_logger_notice, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Logger_Logger, removeAdapter, arginfo_phalcon_logger_logger_removeadapter, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Logger_Logger, setAdapters, arginfo_phalcon_logger_logger_setadapters, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Logger_Logger, setLogLevel, arginfo_phalcon_logger_logger_setloglevel, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Logger_Logger, warning, arginfo_phalcon_logger_logger_warning, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Logger_Logger, addMessage, arginfo_phalcon_logger_logger_addmessage, ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Logger_Logger, getLevels, arginfo_phalcon_logger_logger_getlevels, ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Logger_Logger, getLevelNumber, arginfo_phalcon_logger_logger_getlevelnumber, ZEND_ACC_PRIVATE) + PHP_FE_END +}; diff --git a/ext/phalcon/logger/loggerfactory.zep.c b/ext/phalcon/logger/loggerfactory.zep.c index 17d35ac1c1..72fa46ca35 100644 --- a/ext/phalcon/logger/loggerfactory.zep.c +++ b/ext/phalcon/logger/loggerfactory.zep.c @@ -15,10 +15,11 @@ #include "kernel/object.h" #include "kernel/memory.h" #include "kernel/fcall.h" -#include "kernel/exception.h" #include "kernel/array.h" -#include "ext/spl/spl_exceptions.h" #include "kernel/operators.h" +#include "ext/date/php_date.h" +#include "ext/spl/spl_exceptions.h" +#include "kernel/exception.h" /** @@ -30,13 +31,11 @@ * file that was distributed with this source code. */ /** - * Phalcon\Logger\LoggerFactory - * - * Logger factory + * Factory creating logger objects */ ZEPHIR_INIT_CLASS(Phalcon_Logger_LoggerFactory) { - ZEPHIR_REGISTER_CLASS(Phalcon\\Logger, LoggerFactory, phalcon, logger_loggerfactory, phalcon_logger_loggerfactory_method_entry, 0); + ZEPHIR_REGISTER_CLASS_EX(Phalcon\\Logger, LoggerFactory, phalcon, logger_loggerfactory, phalcon_factory_abstractconfigfactory_ce, phalcon_logger_loggerfactory_method_entry, 0); /** * @var AdapterFactory @@ -45,6 +44,9 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_LoggerFactory) return SUCCESS; } +/** + * @param AdapterFactory $factory + */ PHP_METHOD(Phalcon_Logger_LoggerFactory, __construct) { zval *factory, factory_sub; @@ -68,14 +70,14 @@ PHP_METHOD(Phalcon_Logger_LoggerFactory, __construct) /** * Factory to create an instance from a Config object * - * @param array|\Phalcon\Config\Config config = [ - * 'name' => 'messages', + * @param array|ConfigInterface $config = [ + * 'name' => 'messages', * 'adapters' => [ * 'adapter' => 'stream', - * 'name' => 'file.log', + * 'name' => 'file.log', * 'options' => [ - * 'mode' => 'ab', - * 'option' => null, + * 'mode' => 'ab', + * 'option' => null, * 'facility' => null * ] * ] @@ -83,12 +85,10 @@ PHP_METHOD(Phalcon_Logger_LoggerFactory, __construct) */ PHP_METHOD(Phalcon_Logger_LoggerFactory, load) { - zend_bool _0; zval data; zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zephir_fcall_cache_entry *_2 = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *config = NULL, config_sub, adapter, adapterClass, adapterFileName, adapterOptions, adapters, name, options, _3, _4, _5, *_6, _7, _1$$3, _8$$6, _9$$6, _10$$6, _11$$6, _12$$7, _13$$7, _14$$7, _15$$7; + zval *config = NULL, config_sub, adapter, adapterClass, adapterFileName, adapterOptions, adapters, name, timezone, options, _0, _1, _2, _3, *_4, _5, _6$$3, _7$$3, _8$$3, _9$$3, _10$$4, _11$$4, _12$$4, _13$$4; zval *this_ptr = getThis(); ZVAL_UNDEF(&config_sub); @@ -98,20 +98,21 @@ PHP_METHOD(Phalcon_Logger_LoggerFactory, load) ZVAL_UNDEF(&adapterOptions); ZVAL_UNDEF(&adapters); ZVAL_UNDEF(&name); + ZVAL_UNDEF(&timezone); ZVAL_UNDEF(&options); + ZVAL_UNDEF(&_0); + ZVAL_UNDEF(&_1); + ZVAL_UNDEF(&_2); ZVAL_UNDEF(&_3); - ZVAL_UNDEF(&_4); ZVAL_UNDEF(&_5); - ZVAL_UNDEF(&_7); - ZVAL_UNDEF(&_1$$3); - ZVAL_UNDEF(&_8$$6); - ZVAL_UNDEF(&_9$$6); - ZVAL_UNDEF(&_10$$6); - ZVAL_UNDEF(&_11$$6); - ZVAL_UNDEF(&_12$$7); - ZVAL_UNDEF(&_13$$7); - ZVAL_UNDEF(&_14$$7); - ZVAL_UNDEF(&_15$$7); + ZVAL_UNDEF(&_6$$3); + ZVAL_UNDEF(&_7$$3); + ZVAL_UNDEF(&_8$$3); + ZVAL_UNDEF(&_9$$3); + ZVAL_UNDEF(&_10$$4); + ZVAL_UNDEF(&_11$$4); + ZVAL_UNDEF(&_12$$4); + ZVAL_UNDEF(&_13$$4); ZVAL_UNDEF(&data); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; @@ -126,99 +127,94 @@ PHP_METHOD(Phalcon_Logger_LoggerFactory, load) ZEPHIR_SEPARATE_PARAM(config); - _0 = Z_TYPE_P(config) == IS_OBJECT; - if (_0) { - _0 = zephir_instance_of_ev(config, phalcon_config_configinterface_ce); - } - if (_0) { - ZEPHIR_CALL_METHOD(&_1$$3, config, "toarray", NULL, 0); - zephir_check_call_status(); - ZEPHIR_CPY_WRT(config, &_1$$3); - } - if (UNEXPECTED(Z_TYPE_P(config) != IS_ARRAY)) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_logger_exception_ce, "Config must be array or Phalcon\\Config\\Config object", "phalcon/Logger/LoggerFactory.zep", 63); - return; - } - if (UNEXPECTED(!(zephir_array_isset_string(config, SL("name"))))) { - ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_logger_exception_ce, "You must provide 'name' option in factory config parameter.", "phalcon/Logger/LoggerFactory.zep", 69); - return; - } + ZEPHIR_INIT_VAR(&data); + array_init(&data); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkconfig", NULL, 0, config); + zephir_check_call_status(); + ZEPHIR_CPY_WRT(config, &_0); + ZEPHIR_INIT_VAR(&_1); + ZVAL_STRING(&_1, "name"); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkconfigelement", NULL, 0, config, &_1); + zephir_check_call_status(); + ZEPHIR_CPY_WRT(config, &_0); ZEPHIR_OBS_VAR(&name); - zephir_array_fetch_string(&name, config, SL("name"), PH_NOISY, "phalcon/Logger/LoggerFactory.zep", 72); - ZEPHIR_INIT_VAR(&_3); - array_init(&_3); - ZEPHIR_INIT_VAR(&_4); - ZVAL_STRING(&_4, "options"); - ZEPHIR_CALL_CE_STATIC(&options, phalcon_helper_arr_ce, "get", &_2, 81, config, &_4, &_3); + zephir_array_fetch_string(&name, config, SL("name"), PH_NOISY, "phalcon/Logger/LoggerFactory.zep", 60); + ZEPHIR_INIT_NVAR(&_1); + ZVAL_STRING(&_1, "timezone"); + ZEPHIR_CALL_METHOD(&timezone, this_ptr, "getarrval", NULL, 0, config, &_1); zephir_check_call_status(); - ZEPHIR_INIT_NVAR(&_4); - array_init(&_4); - ZEPHIR_INIT_VAR(&_5); - ZVAL_STRING(&_5, "adapters"); - ZEPHIR_CALL_CE_STATIC(&adapters, phalcon_helper_arr_ce, "get", &_2, 81, config, &_5, &_4); + ZEPHIR_INIT_NVAR(&_1); + array_init(&_1); + ZEPHIR_INIT_VAR(&_2); + ZVAL_STRING(&_2, "options"); + ZEPHIR_CALL_METHOD(&options, this_ptr, "getarrval", NULL, 0, config, &_2, &_1); zephir_check_call_status(); - ZEPHIR_INIT_VAR(&data); - array_init(&data); - zephir_is_iterable(&adapters, 0, "phalcon/Logger/LoggerFactory.zep", 89); + ZEPHIR_INIT_NVAR(&_2); + array_init(&_2); + ZEPHIR_INIT_VAR(&_3); + ZVAL_STRING(&_3, "adapters"); + ZEPHIR_CALL_METHOD(&adapters, this_ptr, "getarrval", NULL, 0, &options, &_3, &_2); + zephir_check_call_status(); + zephir_is_iterable(&adapters, 0, "phalcon/Logger/LoggerFactory.zep", 79); if (Z_TYPE_P(&adapters) == IS_ARRAY) { - ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&adapters), _6) + ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(&adapters), _4) { ZEPHIR_INIT_NVAR(&adapter); - ZVAL_COPY(&adapter, _6); - ZEPHIR_INIT_NVAR(&_8$$6); - ZVAL_STRING(&_8$$6, "adapter"); - ZEPHIR_CALL_CE_STATIC(&adapterClass, phalcon_helper_arr_ce, "get", &_2, 81, &adapter, &_8$$6); + ZVAL_COPY(&adapter, _4); + ZEPHIR_INIT_NVAR(&_6$$3); + ZVAL_STRING(&_6$$3, "adapter"); + ZEPHIR_CALL_METHOD(&adapterClass, this_ptr, "getarrval", NULL, 0, &adapter, &_6$$3); zephir_check_call_status(); - ZEPHIR_INIT_NVAR(&_8$$6); - ZVAL_STRING(&_8$$6, "name"); - ZEPHIR_CALL_CE_STATIC(&adapterFileName, phalcon_helper_arr_ce, "get", &_2, 81, &adapter, &_8$$6); + ZEPHIR_INIT_NVAR(&_6$$3); + ZVAL_STRING(&_6$$3, "name"); + ZEPHIR_CALL_METHOD(&adapterFileName, this_ptr, "getarrval", NULL, 0, &adapter, &_6$$3); zephir_check_call_status(); - ZEPHIR_INIT_NVAR(&_8$$6); - array_init(&_8$$6); - ZEPHIR_INIT_NVAR(&_9$$6); - ZVAL_STRING(&_9$$6, "options"); - ZEPHIR_CALL_CE_STATIC(&adapterOptions, phalcon_helper_arr_ce, "get", &_2, 81, &adapter, &_9$$6, &_8$$6); + ZEPHIR_INIT_NVAR(&_6$$3); + array_init(&_6$$3); + ZEPHIR_INIT_NVAR(&_7$$3); + ZVAL_STRING(&_7$$3, "options"); + ZEPHIR_CALL_METHOD(&adapterOptions, this_ptr, "getarrval", NULL, 0, &adapter, &_7$$3, &_6$$3); zephir_check_call_status(); - zephir_read_property(&_10$$6, this_ptr, ZEND_STRL("adapterFactory"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&_11$$6, &_10$$6, "newinstance", NULL, 0, &adapterClass, &adapterFileName, &adapterOptions); + zephir_read_property(&_8$$3, this_ptr, ZEND_STRL("adapterFactory"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(&_9$$3, &_8$$3, "newinstance", NULL, 0, &adapterClass, &adapterFileName, &adapterOptions); zephir_check_call_status(); - zephir_array_append(&data, &_11$$6, PH_SEPARATE, "phalcon/Logger/LoggerFactory.zep", 86); + zephir_array_append(&data, &_9$$3, PH_SEPARATE, "phalcon/Logger/LoggerFactory.zep", 76); } ZEND_HASH_FOREACH_END(); } else { ZEPHIR_CALL_METHOD(NULL, &adapters, "rewind", NULL, 0); zephir_check_call_status(); while (1) { - ZEPHIR_CALL_METHOD(&_7, &adapters, "valid", NULL, 0); + ZEPHIR_CALL_METHOD(&_5, &adapters, "valid", NULL, 0); zephir_check_call_status(); - if (!zend_is_true(&_7)) { + if (!zend_is_true(&_5)) { break; } ZEPHIR_CALL_METHOD(&adapter, &adapters, "current", NULL, 0); zephir_check_call_status(); - ZEPHIR_INIT_NVAR(&_12$$7); - ZVAL_STRING(&_12$$7, "adapter"); - ZEPHIR_CALL_CE_STATIC(&adapterClass, phalcon_helper_arr_ce, "get", &_2, 81, &adapter, &_12$$7); + ZEPHIR_INIT_NVAR(&_10$$4); + ZVAL_STRING(&_10$$4, "adapter"); + ZEPHIR_CALL_METHOD(&adapterClass, this_ptr, "getarrval", NULL, 0, &adapter, &_10$$4); zephir_check_call_status(); - ZEPHIR_INIT_NVAR(&_12$$7); - ZVAL_STRING(&_12$$7, "name"); - ZEPHIR_CALL_CE_STATIC(&adapterFileName, phalcon_helper_arr_ce, "get", &_2, 81, &adapter, &_12$$7); + ZEPHIR_INIT_NVAR(&_10$$4); + ZVAL_STRING(&_10$$4, "name"); + ZEPHIR_CALL_METHOD(&adapterFileName, this_ptr, "getarrval", NULL, 0, &adapter, &_10$$4); zephir_check_call_status(); - ZEPHIR_INIT_NVAR(&_12$$7); - array_init(&_12$$7); - ZEPHIR_INIT_NVAR(&_13$$7); - ZVAL_STRING(&_13$$7, "options"); - ZEPHIR_CALL_CE_STATIC(&adapterOptions, phalcon_helper_arr_ce, "get", &_2, 81, &adapter, &_13$$7, &_12$$7); + ZEPHIR_INIT_NVAR(&_10$$4); + array_init(&_10$$4); + ZEPHIR_INIT_NVAR(&_11$$4); + ZVAL_STRING(&_11$$4, "options"); + ZEPHIR_CALL_METHOD(&adapterOptions, this_ptr, "getarrval", NULL, 0, &adapter, &_11$$4, &_10$$4); zephir_check_call_status(); - zephir_read_property(&_14$$7, this_ptr, ZEND_STRL("adapterFactory"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(&_15$$7, &_14$$7, "newinstance", NULL, 0, &adapterClass, &adapterFileName, &adapterOptions); + zephir_read_property(&_12$$4, this_ptr, ZEND_STRL("adapterFactory"), PH_NOISY_CC | PH_READONLY); + ZEPHIR_CALL_METHOD(&_13$$4, &_12$$4, "newinstance", NULL, 0, &adapterClass, &adapterFileName, &adapterOptions); zephir_check_call_status(); - zephir_array_append(&data, &_15$$7, PH_SEPARATE, "phalcon/Logger/LoggerFactory.zep", 86); + zephir_array_append(&data, &_13$$4, PH_SEPARATE, "phalcon/Logger/LoggerFactory.zep", 76); ZEPHIR_CALL_METHOD(NULL, &adapters, "next", NULL, 0); zephir_check_call_status(); } } ZEPHIR_INIT_NVAR(&adapter); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "newinstance", NULL, 0, &name, &data); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "newinstance", NULL, 0, &name, &data, &timezone); zephir_check_call_status(); RETURN_MM(); } @@ -226,8 +222,9 @@ PHP_METHOD(Phalcon_Logger_LoggerFactory, load) /** * Returns a Logger object * - * @param string $name - * @param array $adapters + * @param string $name + * @param array $adapters + * @param DateTimeZone|null $timezone * * @return Logger */ @@ -236,44 +233,97 @@ PHP_METHOD(Phalcon_Logger_LoggerFactory, newInstance) zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; zval adapters; - zval *name_param = NULL, *adapters_param = NULL; + zval *name_param = NULL, *adapters_param = NULL, *timezone = NULL, timezone_sub, __$null; zval name; zval *this_ptr = getThis(); ZVAL_UNDEF(&name); + ZVAL_UNDEF(&timezone_sub); + ZVAL_NULL(&__$null); ZVAL_UNDEF(&adapters); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; - ZEND_PARSE_PARAMETERS_START(1, 2) + ZEND_PARSE_PARAMETERS_START(1, 3) Z_PARAM_STR(name) Z_PARAM_OPTIONAL Z_PARAM_ARRAY(adapters) + Z_PARAM_OBJECT_OF_CLASS_OR_NULL(timezone, php_date_get_timezone_ce()) ZEND_PARSE_PARAMETERS_END(); #endif ZEPHIR_MM_GROW(); - zephir_fetch_params(1, 1, 1, &name_param, &adapters_param); - if (UNEXPECTED(Z_TYPE_P(name_param) != IS_STRING && Z_TYPE_P(name_param) != IS_NULL)) { - zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'name' must be of the type string")); - RETURN_MM_NULL(); - } - if (EXPECTED(Z_TYPE_P(name_param) == IS_STRING)) { - zephir_get_strval(&name, name_param); - } else { - ZEPHIR_INIT_VAR(&name); - } + zephir_fetch_params(1, 1, 2, &name_param, &adapters_param, &timezone); + zephir_get_strval(&name, name_param); if (!adapters_param) { ZEPHIR_INIT_VAR(&adapters); array_init(&adapters); } else { - ZEPHIR_OBS_COPY_OR_DUP(&adapters, adapters_param); + zephir_get_arrval(&adapters, adapters_param); + } + if (!timezone) { + timezone = &timezone_sub; + timezone = &__$null; } - object_init_ex(return_value, phalcon_logger_ce); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 453, &name, &adapters); + object_init_ex(return_value, phalcon_logger_logger_ce); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 454, &name, &adapters, timezone); zephir_check_call_status(); RETURN_MM(); } +/** + * @todo Remove this when we get traits + */ +PHP_METHOD(Phalcon_Logger_LoggerFactory, getArrVal) +{ + zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; + zval *collection_param = NULL, *index, index_sub, *defaultValue = NULL, defaultValue_sub, __$null, value; + zval collection; + zval *this_ptr = getThis(); + + ZVAL_UNDEF(&collection); + ZVAL_UNDEF(&index_sub); + ZVAL_UNDEF(&defaultValue_sub); + ZVAL_NULL(&__$null); + ZVAL_UNDEF(&value); +#if PHP_VERSION_ID >= 80000 + bool is_null_true = 1; + ZEND_PARSE_PARAMETERS_START(2, 3) + Z_PARAM_ARRAY(collection) + Z_PARAM_ZVAL(index) + Z_PARAM_OPTIONAL + Z_PARAM_ZVAL_OR_NULL(defaultValue) + ZEND_PARSE_PARAMETERS_END(); +#endif + + + ZEPHIR_MM_GROW(); + zephir_fetch_params(1, 2, 1, &collection_param, &index, &defaultValue); + ZEPHIR_OBS_COPY_OR_DUP(&collection, collection_param); + if (!defaultValue) { + defaultValue = &defaultValue_sub; + defaultValue = &__$null; + } + + + if (UNEXPECTED(!(zephir_array_isset_fetch(&value, &collection, index, 1)))) { + RETVAL_ZVAL(defaultValue, 1, 0); + RETURN_MM(); + } + RETURN_CTOR(&value); +} + +/** + * @return string + */ +PHP_METHOD(Phalcon_Logger_LoggerFactory, getExceptionClass) +{ + zval *this_ptr = getThis(); + + + + RETURN_STRING("Phalcon\\Logger\\Exception"); +} + diff --git a/ext/phalcon/logger/loggerfactory.zep.h b/ext/phalcon/logger/loggerfactory.zep.h index 6ded6e5ee3..fab301ba45 100644 --- a/ext/phalcon/logger/loggerfactory.zep.h +++ b/ext/phalcon/logger/loggerfactory.zep.h @@ -6,27 +6,41 @@ ZEPHIR_INIT_CLASS(Phalcon_Logger_LoggerFactory); PHP_METHOD(Phalcon_Logger_LoggerFactory, __construct); PHP_METHOD(Phalcon_Logger_LoggerFactory, load); PHP_METHOD(Phalcon_Logger_LoggerFactory, newInstance); +PHP_METHOD(Phalcon_Logger_LoggerFactory, getArrVal); +PHP_METHOD(Phalcon_Logger_LoggerFactory, getExceptionClass); ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_loggerfactory___construct, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, factory, Phalcon\\Logger\\AdapterFactory, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_logger_loggerfactory_load, 0, 1, Phalcon\\Logger, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_logger_loggerfactory_load, 0, 1, Phalcon\\Logger\\Logger, 0) ZEND_ARG_INFO(0, config) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_logger_loggerfactory_newinstance, 0, 1, Phalcon\\Logger, 0) +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_phalcon_logger_loggerfactory_newinstance, 0, 1, Phalcon\\Logger\\Logger, 0) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) #if PHP_VERSION_ID >= 80000 ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, adapters, IS_ARRAY, 0, "[]") #else ZEND_ARG_ARRAY_INFO(0, adapters, 0) #endif + ZEND_ARG_OBJ_INFO(0, timezone, DateTimeZone, 1) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_logger_loggerfactory_getarrval, 0, 0, 2) + ZEND_ARG_ARRAY_INFO(0, collection, 0) + ZEND_ARG_INFO(0, index) + ZEND_ARG_INFO(0, defaultValue) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_phalcon_logger_loggerfactory_getexceptionclass, 0, 0, IS_STRING, 0) ZEND_END_ARG_INFO() ZEPHIR_INIT_FUNCS(phalcon_logger_loggerfactory_method_entry) { PHP_ME(Phalcon_Logger_LoggerFactory, __construct, arginfo_phalcon_logger_loggerfactory___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) PHP_ME(Phalcon_Logger_LoggerFactory, load, arginfo_phalcon_logger_loggerfactory_load, ZEND_ACC_PUBLIC) PHP_ME(Phalcon_Logger_LoggerFactory, newInstance, arginfo_phalcon_logger_loggerfactory_newinstance, ZEND_ACC_PUBLIC) + PHP_ME(Phalcon_Logger_LoggerFactory, getArrVal, arginfo_phalcon_logger_loggerfactory_getarrval, ZEND_ACC_PROTECTED) + PHP_ME(Phalcon_Logger_LoggerFactory, getExceptionClass, arginfo_phalcon_logger_loggerfactory_getexceptionclass, ZEND_ACC_PROTECTED) PHP_FE_END }; diff --git a/ext/phalcon/messages/messages.zep.c b/ext/phalcon/messages/messages.zep.c index 84d3bfab99..4c7826c625 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, 454, &_1$$3, index, &_2$$3); + ZEPHIR_CALL_FUNCTION(NULL, "array_splice", NULL, 455, &_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 4dae9bcd09..5c5844d13c 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, 455); + ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 456); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container); } - ZEPHIR_RETURN_CALL_METHOD(&container, "get", NULL, 456, &serviceName); + ZEPHIR_RETURN_CALL_METHOD(&container, "get", NULL, 457, &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, 455); + ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 456); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container); } - ZEPHIR_RETURN_CALL_METHOD(&container, "getshared", NULL, 457, &serviceName); + ZEPHIR_RETURN_CALL_METHOD(&container, "getshared", NULL, 458, &serviceName); zephir_check_call_status(); RETURN_MM(); } @@ -1449,11 +1449,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, 455); + ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 456); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container); } - ZEPHIR_RETURN_CALL_METHOD(&container, "has", NULL, 458, &serviceName); + ZEPHIR_RETURN_CALL_METHOD(&container, "has", NULL, 459, &serviceName); zephir_check_call_status(); RETURN_MM(); } @@ -1615,7 +1615,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, 459, &mainHandler); + ZEPHIR_CALL_METHOD(NULL, &lazyHandler, "__construct", NULL, 460, &mainHandler); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&lazyHandler, &mainHandler); @@ -1894,11 +1894,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, 455); + ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 456); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container); } - ZEPHIR_CALL_METHOD(NULL, &container, "remove", NULL, 460, alias); + ZEPHIR_CALL_METHOD(NULL, &container, "remove", NULL, 461, alias); zephir_check_call_status(); ZEPHIR_MM_RESTORE(); } @@ -2301,7 +2301,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, 455); + ZEPHIR_CALL_METHOD(NULL, &container, "__construct", NULL, 456); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("container"), &container); } @@ -2310,7 +2310,7 @@ PHP_METHOD(Phalcon_Mvc_Micro, setService) } else { ZVAL_BOOL(&_0, 0); } - ZEPHIR_RETURN_CALL_METHOD(&container, "set", NULL, 461, &serviceName, definition, &_0); + ZEPHIR_RETURN_CALL_METHOD(&container, "set", NULL, 462, &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 57091b8312..b233f9a080 100644 --- a/ext/phalcon/mvc/model.zep.c +++ b/ext/phalcon/mvc/model.zep.c @@ -300,7 +300,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __call) zephir_get_arrval(&arguments, arguments_param); - ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 462, &method, &arguments); + ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 463, &method, &arguments); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&records)) { RETURN_CCTOR(&records); @@ -366,7 +366,7 @@ PHP_METHOD(Phalcon_Mvc_Model, __callStatic) zephir_get_arrval(&arguments, arguments_param); - ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 462, &method, &arguments); + ZEPHIR_CALL_SELF(&records, "invokefinder", &_0, 463, &method, &arguments); zephir_check_call_status(); if (!ZEPHIR_IS_FALSE_IDENTICAL(&records)) { RETURN_CCTOR(&records); @@ -708,13 +708,13 @@ PHP_METHOD(Phalcon_Mvc_Model, __set) } } - ZEPHIR_CALL_METHOD(&_14, this_ptr, "possiblesetter", NULL, 463, &property, value); + ZEPHIR_CALL_METHOD(&_14, this_ptr, "possiblesetter", NULL, 464, &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, 464, this_ptr, &property); + ZEPHIR_CALL_FUNCTION(&_15, "property_exists", NULL, 465, this_ptr, &property); zephir_check_call_status(); if (zephir_is_true(&_15)) { ZEPHIR_CALL_METHOD(&manager, this_ptr, "getmodelsmanager", NULL, 0); @@ -1027,7 +1027,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, 465, &columnMap, &attribute); + ZEPHIR_CALL_SELF(&_8$$13, "caseinsensitivecolumnmap", &_9, 466, &columnMap, &attribute); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attribute, &_8$$13); } @@ -1059,7 +1059,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, 463, &attributeField, &value); + ZEPHIR_CALL_METHOD(&_14$$18, this_ptr, "possiblesetter", &_15, 464, &attributeField, &value); zephir_check_call_status(); _13$$18 = !zephir_is_true(&_14$$18); } @@ -1084,7 +1084,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, 465, &columnMap, &attribute); + ZEPHIR_CALL_SELF(&_17$$23, "caseinsensitivecolumnmap", &_9, 466, &columnMap, &attribute); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attribute, &_17$$23); } @@ -1116,7 +1116,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, 463, &attributeField, &value); + ZEPHIR_CALL_METHOD(&_21$$28, this_ptr, "possiblesetter", &_15, 464, &attributeField, &value); zephir_check_call_status(); _20$$28 = !zephir_is_true(&_21$$28); } @@ -1730,7 +1730,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, 465, columnMap, &key); + ZEPHIR_CALL_SELF(&_5$$8, "caseinsensitivecolumnmap", &_6, 466, columnMap, &key); zephir_check_call_status(); ZEPHIR_CPY_WRT(&key, &_5$$8); } @@ -1782,7 +1782,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, 465, columnMap, &key); + ZEPHIR_CALL_SELF(&_11$$17, "caseinsensitivecolumnmap", &_6, 466, columnMap, &key); zephir_check_call_status(); ZEPHIR_CPY_WRT(&key, &_11$$17); } @@ -1818,7 +1818,7 @@ PHP_METHOD(Phalcon_Mvc_Model, cloneResultMapHydrate) ZEPHIR_INIT_NVAR(&value); ZEPHIR_INIT_NVAR(&key); if (hydrationMode != 1) { - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_helper_arr_ce, "toobject", &_14, 466, &hydrateArray); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_helper_arr_ce, "toobject", &_14, 467, &hydrateArray); zephir_check_call_status(); RETURN_MM(); } @@ -2027,7 +2027,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, 467); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "getwriteconnection", NULL, 468); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_0, this_ptr, "exists", NULL, 0, &metaData, &_1); zephir_check_call_status(); @@ -2126,7 +2126,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, 467); + ZEPHIR_CALL_METHOD(&writeConnection, this_ptr, "getwriteconnection", NULL, 468); zephir_check_call_status(); ZEPHIR_INIT_ZVAL_NREF(_0); ZVAL_LONG(&_0, 3); @@ -2135,7 +2135,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, 468); + ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "checkforeignkeysreverserestrict", NULL, 469); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&_2$$3)) { RETURN_MM_BOOL(0); @@ -2297,9 +2297,9 @@ PHP_METHOD(Phalcon_Mvc_Model, delete) RETURN_MM_BOOL(1); } } - ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 469); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 470); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 470); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 471); zephir_check_call_status(); if (zephir_is_true(&schema)) { ZEPHIR_INIT_VAR(&table); @@ -2314,7 +2314,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, 471); + ZEPHIR_CALL_METHOD(&_28$$25, this_ptr, "checkforeignkeysreversecascade", NULL, 472); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&_28$$25)) { RETURN_MM_BOOL(0); @@ -2354,7 +2354,7 @@ PHP_METHOD(Phalcon_Mvc_Model, dump) ZEPHIR_MM_GROW(); - ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 472, this_ptr); + ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 473, this_ptr); zephir_check_call_status(); RETURN_MM(); } @@ -2576,7 +2576,7 @@ PHP_METHOD(Phalcon_Mvc_Model, find) } else { ZEPHIR_CPY_WRT(¶ms, parameters); } - ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_0, 473, ¶ms); + ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_0, 474, ¶ms); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&resultset, &query, "execute", NULL, 0); zephir_check_call_status(); @@ -2725,7 +2725,7 @@ PHP_METHOD(Phalcon_Mvc_Model, findFirst) return; } ZVAL_LONG(&_3, 1); - ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_2, 473, ¶ms, &_3); + ZEPHIR_CALL_STATIC(&query, "getpreparedquery", &_2, 474, ¶ms, &_3); zephir_check_call_status(); ZVAL_BOOL(&_3, 1); ZEPHIR_CALL_METHOD(NULL, &query, "setuniquerow", NULL, 0, &_3); @@ -3618,7 +3618,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, 474, fieldName, &changedFields); + ZEPHIR_CALL_FUNCTION(&intersect, "array_intersect", NULL, 475, fieldName, &changedFields); zephir_check_call_status(); if (allFields) { RETURN_MM_BOOL(ZEPHIR_IS_EQUAL(&intersect, fieldName)); @@ -3691,7 +3691,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, 474, fieldName, &updatedFields); + ZEPHIR_CALL_FUNCTION(&intersect, "array_intersect", NULL, 475, fieldName, &updatedFields); zephir_check_call_status(); if (allFields) { RETURN_MM_BOOL(ZEPHIR_IS_EQUAL(&intersect, fieldName)); @@ -3906,12 +3906,12 @@ PHP_METHOD(Phalcon_Mvc_Model, query) zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 475, container); + ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 476, container); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_3); zephir_get_called_class(&_3); - ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 476, &_3); + ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 477, &_3); zephir_check_call_status(); RETURN_CCTOR(&criteria); } @@ -4011,13 +4011,13 @@ PHP_METHOD(Phalcon_Mvc_Model, refresh) } ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&readConnection, this_ptr, "getreadconnection", NULL, 477); + ZEPHIR_CALL_METHOD(&readConnection, this_ptr, "getreadconnection", NULL, 478); 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, 469); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 470); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 470); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 471); zephir_check_call_status(); if (zephir_is_true(&schema)) { ZEPHIR_INIT_VAR(&table); @@ -4176,7 +4176,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, 467); + ZEPHIR_CALL_METHOD(&writeConnection, this_ptr, "getwriteconnection", NULL, 468); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "prepareSave"); @@ -4192,9 +4192,9 @@ PHP_METHOD(Phalcon_Mvc_Model, save) RETURN_MM_BOOL(0); } } - ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 469); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 470); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 470); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 471); zephir_check_call_status(); if (zephir_is_true(&schema)) { ZEPHIR_INIT_VAR(&table); @@ -4204,7 +4204,7 @@ PHP_METHOD(Phalcon_Mvc_Model, save) } else { ZEPHIR_CPY_WRT(&table, &source); } - ZEPHIR_CALL_METHOD(&readConnection, this_ptr, "getreadconnection", NULL, 477); + ZEPHIR_CALL_METHOD(&readConnection, this_ptr, "getreadconnection", NULL, 478); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&exists, this_ptr, "exists", NULL, 0, &metaData, &readConnection); zephir_check_call_status(); @@ -4235,7 +4235,7 @@ PHP_METHOD(Phalcon_Mvc_Model, save) object_init_ex(&_6$$11, phalcon_mvc_model_validationfailed_ce); ZEPHIR_CALL_METHOD(&_7$$11, this_ptr, "getmessages", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_6$$11, "__construct", NULL, 478, this_ptr, &_7$$11); + ZEPHIR_CALL_METHOD(NULL, &_6$$11, "__construct", NULL, 479, this_ptr, &_7$$11); zephir_check_call_status(); zephir_throw_exception_debug(&_6$$11, "phalcon/Mvc/Model.zep", 2561); ZEPHIR_MM_RESTORE(); @@ -4329,12 +4329,12 @@ PHP_METHOD(Phalcon_Mvc_Model, serialize) zephir_create_array(&_3$$4, 2, 0); zephir_array_update_string(&_3$$4, SL("_attributes"), &attributes, PH_COPY | PH_SEPARATE); zephir_array_update_string(&_3$$4, SL("snapshot"), &snapshot, PH_COPY | PH_SEPARATE); - ZEPHIR_RETURN_CALL_FUNCTION("serialize", NULL, 14, &_3$$4); + ZEPHIR_RETURN_CALL_FUNCTION("serialize", NULL, 15, &_3$$4); zephir_check_call_status(); RETURN_MM(); } } - ZEPHIR_RETURN_CALL_FUNCTION("serialize", NULL, 14, &attributes); + ZEPHIR_RETURN_CALL_FUNCTION("serialize", NULL, 15, &attributes); zephir_check_call_status(); RETURN_MM(); } @@ -4378,7 +4378,7 @@ PHP_METHOD(Phalcon_Mvc_Model, unserialize) zephir_fetch_params(1, 1, 0, &data); - ZEPHIR_CALL_FUNCTION(&attributes, "unserialize", NULL, 16, data); + ZEPHIR_CALL_FUNCTION(&attributes, "unserialize", NULL, 17, data); zephir_check_call_status(); if (Z_TYPE_P(&attributes) == IS_ARRAY) { ZEPHIR_CALL_CE_STATIC(&container, phalcon_di_ce, "getdefault", &_0, 0); @@ -4843,7 +4843,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, 465, columnMap, &key); + ZEPHIR_CALL_SELF(&_5$$6, "caseinsensitivecolumnmap", &_6, 466, columnMap, &key); zephir_check_call_status(); ZEPHIR_CPY_WRT(&key, &_5$$6); } @@ -4902,7 +4902,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, 465, columnMap, &key); + ZEPHIR_CALL_SELF(&_13$$14, "caseinsensitivecolumnmap", &_6, 466, columnMap, &key); zephir_check_call_status(); ZEPHIR_CPY_WRT(&key, &_13$$14); } @@ -5323,7 +5323,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, 465, &columnMap, &attribute); + ZEPHIR_CALL_SELF(&_4$$5, "caseinsensitivecolumnmap", &_5, 466, &columnMap, &attribute); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attribute, &_4$$5); } @@ -5374,7 +5374,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, 465, &columnMap, &attribute); + ZEPHIR_CALL_SELF(&_10$$15, "caseinsensitivecolumnmap", &_5, 466, &columnMap, &attribute); zephir_check_call_status(); ZEPHIR_CPY_WRT(&attribute, &_10$$15); } @@ -5454,7 +5454,7 @@ PHP_METHOD(Phalcon_Mvc_Model, update) if (zephir_is_true(&_0)) { ZEPHIR_CALL_METHOD(&metaData, this_ptr, "getmodelsmetadata", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "getreadconnection", NULL, 477); + ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "getreadconnection", NULL, 478); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "exists", NULL, 0, &metaData, &_2$$3); zephir_check_call_status(); @@ -6580,9 +6580,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, 470); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 471); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 469); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 470); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&sequenceName); if (ZEPHIR_IS_EMPTY(&schema)) { @@ -7382,9 +7382,9 @@ PHP_METHOD(Phalcon_Mvc_Model, exists) 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, 469); + ZEPHIR_CALL_METHOD(&schema, this_ptr, "getschema", NULL, 470); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 470); + ZEPHIR_CALL_METHOD(&source, this_ptr, "getsource", NULL, 471); zephir_check_call_status(); if (zephir_is_true(&schema)) { ZEPHIR_INIT_VAR(&table); @@ -7787,7 +7787,7 @@ PHP_METHOD(Phalcon_Mvc_Model, invokeFinder) if (zephir_array_isset(&attributes, &extraMethod)) { ZEPHIR_CPY_WRT(&field, &extraMethod); } else { - ZEPHIR_CALL_FUNCTION(&extraMethodFirst, "lcfirst", NULL, 97, &extraMethod); + ZEPHIR_CALL_FUNCTION(&extraMethodFirst, "lcfirst", NULL, 99, &extraMethod); zephir_check_call_status(); if (zephir_array_isset(&attributes, &extraMethodFirst)) { ZEPHIR_CPY_WRT(&field, &extraMethodFirst); @@ -7991,7 +7991,7 @@ PHP_METHOD(Phalcon_Mvc_Model, preSave) } } if (ZEPHIR_GLOBAL(orm).virtual_foreign_keys) { - ZEPHIR_CALL_METHOD(&_3$$8, this_ptr, "checkforeignkeysrestrict", NULL, 479); + ZEPHIR_CALL_METHOD(&_3$$8, this_ptr, "checkforeignkeysrestrict", NULL, 480); zephir_check_call_status(); if (ZEPHIR_IS_FALSE_IDENTICAL(&_3$$8)) { RETURN_MM_BOOL(0); diff --git a/ext/phalcon/mvc/model/behavior/timestampable.zep.c b/ext/phalcon/mvc/model/behavior/timestampable.zep.c index 99a1b29c41..983fb66d12 100644 --- a/ext/phalcon/mvc/model/behavior/timestampable.zep.c +++ b/ext/phalcon/mvc/model/behavior/timestampable.zep.c @@ -101,7 +101,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Behavior_Timestampable, notify) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(phalcon_mvc_model_exception_ce, "The option 'field' is required", "phalcon/Mvc/Model/Behavior/Timestampable.zep", 50); return; } - ZEPHIR_CALL_METHOD(×tamp, this_ptr, "gettimestamp", NULL, 480, &options); + ZEPHIR_CALL_METHOD(×tamp, this_ptr, "gettimestamp", NULL, 481, &options); zephir_check_call_status(); if (UNEXPECTED(Z_TYPE_P(&field) == IS_ARRAY)) { zephir_is_iterable(&field, 0, "phalcon/Mvc/Model/Behavior/Timestampable.zep", 63); @@ -165,7 +165,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Behavior_Timestampable, getTimestamp) ZEPHIR_OBS_VAR(&format); if (zephir_array_isset_string_fetch(&format, &options, SL("format"), 0)) { - ZEPHIR_RETURN_CALL_FUNCTION("date", NULL, 481, &format); + ZEPHIR_RETURN_CALL_FUNCTION("date", NULL, 482, &format); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/mvc/model/binder.zep.c b/ext/phalcon/mvc/model/binder.zep.c index 824094c60f..a977f7a638 100644 --- a/ext/phalcon/mvc/model/binder.zep.c +++ b/ext/phalcon/mvc/model/binder.zep.c @@ -431,16 +431,16 @@ PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection) ZEPHIR_INIT_VAR(&reflection); if (!ZEPHIR_IS_NULL(&methodName)) { object_init_ex(&reflection, zephir_get_internal_ce(SL("reflectionmethod"))); - ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 482, handler, &methodName); + ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 483, handler, &methodName); zephir_check_call_status(); } else { object_init_ex(&reflection, zephir_get_internal_ce(SL("reflectionfunction"))); - ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 160, handler); + ZEPHIR_CALL_METHOD(NULL, &reflection, "__construct", NULL, 162, 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, 161); + ZEPHIR_CALL_METHOD(&methodParams, &reflection, "getparameters", NULL, 163); zephir_check_call_status(); ZEPHIR_INIT_VAR(¶msKeys); zephir_array_keys(¶msKeys, ¶ms); @@ -473,7 +473,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection) zephir_array_fetch(¶mValue, ¶ms, ¶mKey, PH_NOISY, "phalcon/Mvc/Model/Binder.zep", 179); ZEPHIR_INIT_NVAR(&_6$$5); ZVAL_STRING(&_6$$5, "Phalcon\\Mvc\\Model"); - ZEPHIR_CALL_FUNCTION(&_7$$5, "is_subclass_of", &_8, 483, &className, &_6$$5); + ZEPHIR_CALL_FUNCTION(&_7$$5, "is_subclass_of", &_8, 484, &className, &_6$$5); zephir_check_call_status(); if (ZEPHIR_IS_STRING(&className, "Phalcon\\Mvc\\Model")) { if (Z_TYPE_P(&realClasses) == IS_NULL) { @@ -555,7 +555,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Binder, getParamsFromReflection) zephir_array_fetch(¶mValue, ¶ms, ¶mKey, PH_NOISY, "phalcon/Mvc/Model/Binder.zep", 179); ZEPHIR_INIT_NVAR(&_15$$19); ZVAL_STRING(&_15$$19, "Phalcon\\Mvc\\Model"); - ZEPHIR_CALL_FUNCTION(&_16$$19, "is_subclass_of", &_8, 483, &className, &_15$$19); + ZEPHIR_CALL_FUNCTION(&_16$$19, "is_subclass_of", &_8, 484, &className, &_15$$19); zephir_check_call_status(); if (ZEPHIR_IS_STRING(&className, "Phalcon\\Mvc\\Model")) { if (Z_TYPE_P(&realClasses) == IS_NULL) { diff --git a/ext/phalcon/mvc/model/criteria.zep.c b/ext/phalcon/mvc/model/criteria.zep.c index d34c61c67a..217e3593c8 100644 --- a/ext/phalcon/mvc/model/criteria.zep.c +++ b/ext/phalcon/mvc/model/criteria.zep.c @@ -783,19 +783,19 @@ PHP_METHOD(Phalcon_Mvc_Model_Criteria, fromInput) zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 475, container); + ZEPHIR_CALL_METHOD(NULL, &criteria, "setdi", NULL, 476, container); zephir_check_call_status(); if (zephir_fast_count_int(&conditions)) { ZEPHIR_INIT_VAR(&_16$$16); ZEPHIR_INIT_VAR(&_17$$16); ZEPHIR_CONCAT_SVS(&_17$$16, " ", &operator, " "); zephir_fast_join(&_16$$16, &_17$$16, &conditions); - ZEPHIR_CALL_METHOD(NULL, &criteria, "where", NULL, 484, &_16$$16); + ZEPHIR_CALL_METHOD(NULL, &criteria, "where", NULL, 485, &_16$$16); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &criteria, "bind", NULL, 485, &bind); + ZEPHIR_CALL_METHOD(NULL, &criteria, "bind", NULL, 486, &bind); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 476, &modelName); + ZEPHIR_CALL_METHOD(NULL, &criteria, "setmodelname", NULL, 477, &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, 274, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "abs", NULL, 276, &_0); zephir_check_call_status(); limit = zephir_get_numberval(&_1); ZVAL_LONG(&_0, offset); - ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 274, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "abs", NULL, 276, &_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 c426b12257..6d419c6311 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, 165, &className); + ZEPHIR_CALL_METHOD(NULL, &classReflection, "__construct", NULL, 167, &className); zephir_check_call_status(); ZVAL_LONG(&_1$$3, 1); - ZEPHIR_CALL_METHOD(&reflectionProperties, &classReflection, "getproperties", NULL, 169, &_1$$3); + ZEPHIR_CALL_METHOD(&reflectionProperties, &classReflection, "getproperties", NULL, 171, &_1$$3); zephir_check_call_status(); zephir_is_iterable(&reflectionProperties, 0, "phalcon/Mvc/Model/Manager.zep", 434); if (Z_TYPE_P(&reflectionProperties) == IS_ARRAY) { @@ -1664,7 +1664,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasOne) ZEPHIR_INIT_VAR(&relation); object_init_ex(&relation, phalcon_mvc_model_relation_ce); ZVAL_LONG(&_2, 1); - ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 486, &_2, &referencedModel, fields, referencedFields, options); + ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 487, &_2, &referencedModel, fields, referencedFields, options); zephir_check_call_status(); ZEPHIR_OBS_VAR(&alias); if (zephir_array_isset_string_fetch(&alias, options, SL("alias"), 0)) { @@ -1805,9 +1805,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasOneThrough) ZEPHIR_INIT_VAR(&relation); object_init_ex(&relation, phalcon_mvc_model_relation_ce); ZVAL_LONG(&_1, 3); - ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 486, &_1, &referencedModel, fields, referencedFields, options); + ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 487, &_1, &referencedModel, fields, referencedFields, options); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &relation, "setintermediaterelation", NULL, 487, intermediateFields, &intermediateModel, intermediateReferencedFields); + ZEPHIR_CALL_METHOD(NULL, &relation, "setintermediaterelation", NULL, 488, intermediateFields, &intermediateModel, intermediateReferencedFields); zephir_check_call_status(); ZEPHIR_OBS_VAR(&alias); if (zephir_array_isset_string_fetch(&alias, options, SL("alias"), 0)) { @@ -1919,7 +1919,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, addBelongsTo) ZEPHIR_INIT_VAR(&relation); object_init_ex(&relation, phalcon_mvc_model_relation_ce); ZVAL_LONG(&_2, 0); - ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 486, &_2, &referencedModel, fields, referencedFields, options); + ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 487, &_2, &referencedModel, fields, referencedFields, options); zephir_check_call_status(); ZEPHIR_OBS_VAR(&alias); if (zephir_array_isset_string_fetch(&alias, options, SL("alias"), 0)) { @@ -2033,7 +2033,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasMany) ZEPHIR_INIT_VAR(&relation); object_init_ex(&relation, phalcon_mvc_model_relation_ce); ZVAL_LONG(&_1, 2); - ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 486, &_1, &referencedModel, fields, referencedFields, options); + ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 487, &_1, &referencedModel, fields, referencedFields, options); zephir_check_call_status(); ZEPHIR_OBS_VAR(&alias); if (zephir_array_isset_string_fetch(&alias, options, SL("alias"), 0)) { @@ -2174,9 +2174,9 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, addHasManyToMany) ZEPHIR_INIT_VAR(&relation); object_init_ex(&relation, phalcon_mvc_model_relation_ce); ZVAL_LONG(&_1, 4); - ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 486, &_1, &referencedModel, fields, referencedFields, options); + ZEPHIR_CALL_METHOD(NULL, &relation, "__construct", NULL, 487, &_1, &referencedModel, fields, referencedFields, options); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &relation, "setintermediaterelation", NULL, 487, intermediateFields, &intermediateModel, intermediateReferencedFields); + ZEPHIR_CALL_METHOD(NULL, &relation, "setintermediaterelation", NULL, 488, intermediateFields, &intermediateModel, intermediateReferencedFields); zephir_check_call_status(); ZEPHIR_OBS_VAR(&alias); if (zephir_array_isset_string_fetch(&alias, options, SL("alias"), 0)) { @@ -2967,7 +2967,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getRelationRecords) ZEPHIR_INIT_VAR(&_4$$3); ZEPHIR_CONCAT_SVSVSVSVS(&_4$$3, "[", &intermediateModel, "].[", &intermediateFields, "] = [", &referencedModel, "].[", &_3$$3, "]"); zephir_array_append(&joinConditions, &_4$$3, PH_SEPARATE, "phalcon/Mvc/Model/Manager.zep", 1534); - ZEPHIR_CALL_METHOD(&_5$$3, this_ptr, "_mergefindparameters", NULL, 488, &extraParameters, parameters); + ZEPHIR_CALL_METHOD(&_5$$3, this_ptr, "_mergefindparameters", NULL, 489, &extraParameters, parameters); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&builder, this_ptr, "createbuilder", NULL, 0, &_5$$3); zephir_check_call_status(); @@ -3098,10 +3098,10 @@ PHP_METHOD(Phalcon_Mvc_Model_Manager, getRelationRecords) ZEPHIR_CALL_METHOD(&_32, record, "getdi", NULL, 0); zephir_check_call_status(); zephir_array_update_string(&findParams, SL("di"), &_32, PH_COPY | PH_SEPARATE); - ZEPHIR_CALL_METHOD(&findArguments, this_ptr, "_mergefindparameters", NULL, 488, &findParams, parameters); + ZEPHIR_CALL_METHOD(&findArguments, this_ptr, "_mergefindparameters", NULL, 489, &findParams, parameters); zephir_check_call_status(); if (Z_TYPE_P(&extraParameters) == IS_ARRAY) { - ZEPHIR_CALL_METHOD(&findParams, this_ptr, "_mergefindparameters", NULL, 488, &extraParameters, &findArguments); + ZEPHIR_CALL_METHOD(&findParams, this_ptr, "_mergefindparameters", NULL, 489, &extraParameters, &findArguments); zephir_check_call_status(); } else { ZEPHIR_CPY_WRT(&findParams, &findArguments); diff --git a/ext/phalcon/mvc/model/metadata/stream.zep.c b/ext/phalcon/mvc/model/metadata/stream.zep.c index 34ab000458..7652784907 100644 --- a/ext/phalcon/mvc/model/metadata/stream.zep.c +++ b/ext/phalcon/mvc/model/metadata/stream.zep.c @@ -217,7 +217,7 @@ PHP_METHOD(Phalcon_Mvc_Model_MetaData_Stream, write) ZEPHIR_CONCAT_SVS(&_5$$3, "= 80000 bool is_null_true = 1; @@ -132,13 +132,18 @@ PHP_METHOD(Phalcon_Paginator_PaginatorFactory, load) ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkconfig", NULL, 0, config); zephir_check_call_status(); ZEPHIR_CPY_WRT(config, &_0); + ZEPHIR_INIT_VAR(&_1); + ZVAL_STRING(&_1, "adapter"); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkconfigelement", NULL, 0, config, &_1); + zephir_check_call_status(); + ZEPHIR_CPY_WRT(config, &_0); ZEPHIR_OBS_VAR(&name); - zephir_array_fetch_string(&name, config, SL("adapter"), PH_NOISY, "phalcon/Paginator/PaginatorFactory.zep", 62); - ZEPHIR_INIT_VAR(&_2); - array_init(&_2); + zephir_array_fetch_string(&name, config, SL("adapter"), PH_NOISY, "phalcon/Paginator/PaginatorFactory.zep", 63); + ZEPHIR_INIT_NVAR(&_1); + array_init(&_1); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "options"); - ZEPHIR_CALL_CE_STATIC(&options, phalcon_helper_arr_ce, "get", &_1, 81, config, &_3, &_2); + ZEPHIR_CALL_CE_STATIC(&options, phalcon_helper_arr_ce, "get", &_2, 81, config, &_3, &_1); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "newinstance", NULL, 0, &name, &options); zephir_check_call_status(); diff --git a/ext/phalcon/session/adapter/stream.zep.c b/ext/phalcon/session/adapter/stream.zep.c index 8bfe1032c6..5a0b624524 100644 --- a/ext/phalcon/session/adapter/stream.zep.c +++ b/ext/phalcon/session/adapter/stream.zep.c @@ -117,7 +117,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, __construct) ZEPHIR_CALL_FUNCTION(&path, "ini_get", NULL, 0, &_2$$3); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_3, "is_writable", NULL, 360, &path); + ZEPHIR_CALL_FUNCTION(&_3, "is_writable", NULL, 362, &path); zephir_check_call_status(); if (UNEXPECTED(!zephir_is_true(&_3))) { ZEPHIR_INIT_VAR(&_4$$4); @@ -173,7 +173,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, destroy) _2 = zephir_is_true(&_3); } if (_2) { - ZEPHIR_CALL_FUNCTION(NULL, "unlink", NULL, 140, &file); + ZEPHIR_CALL_FUNCTION(NULL, "unlink", NULL, 142, &file); zephir_check_call_status(); } RETURN_MM_BOOL(1); @@ -245,7 +245,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, gc) _9$$3 = ZEPHIR_LT(&_10$$3, &time); } if (_9$$3) { - ZEPHIR_CALL_FUNCTION(NULL, "unlink", &_11, 140, &file); + ZEPHIR_CALL_FUNCTION(NULL, "unlink", &_11, 142, &file); zephir_check_call_status(); } } ZEND_HASH_FOREACH_END(); @@ -273,7 +273,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, gc) _14$$5 = ZEPHIR_LT(&_15$$5, &time); } if (_14$$5) { - ZEPHIR_CALL_FUNCTION(NULL, "unlink", &_11, 140, &file); + ZEPHIR_CALL_FUNCTION(NULL, "unlink", &_11, 142, &file); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(NULL, &_3, "next", NULL, 0); @@ -352,7 +352,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, read) ZEPHIR_CALL_FUNCTION(&pointer, "fopen", NULL, 90, &name, &_2$$3); zephir_check_call_status(); ZVAL_LONG(&_3$$3, 1); - ZEPHIR_CALL_FUNCTION(&_4$$3, "flock", NULL, 151, &pointer, &_3$$3); + ZEPHIR_CALL_FUNCTION(&_4$$3, "flock", NULL, 153, &pointer, &_3$$3); zephir_check_call_status(); if (zephir_is_true(&_4$$3)) { ZEPHIR_INIT_NVAR(&data); @@ -399,7 +399,7 @@ PHP_METHOD(Phalcon_Session_Adapter_Stream, write) ZEPHIR_INIT_VAR(&name); ZEPHIR_CONCAT_VV(&name, &_0, &_1); ZVAL_LONG(&_2, 2); - ZEPHIR_CALL_FUNCTION(&_3, "file_put_contents", NULL, 147, &name, data, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "file_put_contents", NULL, 149, &name, data, &_2); zephir_check_call_status(); RETURN_MM_BOOL(!ZEPHIR_IS_FALSE_IDENTICAL(&_3)); } diff --git a/ext/phalcon/session/manager.zep.c b/ext/phalcon/session/manager.zep.c index 58d0ad6c39..4ae8ecfa1a 100644 --- a/ext/phalcon/session/manager.zep.c +++ b/ext/phalcon/session/manager.zep.c @@ -629,7 +629,7 @@ PHP_METHOD(Phalcon_Session_Manager, setId) object_init_ex(&_1$$3, spl_ce_RuntimeException); ZEPHIR_INIT_VAR(&_2$$3); ZEPHIR_CONCAT_SS(&_2$$3, "The session has already been started. ", "To change the id, use regenerateId()"); - ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 305, &_2$$3); + ZEPHIR_CALL_METHOD(NULL, &_1$$3, "__construct", NULL, 307, &_2$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_1$$3, "phalcon/Session/Manager.zep", 254); ZEPHIR_MM_RESTORE(); @@ -774,7 +774,7 @@ PHP_METHOD(Phalcon_Session_Manager, start) if (ZEPHIR_IS_TRUE_IDENTICAL(&_0)) { RETURN_MM_BOOL(1); } - ZEPHIR_CALL_FUNCTION(&_1, "headers_sent", NULL, 395); + ZEPHIR_CALL_FUNCTION(&_1, "headers_sent", NULL, 397); zephir_check_call_status(); if (ZEPHIR_IS_TRUE_IDENTICAL(&_1)) { RETURN_MM_BOOL(0); diff --git a/ext/phalcon/storage/adapter/abstractadapter.zep.c b/ext/phalcon/storage/adapter/abstractadapter.zep.c index dcef92a5bf..869a1ea4b0 100644 --- a/ext/phalcon/storage/adapter/abstractadapter.zep.c +++ b/ext/phalcon/storage/adapter/abstractadapter.zep.c @@ -720,7 +720,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_AbstractAdapter, getArrVal) } if (UNEXPECTED(zephir_is_true(&cast))) { ZEPHIR_MAKE_REF(&value); - ZEPHIR_CALL_FUNCTION(NULL, "settype", NULL, 11, &value, &cast); + ZEPHIR_CALL_FUNCTION(NULL, "settype", NULL, 12, &value, &cast); ZEPHIR_UNREF(&value); zephir_check_call_status(); } diff --git a/ext/phalcon/storage/adapter/apcu.zep.c b/ext/phalcon/storage/adapter/apcu.zep.c index 4a9c522f70..0437bc93fe 100644 --- a/ext/phalcon/storage/adapter/apcu.zep.c +++ b/ext/phalcon/storage/adapter/apcu.zep.c @@ -136,7 +136,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, clear) ZEPHIR_ITERATOR_COPY(&item, _1); } zephir_array_fetch_string(&_2$$4, &item, SL("key"), PH_NOISY | PH_READONLY, "phalcon/Storage/Adapter/Apcu.zep", 63); - ZEPHIR_CALL_FUNCTION(&_3$$4, "apcu_delete", &_4, 121, &_2$$4); + ZEPHIR_CALL_FUNCTION(&_3$$4, "apcu_delete", &_4, 123, &_2$$4); zephir_check_call_status(); if (!(zephir_is_true(&_3$$4))) { result = 0; @@ -196,7 +196,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, decrement) ZEPHIR_CALL_METHOD(&_0, this_ptr, "getprefixedkey", NULL, 0, &key); zephir_check_call_status(); ZVAL_LONG(&_1, value); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_dec", NULL, 122, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_dec", NULL, 124, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -241,7 +241,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, delete) ZEPHIR_CALL_METHOD(&_0, this_ptr, "getprefixedkey", NULL, 0, &key); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_delete", NULL, 121, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_delete", NULL, 123, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -296,7 +296,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, get) ZEPHIR_CALL_METHOD(&_0, this_ptr, "getprefixedkey", NULL, 0, &key); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&content, "apcu_fetch", NULL, 123, &_0); + ZEPHIR_CALL_FUNCTION(&content, "apcu_fetch", NULL, 125, &_0); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getunserializeddata", NULL, 0, &content, defaultValue); zephir_check_call_status(); @@ -423,7 +423,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, has) ZEPHIR_CALL_METHOD(&_0, this_ptr, "getprefixedkey", NULL, 0, &key); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&result, "apcu_exists", NULL, 124, &_0); + ZEPHIR_CALL_FUNCTION(&result, "apcu_exists", NULL, 126, &_0); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); if (((Z_TYPE_P(&result) == IS_TRUE || Z_TYPE_P(&result) == IS_FALSE) == 1)) { @@ -484,7 +484,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, increment) ZEPHIR_CALL_METHOD(&_0, this_ptr, "getprefixedkey", NULL, 0, &key); zephir_check_call_status(); ZVAL_LONG(&_1, value); - ZEPHIR_RETURN_CALL_FUNCTION("apcu_inc", NULL, 125, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("apcu_inc", NULL, 127, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -550,7 +550,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Apcu, set) zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_2, this_ptr, "getttl", NULL, 0, ttl); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&result, "apcu_store", NULL, 126, &_0, &_1, &_2); + ZEPHIR_CALL_FUNCTION(&result, "apcu_store", NULL, 128, &_0, &_1, &_2); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_3); if (((Z_TYPE_P(&result) == IS_TRUE || Z_TYPE_P(&result) == IS_FALSE) == 1)) { diff --git a/ext/phalcon/storage/adapter/libmemcached.zep.c b/ext/phalcon/storage/adapter/libmemcached.zep.c index 6c8e3655ce..8c16cc41bc 100644 --- a/ext/phalcon/storage/adapter/libmemcached.zep.c +++ b/ext/phalcon/storage/adapter/libmemcached.zep.c @@ -389,14 +389,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, 127, &connection, &client); + ZEPHIR_CALL_METHOD(&_9$$4, this_ptr, "setoptions", NULL, 129, &connection, &client); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_10$$4, &_9$$4, "setservers", NULL, 128, &connection, &servers); + ZEPHIR_CALL_METHOD(&_10$$4, &_9$$4, "setservers", NULL, 130, &connection, &servers); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_10$$4, "setsasl", NULL, 129, &connection, &saslUser, &saslPass); + ZEPHIR_CALL_METHOD(NULL, &_10$$4, "setsasl", NULL, 131, &connection, &saslUser, &saslPass); zephir_check_call_status(); } - ZEPHIR_CALL_METHOD(NULL, this_ptr, "setserializer", NULL, 130, &connection); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setserializer", NULL, 132, &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 4be49c9771..3a6f1729e7 100644 --- a/ext/phalcon/storage/adapter/redis.zep.c +++ b/ext/phalcon/storage/adapter/redis.zep.c @@ -398,17 +398,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, 131, &connection); + ZEPHIR_CALL_METHOD(&_1$$3, this_ptr, "checkconnect", NULL, 133, &connection); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&_2$$3, &_1$$3, "checkauth", NULL, 132, &connection); + ZEPHIR_CALL_METHOD(&_2$$3, &_1$$3, "checkauth", NULL, 134, &connection); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "checkindex", NULL, 133, &connection); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "checkindex", NULL, 135, &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, 134, &connection); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "setserializer", NULL, 136, &connection); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("adapter"), &connection); } @@ -786,7 +786,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, 135, &_5$$5, &host, &port); + ZEPHIR_CALL_FUNCTION(&_6$$5, "sprintf", NULL, 137, &_5$$5, &host, &port); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, &_4$$5, "__construct", NULL, 8, &_6$$5); zephir_check_call_status(); @@ -889,23 +889,23 @@ PHP_METHOD(Phalcon_Storage_Adapter_Redis, setSerializer) add_assoc_long_ex(&map, SL("php"), 1); ZEPHIR_INIT_VAR(&_0); ZVAL_STRING(&_0, "\\Redis::SERIALIZER_IGBINARY"); - ZEPHIR_CALL_FUNCTION(&_1, "defined", NULL, 136, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "defined", NULL, 138, &_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, 137, &_2$$3); + ZEPHIR_CALL_FUNCTION(&_3$$3, "constant", NULL, 139, &_2$$3); zephir_check_call_status(); zephir_array_update_string(&map, SL("igbinary"), &_3$$3, PH_COPY | PH_SEPARATE); } ZEPHIR_INIT_NVAR(&_0); ZVAL_STRING(&_0, "\\Redis::SERIALIZER_MSGPACK"); - ZEPHIR_CALL_FUNCTION(&_4, "defined", NULL, 136, &_0); + ZEPHIR_CALL_FUNCTION(&_4, "defined", NULL, 138, &_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, 137, &_5$$4); + ZEPHIR_CALL_FUNCTION(&_6$$4, "constant", NULL, 139, &_5$$4); zephir_check_call_status(); zephir_array_update_string(&map, SL("msgpack"), &_6$$4, PH_COPY | PH_SEPARATE); } diff --git a/ext/phalcon/storage/adapter/stream.zep.c b/ext/phalcon/storage/adapter/stream.zep.c index ebb01f45e4..08572f06fc 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, 138, &storageDir); + ZEPHIR_CALL_METHOD(&_2, this_ptr, "getdirseparator", NULL, 140, &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, 138, &_0); + ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdirseparator", NULL, 140, &_0); zephir_check_call_status(); - ZEPHIR_CALL_METHOD(&iterator, this_ptr, "getiterator", NULL, 139, &directory); + ZEPHIR_CALL_METHOD(&iterator, this_ptr, "getiterator", NULL, 141, &directory); zephir_check_call_status(); zephir_is_iterable(&iterator, 0, "phalcon/Storage/Adapter/Stream.zep", 94); if (Z_TYPE_P(&iterator) == IS_ARRAY) { @@ -169,7 +169,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, clear) if (_4$$3) { ZEPHIR_CALL_METHOD(&_5$$3, &file, "getpathname", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_6$$3, "unlink", &_7, 140, &_5$$3); + ZEPHIR_CALL_FUNCTION(&_6$$3, "unlink", &_7, 142, &_5$$3); zephir_check_call_status(); _4$$3 = !zephir_is_true(&_6$$3); } @@ -194,7 +194,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, clear) if (_9$$5) { ZEPHIR_CALL_METHOD(&_10$$5, &file, "getpathname", NULL, 0); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_11$$5, "unlink", &_7, 140, &_10$$5); + ZEPHIR_CALL_FUNCTION(&_11$$5, "unlink", &_7, 142, &_10$$5); zephir_check_call_status(); _9$$5 = !zephir_is_true(&_11$$5); } @@ -315,9 +315,9 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, delete) if (!(zephir_is_true(&_0))) { RETURN_MM_BOOL(0); } - ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 141, &key); + ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 143, &key); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("unlink", NULL, 140, &filepath); + ZEPHIR_RETURN_CALL_FUNCTION("unlink", NULL, 142, &filepath); zephir_check_call_status(); RETURN_MM(); } @@ -374,17 +374,17 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, get) } - ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 141, &key); + ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 143, &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, 142, &filepath); + ZEPHIR_CALL_METHOD(&payload, this_ptr, "getpayload", NULL, 144, &filepath); zephir_check_call_status(); _0 = ZEPHIR_IS_EMPTY(&payload); if (!(_0)) { - ZEPHIR_CALL_METHOD(&_1, this_ptr, "isexpired", NULL, 143, &payload); + ZEPHIR_CALL_METHOD(&_1, this_ptr, "isexpired", NULL, 145, &payload); zephir_check_call_status(); _0 = zephir_is_true(&_1); } @@ -460,13 +460,13 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getKeys) ZEPHIR_INIT_VAR(&files); array_init(&files); - ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 144); + ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 146); zephir_check_call_status(); if (!((zephir_file_exists(&directory) == SUCCESS))) { array_init(return_value); RETURN_MM(); } - ZEPHIR_CALL_METHOD(&iterator, this_ptr, "getiterator", NULL, 139, &directory); + ZEPHIR_CALL_METHOD(&iterator, this_ptr, "getiterator", NULL, 141, &directory); zephir_check_call_status(); zephir_is_iterable(&iterator, 0, "phalcon/Storage/Adapter/Stream.zep", 195); if (Z_TYPE_P(&iterator) == IS_ARRAY) { @@ -556,17 +556,17 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, has) } - ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 141, &key); + ZEPHIR_CALL_METHOD(&filepath, this_ptr, "getfilepath", NULL, 143, &key); zephir_check_call_status(); if (!((zephir_file_exists(&filepath) == SUCCESS))) { RETURN_MM_BOOL(0); } - ZEPHIR_CALL_METHOD(&payload, this_ptr, "getpayload", NULL, 142, &filepath); + ZEPHIR_CALL_METHOD(&payload, this_ptr, "getpayload", NULL, 144, &filepath); zephir_check_call_status(); if (UNEXPECTED(ZEPHIR_IS_EMPTY(&payload))) { RETURN_MM_BOOL(0); } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "isexpired", NULL, 143, &payload); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "isexpired", NULL, 145, &payload); zephir_check_call_status(); RETURN_MM_BOOL(!zephir_is_true(&_0)); } @@ -704,22 +704,22 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, set) 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_CALL_FUNCTION(&_1, "serialize", NULL, 14, &payload); + ZEPHIR_CALL_FUNCTION(&_1, "serialize", NULL, 15, &payload); zephir_check_call_status(); ZEPHIR_CPY_WRT(&payload, &_1); - ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 144, &key); + ZEPHIR_CALL_METHOD(&directory, this_ptr, "getdir", NULL, 146, &key); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_2, "is_dir", NULL, 145, &directory); + ZEPHIR_CALL_FUNCTION(&_2, "is_dir", NULL, 147, &directory); zephir_check_call_status(); if (!(zephir_is_true(&_2))) { ZVAL_LONG(&_3$$3, 0777); - ZEPHIR_CALL_FUNCTION(NULL, "mkdir", NULL, 146, &directory, &_3$$3, &__$true); + ZEPHIR_CALL_FUNCTION(NULL, "mkdir", NULL, 148, &directory, &_3$$3, &__$true); zephir_check_call_status(); } ZEPHIR_INIT_VAR(&_4); ZEPHIR_CONCAT_VV(&_4, &directory, &key); ZVAL_LONG(&_5, 2); - ZEPHIR_CALL_FUNCTION(&_6, "file_put_contents", NULL, 147, &_4, &payload, &_5); + ZEPHIR_CALL_FUNCTION(&_6, "file_put_contents", NULL, 149, &_4, &payload, &_5); zephir_check_call_status(); RETURN_MM_BOOL(!ZEPHIR_IS_FALSE_IDENTICAL(&_6)); } @@ -780,18 +780,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, 138, &_2); + ZEPHIR_CALL_METHOD(&dirPrefix, this_ptr, "getdirseparator", NULL, 140, &_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, 148, &_3); + ZEPHIR_CALL_METHOD(&dirFromFile, this_ptr, "getdirfromfile", NULL, 150, &_3); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_6); ZEPHIR_CONCAT_VV(&_6, &dirPrefix, &dirFromFile); - ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getdirseparator", NULL, 138, &_6); + ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getdirseparator", NULL, 140, &_6); zephir_check_call_status(); RETURN_MM(); } @@ -837,7 +837,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getFilepath) } - ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdir", NULL, 144, &key); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "getdir", NULL, 146, &key); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_1); zephir_read_property(&_2, this_ptr, ZEND_STRL("prefix"), PH_NOISY_CC | PH_READONLY); @@ -891,10 +891,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, 149, &dir, &_1); + ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 151, &dir, &_1); zephir_check_call_status(); ZVAL_LONG(&_1, 2); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 150, &_0, &_1); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 152, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -955,7 +955,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getPayload) RETURN_MM(); } ZVAL_LONG(&_1, 1); - ZEPHIR_CALL_FUNCTION(&_2, "flock", NULL, 151, &pointer, &_1); + ZEPHIR_CALL_FUNCTION(&_2, "flock", NULL, 153, &pointer, &_1); zephir_check_call_status(); if (zephir_is_true(&_2)) { ZEPHIR_INIT_NVAR(&payload); @@ -990,7 +990,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getPayload) ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 89, &_7$$7, &_8$$7); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_9, "unserialize", NULL, 16, &payload); + ZEPHIR_CALL_FUNCTION(&_9, "unserialize", NULL, 17, &payload); zephir_check_call_status(); ZEPHIR_CPY_WRT(&payload, &_9); ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 91); @@ -1105,7 +1105,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getDirFromFile) ZVAL_LONG(&_0, 8); - ZEPHIR_CALL_FUNCTION(&name, "pathinfo", NULL, 111, &file, &_0); + ZEPHIR_CALL_FUNCTION(&name, "pathinfo", NULL, 113, &file, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, 0); ZVAL_LONG(&_1, -2); @@ -1128,7 +1128,7 @@ PHP_METHOD(Phalcon_Storage_Adapter_Stream, getDirFromFile) } ZEPHIR_INIT_VAR(&_7); ZVAL_LONG(&_8, 2); - ZEPHIR_CALL_FUNCTION(&_9, "str_split", NULL, 110, &start, &_8); + ZEPHIR_CALL_FUNCTION(&_9, "str_split", NULL, 112, &start, &_8); zephir_check_call_status(); zephir_fast_join_str(&_7, SL("/"), &_9); ZEPHIR_CONCAT_VS(return_value, &_7, "/"); diff --git a/ext/phalcon/storage/serializer/base64.zep.c b/ext/phalcon/storage/serializer/base64.zep.c index 634646a07b..6f5097181e 100644 --- a/ext/phalcon/storage/serializer/base64.zep.c +++ b/ext/phalcon/storage/serializer/base64.zep.c @@ -64,7 +64,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, 224, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("base64_encode", NULL, 226, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -101,7 +101,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Base64, unserialize) ZEPHIR_THROW_EXCEPTION_DEBUG_STR(spl_ce_InvalidArgumentException, "Data for the unserializer must of type string", "phalcon/Storage/Serializer/Base64.zep", 50); return; } - ZEPHIR_CALL_FUNCTION(&_0, "base64_decode", NULL, 222, data); + ZEPHIR_CALL_FUNCTION(&_0, "base64_decode", NULL, 224, data); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &_0); ZEPHIR_MM_RESTORE(); diff --git a/ext/phalcon/storage/serializer/json.zep.c b/ext/phalcon/storage/serializer/json.zep.c index 5cf4c3c2b6..886f71857a 100644 --- a/ext/phalcon/storage/serializer/json.zep.c +++ b/ext/phalcon/storage/serializer/json.zep.c @@ -198,12 +198,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, 296); + ZEPHIR_CALL_FUNCTION(&_3, "json_last_error", NULL, 298); 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, 297); + ZEPHIR_CALL_FUNCTION(&_5$$3, "json_last_error_msg", NULL, 299); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_6$$3); ZEPHIR_CONCAT_SV(&_6$$3, "json_decode error: ", &_5$$3); @@ -263,12 +263,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, 296); + ZEPHIR_CALL_FUNCTION(&_2, "json_last_error", NULL, 298); 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, 297); + ZEPHIR_CALL_FUNCTION(&_4$$3, "json_last_error_msg", NULL, 299); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_5$$3); ZEPHIR_CONCAT_SV(&_5$$3, "json_encode error: ", &_4$$3); diff --git a/ext/phalcon/storage/serializer/php.zep.c b/ext/phalcon/storage/serializer/php.zep.c index f19c5b9f6d..4f9f27022e 100644 --- a/ext/phalcon/storage/serializer/php.zep.c +++ b/ext/phalcon/storage/serializer/php.zep.c @@ -61,7 +61,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Php, serialize) RETURN_MM_MEMBER(getThis(), "data"); } zephir_read_property(&_2, this_ptr, ZEND_STRL("data"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_FUNCTION("serialize", NULL, 14, &_2); + ZEPHIR_RETURN_CALL_FUNCTION("serialize", NULL, 15, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -164,7 +164,7 @@ PHP_METHOD(Phalcon_Storage_Serializer_Php, processSerializable) ZEPHIR_CALL_FUNCTION(NULL, "set_error_handler", NULL, 89, &_6$$6, &_7$$6); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&_8$$3, "unserialize", NULL, 16, data); + ZEPHIR_CALL_FUNCTION(&_8$$3, "unserialize", NULL, 17, data); zephir_check_call_status(); zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &_8$$3); ZEPHIR_CALL_FUNCTION(NULL, "restore_error_handler", NULL, 91); diff --git a/ext/phalcon/support/collection.zep.c b/ext/phalcon/support/collection.zep.c index 3800a89b79..388087d99e 100644 --- a/ext/phalcon/support/collection.zep.c +++ b/ext/phalcon/support/collection.zep.c @@ -355,7 +355,7 @@ PHP_METHOD(Phalcon_Support_Collection, get) zephir_array_fetch(&value, &_3, &key, PH_NOISY, "phalcon/Support/Collection.zep", 135); if (UNEXPECTED(zephir_is_true(&cast))) { ZEPHIR_MAKE_REF(&value); - ZEPHIR_CALL_FUNCTION(NULL, "settype", NULL, 11, &value, &cast); + ZEPHIR_CALL_FUNCTION(NULL, "settype", NULL, 12, &value, &cast); ZEPHIR_UNREF(&value); zephir_check_call_status(); } @@ -379,7 +379,7 @@ PHP_METHOD(Phalcon_Support_Collection, getIterator) object_init_ex(return_value, spl_ce_ArrayIterator); zephir_read_property(&_0, this_ptr, ZEND_STRL("data"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 12, &_0); + ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 13, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -433,7 +433,7 @@ PHP_METHOD(Phalcon_Support_Collection, getValues) ZEPHIR_MM_GROW(); zephir_read_property(&_0, this_ptr, ZEND_STRL("data"), PH_NOISY_CC | PH_READONLY); - ZEPHIR_RETURN_CALL_FUNCTION("array_values", NULL, 13, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("array_values", NULL, 14, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -881,7 +881,7 @@ PHP_METHOD(Phalcon_Support_Collection, serialize) ZEPHIR_CALL_METHOD(&_0, this_ptr, "toarray", NULL, 0); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("serialize", NULL, 14, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("serialize", NULL, 15, &_0); zephir_check_call_status(); RETURN_MM(); } @@ -939,7 +939,7 @@ PHP_METHOD(Phalcon_Support_Collection, toJson) ZEPHIR_CALL_METHOD(&_1, this_ptr, "toarray", NULL, 0); zephir_check_call_status(); ZVAL_LONG(&_2, options); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_helper_json_ce, "encode", &_0, 15, &_1, &_2); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_helper_json_ce, "encode", &_0, 16, &_1, &_2); zephir_check_call_status(); RETURN_MM(); } @@ -974,7 +974,7 @@ PHP_METHOD(Phalcon_Support_Collection, unserialize) zephir_cast_to_string(&_0, serialized); ZEPHIR_CPY_WRT(serialized, &_0); - ZEPHIR_CALL_FUNCTION(&data, "unserialize", NULL, 16, serialized); + ZEPHIR_CALL_FUNCTION(&data, "unserialize", NULL, 17, serialized); zephir_check_call_status(); ZEPHIR_CALL_METHOD(NULL, this_ptr, "init", NULL, 0, &data); zephir_check_call_status(); diff --git a/ext/phalcon/support/debug.zep.c b/ext/phalcon/support/debug.zep.c index 2b1acb52e9..7de3431ef9 100644 --- a/ext/phalcon/support/debug.zep.c +++ b/ext/phalcon/support/debug.zep.c @@ -1539,7 +1539,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, 165, &className); + ZEPHIR_CALL_METHOD(NULL, &classReflection, "__construct", NULL, 167, &className); zephir_check_call_status(); ZEPHIR_CALL_METHOD(&_8$$5, &classReflection, "isinternal", NULL, 0); zephir_check_call_status(); @@ -1572,7 +1572,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, 160, &functionName); + ZEPHIR_CALL_METHOD(NULL, &functionReflection, "__construct", NULL, 162, &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 04e3d72b1d..094007d72f 100644 --- a/ext/phalcon/support/debug/dump.zep.c +++ b/ext/phalcon/support/debug/dump.zep.c @@ -318,7 +318,7 @@ PHP_METHOD(Phalcon_Support_Debug_Dump, toJson) ZVAL_LONG(&_1, ((128 | 64) | 256)); - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_helper_json_ce, "encode", &_0, 15, variable, &_1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_helper_json_ce, "encode", &_0, 16, variable, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -891,7 +891,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, 472, variable); + ZEPHIR_CALL_FUNCTION(&_46$$12, "get_object_vars", NULL, 473, 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) { @@ -982,10 +982,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, 165, variable); + ZEPHIR_CALL_METHOD(NULL, &reflect$$15, "__construct", NULL, 167, variable); zephir_check_call_status(); ZVAL_LONG(&_67$$15, ((1 | 2) | 4)); - ZEPHIR_CALL_METHOD(&props$$15, &reflect$$15, "getproperties", NULL, 169, &_67$$15); + ZEPHIR_CALL_METHOD(&props$$15, &reflect$$15, "getproperties", NULL, 171, &_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) { @@ -1263,7 +1263,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, 205, variable); + ZEPHIR_CALL_FUNCTION(&_147, "is_float", NULL, 207, variable); zephir_check_call_status(); if (zephir_is_true(&_147)) { ZEPHIR_INIT_VAR(&_148$$27); diff --git a/ext/phalcon/support/helper/arr/blacklist.zep.c b/ext/phalcon/support/helper/arr/blacklist.zep.c index 598e5b8f1e..adaa752577 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_16__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, 183, &blackListed); + ZEPHIR_CALL_FUNCTION(&_1, "array_flip", NULL, 185, &blackListed); zephir_check_call_status(); - ZEPHIR_RETURN_CALL_FUNCTION("array_diff_key", NULL, 283, &collection, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("array_diff_key", NULL, 285, &collection, &_1); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/support/helper/arr/chunk.zep.c b/ext/phalcon/support/helper/arr/chunk.zep.c index 4b30cc4fc7..c8ae69466a 100644 --- a/ext/phalcon/support/helper/arr/chunk.zep.c +++ b/ext/phalcon/support/helper/arr/chunk.zep.c @@ -79,7 +79,7 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_Chunk, __invoke) ZVAL_LONG(&_0, size); ZVAL_BOOL(&_1, (preserveKeys ? 1 : 0)); - ZEPHIR_RETURN_CALL_FUNCTION("array_chunk", NULL, 284, &collection, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("array_chunk", NULL, 286, &collection, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/support/helper/arr/first.zep.c b/ext/phalcon/support/helper/arr/first.zep.c index 9f357f52bb..c4e5555fd3 100644 --- a/ext/phalcon/support/helper/arr/first.zep.c +++ b/ext/phalcon/support/helper/arr/first.zep.c @@ -77,7 +77,7 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_First, __invoke) ZEPHIR_CALL_METHOD(&filtered, this_ptr, "tofilter", NULL, 0, &collection, method); zephir_check_call_status(); ZEPHIR_MAKE_REF(&filtered); - ZEPHIR_RETURN_CALL_FUNCTION("reset", NULL, 286, &filtered); + ZEPHIR_RETURN_CALL_FUNCTION("reset", NULL, 288, &filtered); ZEPHIR_UNREF(&filtered); zephir_check_call_status(); RETURN_MM(); diff --git a/ext/phalcon/support/helper/arr/flatten.zep.c b/ext/phalcon/support/helper/arr/flatten.zep.c index b7101cb8ce..569d729068 100644 --- a/ext/phalcon/support/helper/arr/flatten.zep.c +++ b/ext/phalcon/support/helper/arr/flatten.zep.c @@ -227,7 +227,7 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_Flatten, processArray) } if (_0) { ZEPHIR_INIT_VAR(&_1$$3); - ZEPHIR_CALL_FUNCTION(&_2$$3, "array_values", NULL, 13, item); + ZEPHIR_CALL_FUNCTION(&_2$$3, "array_values", NULL, 14, item); zephir_check_call_status(); zephir_fast_array_merge(&_1$$3, &data, &_2$$3); ZEPHIR_CPY_WRT(&data, &_1$$3); diff --git a/ext/phalcon/support/helper/arr/get.zep.c b/ext/phalcon/support/helper/arr/get.zep.c index 13d3dad2b0..f2b5155cf2 100644 --- a/ext/phalcon/support/helper/arr/get.zep.c +++ b/ext/phalcon/support/helper/arr/get.zep.c @@ -95,7 +95,7 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_Get, __invoke) } if (!(ZEPHIR_IS_EMPTY(&cast))) { ZEPHIR_MAKE_REF(&value); - ZEPHIR_CALL_FUNCTION(NULL, "settype", NULL, 11, &value, &cast); + ZEPHIR_CALL_FUNCTION(NULL, "settype", NULL, 12, &value, &cast); ZEPHIR_UNREF(&value); zephir_check_call_status(); } diff --git a/ext/phalcon/support/helper/arr/group.zep.c b/ext/phalcon/support/helper/arr/group.zep.c index 5628efff1d..5e4fd22d23 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, 289, method, element); + ZEPHIR_CALL_FUNCTION(&key, "call_user_func", NULL, 291, 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 c6b7fa048c..d3547200ad 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, 290, &collection); + ZEPHIR_CALL_FUNCTION(&_0, "array_unique", NULL, 292, &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 c1d407cf71..b67c0d16e9 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, 291, &filtered); + ZEPHIR_RETURN_CALL_FUNCTION("end", NULL, 293, &filtered); ZEPHIR_UNREF(&filtered); zephir_check_call_status(); RETURN_MM(); diff --git a/ext/phalcon/support/helper/arr/order.zep.c b/ext/phalcon/support/helper/arr/order.zep.c index 4ae71f905e..ca34f50bbd 100644 --- a/ext/phalcon/support/helper/arr/order.zep.c +++ b/ext/phalcon/support/helper/arr/order.zep.c @@ -136,17 +136,17 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_Order, __invoke) if (1 == order) { ZVAL_LONG(&_6$$5, flags); ZEPHIR_MAKE_REF(&sorted); - ZEPHIR_CALL_FUNCTION(NULL, "ksort", NULL, 292, &sorted, &_6$$5); + ZEPHIR_CALL_FUNCTION(NULL, "ksort", NULL, 294, &sorted, &_6$$5); ZEPHIR_UNREF(&sorted); zephir_check_call_status(); } else { ZVAL_LONG(&_7$$6, flags); ZEPHIR_MAKE_REF(&sorted); - ZEPHIR_CALL_FUNCTION(NULL, "krsort", NULL, 293, &sorted, &_7$$6); + ZEPHIR_CALL_FUNCTION(NULL, "krsort", NULL, 295, &sorted, &_7$$6); ZEPHIR_UNREF(&sorted); zephir_check_call_status(); } - ZEPHIR_RETURN_CALL_FUNCTION("array_values", NULL, 13, &sorted); + ZEPHIR_RETURN_CALL_FUNCTION("array_values", NULL, 14, &sorted); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/support/helper/arr/sliceleft.zep.c b/ext/phalcon/support/helper/arr/sliceleft.zep.c index 7cc224a19f..76f74ca95b 100644 --- a/ext/phalcon/support/helper/arr/sliceleft.zep.c +++ b/ext/phalcon/support/helper/arr/sliceleft.zep.c @@ -75,7 +75,7 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_SliceLeft, __invoke) ZVAL_LONG(&_0, 0); ZVAL_LONG(&_1, elements); - ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 294, &collection, &_0, &_1); + ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 296, &collection, &_0, &_1); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/support/helper/arr/sliceright.zep.c b/ext/phalcon/support/helper/arr/sliceright.zep.c index cf1f3cfa21..408bcfcaa2 100644 --- a/ext/phalcon/support/helper/arr/sliceright.zep.c +++ b/ext/phalcon/support/helper/arr/sliceright.zep.c @@ -73,7 +73,7 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_SliceRight, __invoke) ZVAL_LONG(&_0, elements); - ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 294, &collection, &_0); + ZEPHIR_RETURN_CALL_FUNCTION("array_slice", NULL, 296, &collection, &_0); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/support/helper/arr/split.zep.c b/ext/phalcon/support/helper/arr/split.zep.c index ce8f32fc1e..872ef8a2ac 100644 --- a/ext/phalcon/support/helper/arr/split.zep.c +++ b/ext/phalcon/support/helper/arr/split.zep.c @@ -71,7 +71,7 @@ PHP_METHOD(Phalcon_Support_Helper_Arr_Split, __invoke) ZEPHIR_INIT_VAR(&_0); zephir_array_keys(&_0, &collection); zephir_array_fast_append(return_value, &_0); - ZEPHIR_CALL_FUNCTION(&_1, "array_values", NULL, 13, &collection); + ZEPHIR_CALL_FUNCTION(&_1, "array_values", NULL, 14, &collection); zephir_check_call_status(); zephir_array_fast_append(return_value, &_1); RETURN_MM(); diff --git a/ext/phalcon/support/helper/arr/whitelist.zep.c b/ext/phalcon/support/helper/arr/whitelist.zep.c index 58511d90c4..51f71f9537 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_17__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, 183, &filtered); + ZEPHIR_CALL_FUNCTION(&_1, "array_flip", NULL, 185, &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 d668e42d9f..3c175be4c9 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, 295, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&_4, "preg_quote", NULL, 297, &_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, 295, &suffix, &_6$$3); + ZEPHIR_CALL_FUNCTION(&_7$$3, "preg_quote", NULL, 297, &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 e008e9110d..0aafd71082 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, 296); + ZEPHIR_CALL_FUNCTION(&_3, "json_last_error", NULL, 298); 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, 297); + ZEPHIR_CALL_FUNCTION(&_5$$3, "json_last_error_msg", NULL, 299); 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 6d256e595c..bf6397a44d 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, 296); + ZEPHIR_CALL_FUNCTION(&_3, "json_last_error", NULL, 298); 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, 297); + ZEPHIR_CALL_FUNCTION(&_5$$3, "json_last_error_msg", NULL, 299); 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/abstractstr.zep.c b/ext/phalcon/support/helper/str/abstractstr.zep.c index c8ac50b206..8f3db70a16 100644 --- a/ext/phalcon/support/helper/str/abstractstr.zep.c +++ b/ext/phalcon/support/helper/str/abstractstr.zep.c @@ -261,7 +261,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_AbstractStr, toLower) ZVAL_LONG(&_0, 1); - ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_case", NULL, 17, &text, &_0, &encoding); + ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_case", NULL, 11, &text, &_0, &encoding); zephir_check_call_status(); RETURN_MM(); } @@ -369,7 +369,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_AbstractStr, toUpper) ZVAL_LONG(&_0, 0); - ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_case", NULL, 17, &text, &_0, &encoding); + ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_case", NULL, 11, &text, &_0, &encoding); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/support/helper/str/camelize.zep.c b/ext/phalcon/support/helper/str/camelize.zep.c index 699c25d260..5481337e27 100644 --- a/ext/phalcon/support/helper/str/camelize.zep.c +++ b/ext/phalcon/support/helper/str/camelize.zep.c @@ -91,12 +91,12 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Camelize, __invoke) ZEPHIR_CONCAT_SVS(&_0, "/[", &delims, "]+/"); ZVAL_LONG(&_1, -1); ZVAL_LONG(&_2, (2 | 1)); - ZEPHIR_CALL_FUNCTION(&exploded, "preg_split", NULL, 102, &_0, &text, &_1, &_2); + ZEPHIR_CALL_FUNCTION(&exploded, "preg_split", NULL, 104, &_0, &text, &_1, &_2); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_3); ZEPHIR_INIT_NVAR(&_3); zephir_create_closure_ex(&_3, NULL, phalcon_18__closure_ce, SL("__invoke")); - ZEPHIR_CALL_FUNCTION(&output, "array_map", NULL, 103, &_3, &exploded); + ZEPHIR_CALL_FUNCTION(&output, "array_map", NULL, 105, &_3, &exploded); zephir_check_call_status(); zephir_fast_join_str(return_value, SL(""), &output); RETURN_MM(); diff --git a/ext/phalcon/support/helper/str/concat.zep.c b/ext/phalcon/support/helper/str/concat.zep.c index 9eeed5780c..7a1e467ac6 100644 --- a/ext/phalcon/support/helper/str/concat.zep.c +++ b/ext/phalcon/support/helper/str/concat.zep.c @@ -81,19 +81,19 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Concat, __invoke) return; } ZEPHIR_MAKE_REF(&arguments); - ZEPHIR_CALL_FUNCTION(&delimiter, "reset", NULL, 286, &arguments); + ZEPHIR_CALL_FUNCTION(&delimiter, "reset", NULL, 288, &arguments); ZEPHIR_UNREF(&arguments); zephir_check_call_status(); ZVAL_LONG(&_0, 1); - ZEPHIR_CALL_FUNCTION(&_1, "array_slice", NULL, 294, &arguments, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "array_slice", NULL, 296, &arguments, &_0); zephir_check_call_status(); ZEPHIR_CPY_WRT(&arguments, &_1); ZEPHIR_MAKE_REF(&arguments); - ZEPHIR_CALL_FUNCTION(&first, "reset", NULL, 286, &arguments); + ZEPHIR_CALL_FUNCTION(&first, "reset", NULL, 288, &arguments); ZEPHIR_UNREF(&arguments); zephir_check_call_status(); ZEPHIR_MAKE_REF(&arguments); - ZEPHIR_CALL_FUNCTION(&last, "end", NULL, 291, &arguments); + ZEPHIR_CALL_FUNCTION(&last, "end", NULL, 293, &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 3e7a1e06bb..583a0f224d 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, 219, &text, &_0); + ZEPHIR_CALL_FUNCTION(&substr, "mb_substr", NULL, 221, &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, 219, &text, &_0, &_2); + ZEPHIR_CALL_FUNCTION(&_3, "mb_substr", NULL, 221, &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 d2eee81a7d..2e91056882 100644 --- a/ext/phalcon/support/helper/str/dirfromfile.zep.c +++ b/ext/phalcon/support/helper/str/dirfromfile.zep.c @@ -75,16 +75,16 @@ PHP_METHOD(Phalcon_Support_Helper_Str_DirFromFile, __invoke) ZVAL_LONG(&_0, 8); - ZEPHIR_CALL_FUNCTION(&name, "pathinfo", NULL, 111, &file, &_0); + ZEPHIR_CALL_FUNCTION(&name, "pathinfo", NULL, 113, &file, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, 0); ZVAL_LONG(&_1, -2); - ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 219, &name, &_0, &_1); + ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 221, &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, 219, &name, &_2$$3, &_3$$3); + ZEPHIR_CALL_FUNCTION(&start, "mb_substr", NULL, 221, &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 792828c73c..6e4a285ea2 100644 --- a/ext/phalcon/support/helper/str/dynamic.zep.c +++ b/ext/phalcon/support/helper/str/dynamic.zep.c @@ -127,24 +127,24 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Dynamic, __invoke) } - ZEPHIR_CALL_FUNCTION(&_0, "substr_count", NULL, 304, &text, &leftDelimiter); + ZEPHIR_CALL_FUNCTION(&_0, "substr_count", NULL, 306, &text, &leftDelimiter); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_1, "substr_count", NULL, 304, &text, &rightDelimiter); + ZEPHIR_CALL_FUNCTION(&_1, "substr_count", NULL, 306, &text, &rightDelimiter); zephir_check_call_status(); if (UNEXPECTED(!ZEPHIR_IS_IDENTICAL(&_0, &_1))) { ZEPHIR_INIT_VAR(&_2$$3); object_init_ex(&_2$$3, spl_ce_RuntimeException); ZEPHIR_INIT_VAR(&_3$$3); ZEPHIR_CONCAT_SVS(&_3$$3, "Syntax error in string '", &text, "'"); - ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 305, &_3$$3); + ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 307, &_3$$3); zephir_check_call_status(); zephir_throw_exception_debug(&_2$$3, "phalcon/Support/Helper/Str/Dynamic.zep", 43); ZEPHIR_MM_RESTORE(); return; } - ZEPHIR_CALL_FUNCTION(&ldS, "preg_quote", NULL, 295, &leftDelimiter); + ZEPHIR_CALL_FUNCTION(&ldS, "preg_quote", NULL, 297, &leftDelimiter); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&rdS, "preg_quote", NULL, 295, &rightDelimiter); + ZEPHIR_CALL_FUNCTION(&rdS, "preg_quote", NULL, 297, &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, 193, &words); + ZEPHIR_CALL_FUNCTION(&_10$$6, "array_rand", &_11, 195, &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, 295, &_12$$6, &separator); + ZEPHIR_CALL_FUNCTION(&sub, "preg_quote", NULL, 297, &_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, 193, &words); + ZEPHIR_CALL_FUNCTION(&_19$$8, "array_rand", &_11, 195, &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, 295, &_20$$8, &separator); + ZEPHIR_CALL_FUNCTION(&sub, "preg_quote", NULL, 297, &_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/firstbetween.zep.c b/ext/phalcon/support/helper/str/firstbetween.zep.c index 48f94cd572..59760d3a25 100644 --- a/ext/phalcon/support/helper/str/firstbetween.zep.c +++ b/ext/phalcon/support/helper/str/firstbetween.zep.c @@ -79,7 +79,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_FirstBetween, __invoke) zephir_get_strval(&end, end_param); - ZEPHIR_CALL_FUNCTION(&result, "mb_strstr", NULL, 306, &text, &start); + ZEPHIR_CALL_FUNCTION(&result, "mb_strstr", NULL, 308, &text, &start); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_0); if (ZEPHIR_IS_FALSE_IDENTICAL(&result)) { @@ -89,7 +89,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_FirstBetween, __invoke) ZEPHIR_CPY_WRT(&_0, &result); } ZEPHIR_CPY_WRT(&result, &_0); - ZEPHIR_CALL_FUNCTION(&_1, "mb_strstr", NULL, 306, &result, &end, &__$true); + ZEPHIR_CALL_FUNCTION(&_1, "mb_strstr", NULL, 308, &result, &end, &__$true); zephir_check_call_status(); ZEPHIR_CPY_WRT(&result, &_1); ZEPHIR_INIT_NVAR(&_0); diff --git a/ext/phalcon/support/helper/str/friendly.zep.c b/ext/phalcon/support/helper/str/friendly.zep.c index 49d2fb9670..d381ee0ac5 100644 --- a/ext/phalcon/support/helper/str/friendly.zep.c +++ b/ext/phalcon/support/helper/str/friendly.zep.c @@ -137,7 +137,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Friendly, __invoke) ZEPHIR_INIT_VAR(&_1); ZEPHIR_INIT_VAR(&_2); zephir_array_keys(&_2, &matrix); - ZEPHIR_CALL_FUNCTION(&_3, "array_values", NULL, 13, &matrix); + ZEPHIR_CALL_FUNCTION(&_3, "array_values", NULL, 14, &matrix); zephir_check_call_status(); zephir_fast_str_replace(&_1, &_2, &_3, &text); zephir_get_strval(&text, &_1); diff --git a/ext/phalcon/support/helper/str/includes.zep.c b/ext/phalcon/support/helper/str/includes.zep.c index 0f9e856b72..1003e54405 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, 308, &haystack, &needle); + ZEPHIR_CALL_FUNCTION(&_0, "mb_strpos", NULL, 310, &haystack, &needle); zephir_check_call_status(); RETURN_MM_BOOL(!ZEPHIR_IS_FALSE_IDENTICAL(&_0)); } diff --git a/ext/phalcon/support/helper/str/isanagram.zep.c b/ext/phalcon/support/helper/str/isanagram.zep.c index a630606081..67bc99046e 100644 --- a/ext/phalcon/support/helper/str/isanagram.zep.c +++ b/ext/phalcon/support/helper/str/isanagram.zep.c @@ -72,10 +72,10 @@ PHP_METHOD(Phalcon_Support_Helper_Str_IsAnagram, __invoke) ZVAL_LONG(&_0, 1); - ZEPHIR_CALL_FUNCTION(&_1, "count_chars", NULL, 309, &first, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "count_chars", NULL, 311, &first, &_0); zephir_check_call_status(); ZVAL_LONG(&_0, 1); - ZEPHIR_CALL_FUNCTION(&_2, "count_chars", NULL, 309, &second, &_0); + ZEPHIR_CALL_FUNCTION(&_2, "count_chars", NULL, 311, &second, &_0); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_IDENTICAL(&_1, &_2)); } diff --git a/ext/phalcon/support/helper/str/ispalindrome.zep.c b/ext/phalcon/support/helper/str/ispalindrome.zep.c index 65c8525d19..4bd5a1a59e 100644 --- a/ext/phalcon/support/helper/str/ispalindrome.zep.c +++ b/ext/phalcon/support/helper/str/ispalindrome.zep.c @@ -64,7 +64,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_IsPalindrome, __invoke) zephir_get_strval(&text, text_param); - ZEPHIR_CALL_FUNCTION(&_0, "strrev", NULL, 310, &text); + ZEPHIR_CALL_FUNCTION(&_0, "strrev", NULL, 312, &text); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_IDENTICAL(&_0, &text)); } diff --git a/ext/phalcon/support/helper/str/len.zep.c b/ext/phalcon/support/helper/str/len.zep.c index b427f830e4..332d101696 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, 229, &text, &encoding); + ZEPHIR_RETURN_CALL_FUNCTION("mb_strlen", NULL, 231, &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 587bf90387..4e6b25bb5f 100644 --- a/ext/phalcon/support/helper/str/random.zep.c +++ b/ext/phalcon/support/helper/str/random.zep.c @@ -133,61 +133,61 @@ 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, 311, &_3, &_4); + ZEPHIR_CALL_FUNCTION(&_5, "range", NULL, 313, &_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, 311, &_3, &_4); + ZEPHIR_CALL_FUNCTION(&_6, "range", NULL, 313, &_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, 311, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&_9, "range", NULL, 313, &_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, 311, &_3, &_4); + ZEPHIR_CALL_FUNCTION(&_10, "range", NULL, 313, &_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, 311, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 313, &_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, 311, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 313, &_7, &_8); zephir_check_call_status(); zephir_array_update_long(&pools, 4, &_11, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY); ZEPHIR_INIT_NVAR(&_2); ZVAL_STRING(&_2, "2345679ACDEFHJKLMNPRSTUVWXYZ"); - ZEPHIR_CALL_FUNCTION(&_11, "str_split", NULL, 110, &_2); + ZEPHIR_CALL_FUNCTION(&_11, "str_split", NULL, 112, &_2); zephir_check_call_status(); 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, 311, &_7, &_8); + ZEPHIR_CALL_FUNCTION(&_11, "range", NULL, 313, &_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, 311, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&_12, "range", NULL, 313, &_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, 311, &_2, &_3); + ZEPHIR_CALL_FUNCTION(&_13, "range", NULL, 313, &_2, &_3); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(&_14, "array_merge", NULL, 312, &_11, &_12, &_13); + ZEPHIR_CALL_FUNCTION(&_14, "array_merge", NULL, 314, &_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/helper/str/ucwords.zep.c b/ext/phalcon/support/helper/str/ucwords.zep.c index 68b5c1fc90..34b1a8b522 100644 --- a/ext/phalcon/support/helper/str/ucwords.zep.c +++ b/ext/phalcon/support/helper/str/ucwords.zep.c @@ -75,7 +75,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Ucwords, __invoke) ZVAL_LONG(&_0, 2); - ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_case", NULL, 17, &text, &_0, &encoding); + ZEPHIR_RETURN_CALL_FUNCTION("mb_convert_case", NULL, 11, &text, &_0, &encoding); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/support/helper/str/uncamelize.zep.c b/ext/phalcon/support/helper/str/uncamelize.zep.c index 1aa9d14491..58a112741e 100644 --- a/ext/phalcon/support/helper/str/uncamelize.zep.c +++ b/ext/phalcon/support/helper/str/uncamelize.zep.c @@ -80,7 +80,7 @@ PHP_METHOD(Phalcon_Support_Helper_Str_Uncamelize, __invoke) ZEPHIR_INIT_VAR(&_0); ZEPHIR_CONCAT_VS(&_0, &delimiter, "\\0"); - ZEPHIR_CALL_FUNCTION(&_1, "lcfirst", NULL, 97, &text); + ZEPHIR_CALL_FUNCTION(&_1, "lcfirst", NULL, 99, &text); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_2); ZVAL_STRING(&_2, "/[A-Z]/"); diff --git a/ext/phalcon/support/version.zep.c b/ext/phalcon/support/version.zep.c index 442aeb4c75..d78689e0d2 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, 135, &_0, &medium); + ZEPHIR_CALL_FUNCTION(&_1, "sprintf", NULL, 137, &_0, &medium); zephir_check_call_status(); ZEPHIR_INIT_NVAR(&_0); ZVAL_STRING(&_0, "%02s"); - ZEPHIR_CALL_FUNCTION(&_2, "sprintf", NULL, 135, &_0, &minor); + ZEPHIR_CALL_FUNCTION(&_2, "sprintf", NULL, 137, &_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 139af23abd..2578901dd8 100644 --- a/ext/phalcon/tag.zep.c +++ b/ext/phalcon/tag.zep.c @@ -3125,7 +3125,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 cb2122e58c..61e64228b4 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, 256, &optionValue); + ZEPHIR_CALL_FUNCTION(&escaped, "htmlspecialchars", &_4, 258, &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, 256, &optionValue); + ZEPHIR_CALL_FUNCTION(&escaped, "htmlspecialchars", &_4, 258, &optionValue); zephir_check_call_status(); if (Z_TYPE_P(&optionText) == IS_ARRAY) { ZEPHIR_INIT_NVAR(&_16$$12); diff --git a/ext/phalcon/text.zep.c b/ext/phalcon/text.zep.c index 951c700423..e094567fe5 100644 --- a/ext/phalcon/text.zep.c +++ b/ext/phalcon/text.zep.c @@ -303,7 +303,7 @@ PHP_METHOD(Phalcon_Text, endsWith) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_helper_str_ce, "endswith", &_0, 302, &text, &end, &_1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_helper_str_ce, "endswith", &_0, 304, &text, &end, &_1); zephir_check_call_status(); RETURN_MM(); } @@ -508,7 +508,7 @@ PHP_METHOD(Phalcon_Text, startsWith) } else { ZVAL_BOOL(&_1, 0); } - ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_helper_str_ce, "startswith", &_0, 301, &text, &start, &_1); + ZEPHIR_RETURN_CALL_CE_STATIC(phalcon_helper_str_ce, "startswith", &_0, 303, &text, &start, &_1); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/translate/interpolator/associativearray.zep.c b/ext/phalcon/translate/interpolator/associativearray.zep.c index 98bc8c4c26..4f56987f88 100644 --- a/ext/phalcon/translate/interpolator/associativearray.zep.c +++ b/ext/phalcon/translate/interpolator/associativearray.zep.c @@ -97,7 +97,7 @@ PHP_METHOD(Phalcon_Translate_Interpolator_AssociativeArray, replacePlaceholders) zephir_check_call_status(); } - ZEPHIR_RETURN_CALL_METHOD(&interpolate, "__invoke", NULL, 452, &translation, &placeholders); + ZEPHIR_RETURN_CALL_METHOD(&interpolate, "__invoke", NULL, 0, &translation, &placeholders); zephir_check_call_status(); RETURN_MM(); } diff --git a/ext/phalcon/translate/interpolator/indexedarray.zep.c b/ext/phalcon/translate/interpolator/indexedarray.zep.c index f45d694e7d..8b4b822302 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, 255, &placeholders, &translation); + ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", NULL, 257, &placeholders, &translation); ZEPHIR_UNREF(&placeholders); zephir_check_call_status(); ZEPHIR_INIT_VAR(&_0$$3); diff --git a/ext/phalcon/translate/translatefactory.zep.c b/ext/phalcon/translate/translatefactory.zep.c index 5d34917c75..38865e1f86 100644 --- a/ext/phalcon/translate/translatefactory.zep.c +++ b/ext/phalcon/translate/translatefactory.zep.c @@ -112,16 +112,16 @@ PHP_METHOD(Phalcon_Translate_TranslateFactory, __construct) PHP_METHOD(Phalcon_Translate_TranslateFactory, load) { zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL; - zephir_fcall_cache_entry *_1 = NULL; + zephir_fcall_cache_entry *_2 = NULL; zend_long ZEPHIR_LAST_CALL_STATUS; - zval *config = NULL, config_sub, name, options, _0, _2, _3; + zval *config = NULL, config_sub, name, options, _0, _1, _3; zval *this_ptr = getThis(); ZVAL_UNDEF(&config_sub); ZVAL_UNDEF(&name); ZVAL_UNDEF(&options); ZVAL_UNDEF(&_0); - ZVAL_UNDEF(&_2); + ZVAL_UNDEF(&_1); ZVAL_UNDEF(&_3); #if PHP_VERSION_ID >= 80000 bool is_null_true = 1; @@ -139,13 +139,18 @@ PHP_METHOD(Phalcon_Translate_TranslateFactory, load) ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkconfig", NULL, 0, config); zephir_check_call_status(); ZEPHIR_CPY_WRT(config, &_0); + ZEPHIR_INIT_VAR(&_1); + ZVAL_STRING(&_1, "adapter"); + ZEPHIR_CALL_METHOD(&_0, this_ptr, "checkconfigelement", NULL, 0, config, &_1); + zephir_check_call_status(); + ZEPHIR_CPY_WRT(config, &_0); ZEPHIR_OBS_VAR(&name); - zephir_array_fetch_string(&name, config, SL("adapter"), PH_NOISY, "phalcon/Translate/TranslateFactory.zep", 72); - ZEPHIR_INIT_VAR(&_2); - array_init(&_2); + zephir_array_fetch_string(&name, config, SL("adapter"), PH_NOISY, "phalcon/Translate/TranslateFactory.zep", 73); + ZEPHIR_INIT_NVAR(&_1); + array_init(&_1); ZEPHIR_INIT_VAR(&_3); ZVAL_STRING(&_3, "options"); - ZEPHIR_CALL_CE_STATIC(&options, phalcon_helper_arr_ce, "get", &_1, 81, config, &_3, &_2); + ZEPHIR_CALL_CE_STATIC(&options, phalcon_helper_arr_ce, "get", &_2, 81, config, &_3, &_1); zephir_check_call_status(); ZEPHIR_RETURN_CALL_METHOD(this_ptr, "newinstance", NULL, 0, &name, &options); zephir_check_call_status(); diff --git a/ext/phalcon/validation.zep.c b/ext/phalcon/validation.zep.c index ad8aa63ab7..ff644b2964 100644 --- a/ext/phalcon/validation.zep.c +++ b/ext/phalcon/validation.zep.c @@ -596,7 +596,7 @@ PHP_METHOD(Phalcon_Validation, getValue) if (Z_TYPE_P(&entity) == IS_OBJECT) { ZEPHIR_INIT_NVAR(&method); ZEPHIR_CONCAT_SV(&method, "set", &camelizedField); - ZEPHIR_CALL_FUNCTION(&_10$$21, "property_exists", NULL, 464, &entity, &field); + ZEPHIR_CALL_FUNCTION(&_10$$21, "property_exists", NULL, 465, &entity, &field); zephir_check_call_status(); if ((zephir_method_exists(&entity, &method) == SUCCESS)) { ZEPHIR_CALL_METHOD_ZVAL(NULL, &entity, &method, NULL, 0, &value); @@ -705,7 +705,7 @@ PHP_METHOD(Phalcon_Validation, rules) ZEPHIR_CALL_METHOD(&validator, &validators, "current", NULL, 0); zephir_check_call_status(); if (zephir_instance_of_ev(&validator, phalcon_validation_validatorinterface_ce)) { - ZEPHIR_CALL_METHOD(NULL, this_ptr, "add", &_2, 279, field, &validator); + ZEPHIR_CALL_METHOD(NULL, this_ptr, "add", &_2, 281, field, &validator); zephir_check_call_status(); } ZEPHIR_CALL_METHOD(NULL, &validators, "next", NULL, 0); diff --git a/ext/phalcon/validation/validator/callback.zep.c b/ext/phalcon/validation/validator/callback.zep.c index 348d114217..1ee9790b14 100644 --- a/ext/phalcon/validation/validator/callback.zep.c +++ b/ext/phalcon/validation/validator/callback.zep.c @@ -166,7 +166,7 @@ PHP_METHOD(Phalcon_Validation_Validator_Callback, validate) ZEPHIR_CALL_METHOD(&data, validation, "getdata", NULL, 0); zephir_check_call_status(); } - ZEPHIR_CALL_FUNCTION(&returnedValue, "call_user_func", NULL, 289, &callback, &data); + ZEPHIR_CALL_FUNCTION(&returnedValue, "call_user_func", NULL, 291, &callback, &data); zephir_check_call_status(); _1$$3 = Z_TYPE_P(&returnedValue) == IS_OBJECT; if (_1$$3) { diff --git a/ext/phalcon/validation/validator/confirmation.zep.c b/ext/phalcon/validation/validator/confirmation.zep.c index 8a8c9b6dad..2080009faa 100644 --- a/ext/phalcon/validation/validator/confirmation.zep.c +++ b/ext/phalcon/validation/validator/confirmation.zep.c @@ -253,7 +253,7 @@ PHP_METHOD(Phalcon_Validation_Validator_Confirmation, compare) zephir_check_call_status(); zephir_get_strval(&b, &_5$$3); } - ZEPHIR_CALL_FUNCTION(&_6, "strcmp", NULL, 423, &a, &b); + ZEPHIR_CALL_FUNCTION(&_6, "strcmp", NULL, 425, &a, &b); zephir_check_call_status(); RETURN_MM_BOOL(ZEPHIR_IS_LONG_IDENTICAL(&_6, 0)); } diff --git a/ext/phalcon/validation/validator/creditcard.zep.c b/ext/phalcon/validation/validator/creditcard.zep.c index 2916aea5ac..1337fbe7e8 100644 --- a/ext/phalcon/validation/validator/creditcard.zep.c +++ b/ext/phalcon/validation/validator/creditcard.zep.c @@ -199,7 +199,7 @@ PHP_METHOD(Phalcon_Validation_Validator_CreditCard, verifyByLuhnAlgorithm) ZEPHIR_INIT_VAR(&hash); ZVAL_STRING(&hash, ""); - ZEPHIR_CALL_FUNCTION(&_0, "str_split", NULL, 110, &number); + ZEPHIR_CALL_FUNCTION(&_0, "str_split", NULL, 112, &number); zephir_check_call_status(); zephir_get_arrval(&_1, &_0); ZEPHIR_CPY_WRT(&digits, &_1); @@ -253,7 +253,7 @@ PHP_METHOD(Phalcon_Validation_Validator_CreditCard, verifyByLuhnAlgorithm) } ZEPHIR_INIT_NVAR(&digit); ZEPHIR_INIT_NVAR(&position); - ZEPHIR_CALL_FUNCTION(&_10, "str_split", NULL, 110, &hash); + ZEPHIR_CALL_FUNCTION(&_10, "str_split", NULL, 112, &hash); zephir_check_call_status(); ZEPHIR_CALL_FUNCTION(&result, "array_sum", NULL, 0, &_10); zephir_check_call_status(); diff --git a/ext/phalcon/validation/validator/email.zep.c b/ext/phalcon/validation/validator/email.zep.c index 3a101b0ce8..e5a9f09556 100644 --- a/ext/phalcon/validation/validator/email.zep.c +++ b/ext/phalcon/validation/validator/email.zep.c @@ -145,7 +145,7 @@ PHP_METHOD(Phalcon_Validation_Validator_Email, validate) ZEPHIR_CALL_METHOD(&value, validation, "getvalue", NULL, 0, field); zephir_check_call_status(); ZVAL_LONG(&_0, 274); - ZEPHIR_CALL_FUNCTION(&_1, "filter_var", NULL, 273, &value, &_0); + ZEPHIR_CALL_FUNCTION(&_1, "filter_var", NULL, 275, &value, &_0); zephir_check_call_status(); if (!(zephir_is_true(&_1))) { ZEPHIR_CALL_METHOD(&_2$$3, this_ptr, "messagefactory", NULL, 0, validation, field); diff --git a/ext/phalcon/validation/validator/file/mimetype.zep.c b/ext/phalcon/validation/validator/file/mimetype.zep.c index c8fdadfd0a..749e660870 100644 --- a/ext/phalcon/validation/validator/file/mimetype.zep.c +++ b/ext/phalcon/validation/validator/file/mimetype.zep.c @@ -147,12 +147,12 @@ PHP_METHOD(Phalcon_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, 389, &_2$$6); + ZEPHIR_CALL_FUNCTION(&tmp, "finfo_open", NULL, 391, &_2$$6); zephir_check_call_status(); zephir_array_fetch_string(&_3$$6, &value, SL("tmp_name"), PH_NOISY | PH_READONLY, "phalcon/Validation/Validator/File/MimeType.zep", 101); - ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 390, &tmp, &_3$$6); + ZEPHIR_CALL_FUNCTION(&mime, "finfo_file", NULL, 392, &tmp, &_3$$6); zephir_check_call_status(); - ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 391, &tmp); + ZEPHIR_CALL_FUNCTION(NULL, "finfo_close", NULL, 393, &tmp); zephir_check_call_status(); } else { ZEPHIR_OBS_NVAR(&mime); diff --git a/ext/phalcon/validation/validator/file/resolution/equal.zep.c b/ext/phalcon/validation/validator/file/resolution/equal.zep.c index c9c47fd08d..d8d8cd827c 100644 --- a/ext/phalcon/validation/validator/file/resolution/equal.zep.c +++ b/ext/phalcon/validation/validator/file/resolution/equal.zep.c @@ -169,7 +169,7 @@ PHP_METHOD(Phalcon_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/Validation/Validator/File/Resolution/Equal.zep", 88); - ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 397, &_1); + ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 399, &_1); zephir_check_call_status(); ZEPHIR_OBS_VAR(&width); zephir_array_fetch_long(&width, &tmp, 0, PH_NOISY, "phalcon/Validation/Validator/File/Resolution/Equal.zep", 89); diff --git a/ext/phalcon/validation/validator/file/resolution/max.zep.c b/ext/phalcon/validation/validator/file/resolution/max.zep.c index f145758644..7f02f9b61c 100644 --- a/ext/phalcon/validation/validator/file/resolution/max.zep.c +++ b/ext/phalcon/validation/validator/file/resolution/max.zep.c @@ -180,7 +180,7 @@ PHP_METHOD(Phalcon_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/Validation/Validator/File/Resolution/Max.zep", 94); - ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 397, &_1); + ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 399, &_1); zephir_check_call_status(); ZEPHIR_OBS_VAR(&width); zephir_array_fetch_long(&width, &tmp, 0, PH_NOISY, "phalcon/Validation/Validator/File/Resolution/Max.zep", 95); diff --git a/ext/phalcon/validation/validator/file/resolution/min.zep.c b/ext/phalcon/validation/validator/file/resolution/min.zep.c index f5e2d94786..4f3cb64abf 100644 --- a/ext/phalcon/validation/validator/file/resolution/min.zep.c +++ b/ext/phalcon/validation/validator/file/resolution/min.zep.c @@ -180,7 +180,7 @@ PHP_METHOD(Phalcon_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/Validation/Validator/File/Resolution/Min.zep", 94); - ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 397, &_1); + ZEPHIR_CALL_FUNCTION(&tmp, "getimagesize", NULL, 399, &_1); zephir_check_call_status(); ZEPHIR_OBS_VAR(&width); zephir_array_fetch_long(&width, &tmp, 0, PH_NOISY, "phalcon/Validation/Validator/File/Resolution/Min.zep", 95); diff --git a/ext/phalcon/validation/validator/ip.zep.c b/ext/phalcon/validation/validator/ip.zep.c index e1b451eda2..43fb0d999c 100644 --- a/ext/phalcon/validation/validator/ip.zep.c +++ b/ext/phalcon/validation/validator/ip.zep.c @@ -260,7 +260,7 @@ PHP_METHOD(Phalcon_Validation_Validator_Ip, validate) zephir_bitwise_or_function(&_11, &_10, &allowReserved); zephir_array_update_string(&options, SL("flags"), &_11, PH_COPY | PH_SEPARATE); ZVAL_LONG(&_1, 275); - ZEPHIR_CALL_FUNCTION(&_12, "filter_var", NULL, 273, &value, &_1, &options); + ZEPHIR_CALL_FUNCTION(&_12, "filter_var", NULL, 275, &value, &_1, &options); zephir_check_call_status(); if (!(zephir_is_true(&_12))) { ZEPHIR_CALL_METHOD(&_13$$8, this_ptr, "messagefactory", NULL, 0, validation, field); diff --git a/ext/phalcon/validation/validator/stringlength/max.zep.c b/ext/phalcon/validation/validator/stringlength/max.zep.c index 70479bc1ef..c77c0f413a 100644 --- a/ext/phalcon/validation/validator/stringlength/max.zep.c +++ b/ext/phalcon/validation/validator/stringlength/max.zep.c @@ -168,7 +168,7 @@ PHP_METHOD(Phalcon_Validation_Validator_StringLength_Max, validate) ZEPHIR_CALL_METHOD(&value, validation, "getvalue", NULL, 0, field); zephir_check_call_status(); if ((zephir_function_exists_ex(ZEND_STRL("mb_strlen")) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 229, &value); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 231, &value); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&length); diff --git a/ext/phalcon/validation/validator/stringlength/min.zep.c b/ext/phalcon/validation/validator/stringlength/min.zep.c index c2a2530f4c..2ac376cdcb 100644 --- a/ext/phalcon/validation/validator/stringlength/min.zep.c +++ b/ext/phalcon/validation/validator/stringlength/min.zep.c @@ -168,7 +168,7 @@ PHP_METHOD(Phalcon_Validation_Validator_StringLength_Min, validate) ZEPHIR_CALL_METHOD(&value, validation, "getvalue", NULL, 0, field); zephir_check_call_status(); if ((zephir_function_exists_ex(ZEND_STRL("mb_strlen")) == SUCCESS)) { - ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 229, &value); + ZEPHIR_CALL_FUNCTION(&length, "mb_strlen", NULL, 231, &value); zephir_check_call_status(); } else { ZEPHIR_INIT_NVAR(&length); diff --git a/ext/phalcon/validation/validator/uniqueness.zep.c b/ext/phalcon/validation/validator/uniqueness.zep.c index ca98a3cac5..84ad63c5b8 100644 --- a/ext/phalcon/validation/validator/uniqueness.zep.c +++ b/ext/phalcon/validation/validator/uniqueness.zep.c @@ -648,7 +648,7 @@ PHP_METHOD(Phalcon_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, 311, &_11$$6, &_12$$6); + ZEPHIR_CALL_FUNCTION(&_13$$6, "range", &_14, 313, &_11$$6, &_12$$6); zephir_check_call_status(); _9$$6 = !ZEPHIR_IS_IDENTICAL(&_10$$6, &_13$$6); } @@ -1052,7 +1052,7 @@ PHP_METHOD(Phalcon_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, 311, &_89$$37, &_90$$37); + ZEPHIR_CALL_FUNCTION(&_91$$37, "range", &_14, 313, &_89$$37, &_90$$37); zephir_check_call_status(); _87$$37 = !ZEPHIR_IS_IDENTICAL(&_88$$37, &_91$$37); } diff --git a/ext/phalcon/validation/validator/url.zep.c b/ext/phalcon/validation/validator/url.zep.c index 9570d23ece..4653eead5f 100644 --- a/ext/phalcon/validation/validator/url.zep.c +++ b/ext/phalcon/validation/validator/url.zep.c @@ -153,11 +153,11 @@ PHP_METHOD(Phalcon_Validation_Validator_Url, validate) zephir_read_property(&_0, this_ptr, ZEND_STRL("options"), PH_NOISY_CC | PH_READONLY); if (zephir_array_isset_string_fetch(&options, &_0, SL("options"), 0)) { ZVAL_LONG(&_1$$3, 273); - ZEPHIR_CALL_FUNCTION(&result, "filter_var", NULL, 273, &value, &_1$$3, &options); + ZEPHIR_CALL_FUNCTION(&result, "filter_var", NULL, 275, &value, &_1$$3, &options); zephir_check_call_status(); } else { ZVAL_LONG(&_2$$4, 273); - ZEPHIR_CALL_FUNCTION(&result, "filter_var", NULL, 273, &value, &_2$$4); + ZEPHIR_CALL_FUNCTION(&result, "filter_var", NULL, 275, &value, &_2$$4); zephir_check_call_status(); } if (!(zephir_is_true(&result))) {